From 0af88c8ae70e77e01c1427d43fa6ed95e57b7232 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 3 Jan 2025 02:26:43 +0100 Subject: [PATCH 1/3] pkgs/overlays/unstable-from-source: remove darwin{Sdk; Min}Version from platform --- pkgs/overlays/unstable-from-source.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/overlays/unstable-from-source.nix b/pkgs/overlays/unstable-from-source.nix index afb8f2e..214307d 100644 --- a/pkgs/overlays/unstable-from-source.nix +++ b/pkgs/overlays/unstable-from-source.nix @@ -9,6 +9,8 @@ let sanitizePlatform = platformConfig: self.lib.removeAttrs platformConfig [ "emulator" "emulatorAvailable" + "darwinSdkVersion" + "darwinMinVersion" ]; unstablePkgsForNixpkgs = nixpkgs: import unstableSource { From 2d24ce7fd467763b2ad2663076bb2ca433df1522 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 3 Jan 2025 02:27:59 +0100 Subject: [PATCH 2/3] pkgs/overlays/cosmic-packages: use unstable-from-source overlay code here wants to do the same thing as unstable-from-source overlay --- pkgs/overlays/cosmic-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix index 9b9f6f5..5f34ffa 100644 --- a/pkgs/overlays/cosmic-packages.nix +++ b/pkgs/overlays/cosmic-packages.nix @@ -20,12 +20,11 @@ let }; # Initialize pinned nixpkgs - futureNixpkgs = import futureNixpkgsSrc { - localSystem = self.stdenv.buildPlatform; - config = self.config; - } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else { - crossSystem = self.stdenv.hostPlatform; - }); + futureNixpkgs = let + extended = self.extend (import ./unstable-from-source.nix { + unstableSource = futureNixpkgsSrc; + }); + in extended.unstable; in import "${nixos-cosmic}/pkgs" { From 04af4df022401dfcd27627a2c7d7f5d9046693df Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 3 Jan 2025 03:52:30 +0100 Subject: [PATCH 3/3] lock: update --- lock.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lock.nix b/lock.nix index d60d746..efc9fc8 100644 --- a/lock.nix +++ b/lock.nix @@ -4,11 +4,11 @@ sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h"; }; nixpkgs = { - revision = "1c6e20d41d6a9c1d737945962160e8571df55daa"; - sha256 = "1cyck9dycldzj5p8p2bz0rhzmdgm75zvmg9afhblm4k9vlr350qq"; + revision = "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9"; + sha256 = "0zffg0m7rhdpk94df578wln5lw3plamadac86cd7cfjcb1n13xmm"; }; cosmic-modules = { - revision = "86e08fbc79f33f98c00097d6dcabe0e17c20faae"; - sha256 = "1zxv3lx813wvy4d036w5lg34qf51idcbd49fnllfy7vxz2nhbdp1"; + revision = "c9667d79481c62d9b204f8cb13d043b9b1f5dc05"; + sha256 = "1q07p4zicp1bjxwn3n6w48045kd5dabkffzwxydjgjfgrsdkz1f0"; }; }