diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-30 18:39:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-30 18:39:36 +0100 |
| commit | 9cd2dbc569e08afde0a36bec51b603b5f97a6ca2 (patch) | |
| tree | c1e0e00cdc3447e4c528b4e92b05e17be3c2ec50 /pkgs/development/libraries | |
| parent | cc07ec890d0e7b31d7154f1bce6d3ba19aae5a1e (diff) | |
| parent | 49b136377a93391f8fb2c80b9d14852dd531bb6c (diff) | |
| download | nixpkgs-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar nixpkgs-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.gz nixpkgs-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.bz2 nixpkgs-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.lz nixpkgs-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.xz nixpkgs-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.zst nixpkgs-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.zip | |
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra; restarting the jobs didn't help.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/sdformat/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/torch/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/torch/src.json | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix index 692de29afd7..f81eb9b259e 100644 --- a/pkgs/development/libraries/sdformat/default.nix +++ b/pkgs/development/libraries/sdformat/default.nix @@ -1,13 +1,10 @@ -{ stdenv, fetchurl, cmake, boost, ruby_1_9, ignition, tinyxml +{ stdenv, fetchurl, cmake, boost, ruby, ignition, tinyxml , name ? "sdformat-${version}" , version ? "4.0.0" # versions known to work with this expression include 3.7.0 , srchash-sha256 ? "b0f94bb40b0d83e35ff250a7916fdfd6df5cdc1e60c47bc53dd2da5e2378163e" , ... }: -let - ruby = ruby_1_9; -in stdenv.mkDerivation rec { src = fetchurl { url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2"; @@ -26,6 +23,7 @@ stdenv.mkDerivation rec { ]; meta = { + broken = true; platforms = stdenv.lib.platforms.unix; }; } 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 -} |