Compare commits

..

No commits in common. "04af4df022401dfcd27627a2c7d7f5d9046693df" and "492255e4e0f753a01bbdd514f4c2e99814a995f2" have entirely different histories.

3 changed files with 10 additions and 11 deletions

View file

@ -4,11 +4,11 @@
sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h"; sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h";
}; };
nixpkgs = { nixpkgs = {
revision = "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9"; revision = "1c6e20d41d6a9c1d737945962160e8571df55daa";
sha256 = "0zffg0m7rhdpk94df578wln5lw3plamadac86cd7cfjcb1n13xmm"; sha256 = "1cyck9dycldzj5p8p2bz0rhzmdgm75zvmg9afhblm4k9vlr350qq";
}; };
cosmic-modules = { cosmic-modules = {
revision = "c9667d79481c62d9b204f8cb13d043b9b1f5dc05"; revision = "86e08fbc79f33f98c00097d6dcabe0e17c20faae";
sha256 = "1q07p4zicp1bjxwn3n6w48045kd5dabkffzwxydjgjfgrsdkz1f0"; sha256 = "1zxv3lx813wvy4d036w5lg34qf51idcbd49fnllfy7vxz2nhbdp1";
}; };
} }

View file

@ -20,11 +20,12 @@ let
}; };
# Initialize pinned nixpkgs # Initialize pinned nixpkgs
futureNixpkgs = let futureNixpkgs = import futureNixpkgsSrc {
extended = self.extend (import ./unstable-from-source.nix { localSystem = self.stdenv.buildPlatform;
unstableSource = futureNixpkgsSrc; config = self.config;
} // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
crossSystem = self.stdenv.hostPlatform;
}); });
in extended.unstable;
in in
import "${nixos-cosmic}/pkgs" { import "${nixos-cosmic}/pkgs" {

View file

@ -9,8 +9,6 @@ let
sanitizePlatform = platformConfig: self.lib.removeAttrs platformConfig [ sanitizePlatform = platformConfig: self.lib.removeAttrs platformConfig [
"emulator" "emulator"
"emulatorAvailable" "emulatorAvailable"
"darwinSdkVersion"
"darwinMinVersion"
]; ];
unstablePkgsForNixpkgs = nixpkgs: import unstableSource { unstablePkgsForNixpkgs = nixpkgs: import unstableSource {