Compare commits
No commits in common. "7f81b391c10118e66ad1a3e5fb8cb743bf6e96eb" and "4f10f70c70fd23b70a247d8873fb5782a475f315" have entirely different histories.
7f81b391c1
...
4f10f70c70
1 changed files with 8 additions and 17 deletions
|
@ -2,21 +2,12 @@ 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 !builtins.isNull unstableRevision
|
unstablePkgsExprs = if nixos
|
||||||
then if !builtins.isNull unstableRevisionHash
|
then builtins.fetchTarball "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
||||||
then builtins.fetchTarball {
|
else builtins.fetchTarball "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
|
||||||
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")
|
||||||
|
@ -25,10 +16,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.buildPlatform
|
# localSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.hostPlatform ???
|
||||||
localSystem = nixpkgs.stdenv.buildPlatform;
|
localSystem = nixpkgs.stdenv.hostPlatform;
|
||||||
# crossSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.targetPlatform ??
|
# crossSystem -> nixpkgs.stdenv.targetPlatform
|
||||||
crossSystem = nixpkgs.stdenv.hostPlatform;
|
crossSystem = nixpkgs.stdenv.targetPlatform;
|
||||||
# config -> pkgs.config
|
# config -> pkgs.config
|
||||||
config = nixpkgs.config;
|
config = nixpkgs.config;
|
||||||
# overlays -> partial of pkgs.overlays
|
# overlays -> partial of pkgs.overlays
|
||||||
|
|
Loading…
Reference in a new issue