commit 770da1783acdb98fdadbb011ef5a912fbc4b4871

+9 -6

pkgs/development/libraries/luabind/default.nix

··· 1 - {lib, stdenv, fetchurl, boost-build, lua, boost}: 1 + { lib, stdenv, fetchFromGitHub, boost-build, lua, boost }: 2 2 3 - stdenv.mkDerivation { 4 - name = "luabind-0.9.1"; 3 + stdenv.mkDerivation rec { 4 + pname = "luabind"; 5 + version = "0.9.1"; 5 6 6 - src = fetchurl { 7 - url = "https://github.com/luabind/luabind/archive/v0.9.1.tar.gz"; 8 - sha256 = "0e5ead50a07668d29888f2fa6f53220f900c886e46a2c99c7e8656842f05ff2d"; 7 + src = fetchFromGitHub { 8 + owner = "luabind"; 9 + repo = "luabind"; 10 + rev = version; 11 + sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag="; 9 12 }; 10 13 11 14 patches = [ ./0.9.1_modern_boost_fix.patch ./0.9.1_boost_1.57_fix.patch ./0.9.1_discover_luajit.patch ];

+5 -3

pkgs/development/libraries/nco/default.nix

··· 1 - { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: 1 + { lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "nco"; 5 5 version = "5.0.3"; 6 6 7 - src = fetchzip { 8 - url = "https://github.com/nco/nco/archive/${version}.tar.gz"; 7 + src = fetchFromGitHub { 8 + owner = "nco"; 9 + repo = "nco"; 10 + rev = version; 9 11 sha256 = "sha256-KrFRBlD3z/sjKIvxmE0s/xCILQmESecilnlUGzDDICw="; 10 12 }; 11 13

+6 -4

pkgs/development/libraries/netcdf-cxx4/default.nix

··· 1 - { lib, stdenv, fetchzip, netcdf, hdf5, curl, cmake, ninja }: 1 + { lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, cmake, ninja }: 2 2 stdenv.mkDerivation rec { 3 3 pname = "netcdf-cxx4"; 4 4 version = "4.3.1"; 5 5 6 - src = fetchzip { 7 - url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz"; 8 - sha256 = "05kydd5z9iil5iv4fp7l11cicda5n5lsg5sdmsmc55xpspnsg7hr"; 6 + src = fetchFromGitHub { 7 + owner = "Unidata"; 8 + repo = "netcdf-cxx4"; 9 + rev = "v${version}"; 10 + sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; 9 11 }; 10 12 11 13 preConfigure = ''

+6 -4

pkgs/development/libraries/netcdf-fortran/default.nix

··· 1 - { lib, stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: 1 + { lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran }: 2 2 stdenv.mkDerivation rec { 3 3 pname = "netcdf-fortran"; 4 4 version = "4.4.5"; 5 5 6 - src = fetchurl { 7 - url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; 8 - sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; 6 + src = fetchFromGitHub { 7 + owner = "Unidata"; 8 + repo = "netcdf-fortran"; 9 + rev = "v${version}"; 10 + sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0="; 9 11 }; 10 12 11 13 nativeBuildInputs = [ gfortran ];

+56 -20

pkgs/development/libraries/ogre/default.nix

··· 1 - { fetchurl, stdenv, lib 2 - , cmake, libGLU, libGL 3 - , freetype, freeimage, zziplib, xorgproto, libXrandr 4 - , libXaw, freeglut, libXt, libpng, boost, ois 5 - , libX11, libXmu, libSM, pkg-config 6 - , libXxf86vm, libICE 1 + { fetchFromGitHub 2 + , stdenv 3 + , lib 4 + , cmake 5 + , libGLU 6 + , libGL 7 + , freetype 8 + , freeimage 9 + , zziplib 10 + , xorgproto 11 + , libXrandr 12 + , libXaw 13 + , freeglut 14 + , libXt 15 + , libpng 16 + , boost 17 + , ois 18 + , libX11 19 + , libXmu 20 + , libSM 21 + , pkg-config 22 + , libXxf86vm 23 + , libICE 7 24 , unzip 8 25 , libXrender 9 26 , SDL2 10 - , withNvidiaCg ? false, nvidia_cg_toolkit 11 - , withSamples ? false }: 27 + , withNvidiaCg ? false 28 + , nvidia_cg_toolkit 29 + , withSamples ? false 30 + }: 12 31 13 32 stdenv.mkDerivation rec { 14 33 pname = "ogre"; 15 34 version = "1.12.1"; 16 35 17 - src = fetchurl { 18 - url = "https://github.com/OGRECave/ogre/archive/v${version}.zip"; 19 - sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; 36 + src = fetchFromGitHub { 37 + owner = "OGRECave"; 38 + repo = "ogre"; 39 + rev = "v${version}"; 40 + sha256 = "sha256-FHW0+DZhw6MLlhjh4DRYhA+6vBBXMN9K6GEVoR6P5kM="; 20 41 }; 21 42 22 43 cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] 23 44 ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") 24 - ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") 45 + ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") 25 46 ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; 26 47 27 48 28 49 nativeBuildInputs = [ cmake unzip pkg-config ]; 29 50 buildInputs = 30 - [ cmake libGLU libGL 31 - freetype freeimage zziplib xorgproto libXrandr 32 - libXaw freeglut libXt libpng boost ois 33 - libX11 libXmu libSM 34 - libXxf86vm libICE 35 - libXrender 36 - SDL2 37 - ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; 51 + [ 52 + cmake 53 + libGLU 54 + libGL 55 + freetype 56 + freeimage 57 + zziplib 58 + xorgproto 59 + libXrandr 60 + libXaw 61 + freeglut 62 + libXt 63 + libpng 64 + boost 65 + ois 66 + libX11 67 + libXmu 68 + libSM 69 + libXxf86vm 70 + libICE 71 + libXrender 72 + SDL2 73 + ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; 38 74 39 75 meta = { 40 76 description = "A 3D engine";

+6 -4

pkgs/development/libraries/ogrepaged/default.nix

··· 1 - { lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: 1 + { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ois, ogre, libX11, boost }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "ogre-paged"; 5 5 version = "1.2.0"; 6 6 7 - src = fetchurl { 8 - url = "https://github.com/RigsOfRods/ogre-pagedgeometry/archive/v${version}.tar.gz"; 9 - sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82"; 7 + src = fetchFromGitHub { 8 + owner = "RigsOfRods"; 9 + repo = "ogre-pagedgeometry"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-EwtTV8cbhDv0Bgj7i3qgq4hLETwd5B2GFEegwozlY9U="; 10 12 }; 11 13 12 14 patches = [

+7 -7

pkgs/development/libraries/openbabel/default.nix

··· 1 - {stdenv, lib, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: 1 + { stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "openbabel"; 5 5 version = "3.1.1"; 6 6 7 - src = fetchurl { 8 - url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz"; 9 - sha256 = "c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02"; 7 + src = fetchFromGitHub { 8 + owner = "openbabel"; 9 + repo = "openbabel"; 10 + rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}"; 11 + sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY="; 10 12 }; 11 - 12 13 13 14 buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; 14 15 ··· 21 22 "-DPYTHON_BINDINGS=ON" 22 23 ]; 23 24 24 - 25 25 postFixup = '' 26 26 cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py 27 27 from distutils.core import setup ··· 33 33 package_data = {'openbabel' : ['_openbabel.so']} 34 34 ) 35 35 EOF 36 - ''; 36 + ''; 37 37 38 38 meta = with lib; { 39 39 description = "A toolbox designed to speak the many languages of chemical data";

+7 -4

pkgs/development/libraries/science/math/openlibm/default.nix

··· 1 - { lib, stdenv, fetchurl }: 1 + { lib, stdenv, fetchFromGitHub }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "openlibm"; 5 5 version = "0.8.0"; 6 - src = fetchurl { 7 - url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; 8 - sha256 = "sha256-A2IHaN9MpSamPdZ1xt6VpcnRZ/9ZVVzlemHGv0nkAO4="; 6 + 7 + src = fetchFromGitHub { 8 + owner = "JuliaLang"; 9 + repo = "openlibm"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-dEM10picZXiPokzSHCfxhS7fwZ0sMjil4bni+PHBCeI="; 9 12 }; 10 13 11 14 makeFlags = [ "prefix=$(out)" ];

+7 -5

pkgs/development/libraries/science/math/primesieve/default.nix

··· 1 - { lib, stdenv, fetchurl, cmake }: 1 + { lib, stdenv, fetchFromGitHub, cmake }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "primesieve"; 5 5 version = "7.6"; 6 6 7 - nativeBuildInputs = [cmake]; 7 + nativeBuildInputs = [ cmake ]; 8 8 9 - src = fetchurl { 10 - url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz"; 11 - sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk="; 9 + src = fetchFromGitHub { 10 + owner = "kimwalisch"; 11 + repo = "primesieve"; 12 + rev = "v${version}"; 13 + sha256 = "sha256-rSNYoWBy80BgPi1c+BSKbWTyGGb7/fxmu+mq1DXakHY="; 12 14 }; 13 15 14 16 meta = with lib; {

+30 -10

pkgs/development/libraries/sfml/default.nix

··· 1 - { lib, stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis 2 - , glew, libXrandr, libXrender, udev, xcbutilimage 3 - , IOKit, Foundation, AppKit, OpenAL 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , libX11 6 + , freetype 7 + , libjpeg 8 + , openal 9 + , flac 10 + , libvorbis 11 + , glew 12 + , libXrandr 13 + , libXrender 14 + , udev 15 + , xcbutilimage 16 + , IOKit 17 + , Foundation 18 + , AppKit 19 + , OpenAL 4 20 }: 5 21 6 22 stdenv.mkDerivation rec { 7 23 pname = "sfml"; 8 24 version = "2.5.1"; 9 25 10 - src = fetchzip { 11 - url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; 12 - sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay"; 26 + src = fetchFromGitHub { 27 + owner = "SFML"; 28 + repo = "SFML"; 29 + rev = version; 30 + sha256 = "sha256-Xt2Ct4vV459AsSvJxQfwMsNs6iA5y3epT95pLWJGeSk="; 13 31 }; 14 32 15 33 nativeBuildInputs = [ cmake ]; ··· 18 36 ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] 19 37 ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; 20 38 21 - cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" 22 - "-DSFML_MISC_INSTALL_PREFIX=share/SFML" 23 - "-DSFML_BUILD_FRAMEWORKS=no" 24 - "-DSFML_USE_SYSTEM_DEPS=yes" ]; 39 + cmakeFlags = [ 40 + "-DSFML_INSTALL_PKGCONFIG_FILES=yes" 41 + "-DSFML_MISC_INSTALL_PREFIX=share/SFML" 42 + "-DSFML_BUILD_FRAMEWORKS=no" 43 + "-DSFML_USE_SYSTEM_DEPS=yes" 44 + ]; 25 45 26 46 meta = with lib; { 27 47 homepage = "https://www.sfml-dev.org/";

+9 -4

pkgs/development/libraries/stxxl/default.nix

··· 1 - { lib, stdenv, fetchurl, cmake 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 2 5 , parallel ? true 3 6 }: 4 7 ··· 10 13 pname = "stxxl"; 11 14 version = "1.4.1"; 12 15 13 - src = fetchurl { 14 - url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz"; 15 - sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c"; 16 + src = fetchFromGitHub { 17 + owner = "stxxl"; 18 + repo = "stxxl"; 19 + rev = version; 20 + sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I="; 16 21 }; 17 22 18 23 nativeBuildInputs = [ cmake ];

+6 -4

pkgs/development/libraries/vaapi-intel-hybrid/default.nix

··· 1 - { lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: 1 + { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "intel-hybrid-driver"; 5 5 version = "1.0.2"; 6 6 7 - src = fetchurl { 8 - url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz"; 9 - sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n"; 7 + src = fetchFromGitHub { 8 + owner = "01org"; 9 + repo = "intel-hybrid-driver"; 10 + rev = version; 11 + sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8="; 10 12 }; 11 13 12 14 patches = [

+42 -12

pkgs/development/libraries/vigra/default.nix

··· 1 - { lib, stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase 2 - , libjpeg, libpng, libtiff, openexr, python2Packages }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , fetchurl 5 + , boost 6 + , cmake 7 + , fftw 8 + , fftwSinglePrec 9 + , hdf5 10 + , ilmbase 11 + , libjpeg 12 + , libpng 13 + , libtiff 14 + , openexr 15 + , python2Packages 16 + }: 3 17 4 18 let 5 19 inherit (python2Packages) python numpy; 6 20 # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... 7 - in stdenv.mkDerivation rec { 21 + in 22 + stdenv.mkDerivation rec { 8 23 pname = "vigra"; 9 24 version = "1.11.1"; 10 25 11 - src = fetchurl { 12 - url = "https://github.com/ukoethe/vigra/archive/Version-${lib.replaceChars ["."] ["-"] version}.tar.gz"; 13 - sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj"; 26 + src = fetchFromGitHub { 27 + owner = "ukoethe"; 28 + repo = "vigra"; 29 + rev = "Version-${lib.replaceChars ["."] ["-"] version}"; 30 + sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk="; 14 31 }; 15 32 16 33 NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; 17 34 18 35 # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414 19 36 patches = 20 - let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch"; 21 - sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; }; 37 + let clangPatch = fetchurl { 38 + url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch"; 39 + sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; 40 + }; 22 41 in [ clangPatch ]; 23 42 24 43 nativeBuildInputs = [ cmake ]; 25 - buildInputs = [ boost fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng 26 - libtiff numpy openexr python ]; 44 + buildInputs = [ 45 + boost 46 + fftw 47 + fftwSinglePrec 48 + hdf5 49 + ilmbase 50 + libjpeg 51 + libpng 52 + libtiff 53 + numpy 54 + openexr 55 + python 56 + ]; 27 57 28 58 preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; 29 59 30 60 cmakeFlags = [ "-DWITH_OPENEXR=1" ] 31 - ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") 32 - [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; 61 + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") 62 + [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; 33 63 34 64 # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" 35 65 doCheck = false;

+11 -10

pkgs/development/libraries/vo-amrwbenc/default.nix

··· 1 - { lib, stdenv, fetchurl, autoreconfHook }: 1 + { lib, stdenv, fetchFromGitHub, autoreconfHook }: 2 2 3 - let 4 - version = "0.1.3"; 5 - in 6 - stdenv.mkDerivation { 7 - name = "vo-amrwbenc-${version}"; 3 + stdenv.mkDerivation rec{ 4 + pname = "vo-amrwbenc"; 8 5 version = "0.1.3"; 9 - buildInputs = [ autoreconfHook ]; 10 - src = fetchurl { 11 - url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz"; 12 - sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "mstorsjo"; 9 + repo = "vo-amrwbenc"; 10 + rev = "v${version}"; 11 + sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w="; 13 12 }; 13 + 14 + nativeBuildInputs = [ autoreconfHook ]; 14 15 15 16 meta = { 16 17 homepage = "https://sourceforge.net/projects/opencore-amr/";

+6 -4

pkgs/development/mobile/imgpatchtools/default.nix

··· 1 - { lib, stdenv, fetchzip, bzip2, openssl, zlib }: 1 + { lib, stdenv, fetchFromGitHub, bzip2, openssl, zlib }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "imgpatchtools"; 5 5 version = "0.3"; 6 6 7 - src = fetchzip { 8 - url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz"; 9 - sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd"; 7 + src = fetchFromGitHub { 8 + owner = "erfanoabdi"; 9 + repo = "imgpatchtools"; 10 + rev = version; 11 + sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M="; 10 12 }; 11 13 12 14 buildInputs = [ bzip2 openssl zlib ];