From 3cb7cd2d7f24bd1f270c9cdb5e519dde7936a6f4 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Mon, 20 May 2024 22:07:35 +0200 Subject: [PATCH] chore: rustup nightly breaks nixos with ldd -> rollback version of rust --- .direnv/flake-profile | 2 +- .direnv/flake-profile-1-link | 1 - .direnv/flake-profile-2-link | 1 + flake.lock | 11 +++++++---- flake.nix | 9 ++++----- nix/default.nix | 5 +++-- 6 files changed, 16 insertions(+), 13 deletions(-) delete mode 120000 .direnv/flake-profile-1-link create mode 120000 .direnv/flake-profile-2-link diff --git a/.direnv/flake-profile b/.direnv/flake-profile index 0c05709..c7ae5b7 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-1-link \ No newline at end of file +flake-profile-2-link \ No newline at end of file diff --git a/.direnv/flake-profile-1-link b/.direnv/flake-profile-1-link deleted file mode 120000 index 8ec8cf3..0000000 --- a/.direnv/flake-profile-1-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/a7q30l1dy9h81iddq6ysf67616mbjfv2-nix-shell-env \ No newline at end of file diff --git a/.direnv/flake-profile-2-link b/.direnv/flake-profile-2-link new file mode 120000 index 0000000..49d810c --- /dev/null +++ b/.direnv/flake-profile-2-link @@ -0,0 +1 @@ +/nix/store/xrq8ppsi3rg3qjvlkvkvndic04y99djw-nix-shell-env \ No newline at end of file diff --git a/flake.lock b/flake.lock index 7fc701f..1b9d765 100644 --- a/flake.lock +++ b/flake.lock @@ -85,12 +85,15 @@ "locked": { "lastModified": 1716171463, "narHash": "sha256-lc7wOh5BjYUoxdhcPkeUY8BmuL2qtRaHlW1403RW48E=", - "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz" + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "04d61d14803854fd8453ec43c5c53a471e5407a8", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz" + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index 4d2f6f9..02083e9 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,7 @@ url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; - rust-overlay = { - url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"; - }; + rust-overlay.url = "github:oxalica/rust-overlay"; }; outputs = inputs @ { self, flake-parts, ... }: @@ -36,8 +34,9 @@ devShells.default = pkgs.mkShell { inputsFrom = builtins.attrValues self'.packages; packages = with pkgs; [ - (rust-bin.selectLatestNightlyWith - (toolchain: toolchain.default)) + # (rust-bin.selectLatestNightlyWith + # (toolchain: toolchain.default)) + rust-bin.nightly."2024-05-10".default ]; }; diff --git a/nix/default.nix b/nix/default.nix index e6e0fd9..2d5a748 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -37,8 +37,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config wrapGAppsHook4 - (rust-bin.selectLatestNightlyWith - (toolchain: toolchain.default)) + # (rust-bin.selectLatestNightlyWith + # (toolchain: toolchain.default)) + rust-bin.nightly."2024-05-10".default ]; copyLibs = true;