From e4813107c373b002dbf521745270ac299b3c2d4e Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 2 Oct 2024 01:44:58 +0200 Subject: [PATCH] pkgs/overlays/cosmic-packages: use unstable pinned in upstream. --- pkgs/overlays/cosmic-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix index 8f2cff8..4026eae 100644 --- a/pkgs/overlays/cosmic-packages.nix +++ b/pkgs/overlays/cosmic-packages.nix @@ -7,14 +7,18 @@ let cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs"; cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir); - # Pinned unstable nixpkgs + # Pinned unstable nixpkgs from cosmic-modules + cosmicModulesLock = builtins.fromJSON (builtins.readFile "${nixos-cosmic}/flake.lock"); + pinnedNixpkgsRev = cosmicModulesLock.nodes.nixpkgs.locked.rev; + pinnedNixpkgsNarHash = cosmicModulesLock.nodes.nixpkgs.locked.narHash; + futureNixpkgsSrc = builtins.fetchTarball { name = "nixpkgs"; - url = "https://github.com/NixOS/nixpkgs/archive/c3aa7b8938b17aebd2deecf7be0636000d62a2b9.tar.gz"; - sha256 = "1ds3yjcy52l8d3rkxr3b7h9c0c3nly079bgakjaasnfjj3xprrwr"; + url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgsRev}.tar.gz"; + sha256 = pinnedNixpkgsNarHash; }; - # Take rustPackages from staging nixpkgs + # Take rustPackages from pinned nixpkgs futureNixpkgs = import futureNixpkgsSrc { localSystem = self.stdenv.buildPlatform; config = self.config;