diff options
Diffstat (limited to 'pkgs/development/tools')
57 files changed, 1150 insertions, 476 deletions
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 0d961ab5c23c..fc1e8e5d54ec 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.17"; + version = "6.18"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "1cfcjz1fg9ilqqaqlbzd5n7nsx1kzy6sabjp92b9d8mwy15bn5ql"; + sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 50583f65f602..2e01e4d8f28e 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ]; buildInputs = [ clang llvmPackages.clang perl makeWrapper ]; - buildPhase = "true"; + + dontBuild = true; installPhase = '' mkdir -p $out/bin $out/libexec diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index b20662c889ab..778aaa90cbe9 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = http://cppcheck.sourceforge.net/; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ simons joachifm ]; + maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 374f0fee3f11..bd3f33d169a1 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.5"; + version = "0.6"; src = fetchurl { - sha256 = "19pwhgwvfr86n8ks099p9r02v7zh8d3qs7g7snzkhpdgq1azww85"; + sha256 = "0n3z4pfbby0rl338irbs4yvcmjfnza82xg9a8r9amyl0bkfasbxb"; url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 4a33a0cd8f33..00eb5b9afc13 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "code coverage tester for compiled programs, Python scripts and shell scripts"; - longDescription = - '' Kcov is a code coverage tester for compiled programs, Python + longDescription = '' + Kcov is a code coverage tester for compiled programs, Python scripts and shell scripts. It allows collecting code coverage information from executables without special command-line arguments, and continuosly produces output from long-running applications. - ''; + ''; - homePage = http://simonkagstrom.github.io/kcov/index.html; + homepage = http://simonkagstrom.github.io/kcov/index.html; license = licenses.gpl2; maintainers = [ maintainers.gal_bolle ]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index b0950fb8cb24..4ad19b615f9a 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ]; - cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; + cmakeFlags = [ + "-DCMAKE_C_FLAGS_RELEASE:STRING=" + "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" + "-Ddisable32bit=ON" + ]; # we turn on additional warnings due to hardening NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 6542c9ae3c52..885e10b465ae 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" + CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ p p.out ]) buildInputs); configureFlags = @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { source $setupHook fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${glibc.bin or glibc} \ - --subst-var-by glibc_dev ${glibc.dev or glibc} \ - --subst-var-by glibc_lib ${glibc.out or glibc} + --subst-var-by glibc_bin ${getBin glibc} \ + --subst-var-by glibc_dev ${getDev glibc} \ + --subst-var-by glibc_lib ${getLib glibc} ''; meta = { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9d0ff6e1f174..32e16751395a 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { optional (stdenv ? glibc) ./search-path-3.2.patch ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; - outputs = [ "out" "doc" ]; + outputs = [ "out" ]; setOutputFlags = false; setupHook = ./setup-hook.sh; @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { '' fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${glibc.bin or glibc} \ - --subst-var-by glibc_dev ${glibc.dev or glibc} \ - --subst-var-by glibc_lib ${glibc.out or glibc} + --subst-var-by glibc_bin ${getBin glibc} \ + --subst-var-by glibc_dev ${getDev glibc} \ + --subst-var-by glibc_lib ${getLib glibc} ''; configureFlags = - [ "--docdir=/share/doc/${name}" + [ "--docdir=share/doc/${name}" "--no-system-jsoncpp" ] ++ optional (!stdenv.isCygwin) "--system-libs" @@ -64,10 +64,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preInstall = ''mkdir "$doc" ''; - - postInstall = ''moveToOutput "share/cmake-*/Help" "$doc" ''; - meta = with stdenv.lib; { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix index de6f96ce99f6..7c45a6c8e674 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation { to build and install the program. ''; - maintainers = with stdenv.lib.maintainers; [ simons ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 730d42073759..1ef53867cb15 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -4,7 +4,7 @@ rec { gradleGen = {name, src} : stdenv.mkDerivation rec { inherit name src; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir -pv $out/lib/gradle/ @@ -51,11 +51,11 @@ rec { }; gradleLatest = gradleGen rec { - name = "gradle-2.12"; + name = "gradle-2.13"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0p5b6dngza6c2lchz5j0w4cbsizpzvkf638yzxv09k8636c68w77"; + sha256 = "0r5nrgrb14fi1p4cx5q5x82nghhrzdd843dsyzx6ay56lp35wrhg"; }; }; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 417ab348c405..19dbdb76a360 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation { software. ''; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index ca154469dfd0..827fb4e05a50 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.653"; + version = "2.3"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1z24vddr8v64g4x3s7qx5n30sjcm2xpz7mn23zlc0n8lhnmkzqs8"; + sha256 = "0x59dbvh6y25ki5jy51djbfbhf8g2j3yd9f3n66f7bkdfw8p78g1"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 7373d8584c23..bf9fb4f30352 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { manual (in LaTeX) from a set of documented source files. ''; - maintainers = [stdenv.lib.maintainers.simons]; platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index 724942c57c83..e2996b030ef8 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -33,5 +33,5 @@ mkDerivation rec { homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; } diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 870f3d40961e..edaec9c257a8 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -29,5 +29,5 @@ mkDerivation rec { homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Data types and functions to manipulate the Nixpkgs distribution"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; } diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index 461cf464f454..56cd1d29dde4 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -32,5 +32,5 @@ mkDerivation rec { homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; } diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 44491fa0ef98..faf1bd6d9bde 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -7,12 +7,12 @@ }: mkDerivation { pname = "tinc"; - version = "20160419"; + version = "20160511"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "b9f7cc1076098b1f99f20655052c9fd34598d891"; - sha256 = "1f0k7a4vxdd2cd2h5qwska9hfw7ig6q2rx87d09fg2xlix96g81r"; + rev = "405af997c182b89edfc9656612c32616e98c7862"; + sha256 = "0zryw3abp64922dnk6jss58lq4k7ijwbbn35zh5vbg3ns8307k6b"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 5be4f4a27ab4..7671bf18063b 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi, check -, libserialport, librevisa +, libserialport, librevisa, doxygen, glibmm, python +, version ? "0.4.0", sha256 ? "17k63p3yhpx9qbfprgayphqqhn2hdrcph73g6fqxmrinxqziyaaz" }: stdenv.mkDerivation rec { - name = "libsigrok-0.3.0"; + inherit version; + name = "libsigrok-${version}"; src = fetchurl { url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz"; - sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; + inherit sha256; }; firmware = fetchurl { - url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz"; - sha256 = "0w0w6l015d16181mx8mgyjha4bv3ba7x36p86k9n1x52809433gj"; + url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz"; + sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl"; }; buildInputs = [ pkgconfig libzip glib libusb1 libftdi check libserialport - librevisa + librevisa doxygen glibmm python ]; postInstall = '' diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 87ecd637b4e2..706b9bde3273 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.3.0"; + name = "libsigrokdecode-0.4.0"; src = fetchurl { url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "13s7ss52dqj7fccjgrkx10zkj41ygxn8ml1l0bs1vgczz4fvnkpf"; + sha256 = "0drmxjc2xavccjl2i6vcjipijrn7459nv8cpmm788pi4fcdrszpx"; }; buildInputs = [ pkgconfig glib python3 libsigrok check ]; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 3951212495d4..fb1e4a8ca4b5 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 31bd4fb1c433..70dccdcd626f 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, xz }: + stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2015.09.25"; + version = "2016.03.20"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "02im1jn0igzn2qpxkgiwxvcm3jgvjaypg955pi9h2d6jvfjnf13w"; + sha256 = "0dz4fnc723jqn3by22ds5fys7g31apzm1r9allldvva0yvzjxyw8"; }; + buildInputs = [ xz ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index d2ddcabc0b1e..8170fc46f340 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autogen-${version}"; - version = "5.18.6"; + version = "5.18.7"; src = fetchurl { - url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz"; - sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs"; + url = "mirror://gnu/autogen/autogen-${version}.tar.xz"; + sha256 = "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7"; }; outputs = [ "dev" "bin" "lib" "out" "man" "info" ]; diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 96a481ade1c1..77fe2b7b92c2 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index c78e9e6c0a41..fd074e6b96c8 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index 9db2375a5c63..3c4a8d1189e4 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index f344156f6bc5..bc1f348040cd 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -20,9 +20,14 @@ let ccache = stdenv.mkDerivation rec { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig: (runCommand "ccache-links" - { passthru.gcc = gcc; passthru.isGNU = true; } - '' + links = extraConfig: stdenv.mkDerivation rec { + name = "ccache-links"; + passthru = { + inherit gcc; + isGNU = true; + }; + inherit (gcc.cc) lib; + buildCommand = '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF @@ -48,7 +53,8 @@ let ccache = stdenv.mkDerivation rec { for file in $(ls ${gcc.cc} | grep -vw bin); do ln -s ${gcc.cc}/$file $out/$file done - ''); + ''; + }; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 35c332f28773..60a0370e86e2 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "complexity-${version}"; - version = "1.3"; + version = "1.10"; src = fetchurl { url = "mirror://gnu/complexity/${name}.tar.gz"; - sha256 = "19bc64sxpqd5rqylqaa7dijz2x7qp2b0dg3ah3fb3qbcvd8b4wgy"; + sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522"; }; buildInputs = [ autogen ]; diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 584095c904d5..af40f3df20fa 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { ''; homepage = http://ctags.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ simons ]; platforms = platforms.unix; # So that Exuberant ctags is preferred over emacs's ctags diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index e1a3a8223f23..783607860dec 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -2,7 +2,7 @@ , pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }: let - version = "${major}.10"; + version = "${major}.11"; major = "0.3"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; - sha256 = "88f0df5fcb862387ff3d1793873c5eb368c3e4db0bbd82ea65f748cbf70a6359"; + sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; }; buildInputs = [ diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index ed3ad45c463a..26acd085bb85 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -75,7 +75,7 @@ let license = "GPL"; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons anderspapitto ]; + maintainers = with stdenv.lib.maintainers; [ anderspapitto ]; }; }; in diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 79f7445af478..20aa8b1aa1bc 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -8,10 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf"; }; - doCheck = !stdenv.isDarwin - && !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin - && !stdenv.isSunOS # XXX: `test-setlocale2.sh' fails - && !stdenv.isFreeBSD; # XXX: test 084 fails + doCheck = false; configureFlags = "--with-syscmd-shell=${stdenv.shell}"; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 8f687908017f..6839335245fc 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.3"; + name = "help2man-1.47.4"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 53020671d17e..cd027c7b08d7 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -8,15 +8,15 @@ { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor -, freetype, libXinerama -, makeDesktopItem +, freetype, libXinerama, libxcb, zlib, pciutils +, makeDesktopItem, xkeyboardconfig }: let libPath = stdenv.lib.makeLibraryPath [ glib libSM libICE gtk libXext libXft fontconfig libXrender libXfixes libX11 - libXi libXrandr libXcursor freetype libXinerama + libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib ]; in @@ -25,21 +25,21 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.1.15"; + version = "1.2.9"; name = "${pname}-${version}"; src = if stdenv.system == "i686-linux" then fetchurl { - name = "saleae-logic-${version}-32bit.zip"; - url = "http://downloads.saleae.com/Logic%20${version}%20(32-bit).zip"; - sha256 = "0h13my4xgv8v8l12shimhhn54nn0dldbxz1gpbx92ysd8q8x1q79"; + name = "saleae-logic-${version}-32bit.zip"; + url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip"; + sha256 = "0000004xgv8v8l12shimhhn54nn0dldbxz1gpbx92ysd8q8x1q79"; } else if stdenv.system == "x86_64-linux" then fetchurl { - name = "saleae-logic-${version}-64bit.zip"; - url = "http://downloads.saleae.com/Logic%20${version}%20(64-bit).zip"; - sha256 = "1phnjsmaj1gflx7shh8wfrd8dnhn43s3v7bck41h8yj4nd4ax69z"; + name = "saleae-logic-${version}-64bit.zip"; + url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; + sha256 = "1d4hmp756ysfk5i1ys4mlkd1czbdw0zqznkzx08pyqk93zc7b16s"; } else abort "Saleae Logic software requires i686-linux or x86_64-linux"; @@ -74,6 +74,8 @@ stdenv.mkDerivation rec { cat > "$out/bin/saleae-logic" << EOF #!${stdenv.shell} export LD_PRELOAD="$out/lib/preload.so" + export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" + export PATH="${pciutils}/bin:\$PATH" exec "$out/Logic" "\$@" EOF chmod a+x "$out"/bin/saleae-logic diff --git a/pkgs/development/tools/misc/saleae-logic/preload.c b/pkgs/development/tools/misc/saleae-logic/preload.c index 6b3632db97bb..b4451e4d99f7 100644 --- a/pkgs/development/tools/misc/saleae-logic/preload.c +++ b/pkgs/development/tools/misc/saleae-logic/preload.c @@ -2,17 +2,20 @@ * LD_PRELOAD trick to make Saleae Logic work from a read-only installation * directory. * - * Saleae Logic tries to write to the ./Settings/settings.xml file, relative to - * its installation directory. Because the nix store is read-only, we have to - * redirect access to this file somewhere else. Here's the map: + * Saleae Logic tries to write to a few directories inside its installation + * directory. Because the Nix store is read-only, we have to redirect access to + * this file somewhere else. Here's the map: * - * $out/Settings/settings.xml => $HOME/.saleae-logic-settings.xml + * $out/Settings/ => $HOME/.saleae-logic/Settings/ + * $out/Databases/ => $HOME/.saleae-logic/Databases/ + * $out/Errors/ => $HOME/.saleae-logic/Errors/ + * $out/Calibration/ => $HOME/.saleae-logic/Calibration/ * * This also makes the software multi-user aware :-) * - * NOTE: The next Logic version is supposed to have command line parameters for - * configuring where the Settings/ directory is located, but until then we have - * to use this. + * NOTE: AFAIK (Bjørn Forsman), Logic version 1.2+ was supposed to have a + * command line parameter for redirecting these write operations, but + * apparently that feature got postponed. * * Usage: * gcc -shared -fPIC -DOUT="$out" preload.c -o preload.so -ldl @@ -33,30 +36,65 @@ #include <limits.h> #include <sys/stat.h> #include <sys/types.h> +#include <errno.h> #ifndef OUT #error Missing OUT define - path to the installation directory. #endif +/* + * TODO: How to properly wrap "open", which is declared as a variadic function + * in glibc? The man page lists these signatures: + * + * int open(const char *pathname, int flags); + * int open(const char *pathname, int flags, mode_t mode); + * + * But using either signature in this code cause a compile error, because + * glibc has declared the function as "int open(const char *, int, ...)". + * Same thing with "openat". + * + * For now we discard the variadic args. It seems to work. + * + * Relevant: + * http://stackoverflow.com/questions/28462523/how-to-wrap-ioctlint-d-unsigned-long-request-using-ld-preload + */ typedef FILE *(*fopen_func_t)(const char *path, const char *mode); typedef FILE *(*fopen64_func_t)(const char *path, const char *mode); +typedef int (*open_func_t)(const char *pathname, int flags, ...); +typedef int (*open64_func_t)(const char *pathname, int flags, ...); +typedef int (*openat_func_t)(int dirfd, const char *pathname, int flags, ...); +typedef int (*openat64_func_t)(int dirfd, const char *pathname, int flags, ...); +typedef int (*xstat_func_t)(int vers, const char *pathname, struct stat *buf); +typedef int (*xstat64_func_t)(int vers, const char *pathname, struct stat64 *buf); +typedef int (*access_func_t)(const char *pathname, int mode); +typedef int (*faccessat_func_t)(int dirfd, const char *pathname, int mode, int flags); +typedef int (*unlink_func_t)(const char *pathname); /* - * Redirect $out/Settings/settings.xml => $HOME/.saleae-logic-settings.xml. No - * other paths are changed. Path is truncated if bigger than PATH_MAX. + * Redirect $out/{Settings,Databases,Errors,Calibration}/ => $HOME/.saleae-logic/. + * Path is truncated if bigger than PATH_MAX. * * @param pathname Original file path. * @param buffer Pointer to a buffer of size PATH_MAX bytes that this function * will write the new redirected path to (if needed). * * @return Pointer to the resulting path. It will either be equal to the - * pathname or buffer argument. + * pathname (no redirect) or buffer argument (was redirected). */ static const char *redirect(const char *pathname, char *buffer) { const char *homepath; const char *new_path; static char have_warned; + const char *remainder; + static char have_initialized; + static size_t out_strlen; + static size_t settings_strlen; + static size_t databases_strlen; + static size_t errors_strlen; + static size_t calibration_strlen; + int ret; + int i; homepath = getenv("HOME"); if (!homepath) { @@ -67,9 +105,59 @@ static const char *redirect(const char *pathname, char *buffer) } } + if (!have_initialized) { + /* + * The directories that Saleae Logic expects to find. + * The first element is intentionally empty (create base dir). + */ + char *dirs[] = {"", "/Settings", "/Databases", "/Errors", "/Calibration"}; + char old_settings_path[PATH_MAX]; + access_func_t orig_access; + + out_strlen = strlen(OUT); + settings_strlen = out_strlen + strlen("/Settings"); + databases_strlen = out_strlen + strlen("/Databases"); + errors_strlen = out_strlen + strlen("/Errors"); + calibration_strlen = out_strlen + strlen("/Calibration"); + for (i = 0; i < sizeof dirs / sizeof dirs[0]; i++) { + snprintf(buffer, PATH_MAX, "%s/.saleae-logic%s", homepath, dirs[i]); + buffer[PATH_MAX-1] = '\0'; + ret = mkdir(buffer, 0755); + if (0 != ret && errno != EEXIST) { + fprintf(stderr, "ERROR: Failed to create directory \"%s\": %s\n", + buffer, strerror(errno)); + return NULL; + } + } + + /* + * Automatic migration of the settings file: + * ~/.saleae-logic-settings.xml => ~/.saleae-logic/Settings/settings.xml + */ + snprintf(old_settings_path, PATH_MAX, "%s/.saleae-logic-settings.xml", homepath); + old_settings_path[PATH_MAX-1] = '\0'; + orig_access = (access_func_t)dlsym(RTLD_NEXT, "access"); + if (orig_access(old_settings_path, F_OK) == 0) { + snprintf(buffer, PATH_MAX, "%s/.saleae-logic/Settings/settings.xml", homepath); + buffer[PATH_MAX-1] = '\0'; + ret = rename(old_settings_path, buffer); + if (ret != 0) { + fprintf(stderr, "WARN: Failed to move %s to %s", + old_settings_path, buffer); + } + } + + have_initialized = 1; + } + new_path = pathname; - if (strcmp(OUT "/Settings/settings.xml", pathname) == 0) { - snprintf(buffer, PATH_MAX, "%s/.saleae-logic-settings.xml", homepath); + remainder = pathname + out_strlen; + + if ((strncmp(OUT "/Settings", pathname, settings_strlen) == 0) || + (strncmp(OUT "/Databases", pathname, databases_strlen) == 0) || + (strncmp(OUT "/Errors", pathname, errors_strlen) == 0) || + (strncmp(OUT "/Calibration", pathname, calibration_strlen) == 0)) { + snprintf(buffer, PATH_MAX, "%s/.saleae-logic%s", homepath, remainder); buffer[PATH_MAX-1] = '\0'; new_path = buffer; } @@ -79,36 +167,175 @@ static const char *redirect(const char *pathname, char *buffer) FILE *fopen(const char *pathname, const char *mode) { - FILE *fp; const char *path; char buffer[PATH_MAX]; fopen_func_t orig_fopen; orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen"); path = redirect(pathname, buffer); - fp = orig_fopen(path, mode); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: fopen(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp); + fprintf(stderr, "preload_debug: fopen(\"%s\", \"%s\") => \"%s\"\n", pathname, mode, path); } - return fp; + return orig_fopen(path, mode); } FILE *fopen64(const char *pathname, const char *mode) { - FILE *fp; const char *path; char buffer[PATH_MAX]; fopen64_func_t orig_fopen64; orig_fopen64 = (fopen64_func_t)dlsym(RTLD_NEXT, "fopen64"); path = redirect(pathname, buffer); - fp = orig_fopen64(path, mode); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: fopen64(\"%s\", \"%s\") => \"%s\"\n", pathname, mode, path); + } + + return orig_fopen64(path, mode); +} + +int open(const char *pathname, int flags, ...) +{ + const char *path; + char buffer[PATH_MAX]; + open_func_t orig_open; + + orig_open = (open_func_t)dlsym(RTLD_NEXT, "open"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: open(\"%s\", ...) => \"%s\"\n", pathname, path); + } + + return orig_open(path, flags); +} + +int open64(const char *pathname, int flags, ...) +{ + const char *path; + char buffer[PATH_MAX]; + open64_func_t orig_open64; + + orig_open64 = (open64_func_t)dlsym(RTLD_NEXT, "open64"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: open64(\"%s\", ...) => \"%s\"\n", pathname, path); + } + return orig_open64(path, flags); +} + +int openat(int dirfd, const char *pathname, int flags, ...) +{ + const char *path; + char buffer[PATH_MAX]; + openat_func_t orig_openat; + + orig_openat = (openat_func_t)dlsym(RTLD_NEXT, "openat"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: openat(%d, \"%s\", %#x) => \"%s\"\n", dirfd, pathname, flags, path); + } + + return orig_openat(dirfd, path, flags); +} + +int openat64(int dirfd, const char *pathname, int flags, ...) +{ + const char *path; + char buffer[PATH_MAX]; + openat64_func_t orig_openat64; + + orig_openat64 = (openat64_func_t)dlsym(RTLD_NEXT, "openat64"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: openat64(%d, \"%s\", %#x) => \"%s\"\n", dirfd, pathname, flags, path); + } + + return orig_openat64(dirfd, path, flags); +} + +/* + * Notes about "stat". + * + * The stat function is special, at least in glibc, in that it cannot be + * directly overridden by LD_PRELOAD, due to it being inline wrapper around + * __xstat. The __xstat functions take one extra parameter, a version number, + * to indicate what "struct stat" should look like. This trick allows changing + * the contents of mode_t without changing the shared library major number. See + * sys/stat.h header for more info. + */ +int __xstat(int vers, const char *pathname, struct stat *buf) +{ + const char *path; + char buffer[PATH_MAX]; + xstat_func_t orig_xstat; + + orig_xstat = (xstat_func_t)dlsym(RTLD_NEXT, "__xstat"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: (__x)stat(\"%s\", ...) => \"%s\"\n", pathname, path); + } + + return orig_xstat(vers, path, buf); +} + +int __xstat64(int vers, const char *pathname, struct stat64 *buf) +{ + const char *path; + char buffer[PATH_MAX]; + xstat64_func_t orig_xstat64; + + orig_xstat64 = (xstat64_func_t)dlsym(RTLD_NEXT, "__xstat64"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: (__x)stat64(\"%s\", ...) => \"%s\"\n", pathname, path); + } + + return orig_xstat64(vers, path, buf); +} + +int access(const char *pathname, int mode) +{ + const char *path; + char buffer[PATH_MAX]; + access_func_t orig_access; + + orig_access = (access_func_t)dlsym(RTLD_NEXT, "access"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: access(\"%s\", ...) => \"%s\"\n", pathname, path); + } + + return orig_access(path, mode); +} + +int faccessat(int dirfd, const char *pathname, int mode, int flags) +{ + const char *path; + char buffer[PATH_MAX]; + faccessat_func_t orig_faccessat; + + orig_faccessat = (faccessat_func_t)dlsym(RTLD_NEXT, "faccessat"); + path = redirect(pathname, buffer); + if (path != pathname && getenv("PRELOAD_DEBUG")) { + fprintf(stderr, "preload_debug: faccessat(\"%s\", ...) => \"%s\"\n", pathname, path); + } + + return orig_faccessat(dirfd, path, mode, flags); +} + +int unlink(const char *pathname) +{ + const char *path; + char buffer[PATH_MAX]; + unlink_func_t orig_unlink; + + orig_unlink = (unlink_func_t)dlsym(RTLD_NEXT, "unlink"); + path = redirect(pathname, buffer); if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: fopen64(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp); + fprintf(stderr, "preload_debug: unlink(\"%s\") => \"%s\"\n", pathname, path); } - return fp; + return orig_unlink(path); } diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index 0a1032cecf81..bcdba402b2e0 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -1,9 +1,13 @@ { name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }: + stdenv.mkDerivation { name = "${name}-${sqitchModule.version}"; + buildInputs = [ perl makeWrapper sqitchModule databaseModule ]; - unpackPhase = ":"; - buildPhase = ":"; + + src = sqitchModule; + dontBuild = true; + installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix new file mode 100644 index 000000000000..91b343b20b4c --- /dev/null +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, libusb1, usb-modeswitch }: + +let + version = "20160112"; +in + +stdenv.mkDerivation rec { + name = "usb-modeswitch-data-${version}"; + + src = fetchurl { + url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + sha256 = "19yzqv0592b9mwgdi7apzw881q70ajyx5d56zr1z5ldi915a8yfn"; + }; + + # make clean: we always build from source. It should be necessary on x86_64 only + prePatch = '' + sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules + sed -i "1 i\DESTDIR=$out" Makefile + ''; + + buildInputs = [ pkgconfig libusb1 usb-modeswitch ]; + + meta = { + description = "device database and the rules file for 'multi-mode' USB devices"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index cc28b011829c..9aad2edfa4ec 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: let - version = "2.2.1"; + version = "2.3.0"; in stdenv.mkDerivation rec { @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { + description = "a mode switching tool for controlling 'multi-mode' USB devices"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 69270f8a5181..9ff9b05b5ed1 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.08.00"; + version = "3.08.01"; buildInputs = [ perl icmake ]; src = fetchFromGitHub { - sha256 = "107jhywx0xdyp7yll1c5zwngzjl3yvg1b4yan8wl2acnbrv6hwa4"; + sha256 = "0sks4phdy8qf6lmbjardrk0gl4v7crr4vjdgwpkkc8d5lzvcx7j5"; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 83dd74d321ec..bb44bbc8d6ee 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.14"; + name = "camlp5${if transitional then "_transitional" else ""}-6.16"; src = fetchurl { - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz; - sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89"; + url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz; + sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 70d90752aceb..6dcf05222320 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -2,11 +2,11 @@ ocamlmod, ocamlify, ounit, expect}: stdenv.mkDerivation { - name = "ocaml-oasis-0.4.5"; + name = "ocaml-oasis-0.4.6"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1475/oasis-0.4.5.tar.gz; - sha256 = "0i1fifzig2slhb07d1djx6i690b8ys0avsx6ssnihisw841sc8v6"; + url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz; + sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 716b489d3d77..fc8ef5ff964a 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,35 +1,53 @@ -{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ stdenv, lib, go, gox, goPackages, fetchFromGitHub +, fetchgit, fetchhg, fetchbzr, fetchsvn }: stdenv.mkDerivation rec { - name = "packer-0.8.6"; + name = "packer-${version}"; + version = "0.10.1"; src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn; }; - buildInputs = [ go gox ]; + buildInputs = [ go gox goPackages.tools ]; - installPhase = '' - export GOPATH=$src - XC_ARCH=$(go env GOARCH) - XC_OS=$(go env GOOS) + configurePhase = '' + export GOPATH=$PWD/share/go + export XC_ARCH=$(go env GOARCH) + export XC_OS=$(go env GOOS) - mkdir -p $out/bin + mkdir $GOPATH/bin + + cd $GOPATH/src/github.com/mitchellh/packer + + # Don't fetch the deps + substituteInPlace "Makefile" --replace ': deps' ':' + + # Avoid using git + sed \ + -e "s|GITBRANCH:=.*||" \ + -e "s|GITSHA:=.*|GITSHA=${src.rev}|" \ + -i Makefile + sed \ + -e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \ + -e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \ + -i "scripts/build.sh" + ''; + + buildPhase = '' + make generate releasebin + ''; - cd $src/src/github.com/mitchellh/packer - gox \ - -os="''${XC_OS}" \ - -arch="''${XC_ARCH}" \ - -output "$out/bin/packer-{{.Dir}}" \ - ./... - mv $out/bin/packer{*packer*,} + installPhase = '' + mkdir -p $out/bin + mv bin/* $out/bin ''; meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; - homepage = "http://www.packer.io"; + homepage = http://www.packer.io; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan zimbatm ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index 5f8e69679c18..2be1911cf91b 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -1,507 +1,572 @@ # This file was generated by go2nix. -{ stdenv, lib, fetchFromGitHub, fetchgit, fetchhg, fetchbzr }: +{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: -let - goDeps = [ - { - root = "github.com/mitchellh/packer"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "packer"; - rev = "f8f7b7a34c1be06058f5aca23a51247db12cdbc5"; - sha256 = "162ja4klyb3nv44rhdg2gd3xrr4n0l0gi49cn1mr1s2h9yznphyp"; - }; - } +with goPackages; + +buildGoPackage rec { + name = "packer-${version}"; + version = "20160507-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; + + buildInputs = [ go gox goPackages.tools ]; + + goPackagePath = "github.com/mitchellh/packer"; + + src = fetchgit { + inherit rev; + url = "https://github.com/mitchellh/packer"; + sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10"; + }; + + extraSrcs = [ { - root = "github.com/mitchellh/gox"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "gox"; - rev = "ef1967b9f538fe467e6a82fc42ec5dff966ad4ea"; - sha256 = "0i9s8fp6m2igx93ffv3rf5v5hz7cwrx7pbxrz4cg94hba3sy3nfj"; + goPackagePath = "github.com/ActiveState/tail"; + + src = fetchgit { + url = "https://github.com/ActiveState/tail"; + rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c"; + sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d"; }; } { - root = "github.com/mitchellh/iochan"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "iochan"; - rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; - sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + + src = fetchgit { + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "a1883f7b98346e4908a6c25230c95a8a3026a10c"; + sha256 = "0pxqi0b8qwcc687si3zh6w1d594rxd6kn2wzx23clbp2nc5w3wf4"; }; } { - root = "github.com/hashicorp/atlas-go"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "atlas-go"; - rev = "d1d08e8e25f0659388ede7bb8157aaa4895f5347"; - sha256 = "0bbqh94i8qllp51ln1mmcjy5srny7s4xg0l353kccvk3c7s68m03"; + goPackagePath = "github.com/Azure/go-autorest"; + + src = fetchgit { + url = "https://github.com/Azure/go-autorest"; + rev = "b01ec2b60f95678fa759f796bac3c6b9bceaead4"; + sha256 = "1vqwy4m26ps5lmp066zgiz04s7r2dwa832zjlfmpgha7id16pa0c"; }; } { - root = "github.com/hashicorp/go-checkpoint"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-checkpoint"; - rev = "88326f6851319068e7b34981032128c0b1a6524d"; - sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4"; + goPackagePath = "github.com/Azure/go-ntlmssp"; + + src = fetchgit { + url = "https://github.com/Azure/go-ntlmssp"; + rev = "e0b63eb299a769ea4b04dadfe530f6074b277afb"; + sha256 = "19bn9ds12cyf8y3w5brnxwg8lwdkg16ww9hmnq14y2kmli42l14m"; }; } { - root = "github.com/hashicorp/go-msgpack"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-msgpack"; - rev = "fa3f63826f7c23912c15263591e65d54d080b458"; - sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"; + goPackagePath = "github.com/armon/go-radix"; + + src = fetchgit { + url = "https://github.com/armon/go-radix"; + rev = "4239b77079c7b5d1243b7b4736304ce8ddb6f0f2"; + sha256 = "0md8li1gv4ji4vr63cfa2bcmslba94dzw6awzn5ndnpmdb7np6vh"; }; } { - root = "github.com/hashicorp/go-multierror"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-multierror"; - rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; - sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + goPackagePath = "github.com/aws/aws-sdk-go"; + + src = fetchgit { + url = "https://github.com/aws/aws-sdk-go"; + rev = "8041be5461786460d86b4358305fbdf32d37cfb2"; + sha256 = "06ilyl1z5mn6i0afd8ila4lr2vwqdgq5zby8v4v2g3dd39qi6jq2"; }; } { - root = "github.com/hashicorp/go-version"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-version"; - rev = "999359b6b7a041ce16e695d51e92145b83f01087"; - sha256 = "0z2bzphrdkaxh5vnvjh3g25d6cykchshwwbyqgji91mpgjd30pbm"; + goPackagePath = "github.com/bgentry/speakeasy"; + + src = fetchgit { + url = "https://github.com/bgentry/speakeasy"; + rev = "36e9cfdd690967f4f690c6edcc9ffacd006014a0"; + sha256 = "0grr82p10dk51l082xaqkpq3izj5bhby3l15gj866kngybfb4nzr"; }; } { - root = "github.com/hashicorp/yamux"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "yamux"; - rev = "ae139c4ae7fe21e9d99459d2acc57967cebb6918"; - sha256 = "1p5h2wklj8lb1vnjnd5kw7cshfmiw7jmzw9radln955hzd5xzbnl"; + goPackagePath = "github.com/dgrijalva/jwt-go"; + + src = fetchgit { + url = "https://github.com/dgrijalva/jwt-go"; + rev = "f2193411bd642f7db03249fd79d5292c9b34916a"; + sha256 = "0nkzn8i5f7x3wyi7mhhj9vpdbkdjvrb9hhrw0fqy6vcghia6dhrj"; }; } { - root = "github.com/mitchellh/cli"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "cli"; - rev = "8102d0ed5ea2709ade1243798785888175f6e415"; - sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; + goPackagePath = "github.com/digitalocean/godo"; + + src = fetchgit { + url = "https://github.com/digitalocean/godo"; + rev = "6ca5b770f203b82a0fca68d0941736458efa8a4f"; + sha256 = "00di15gdv47jfdr1l8cqphmlv5bzalxk7dk53g3mif7vwhs8749j"; }; } { - root = "github.com/mitchellh/mapstructure"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + goPackagePath = "github.com/dylanmei/iso8601"; + + src = fetchgit { + url = "https://github.com/dylanmei/iso8601"; + rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4"; + sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1"; }; } { - root = "github.com/mitchellh/osext"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "osext"; - rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702"; - sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23"; + goPackagePath = "github.com/dylanmei/winrmtest"; + + src = fetchgit { + url = "https://github.com/dylanmei/winrmtest"; + rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5"; + sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh"; }; } { - root = "github.com/mitchellh/panicwrap"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "panicwrap"; - rev = "45cbfd3bae250c7676c077fb275be1a2968e066a"; - sha256 = "0mbha0nz6zcgp2pny2x03chq1igf9ylpz55xxq8z8g2jl6cxaghn"; + goPackagePath = "github.com/go-ini/ini"; + + src = fetchgit { + url = "https://github.com/go-ini/ini"; + rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; + sha256 = "0dl5ibrrq2i887i0bf8a9m887rhnpgv6wmwyc1sj8a75c0yd02da"; }; } { - root = "github.com/mitchellh/prefixedio"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "prefixedio"; - rev = "89d9b535996bf0a185f85b59578f2e245f9e1724"; - sha256 = "0lc64rlizb412msd32am2fixkh0536pjv7czvgyw5fskn9kgk3y2"; + goPackagePath = "github.com/google/go-querystring"; + + src = fetchgit { + url = "https://github.com/google/go-querystring"; + rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0"; + sha256 = "117211606pv0p3p4cblpnirrrassprrvvcq2svwpplsq5vff1rka"; }; } { - root = "github.com/mitchellh/reflectwalk"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "reflectwalk"; - rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6"; - sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq"; + goPackagePath = "github.com/hashicorp/atlas-go"; + + src = fetchgit { + url = "https://github.com/hashicorp/atlas-go"; + rev = "95fa852edca41c06c4ce526af4bb7dec4eaad434"; + sha256 = "002lpvxi6my8dk4d4ks091ad66bj6rnz4xchbzpqwvp7n8097aqz"; }; } { - root = "github.com/mitchellh/go-fs"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "go-fs"; - rev = "a34c1b9334e86165685a9449b782f20465eb8c69"; - sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i"; + goPackagePath = "github.com/hashicorp/errwrap"; + + src = fetchgit { + url = "https://github.com/hashicorp/errwrap"; + rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55"; + sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf"; }; } { - root = "github.com/mitchellh/goamz"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "goamz"; - rev = "caaaea8b30ee15616494ee68abd5d8ebbbef05cf"; - sha256 = "0bshq69ir9h2nszbr74yvcg5wnd9a5skfmr9bgk014k9wwk7dc72"; + goPackagePath = "github.com/hashicorp/go-checkpoint"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-checkpoint"; + rev = "e4b2dc34c0f698ee04750bf2035d8b9384233e1b"; + sha256 = "0qjfk1fh5zmn04yzxn98zam8j4ay5mzd5kryazqj01hh7szd0sh5"; }; } { - root = "github.com/mitchellh/multistep"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "multistep"; - rev = "162146fc57112954184d90266f4733e900ed05a5"; - sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "875fb671b3ddc66f8e2f0acc33829c8cb989a38d"; + sha256 = "0ammv6gn9cmh6padaaw76wa6xvg22a9b3sw078v9chcvfk2bggha"; }; } { - root = "github.com/ActiveState/tail"; - src = fetchFromGitHub { - owner = "ActiveState"; - repo = "tail"; - rev = "4b368d1590196ade29993d6a0896591403180bbd"; - sha256 = "183y44skn75lkpsjd3zlbx8vc3b930p3nkpc1ybq3k50s4bzhsll"; + goPackagePath = "github.com/hashicorp/go-multierror"; + + src = fetchgit { + url = "https://github.com/hashicorp/go-multierror"; + rev = "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5"; + sha256 = "0dc02mvv11hvanh12nhw8jsislnxf6i4gkh6vcil0x23kj00z3iz"; }; } { - root = "google.golang.org/api"; + goPackagePath = "github.com/hashicorp/go-rootcerts"; + src = fetchgit { - url = "https://github.com/google/google-api-go-client.git"; - rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; - sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; }; } { - root = "golang.org/x/crypto"; + goPackagePath = "github.com/hashicorp/go-version"; + src = fetchgit { - url = "https://go.googlesource.com/crypto.git"; - rev = "81bf7719a6b7ce9b665598222362b50122dfc13b"; - sha256 = "0rwzc2ls842d0g588b5xik59srwzawch3nb1dlcqwm4a1132mvmr"; + url = "https://github.com/hashicorp/go-version"; + rev = "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38"; + sha256 = "0ibqaq6z02himzci4krbfhqdi8fw2gzj9a8z375nl3qbzdgzqnm7"; }; } { - root = "golang.org/x/oauth2"; + goPackagePath = "github.com/hashicorp/yamux"; + src = fetchgit { - url = "https://go.googlesource.com/oauth2.git"; - rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; - sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + url = "https://github.com/hashicorp/yamux"; + rev = "df949784da9ed028ee76df44652e42d37a09d7e4"; + sha256 = "080bmbdaq88ri2pn63mcjc4kq2y2sy1742ypqfgrvwssa1ynvnhy"; }; } { - root = "golang.org/x/net"; + goPackagePath = "github.com/hpcloud/tail"; + src = fetchgit { - url = "https://go.googlesource.com/net.git"; - rev = "7654728e381988afd88e58cabfd6363a5ea91810"; - sha256 = "08i6kkzbckbc5k15bdlqkbird48zmc24qr505hlxlb11djjgdiml"; + url = "https://github.com/hpcloud/tail"; + rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c"; + sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d"; }; } { - root = "google.golang.org/appengine"; + goPackagePath = "github.com/jmespath/go-jmespath"; + src = fetchgit { - url = "https://github.com/golang/appengine.git"; - rev = "cdd515334b113fdc9b35cb1e7a3b457eeb5ad5cf"; - sha256 = "0l0rddpfbddbi8kizg2n25w7bdhf99f0iz7ghwz7fq6k4rmq44ws"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c01cf91b011868172fdcd9f41838e80c9d716264"; + sha256 = "0lp2m33a6x2pjbv5xlbbcr48qri32s84hcgm3xmgvmrx6zyi74zg"; }; } { - root = "google.golang.org/cloud"; + goPackagePath = "github.com/kardianos/osext"; + src = fetchgit { - url = "https://github.com/GoogleCloudPlatform/gcloud-golang.git"; - rev = "e34a32f9b0ecbc0784865fb2d47f3818c09521d4"; - sha256 = "1rzac44kzhd7r6abdy5qyj69y64wy9r73vnxsdalfr5m0i55fqk4"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; }; } { - root = "github.com/golang/protobuf"; - src = fetchFromGitHub { - owner = "golang"; - repo = "protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + goPackagePath = "github.com/klauspost/compress"; + + src = fetchgit { + url = "https://github.com/klauspost/compress"; + rev = "f86d2e6d8a77c6a2c4e42a87ded21c6422f7557e"; + sha256 = "17f9zxrs2k8q5kghppjnbn0xzl3i4fgl4852kj8cg94b51s5ll9f"; }; } { - root = "github.com/mitchellh/gophercloud-fork-40444fb"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "gophercloud-fork-40444fb"; - rev = "40444fbc2b10960682b34e6822eb9179216e1ae1"; - sha256 = "06bm7hfi03c75npzy51wbl9qyln35c3kzj9yn2w4fhn0k9dia9s3"; + goPackagePath = "github.com/klauspost/cpuid"; + + src = fetchgit { + url = "https://github.com/klauspost/cpuid"; + rev = "349c675778172472f5e8f3a3e0fe187e302e5a10"; + sha256 = "1y7gqpcpcb29ws77328vfm30s8nsrbxyylfpb8ksb8wwg062yv6v"; }; } { - root = "github.com/racker/perigee"; - src = fetchFromGitHub { - owner = "racker"; - repo = "perigee"; - rev = "44a7879d89b7040bcdb51164a83292ef5bf9deec"; - sha256 = "04wscffagpbcfjs6br96n46aqy43cq6ndq16nlpvank0m98jaax0"; + goPackagePath = "github.com/klauspost/crc32"; + + src = fetchgit { + url = "https://github.com/klauspost/crc32"; + rev = "999f3125931f6557b991b2f8472172bdfa578d38"; + sha256 = "1sxnq3i7wvcdqx0l91jc04nf5584ym8dxzkz3xvivm8p7kz2xjns"; }; } { - root = "github.com/going/toolkit"; - src = fetchFromGitHub { - owner = "going"; - repo = "toolkit"; - rev = "5bff591dc40da25dcc875d3fa1a3373d74d45411"; - sha256 = "15gnlqignm7xcp2chrz7d7qqlibkbfrrsvbcysk8lrj9l7md8vjf"; + goPackagePath = "github.com/klauspost/pgzip"; + + src = fetchgit { + url = "https://github.com/klauspost/pgzip"; + rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d"; + sha256 = "00jcx3pdwxi4r2l3m4b8jb17b2srckz488cmjvd1vqkr85a0jp2x"; }; } { - root = "github.com/mitchellh/go-vnc"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "go-vnc"; - rev = "723ed9867aed0f3209a81151e52ddc61681f0b01"; - sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h"; + goPackagePath = "github.com/kr/fs"; + + src = fetchgit { + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; }; } { - root = "github.com/howeyc/fsnotify"; - src = fetchFromGitHub { - owner = "howeyc"; - repo = "fsnotify"; - rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2"; - sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn"; + goPackagePath = "github.com/masterzen/simplexml"; + + src = fetchgit { + url = "https://github.com/masterzen/simplexml"; + rev = "95ba30457eb1121fa27753627c774c7cd4e90083"; + sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz"; }; } { - root = "gopkg.in/tomb.v1"; + goPackagePath = "github.com/masterzen/winrm"; + src = fetchgit { - url = "https://gopkg.in/tomb.v1.git"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + url = "https://github.com/masterzen/winrm"; + rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa"; + sha256 = "1d4khg7c4vw645id0x301zkgidm4ah6nkmiq52j8wsivi85yhn66"; }; } { - root = "github.com/vaughan0/go-ini"; - src = fetchFromGitHub { - owner = "vaughan0"; - repo = "go-ini"; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + goPackagePath = "github.com/masterzen/xmlpath"; + + src = fetchgit { + url = "https://github.com/masterzen/xmlpath"; + rev = "13f4951698adc0fa9c1dda3e275d489a24201161"; + sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk"; }; } { - root = "github.com/aws/aws-sdk-go"; - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-sdk-go"; - rev = "f096b7d61df3d7d6d97f0e701f92616d1ea5420d"; - sha256 = "0z2fknqxdyb5vw4am46cn60m15p9fjsqzpzaj2pamp436l0cpjkw"; + goPackagePath = "github.com/mattn/go-isatty"; + + src = fetchgit { + url = "https://github.com/mattn/go-isatty"; + rev = "56b76bdf51f7708750eac80fa38b952bb9f32639"; + sha256 = "0l8lcp8gcqgy0g1cd89r8vk96nami6sp9cnkx60ms1dn6cqwf5n3"; }; } { - root = "github.com/digitalocean/godo"; - src = fetchFromGitHub { - owner = "digitalocean"; - repo = "godo"; - rev = "2a0d64a42bb60a95677748a4d5729af6184330b4"; - sha256 = "0854577b08fw9bjflk044ph16p15agxhh6xbzn71rhfvxg5yg5mi"; + goPackagePath = "github.com/mitchellh/cli"; + + src = fetchgit { + url = "https://github.com/mitchellh/cli"; + rev = "5c87c51cedf76a1737bf5ca3979e8644871598a6"; + sha256 = "1ajxzh3winjnmqhd4yn6b6f155vfzi0dszhzl4a00zb5pdppp1rd"; }; } { - root = "github.com/dylanmei/winrmtest"; - src = fetchFromGitHub { - owner = "dylanmei"; - repo = "winrmtest"; - rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5"; - sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh"; + goPackagePath = "github.com/mitchellh/go-fs"; + + src = fetchgit { + url = "https://github.com/mitchellh/go-fs"; + rev = "a34c1b9334e86165685a9449b782f20465eb8c69"; + sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i"; }; } { - root = "github.com/klauspost/pgzip"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "pgzip"; - rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d"; - sha256 = "1bfka02xrhp4fg9pz2v4ppxa46b59bwy5n88c7hbbxqxm8z30yca"; + goPackagePath = "github.com/mitchellh/go-homedir"; + + src = fetchgit { + url = "https://github.com/mitchellh/go-homedir"; + rev = "d682a8f0cf139663a984ff12528da460ca963de9"; + sha256 = "0vsiby9fbkaz7q067wmc6s5pzgpq4gdfx66cj2a1lbdarf7j1kbs"; }; } { - root = "github.com/masterzen/winrm"; - src = fetchFromGitHub { - owner = "masterzen"; - repo = "winrm"; - rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa"; - sha256 = "0qzdmsjgcf5n0jzjf4gd22lhqwn9yagynk1izjz3978gr025p2zm"; + goPackagePath = "github.com/mitchellh/go-vnc"; + + src = fetchgit { + url = "https://github.com/mitchellh/go-vnc"; + rev = "723ed9867aed0f3209a81151e52ddc61681f0b01"; + sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h"; }; } { - root = "github.com/google/go-querystring"; - src = fetchFromGitHub { - owner = "google"; - repo = "go-querystring"; - rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0"; - sha256 = "0raf6r3dd8rxxppzrbhp1y6k5csgfkfs7b0jylj65sbg0hbzxvbr"; + goPackagePath = "github.com/mitchellh/iochan"; + + src = fetchgit { + url = "https://github.com/mitchellh/iochan"; + rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; + sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; }; } { - root = "github.com/go-ini/ini"; - src = fetchFromGitHub { - owner = "go-ini"; - repo = "ini"; - rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; - sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia"; + goPackagePath = "github.com/mitchellh/mapstructure"; + + src = fetchgit { + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; }; } { - root = "github.com/klauspost/compress"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "compress"; - rev = "112706bf3743c241303219f9c5ce2e6635f69221"; - sha256 = "1gyf5hf8wivbx6s99x2rxq2a335b49av2xb43nikgbzm4qn7win7"; + goPackagePath = "github.com/mitchellh/multistep"; + + src = fetchgit { + url = "https://github.com/mitchellh/multistep"; + rev = "162146fc57112954184d90266f4733e900ed05a5"; + sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; }; } { - root = "github.com/masterzen/simplexml"; - src = fetchFromGitHub { - owner = "masterzen"; - repo = "simplexml"; - rev = "95ba30457eb1121fa27753627c774c7cd4e90083"; - sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz"; + goPackagePath = "github.com/mitchellh/packer"; + + src = fetchgit { + url = "https://github.com/mitchellh/packer"; + rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; + sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10"; }; } { - root = "github.com/masterzen/xmlpath"; - src = fetchFromGitHub { - owner = "masterzen"; - repo = "xmlpath"; - rev = "13f4951698adc0fa9c1dda3e275d489a24201161"; - sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk"; + goPackagePath = "github.com/mitchellh/panicwrap"; + + src = fetchgit { + url = "https://github.com/mitchellh/panicwrap"; + rev = "a1e50bc201f387747a45ffff020f1af2d8759e88"; + sha256 = "0w5y21psgrl1afsap613c3qw84ik7zhnalnv3bf6r51hyv187y69"; }; } { - root = "github.com/jmespath/go-jmespath"; - src = fetchFromGitHub { - owner = "jmespath"; - repo = "go-jmespath"; - rev = "c01cf91b011868172fdcd9f41838e80c9d716264"; - sha256 = "0gfrqwl648qngp77g8m1g9g7difggq2cac4ydjw9bpx4bd7mw1rw"; + goPackagePath = "github.com/mitchellh/prefixedio"; + + src = fetchgit { + url = "https://github.com/mitchellh/prefixedio"; + rev = "6e6954073784f7ee67b28f2d22749d6479151ed7"; + sha256 = "0an2pnnda33ns94v7x0sv9kmsnk62r8xm0cj4d69f2p63r85fdp6"; }; } { - root = "github.com/klauspost/cpuid"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "cpuid"; - rev = "349c675778172472f5e8f3a3e0fe187e302e5a10"; - sha256 = "1s8baj42k66ny77qkm3n06kwayk4srwf4b9ss42612f3h86ka5i2"; + goPackagePath = "github.com/mitchellh/reflectwalk"; + + src = fetchgit { + url = "https://github.com/mitchellh/reflectwalk"; + rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6"; + sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq"; }; } { - root = "github.com/nu7hatch/gouuid"; - src = fetchFromGitHub { - owner = "nu7hatch"; - repo = "gouuid"; + goPackagePath = "github.com/nu7hatch/gouuid"; + + src = fetchgit { + url = "https://github.com/nu7hatch/gouuid"; rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; - sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + sha256 = "175alsrjb2a1qzwp1l323vwwpirzaj95yfqqfi780698myhpb52k"; }; } { - root = "github.com/klauspost/crc32"; - src = fetchFromGitHub { - owner = "klauspost"; - repo = "crc32"; - rev = "999f3125931f6557b991b2f8472172bdfa578d38"; - sha256 = "00ws3hrszxdnyj0cjk9b8b44xc8x5hizm0h22x6m3bb4c5b487wv"; + goPackagePath = "github.com/packer-community/winrmcp"; + + src = fetchgit { + url = "https://github.com/packer-community/winrmcp"; + rev = "f1bcf36a69fa2945e65dd099eee11b560fbd3346"; + sha256 = "0pj5gfbmx507lp1w3gfn23x0rn0x5rih9nqij9g8d9c4m1sx3275"; }; } { - root = "github.com/pierrec/lz4"; - src = fetchFromGitHub { - owner = "pierrec"; - repo = "lz4"; + goPackagePath = "github.com/pierrec/lz4"; + + src = fetchgit { + url = "https://github.com/pierrec/lz4"; rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470"; sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp"; }; } { - root = "github.com/packer-community/winrmcp"; - src = fetchFromGitHub { - owner = "packer-community"; - repo = "winrmcp"; - rev = "3d184cea22ee1c41ec1697e0d830ff0c78f7ea97"; - sha256 = "0g2rwwhykm1z099gwkg1nmb1ggnizqlm2pbmy3qsdvjnl5246ca4"; + goPackagePath = "github.com/pierrec/xxHash"; + + src = fetchgit { + url = "https://github.com/pierrec/xxHash"; + rev = "5a004441f897722c627870a981d02b29924215fa"; + sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; }; } { - root = "github.com/dylanmei/iso8601"; - src = fetchFromGitHub { - owner = "dylanmei"; - repo = "iso8601"; - rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4"; - sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1"; + goPackagePath = "github.com/pkg/sftp"; + + src = fetchgit { + url = "https://github.com/pkg/sftp"; + rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"; + sha256 = "0v6g9j9pnkqz72x5409y8gd8ycniziydvsjb4298dkd21d3b94dg"; }; } { - root = "github.com/pierrec/xxHash"; - src = fetchFromGitHub { - owner = "pierrec"; - repo = "xxHash"; - rev = "5a004441f897722c627870a981d02b29924215fa"; - sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; + goPackagePath = "github.com/rackspace/gophercloud"; + + src = fetchgit { + url = "https://github.com/rackspace/gophercloud"; + rev = "53d1dc4400e1ebcd37a0e01d8c1fe2f4db3b99d2"; + sha256 = "0rdyljj395k1w7xnxw1i76w29fgl517mvs7bsqll35lss2gbhan2"; }; } { - root = "github.com/satori/go.uuid"; - src = fetchFromGitHub { - owner = "satori"; - repo = "go.uuid"; + goPackagePath = "github.com/satori/go.uuid"; + + src = fetchgit { + url = "https://github.com/satori/go.uuid"; rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048"; sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2"; }; } { - root = "github.com/rackspace/gophercloud"; - src = fetchFromGitHub { - owner = "rackspace"; - repo = "gophercloud"; - rev = "680aa02616313d8399abc91f17a444cf9292f0e1"; - sha256 = "0pxzvhh6l1gfn31k6g8fz3x4b6mz88cx2rgpims0ys5cl212zrp1"; + goPackagePath = "github.com/tent/http-link-go"; + + src = fetchgit { + url = "https://github.com/tent/http-link-go"; + rev = "ac974c61c2f990f4115b119354b5e0b47550e888"; + sha256 = "0iwq842pvp5y77cr25yanj1cgqzmkz1aw6jzgjrrmlqqkdad5z8c"; }; } { - root = "gopkg.in/fsnotify.v0"; - src = fetchFromGitHub { - owner = "go-fsnotify"; - repo = "fsnotify"; - rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6"; - sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; + goPackagePath = "github.com/ugorji/go"; + + src = fetchgit { + url = "https://github.com/ugorji/go"; + rev = "646ae4a518c1c3be0739df898118d9bccf993858"; + sha256 = "0njncpdbh115l5mxyks08jh91kdmy0mvbmxj9mr1psv5k97gf0pn"; }; } { - root = "github.com/tent/http-link-go"; - src = fetchFromGitHub { - owner = "tent"; - repo = "http-link-go"; - rev = "ac974c61c2f990f4115b119354b5e0b47550e888"; - sha256 = "1fph21b6vp4cm73fkkykffggi57m656x9fd1k369fr6jbvq5fffj"; + goPackagePath = "golang.org/x/crypto"; + + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h"; }; } - ]; + { + goPackagePath = "golang.org/x/net"; -in + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "6ccd6698c634f5d835c40c1c31848729e0cecda1"; + sha256 = "05c7kdjkvf7hrdiv1k12nyss6s8chhakqn1adxbrrahr6rl1nhpj"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; -stdenv.mkDerivation rec { - name = "go-deps"; + src = fetchgit { + url = "https://go.googlesource.com/oauth2"; + rev = "8a57ed94ffd43444c0879fe75701732a38afc985"; + sha256 = "10pxnbsy1lnx7a1x6g3cna5gdm11aal1r446dpmpgj94xiw96mxv"; + }; + } + { + goPackagePath = "google.golang.org/api"; - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); + src = fetchgit { + url = "https://code.googlesource.com/google-api-go-client"; + rev = "ddff2aff599105a55549cf173852507dfa094b7f"; + sha256 = "03058zh0v997fxmlvd8r4m63r3z0fzg6fval6wnxw3wq22m7h3yx"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + + src = fetchgit { + url = "https://code.googlesource.com/gocloud"; + rev = "5a3b06f8b5da3b7c3a93da43163b872c86c509ef"; + sha256 = "03zrw3mgh82gvfgz17k97n8hivnvvplc42c7vyr76i90n1mv29g7"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + + src = fetchgit { + url = "https://gopkg.in/fsnotify.v1"; + rev = "8611c35ab31c1c28aa903d33cf8b6e44a399b09e"; + sha256 = "17a7z88860hhmbgmpc2si1n67s8zk3vzwv5r4wyhrsljcq0bcv9q"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + + src = fetchgit { + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/xmlpath.v2"; + + src = fetchgit { + url = "https://gopkg.in/xmlpath.v2"; + rev = "860cbeca3ebcc600db0b213c0e83ad6ce91f5739"; + sha256 = "0jgvd0y78fir4vkcj8acs0pdvlc0xr7i7cspbkm2yjm8wv23p63h"; + }; + } + ]; } diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index f89e7bca5a76..5d4da29e9b0c 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { to use Bison. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 97a66490bf98..ebbee4e693dc 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { to use Bison. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix new file mode 100644 index 000000000000..4b6d230becd6 --- /dev/null +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, python3, python3Packages }: + +stdenv.mkDerivation { + name = "postiats-utilities-2.0.1"; + src = fetchurl { + url = "https://github.com/Hibou57/PostiATS-Utilities/archive/v2.0.1.tar.gz"; + sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/Hibou57/PostiATS-Utilities"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.ttuegel ]; + }; + + buildInputs = [ python3 python3Packages.wrapPython ]; + + phases = "unpackPhase patchPhase installPhase"; + + postPatch = '' + for f in pats-* postiats/*.py; do + sed -i "$f" -e "1 s,python3,python," + done + ''; + + installPhase = '' + libdir="$out/lib/${python3.libPrefix}/site-packages" + mkdir -p "$libdir" + cp -r postiats "$libdir" + + mkdir -p "$out/bin" + install pats-* "$out/bin" + + wrapPythonPrograms + ''; +} diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix new file mode 100644 index 000000000000..74c537763da2 --- /dev/null +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchurl, python, zip, makeWrapper +}: + +let + deps = import ./deps.nix { inherit fetchurl; }; + version = "1.0.0"; + src = fetchurl { + url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; + sha256 = "1rbwkmsllg8wxv45xyvc3vh97na0zxxydcfqrvig496xkylvw2rn"; + + }; +in stdenv.mkDerivation rec { + name = "pypi2nix-${version}"; + srcs = with deps; [ src pip click setuptools zcbuildout zcrecipeegg ]; + buildInputs = [ python zip makeWrapper ]; + sourceRoot = "."; + + postUnpack = '' + mkdir -p $out/pkgs + + mv pip-*/pip $out/pkgs/pip + mv click-*/click $out/pkgs/click + mv setuptools-*/setuptools $out/pkgs/setuptools + mv zc.buildout-*/src/zc $out/pkgs/zc + mv zc.recipe.egg-*/src/zc/recipe $out/pkgs/zc/recipe + + if [ "$IN_NIX_SHELL" != "1" ]; then + if [ -e git-export ]; then + mv git-export/src/pypi2nix $out/pkgs/pypi2nix + else + mv pypi2nix*/src/pypi2nix $out/pkgs/pypi2nix + fi + fi + ''; + + commonPhase = '' + mkdir -p $out/bin + + echo "#!${python}/bin/python" > $out/bin/pypi2nix + echo "import pypi2nix.cli" >> $out/bin/pypi2nix + echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix + + chmod +x $out/bin/pypi2nix + + export PYTHONPATH=$out/pkgs:$PYTHONPATH + ''; + + installPhase = commonPhase + '' + wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + shellHook = '' + export home=`pwd` + export out=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name + + rm -rf $out + mkdir -p $out + + cd $out + runHook unpackPhase + runHook commonPhase + cd $home + + export PATH=$out/bin:$PATH + export PYTHONPATH=`pwd`/src:$PYTHONPATH + ''; + meta = { + homepage = https://github.com/garbas/pypi2nix; + description = "A tool that generates nix expressions for your python packages, so you don't have to."; + maintainers = with stdenv.lib.maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix new file mode 100644 index 000000000000..39fc9329d5ec --- /dev/null +++ b/pkgs/development/tools/pypi2nix/deps.nix @@ -0,0 +1,68 @@ +{ fetchurl +#, pypi_url ? "https://files.pythonhosted.org/packages" +, pypi_url ? "https://pypi.io/packages/source/packages" +}: + +rec { + + pipVersion = "8.1.1"; + pipHash = "6b86f11841e89c8241d689956ba99ed7"; + pipWhlHash = "22db7b6a517a09c29d54a76650f170eb"; + + setuptoolsVersion = "21.0.0"; + setuptoolsHash = "81964fdb89534118707742e6d1a1ddb4"; + setuptoolsWhlHash = "6027400d6870a7dad29952b7d2dfdc7b"; + + zcbuildoutVersion = "2.5.1"; + zcbuildoutHash = "c88947a3c021ee1509a331c4fa9be187"; + + zcrecipeeggVersion = "2.0.3"; + zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4"; + + wheelVersion = "0.29.0"; + wheelHash = "555a67e4507cedee23a0deb9651e452f"; + + clickVersion = "6.6"; + clickHash = "d0b09582123605220ad6977175f3e51d"; + + pipWhl = fetchurl { + url = "https://pypi.python.org/packages/31/6a/0f19a7edef6c8e5065f4346137cc2a08e22e141942d66af2e1e72d851462/pip-${pipVersion}-py2.py3-none-any.whl"; + md5 = pipWhlHash; + }; + + setuptoolsWhl = fetchurl { + url = "https://pypi.python.org/packages/15/b7/a76624e5a3b18c8c1c8d33a5240b34cdabb08aef2da44b536a8b53ba1a45/setuptools-${setuptoolsVersion}-py2.py3-none-any.whl"; + md5 = setuptoolsWhlHash; + }; + + pip = fetchurl { + url = "${pypi_url}/source/p/pip/pip-${pipVersion}.tar.gz"; + md5 = pipHash; + }; + + setuptools = fetchurl { + url = "${pypi_url}/source/s/setuptools/setuptools-${setuptoolsVersion}.tar.gz"; + md5 = setuptoolsHash; + }; + + zcbuildout = fetchurl { + url = "${pypi_url}/source/z/zc.buildout/zc.buildout-${zcbuildoutVersion}.tar.gz"; + md5 = zcbuildoutHash; + }; + + zcrecipeegg = fetchurl { + url = "${pypi_url}/source/z/zc.recipe.egg/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz"; + md5 = zcrecipeeggHash; + }; + + wheel = fetchurl { + url = "${pypi_url}/source/w/wheel/wheel-${wheelVersion}.tar.gz"; + md5 = wheelHash; + }; + + click = fetchurl { + url = "${pypi_url}/source/c/click/click-${clickVersion}.tar.gz"; + md5 = clickHash; + }; + +} diff --git a/pkgs/development/tools/redis-dump/.bundle/config b/pkgs/development/tools/redis-dump/.bundle/config new file mode 100644 index 000000000000..b81abe028c3c --- /dev/null +++ b/pkgs/development/tools/redis-dump/.bundle/config @@ -0,0 +1,3 @@ +--- +BUNDLE_PATH: vendor +BUNDLE_DISABLE_SHARED_GEMS: '1' diff --git a/pkgs/development/tools/redis-dump/Gemfile b/pkgs/development/tools/redis-dump/Gemfile new file mode 100644 index 000000000000..f78cb0873c08 --- /dev/null +++ b/pkgs/development/tools/redis-dump/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'redis-dump' diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/development/tools/redis-dump/Gemfile.lock new file mode 100644 index 000000000000..283a3815f223 --- /dev/null +++ b/pkgs/development/tools/redis-dump/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: https://rubygems.org/ + specs: + drydock (0.6.9) + redis (3.3.0) + redis-dump (0.3.5) + drydock (>= 0.6.9) + redis (>= 2.0) + uri-redis (>= 0.4.0) + yajl-ruby (>= 0.1) + uri-redis (0.4.2) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + redis-dump + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix new file mode 100644 index 000000000000..bc1adf730a35 --- /dev/null +++ b/pkgs/development/tools/redis-dump/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }: + +bundlerEnv { + name = "redis-dump-0.3.5"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ perl autoconf ]; + + meta = with lib; { + description = "Backup and restore your Redis data to and from JSON"; + homepage = http://delanotes.com/redis-dump/; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/pkgs/development/tools/redis-dump/gemset.nix new file mode 100644 index 000000000000..4054f4bb0a7a --- /dev/null +++ b/pkgs/development/tools/redis-dump/gemset.nix @@ -0,0 +1,41 @@ +{ + drydock = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grf3361mh93lczljmnwafl7gbcp9kk1bjpfwx4ykpd43fzdbfyj"; + type = "gem"; + }; + version = "0.6.9"; + }; + redis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v68ggm0pwcyml3ngfyngwgvypwmsrmji1kyx48qqcg045zjs5p6"; + type = "gem"; + }; + version = "3.3.0"; + }; + redis-dump = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y6s3nvcw84jqqvp9pjg9qmqyc0b8jkrp0dknhjjr0lg2q3fq87h"; + type = "gem"; + }; + version = "0.3.5"; + }; + uri-redis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13n8ak41rikkbmml054pir4i1xbgjpmf3dbqihc2kcrgmz3dg81a"; + type = "gem"; + }; + version = "0.4.2"; + }; + yajl-ruby = { + source = { + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + type = "gem"; + }; + version = "1.2.1"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix new file mode 100644 index 000000000000..e315ab38344b --- /dev/null +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, rustPlatform, makeWrapper }: + +with rustPlatform; + +buildRustPackage rec { + name = "racerd-${version}"; + version = "0.1.1"; + src = fetchgit { + url = "git://github.com/jwilm/racerd.git"; + rev = "dcbb7885e84eb5e2fbb2072e185701ad1abbd93a"; + sha256 = "18c6a1x0li5yxif9qqnsnyas6if0m6srbqh0h0nywgx0lm8bpgly"; + }; + + doCheck = false; + + depsSha256 = "0ca0lc8mm8kczll5m03n5fwsr0540c2xbfi4nn9ksn0s4sap50yn"; + + buildInputs = [ makeWrapper ]; + + RUST_SRC_PATH = ''${rustc.src}/src''; + + installPhase = '' + mkdir -p $out/bin + cp -p target/release/racerd $out/bin/ + wrapProgram $out/bin/racerd --set RUST_SRC_PATH "$RUST_SRC_PATH" + ''; + + meta = with stdenv.lib; { + description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; + homepage = "https://github.com/jwilm/racerd"; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix new file mode 100644 index 000000000000..b909c646555f --- /dev/null +++ b/pkgs/development/tools/scalafmt/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, unzip, jre }: + +stdenv.mkDerivation rec { + version = "0.2.3"; + baseName = "scalafmt"; + name = "${baseName}-${version}"; + + src = fetchurl { + url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; + sha256 = "0klzm86771wl6d8cq5cf4a4mfz8idcis6wrg0x2ix5rcc5zi0d4d"; + }; + + unpackPhase = "tar xvzf $src"; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + + cp cli/target/scala-2.11/scalafmt.jar "$out/lib/${name}.jar" + + cat > "$out/bin/${baseName}" << EOF + #!${stdenv.shell} + exec ${jre}/bin/java -jar "$out/lib/${name}.jar" "\$@" + EOF + + chmod a+x "$out/bin/${baseName}" + ''; + + meta = with stdenv.lib; { + description = "Opinionated code formatter for Scala"; + homepage = http://scalafmt.org; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.markus1189 ]; + }; +} diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index b2e6dea09e67..7ea394039b9f 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { - name = "sigrok-cli-0.5.0"; + name = "sigrok-cli-0.6.0"; src = fetchurl { url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; - sha256 = "0g3jzspq9iwz2szzxil9ilim1and85qd605f4jbc04sva80hb8vk"; + sha256 = "0g3jhi7azm256gnryka70wn7j3af42yk19c9kbhqffaz4i7dwbmb"; }; buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ]; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index add85805500a..1228484fc65e 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,13 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.6.2015.08.20"; + version="0.10.0"; name="${baseName}-${version}"; - hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; - #url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; - url = "https://github.com/laurentj/slimerjs.git"; - rev = "87e0ff1d666897754a914131d8f1744195ee4d7a"; - sha256="0ifgr8pi40id7vcv8ipc754bys22bhij0kkhd691285x19f52alc"; + hash="1yqs4f90bp8vxa7n8y1a3hi9hd7374hq9qa44xgfb4l5kn6h1f40"; + url="http://download.slimerjs.org/releases/0.10.0/slimerjs-0.10.0.zip"; + sha256="1yqs4f90bp8vxa7n8y1a3hi9hd7374hq9qa44xgfb4l5kn6h1f40"; }; buildInputs = [ unzip zip @@ -18,12 +16,12 @@ in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; - #src = fetchurl { - # inherit (s) url sha256; - #}; - src = fetchgit { - inherit (s) url sha256 rev; + src = fetchurl { + inherit (s) url sha256; }; + #src = fetchgit { + # inherit (s) url sha256 rev; + #}; preConfigure = '' test -d src && cd src test -f omni.ja || zip omni.ja -r */ diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index 8def4b6a6657..deb5c8106282 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sslmate.com; - maintainers = [ maintainers.iElectric ]; + maintainers = [ maintainers.domenkozar ]; description = "Easy to buy, deploy, and manage your SSL certs"; platforms = platforms.unix; license = licenses.mit; # X11 |