nixpkgs: update

This commit is contained in:
Graham Christensen 2017-12-20 08:17:14 -05:00
parent 60bbed5901
commit 0f711738bd
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 3 additions and 11 deletions

View file

@ -15,14 +15,6 @@ in import (hostpkgs.stdenv.mkDerivation {
}; };
patches = [ patches = [
(fetchurl {
# As of 2017-22-29 21:30:00 EST:
# The URL is https://github.com/NixOS/nixpkgs/pull/31150 but
# with master merged in so it applies cleanly.
url = "https://github.com/NixOS/nixpkgs/compare/master...grahamc:P-E-Meunier-mkRustCrate-rebased.patch";
name = "mkRustCrate-rebased.patch";
sha256 = "0w3w226axr282ranbzxymqshl4irxh5xx3sv1rrwvfv616j6ysqj";
})
]; ];
moveToOut = '' moveToOut = ''

View file

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/nixos/nixpkgs-channels.git", "url": "https://github.com/nixos/nixpkgs-channels.git",
"rev": "79081322ab97b7d9c937c07b24cd0911e2a3a0a9", "rev": "a0aeb2381e5a6c5c57efdec1bf4b4ada44d29511",
"date": "2017-12-07T14:37:08+01:00", "date": "2017-12-20T02:19:43+00:00",
"sha256": "1w90bf4wp3y40fv1gbmwzv6y0d0rj8jpzdj7hf3xi5vfr9j2sbqb", "sha256": "04dgg0f2839c1kvlhc45hcksmjzr8a22q1bgfnrx71935ilxl33d",
"fetchSubmodules": true "fetchSubmodules": true
} }