From f95daa0d1edfa5295c9b33170e06cbd08edb380a Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Thu, 20 Feb 2025 17:14:20 +0100 Subject: [PATCH] Update python to 3.12 --- dev/nix/shell.nix | 155 +++++++++++++++++++++++----------------------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/dev/nix/shell.nix b/dev/nix/shell.nix index bcd2915cf..f3d771401 100644 --- a/dev/nix/shell.nix +++ b/dev/nix/shell.nix @@ -1,86 +1,87 @@ -{ - self, - inputs, - ... +{ self +, inputs +, ... }: { - perSystem = { - inputs', - self', - pkgs, - system, - ... - }: let - isDarwin = pkgs.lib.hasSuffix "darwin" system; - fenixPkgs = inputs'.fenix.packages; - rustToolchain = with fenixPkgs; - fromToolchainFile { - file = ../../rust-toolchain.toml; - sha256 = "VZZnlyP69+Y3crrLHQyJirqlHrTtGTsyiSnZB8jEvVo="; - }; - in { - devShells = { - default = pkgs.mkShell { - # envs needed for rust toochain - RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library"; - LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; - LD_LIBRARY_PATH = "${rustToolchain}/lib"; + perSystem = + { inputs' + , self' + , pkgs + , system + , ... + }: + let + isDarwin = pkgs.lib.hasSuffix "darwin" system; + fenixPkgs = inputs'.fenix.packages; + rustToolchain = with fenixPkgs; + fromToolchainFile { + file = ../../rust-toolchain.toml; + sha256 = "VZZnlyP69+Y3crrLHQyJirqlHrTtGTsyiSnZB8jEvVo="; + }; + in + { + devShells = { + default = pkgs.mkShell { + # envs needed for rust toochain + RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library"; + LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; + LD_LIBRARY_PATH = "${rustToolchain}/lib"; - # envs needed in order to construct some of the rust crates - ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib/"; - OPENSSL_NO_VENDOR = 1; - OPENSSL_DIR = "${pkgs.openssl.dev}"; - OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include"; - OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; - packages = with pkgs; [ - # core tooling to share across linux/macos - coreutils - pkg-config - protobuf - libiconv - openssl - gnumake + # envs needed in order to construct some of the rust crates + ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib/"; + OPENSSL_NO_VENDOR = 1; + OPENSSL_DIR = "${pkgs.openssl.dev}"; + OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include"; + OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; + packages = with pkgs; [ + # core tooling to share across linux/macos + coreutils + pkg-config + protobuf + libiconv + openssl + gnumake - # tools for e2e testing - docker-compose - python311 - python311Packages.pip - python311Packages.virtualenv - sops + # tools for e2e testing + docker-compose + python312 + python312Packages.pip + python312Packages.virtualenv + sops - # local development tools - rustToolchain - nodejs - gawk - cargo-edit - cargo-license - perl + # local development tools + rustToolchain + nodejs + gawk + cargo-edit + cargo-license + perl - # infra packages - earthly - awscli2 - kubectl - kubernetes-helm + # infra packages + earthly + awscli2 + kubectl + kubernetes-helm - # our local packages - self'.packages.cardano-cli - ] - ++ ( - if isDarwin - then - [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ] - else [ pkgs.clang ] - ); - }; - process-compose = pkgs.mkShell { - inputsFrom = [ self'.devShells.default ]; - packages = [ - self'.packages.partnerchains-stack - ]; - shellHook = '' - echo "Partner Chains dependency stack devshell"; - echo "useage: -n to specify networks." - ''; + # our local packages + self'.packages.cardano-cli + ] + ++ ( + if isDarwin + then + [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ] + else [ pkgs.clang ] + ); + }; + process-compose = pkgs.mkShell { + inputsFrom = [ self'.devShells.default ]; + packages = [ + self'.packages.partnerchains-stack + ]; + shellHook = '' + echo "Partner Chains dependency stack devshell"; + echo "useage: -n to specify networks." + ''; + }; }; }; - }; }