diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/9pfs/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/filesystems/aefs/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/misc/gparted/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/pg_top/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/qt5ct/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/subberthehut/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/networking/inadyn/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/miniupnpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/nbd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/s4cmd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/keybase/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/security/pass/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/security/sudo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/testdisk-photorec/default.nix | 51 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tectonic/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 5 |
19 files changed, 130 insertions, 43 deletions
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 37ec4105472b..2e34c9dd4857 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist + homepage = https://github.com/mischief/9pfs; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; + license = with lib.licenses; [ lpl-102 bsd2 ]; }; } diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index d081f08ffc7c..9ea4d092548f 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fuse }: - + stdenv.mkDerivation rec { name = "aefs-0.4pre259-8843b7c"; - + src = fetchurl { url = "http://tarballs.nixos.org/${name}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/; description = "A cryptographic filesystem implemented in userspace using FUSE"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index ca078c16ab6b..a3c30c15e5f7 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.31.0"; + name = "gparted-0.32.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv"; + sha256 = "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df"; }; configureFlags = [ "--disable-doc" ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index f92f03c4cc79..7af5e12081b6 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180722"; + name = "parallel-20180822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "06635p9w4kl0mvqlbgglsndl1zm06f65ckzrjl9p8n4cswf443fg"; + sha256 = "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 4de334331158..4f4bd7e754c4 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -14,13 +14,11 @@ stdenv.mkDerivation rec { description = "A 'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: - <itemizedlist> - <listitem>View currently running SQL statement of a process.</listitem> - <listitem>View query plan of a currently running SQL statement.</listitem> - <listitem>View locks held by a process.</listitem> - <listitem>View user table statistics.</listitem> - <listitem>View user index statistics.</listitem> - </itemizedlist> + * View currently running SQL statement of a process. + * View query plan of a currently running SQL statement. + * View locks held by a process. + * View user table statistics. + * View user index statistics. ''; homepage = http://ptop.projects.postgresql.org/; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index a43335626acf..72ba4863c40a 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.35"; + version = "0.36"; src = fetchurl { url = "mirror://sourceforge/qt5ct/${name}.tar.bz2"; - sha256 = "0xzgd12cvm4vyzl8qax6izdmaf46bf18h055z6k178s8pybm1sqw"; + sha256 = "12gfhchp05xn311zsxh41k3anyrscg53r5d06dasyxyk6hpr9hwg"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix new file mode 100644 index 000000000000..e5cc5ad4198f --- /dev/null +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: +stdenv.mkDerivation rec { + name = "subberthehut-${version}"; + version = "20"; + + src = fetchFromGitHub { + owner = "mus65"; + repo = "subberthehut"; + rev = version; + sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xmlrpc_c glib zlib ]; + + installPhase = '' + install -Dm755 subberthehut $out/bin/subberthehut + install -Dm644 bash_completion $out/share/bash-completion/completions/subberthehut + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mus65/subberthehut; + description = "An OpenSubtitles.org downloader"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jqueiroz ]; + }; +} diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 6178181193cf..8029415a98cf 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.3.1"; + version = "2.4"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "0m2lkmvklhnggv1kim0rikq1gxxc984lsg4gpn8s6lzv6y0axbya"; + sha256 = "1h24yavp1246zn5isypvxrilp6xj2266qr52w2r24qxicr8b320y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 0c546ff91090..07112d1497af 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "miniupnpd-2.1.20180706"; + name = "miniupnpd-2.1"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "01mhv3lgpj2shs3666zwlhvfiv1mpf4h9mv35g8gihyq8k82ybgw"; + sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 6b6d99e745e1..0f7f75b989e2 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.17"; + name = "nbd-3.18"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r"; + sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq"; }; buildInputs = diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 20f129357dff..8088cc0ec4d9 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "s4cmd"; - version = "2.0.1"; + version = "2.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "14gfpnj4xa1sq3x3zd29drpzsygn998y32szwm069ma0w9jwjjz6"; + sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2"; }; propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index a46550d59cdb..27793f448013 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.14.1"; + version = "4.14.2"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "0fvrjq6jsvbllb5q6blchzh7p5flk61rz34g4g9mp9iwrhn0xx23"; + sha256 = "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 1bccd4c9f957..beea202a9562 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,8 +1,10 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub +, AVFoundation ? null, AudioToolbox ? null, ImageIO ? null, CoreMedia ? null +, Foundation ? null, CoreGraphics ? null, MediaToolbox ? null }: buildGoPackage rec { name = "keybase-${version}"; - version = "2.1.0"; + version = "2.5.0"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,9 +15,10 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "16izsx5944byc930i6pqsbyrp316yyy8z5xvmzj0g8rgawajdx5h"; + sha256 = "0fa55nizld8q0szhlpsf75ifb53js3crh98xmf8mn4bvms7d0x09"; }; + buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 1f0126005f8f..007ffdf3e3fa 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchurl, buildEnv -, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode -, makeWrapper +, coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps +, qrencode , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin @@ -66,7 +66,8 @@ let which qrencode procps - ] ++ ifEnable x11Support [ dmenu xclip xdotool ]); + ] ++ optional stdenv.isDarwin openssl + ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' # Link extensions env @@ -97,6 +98,9 @@ let -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ -e '/which gpg/ d' \ tests/setup.sh + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # 'pass edit' uses hdid, which is not available from the sandbox. + rm -f tests/t0200-edit-tests.sh ''; doCheck = false; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 0a760807afbc..71cf239d72cb 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.23"; + name = "sudo-1.8.24"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"; + sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l"; }; prePatch = '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 7abf9e85ab88..4164adcb25bf 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.16.1"; + version = "3.17.2"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "0a9snxvs3fsv0gm5q9xkrcg0hwgs3c8q1rb434cnzn4qbqfnzvn7"; + sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/pkgs/tools/system/testdisk-photorec/default.nix new file mode 100644 index 000000000000..5342cf857acc --- /dev/null +++ b/pkgs/tools/system/testdisk-photorec/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchurl +, ncurses +, libuuid +, libjpeg +, zlib +, ntfs3g +, e2fsprogs +}: + +stdenv.mkDerivation rec { + name = "testdisk-photorec-${version}"; + version = "7.0"; + src = fetchurl { + url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2"; + sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; + }; + buildInputs = [ + ncurses + libuuid + # optional: + libjpeg + zlib + ntfs3g + e2fsprogs + #libewf # makes it fail to build + #qt4 # for qphotorec, which does not build in 7.0 + ]; + meta = with stdenv.lib; { + homepage = https://www.cgsecurity.org/wiki/Main_Page; + downloadPage = https://www.cgsecurity.org/wiki/TestDisk_Download; + description = "Data recovery utilities"; + longDescription = '' + TestDisk is a powerful free data recovery software. It was primarily + designed to help recover lost partitions and/or make non-booting disks + bootable again when these symptoms are caused by faulty software: certain + types of viruses or human error (such as accidentally deleting a + Partition Table). + + PhotoRec is a file data recovery software designed to recover lost files + including video, documents and archives from hard disks, CD-ROMs, and + lost pictures (thus the Photo Recovery name) from digital camera memory. + PhotoRec ignores the file system and goes after the underlying data, so + it will still work even if your media's file system has been severely + damaged or reformatted. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index fa8af0089556..0d082eac4bba 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform -, darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }: +, darwin, fontconfig, harfbuzz, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontconfig harfbuzz-icu openssl ] + buildInputs = [ fontconfig harfbuzz openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); # tests fail due to read-only nix store diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8e7551b4e410..b313fc0b53de 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -95,12 +95,13 @@ core = stdenv.mkDerivation rec { configureFlags = common.configureFlags ++ [ "--without-x" ] # disable xdvik and xpdfopen - ++ map (what: "--disable-${what}") [ + ++ map (what: "--disable-${what}") ([ "dvisvgm" "dvipng" # ghostscript dependency "luatex" "luajittex" "mp" "pmp" "upmp" "mf" # cairo would bring in X and more "xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small - ] + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit") ++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure + ; enableParallelBuilding = true; |