From a6538fe9210b87eeee6b57e813751dbc2472aa63 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 6 Dec 2024 12:54:01 +0100 Subject: [PATCH] build(nix): update dependencies Signed-off-by: Roman Volosatovs --- flake.lock | 85 ++++++++++++++++++++++++++---------------------------- flake.nix | 58 +++++++++++-------------------------- 2 files changed, 58 insertions(+), 85 deletions(-) diff --git a/flake.lock b/flake.lock index d684960..8e7c51d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1728933535, - "narHash": "sha256-+EO3jis98fMzG2/JPeFcmWgDxxm4RO0q/TSxiXHoAFs=", + "lastModified": 1733371256, + "narHash": "sha256-gWvibGRlB+SMgqTOblVPpkcIAcl0LppLz1dBukEyXoY=", "owner": "rustsec", "repo": "advisory-db", - "rev": "57c4a0ce3a1a3cdbf9e7eaa16b5441345de50d13", + "rev": "463107188fc02ccaddefc8f4a65746afa06bb7fa", "type": "github" }, "original": { @@ -18,16 +18,15 @@ }, "crane": { "locked": { - "lastModified": 1727316705, - "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=", + "lastModified": 1733418579, + "narHash": "sha256-0fJaoI4B9Nn67E1P44usZhZHkSSyWdAI23HU+X+HJCQ=", "owner": "ipetkov", "repo": "crane", - "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e", + "rev": "62e50137688d953557f156f01e2ad2a25b22d66c", "type": "github" }, "original": { "owner": "ipetkov", - "ref": "v0.19.0", "repo": "crane", "type": "github" } @@ -78,17 +77,16 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727159616, - "narHash": "sha256-1VjZ+khJwZphRJZy2HvbMSCgi3OV7mu8RjVzqCxVi2k=", + "lastModified": 1733466958, + "narHash": "sha256-JACQSAw27LYEdfDZuPVKbLpX5kTUkgpq53WTt2BZTW0=", "owner": "nix-community", "repo": "fenix", - "rev": "4306d494985e00719573bbdeb863c27c6d83dc9c", + "rev": "c1bb57f954601094bfacc2a7ca65551b3f1bcecd", "type": "github" }, "original": { "owner": "nix-community", "repo": "fenix", - "rev": "4306d494985e00719573bbdeb863c27c6d83dc9c", "type": "github" } }, @@ -137,11 +135,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -180,11 +178,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "owner": "numtide", "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "type": "github" }, "original": { @@ -245,11 +243,11 @@ "nixlib": "nixlib_2" }, "locked": { - "lastModified": 1681933283, - "narHash": "sha256-phDsQdaoUEI4DUTErR6Tz7lS0y3kXvDwwbqtxpzd0eo=", + "lastModified": 1732275245, + "narHash": "sha256-HaG2NWJmxmGltlKSyvoROdajDKmMVjqEU6dK+nZ9ois=", "owner": "rvolosatovs", "repo": "nix-log", - "rev": "833d31e3c1a677eac81ba87e777afa5076071d66", + "rev": "420777992ad234cb1a1c9dafb9aa022526949e1f", "type": "github" }, "original": { @@ -301,11 +299,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1729266999, - "narHash": "sha256-wRyieaPeigUBSIqbiSILNkrICSW8MglIAP5i+25eaLg=", + "lastModified": 1733484826, + "narHash": "sha256-CXP/ICv1DH3ehtH83WftlzuwYGM7m7IxCsso/4VqtR0=", "owner": "rvolosatovs", "repo": "nixify", - "rev": "b21804e26b6935fe08b36148510d53cab81a5a2d", + "rev": "2ee6971eca1732128a4fa7b7e0dadab591c1e6ce", "type": "github" }, "original": { @@ -370,11 +368,11 @@ }, "nixlib_3": { "locked": { - "lastModified": 1728781282, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -401,43 +399,43 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1733326450, + "narHash": "sha256-hBG6Ix5ZzXCJoanrPOLtQRalYv6nnDu9AZeamRfjKJ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "f9ef77eb704d063bfbff7f04531a0b325cc1a18f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-24.05-darwin", + "ref": "nixpkgs-24.11-darwin", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-nixos": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728979988, - "narHash": "sha256-GBJRnbFLDg0y7ridWJHAP4Nn7oss50/VNgqoXaf/RVk=", + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7881fbfd2e3ed1dfa315fca889b2cfd94be39337", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", "type": "github" }, "original": { @@ -458,11 +456,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727104575, - "narHash": "sha256-lB/ZS0SnHyE8Z3G8DIL/QJPg6w6x5ZhgVO2pBqnz89g=", + "lastModified": 1733427694, + "narHash": "sha256-r8Ab+UJUM2H0inWuFL3QFVnBRkuwsr79L6RnTVDTCCY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3d0343251fe084b335b55c17a52bb4a3527b1bd0", + "rev": "150b0e72929453f800db1a14e81003295ea5822d", "type": "github" }, "original": { @@ -526,17 +524,16 @@ ] }, "locked": { - "lastModified": 1727144949, - "narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=", + "lastModified": 1733452419, + "narHash": "sha256-eh2i2GtqdWVOP7yjiWtB8FMUWktCZ4vjo81n6g5mSiE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2e19799819104b46019d339e78d21c14372d3666", + "rev": "020701e6057992329a7cfafc6e3c5d5658bbcf79", "type": "github" }, "original": { "owner": "oxalica", "repo": "rust-overlay", - "rev": "2e19799819104b46019d339e78d21c14372d3666", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 5d1ca05..34e1a6d 100644 --- a/flake.nix +++ b/flake.nix @@ -85,6 +85,7 @@ targets.s390x-unknown-linux-gnu = false; targets.wasm32-unknown-unknown = false; targets.wasm32-wasip1 = false; + targets.wasm32-wasip2 = false; clippy.deny = ["warnings"]; clippy.workspace = true; @@ -97,51 +98,26 @@ pkgsCross ? pkgs, ... }: { - buildInputs ? [], - depsBuildBuild ? [], - nativeBuildInputs ? [], nativeCheckInputs ? [], preCheck ? "", ... } @ args: - with pkgs.lib; let - darwin2darwin = pkgs.stdenv.hostPlatform.isDarwin && pkgsCross.stdenv.hostPlatform.isDarwin; - - depsBuildBuild' = - depsBuildBuild - ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.darwin.apple_sdk.frameworks.SystemConfiguration - ++ optional darwin2darwin pkgs.xcbuild.xcrun; - in - { - buildInputs = - buildInputs - ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.libiconv; - - depsBuildBuild = depsBuildBuild'; - } - // optionalAttrs (args ? cargoArtifacts) { - preCheck = - '' - export GOCACHE=$TMPDIR/gocache - export GOMODCACHE=$TMPDIR/gomod - export GOPATH=$TMPDIR/go - export HOME=$TMPDIR/home - '' - + preCheck; - - depsBuildBuild = - depsBuildBuild' - ++ optionals darwin2darwin [ - pkgs.darwin.apple_sdk.frameworks.CoreFoundation - pkgs.darwin.apple_sdk.frameworks.CoreServices - ]; - - nativeCheckInputs = - nativeCheckInputs - ++ [ - pkgs.pkgsUnstable.go - ]; - }; + optionalAttrs (args ? cargoArtifacts) { + preCheck = + '' + export GOCACHE=$TMPDIR/gocache + export GOMODCACHE=$TMPDIR/gomod + export GOPATH=$TMPDIR/go + export HOME=$TMPDIR/home + '' + + preCheck; + + nativeCheckInputs = + nativeCheckInputs + ++ [ + pkgs.pkgsUnstable.go + ]; + }; withPackages = { hostRustToolchain,