Merge branch 'update-nixpkgs2'

This commit is contained in:
Jonas Nick 2019-05-13 15:53:27 +00:00
commit c6667c346a
No known key found for this signature in database
GPG Key ID: 4861DBF262123605

View File

@ -2,12 +2,12 @@
nixpkgs = builtins.fetchGit { nixpkgs = builtins.fetchGit {
url = "https://github.com/nixos/nixpkgs-channels"; url = "https://github.com/nixos/nixpkgs-channels";
ref = "nixos-19.03"; ref = "nixos-19.03";
rev = "7936400662bc9379beb69855b0e0b7c0110e5f3c"; rev = "6ec0970062c62935da71e6dbd3576bbbdcbfa10c";
}; };
nixpkgs-unstable = builtins.fetchGit { nixpkgs-unstable = builtins.fetchGit {
url = "https://github.com/nixos/nixpkgs-channels"; url = "https://github.com/nixos/nixpkgs-channels";
ref = "nixpkgs-unstable"; ref = "nixos-unstable";
rev = "02bb5e35eae8a9e124411270a6790a08f68e905b"; rev = "24debf74ef5c6e7799a5bc7edc4b2d6eae8e3c07";
}; };
} }