diff options
Diffstat (limited to 'pkgs/tools')
64 files changed, 630 insertions, 330 deletions
diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix new file mode 100644 index 000000000000..e4ba08a6ff36 --- /dev/null +++ b/pkgs/tools/X11/ncview/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl +, netcdf, x11, xorg, udunits, expat +}: + +let + pname = "ncview"; + version = "2.1.8"; + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "ftp://cirrus.ucsd.edu/pub/ncview/ncview-2.1.8.tar.gz"; + sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; + }; + + buildInputs = [ netcdf x11 xorg.libXaw udunits expat ]; + + meta = with stdenv.lib; { + description = "Visual browser for netCDF format files"; + homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ jmettes ]; + }; +} diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index d18fe4eafd34..afc9b44d42f2 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -47,6 +47,11 @@ in rec { sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59"; }; - ansible2 = ansible_2_5; + ansible_2_6 = generic { + version = "2.6.2"; + sha256 = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl"; + }; + + ansible2 = ansible_2_6; ansible = ansible2; } diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 1a85bf21b224..d01dca459591 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -1,28 +1,31 @@ { lib -, python +, python3 +, glibcLocales }: -with python.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.6.0"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0qg4b62kizyb16kk0cvpk70bfs3gg4q4hj2b15nnc7a3gqqfp67j"; + sha256 = "11d3ssjifms6bid77jk06zl5wl3srihijmv5kggxa0w2l59y8h9m"; }; propagatedBuildInputs = [ - pymysql configobj sqlparse prompt_toolkit pygments click pycrypto + pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers ]; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; + checkInputs = [ pytest mock glibcLocales ]; + + checkPhase = '' + export HOME=. + export LC_ALL="en_US.UTF-8" - # No tests in archive. Newer versions do include tests - doCheck = false; + py.test + ''; meta = { inherit version; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index ca0e16c1185a..f5be7719d0d2 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,17 +1,19 @@ -{ stdenv, pythonPackages, bash }: - -pythonPackages.buildPythonApplication rec { +{ stdenv, python3Packages, bash }: + +python3Packages.buildPythonApplication rec { pname = "simp_le-client"; - version = "0.8.0"; + version = "0.9.0"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i"; + sha256 = "1yxfznd78zkg2f657v520zj5w4dvq5n594d0kpm4lra8xnpg4zcv"; }; postPatch = '' # drop upper bound of acme requirement sed -ri "s/'(acme>=[^,]+),<[^']+'/'\1'/" setup.py + # drop upper bound of idna requirement + sed -ri "s/'(idna)<[^']+'/'\1'/" setup.py substituteInPlace simp_le.py \ --replace "/bin/sh" "${bash}/bin/sh" ''; @@ -20,14 +22,13 @@ pythonPackages.buildPythonApplication rec { $out/bin/simp_le --test ''; - propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy ]; + propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; meta = with stdenv.lib; { homepage = https://github.com/zenhack/simp_le; description = "Simple Let's Encrypt client"; license = licenses.gpl3; maintainers = with maintainers; [ gebner makefu ]; - platforms = platforms.all; + platforms = platforms.linux; }; } - diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 907ac58d15fe..292c0be20e57 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { # remaps /etc/passwd to a trivial file, but we can't do that on Darwin so I do this # instead. In this case, I pass in the very imaginative "submitter" as the submitter name - patchPhase = let + patches = [ + # CVE-2018-1000097 + (fetchurl { + url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-2+deb9u1/debian/patches/01-fix-heap-buffer-overflow-cve-2018-1000097.patch"; + sha256 = "19g0sxc8g79aj5gd5idz5409311253jf2q8wqkasf0handdvsbxx"; + }) + ]; + + postPatch = let # This evaluates to a string containing: # # substituteInPlace tests/shar-2 --replace '${SHAR}' '${SHAR} -s submitter' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 9e05043d4b02..20d85405bbac 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional enableNLS libnatspec ++ stdenv.lib.optional stdenv.isCygwin libiconv; - meta = { + meta = with stdenv.lib; { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; - platforms = stdenv.lib.platforms.all; + license = licenses.bsdOriginal; + platforms = platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index ce65ef4eb80b..3855152880e2 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }: +{ lib, python2, fetchFromGitHub, roundup }: -buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { pname = "ddar"; version = "1.0"; @@ -23,7 +23,7 @@ buildPythonApplication rec { make -f Makefile.prep synctus/ddar_pb2.py ''; - propagatedBuildInputs = [ protobuf ]; + propagatedBuildInputs = with python2.pkgs; [ protobuf ]; checkInputs = [ roundup ]; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index e8d3a2e185ee..f11a387e5fed 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash +{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg1, bash , gnugrep, txt2man, makeWrapper, which }: -stdenv.mkDerivation { - name = "duply-1.9.2"; +stdenv.mkDerivation rec { + name = "duply-${version}"; + version = "2.1"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.9.x/duply_1.9.2.tgz"; - sha256 = "1ay50rsr90dcnjncjclzfckqmxxnizmi4jhb5rsybfn0xdj0kz1b"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.1.x/duply_${version}.tgz"; + sha256 = "0i5j7h7h6ssrwhll0sfhymisshg54kx7j45zcqffzjxa0ylvzlm8"; }; buildInputs = [ txt2man makeWrapper ]; @@ -19,7 +20,7 @@ stdenv.mkDerivation { mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - ${stdenv.lib.makeBinPath [ coreutils python duplicity gawk gnupg1 bash gnugrep txt2man which ]} + ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg1 bash gnugrep txt2man which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index a7f90b3b3037..feb7b4802630 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.1"; + version = "0.9.2"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "116dc86fjmflmk0n2nywvv2f6z1jig3czqxz0cx0z77n8rmj9npv"; + sha256 = "0kl8yk636i3y7f2kd43pydjh4pv7hhq09p5k54jlysnrbf2kjb4h"; }; buildPhase = '' diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 3210e777889e..9c2fb0c0b002 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -1,18 +1,14 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -let - rev = "966f3c5f45ba18b2225c5b06918e41f56e223e73"; - revCount = "240"; - sha256 = "1m70a5rpycrfwrrc83745mamgpg54pc0n75qpzr9jbvicbp8g66p"; -in buildGoPackage rec { name = "wal-g-${version}"; - version = "0.1.8pre${revCount}_${builtins.substring 0 9 rev}"; + version = "0.1.10"; src = fetchFromGitHub { - owner = "wal-g"; - repo = "wal-g"; - inherit rev sha256; + owner = "wal-g"; + repo = "wal-g"; + rev = "v${version}"; + sha256 = "0klqnrrjzzxcj3clg7vapmbga1vqsfh8mkci5r2ir1bjp0z1xfnp"; }; goPackagePath = "github.com/wal-g/wal-g"; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index da562fde1603..9769896313ea 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,18 +1,19 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3 +{ stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: let + pythonPackages = python3Packages; binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; in stdenv.mkDerivation rec { name = "blueman-${version}"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; - sha256 = "1jl83z56c01ypvv98mxn74kpbv58yrccggp1rbmnw1dnvjxvjbic"; + sha256 = "0bc1lfsjkbrg9f1jnw6mx7bp04x76ljy9g0rgx7n80vaj0hpz3bj"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 0d2e63c7d59d..4b127417ca8d 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -35,11 +35,10 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; - meta = { - homepage = http://www.bzip.org; + meta = with stdenv.lib; { description = "High-quality data compression program"; - - platforms = stdenv.lib.platforms.all; + license = licenses.bsdOriginal; + platforms = platforms.all; maintainers = []; }; } diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 2697d22a0e01..06c7e6439a9f 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -2,28 +2,18 @@ stdenv.mkDerivation rec { name = "zopfli-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "google"; repo = "zopfli"; rev = name; name = "${name}-src"; - sha256 = "1dclll3b5azy79jfb8vhb21drivi7vaay5iw0lzs4lrh6dgyvg6y"; + sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y"; }; patches = [ (fetchpatch { - sha256 = "07z6df1ahx40hnsrcs5mx3fc58rqv8fm0pvyc7gb7kc5mwwghvvp"; - name = "Fix-invalid-read-outside-allocated-memory.patch"; - url = "https://github.com/google/zopfli/commit/9429e20de3885c0e0d9beac23f703fce58461021.patch"; - }) - (fetchpatch { - sha256 = "07m8q5kipr84cg8i1l4zd22ai9bmdrblpdrsc96llg7cm51vqdqy"; - name = "zopfli-bug-and-typo-fixes.patch"; - url = "https://github.com/google/zopfli/commit/7190e08ecac2446c7c9157cfbdb7157b18912a92.patch"; - }) - (fetchpatch { name = "zopfli-cmake.patch"; url = "https://github.com/google/zopfli/commit/7554e4d34e7000b0595aa606e7d72357cf46ba86.patch"; sha256 = "1pvfhir2083v1l042a4dy5byqdmad7sxnd4jrprl2hzzb2avxbbn"; diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix deleted file mode 100644 index b723c107936c..000000000000 --- a/pkgs/tools/compression/zstdmt/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, zstd, lz4 }: - -stdenv.mkDerivation rec { - name = "zstdmt-${version}"; - version = "0.3"; - - src = fetchFromGitHub { - sha256 = "17i44kjc612sbs7diim9ih007zp7z9zs3q3yacd6dzlqya5vsp0w"; - rev = "v${version}"; - repo = "zstdmt"; - owner = "mcmilk"; - }; - - setSourceRoot = '' - sourceRoot=$(echo */unix) - ''; - - buildInputs = [ - zstd lz4 - ]; - - makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ]; - - installPhase = '' - mkdir -p $out/bin/ - mv zstdmt lz4mt $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "Multithreading Library for LZ4, LZ5 and ZStandard"; - homepage = https://github.com/mcmilk/zstdmt; - license = with licenses; [ bsd2 ]; - - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch deleted file mode 100644 index 812f9954cf20..000000000000 --- a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index af7a206..553ac70 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr) - INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools - else - ROOT_SBINDIR=$(PREFIX)/sbin -- INITRAMFS_DIR=/etc/initramfs-tools -+ INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools - endif - - .PHONY: all diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 1fafe7412d87..b919d5808756 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium -, keyutils, liburcu, zlib, libaio, zstd }: +{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +, liburcu, zlib, libaio, zstd, lz4 }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-04-10"; + name = "bcachefs-tools-unstable-2018-07-21"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "c598d91dcb0c7e95abdacb2711898ae14ab52ca1"; - sha256 = "1mglw6p1145nryn8babkg2hj778kqa0vrzjbdp9kxjlyb3fksmff"; + rev = "cecf7e05e151499a3e96dc05f97f37c14162e94b"; + sha256 = "18vmyrjwza1iv0apkykbqsnnic5lrqlwfsrj85pgrpwzii36i8i0"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ]; - patches = [ ./Makefile.patch ]; - + buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; installFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + sed -i \ + "s,INITRAMFS_DIR=/etc/initramfs-tools,INITRAMFS_DIR=$out/etc/initramfs-tools,g" Makefile + ''; meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; homepage = https://bcachefs.org/; license = licenses.gpl2; - maintainers = with maintainers; [ davidak chiiruno]; + maintainers = with maintainers; [ davidak chiiruno ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 321259292ef4..20e1853a3af6 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.10.0"; + version = "1.11.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "1254pd254l1hxkzkkzqmzc0j9vywj2wddg9apqaixjninj21jrbc"; + sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index b3d8d70f0e29..d7d917d5e9fb 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "squashfuse"; - version = "unstable-2018-02-20"; + version = "0.1.103"; name = "${pname}-${version}"; meta = { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vasi"; repo = "${pname}"; - rev = "3f4a93f373796e88f7eee3a0c005ef60cb395d30"; + rev = "540204955134eee44201d50132a5f66a246bcfaf"; sha256 = "07jv4qjjz9ky3mw3p5prgs19g1bna9dcd7jjdz8083s1wyipdgcq"; }; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 01ddd6ba7fc5..84940e23f0c1 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.44"; + version="2.46"; name="${baseName}-${version}"; - hash="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg"; - url="https://freefr.dl.sourceforge.net/project/asymptote/2.44/asymptote-2.44.src.tgz"; - sha256="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg"; + hash="06nvvgpyrjwd3pd7q2j6qj5fjv3yvdqb0k9859i1lghjm0bg5kkq"; + url="https://freefr.dl.sourceforge.net/project/asymptote/2.46/asymptote-2.46.src.tgz"; + sha256="06nvvgpyrjwd3pd7q2j6qj5fjv3yvdqb0k9859i1lghjm0bg5kkq"; }; buildInputs = [ ghostscriptX imagemagick fftw diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 21d86f4c44b6..4c565e91a4de 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,22 +1,26 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "1.0.1"; + version = "2.1.0"; name = "oxipng-${version}"; src = fetchFromGitHub { owner = "shssoichiro"; repo = "oxipng"; rev = "v${version}"; - sha256 = "0w39f0dhq9cxk25vy0wh8vicxyckvj1vmglx5va4550i3q0hsrws"; + sha256 = "13rzkfb025y4i9dj66fgc74whgs90gyw861dccsj16cpfl6kh5z0"; }; - cargoSha256 = "00nbx6n73yl4ax05pqkmim1vhy0pymgz5la1cc4y18gjbjjj9w4h"; + cargoSha256 = "0l6ad8rnifd5hkv6x2cr0frdddsfwm1xd1v56imlglsjkgz56cva"; meta = with stdenv.lib; { homepage = https://github.com/shssoichiro/oxipng; description = "A lossless PNG compression optimizer"; license = licenses.mit; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; + + # macro is_arm_feature_detected! is unstable + broken = stdenv.isAarch64; }; } diff --git a/pkgs/tools/graphics/scour/default.nix b/pkgs/tools/graphics/scour/default.nix new file mode 100644 index 000000000000..11932aabe0bb --- /dev/null +++ b/pkgs/tools/graphics/scour/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python3 }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "scour"; + version = "0.37"; + + src = fetchPypi { + inherit pname version; + sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "An SVG Optimizer / Cleaner "; + homepage = https://github.com/scour-project/scour; + license = licenses.asl20; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index c1cca25c576e..daaffbf080fd 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -1,13 +1,11 @@ { lib, python3Packages, fetchFromGitHub, glibcLocales }: -let - pythonPackages = python3Packages; -in pythonPackages.buildPythonApplication rec { - name = "asciinema-${version}"; +python3Packages.buildPythonApplication rec { + pname = "asciinema"; version = "2.0.1"; - buildInputs = with pythonPackages; [ nose ]; - propagatedBuildInputs = with pythonPackages; [ requests ]; + buildInputs = with python3Packages; [ nose ]; + propagatedBuildInputs = with python3Packages; [ requests ]; src = fetchFromGitHub { owner = "asciinema"; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index d70af6b311ff..bc6f1a1ff0d4 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.1.1"; + version = "4.2.3"; src = fetchurl { - url = "https://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6"; + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + sha256 = "1v42hr4p9nj7jvcjkffif6w7icns5iq0mgk9ih2mi5j2h1ngh1f7"; }; dontConfigure = true; @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r dist/Geekbench-${version}-Linux/. $out/bin - rm $out/bin/geekbench_x86_32 + cp -r geekbench.plar geekbench4 geekbench_x86_64 $out/bin for f in geekbench4 geekbench_x86_64 ; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform benchmark"; - homepage = http://geekbench.com/; + homepage = https://geekbench.com/; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 7db908773169..51844c8e5faa 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.8"; + version = "1.2018.9"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "02svd0cpaix2d523iy457h3qwlc9qpvvkls64bqa7yrqyk43xrii"; + sha256 = "0g5wd80brwqb0v9rbs66y3clv9jsccc8937jzz4r9gzp38rkvzmn"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 9ba61221684a..e29e799898c3 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip +{ stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip , rtmpdump }: let - inherit (pythonPackages) python nose pycrypto requests mock; + inherit (python3Packages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; version = "1.9.11"; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index decbddcd477f..4cbb2943d3cf 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.8.2"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "1yflnydzdfkr8bi29yf42hb6h6525a4rdid3w8qjfk8rpqh53pqj"; + sha256 = "19w9g1ksr0vyblgcirppj0279gfj5s902jblzgav5a4n2mq42rrq"; }; postAutoreconf = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index be6bacd3b214..ebdd08b23a84 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.07.10"; + version = "2018.08.04"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1rigah941k2drzx5qz937lk68gw9jrizj5lgd9f9znp0bgi2d0xd"; + sha256 = "1hcx99qbbyigc8k98c8bcc6a2wnhq6493fmrkl7rysc8krlxr0pm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 1690d3fcc3e3..8f72976d7dce 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,6 +1,6 @@ { useLua ? !stdenv.isDarwin , usePcre ? true -, stdenv, fetchurl, fetchpatch +, stdenv, fetchurl , openssl, zlib, lua5_3 ? null, pcre ? null }: @@ -9,26 +9,14 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "1.8.9"; + version = "1.8.13"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; - sha256 = "00miblgwll3mycsgmp3gd3cn4lwsagxzgjxk5i6csnyqgj97fss3"; + sha256 = "2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-11469.patch"; - url = "https://git.haproxy.org/?p=haproxy-1.8.git;a=patch;h=17514045e5d934dede62116216c1b016fe23dd06"; - sha256 = "0hzcvghg8qz45n3mrcgsjgvrvicvbvm52cc4hs5jbk1yb50qvls7"; - }) - ] ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { - name = "fix-darwin-no-threads-build.patch"; - url = "https://git.haproxy.org/?p=haproxy-1.8.git;a=patch;h=fbf09c441a4e72c4a690bc7ef25d3374767fe5c5;hp=3157ef219c493f3b01192f1b809a086a5b119a1e"; - sha256 = "16ckzb160anf7xih7mmqy59pfz8sdywmyblxnr7lz9xix3jwk55r"; - }); - buildInputs = [ openssl zlib ] ++ stdenv.lib.optional useLua lua5_3 ++ stdenv.lib.optional usePcre pcre; @@ -51,7 +39,8 @@ stdenv.mkDerivation rec { "USE_LUA=yes" "LUA_LIB=${lua5_3}/lib" "LUA_INC=${lua5_3}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc"; + ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc" + ++ stdenv.lib.optional stdenv.isLinux "USE_GETADDRINFO=1"; meta = { description = "Reliable, high performance TCP/HTTP load balancer"; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 86d162648238..bb627f49971b 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "lftp-${version}"; - version = "4.8.3"; + version = "4.8.4"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz" "https://lftp.yar.ru/ftp/${name}.tar.xz" ]; - sha256 = "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny"; + sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index e2d4880250c2..c995eea7b14d 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "megatools-${version}"; - version = "2017-10-26"; + version = "1.10.2"; src = fetchFromGitHub { owner = "megous"; repo = "megatools"; - rev = "35dfba3262f620b4701ec1975293463957e20f26"; - sha256 = "0xphgv78j731rmhxic4fwzdr7vq5px921qifrw1y40b93nhy4d5n"; + rev = "${version}"; + sha256 = "001hw8j36ld03wwaphq3xdaazf2dpl36h84k8xmk524x8vlia8lk"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 644bf00e8c28..52e350c6319e 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,46 +1,20 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 +{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection -, libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: +, libappindicator-gtk3, withGnome ? false }: let pname = "network-manager-applet"; - version = "1.8.14"; + version = "1.8.16"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya"; + sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2"; }; - patches = [ - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch; - sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk"; - }) - - # following 3 patches: - # https://gitlab.gnome.org/GNOME/network-manager-applet/issues/11 - # should be fixed in 1.8.16 - (fetchpatch { - name = "0001-connection-editor-hold-GApplication-while-the-import.patch"; - url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/419c459e70ac752eb9226b0db1192fb0433d5d5e.patch; - sha256 = "0zi4fn2ynymi6ckkdrj8vcl78pwmkan4n8l53axaqb4kn0wnahdj"; - }) - (fetchpatch { - name = "0002-connection-list-attempt-a-VPN-import-first.patch"; - url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/9d79ffdb148b31c7194c66946c87b6cd57ed54a3.patch; - sha256 = "1v0pdvkglrcfl1khp9j17cw0gvwg8scdha0wfziy054s1r6kyj23"; - }) - (fetchpatch { - name = "0003-bluetooth-fix-an-assert-failure-on-creation-cancella.patch"; - url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/516f3f6c70ef9694d6004c64d50a9f3cd2725ab7.patch; - sha256 = "1msk4hmri3x5chmclxm7sdj1v9jg7pxqqrarlvsmfmshdwq4ljwk"; - }) - ]; - mesonFlags = [ "-Dselinux=false" "-Dappindicator=yes" @@ -51,9 +25,9 @@ in stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes libgudev + polkit isocodes mobile-broadband-provider-info libgudev modemmanager jansson glib-networking - libindicator-gtk3 libappindicator-gtk3 + libappindicator-gtk3 ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ]; nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; @@ -62,10 +36,6 @@ in stdenv.mkDerivation rec { hicolor-icon-theme ]; - NIX_CFLAGS = [ - ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 647b7ed26da9..13c195d64e88 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchFromGitHub, pythonPackages, +{ stdenv, fetchFromGitHub, python2Packages, asciidoc, libxml2, libxslt, docbook_xsl }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { version = "7.2.1"; - name = "offlineimap-${version}"; - namePrefix = ""; + pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; @@ -21,7 +20,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; - propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ]; + propagatedBuildInputs = with python2Packages; [ six kerberos ]; postInstall = '' make -C docs man diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 87cf6d172c0c..9c6f5eec11b7 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "libtorrent-${version}"; - version = "20161212"; + version = "0.13.7"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"; - sha256 = "0y9759sxx5dyamyw8w58dsxq7bmnn57q7s2f4cw2zln2pp5gripw"; + rev = "v${version}"; + sha256 = "027qanwcisxhx0bq8dn8cpg8563q0k2pm8ls278f04n7jqvvwkp0"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = "http://rtorrent.net/downloads/"; + inherit (src.meta) homepage; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 6ab462ac5a8c..658739c93aa0 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "rtorrent-${version}"; - version = "20161023"; + version = "0.9.7"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "226e670decf92e7adaa845a6982aca4f164ea740"; - sha256 = "0cxyakc09bn6wjfj42gh508hc62awx825skzacpizx2bqs6v7xvb"; + rev = "v${version}"; + sha256 = "0a9dk3cz56f7gad8ghsma79iy900rwdvzngs6k6x08nlwaqid8ga"; }; nativeBuildInputs = [ pkgconfig ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = https://rakshasa.github.io/rtorrent/; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 623081fbb4ef..eedea841356d 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "speedtest-cli-${version}"; version = "2.0.2"; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 24a19b8de9db..d2b124bf1a18 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180708"; + version = "0.0.20180802"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "04c3vynr7rfmnnw7gccbap9xcfi89ma09lq66c4bzjzxny1n2wdz"; + sha256 = "1bz9hk3h57r160hxzwa942xkczhgrpwni9sr7gswrkfv3n0as3fa"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 1075e4616186..4061d5284aa6 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,20 +1,28 @@ -{stdenv, fetchurl, xlibsWrapper, imake}: +{ stdenv, fetchurl, xlibsWrapper, imake }: stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; + outputs = [ "out" "man" ]; + src = fetchurl { url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz; sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7"; }; - preConfigure = " - configureFlags=\"--with-app-defaults-dir=$out/etc/X11/app-defaults\" - "; + nativeBuildInputs = [ imake ]; + buildInputs = [ xlibsWrapper ]; + + configureFlags = [ + "--with-app-defaults-dir=$out/etc/X11/app-defaults" + ]; - buildPhase = "xmkmf; make includes; make"; + preBuild = '' + xmkmf + make includes + ''; - buildInputs = [xlibsWrapper imake]; + installTargets = [ "install" "install.man" ]; meta = { homepage = http://www.jmknoble.net/software/x11-ssh-askpass/; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index bc8b1a5e0cdf..ac7e01482283 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.10"; + version = "1.2.12"; name = "zerotierone-${version}"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0mqckh51xj79z468n2683liczqracip36jvhfyd0fr3pwrbyqy8w"; + sha256 = "1m7ynrgzpg2sp37hcmjkx6w173icfhakzn1c1zrdzrxmmszrj9r1"; }; preConfigure = '' diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix new file mode 100644 index 000000000000..2c389c144b1e --- /dev/null +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -0,0 +1,112 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, cmake, autoconf, automake, libtool +, wget, xxd, desktop-file-utils +, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive +, squashfsTools +, gtest +}: + +let + + appimagekit_src = fetchFromGitHub { + owner = "AppImage"; + repo = "AppImageKit"; + rev = "b0859501df61cde198b54a317c03b41dbafc98b1"; + sha256 = "0qqg79jw9w9rs8c2w3lla4kz62ihafrf7jm370pp1dl8y2i81jzg"; + }; + + # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/cmake/dependencies.cmake" + appimagekit_squashfuse = squashfuse.overrideAttrs (attrs: rec { + name = "squashfuse-${version}"; + version = "20161009"; + + src = fetchFromGitHub { + owner = "vasi"; + repo = "squashfuse"; + rev = "1f980303b89c779eabfd0a0fdd36d6a7a311bf92"; + sha256 = "0lrw9ff8k15l34wjwyllw3i35hl0cms97jj2hpnr2q8ipgxpb5q5"; + }; + + patches = [ + "${appimagekit_src}/squashfuse.patch" + "${appimagekit_src}/squashfuse_dlopen.patch" + ]; + + postPatch = '' + cp -v ${appimagekit_src}/squashfuse_dlopen.[hc] . + ''; + + preConfigure = '' + sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure + sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h + ''; + + configureFlags = [ + "--disable-demo" "--disable-high-level" "--without-lzo" "--without-lz4" + ]; + + postConfigure = '' + sed -i "s|XZ_LIBS = -llzma |XZ_LIBS = -Bstatic -llzma/|g" Makefile + ''; + + # only static libs and header files + installPhase = '' + mkdir -p $out/lib $out/include + cp -v ./.libs/*.a $out/lib + cp -v ./*.h $out/include + ''; + }); + +in stdenv.mkDerivation rec { + name = "appimagekit-20180727"; + + src = appimagekit_src; + + patches = [ ./nix.patch ]; + + nativeBuildInputs = [ + pkgconfig cmake autoconf automake libtool wget xxd + desktop-file-utils + ]; + + buildInputs = [ + glib zlib cairo openssl fuse + xz inotify-tools libarchive + squashfsTools + ]; + + preConfigure = '' + export HOME=$(pwd) + ''; + + cmakeFlags = [ + "-DUSE_SYSTEM_XZ=ON" + "-DUSE_SYSTEM_SQUASHFUSE=ON" + "-DSQUASHFUSE=${appimagekit_squashfuse}" + "-DUSE_SYSTEM_INOTIFY_TOOLS=ON" + "-DUSE_SYSTEM_LIBARCHIVE=ON" + "-DUSE_SYSTEM_GTEST=ON" + "-DUSE_SYSTEM_MKSQUASHFS=ON" + "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" + ]; + + checkInputs = [ gtest ]; + doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why + + # for debugging + passthru = { + squashfuse = appimagekit_squashfuse; + }; + + meta = with stdenv.lib; { + description = "A tool to package desktop applications as AppImages"; + longDescription = '' + AppImageKit is an implementation of the AppImage format that + provides tools such as appimagetool and appimaged for handling + AppImages. + ''; + license = licenses.mit; + homepage = src.meta.homepage; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/package-management/appimagekit/nix.patch b/pkgs/tools/package-management/appimagekit/nix.patch new file mode 100644 index 000000000000..9725cef5ba7d --- /dev/null +++ b/pkgs/tools/package-management/appimagekit/nix.patch @@ -0,0 +1,174 @@ +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index ea133a3..916606c 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -224,21 +224,23 @@ if(NOT USE_SYSTEM_XZ) + LIBRARY_DIRS <INSTALL_DIR>/lib/ + LIBRARIES "<INSTALL_DIR>/lib/liblzma.a" + INCLUDE_DIRS "<SOURCE_DIR>/src/liblzma/api/" + ) + else() + message(STATUS "Using system xz") + + import_pkgconfig_target(TARGET_NAME xz PKGCONFIG_TARGET liblzma STATIC) + endif() + ++set(USE_SYSTEM_SQUASHFUSE OFF CACHE BOOL "Use system squashfuse instead of building our own") + ++if(NOT USE_SYSTEM_SQUASHFUSE) + # as distros don't provide suitable squashfuse and squashfs-tools, those dependencies are bundled in, can, and should + # be used from this repository + # TODO: implement out-of-source builds for squashfuse, as for the other dependencies + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/src/patch-squashfuse.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/patch-squashfuse.sh + @ONLY + ) + + ExternalProject_Add(squashfuse-EXTERNAL +@@ -259,20 +261,34 @@ ExternalProject_Add(squashfuse-EXTERNAL + BUILD_IN_SOURCE ON + INSTALL_COMMAND ${MAKE} install + ) + + import_external_project( + TARGET_NAME squashfuse + EXT_PROJECT_NAME squashfuse-EXTERNAL + LIBRARIES "<SOURCE_DIR>/.libs/libsquashfuse.a;<SOURCE_DIR>/.libs/libsquashfuse_ll.a;<SOURCE_DIR>/.libs/libfuseprivate.a" + INCLUDE_DIRS "<SOURCE_DIR>" + ) ++else() ++ message(STATUS "Using system squashfsfuse from ${SQUASHFUSE}") ++ ++ add_library(squashfuse INTERFACE IMPORTED GLOBAL) ++ ++ set(squashfuse_INCLUDE_DIRS "${SQUASHFUSE}/include") ++ set(squashfuse_LIBRARIES "${SQUASHFUSE}/lib/libsquashfuse.a;${SQUASHFUSE}/lib/libsquashfuse_ll.a;${SQUASHFUSE}/lib/libfuseprivate.a") ++ ++ set_property( ++ TARGET squashfuse ++ PROPERTY INTERFACE_LINK_LIBRARIES ${squashfuse_LIBRARIES} ++ ) ++ include_directories(${squashfuse_INCLUDE_DIRS}) ++endif() + + + set(USE_SYSTEM_INOTIFY_TOOLS OFF CACHE BOOL "Use system libinotifytools instead of building our own") + + if(NOT USE_SYSTEM_INOTIFY_TOOLS) + message(STATUS "Downloading and building inotify-tools") + + # TODO: build out of source + ExternalProject_Add(inotify-tools-EXTERNAL + URL https://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-3.14.tar.gz +@@ -345,20 +361,23 @@ if(NOT USE_SYSTEM_GTEST) + INCLUDE_DIRS "<INSTALL_DIR>/include/" + ) + else() + message(STATUS "Using system GTest") + + import_find_pkg_target(gtest GTest GTEST) + endif() + endif() + + ++set(USE_SYSTEM_MKSQUASHFS OFF CACHE BOOL "Use system mksquashfs instead of downloading and building our own") ++ ++if(NOT USE_SYSTEM_MKSQUASHFS) + # TODO: allow using system wide mksquashfs + set(mksquashfs_cflags "-DXZ_SUPPORT ${CFLAGS}") + + if(xz_LIBRARIES MATCHES "\\.a$") + set(mksquashfs_ldflags "${xz_LIBRARIES}") + else() + set(mksquashfs_ldflags "-l${xz_LIBRARIES}") + endif() + + if(xz_INCLUDE_DIRS) +@@ -385,20 +404,25 @@ ExternalProject_Add(mksquashfs + INSTALL_COMMAND ${MAKE} -C squashfs-tools/ install INSTALL_DIR=<INSTALL_DIR> + ) + + ExternalProject_Get_Property(mksquashfs INSTALL_DIR) + set(mksquashfs_INSTALL_DIR "${INSTALL_DIR}") + mark_as_advanced(mksquashfs_INSTALL_DIR) + + # for later use when packaging as an AppImage + set(mksquashfs_BINARY "${mksquashfs_INSTALL_DIR}/mksquashfs") + mark_as_advanced(mksquashfs_BINARY) ++else() ++ message(STATUS "Using system mksquashfs") ++ ++ set(mksquashfs_BINARY "mksquashfs") ++endif() + + + #### build dependency configuration #### + + # only have to build custom xz when not using system libxz + if(TARGET xz-EXTERNAL) + if(TARGET squashfuse-EXTERNAL) + ExternalProject_Add_StepDependencies(squashfuse-EXTERNAL configure xz-EXTERNAL) + endif() + if(TARGET mksquashfs) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3f25442..974ed0e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -197,27 +197,27 @@ target_include_directories(digest_md5 + + target_link_libraries(digest_md5 + PRIVATE + libglib + ) + + + # install binaries + if(AUXILIARY_FILES_DESTINATION) + install( +- PROGRAMS ${mksquashfs_INSTALL_DIR}/mksquashfs ${CMAKE_CURRENT_BINARY_DIR}/runtime ++ PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/runtime + DESTINATION ${AUXILIARY_FILES_DESTINATION} + COMPONENT applications + ) + else() + install( +- PROGRAMS ${mksquashfs_INSTALL_DIR}/mksquashfs ${CMAKE_CURRENT_BINARY_DIR}/runtime ++ PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/runtime + DESTINATION bin + COMPONENT applications + ) + endif() + + install( + TARGETS AppRun appimagetool digest validate + RUNTIME DESTINATION bin COMPONENT applications + LIBRARY DESTINATION lib COMPONENT applications + ARCHIVE DESTINATION lib/static COMPONENT applications +diff --git a/src/shared.c b/src/shared.c +index cf5fd5c..4f48dbc 100644 +--- a/src/shared.c ++++ b/src/shared.c +@@ -34,21 +34,21 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <dirent.h> + #include <errno.h> + + #include <glib.h> + #include <glib/gprintf.h> + #include <glib/gstdio.h> + #include <gio/gio.h> + +-#include "squashfuse.h" ++#include <squashfuse.h> + #include <squashfs_fs.h> + #include "getsection.h" + #include "elf.h" + + #include "xdg-basedir.h" + + // own header + #include "shared.h" + + #if HAVE_LIBARCHIVE3 == 1 // CentOS diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index c216195f54d7..d27fe50ab581 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "0dv6hzmfqyhfi6zzjm10nzzqiy2wyfhiksm1cd4fznq0psxaihfj"; + sha256 = "0lfwikcxnjjb10ssawkfgq7k8i86lsdcn0c0plwi9hgpxl2b52mp"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index f6c5c7b53e13..c22a8a5e85ec 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchurl, git }: +{ lib, python3Packages, fetchurl, git }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "nox-${version}"; version = "0.0.6"; namePrefix = ""; @@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec { patches = [ ./nox-review-wip.patch ]; - buildInputs = [ pythonPackages.pbr git ]; + buildInputs = [ python3Packages.pbr git ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ dogpile_cache click requests diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index d343064cc539..8423caa49d59 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -3,11 +3,11 @@ zlib, bzip2, lzma }: stdenv.mkDerivation rec { name = "pacman-${version}"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz"; - sha256 = "1b545zvh661vkypnqr1cdicypym9d2kfvnxbf4a61qkyza6kzx35"; + sha256 = "17g497q6ylq73rql9k2ji2l2b2bj3dd4am30z8i6khnhc0x8s2il"; }; # trying to build docs fails with a2x errors, unable to fix through asciidoc diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix new file mode 100644 index 000000000000..1679b7fddd07 --- /dev/null +++ b/pkgs/tools/security/b2sum/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchzip, openmp ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "b2sum-${version}"; + version = "unstable-2018-06-11"; + + src = fetchzip { + url = "https://github.com/BLAKE2/BLAKE2/archive/320c325437539ae91091ce62efec1913cd8093c2.tar.gz"; + sha256 = "0agmc515avdpr64bsgv87wby2idm0d3wbndxzkhdfjgzhgv0rb8k"; + }; + + sourceRoot = "source/b2sum"; + + buildInputs = [ openmp ]; + + buildFlags = [ (optional (isNull openmp) "NO_OPENMP=1") ]; + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "The b2sum utility is similar to the md5sum or shasum utilities but for BLAKE2"; + homepage = "https://blake2.net"; + license = with licenses; [ asl20 cc0 openssl ]; + maintainers = with maintainers; [ kirelagin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 903794622fb0..0f515c518040 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.27"; + version = "1.4.29"; name = "ccid-${version}"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2"; - sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56"; + url = "https://ccid.apdu.fr/files/${name}.tar.bz2"; + sha256 = "0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5"; }; postPatch = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ccid drivers for pcsclite"; - homepage = http://pcsclite.alioth.debian.org/; + homepage = https://ccid.apdu.fr/; license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 0afa91086890..77a15e2f27c7 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation { - name = "ccrypt-1.10"; + name = "ccrypt-1.11"; src = fetchurl { - url = mirror://sourceforge/ccrypt/ccrypt-1.10.tar.gz; - sha256 = "184v9676hx2w875cz04rd3a20wrcms33a1zwybvapb0g2yi6vml7"; + url = mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz; + sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 5f4fbea9fcd9..a8fc864afd63 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fwknop"; - version = "2.6.9"; + version = "2.6.10"; src = fetchFromGitHub { owner = "mrash"; repo = pname; rev = version; - sha256 = "1509d1lzfmhavdwi65dwb0jaglpy8ciccgpcnhx9ks6s7irn923c"; + sha256 = "05kvqhmxj9p2y835w75f3jvhr38bb96cd58mvfd7xil9dhmhn9ra"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 725f913734d4..9bac2d6c8035 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "4.1.0"; + version = "4.2.1"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "170i2y32ykgzb1qf1wz3klwn31c09bviz4x3bnrwia65adqrj8xx"; + sha256 = "082k5srjwkfvnvz0bfcg5r12m9c2qjyfhnp135mparkf831p7bbx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index f019aa460aea..ff153fddf4d3 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "2.1.1"; + version = "2.5.0"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "1s1bgi9hcilz2is8w2kkvzi928i7w6m5j2x8avkb8zl9s3mrqz3q"; + sha256 = "196w7vvi49xpmzn9d75qr5a1b8w23931544kx9bkc9bbwbjfc4la"; }; buildFlags = [ "-tags production" ]; @@ -23,5 +23,6 @@ buildGoPackage rec { description = "The Keybase FS FUSE driver"; platforms = platforms.linux; maintainers = with maintainers; [ bennofs np ]; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 549794b78313..c8bbe42c9d6a 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -38,10 +38,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.3.0-20180627160031.8e0438e6fb"; + version = "2.5.0-20180807164805.0fda758997"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0xaxxjdfdmgv0wfy75dspfa0a7cdwdpphyy6my9vw82v8jxl3ffx"; + sha256 = "135sm3h5i2h9j06py827psjbhhiqy1mb133s92p7jp6q1mhr8j1x"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { description = "The Keybase official GUI."; platforms = platforms.linux; maintainers = with maintainers; [ puffnfresh np ]; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index ba5defbe2151..4d90289f3f35 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.37"; + version = "0.38"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0g1p12jbraj0q5qpvqnbg5v1jwlcx6h04xz5s7jds51l7gf5f9np"; + sha256 = "151w68i0bhryij79s9xny8wh2256zayc5gyrj0s5nwnhl9yxz0f1"; }; prePatch = '' diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index fbce70e9e8ea..f23345fb71db 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efibootmgr-${version}"; - version = "16"; + version = "17"; nativeBuildInputs = [ pkgconfig ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "rhboot"; repo = "efibootmgr"; rev = version; - sha256 = "0b27h8vf1b6laln5n0wk2hkzyyh87sxanj7wrz9kimyx03dcq6vi"; + sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"; }; makeFlags = [ "EFIDIR=nixos" ]; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 2a5eea0b2516..261f4cee2b83 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, libaio, python, zlib }: - -let - version = "3.7"; - sha256 = "1m2slyxhzyznq283m6ljjgjg38i0hxg537bwhfs12qskv00c4vsk"; -in +{ stdenv, fetchFromGitHub, makeWrapper +, libaio, python, zlib +, withGnuplot ? false, gnuplot ? null }: stdenv.mkDerivation rec { name = "fio-${version}"; + version = "3.8"; src = fetchFromGitHub { - owner = "axboe"; - repo = "fio"; - rev = "fio-${version}"; - inherit sha256; + owner = "axboe"; + repo = "fio"; + rev = "fio-${version}"; + sha256 = "1krifr4ms7x229a3p088zl5rpdrfwz6bw4c2lrz3hksignjxaw91"; }; buildInputs = [ python zlib ] ++ stdenv.lib.optional (!stdenv.isDarwin) libaio; + nativeBuildInputs = [ makeWrapper ]; + enableParallelBuilding = true; postPatch = '' @@ -27,9 +27,14 @@ stdenv.mkDerivation rec { substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; + postInstall = stdenv.lib.optionalString withGnuplot '' + wrapProgram $out/bin/fio2gnuplot \ + --prefix PATH : ${stdenv.lib.makeBinPath [ gnuplot ]} + ''; + meta = with stdenv.lib; { - homepage = "http://git.kernel.dk/?p=fio.git;a=summary;"; description = "Flexible IO Tester - an IO benchmark tool"; + homepage = "http://git.kernel.dk/?p=fio.git;a=summary;"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index f3bd820e3e85..cd6577694890 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.1.1"; + version = "3.1.2"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1w1smjhinddf139yir44y88j5bjw5kzmprk2ljc3k6xz3va7v1k0"; + sha256 = "00s7qbmywk3wka985lhhki17xs7d0ll8p172avv1pzmdwfrm703n"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 75e25bcc6730..75f609684406 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, mailutils, gzip, popt, autoreconfHook }: +{ stdenv, fetchFromGitHub, gzip, popt, autoreconfHook +, mailutils ? null +}: stdenv.mkDerivation rec { name = "logrotate-${version}"; @@ -14,8 +16,11 @@ stdenv.mkDerivation rec { # Logrotate wants to access the 'mail' program; to be done. patchPhase = '' sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' \ - -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac + -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac + + ${stdenv.lib.optionalString (mailutils != null) '' + sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac + ''} ''; autoreconfPhase = '' diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 7bb98e8e80c4..6f86647f4c70 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.9.0"; + version = "1.10.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "1vy0jz5lxw63b830l9jgf1qqhp41gzapyhdr5k1gwg3zghvlg10w"; + sha256 = "02spfisabjkkgd9fairldlf84n83vbv2xafg0g5jrpfa972pjl9r"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ zlib libuuid ]; - # Allow UI to load when running as non-root - patches = [ ./web_access.patch ]; - # Build will fail trying to create /var/{cache,lib,log}/netdata without this postPatch = '' sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch deleted file mode 100644 index ae4d29185de4..000000000000 --- a/pkgs/tools/system/netdata/web_access.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/web_client.c.orig -+++ b/src/web_client.c -@@ -302,7 +302,7 @@ - buffer_strcat_htmlescape(w->response.data, webfilename); - return 404; - } -- -+#if 0 - // check if the file is owned by expected user - if(stat.st_uid != web_files_uid()) { - error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid()); -@@ -320,7 +320,7 @@ - buffer_strcat_htmlescape(w->response.data, webfilename); - return 403; - } -- -+#endif - if((stat.st_mode & S_IFMT) == S_IFDIR) { - snprintfz(webfilename, FILENAME_MAX, "%s/index.html", filename); - return mysendfile(w, webfilename); diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix new file mode 100644 index 000000000000..054de73c080f --- /dev/null +++ b/pkgs/tools/system/nvtop/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: + +stdenv.mkDerivation rec { + name = "nvtop-${version}"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Syllo"; + repo = "nvtop"; + rev = version; + sha256 = "0gampikzmd1l0vdhvarl0hckl6kmjh2rwcllpg6rrm2p75njw7hv"; + }; + + cmakeFlags = [ + "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" + "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so.390.67" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses nvidia_x11 cudatoolkit ]; + + meta = with stdenv.lib; { + description = "A (h)top like like task monitor for NVIDIA GPUs"; + homepage = https://github.com/Syllo/nvtop; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ willibutz ]; + }; +} diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 5b2be75e452f..6cdaec10868f 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${stdenv.lib.version}"; + OSQUERY_PLATFORM = "NixOS;"; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 81e929382b2d..1367871ded41 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -3,7 +3,7 @@ , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null -, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null +, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null }: with stdenv.lib; @@ -11,21 +11,21 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.21.0"; + name = "rsyslog-8.37.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx"; + sha256 = "1rs7y7xgjm82j4mp0897x2myv73kkcj86np37y7qzgca9jdjhp19"; }; #patches = [ ./fix-gnutls-detection.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc + fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq - rabbitmq-c hiredis + rabbitmq-c hiredis mongoc ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c ++ stdenv.lib.optional stdenv.isLinux systemd; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index aa41e7b7f60a..f70f0f3d75b2 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; - rev = "${version}"; - sha256 = "1h7k9ik723qzplwl0a5i0anzdr115wwklfgp0n11p4k2ckh7nygn"; + rev = version; + sha256 = "089xffrqi4wm0w1lhy5iqxrcb82ca44bxl8qps4ilv0ih91vxwfj"; }; - cargoSha256 = "1gld93dxfm4vyiz1b43smbdhxmyzdk2236ksp8vw1zb1yyzn83nf"; + cargoSha256 = "1wsw7s1bc1gnpq4kjzkas5zf2snhpx9f6cyrrf6g5jr8l0hcbyih"; nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index fe890c2916d0..b49305409024 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "0wcw4kyivb10m9b173183jrj46a0gisd35yqxi1mr9hw5l5dhkpa"; + sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; }; patches = [ ./bash-completion.patch ]; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index c9280c102b70..d19838f9ff06 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,16 +1,9 @@ -{ stdenv, fetchFromGitHub, buildPerlModule, autovivification, BusinessISBN -, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple -, DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian -, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder -, FileSlurp, FileWhich, IPCRun3, LogLog4perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils -, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate -, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor -, TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey -, TestDifferences }: +{ stdenv, fetchFromGitHub, perlPackages }: -buildPerlModule rec { +perlPackages.buildPerlModule rec { name = "biber-${version}"; version = "2.7"; + src = fetchFromGitHub { owner = "plk"; repo = "biber"; @@ -18,7 +11,7 @@ buildPerlModule rec { sha256 = "04jmsh59g2s0b61rm25z0hwb6yliqyh5gjs4y74va93d2b9mrd17"; }; - buildInputs = [ + buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DateTime DateTimeFormatBuilder DateTimeCalendarJulian @@ -32,10 +25,10 @@ buildPerlModule rec { # Tests depend on the precise Unicode-Collate version (expects 1.19, but we have 1.25) doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Backend for BibLaTeX"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index d6bdbf920852..16b7a734c22d 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.3.4"; + version = "1.4.1"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz"; - sha256 = "131f6sd4azpc988kwzlrc9c4x98abhfnxr5wpk7i427ha84g89yb"; + sha256 = "14nabq1hrz5jvilx22yxbqjsd9s4ll0fnl750n1qbyyxw2m6vj9b"; }; postPatch = '' |