From b8aba059e6166453b5e50479f3e0034fbad1e31f Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 16 Aug 2024 16:55:14 +0200 Subject: [PATCH] pkgs/overlays/cosmic-packages: update staging nixpkgs pin to current unstable --- pkgs/overlays/cosmic-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix index 1722c18..8f2cff8 100644 --- a/pkgs/overlays/cosmic-packages.nix +++ b/pkgs/overlays/cosmic-packages.nix @@ -7,21 +7,21 @@ let cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs"; cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir); - # FIXME: use unstable nixpkgs when rust 1.80 will be available in unstable - stagingNixpkgsSrc = builtins.fetchTarball { + # Pinned unstable nixpkgs + futureNixpkgsSrc = builtins.fetchTarball { name = "nixpkgs"; - url = "https://github.com/NixOS/nixpkgs/archive/b79cec4237cd0f655562890bf927466c68b48d68.tar.gz"; - sha256 = "1mswisq9iwffg2d6rfxvr27mvi4w853d9rn222s2g76445d0iqh8"; + url = "https://github.com/NixOS/nixpkgs/archive/c3aa7b8938b17aebd2deecf7be0636000d62a2b9.tar.gz"; + sha256 = "1ds3yjcy52l8d3rkxr3b7h9c0c3nly079bgakjaasnfjj3xprrwr"; }; # Take rustPackages from staging nixpkgs - stagingNixpkgs = import stagingNixpkgsSrc { + futureNixpkgs = import futureNixpkgsSrc { localSystem = self.stdenv.buildPlatform; config = self.config; } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else { crossSystem = self.stdenv.hostPlatform; }); - futureRustPackages = stagingNixpkgs.rustPackages; + futureRustPackages = futureNixpkgs.rustPackages; # Create nixpkgs with future rust nixpkgsWithFutureRust = self.extend (futureSelf: futureSuper: {