diff options
Diffstat (limited to 'pkgs/tools')
24 files changed, 246 insertions, 285 deletions
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index 758bf1729b17..e986b46aa487 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -1,21 +1,15 @@ { stdenv, fetchurl, libX11, libXtst, xextproto, libXi, inputproto }: -stdenv.mkDerivation { - name = "xmacro-0.3pre20000911"; +stdenv.mkDerivation rec { + name = "xmacro-${version}"; + version = "0.4.6"; src = fetchurl { - url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz; - sha256 = "04gzgxhp8bx98zrcvmsm7mn72r9g9588skbf64cqvkp4yz6kfqhb"; + url = "http://download.sarine.nl/xmacro/${name}.tar.gz"; + sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61"; }; - preBuild = '' - sed -e 's/-pedantic//g' -i Makefile - sed -e 's/iostream[.]h/iostream/' -i *.cpp - sed -e 's/iomanip[.]h/iomanip/' -i *.cpp - sed -e '1iusing namespace std;' -i *.cpp - ''; - - preInstall = "echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; "; + preInstall = "echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; "; buildInputs = [ libX11 libXtst xextproto libXi inputproto ]; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 02265bbc683f..ecd6a3209f4f 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, zlib, openssl, libiconv }: stdenv.mkDerivation rec { - version = "3.48.22"; + version = "3.49.2"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "13y4m4rhvmgbbpc3lig9hzmzi86a5fkyi79sz1ckk4wfnkbim0xj"; + sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - meta = { - homepage = http://www.httrack.com; - description = "Easy-to-use offline browser utility"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = with stdenv.lib.platforms; unix; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Easy-to-use offline browser / website mirroring utility"; + homepage = http://www.httrack.com; + license = licenses.gpl3; + maintainers = with maintainers; [ the-kenny ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix new file mode 100644 index 000000000000..e29acc6f3c85 --- /dev/null +++ b/pkgs/tools/backup/httrack/qt.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper +, httrack, qtbase, qtmultimedia }: + +stdenv.mkDerivation rec { + name = "httraqt-${version}"; + version = "1.4.9"; + + src = fetchurl { + url = "mirror://sourceforge/httraqt/${name}.tar.gz"; + sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b"; + }; + + buildInputs = [ httrack qtbase qtmultimedia ]; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + + enableParallelBuilding = true; + + prePatch = '' + substituteInPlace cmake/HTTRAQTFindHttrack.cmake \ + --replace /usr/include/httrack/ ${httrack}/include/httrack/ + + substituteInPlace distribution/posix/CMakeLists.txt \ + --replace /usr/share $out/share + + substituteInPlace desktop/httraqt.desktop \ + --replace Exec=httraqt Exec=$out/bin/httraqt + + substituteInPlace sources/main/httraqt.cpp \ + --replace /usr/share/httraqt/ $out/share/httraqt + ''; + + meta = with stdenv.lib; { + description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; + homepage = http://www.httrack.com; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index bb2ed0c2c268..9027bdf9c5fc 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -31,10 +31,11 @@ in stdenv.mkDerivation rec { configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ]; - preFixup = '' + postFixup = '' makeWrapperArgs="--prefix PATH ':' ${binPath}" - wrapPythonProgramsIn "$out/bin" "$pythonPath" - wrapPythonProgramsIn "$out/libexec" "$pythonPath" + # This mimics ../../../development/interpreters/python/wrap.sh + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index a50d8341f6b0..0c8f05d6904d 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "lizardfs-${version}"; - version = "3.10.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "lizardfs"; repo = "lizardfs"; rev = "v${version}"; - sha256 = "0xw6skprxw0wcbqh4yx8f8a4q00x0sfz42llqgd047bcbga1k5zg"; + sha256 = "1njgj242vgpdqb1di321jfqk4al5lk72x2iyp0nldy7h6r98l2ww"; }; buildInputs = diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 6ae6df35a511..28699bf69312 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, cmake, patchelf, imagemagick }: +{ stdenv, fetchbzr, cmake, patchelf, imagemagick }: stdenv.mkDerivation rec { name = "cuneiform-${version}"; version = "1.1.0"; - src = fetchurl { - url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2"; - sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; + src = fetchbzr { + url = "lp:~f0ma/cuneiform-linux/devel"; + rev = "540"; + sha256 = "0sj7v3plf2rrc2vzxl946h9yfribc0jfn4b3ffppghxk2g6kicsb"; }; buildInputs = [ @@ -16,5 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Multi-language OCR system"; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [raskin]; }; } diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index 6e09dc191acc..e6773e42304b 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -19,27 +19,16 @@ stdenv.mkDerivation { sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn"; }; - # The sed commands disable header checks and add LDFLAGS NIX_CFLAGS_COMPILE - # to the gcc environment buildPhase = '' mkdir -p $out export CXX=g++ - sed -i SConstruct \ - -e 's/def CheckForQt(context):/def CheckForQt(context):\n return 1/' \ - -e "s/not config.CheckHeader('lcms.h')/False/" \ - -e "s/not config.CheckHeader('tiff.h')/False/" \ - -e "s/not config.CheckCXXHeader('vigra\/impex.hxx')/False/" \ - \ - -e "s/^\( 'LDFLAGS'.*\)/\1\n,'hardeningDisable' : os.environ['hardeningDisable']/" \ - -e "s/^\( 'LDFLAGS'.*\)/\1\n,'NIX_CFLAGS_COMPILE' : os.environ['NIX_CFLAGS_COMPILE']/" \ - -e "s/^\( 'LDFLAGS'.*\)/\1\n,'NIX_LDFLAGS' : os.environ['NIX_LDFLAGS']/" scons PREFIX=$out SYSLIBS=1 install ''; installPhase = ":"; - patches = [ ./lcms-1.17.patch ]; + patches = [ ./lcms-1.17.patch ./keep-environment.patch ]; meta = { description = "Little CMS ICC profile construction set"; diff --git a/pkgs/tools/graphics/lprof/keep-environment.patch b/pkgs/tools/graphics/lprof/keep-environment.patch new file mode 100644 index 000000000000..4dcb5b0448dd --- /dev/null +++ b/pkgs/tools/graphics/lprof/keep-environment.patch @@ -0,0 +1,16 @@ +--- lprof-1.11.4.1.org/SConstruct 2006-06-06 02:11:32.000000000 +0100 ++++ lprof-1.11.4.1/SConstruct 2017-08-29 12:56:13.425654683 +0100 +@@ -22,12 +22,7 @@ + # opts.Add(BoolOption('qt-mt-lib', 'Flag used to set QT library to either qt-mt or qt. Value of 1 = qt-mt, 0 = qt.', 'yes')) + + # setup base environemnt +-env = Environment( +- ENV = { +- 'PATH' : os.environ[ 'PATH' ], +- 'HOME' : os.environ[ 'HOME' ], # required for distcc +- 'LDFLAGS' : '' +- }, options = opts) ++env = Environment(ENV = os.environ, options = opts) + + opts.Update(env) + opts.Save('lprof.conf', env) # Save, so user doesn't have to diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index b2cd71d1816e..4581f80a75e0 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fcitx gettext pkgconfig ]; + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + preInstall = '' substituteInPlace src/cmake_install.cmake \ --replace ${fcitx} $out @@ -28,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ericsagnes ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 5d130d7ad807..f93edffa7bde 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; - version = "1.5.8"; + version = "1.5.9"; meta = with stdenv.lib; { isIbusEngine = true; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "1aj7vnfky7izl23xyjky78z3qas3q72l3kr8dnql2lnivsrb8q1y"; + sha256 = "1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x"; }; } diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 827024abdbc1..cb2109e195ea 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -12,6 +12,7 @@ python2Packages.buildPythonApplication rec { doCheck = false; propagatedBuildInputs = with python2Packages; [ + ansible2 boto cffi cryptography diff --git a/pkgs/tools/misc/memtest86+/compile-fix.patch b/pkgs/tools/misc/memtest86+/compile-fix.patch deleted file mode 100644 index f178259f9e03..000000000000 --- a/pkgs/tools/misc/memtest86+/compile-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- memtest86+-5.01/io.h~ 2013-08-10 02:01:58.000000000 +0000 -+++ memtest86+-5.01/io.h 2014-01-08 01:29:12.404465515 +0000 -@@ -31,7 +31,7 @@ - */ - - #define __OUT1(s,x) \ --extern inline void __out##s(unsigned x value, unsigned short port) { -+static inline void __out##s(unsigned x value, unsigned short port) { - - #define __OUT2(s,s1,s2) \ - __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" -@@ -43,7 +43,7 @@ - __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } - - #define __IN1(s) \ --extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; -+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; - - #define __IN2(s,s1,s2) \ - __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" diff --git a/pkgs/tools/misc/memtest86+/crash-fix.patch b/pkgs/tools/misc/memtest86+/crash-fix.patch deleted file mode 100644 index de7c86bac353..000000000000 --- a/pkgs/tools/misc/memtest86+/crash-fix.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/controller.c b/controller.c -index f4f7371..183e9c3 100644 ---- a/controller.c -+++ b/controller.c -@@ -2,6 +2,8 @@ - * MemTest86+ V5 Specific code (GPL V2.0) - * By Samuel DEMEULEMEESTER, sdemeule@memtest.org - * http://www.canardpc.com - http://www.memtest.org -+ * -+ * Edited by David McInnis Oct 4, 2014 - */ - - //#include "defs.h" -@@ -292,7 +294,7 @@ static void setup_nhm(void) - - /* First, locate the PCI bus where the MCH is located */ - -- for(i = 0; i < sizeof(possible_nhm_bus); i++) { -+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); - vid &= 0xFFFF; -@@ -327,7 +329,7 @@ static void setup_nhm32(void) - ctrl.mode = ECC_NONE; - - /* First, locate the PCI bus where the MCH is located */ -- for(i = 0; i < sizeof(possible_nhm_bus); i++) { -+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); - vid &= 0xFFFF; -@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) { - unsigned long dramchr; - float clockratio; - double dramclock; -- unsigned int dummy[3]; -+ unsigned int dummy[4]; - int ram_type; - - float coef = 10; -@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) { - - static void poll_timings_i875(void) { - -- ulong dev6, dev62; -+ ulong dev6; - ulong temp; - float cas; - int rcd, rp, ras, chan; - long *ptr, *ptr2; - -- pci_conf_read( 0, 6, 0, 0x40, 4, &dev62); -+ pci_conf_read( 0, 6, 0, 0x40, 4, &dev6); - ptr2=(long*)(dev6+0x68); - - /* Read the MMR Base Address & Define the pointer */ -diff --git a/init.c b/init.c -index 754b8d7..5bd8b4f 100644 ---- a/init.c -+++ b/init.c -@@ -7,6 +7,8 @@ - * - * Released under version 2 of the Gnu Public License. - * By Chris Brady -+ * -+ * Edited by David McInnis October 4, 2014 - */ - - -@@ -914,7 +916,6 @@ void cpu_type(void) - default: - cprint(0, COL_MID, "Unknown Intel"); - break; -- break; - } - - } -diff --git a/main.c b/main.c -index 0bc7ca0..613f811 100644 ---- a/main.c -+++ b/main.c -@@ -422,7 +422,7 @@ void test_start(void) - //initialise_cpus(); - btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0); - /* Draw the screen and get system information */ -- init(); -+ init(); - - /* Set defaults and initialize variables */ - set_defaults(); -@@ -737,7 +737,7 @@ void test_start(void) - /* Do the same test for each CPU */ - if (++cpu_sel >= act_cpus) - { -- cpu_sel = 0; -+ cpu_sel = 0; - next_test(); - } else { - continue; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 5b4044f1891c..0a02f8fb4f73 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -8,8 +8,28 @@ stdenv.mkDerivation rec { sha256 = "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l"; }; - # Patch incompatiblity with GCC. Source: http://koji.fedoraproject.org/koji/buildinfo?buildID=586907 - patches = [ ./compile-fix.patch ./crash-fix.patch ./no-optimization.patch ]; + patches = [ + (fetchurl { + url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/doc-serialconsole"; + sha256 = "1qh2byj9bmpchym8iq20n4hqmy10nrl6bi0d9pgdqikkmw9m38jq"; + }) + (fetchurl { + url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/multiboot"; + sha256 = "0nq61307ah5b41ff5nqs99wjzjzlajvfv6k9c9d0gqvhx8r4dvmy"; + }) + (fetchurl { + url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-O0.patch"; + sha256 = "1xmj3anq1fr0cxwv8lqfp5cr5f58v7glwc6z0v8hx8aib8yj1wl2"; + }) + (fetchurl { + url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-array-size.patch"; + sha256 = "0yxlzpfs6313s91y984p7rlf5rgybcjhg7i9zqy4wqhm3j90f1kb"; + }) + (fetchurl { + url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/gcc-5"; + sha256 = "13xfy6sn8qbj1hx4vms2cz24dsa3bl8n2iblz185hkn11y7141sc"; + }) + ]; preBuild = '' # Really dirty hack to get Memtest to build without needing a Glibc diff --git a/pkgs/tools/misc/memtest86+/no-optimization.patch b/pkgs/tools/misc/memtest86+/no-optimization.patch deleted file mode 100644 index 76815a931704..000000000000 --- a/pkgs/tools/misc/memtest86+/no-optimization.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- memtest86+-5.01/Makefile~ 2014-01-08 01:30:11.355900076 +0000 -+++ memtest86+-5.01/Makefile 2014-01-08 01:31:19.387555469 +0000 -@@ -12,7 +12,7 @@ - AS=as -32 - CC=gcc - --CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ -+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ - -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix new file mode 100644 index 000000000000..279de83e817a --- /dev/null +++ b/pkgs/tools/misc/shallot/default.nix @@ -0,0 +1,32 @@ +{ + stdenv, fetchFromGitHub, + openssl +}: + +let + version = "0.0.3"; +in stdenv.mkDerivation { + name = "shallot-${version}"; + + src = fetchFromGitHub { + owner = "katmagic"; + repo = "Shallot"; + rev = "shallot-${version}"; + sha256 = "0cjafdxvjkwb9vyifhh11mw0la7yfqswqwqmrfp1fy9jl7m0il9k"; + }; + + buildInputs = [ openssl ]; + + installPhase = '' + mkdir -p $out/bin + cp ./shallot $out/bin/ + ''; + + meta = { + description = "Shallot allows you to create customized .onion addresses for your hidden service"; + + license = stdenv.lib.licenses.mit; + homepage = https://github.com/katmagic/Shallot; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 9e7167989e48..1282c72452f4 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "dnscrypt-wrapper-${version}"; - version = "0.2.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Cofyc"; repo = "dnscrypt-wrapper"; rev = "v${version}"; - sha256 = "0ip205safbpkmk1z7qf3hshqlc2q2zwhsm3i705m0y7rxc4200ms"; + sha256 = "0wnkgn0ajx1qmfyb264jvpqxlbravdcq4m485iaa3wjp82g8xlca"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libsodium libevent ]; diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix new file mode 100644 index 000000000000..154b54952f2d --- /dev/null +++ b/pkgs/tools/networking/network-manager/iodine.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, iodine, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3 }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-iodine"; + major = "1.2"; + version = "${major}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh"; + }; + + buildInputs = [ iodine networkmanager libsecret ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome" else "--without-gnome"}" + "--disable-static" + "--localstatedir=/" # needed for the management socket under /run/NetworkManager + ]; + + preConfigure = '' + substituteInPlace "src/nm-iodine-service.c" \ + --replace "/usr/bin/iodine" "${iodine}/bin/iodine" + ''; + + meta = { + description = "NetworkManager's iodine plugin"; + inherit (networkmanager.meta) maintainers platforms; + }; +} diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index 09357e87da01..46680ab47af4 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -1,21 +1,19 @@ { stdenv, fetchurl, openssl, zlib, ncurses }: stdenv.mkDerivation rec { - name = "polygraph-4.3.2"; + name = "polygraph-4.11.0"; src = fetchurl { url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz"; - sha256 = "1fv9jpcicfsgsmghkykqif6l6w7nwvk5xbdmpv72jbrwzx44845h"; + sha256 = "1ii60yl3p89qawvl19sd1bkpkw39fz8kpvmc3cawa32nxzbm9pbs"; }; buildInputs = [ openssl zlib ncurses ]; - patches = [ ./fix_build.patch ]; - meta = with stdenv.lib; { homepage = http://www.web-polygraph.org; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/polygraph/fix_build.patch b/pkgs/tools/networking/polygraph/fix_build.patch deleted file mode 100644 index 96832d72037a..000000000000 --- a/pkgs/tools/networking/polygraph/fix_build.patch +++ /dev/null @@ -1,77 +0,0 @@ -Description: Fix ftbfs with GCC-4.7. -Author: Mònica Ramírez Arceda <monica@debian.org> -Bug-Debian: http://bugs.debian.org/667326 -Last-Update: 2012-05-11 - ---- a/src/xstd/Heap.h -+++ b/src/xstd/Heap.h -@@ -23,7 +23,7 @@ - const Item &top() const { return this->theItems[1]; } - Item &at(int idx) { return this->theItems[idx+1]; } - -- void add(Item v) { append(v); floatUp(++theCnt); } -+ void add(Item v) { this->append(v); floatUp(++theCnt); } - void skip() { this->theItems[1] = this->theItems[theCnt--]; this->theCount--; sinkDown(1); } - Item shift() { const Item v = this->theItems[1]; skip(); return v; } - ---- a/src/xstd/Ring.h -+++ b/src/xstd/Ring.h -@@ -22,11 +22,11 @@ - int size() const { return Array<Item>::size(); } - bool empty() const { return this->theInOff <= this->theOutOff; } - bool full() const { return count() >= this->theCapacity; } -- const Item &top(int off = 0) const { return item((this->theOutOff+off) % this->theCapacity); } -+ const Item &top(int off = 0) const { return this->item((this->theOutOff+off) % this->theCapacity); } - -- Item &top(int off = 0) { return item((this->theOutOff+off) % this->theCapacity); } -- void enqueue(Item i) { Assert(!full()); item(this->theInOff++ % this->theCapacity) = i; check(); } -- Item dequeue() { return item(this->theOutOff++ % this->theCapacity); } -+ Item &top(int off = 0) { return this->item((this->theOutOff+off) % this->theCapacity); } -+ void enqueue(Item i) { Assert(!full()); this->item(this->theInOff++ % this->theCapacity) = i; check(); } -+ Item dequeue() { return this->item(this->theOutOff++ % this->theCapacity); } - - void reset() { this->theInOff = this->theOutOff = 0; } - inline void resize(int aCap); ---- a/src/runtime/StatPhase.cc -+++ b/src/runtime/StatPhase.cc -@@ -413,12 +413,12 @@ - break; - } - } else { -- static CompoundXactInfo &compound = *CompoundXactInfo::Create(); -- compound.exchanges = 1; -- compound.reqSize = reqSize; -- compound.repSize = repSize; -- compound.lifeTime = repTime; -- compound.record(rec.theIsolated); -+ static CompoundXactInfo &compound2 = *CompoundXactInfo::Create(); -+ compound2.exchanges = 1; -+ compound2.reqSize = reqSize; -+ compound2.repSize = repSize; -+ compound2.lifeTime = repTime; -+ compound2.record(rec.theIsolated); - } - - if (x->cookiesSent() > 0) ---- a/src/cache/CacheEntryHash.cc -+++ b/src/cache/CacheEntryHash.cc -@@ -14,7 +14,7 @@ - - CacheEntryHash::CacheEntryHash(int aCapacity): theCount(0) { - theCapacity = (aCapacity + aCapacity/3 + 7) | 1; -- theIndex = new (CacheEntry*[theCapacity]); -+ theIndex = new (CacheEntry*[this->theCapacity]); - memset(theIndex, 0, sizeof(CacheEntry*)*theCapacity); - } - ---- a/src/tools/IntIntHash.cc -+++ b/src/tools/IntIntHash.cc -@@ -13,7 +13,7 @@ - - IntIntHash::IntIntHash(int aCapacity): theHashCap(0) { - theHashCap = (aCapacity + aCapacity/3 + 7) | 1; -- theIndex = new (IntIntHashItem*[theHashCap]); -+ theIndex = new (IntIntHashItem*[this->theHashCap]); - memset(theIndex, 0, sizeof(IntIntHashItem*)*theHashCap); - } - \ No newline at end of file diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix new file mode 100644 index 000000000000..d045450f9480 --- /dev/null +++ b/pkgs/tools/security/enchive/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "enchive-${version}"; + version = "3.3"; + src = fetchFromGitHub { + owner = "skeeto"; + repo = "enchive"; + rev = version; + sha256 = "0i3b0v5dqz56m5ppzm3332yxkw17dxs2zpvf48769ljgjy74irfl"; + }; + + makeFlags = ["PREFIX=$(out)"]; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp/ + cp -v "$src/enchive-mode.el" "$out/share/emacs/site-lisp/" + ''; + + meta = { + description = "Encrypted personal archives"; + homepage = https://github.com/skeeto/enchive; + license = stdenv.lib.licenses.unlicense; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 9de6216ea594..7ca4d8bd1c17 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,18 +9,19 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.7.3"; + version = "0.8.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "15wj1pfgzwzjfrqy7b5bx4y9f0hbpqlfif58l5xamwm88229qk4m"; + sha256 = "19y688nvi0vr7cdnaa5sy2m65xicjwi5qgkgzyjvb7r3zb0dnli1"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; buildPhase = '' + patchShebangs ./ substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' mkdir -p src/github.com/hashicorp diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 9e273d3c69b7..37447d0fb2ae 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "2.9.0"; + version = "2.16.0"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "781e9095d8152345a6106135e87c46eb306ff234b847de5073faca2f78544398"; + sha256 = "0c31z7w4b3wz5nahsmnfhvp3srprfsqbp3zyngw4cqw3dm17kvvi"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 73986b5be05d..cec4fc1ce8bf 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -1,34 +1,39 @@ -{ fetchurl, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv -, libavc1394, pkgconfig }: +{ fetchFromGitHub, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv +, libavc1394, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "dvgrab-3.5"; + name = "dvgrab-2016-05-16"; - src = fetchurl { - url = "mirror://sourceforge/kino/${name}.tar.gz"; - sha256 = "1y8arv14nc9sf8njfcxf96pb4nyimpsly1fnhcbj406k54s1h42r"; + src = fetchFromGitHub { + # mirror of original project with some build fixes + owner = "ddennedy"; + repo = "dvgrab"; + rev = "e46042e0c7b3523b6854ee547b0534e8310b7460"; + sha256 = "17qy76fjpzrbxm4pj0ljx5lbimxryv24fvr13jwkh24j85dxailn"; }; - buildInputs = - [ libunwind libraw1394 libjpeg libiec61883 libdv libavc1394 - pkgconfig - ]; + buildInputs = [ + libunwind libraw1394 libjpeg libiec61883 libdv libavc1394 + ]; - meta = { + nativeBuildInputs = [ + autoreconfHook pkgconfig + ]; + + meta = with stdenv.lib; { description = "Receive and store audio & video over IEEE1394"; - longDescription = - '' dvgrab receives audio and video data from a digital camcorder via an - IEEE1394 (widely known as FireWire) or USB link and stores them into - one of several file formats. It features autosplit of long video - sequences, and supports saving the data as raw frames, AVI type 1, - AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS. - ''; + longDescription = '' + dvgrab receives audio and video data from a digital camcorder via an + IEEE1394 (widely known as FireWire) or USB link and stores them into + one of several file formats. It features autosplit of long video + sequences, and supports saving the data as raw frames, AVI type 1, + AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS. + ''; homepage = http://kinodv.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; - maintainers = [ ]; + license = licenses.gpl2Plus; + platforms = platforms.gnu; }; } |