diff options
| -rw-r--r-- | pkgs/lib/misc.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/autofs/autofs-v5.nix | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index e3215d9ec56..f2898e4bef8 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -205,7 +205,6 @@ rec { # calls a function (f attr value ) for each record item. returns a list mapAttrsFlatten = f : r : map (attr: f attr (builtins.getAttr attr r) ) (attrNames r); - mapRecordFlatten = builtins.trace "deprecated usage of mapRecordFlatten, use mapAttrsFlatten instead" mapAttrsFlatten; # attribute set containing one attribute nvs = name : value : listToAttrs [ (nameValuePair name value) ]; diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 592dc52f34c..92e269306ab 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation { # It's too tiresome to apply all patches which are availible (see previous rev). # Using git repo which seems to be the same anyway.. - # REGION AUTO UPDATE: { name="autofs"; type="git"; url="http://ftp.riken.go.jp/Linux/kernel.org/scm/linux/storage/autofs/autofs.git"; } - src = sourceFromHead "autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz"; sha256 = "405c769b87f8ec2116faaca021ae03bb69d0a996cd574493b4eede34cb587061"; }); + # REGION AUTO UPDATE: { name="autofs"; type="git"; url="http://ftp.riken.go.jp/Linux/kernel.org/scm/linux/storage/autofs/autofs.git"; } + src= sourceFromHead "autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz"; sha256 = "6764390e1f202eaef2f800146c8ccef616d502cec9471b006abde0781a62237f"; }); # END /*fetchurl { url = "${baseURL}/autofs-5.0.4.tar.bz2"; |