Compare commits

...

2 commits

View file

@ -2,12 +2,21 @@ self: super:
let let
nixos = self.config.nixos or true; nixos = self.config.nixos or true;
unstableRevision = self.config.unstableRevision or null;
unstableRevisionHash = self.config.unstableRevisionHash or null;
useUnstable = self.config.useUnstable or true; useUnstable = self.config.useUnstable or true;
unstablePkgsExprs = if nixos unstablePkgsExprs = if !builtins.isNull unstableRevision
then builtins.fetchTarball "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" then if !builtins.isNull unstableRevisionHash
else builtins.fetchTarball "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; then builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${unstableRevision}.tar.gz";
sha256 = unstableRevisionHash;
}
else builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${unstableRevision}.tar.gz"
else if nixos
then builtins.fetchTarball "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
else builtins.fetchTarball "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
# Compiled nixpkgs expression eg expressions from a nix channel # Compiled nixpkgs expression eg expressions from a nix channel
nixpkgsVersion = builtins.concatStringsSep "." [ nixpkgsVersion = builtins.concatStringsSep "." [
(builtins.readFile "${unstablePkgsExprs}/.version") (builtins.readFile "${unstablePkgsExprs}/.version")
@ -16,10 +25,10 @@ let
nixpkgsRevision = (builtins.readFile "${unstablePkgsExprs}/.git-revision"); nixpkgsRevision = (builtins.readFile "${unstablePkgsExprs}/.git-revision");
unstablePkgsForNixpkgs = nixpkgs: import unstablePkgsExprs { unstablePkgsForNixpkgs = nixpkgs: import unstablePkgsExprs {
# localSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.hostPlatform ??? # localSystem -> pkgs.stdenv.buildPlatform
localSystem = nixpkgs.stdenv.hostPlatform; localSystem = nixpkgs.stdenv.buildPlatform;
# crossSystem -> nixpkgs.stdenv.targetPlatform # crossSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.targetPlatform ??
crossSystem = nixpkgs.stdenv.targetPlatform; crossSystem = nixpkgs.stdenv.hostPlatform;
# config -> pkgs.config # config -> pkgs.config
config = nixpkgs.config; config = nixpkgs.config;
# overlays -> partial of pkgs.overlays # overlays -> partial of pkgs.overlays