diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-30 11:18:56 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-30 11:44:08 +0100 |
| commit | c20cc6d0b37b8330eb1bcdc0031b600f2665eb93 (patch) | |
| tree | 7204fef874deec5a890e03e63d271df8dc11460a /pkgs/development/libraries | |
| parent | 2dc87881b045ad02abe32c6c486e2b30fceb61de (diff) | |
| download | nixpkgs-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar nixpkgs-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.gz nixpkgs-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.bz2 nixpkgs-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.lz nixpkgs-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.xz nixpkgs-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.zst nixpkgs-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.zip | |
Excise use of importJSON
Putting information in external JSON files is IMHO not an improvement over the idiomatic style of Nix expressions. The use of JSON doesn't add anything over Nix expressions (in fact it removes expressive power). And scattering package info over lots of little files makes packages less readable over having the info in one file.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/torch/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/torch/src.json | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix index 1b1a100350c..d4c61890afb 100644 --- a/pkgs/development/libraries/torch/default.nix +++ b/pkgs/development/libraries/torch/default.nix @@ -10,7 +10,14 @@ stdenv.mkDerivation rec{ libjpeg zeromq3 ncurses openssl libpng readline pkgconfig zlib libX11 which ]; - src = fetchgit (stdenv.lib.importJSON ./src.json); + + src = fetchgit { + url = "https://github.com/torch/distro"; + rev = "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f"; + sha256 = "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy"; + fetchSubmodules = true; + }; + buildPhase = '' cd .. export PREFIX=$out diff --git a/pkgs/development/libraries/torch/src.json b/pkgs/development/libraries/torch/src.json deleted file mode 100644 index 37c7a20ce54..00000000000 --- a/pkgs/development/libraries/torch/src.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "url": "https://github.com/torch/distro", - "rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f", - "sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy", - "fetchSubmodules": true -} |