diff options
author | Marc Weber <marco-oweber@gmx.de> | 2008-12-20 01:20:35 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2008-12-20 01:20:35 +0000 |
commit | e996113be7f41f067aaefac881c540b5ceb8d2d4 (patch) | |
tree | 177f16552ca2d05020c3d45a0b45502556a09502 /pkgs/servers | |
parent | 5ab6464edb9bbc2a9aa15122ffc02b57ad236bb7 (diff) |
removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now svn path=/nixpkgs/trunk/; revision=13661
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/squid/3.head.nix | 24 | ||||
-rw-r--r-- | pkgs/servers/squid/default.nix | 33 |
2 files changed, 14 insertions, 43 deletions
diff --git a/pkgs/servers/squid/3.head.nix b/pkgs/servers/squid/3.head.nix deleted file mode 100644 index 26f459525a864..0000000000000 --- a/pkgs/servers/squid/3.head.nix +++ /dev/null @@ -1,24 +0,0 @@ -args: -( args.mkDerivationByConfiguration { - flagConfig = { - mandatory = { buildInputs = [ "perl" ]; }; - # many options I don't know wether they should be default .. - }; - - extraAttrs = co : { - name = "squid-3.0-stable5"; - - src = args.fetchurl { - url = http://www.squid-cache.org/Versions/v3/HEAD/squid-3.HEAD-20080706.tar.bz2; - sha256 = "20f5994dd2189faa07edaef2c529f385e4590266d283745027b35d140eefe1ab"; - }; - - configureFlags = ["--enable-ipv6"]; - - meta = { - description = "http-proxy"; - homepage = "http://www.squid-cache.org"; - license = "GPL2"; - }; - }; -} ) args diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 3ae7053f92949..95e922f5e95ef 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,24 +1,19 @@ -args: -( args.mkDerivationByConfiguration { - flagConfig = { - mandatory = { buildInputs = [ "perl" ]; }; - # many options I don't know wether they should be default .. - }; +args: with args; +stdenv.mkDerivation { + name = "squid-3.0-stable5"; - extraAttrs = co : { - name = "squid-3.0-stable5"; + buildInputs = [perl]; - src = args.fetchurl { - url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2; - sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w"; - }; + src = args.fetchurl { + url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2; + sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w"; + }; - configureFlags = ["--enable-ipv6"]; + configureFlags = ["--enable-ipv6"]; - meta = { - description = "http-proxy"; - homepage = "http://www.squid-cache.org"; - license = "GPL2"; - }; + meta = { + description = "http-proxy"; + homepage = "http://www.squid-cache.org"; + license = "GPL2"; }; -} ) args +} |