diff options
Diffstat (limited to 'pkgs/tools')
47 files changed, 257 insertions, 195 deletions
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch b/pkgs/tools/X11/xpra/0002-Constant-DPI.patch index f91e53d1e493..f91e53d1e493 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch +++ b/pkgs/tools/X11/xpra/0002-Constant-DPI.patch diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch b/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch index 3dbb6fd179ff..3dbb6fd179ff 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch +++ b/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch b/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch index 567db3fc3865..567db3fc3865 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch +++ b/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index cef8bd491637..968c695c464a 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig +{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which , ffmpeg_4, x264, libvpx, libwebp, x265 @@ -11,7 +11,23 @@ with lib; let inherit (python3.pkgs) cython buildPythonApplication; - xf86videodummy = callPackage ./xf86videodummy { }; + xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { + patches = [ + ./0002-Constant-DPI.patch + ./0003-fix-pointer-limits.patch + ./0005-support-for-30-bit-depth-in-dummy-driver.patch + ]; + }); + + xorgModulePaths = writeText "module-paths" '' + Section "Files" + ModulePath "${xorgserver}/lib/xorg/modules" + ModulePath "${xorgserver}/lib/xorg/modules/extensions" + ModulePath "${xorgserver}/lib/xorg/modules/drivers" + ModulePath "${xf86videodummy}/lib/xorg/modules/drivers" + EndSection + ''; + in buildPythonApplication rec { pname = "xpra"; version = "3.0.7"; @@ -81,6 +97,11 @@ in buildPythonApplication rec { ) ''; + # append module paths to xorg.conf + postInstall = '' + cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf + ''; + doCheck = false; enableParallelBuilding = true; diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/pkgs/tools/X11/xpra/xf86videodummy/default.nix deleted file mode 100644 index 4e9f88608927..000000000000 --- a/pkgs/tools/X11/xpra/xf86videodummy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchurl -, xorgproto, xorgserver -, pkgconfig }: - -with lib; - -stdenv.mkDerivation rec { - version = "0.3.8"; - suffix = "1"; - name = "xpra-xf86videodummy-${version}-${suffix}"; - builder = ../../../../servers/x11/xorg/builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-dummy-${version}.tar.bz2"; - sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; - }; - patches = [ - ./0002-Constant-DPI.patch - ./0003-fix-pointer-limits.patch - ./0005-support-for-30-bit-depth-in-dummy-driver.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto xorgserver ]; - - meta = { - description = "Dummy driver for Xorg with xpra patches"; - homepage = https://xpra.org/trac/wiki/Xdummy; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ numinit ]; - }; -} diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index efd6db395f20..f85a61be4a8d 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "lxd"; - version = "3.23"; + version = "4.0.0"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1zbm736m9g4c40r55s6rg3xrgw9bysslr992sa80vlrxfmwfiqg4"; + sha256 = "00kydp6aysggng9a7m0q3zj3591yk6jgcibbqxx4ki20pd4vmqnb"; }; preBuild = '' @@ -49,7 +49,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = https://linuxcontainers.org/lxd/; + homepage = "https://linuxcontainers.org/lxd/"; license = licenses.asl20; maintainers = with maintainers; [ fpletz wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix index f7e96971ab19..f95dcc8bb6dd 100644 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ b/pkgs/tools/audio/google-music-scripts/default.nix @@ -1,17 +1,22 @@ { lib, python3 }: -python3.pkgs.buildPythonApplication rec { +with python3.pkgs; + +buildPythonApplication rec { pname = "google-music-scripts"; - version = "4.0.1"; + version = "4.3.0"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d"; + sha256 = "0dykjhqklbpqr1lvls0bgf6xkwvslj37lx4q8522hjbs150pwjmq"; }; - patches = [ ./loguru.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "audio-metadata>=0.8,<0.9" "audio-metadata" + ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ appdirs audio-metadata google-music @@ -24,10 +29,12 @@ python3.pkgs.buildPythonApplication rec { ]; # No tests - doCheck = false; + checkPhase = '' + $out/bin/gms --help >/dev/null + ''; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music-scripts; + homepage = "https://github.com/thebigmunch/google-music-scripts"; description = "A CLI utility for interacting with Google Music"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/tools/audio/google-music-scripts/loguru.patch b/pkgs/tools/audio/google-music-scripts/loguru.patch deleted file mode 100644 index 141ce044c431..000000000000 --- a/pkgs/tools/audio/google-music-scripts/loguru.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -24,7 +24,7 @@ audio-metadata = "^0.4" - google-music = "^3.0" - google-music-proto = "^2.4" - google-music-utils = "^2.1" --loguru = "^0.2" -+loguru = "^0.3" - pendulum = "^2.0" - natsort = ">=5.0,<7.0" - tomlkit = "^0.5" ---- a/setup.py -+++ b/setup.py -@@ -16,7 +16,7 @@ install_requires = \ - 'google-music-proto>=2.4,<3.0', - 'google-music-utils>=2.1,<3.0', - 'google-music>=3.0,<4.0', -- 'loguru>=0.2,<0.3', -+ 'loguru>=0.3,<0.4', - 'natsort>=5.0,<7.0', - 'pendulum>=2.0,<3.0', - 'tomlkit>=0.5,<0.6'] diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index fe9f1ae11e60..4a912d3b42c2 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.110"; + version = "3.0.112"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "16m3mxmik2ifrv1g9cp68k57w8xwsxacws3sh1ajlba4azj9sf8v"; + sha256 = "04ymwg9r9x9gqjwy9jbjv7zzfgwal0xlfy6z5bwl27m2ys6l5k4a"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://moosefs.com; + homepage = "https://moosefs.com"; description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index b477ad8deace..58bd9340c5b0 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.23"; + name = "mtools-4.0.24"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i"; + sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14"; }; patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/mtools/; + homepage = "https://www.gnu.org/software/mtools/"; description = "Utilities to access MS-DOS disks"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index bc8ce7b19c53..df8b3f22c484 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig -, lz4, xz, zlib, zstd +, lz4, lzo, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.8"; + version = "0.9"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y"; + sha256 = "1jx6bga0k07cckpv0yk77kwql7rjiicf9wkbadc8yqhp463xn90q"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; - buildInputs = [ zlib xz lz4 zstd ]; + buildInputs = [ zlib xz lz4 lzo zstd ]; meta = with lib; { homepage = https://github.com/AgentD/squashfs-tools-ng; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0ac1c1a21553..c04101575c73 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -48,12 +48,16 @@ in (if aquaterm then "--with-aquaterm" else "--without-aquaterm") ]; + CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; + postInstall = lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ --prefix PATH : '${fontconfig.bin}/bin' \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' + '' + lib.optionalString (stdenv.isDarwin && withQt) '' + wrapQtApp $out/bin/gnuplot ''; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index b7e2fb00a140..5d31570aacd5 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.4"; + version = "0.13.5b"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h"; + sha256 = "0gcv9w79r9q3rzrdqiq9xgh68ya653sq84vzgf0fb154zmzjkxfv"; }; - cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9"; + cargoSha256 = "0534jykfnqs1gfnmijkpcf91ddpbggw7p25h4arci14lgd2wrmgd"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index b2fb6925abac..38dbd5780254 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.16"; + version = "1.7.18"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52"; + sha256 = "12gx78cbs7abizlqhs7y2w6lwlk5d1hhvixj0ki8d1d5vdr747bc"; }; - modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; + modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 38619f537151..7a8e56a4d6aa 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.58"; + version = "0.2.59"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49"; + sha256 = "14a7mb1a1s74hi124v4jscc72m09zq2bd8xrhq5agz9z27plqm2c"; }; - cargoSha256 = "0m2931fmc8jczjpb08077cpz9klhhf3aq15j2h76sb254qndagzy"; + cargoSha256 = "1945s3ajpy55fzh5wbl7fchqck0fh69shl18lxni9hvg04smq39i"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 99dcc194d011..bf6c125ac759 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "08gscwdq7fwfpk3mf7dfdf64n5ijm5kjb7f5wrzzvpnnqz24xnb0"; + sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg"; }; doCheck = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configurable embedded Linux firmware update creator and runner"; - homepage = https://github.com/fhunleth/fwup; + homepage = "https://github.com/fhunleth/fwup"; license = licenses.asl20; maintainers = [ maintainers.georgewhewell ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d337731888fd..d5c75a1e8a7a 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.21.0-1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv"; + sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; }; modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 5438f71930da..7a8b16c55e0d 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,25 +1,25 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: - buildGoPackage rec { - pname = "git-town"; - version = "7.2.0"; +buildGoPackage rec { + pname = "git-town"; + version = "7.3.0"; - goPackagePath = "github.com/Originate/git-town"; + goPackagePath = "github.com/Originate/git-town"; - src = fetchFromGitHub { - owner = "Originate"; - repo = "git-town"; - rev = "v${version}"; - sha256 = "0hr0c6iya34lanfhsg9kj03l4ajalcfxkbn4bgwh0749smhi6mrj"; - }; + src = fetchFromGitHub { + owner = "Originate"; + repo = "git-town"; + rev = "v${version}"; + sha256 = "166g9i79hqga8k5wvs0b84q6rqniizzsd39v37s9w16axgdrm6nb"; + }; - buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; - meta = with stdenv.lib; { - description = "Generic, high-level git support for git-flow workflows"; - homepage = http://www.git-town.com/; - maintainers = [ maintainers.allonsy ]; - license = licenses.mit; - }; - } + meta = with stdenv.lib; { + description = "Generic, high-level git support for git-flow workflows"; + homepage = "http://www.git-town.com/"; + maintainers = [ maintainers.allonsy ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 6ded4f28e9d7..49ca39c7d060 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1n9nwxq0aklihhp0v39klq4za63ks6v5z76dp5821jcv1cbk96g9"; + sha256 = "0m3g68ycb0yvdpiyd6qysgz0ygz9s0kb98g79cdx9rqpb7x0rmd0"; }; dontBuild = true; diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/misc/kanshi/default.nix index d3e0ba029f3f..0cb20315f66c 100644 --- a/pkgs/tools/misc/kanshi/default.nix +++ b/pkgs/tools/misc/kanshi/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, wayland }: +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "0v50q1s105c2rar6mi1pijm8llsnsp62gv4swd3ddjn5rwallg46"; + sha256 = "0nbpgm8qnn7ljsg9vgs35kl8l4rrk542vdcbx8wrn9r909ld3x92"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 207492a89449..0a8f10fa85d5 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "geek1011"; repo = pname; rev = "v${version}"; - sha256 = "17zhfq1nfdas4k5yzyr82zs3r3mm4n8f907ih1ckx081hy4g7a2p"; + sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; }; - modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43"; + modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - subPackages = [ "." "covergen" "seriesmeta" ]; + excludedPackages = [ "kobotest" ]; meta = with lib; { description = "EPUB to KEPUB converter"; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 77fdbcf8ac34..d55b2cd6f248 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pSub vrthra ]; + maintainers = with maintainers; [ pSub vrthra tomberek ]; }; } diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/tools/misc/parallel/wrapper.nix new file mode 100644 index 000000000000..b85dfc56f3d6 --- /dev/null +++ b/pkgs/tools/misc/parallel/wrapper.nix @@ -0,0 +1,13 @@ +{ parallel, makeWrapper , runCommand +, perlPackages +, extraPerlPackages ? + with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] +}: + +runCommand "parallel-full" { + nativeBuildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" + '' diff --git a/pkgs/tools/misc/pfetch/default.nix b/pkgs/tools/misc/pfetch/default.nix index 49867331780f..bbecf4656e74 100644 --- a/pkgs/tools/misc/pfetch/default.nix +++ b/pkgs/tools/misc/pfetch/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "pfetch"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "pfetch"; rev = version; - sha256 = "0yg9nlrjnm2404ysm2qp1klpq1wlmyih302kzfqchn6l2sibsm4j"; + sha256 = "06z0k1naw3k052p2z7241lx92rp5m07zlr0alx8pdm6mkc3c4v8f"; }; dontBuild = true; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A pretty system information tool written in POSIX sh"; - homepage = https://github.com/dylanaraps/pfetch; + homepage = "https://github.com/dylanaraps/pfetch"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ equirosa ]; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 1472b4ae72f6..7c906ecddf9d 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "0b0x389khdqyzdb6mwbf31wdfn8xila756hb11l555iwipl271ci"; + sha256 = "0xjb8slrlkrzdqvzmf63lq6rgggrjw3hf9an6h8xf6vizz1vfni0"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0xcsj8wprp9r6s7r2d2fnbicrc5pfnnx1gxyrq2qkj3rwr1q8ndg"; + cargoSha256 = "14p4ppbl2mak21jvxpbd1b28jaw2629bc8kv7875cdzy3ksxyji3"; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index db1938160b3d..39882b4e6e6d 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.2.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "02rcgz1sklll0gpxjwb7y3jc6flzr4492qp72blra6a26qpb7vxp"; + sha256 = "0r42hrhd33kkkvii9h4896cmr319q728pdnhhamkhzgilvzxrwrz"; }; - cargoSha256 = "1kd4q2ddm5byf62xj923n140k9x89yf9yswwgsnvkbpvrnpl4mwj"; + cargoSha256 = "041djz3w7qmr19xq4cxgpw0m4qz2368q2wijw5aidvrxqlcz7xg2"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index e88322f7f756..c621e5ae2c2d 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -2,14 +2,14 @@ let pname = "wootility"; - version = "3.3.3"; + version = "3.4.6"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "1qdiacwnvqahqkrhwnblz0jjywn63c6ndl3z450myhx5x55fdcja"; + sha256 = "02ivbgnzr657iqb9hviaylmsym2kki2c84xmqfix3b0awsphn05q"; }; profile = '' diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 348104e95913..93b2aba5dbfc 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "amass"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9"; + sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf"; }; - modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl"; + modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 0412020518e5..20c9fe714511 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43"; + sha256 = "1qc7na1c0c5i2r19vg54ggvcmnkyz024hqlbzgix2v5n6wlpk0fc"; }; - modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q"; + modSha256 = "1y6qfb71vaard2l9fv83alprwpvii0pbzl8b3damd4j9x158hk7b"; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 089eee332b4c..b82f1e7bb4bb 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dnscrypt-proxy2"; - version = "2.0.39"; + version = "2.0.42"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "jedisct1"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "0fvnp2brmqkwn04v01k53f9djk9ywa1cg26m2frhv4lj0581430y"; + sha256 = "1v4n0pkwcilxm4mnj4fsd4gf8pficjj40jnmfkiwl7ngznjxwkyw"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 8296600cf3d3..6f57e9812397 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.23.7"; + version = "0.24.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a"; + sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg"; }; - modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; + modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz"; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 98d2625aade9..5649ff06dda3 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; + enableParallelBuilding = true; + patches = [ ./ssh_path.patch ./utempter_path.patch diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index a85d4d7ad108..7bc6d0e2be78 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nethogs"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${version}"; - sha256 = "13plwblwbnyyi40jaqx471gwhln08wm7f0fxyvj1yh3d81k556yx"; + sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; }; buildInputs = [ ncurses libpcap ]; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index b70bf2952f7a..01e4bdcaa8b5 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, glib +, libcap +, libseccomp +, libslirp +}: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.4.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "1932q80s6187k4fsvgia5iwc9lqsdkxzqqwpw1ksy0mx8wzmwbih"; + sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libcap libseccomp glib ]; + buildInputs = [ glib libcap libseccomp libslirp ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 3bf3b97c2355..91b080153279 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50"; + sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; + modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 8845c54b5714..bb91697ab57c 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.12"; + version = "0.2.15"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1jhv7c68ymwaq9fr586rjbgcaxpkxcr0d3pq7lyhbzihaywz7m6m"; + sha256 = "1h1z18m504kflzv9wcybkgc4xr5w9l9d7qsjri0an57lxv6dpv0f"; }; - cargoSha256 = "1n4k8mnsix3sy6pmqkk7wymknn1mn5dkwa9i90nlb4k2h9y709wj"; + cargoSha256 = "1wfxy4py2xwf1m0i52jq1f9xgzc7v5m55crl0xbp8f0raflksaxk"; meta = with lib; { description = "Mirror installed software on multiple machines"; homepage = "https://github.com/tversteeg/emplace"; license = licenses.agpl3; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index dc69ae457dcd..bd80d4a93507 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python3, sqlite , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive -# TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false , enableBashCompletion ? false, bash-completion ? null @@ -23,7 +22,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib polkit python3 gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; - propagatedBuildInputs = [ sqlite nix boost ]; + propagatedBuildInputs = + [ sqlite boost ] + ++ lib.optional enableNixBackend nix; nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 71f39eaf2ee9..f2abc376cd27 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.17.0"; + x86_64-linux = "1.17.2"; }.${system} or ""; sha256 = { - x86_64-linux = "01azgz1wka32z2jjdnbdyzm8fbrb34ifwirmjbvfw37yia28sd72"; + x86_64-linux = "0v7lrwj3sdypnqayknwg0cg9c2gfsxbjic5wswkfxljy652x8izx"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/tools/security/onesixtyone/default.nix new file mode 100644 index 000000000000..4eed52b07f0e --- /dev/null +++ b/pkgs/tools/security/onesixtyone/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "onesixtyone"; + version = "unstable-2019-12-26"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "onesixtyone"; + rev = "9ce1dcdad73d45c8694086a4f90d7713be1cbdd7"; + sha256 = "111nxn4pcbx6p9j8cjjxv1j1s7dgf7f4dix8acsmahwbpzinzkg3"; + }; + + buildPhase = '' + $CC -o onesixtyone onesixtyone.c + ''; + + installPhase = '' + install -D onesixtyone $out/bin/onesixtyone + ''; + + meta = with stdenv.lib; { + description = "Fast SNMP Scanner"; + homepage = "https://github.com/trailofbits/onesixtyone"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.fishi0x01 ]; + }; +} + diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 011747890818..4373abdb9a4b 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "15zxi64s1hgpm3rxk0m7z5363jc7h80g91bfx8vg7nw680lday4w"; + sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; }; - modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx"; + modSha256 = "1kcj5065yy52p1jy4fad5lsz3y4spqc40k1qsirm53qqixhrhvag"; subPackages = [ "." "cmd/saml2aws" ]; diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix index e419232641b6..1395b8e10617 100644 --- a/pkgs/tools/security/scallion/default.nix +++ b/pkgs/tools/security/scallion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl, ocl-icd }: +{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }: stdenv.mkDerivation rec { version = "2.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp scallion/bin/Debug/* $out/share/ makeWrapper ${mono}/bin/mono $out/bin/scallion \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ocl-icd ]} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ --add-flags $out/share/scallion.exe ''; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index daf9ce58c911..44ef60c70f38 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gotop"; - version = "3.0.0"; - - goPackagePath = "github.com/cjbassi/gotop"; + version = "3.5.0"; src = fetchFromGitHub { - owner = "cjbassi"; + owner = "xxxserxxx"; repo = pname; - rev = version; - sha256 = "1kndj5qjaqgizjakh642fay2i0i1jmfjlk1p01gnjbh2b0yzvj1r"; + rev = "v${version}"; + sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; }; + modSha256 = "1gbpxq2vyshln97gij5y9qsjyf3mkwfqwwhikc0cck3mnwiv87dd"; + meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; - homepage = https://github.com/cjbassi/gotop; + homepage = "https://github.com/xxxserxxx/gotop"; license = licenses.agpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index 2b4d1deb9f9b..2f5adc3f4c95 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/tools/system/minijail/default.nix @@ -1,45 +1,60 @@ -{ stdenv, fetchFromGitiles, libcap }: +{ stdenv, lib, fetchFromGitiles, glibc, libcap, qemu }: + +let + dumpConstants = + if stdenv.buildPlatform == stdenv.hostPlatform then "./dump_constants" + else if stdenv.hostPlatform.isAarch32 then "qemu-arm dump_constants" + else if stdenv.hostPlatform.isAarch64 then "qemu-aarch64 dump_constants" + else if stdenv.hostPlatform.isx86_64 then "qemu-x86_64 dump_constants" + else throw "Unsupported host platform"; +in stdenv.mkDerivation rec { pname = "minijail"; - version = "android-10.0.0_r9"; + version = "14"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/minijail"; - rev = version; - sha256 = "0gcfsyim1krrddcklydqfxl8mamaxgail2xl5qp9yclq60km8f22"; + rev = "linux-v${version}"; + sha256 = "00dq854n4zg3ca2b46f90k15n32zn2sgabi76mnq2w985k9v977n"; }; + nativeBuildInputs = + lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) qemu; buildInputs = [ libcap ]; makeFlags = [ "LIBDIR=$(out)/lib" ]; - - preConfigure = '' - substituteInPlace common.mk --replace /bin/echo echo - sed -i '/#include <asm\/siginfo.h>/ d' signal_handler.c - ''; + dumpConstantsFlags = lib.optional (stdenv.hostPlatform.libc == "glibc") + "LDFLAGS=-L${glibc.static}/lib"; postPatch = '' + substituteInPlace common.mk --replace /bin/echo echo patchShebangs platform2_preinstall.sh ''; postBuild = '' - ./platform2_preinstall.sh ${version} $out/include/chromeos + make $makeFlags $buildFlags $dumpConstantsFlags dump_constants + ${dumpConstants} > constants.json ''; installPhase = '' - mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin + ./platform2_preinstall.sh ${version} $out/include/chromeos + + mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin \ + $out/share/minijail + cp -v *.so $out/lib cp -v *.pc $out/lib/pkgconfig cp -v libminijail.h scoped_minijail.h $out/include/chromeos cp -v minijail0 $out/bin + cp -v constants.json $out/share/minijail ''; - meta = { - homepage = https://android.googlesource.com/platform/external/minijail/; + meta = with lib; { + homepage = "https://android.googlesource.com/platform/external/minijail/"; description = "Sandboxing library and application using Linux namespaces and capabilities"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [pcarrier]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ pcarrier qyliss ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/tools/system/minijail/tools.nix new file mode 100644 index 000000000000..875ea0dbff95 --- /dev/null +++ b/pkgs/tools/system/minijail/tools.nix @@ -0,0 +1,13 @@ +{ buildPythonApplication, lib, minijail }: + +buildPythonApplication { + pname = "minijail-tools"; + inherit (minijail) version src; + + meta = with lib; { + homepage = "https://android.googlesource.com/platform/external/minijail/+/refs/heads/master/tools/"; + description = "A set of tools for minijail"; + license = licenses.asl20; + inherit (minijail.meta) maintainers platforms; + }; +} diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 1b6e4d945d42..a12f07d6da61 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.6.5"; + version = "0.7.2"; src = fetchFromGitHub { owner = "chmln"; repo = pname; - rev = version; - sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj"; + rev = "v${version}"; + sha256 = "15siv3p22v7lj37b74pjsy360qx97d40q2xdzdg2srbi8svjgg27"; }; - cargoSha256 = "0n4c0snmjfyk3z2mbzpqgb6ggyv4nqszdda035g3rzpbavzx9xb5"; + cargoSha256 = "1sa7ki7kyg98l2gcrdzk7182ghm1clyqljjb596mhzh48g8kddn5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index cb4bc14927de..ee4d0dfe588a 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -153,7 +153,8 @@ in buildEnv { rm "$link" makeWrapper "$target" "$link" \ --prefix PATH : "$out/bin:${perl}/bin" \ - --prefix PERL5LIB : "$PERL5LIB" + --prefix PERL5LIB : "$PERL5LIB" \ + --set-default TEXMFCNF "$TEXMFCNF" # avoid using non-nix shebang in $target by calling interpreter if [[ "$(head -c 2 "$target")" = "#!" ]]; then diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 0daa01f85bb3..04d222609a67 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -3,6 +3,7 @@ , curl , json_c , pam +, bashInteractive }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace compat.h --replace /bin/bash ${stdenv.shell} + substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash ''; buildInputs = [ curl.dev pam ]; |