diff options
Diffstat (limited to 'pkgs/tools')
22 files changed, 153 insertions, 70 deletions
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 3248ac63bf79..ce9f17b1a517 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { version = "0.4.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/c/cli53/${name}.tar.gz"; + url = "mirror://pypi/c/cli53/${name}.tar.gz"; sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig"; }; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 254b7b9374eb..0cd10fcab92a 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { disabled = pythonPackages.isPy3k; src = fetchurl { - url = "https://pypi.python.org/packages/source/s/salt/${name}.tar.gz"; + url = "mirror://pypi/s/salt/${name}.tar.gz"; sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j"; }; diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix index 8c65defcab58..14105dc2f98c 100644 --- a/pkgs/tools/admin/salt/testing.nix +++ b/pkgs/tools/admin/salt/testing.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { ]; src = fetchurl { - url = "https://pypi.python.org/packages/source/S/SaltTesting/${name}.tar.gz"; + url = "mirror://pypi/S/SaltTesting/${name}.tar.gz"; sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h"; }; diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index 4875ebf504b4..98bcfb3048f8 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, python, mutagen, wrapPython, opusTools }: +{ stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }: -let version = "0.12.1"; in +let version = "0.12.2"; in stdenv.mkDerivation rec { name = "dir2opus-${version}"; pythonPath = [ mutagen ]; buildInputs = [ wrapPython ]; - propagatedBuildInputs = [ opusTools ]; + propagatedBuildInputs = [ opusTools mpg123 ]; src = fetchurl { url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1d6x3qfcj5lfmc8gzna1vrr7fl31i86ha8l4nz5987rx57fgwf0q"; + sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d"; }; postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus"; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index ada4ef29c84e..95c0c26f30be 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz"; + url = "mirror://pypi/b/borgbackup/borgbackup-${version}.tar.gz"; sha256 = "1myz10pwxnac9z59gw1w3xjhz6ghx03vngpl97ca527pj0r39shi"; }; diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 021e0da0e724..839cc1d604e6 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -1,22 +1,14 @@ -{ lib, buildEnv, brasero-original, cdrtools, makeWrapper }: +{ lib, symlinkJoin, brasero-original, cdrtools, makeWrapper }: let binPath = lib.makeBinPath [ cdrtools ]; -in buildEnv { +in symlinkJoin { name = "brasero-${brasero-original.version}"; paths = [ brasero-original ]; buildInputs = [ makeWrapper ]; postBuild = '' - # TODO: This could be avoided if buildEnv could be forced to create all directories - if [ -L $out/bin ]; then - rm $out/bin - mkdir $out/bin - for i in ${brasero-original}/bin/*; do - ln -s $i $out/bin - done - fi wrapProgram $out/bin/brasero \ --prefix PATH ':' ${binPath} ''; diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index a0ae26189541..1e1a2b76a4bb 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }: +{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }: # This is based on the pidgin-with-plugins package. # Users should be able to configure what plugins are used @@ -12,24 +12,16 @@ # (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; }) # } -let -drv = buildEnv { - name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version; +symlinkJoin { + name = "fcitx-with-plugins-${fcitx.version}"; paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ plugins; + buildInputs = [ makeWrapper ]; + postBuild = '' - # TODO: This could be avoided if buildEnv could be forced to create all directories - if [ -L $out/bin ]; then - rm $out/bin - mkdir $out/bin - for i in ${fcitx}/bin/*; do - ln -s $i $out/bin - done - fi wrapProgram $out/bin/fcitx \ --set FCITXDIR "$out/" ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) +} diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 1d7984ac11da..343559bb1e11 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,12 +1,14 @@ -{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchzip }: +{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: stdenv.mkDerivation rec { name = "antimicro-${version}"; - version = "2.18"; + version = "2.18.2"; - src = fetchzip { - url = "https://github.com/Ryochan7/antimicro/archive/${version}.tar.gz"; - sha256 = "0kyl4xl2am50v2xscgy2irpcdj78f7flgfhljyjck4ynf8d40vb7"; + src = fetchFromGitHub { + owner = "7185"; + repo = "antimicro"; + rev = "${version}"; + sha256 = "1mqw5idn57yj6c1w8y0byzh0xafcpbhaa6czgljh206abwfixjmk"; }; buildInputs = [ diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix new file mode 100644 index 000000000000..4e0790dded6c --- /dev/null +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: + +stdenv.mkDerivation rec { + name = "dbus-map-${version}"; + version = "2015-05-28"; + src = fetchFromGitHub { + owner = "taviso"; + repo = "dbusmap"; + rev = "43703fc5e15743309b67131b5ba457b0d6ea7667"; + sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc"; + }; + buildInputs = [ + pkgconfig glib procps libxml2 + ]; + installPhase = '' + mkdir -p $out/bin + mv dbus-map $out/bin + ''; + meta = with lib; { + description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus"; + homepage = "https://github.com/taviso/dbusmap"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 808fb2c841c0..f9459c72828d 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.25.0"; + name = "gparted-0.26.0"; src = fetchurl { - sha256 = "1bllvj66rka8f9h9rfwvxaqrj4mbp2n2860ahnp9xm1195gnv69d"; + sha256 = "1d3zw99yd1v0gqhcxff35wqz34xi6ps7q9j1bn11sghqihr3kwxw"; url = "mirror://sourceforge/gparted/${name}.tar.gz"; }; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index ff64b65a89b8..7d9d5545f406 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,32 +1,56 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection -, libgsystem, xz, e2fsprogs, libsoup, gpgme +, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse +, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: -stdenv.mkDerivation { - name = "ostree-2015.3"; +let + libglnx-src = fetchFromGitHub { + owner = "GNOME"; + repo = "libglnx"; + rev = "769522753c25537e520adc322fa62e5390272add"; + sha256 = "0gfc8dl63xpmf73dwb1plj7cymq7z6w6wq5m06yx8jymwhq7x1l8"; + }; - meta = with stdenv.lib; { - description = "Git for operating system binaries"; - homepage = "http://live.gnome.org/OSTree/"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + bsdiff-src = fetchFromGitHub { + owner = "mendsley"; + repo = "bsdiff"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; +in stdenv.mkDerivation rec { + rev = "v2016.5"; + name = "ostree-${rev}"; src = fetchFromGitHub { - owner = "GNOME"; - repo = "ostree"; - rev = "v2015.3"; - sha256 = "1n5q0yxwqx4pqiww3yjmqxl5835kknpw1bnwzbpanmyndnnl88dd"; + inherit rev; + owner = "ostreedev"; + repo = "ostree"; + sha256 = "1dfyhzgv94ldjv2l4jxf4xhks2z5ljljqa3k579qskds755n6kvg"; }; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk_doc gobjectIntrospection + autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc + libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme ]; + buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ]; + + prePatch = '' + rmdir libglnx bsdiff + cp --no-preserve=mode -r ${libglnx-src} libglnx + cp --no-preserve=mode -r ${bsdiff-src} bsdiff + ''; - preAutoreconf = '' - mkdir m4 - gtkdocize + preConfigure = '' + env NOCONFIGURE=1 ./autogen.sh ''; + + meta = with stdenv.lib; { + description = "Git for operating system binaries"; + homepage = "http://live.gnome.org/OSTree/"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ copumpkin ]; + }; } + diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index f1cf04424349..b7f8e4b21066 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config, xauth, utillinux, which, fontsConf}: +{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config +, xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; @@ -17,6 +18,6 @@ stdenv.mkDerivation { wrapProgram $out/bin/xvfb-run \ --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]} ''; } diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index a3c52f7dd501..702fa208ac25 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "http://pypi.python.org/packages/source/h/httpie/${name}.tar.gz"; + url = "mirror://pypi/h/httpie/${name}.tar.gz"; sha256 = "0s0dsj1iimn17h0xyziwk4kz4ga9s0vy9rhzixh8dna32za84fdg"; }; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix new file mode 100644 index 000000000000..28fb39db5719 --- /dev/null +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +assert stdenv.isLinux; + +let + arch = + if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x86" + else abort "Unsupported architecture"; + sha256 = + if stdenv.system == "x86_64-linux" then "1j9sba5prpihlmxr98ss3vls2qjfc6hypzlakr1k97z0a8433nif" + else if stdenv.system == "i686-linux" then "100x6gib2np72wrvcn1yhdyn4fplf5x8xm4x0g77izyfdb3yjg8h" + else abort "Unsupported architecture"; + libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; + +in stdenv.mkDerivation rec { + name = "logmein-hamachi-2.1.0.139"; + + src = fetchurl { + url = "https://secure.logmein.com/labs/${name}-${arch}.tgz"; + inherit sha256; + }; + + installPhase = '' + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath ${libraries} \ + hamachid + install -D -m755 hamachid $out/bin/hamachid + ln -s $out/bin/hamachid $out/bin/hamachi + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; + homepage = https://secure.logmein.com/products/hamachi/; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 80bcb7ae9879..de5ba4c18e12 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { version = "0.3.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; + url = "mirror://pypi/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; sha256 = "19i671cd815fcv0x7h2m0a493slzwkzn7r926g8myx1srkss0q6d"; }; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 89e72307ead1..895704ec6464 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz"; + url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz"; sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral"; }; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 24a3abd4096f..a252dad5ea12 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.94b"; + version = "2.10b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1c36yz3ajd66m3c5aiai3wf59pzxivn80cvlib3dw45d4zqiymqp"; + sha256 = "1qxz3szsdr3ciz496mjb5v2k8p90nilgnlbwwv9csk828qb2jhc1"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index be678b18dda0..308b94231e76 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, openssl, pcre, qt4, boost, pkcs11helper }: +{ stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }: stdenv.mkDerivation { name = "meo-20121113"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildFlags = "QMAKE=qmake"; - buildInputs = [ openssl pcre qt4 boost pkcs11helper ]; + buildInputs = [ openssl pcre-cpp qt4 boost pkcs11helper ]; preConfigure = '' sed -i s,-mt$,, meo-gui/meo-gui.pro diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 411195747678..e3d5c892d37d 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { src = fetchurl { sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b"; - url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; + url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index f4a14155d689..2883a364548d 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -14,7 +14,8 @@ perlPackages.buildPerlPackage rec { --replace /usr/share/awstats/ "$out/wwwroot/cgi-bin/" ''; - outputs = [ "out" "bin" "doc" ]; + outputs = [ "out" "bin" "doc" ]; # bin just links the user-run executable + propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle buildInputs = with perlPackages; [ ]; # plugins will need some diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index da3a77e8d2e4..149af7baa2d7 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz"; + url = "mirror://pypi/g/grin/${name}.tar.gz"; sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz"; }; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 3675b5ab091b..bb72fd2911f7 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; + url = "mirror://pypi/v/vnc2flv/${name}.tar.gz"; sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq"; }; |