3
0
Fork 0
forked from mirrors/nixpkgs

remove mapRecordFlatten & fix source autofs

svn path=/nixpkgs/trunk/; revision=18987
This commit is contained in:
Marc Weber 2009-12-16 05:52:36 +00:00
parent 404f029dfe
commit 0888bf7107
2 changed files with 3 additions and 4 deletions

View file

@ -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) ];

View file

@ -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";