From d6d127668df3dd9c52f4aa07ef6d4755aa45ba5d Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 13 Apr 2022 21:51:50 +0300 Subject: [PATCH 001/182] cmdstan: 2.17.1 -> 2.29.2 --- .../development/compilers/cmdstan/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index a41f836e10c..40fdcb29013 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.17.1"; + version = "2.29.2"; + # includes stanc binaries needed to build cmdstand src = fetchurl { url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; + sha256 = "sha256-VntTH6c//fcGyqF+szROHftB6GmTyvi6QIdf+RAzUVM="; }; buildFlags = [ "build" ]; @@ -14,7 +15,16 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ python3 ]; - checkPhase = "python ./runCmdStanTests.py src/test/interface"; # see #5368 + + postPatch = '' + substituteInPlace stan/lib/stan_math/make/libraries \ + --replace "/usr/bin/env bash" "bash" + patchShebangs . + ''; + + checkPhase = '' + ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface + ''; installPhase = '' mkdir -p $out/opt $out/bin @@ -28,6 +38,9 @@ stdenv.mkDerivation rec { chmod a+x $out/bin/stan ''; + # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. + preFixup = "rm -rf $(pwd)"; + meta = { description = "Command-line interface to Stan"; longDescription = '' From 5a77756649f7c95268c86dfa6fa96d65bbccd4b1 Mon Sep 17 00:00:00 2001 From: Christian Luetke Stetzkamp Date: Fri, 22 Apr 2022 11:46:45 +0200 Subject: [PATCH 002/182] radicle-upstream: 0.2.12 -> 0.3.0 Fixes #168605 --- .../git-and-tools/radicle-upstream/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 87d92e72a8f..d5791f6506c 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,17 +2,17 @@ let pname = "radicle-upstream"; - version = "0.2.12"; + version = "0.3.0"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "7520c7feb94234df6f8523689d098e0d19510e2ac0122e482d1e01086c9b02fe"; + sha256 = "sha256-Y7V89G+nXRtknOukvBN8Q+sNx91YNPDT0p5hrFYe/Sk="; }; x86_64-darwin = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "8bbff051f169f029044e4c4965cad88f48e939b945fd5c253f0c39665a19ce44"; + sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; }; }; src = srcs.${stdenv.hostPlatform.system}; From b0c232895a678da14daf91c365c8d75fb92e9c71 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sat, 23 Apr 2022 13:54:58 -0500 Subject: [PATCH 003/182] mapserver: switch to python3 --- pkgs/servers/mapserver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mapserver/default.nix b/pkgs/servers/mapserver/default.nix index f8b0d8196fa..9ec9ad01bc8 100644 --- a/pkgs/servers/mapserver/default.nix +++ b/pkgs/servers/mapserver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz , libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib -, withPython ? true, swig, python2 +, withPython ? true, swig, python3 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional withPython swig; + ] ++ lib.optional withPython [ swig python3.pkgs.setuptools ]; buildInputs = [ cairo @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { proj protobufc zlib - ] ++ lib.optional withPython python2; + ] ++ lib.optional withPython python3; cmakeFlags = [ "-DWITH_KML=ON" From c9a1647adeef403328f7b222666648bf8bfa0320 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 24 Apr 2022 23:31:35 -0700 Subject: [PATCH 004/182] nixos/tailscale: use systemctl restart during activation. This avoids the scenario where you activate a new config over Tailscale, and a long delay between the "stop services" and "start services" phases of the activation script lead to your terminal freezing for tens of seconds, until tailscaled finally gets started again and the session recovers. Per the documentation of stopIfChanged, this is only safe to do if the service definition is robust to stopping the old process using the new service definition. As the maintainer of the upstream systemd unit, I can confirm that Tailscale is robust to this scenario: it has to be in order to work right on several other distros that just do unpack-then-restart, rather than the more complex stop-unpack-start dance. Signed-off-by: David Anderson --- nixos/modules/services/networking/tailscale.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 1f64113950a..36db8bfb128 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -47,6 +47,18 @@ in { ] ++ (lib.optionals (cfg.permitCertUid != null) [ "TS_PERMIT_CERT_UID=${cfg.permitCertUid}" ]); + # Restart tailscaled with a single `systemctl restart` at the + # end of activation, rather than a `stop` followed by a later + # `start`. Activation over Tailscale can hang for tens of + # seconds in the stop+start setup, if the activation script has + # a significant delay between the stop and start phases + # (e.g. script blocked on another unit with a slow shutdown). + # + # Tailscale is aware of the correctness tradeoff involved, and + # already makes its upstream systemd unit robust against unit + # version mismatches on restart for compatibility with other + # linux distros. + stopIfChanged = false; }; }; } From db5fd3bad1342bcdaf8fa336819ef6317e71da2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 02:42:10 +0000 Subject: [PATCH 005/182] ffmpeg-normalize: 1.22.9 -> 1.22.10 --- pkgs/applications/video/ffmpeg-normalize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 9331471c747..4f77118c0a4 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.9"; + version = "1.22.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RBrCIDinPXbXKqrrhqVf3rV4rfi+2PttIaYxUKOk7hs="; + sha256 = "sha256-F058lCuIxH0lqJlPrWIznu2Ks2w+KXrTnJD7CmYSZFU="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; From 9c7c44c37651e92ddf011ace2c39bb3ec681b4a0 Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Tue, 26 Apr 2022 14:14:44 +1000 Subject: [PATCH 006/182] lklug-sinhala: init at 0.6 --- pkgs/data/fonts/lklug-sinhala/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/data/fonts/lklug-sinhala/default.nix diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/data/fonts/lklug-sinhala/default.nix new file mode 100644 index 00000000000..45f907f1cf0 --- /dev/null +++ b/pkgs/data/fonts/lklug-sinhala/default.nix @@ -0,0 +1,23 @@ +{ fetchzip, lib }: + +let + version = "0.6"; +in +fetchzip { + name = "lklug-sinhala-${version}"; + url = "mirror://debian/pool/main/f/fonts-lklug-sinhala/fonts-lklug-sinhala_${version}.orig.tar.xz"; + sha256 = "sha256-Fy+QnAajA4yLf/I1vOQll5pRd0ZLfLe8UXq4XMC9qNc="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lklug-sinhala-${version}/lklug.ttf + ''; + + meta = with lib; { + description = "Unicode Sinhala font by Lanka Linux User Group"; + homepage = "http://www.lug.lk/fonts/lklug"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3706cc3dc3f..e88b044a228 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24342,6 +24342,8 @@ with pkgs; linux-manual = callPackage ../data/documentation/linux-manual { }; + lklug-sinhala = callPackage ../data/fonts/lklug-sinhala {}; + lmmath = callPackage ../data/fonts/lmmath {}; lmodern = callPackage ../data/fonts/lmodern { }; From 41876b4f4622e9d91f4af698465bb73f77ca11e0 Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Tue, 26 Apr 2022 13:47:02 +1000 Subject: [PATCH 007/182] sil-padauk: init at 3.003 --- pkgs/data/fonts/sil-padauk/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/sil-padauk/default.nix diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/data/fonts/sil-padauk/default.nix new file mode 100644 index 00000000000..1b574e2da2d --- /dev/null +++ b/pkgs/data/fonts/sil-padauk/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "3.003"; +in +fetchzip { + name = "sil-padauk-${version}"; + url = "mirror://debian/pool/main/f/fonts-sil-padauk/fonts-sil-padauk_${version}.orig.tar.xz"; + sha256 = "sha256-oK+EufbvsqXunTgcWj+DiNdfpRl+VPO60Wc9KYjZv5A="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "Burmese Unicode 6 TrueType font"; + homepage = "https://software.sil.org/padauk"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3706cc3dc3f..02e1428128c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24645,6 +24645,8 @@ with pkgs; sierra-gtk-theme = callPackage ../data/themes/sierra { }; + sil-padauk = callPackage ../data/fonts/sil-padauk { }; + snap7 = callPackage ../development/libraries/snap7 {}; snowblind = callPackage ../data/themes/snowblind { }; From 7c64d88385068b7746ff8f4708986552e2970252 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 20:27:20 -0500 Subject: [PATCH 008/182] uthenticode: 1.0.4 -> 1.0.8 --- .../libraries/uthenticode/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 9957eccd426..4d0293052a4 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -2,27 +2,20 @@ stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.4"; + version = "1.0.8"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - sha256 = "16j91cki63zk4d7wzwvq8al98l8hmvcdil3vfp44ink4q4bfswkx"; + hash = "sha256-H4fAHZM+vYaUkXZE4f7r2bxw9dno7O+lYrqQ9/6YPWA="; }; - patches = [ - # adds USE_SYSTEM_GTEST cmake flag, the patch won't be necessary in next versions - (fetchpatch { - url = "https://github.com/trailofbits/uthenticode/commit/7a4c5499c8e5ea7bfae1c620e1f96c112866b1dd.patch"; - sha256 = "17637j5zwp71jmi803mv1z04arld3k3kmrm8nvrkpg08q5kizh28"; - }) - ]; - - cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_SYSTEM_GTEST=1" ]; + cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ pe-parse openssl gtest ]; + checkInputs = [ gtest ]; + buildInputs = [ pe-parse openssl ]; doCheck = true; checkPhase = "test/uthenticode_test"; From 637f6305d51f770160bd6db51bfc0337b637392a Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Fri, 22 Apr 2022 15:29:31 +1000 Subject: [PATCH 009/182] nanum: init at 20170925 --- pkgs/data/fonts/nanum/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/nanum/default.nix diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/data/fonts/nanum/default.nix new file mode 100644 index 00000000000..1aac2c53d82 --- /dev/null +++ b/pkgs/data/fonts/nanum/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "20170925"; +in +fetchzip { + name = "nanum-${version}"; + url = "mirror://ubuntu/pool/universe/f/fonts-nanum/fonts-nanum_${version}.orig.tar.xz"; + sha256 = "sha256-lSTeQEuMmlQxiQqrx9tNScifE8nMOUDJF3lCfoAFIJk="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "Nanum Korean font set"; + homepage = "https://hangeul.naver.com/font"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a50d9838a4f..c1e08a590a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24450,6 +24450,8 @@ with pkgs; nafees = callPackage ../data/fonts/nafees { }; + nanum = callPackage ../data/fonts/nanum { }; + nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; national-park-typeface = callPackage ../data/fonts/national-park { }; From ae4494212a4ddefae925578939b2cec7aaae1b9e Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Fri, 22 Apr 2022 12:19:33 +1000 Subject: [PATCH 010/182] takao: init at 00303.01 --- pkgs/data/fonts/takao/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/takao/default.nix diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/data/fonts/takao/default.nix new file mode 100644 index 00000000000..dcbce858e01 --- /dev/null +++ b/pkgs/data/fonts/takao/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "00303.01"; +in +fetchzip { + name = "takao-${version}"; + url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz"; + sha256 = "sha256-TlPq3iIv8vHlxYu5dkX/Lf6ediYKQaQ5uMbFvypQM/w="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "Japanese TrueType Gothic, P Gothic, Mincho, P Mincho fonts"; + homepage = "https://launchpad.net/takao-fonts"; + license = licenses.ipa; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a50d9838a4f..32ed99ae9d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24746,6 +24746,8 @@ with pkgs; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; + takao = callPackage ../data/fonts/takao { }; + taskspooler = callPackage ../tools/system/taskspooler { }; tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; From e83884a9e9ce88e98ea4f35354ffffd1368a4ba1 Mon Sep 17 00:00:00 2001 From: Pawel Lipski Date: Wed, 27 Apr 2022 18:54:28 +0200 Subject: [PATCH 011/182] git-machete: updates to 3.9.0 --- .../version-management/git-and-tools/git-machete/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 6b6da70bb94..792dee051fd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonApplication +, pytest , fetchFromGitHub , installShellFiles , git @@ -21,7 +22,7 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git ]; + checkInputs = [ git pytest ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash From 4901ac200b9b039c614d0bd9422cb25e35029f5b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 29 Apr 2022 08:02:24 +0100 Subject: [PATCH 012/182] pax-utils: 1.3.3 -> 1.3.4 While at it added trivial updater. changes: https://gitweb.gentoo.org/proj/pax-utils.git/log/ --- pkgs/os-specific/linux/pax-utils/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index b22af8d7083..7172aca65f6 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchurl, bash }: +{ stdenv, lib, fetchurl, bash, gitUpdater }: stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ="; + sha256 = "sha256-i67S+cWujgzaG5x1mQhkEBr8ZPrQpGFuEPP/jviRBAs="; }; strictDeps = true; @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = gitUpdater { + inherit pname version; + url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "ELF utils that can check files for security relevant properties"; longDescription = '' From 85f977180abcb7a89bc9cc7c8f325026f3fb4b9e Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 29 Apr 2022 14:04:32 +0200 Subject: [PATCH 013/182] papermc: 1.18.1r132 -> 1.18.2r313 --- pkgs/games/papermc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 52bd5c00d43..7b7d66f6188 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.18.1"; - buildNum = "132"; + mcVersion = "1.18.2"; + buildNum = "313"; jar = fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "af26babef1e9134804bdf61e14eed7677d603516638f5a2ffe97e176ebd9839b"; + sha256 = "sha256-wotk0Pu1wKomj83nMCyzzPZ+Y9RkQUbfeWjRGaSt7lE="; }; in stdenv.mkDerivation { pname = "papermc"; From 3eab641238e55d7d5931c453b9d036cedba148e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 Apr 2022 11:12:29 +0200 Subject: [PATCH 014/182] knot-resolver: switch to systemdMinimal It was in closure anyway, and this saves 62M from $ nix path-info -S ./result Still, for those using the service this won't change the closure. --- pkgs/servers/dns/knot-resolver/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d47b5a3e6a3..f7afb444a87 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] - ++ optionals stdenv.isLinux [ systemd libcap_ng ] + ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] ++ [ nghttp2 ] ## optional dependencies; TODO: dnstap ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4810b3813c2..f4cd8f87180 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21787,7 +21787,9 @@ with pkgs; keycloak = callPackage ../servers/keycloak { }; knot-dns = callPackage ../servers/dns/knot-dns { }; - knot-resolver = callPackage ../servers/dns/knot-resolver { }; + knot-resolver = callPackage ../servers/dns/knot-resolver { + systemd = systemdMinimal; # in closure already anyway + }; rdkafka = callPackage ../development/libraries/rdkafka { }; From 9791289e848f4b48497fbaa955eb49abbdc0f1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 Apr 2022 11:31:51 +0200 Subject: [PATCH 015/182] knot-resolver: enable more tests Apparently luarocks works now on aarch64-darwin. --- pkgs/servers/dns/knot-resolver/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index f7afb444a87..1ec5a78ea1a 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -79,8 +79,7 @@ unwrapped = stdenv.mkDerivation rec { rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; - doInstallCheck = with stdenv; hostPlatform == buildPlatform - && !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform + doInstallCheck = with stdenv; hostPlatform == buildPlatform; installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' meson test --print-errorlogs From d30dbf38b9f416ed756dc2e9a5e6d37865745651 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 5 Apr 2022 12:02:18 +0200 Subject: [PATCH 016/182] nixos/networkd: reimplement useDHCP in a sensible way --- .../tasks/network-interfaces-systemd.nix | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8654539b662..4273bbc6f0c 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -43,12 +43,6 @@ in } { assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null; message = "networking.defaultGateway6.interface is not supported by networkd."; - } { - assertion = cfg.useDHCP == false; - message = '' - networking.useDHCP is not supported by networkd. - Please use per interface configuration and set the global option to false. - ''; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; @@ -92,6 +86,40 @@ in }; }; }); + networks."99-ethernet-default-dhcp" = lib.mkIf cfg.useDHCP { + # We want to match physical ethernet interfaces as commonly + # found on laptops, desktops and servers, to provide an + # "out-of-the-box" setup that works for common cases. This + # heuristic isn't perfect (it could match interfaces with + # custom names that _happen_ to start with en or eth), but + # should be good enough to make the common case easy and can + # be overridden on a case-by-case basis using + # higher-priority networks or by disabling useDHCP. + + # Type=ether matches veth interfaces as well, and this is + # more likely to result in interfaces being configured to + # use DHCP when they shouldn't. + + # We set RequiredForOnline to false, because it's fairly + # common for such devices to have multiple interfaces and + # only one of them to be connected (e.g. a laptop with + # ethernet and WiFi interfaces). Maybe one day networkd will + # support "any"-style RequiredForOnline... + matchConfig.Name = ["en*" "eth*"]; + DHCP = "yes"; + linkConfig.RequiredForOnline = lib.mkDefault false; + }; + networks."99-wireless-client-dhcp" = lib.mkIf cfg.useDHCP { + # Like above, but this is much more likely to be correct. + matchConfig.WLANInterfaceType = "station"; + DHCP = "yes"; + linkConfig.RequiredForOnline = lib.mkDefault false; + # We also set the route metric to one more than the default + # of 1024, so that Ethernet is preferred if both are + # available. + dhcpV4Config.RouteMetric = 1025; + ipv6AcceptRAConfig.RouteMetric = 1025; + }; networks."40-${i.name}" = mkMerge [ (genericNetwork id) { name = mkDefault i.name; DHCP = mkForce (dhcpStr From ba4a615da9400c3ff8d27b6615013fee5ff69b9e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 5 Apr 2022 21:28:38 +0200 Subject: [PATCH 017/182] nixos/tests/networking: add test for global useDHCP --- nixos/tests/networking.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index a1150097a09..d49c7d943fd 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -139,6 +139,25 @@ let client.wait_until_succeeds("ping -c 1 192.168.3.1") ''; }; + dhcpDefault = { + name = "useDHCP-by-default"; + nodes.router = router; + nodes.client = { lib, ... }: { + # Disable test driver default config + networking.interfaces = lib.mkForce {}; + virtualisation.vlans = [ 1 ]; + }; + testScript = '' + start_all() + client.wait_for_unit("multi-user.target") + client.wait_until_succeeds("ip addr show dev eth1 | grep '192.168.1'") + client.shell_interact() + client.succeed("ping -c 1 192.168.1.1") + router.succeed("ping -c 1 192.168.1.1") + router.succeed("ping -c 1 192.168.1.2") + router.succeed("ping -c 1 192.168.1.2") + ''; + }; dhcpSimple = { name = "SimpleDHCP"; nodes.router = router; From 161dd27ee1ac84a78bda62a603dcb54ae1f8b15f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Apr 2022 13:12:05 +0200 Subject: [PATCH 018/182] nixos/tests/networking: test connectivity from both client & router --- nixos/tests/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index d49c7d943fd..84693ee780c 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -155,7 +155,7 @@ let client.succeed("ping -c 1 192.168.1.1") router.succeed("ping -c 1 192.168.1.1") router.succeed("ping -c 1 192.168.1.2") - router.succeed("ping -c 1 192.168.1.2") + client.succeed("ping -c 1 192.168.1.2") ''; }; dhcpSimple = { From aa849e14785930404601747c7ea7b6172d80832d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Apr 2022 13:48:01 +0200 Subject: [PATCH 019/182] nixos/network-interfaces-systemd: actually set catchall-iface if `useDHCP = true;` Previously this wasn't done in the `forEach`-expression for `cfg.interfaces` and thus `networking.useDHCP` didn't have any effect if no further interface was statically configured. --- .../tasks/network-interfaces-systemd.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 4273bbc6f0c..110e84494a3 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -74,18 +74,7 @@ in in mkMerge [ { enable = true; } - (mkMerge (forEach interfaces (i: { - netdevs = mkIf i.virtual ({ - "40-${i.name}" = { - netdevConfig = { - Name = i.name; - Kind = i.virtualType; - }; - "${i.virtualType}Config" = optionalAttrs (i.virtualOwner != null) { - User = i.virtualOwner; - }; - }; - }); + (mkIf cfg.useDHCP { networks."99-ethernet-default-dhcp" = lib.mkIf cfg.useDHCP { # We want to match physical ethernet interfaces as commonly # found on laptops, desktops and servers, to provide an @@ -120,6 +109,19 @@ in dhcpV4Config.RouteMetric = 1025; ipv6AcceptRAConfig.RouteMetric = 1025; }; + }) + (mkMerge (forEach interfaces (i: { + netdevs = mkIf i.virtual ({ + "40-${i.name}" = { + netdevConfig = { + Name = i.name; + Kind = i.virtualType; + }; + "${i.virtualType}Config" = optionalAttrs (i.virtualOwner != null) { + User = i.virtualOwner; + }; + }; + }); networks."40-${i.name}" = mkMerge [ (genericNetwork id) { name = mkDefault i.name; DHCP = mkForce (dhcpStr From b08a06859c615a920b91b05b52b5765ca8368b71 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Apr 2022 23:35:53 +0200 Subject: [PATCH 020/182] nixos/tests/networking/dhcpDefault: actually use networkd for client --- nixos/tests/networking.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 84693ee780c..2cc1e9b0942 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -145,6 +145,7 @@ let nodes.client = { lib, ... }: { # Disable test driver default config networking.interfaces = lib.mkForce {}; + networking.useNetworkd = networkd; virtualisation.vlans = [ 1 ]; }; testScript = '' From 9c186626125999e917027accc297d1c9b24e1fcb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Apr 2022 13:55:16 +0200 Subject: [PATCH 021/182] nixos/networkd: allow RouteMetric for IPv6AcceptRA According to `systemd.network(5)` of systemd v249 this is a valid option. Fixes evaluation of the wildcard network definitions. --- nixos/modules/system/boot/networkd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index d1a6f46bfc4..0336930b3ab 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -779,6 +779,7 @@ let "RouteDenyList" "RouteAllowList" "DHCPv6Client" + "RouteMetric" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) From cff16bc62507bc0dfbaa1582ad0931be4da006ad Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Apr 2022 23:45:26 +0200 Subject: [PATCH 022/182] nixos/doc: add release-note entry for networking.useDHCP change --- .../from_md/release-notes/rl-2205.section.xml | 15 +++++++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 2046e2449cc..aa7be94c331 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -2386,6 +2386,21 @@ hosts. + + + The option + networking.useDHCP + isn’t deprecated anymore. When using + systemd-networkd, + a generic .network-unit is added which + enables DHCP for each interface matching + en*, eth* or + wl* with priority 99 (which means that it + doesn’t have any effect if such an interface is matched by a + .network-unit with a lower priority). In + case of scripted networking, no behavior was changed. + + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 9674eb66a4c..aefe6286931 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -846,4 +846,11 @@ In addition to numerous new and upgraded packages, this release has the followin `true` starting with NixOS 22.11. Enable it explicitly if you need to control Snapserver remotely or connect streamig clients from other hosts. +- The option [networking.useDHCP](options.html#opt-networking.useDHCP) isn't deprecated anymore. + When using [`systemd-networkd`](options.html#opt-networking.useNetworkd), a generic + `.network`-unit is added which enables DHCP for each interface matching `en*`, `eth*` + or `wl*` with priority 99 (which means that it doesn't have any effect if such an interface is matched + by a `.network-`unit with a lower priority). In case of scripted networking, no behavior + was changed. + From 8e42949a2421485c34fa56cff3e768af1c91459e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 30 Apr 2022 00:26:46 +0200 Subject: [PATCH 023/182] nixos/nixos-generate-config: use networking.useDHCP by default Currently we're still using scripted networking by default. A problem with scripted networking is that having `useDHCP` on potentially non-existing interfaces (e.g. an ethernet interface for USB tethering) can cause the boot to hang. Closes #107908 --- .../modules/installer/tools/nixos-generate-config.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index fb5d3ba4732..6d32d727501 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -581,17 +581,19 @@ ${\join "", (map { " $_\n" } (uniq @attrs))}} EOF sub generateNetworkingDhcpConfig { + # FIXME disable networking.useDHCP by default when switching to networkd. my $config = <.useDHCP`. + networking.useDHCP = lib.mkDefault true; EOF foreach my $path (glob "/sys/class/net/*") { my $dev = basename($path); if ($dev ne "lo") { - $config .= " networking.interfaces.$dev.useDHCP = lib.mkDefault true;\n"; + $config .= " # networking.interfaces.$dev.useDHCP = lib.mkDefault true;\n"; } } From 196c877c8555eb72e52c5a5353a18a710ad00c70 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 30 Apr 2022 12:40:10 +0200 Subject: [PATCH 024/182] nixos/network-interfaces: remove outdated deprecation information --- nixos/modules/tasks/network-interfaces.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index d09e9b99248..d56159f1596 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1254,11 +1254,6 @@ in Whether to use DHCP to obtain an IP address and other configuration for all network interfaces that are not manually configured. - - Using this option is highly discouraged and also incompatible with - . Please use - instead - and set this to false. ''; }; From e12eebf51a8c864343b43fd6a5c44a853b147f68 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:25:57 -0700 Subject: [PATCH 025/182] aws-c-http: 0.6.10 -> 0.6.15 --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index a25231ee883..0eee407f989 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.10"; + version = "0.6.15"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-R+teEKSQjSFYt3+XXvooAy4GJwN4yzEhJtiuknBZIgU="; + sha256 = "sha256-WIKWF8G+fdX9MD6vQctM+5pDnR0/0TenabWE4PRteq8="; }; nativeBuildInputs = [ From e35888c2cf36bee18701f108e36134b4c4b987c5 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:27:01 -0700 Subject: [PATCH 026/182] aws-c-io: 0.10.19 -> 0.11.0 --- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index f19a69fc457..0a9bb554373 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.19"; + version = "0.11.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc="; + sha256 = "sha256-LIrAA3+Yd0lhCMQ9R4HT/ZFKm3y9iSm3h5vcn0ghiPA="; }; nativeBuildInputs = [ cmake ]; From 82fa29a1854ef7b60190ea4898cad103e37892eb Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:32:31 -0700 Subject: [PATCH 027/182] aws-c-s3: 0.1.33 -> 0.1.39 --- pkgs/development/libraries/aws-c-s3/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 2868e6b80b8..0ed8681b5b6 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -6,19 +6,20 @@ , aws-c-compression , aws-c-http , aws-c-io +, aws-checksums , cmake , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.33"; + version = "0.1.39"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o="; + sha256 = "sha256-UbYh3awI7Y3mJnVQrltU+rZ1TI1TDaMF5TOcvxbzNa8="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { aws-c-compression aws-c-http aws-c-io + aws-checksums s2n-tls ]; From beaa1f3d489110607fe3b4a3a83ff11e22990dce Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:33:28 -0700 Subject: [PATCH 028/182] aws-crt-cpp: 0.17.16 -> 0.17.28 --- pkgs/development/libraries/aws-crt-cpp/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 391ecc26fb8..201837eb536 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , aws-c-auth , aws-c-cal , aws-c-common @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.16"; + version = "0.17.28"; outputs = [ "out" "dev" ]; @@ -24,13 +25,22 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c="; + sha256 = "sha256-4/BgwX8Pa5D2lEn0Dh3JlUiYUtA9u0rWpBixqmv1X/A="; }; patches = [ # Correct include path for split outputs. # https://github.com/awslabs/aws-crt-cpp/pull/325 ./0001-build-Make-includedir-properly-overrideable.patch + + # Fix build with new input stream api + # https://github.com/awslabs/aws-crt-cpp/pull/341 + # Remove with next release + (fetchpatch { + url = "https://github.com/awslabs/aws-crt-cpp/commit/8adb8490fd4f1d1fe65aad01b0a7dda0e52ac596.patch"; + excludes = [ "crt/*" ]; + sha256 = "190v8rlj6z0qllih6w3kqmdvqjifj66hc4bchsgr3gpfv18vpzid"; + }) ]; postPatch = '' From b5f7a8aed3489888ce4b959dcba5dea43570d5d3 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:48:24 -0700 Subject: [PATCH 029/182] s2n-tls: 1.3.6 -> 1.3.12 --- pkgs/development/libraries/s2n-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index e6e35f9b2c4..918626d04c9 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.6"; + version = "1.3.12"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU="; + sha256 = "1n1bak4s67cfizh8j5wpf05kfdcjvwqaca4rq9qys25z52bbpn9f"; }; nativeBuildInputs = [ cmake ]; From 59e1eb39b3736cf22f01ac398ee68ef838208bbd Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:48:47 -0700 Subject: [PATCH 030/182] aws-c-cal: 0.5.14 -> 0.5.17 --- pkgs/development/libraries/aws-c-cal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index e7f0c0854db..40e8a5eb54c 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.14"; + version = "0.5.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts="; + sha256 = "sha256-peaoTv2TLqtHScfnCPMNbE6fhUTKfRe1ZzuBsr/rpz0="; }; nativeBuildInputs = [ cmake ]; From 05021a0f90682ddc403ae2d441a5cdae07bc2776 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:49:28 -0700 Subject: [PATCH 031/182] aws-c-auth: 0.6.11 -> 0.6.13 --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index b6fcb11c315..5b859075017 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.11"; + version = "0.6.13"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs="; + sha256 = "sha256-f1STZdxj8cdK60dCgl2Xfsqaa/x3Z1xEjH3p4GUwGUg="; }; nativeBuildInputs = [ From 3ef14c0d469d715c6181b9c36cfc59bb52fc3c1f Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Apr 2022 14:50:09 -0700 Subject: [PATCH 032/182] aws-c-common: 0.6.19 -> 0.7.0 --- pkgs/development/libraries/aws-c-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index ab52fa5aa74..1b8f7e73e82 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.19"; + version = "0.7.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI="; + sha256 = "sha256-DKorZUVUDEP4IRPchzaW35fPLmYoJRcfLMdPHrBrol8="; }; nativeBuildInputs = [ cmake ]; From cb03b379274846c8b1be1affcd402a85f30ae4c8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 1 May 2022 15:28:17 +0100 Subject: [PATCH 033/182] pkgsCross.mingw32.gcc11Stdenv: update mcfgthread patches for gcc-11 Without the change mingw32-gcc fails to build as: In file included from /build/gcc-11.2.0/libstdc++-v3/libsupc++/cxxabi.h:49, from ../../../../gcc-11.2.0/libstdc++-v3/libsupc++/atexit_thread.cc:24: ../../../../gcc-11.2.0/libstdc++-v3/libsupc++/atexit_thread.cc:36:3: error: 'int __cxxabiv1::__cxa_thread_atexit(void (*)(void*), void*, void*)' should have been declared inside '__cxxabiv1' 36 | _GLIBCXX_NOTHROW | ^~~~~~~~~~~~~~~~ ../../../../gcc-11.2.0/libstdc++-v3/libsupc++/atexit_thread.cc:34:1: error: conflicting declaration of C function 'int __cxxabiv1::__cxa_thread_atexit(void (*)(void*), void*, void*)' 34 | __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), | ^~~~~~~~~~ The change follows upstream change introduced in https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=7fc0f78c3f43af1967cb7b1ee8f4947f3b890aa2 --- .../11/Added-mcf-thread-model-support-from-mcfgthread.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch index d9809e828f1..77202438e47 100644 --- a/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch +++ b/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -222,16 +222,16 @@ index de920d714c6..665fb74bd6b 100644 +#ifdef __USING_MCFGTHREAD__ + +#include -+ ++namespace __cxxabiv1 { +extern "C" int -+__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *), + void *obj, void *dso_handle) + _GLIBCXX_NOTHROW +{ + return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; + (void)dso_handle; +} -+ ++} +#else // __USING_MCFGTHREAD__ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 From 666d33933af0905144b2c53c2030e620b8e0fec0 Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Fri, 22 Apr 2022 10:25:43 +1000 Subject: [PATCH 034/182] tibetan-machine: init at 1.901b --- pkgs/data/fonts/tibetan-machine/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/tibetan-machine/default.nix diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/data/fonts/tibetan-machine/default.nix new file mode 100644 index 00000000000..67393a9c4ab --- /dev/null +++ b/pkgs/data/fonts/tibetan-machine/default.nix @@ -0,0 +1,22 @@ +{ fetchzip, lib }: + +let + version = "1.901b"; +in +fetchzip { + name = "tibetan-machine-${version}"; + url = "mirror://debian/pool/main/f/fonts-tibetan-machine/fonts-tibetan-machine_${version}.orig.tar.bz2"; + sha256 = "sha256-A+RgpFLsP4iTzl0PMRHaNzWGbDR5Qa38lRegNJ96ULo="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts ttf-tmuni-${version}/TibMachUni-${version}.ttf + ''; + + meta = with lib; { + description = "Tibetan Machine - an OpenType Tibetan, Dzongkha and Ladakhi font"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfca44e2701..1ad6f8d35fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24861,6 +24861,8 @@ with pkgs; theme-vertex = callPackage ../data/themes/vertex { }; + tibetan-machine = callPackage ../data/fonts/tibetan-machine { }; + times-newer-roman = callPackage ../data/fonts/times-newer-roman { }; tipa = callPackage ../data/fonts/tipa { }; From 777eee14aac4889d591bc85779fcd1a5e8b24783 Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Fri, 22 Apr 2022 09:51:01 +1000 Subject: [PATCH 035/182] khmeros: init at 5.0 --- pkgs/data/fonts/khmeros/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/khmeros/default.nix diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/data/fonts/khmeros/default.nix new file mode 100644 index 00000000000..28db0d00981 --- /dev/null +++ b/pkgs/data/fonts/khmeros/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "5.0"; +in +fetchzip { + name = "khmeros-${version}"; + url = "mirror://debian/pool/main/f/fonts-khmeros/fonts-khmeros_${version}.orig.tar.xz"; + sha256 = "sha256-pS+7RQbGwlBxdCfSVxHmARCAkZrZttwYNlV/CrxqI+w="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "KhmerOS Unicode fonts for the Khmer language"; + homepage = "http://www.khmeros.info/"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfca44e2701..34df1386a3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24352,6 +24352,8 @@ with pkgs; kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + khmeros = callPackage ../data/fonts/khmeros {}; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; From c91f4f127a91f6ccfd87d4c3dca7411bd163329d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 2 May 2022 12:04:41 +0200 Subject: [PATCH 036/182] maintainers: add numtide team --- maintainers/team-list.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 26f0f1d48d4..8b21f98409e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -445,6 +445,19 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + numtide = { + members = [ + mic92 + flokli + jfroche + tazjin + zimbatm + ]; + enableFeatureFreezePing = true; + scope = "Group registration for Numtide team members who collectively maintain packages."; + shortName = "Numtide team"; + }; + openstack = { members = [ emilytrau From 2e365a077df2428af1e0a477263c5b7b4eb12158 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 2 May 2022 12:10:03 +0200 Subject: [PATCH 037/182] terraform: maintained by numtide --- pkgs/applications/networking/cluster/terraform/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 73f618cb029..b4191bbd78c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -63,11 +63,10 @@ let kalbasit marsam maxeaubrey + techknowlogick timstott - zimbatm zowoq - techknowlogick - ]; + ] ++ teams.numtide.members; }; } // attrs'); From c398615dae0e74ca48cce4d0cdc9f34ae77745fa Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 2 May 2022 12:10:16 +0200 Subject: [PATCH 038/182] treefmt: maintained by numtide --- pkgs/development/tools/treefmt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index bd297154cc3..f9cef54564f 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -16,6 +16,6 @@ rustPlatform.buildRustPackage rec { description = "one CLI to format the code tree"; homepage = "https://github.com/numtide/treefmt"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ zimbatm ]; + maintainers = lib.teams.numtide.members; }; } From 1864214bd624184085a1bdd5c770b20df4d79488 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 2 May 2022 12:10:25 +0200 Subject: [PATCH 039/182] direnv: maintained by numtide --- pkgs/tools/misc/direnv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 624236462c2..92f32a215a5 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -49,6 +49,6 @@ buildGoModule rec { ''; homepage = "https://direnv.net"; license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; + maintainers = teams.numtide.members; }; } From c42af24f3036e089f79d723314245357626f9a26 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 2 May 2022 10:44:18 -0700 Subject: [PATCH 040/182] signalbackup-tools: 20220425 -> 20220430 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index c848cb55c0d..f81b8853c8b 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220425"; + version = "20220430"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-FWW4rVaoShT55ZWN/siFHoTTNcarnfTa2h/J2GWxLW8="; + sha256 = "sha256-clG0B7PgtlpsSnZgglkv7y7SOtMTBvwJMnvMrcTWXdI="; }; # Remove when Apple SDK is >= 10.13 From 7485e9f1d78ae64e42a703f83a12b948e1c5921c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 3 May 2022 00:12:54 +0000 Subject: [PATCH 041/182] goconvey: 1.6.3 -> 1.7.2 --- pkgs/development/tools/goconvey/default.nix | 21 ++++++++++++--------- pkgs/development/tools/goconvey/deps.nix | 20 -------------------- 2 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/tools/goconvey/deps.nix diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index fb6ce653cc4..802be18e566 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,25 +1,28 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "goconvey"; - version = "1.6.3"; + version = "1.7.2"; - goPackagePath = "github.com/smartystreets/goconvey"; excludedPackages = "web/server/watch/integration_testing"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "smartystreets"; repo = "goconvey"; - rev = version; - sha256 = "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"; + rev = "v${version}"; + sha256 = "sha256-YT9M9VaLIGUo6pdkaLWLtomcjrDqdnOqwl+C9UwDmT8="; }; + vendorSha256 = "sha256-sHyK/4YdNCLCDjxjMKygWAVRnHZ1peYjYRYyEcqoe+E="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; + meta = { description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; homepage = "https://github.com/smartystreets/goconvey"; - maintainers = with lib.maintainers; [ vdemeester ]; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; }; } diff --git a/pkgs/development/tools/goconvey/deps.nix b/pkgs/development/tools/goconvey/deps.nix deleted file mode 100644 index d329359da70..00000000000 --- a/pkgs/development/tools/goconvey/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "0b37b35ec7434b77e77a4bb29b79677cced992ea"; - sha256 = "1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9"; - }; - } -] From fe8f77c2c086440e8756cba0abf42e7f1b155015 Mon Sep 17 00:00:00 2001 From: Thibault Lemaire Date: Thu, 21 Apr 2022 16:40:39 +0200 Subject: [PATCH 042/182] linphone: Cleanup dependencies A lot of bloat had been accumulated through updates (e.g. with linphone migrating from Gtk to Qt, or linphone being split to liblinphone & linphone-desktop). Method: Through trial and error. Delete all dependencies, try to build, try to run, reintroduce missing dependencies. I have tested everything I could, but it is possible that some optional features have been silently disabled with dependencies not being found now. (Codecs, encryption schemes, etc...) --- .../instant-messengers/linphone/default.nix | 70 +--------------- .../development/libraries/belcard/default.nix | 6 +- .../libraries/liblinphone/default.nix | 82 ++----------------- pkgs/development/libraries/lime/default.nix | 8 +- .../libraries/mediastreamer/default.nix | 37 ++------- .../libraries/mediastreamer/msopenh264.nix | 2 +- 6 files changed, 24 insertions(+), 181 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 3b11f7fc1a8..306a53f0a3c 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,51 +1,18 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , fetchFromGitLab -, fetchurl -, ffmpeg -, gdk-pixbuf -, glib -, graphviz -, gtk2 -, intltool , lib -, libexosip , liblinphone -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 -, libxml2 -, makeWrapper -, mbedtls , mediastreamer , mediastreamer-openh264 , minizip2 , mkDerivation -, openldap -, ortp -, pango -, pkg-config -, qtbase , qtgraphicaleffects , qtquickcontrols2 , qttranslations -, readline -, speex -, sqlite - -, udev -, zlib }: # How to update Linphone? (The Qt desktop app) @@ -95,57 +62,22 @@ mkDerivation rec { # linphone-desktop. buildInputs = [ # Made by BC - bcg729 bctoolbox belcard belle-sip belr - bzrtp liblinphone mediastreamer mediastreamer-openh264 - ortp - - # Vendored by BC but we use upstream, might cause problems - libmatroska - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip - libnotify - libosip - libsoup - libupnp - libxml2 - mbedtls minizip2 - openldap - pango - qtbase qtgraphicaleffects qtquickcontrols2 qttranslations - readline - speex - sqlite - udev - zlib ]; nativeBuildInputs = [ - # Made by BC - bcunit - cmake - graphviz - intltool - makeWrapper - pkg-config ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index aace36c619c..0f251f73e81 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ bctoolbox belr ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { description = "C++ library to manipulate VCard standard format. Part of the Linphone project."; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 89a23dccc7e..10c2bfb272c 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -1,50 +1,20 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , doxygen , fetchFromGitLab -, ffmpeg -, gdk-pixbuf -, glib -, graphviz -, gtk2 -, intltool , jsoncpp -, libexosip -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 , libxml2 , lime -, makeWrapper -, mbedtls , mediastreamer -, openldap -, ortp -, pango -, pkg-config , python3 -, readline , bc-soci -, boost -, speex , sqlite , lib , stdenv -, udev , xercesc -, xsd -, zlib }: stdenv.mkDerivation rec { @@ -62,69 +32,31 @@ stdenv.mkDerivation rec { patches = [ ./use-normal-jsoncpp.patch ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; - # TODO: Not sure if all these inputs are actually needed. Most of them were - # defined when liblinphone and linphone-desktop weren't separated yet, so some - # of them might not be needed for liblinphone alone. buildInputs = [ - (python3.withPackages (ps: [ ps.pystache ps.six ])) - # Made by BC - bcg729 - bctoolbox belcard belle-sip - belr - bzrtp lime mediastreamer - ortp # Vendored by BC bc-soci - # Vendored by BC but we use upstream, might cause problems - libmatroska - - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip - libnotify - libosip - libsoup - libupnp + jsoncpp libxml2 - mbedtls - openldap - pango - readline - boost - speex + (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite - udev xercesc - xsd - zlib - jsoncpp ]; nativeBuildInputs = [ - # Made by BC - bcunit - cmake doxygen - graphviz - intltool - makeWrapper - pkg-config ]; strictDeps = true; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 1d6a94a828a..38dd0d04e67 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -5,7 +5,6 @@ , lib , bc-soci , sqlite -, boost , stdenv }: @@ -31,12 +30,13 @@ stdenv.mkDerivation rec { bc-soci sqlite - boost ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 2d9c559bcba..bb5bc566bc1 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,33 +1,21 @@ -{ alsa-lib -, bctoolbox +{ bctoolbox , bzrtp , cmake -, doxygen , fetchFromGitLab , ffmpeg , glew , gsm -, intltool , lib -, libGL -, libGLU , libX11 , libXext -, libXv -, libmatroska , libopus -, libpcap , libpulseaudio -, libtheora -, libupnp , libv4l , libvpx , ortp -, pkg-config , python3 , qtbase , qtdeclarative -, SDL , speex , srtp , stdenv @@ -59,9 +47,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - doxygen - intltool - pkg-config python3 qtbase qtdeclarative @@ -73,28 +58,19 @@ stdenv.mkDerivation rec { bzrtp ortp - # Vendored by BC but we use upstream, might cause problems - libmatroska - - alsa-lib ffmpeg glew - gsm - libGL - libGLU libX11 libXext - libXv - libopus - libpcap libpulseaudio - libtheora - libupnp libv4l - libvpx - SDL speex srtp + + # Optional + gsm # GSM audio codec + libopus # Opus audio codec + libvpx # VP8 video codec ]; strictDeps = true; @@ -104,6 +80,7 @@ stdenv.mkDerivation rec { "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" "-DENABLE_STRICT=NO" # Disable -Werror + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables ]; NIX_LDFLAGS = "-lXext"; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 17f537b4d87..83a96175cba 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; }; - nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ mediastreamer openh264 ]; # Do not build static libraries From 58fb27e4a11eb48de5250bb8af3744ec6fd41330 Mon Sep 17 00:00:00 2001 From: Pawel Lipski Date: Wed, 4 May 2022 15:16:26 +0200 Subject: [PATCH 043/182] git-machete: add pytest-mock and pytestCheckHook to checkInputs --- .../version-management/git-and-tools/git-machete/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 792dee051fd..4f774f5b2f4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication -, pytest +, pytest-mock +, pytestCheckHook , fetchFromGitHub , installShellFiles , git @@ -22,7 +23,7 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git pytest ]; + checkInputs = [ git pytest-mock pytestCheckHook ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash From 8bfcef793c553cf25a6cf3e77b8aecfade954c2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 14:34:16 +0000 Subject: [PATCH 044/182] python310Packages.flametree: 0.1.11 -> 0.1.12 --- pkgs/development/python-modules/flametree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix index b4311eeb7cd..047f2849d04 100644 --- a/pkgs/development/python-modules/flametree/default.nix +++ b/pkgs/development/python-modules/flametree/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "flametree"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "Flametree"; - rev = "v${version}"; - sha256 = "1ynrk1ivl1vjiga0ayl8k89vs5il7i0pf9jz2ycn771c47szwk4x"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oyiuhsYouGDKRssKc0aYIoG32H7GS6Bn4RtI7/9N158="; }; checkInputs = [ From 837b76a25d55165b90394944d6a5cd49afc791d8 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 4 May 2022 16:45:43 +0200 Subject: [PATCH 045/182] trilium: 0.50.3 -> 0.51.2 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 7190fe90040..9e2752e163f 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.50.3"; + version = "0.51.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "sha256-0N2+NcdZGxaj4LcG5edyd3ry+0dSQSfUQRqZEYFfWqQ="; + sha256 = "17bqcnpvflpi5dlz9m294diwd6as5wha5jcv9a3qvhh4pq0nyr4z"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "sha256-za32yRhusReoGIRdbfx30CPH63BVXz2Z7jkhxtb7XSo="; + sha256 = "0jjvg75a4va5d81x8dvpzmzax7p0bqd7psv0alkkl13m91gai6ig"; }; in { From 1c9f439ba26218b0f51e0a620fb86fcb15737304 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 4 May 2022 20:50:50 +0200 Subject: [PATCH 046/182] chromium: 101.0.4951.41 -> 101.0.4951.54 https://chromereleases.googleblog.com/2022/05/stable-channel-update-for-desktop.html --- .../browsers/chromium/upstream-info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bb994f7008f..9ea70debaf3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "101.0.4951.41", - "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609", - "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq", + "version": "101.0.4951.54", + "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62", + "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y", "deps": { "gn": { "version": "2022-03-14", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "101.0.4951.15", - "sha256_linux": "1i8ay83gh1q6nd0v14qv7gjar9h4fccb50a8b6fg671pg0l6vn24", - "sha256_darwin": "0ldxy1dxb99xps0h1d1264njc55q4bd000bdnaaks9kyx2djn54b", - "sha256_darwin_aarch64": "14awsldpqz2y187jwbcli8v7f1r6gsybk8yx8jqg26y8iyg3lrx9" + "version": "101.0.4951.41", + "sha256_linux": "0zsh6cm7h1m0k5mx1cd29knxjxaadjjcbp7m5fr2mx9c21a1nlcr", + "sha256_darwin": "09py50436y81lw2vk44256dmzsg8dqj14fd0g0gs1cc3ps6q4awl", + "sha256_darwin_aarch64": "0krjijd0zgwg8d44miz43xrjdlvfiymbrrz5r1hzpx64555ch12y" } }, "beta": { From 64a204d1a7300d60aa4665415ab043e42cde0f74 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 18 Mar 2022 16:18:00 +0530 Subject: [PATCH 047/182] nixos/proxmox-lxc: use hostname provided by proxmox --- nixos/modules/virtualisation/proxmox-lxc.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/virtualisation/proxmox-lxc.nix b/nixos/modules/virtualisation/proxmox-lxc.nix index 3913b474afb..9b9f99e5b81 100644 --- a/nixos/modules/virtualisation/proxmox-lxc.nix +++ b/nixos/modules/virtualisation/proxmox-lxc.nix @@ -20,6 +20,15 @@ with lib; configuration from proxmox. ''; }; + manageHostName = mkOption { + type = types.bool; + default = false; + description = '' + Whether to manage hostname through nix options + When false, the hostname is picked up from /etc/hostname + populated by proxmox. + ''; + }; }; config = @@ -50,6 +59,8 @@ with lib; useDHCP = false; useHostResolvConf = false; useNetworkd = true; + # pick up hostname from /etc/hostname generated by proxmox + hostName = mkIf (!cfg.manageHostName) (mkForce ""); }; services.openssh = { From dc75a521b8a496d51b93020931a64e6f5a1f5889 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 16:11:30 -0500 Subject: [PATCH 048/182] alps: 2021-09-29 -> 2022-03-01 --- pkgs/servers/alps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index fb10a5369f1..8b2a605261b 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "alps"; - version = "2021-09-29"; + version = "2022-03-01"; src = fetchFromSourcehut { owner = "~migadu"; repo = "alps"; - rev = "d4c35f3c3157bece8e50fd95f2ee1081be30d7ae"; - sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug="; + rev = "f4523b51af0787795973b403b978ff74737a47ef"; + hash = "sha256-un1RGIABFhHKeXPXtLnGayyoGzfo5PZc8VBSHA0PAaw="; }; vendorSha256 = "sha256-Vg0k+YSMg6Ree/jkVV2VQ8RbSbQFUhmUN2MeTBxPeLo="; From 2ad0491625394fb23cee00cfd31b0147f6e4b5cb Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 20:27:54 -0500 Subject: [PATCH 049/182] pe-parse: 1.2.0 -> 2.0.0 --- pkgs/development/libraries/pe-parse/default.nix | 6 +++--- pkgs/development/libraries/uthenticode/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index 445188bd0d9..3b916a6a01e 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "pe-parse"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pe-parse"; rev = "v${version}"; - sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv"; + hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k="; }; nativeBuildInputs = [ cmake ]; doInstallCheck = true; installCheckPhase = '' - $out/bin/dump-pe ../test/assets/example.exe + $out/bin/dump-pe ../tests/assets/example.exe ''; meta = with lib; { diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 4d0293052a4..c342ee4d70d 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, pe-parse }: +{ stdenv, lib, fetchFromGitHub, cmake, gtest, openssl, pe-parse }: stdenv.mkDerivation rec { pname = "uthenticode"; From 16e15fa68f0247d1ccc9bf94e2906097bcaa2d5c Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 4 May 2022 17:46:39 -0700 Subject: [PATCH 050/182] treewide: add meta.mainProgram to many packages --- pkgs/applications/editors/oed/default.nix | 3 ++- pkgs/applications/editors/vscode/vscodium.nix | 1 + pkgs/applications/emulators/commanderx16/emulator.nix | 3 ++- pkgs/applications/misc/nanoblogger/default.nix | 1 + pkgs/applications/misc/oil-buku/default.nix | 3 ++- pkgs/applications/misc/taskwarrior/default.nix | 1 + pkgs/applications/misc/translate-shell/default.nix | 1 + pkgs/applications/misc/web-media-controller/default.nix | 1 + pkgs/applications/networking/cluster/bosh-cli/default.nix | 1 + pkgs/applications/networking/cluster/fluxcd/default.nix | 1 + pkgs/applications/networking/cluster/krelay/default.nix | 1 + .../applications/networking/cluster/openshift/default.nix | 3 ++- pkgs/applications/networking/syncthing/default.nix | 1 + pkgs/applications/office/todo.txt-cli/default.nix | 1 + pkgs/applications/radio/kalibrate-rtl/default.nix | 3 ++- pkgs/applications/radio/soapysdr/default.nix | 1 + pkgs/applications/science/logic/abc/default.nix | 3 ++- pkgs/applications/science/logic/key/default.nix | 1 + pkgs/development/compilers/dotnet/build-dotnet.nix | 7 ++++--- pkgs/development/compilers/fstar/default.nix | 5 +++-- pkgs/development/compilers/jasmin-compiler/default.nix | 3 ++- pkgs/development/compilers/vlang/default.nix | 1 + pkgs/development/interpreters/kona/default.nix | 1 + pkgs/development/interpreters/rakudo/moarvm.nix | 3 ++- pkgs/development/tools/ammonite/default.nix | 3 ++- .../tools/build-managers/gnumake/4.2/default.nix | 8 ++++---- pkgs/development/tools/build-managers/gnumake/default.nix | 8 ++++---- pkgs/development/tools/build-managers/jam/ftjam.nix | 3 ++- pkgs/development/tools/build-managers/samurai/default.nix | 3 ++- .../tools/build-managers/sbt-extras/default.nix | 4 ++-- pkgs/development/tools/buildkit/default.nix | 1 + .../tools/continuous-integration/jenkins/default.nix | 3 ++- pkgs/development/tools/dapr/cli/default.nix | 3 ++- pkgs/development/tools/ent/default.nix | 3 ++- pkgs/development/tools/gnulib/default.nix | 3 ++- pkgs/development/tools/go-swag/default.nix | 1 + pkgs/development/tools/goa/default.nix | 3 ++- pkgs/development/tools/jd-diff-patch/default.nix | 1 + pkgs/development/tools/jmespath/default.nix | 3 ++- pkgs/development/tools/kustomize/3.nix | 1 + .../tools/literate-programming/Literate/default.nix | 3 ++- pkgs/development/tools/misc/chruby/default.nix | 3 ++- pkgs/development/tools/misc/gnum4/default.nix | 4 ++-- pkgs/development/tools/misc/premake/default.nix | 5 +++-- pkgs/development/tools/misc/watson-ruby/default.nix | 1 + pkgs/development/tools/rust/bindgen/unwrapped.nix | 3 ++- pkgs/development/tools/rust/rust-analyzer/default.nix | 1 + pkgs/development/tools/selenium/server/default.nix | 3 ++- pkgs/development/web/lucky-cli/default.nix | 4 ++-- pkgs/development/web/shopify-cli/default.nix | 3 ++- pkgs/games/bugdom/default.nix | 5 ++--- pkgs/games/r2mod_cli/default.nix | 1 + pkgs/games/tcl2048/default.nix | 3 ++- pkgs/misc/openrussian-cli/default.nix | 3 ++- pkgs/misc/platformsh/default.nix | 3 ++- pkgs/misc/screensavers/pipes/default.nix | 3 ++- pkgs/servers/exhibitor/default.nix | 3 ++- pkgs/servers/gotify/default.nix | 1 + pkgs/servers/icingaweb2/default.nix | 3 ++- pkgs/servers/mail/opensmtpd/filter-rspamd.nix | 3 ++- pkgs/servers/monitoring/prometheus/json-exporter.nix | 1 + pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix | 1 + pkgs/servers/t-rex/default.nix | 1 + pkgs/servers/unifiedpush-common-proxies/default.nix | 1 + pkgs/servers/web-apps/engelsystem/default.nix | 3 ++- pkgs/servers/web-apps/lemmy/server.nix | 1 + pkgs/servers/web-apps/vikunja/api.nix | 1 + pkgs/shells/zsh/zplug/default.nix | 3 ++- pkgs/shells/zsh/zsh-history/default.nix | 5 +++-- pkgs/tools/archivers/gnutar/default.nix | 4 ++-- pkgs/tools/audio/glyr/default.nix | 3 ++- pkgs/tools/compression/xdelta/default.nix | 1 + pkgs/tools/compression/xdelta/unstable.nix | 1 + pkgs/tools/misc/anystyle-cli/default.nix | 1 + pkgs/tools/misc/didyoumean/default.nix | 1 + pkgs/tools/misc/go.rice/default.nix | 3 ++- pkgs/tools/misc/graylog/default.nix | 3 ++- pkgs/tools/misc/mysql2pgsql/default.nix | 1 + pkgs/tools/misc/opentelemetry-collector/contrib.nix | 5 +++-- pkgs/tools/misc/wakatime/default.nix | 1 + pkgs/tools/misc/zsh-autoenv/default.nix | 1 + pkgs/tools/networking/obfs4/default.nix | 1 + pkgs/tools/networking/ooniprobe-cli/default.nix | 1 + pkgs/tools/networking/samplicator/default.nix | 1 + pkgs/tools/networking/slack-cli/default.nix | 1 + pkgs/tools/networking/tinc/default.nix | 1 + pkgs/tools/nix/nixos-generators/default.nix | 1 + pkgs/tools/security/bash-supergenpass/default.nix | 5 +++-- pkgs/tools/security/sequoia/default.nix | 1 + pkgs/tools/security/vault/vault-bin.nix | 5 +++-- pkgs/tools/system/nkeys/default.nix | 1 + pkgs/tools/system/taskspooler/default.nix | 5 +++-- pkgs/tools/text/discount/default.nix | 1 + pkgs/tools/text/replace/default.nix | 3 ++- 94 files changed, 157 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/editors/oed/default.nix b/pkgs/applications/editors/oed/default.nix index f4012220c50..a17199c2ff6 100644 --- a/pkgs/applications/editors/oed/default.nix +++ b/pkgs/applications/editors/oed/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ibara/oed"; description = "Portable ed editor from OpenBSD"; + homepage = "https://github.com/ibara/oed"; license = with licenses; [ bsd2 ]; + mainProgram = "ed"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 41dfc3b1145..633688567ae 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -60,6 +60,7 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica turion bobby285271 ]; + mainProgram = "codium"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix index d15c99d355b..d070c86eef8 100644 --- a/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/pkgs/applications/emulators/commanderx16/emulator.nix @@ -29,10 +29,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.commanderx16.com/forum/index.php?/home/"; description = "The official emulator of CommanderX16 8-bit computer"; + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "x16emu"; inherit (SDL2.meta) platforms; }; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index e8fa4d4fd37..0ae63d210e7 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "Small weblog engine written in Bash for the command line"; homepage = "http://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; + mainProgram = "nb"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/applications/misc/oil-buku/default.nix index e0c05488288..5f895179f1f 100644 --- a/pkgs/applications/misc/oil-buku/default.nix +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -38,7 +38,8 @@ stdenvNoCC.mkDerivation rec { description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; homepage = "https://github.com/AndreiUlmeyda/oil"; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = with maintainers; [ atila ]; + mainProgram = "oil"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 5a12380a4ff..56baa1e9d82 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber oxalica ]; + mainProgram = "task"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index be2ee1e7a85..e46f5d2b8c1 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; maintainers = with maintainers; [ ebzzry infinisil ]; + mainProgram = "trans"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index 7e0fbb999f5..d2b5b924ea8 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "MPRIS proxy for usage with 'Web Media Controller' web extension"; license = licenses.unlicense; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "web-media-controller"; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index beedc41fa8e..069307c41e9 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ris ]; + mainProgram = "bosh"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 3889082ec0c..21e2f00c3e2 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -66,5 +66,6 @@ in buildGoModule rec { homepage = "https://fluxcd.io"; license = licenses.asl20; maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; + mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index f0a9912ab91..16e9203bf9c 100644 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ivankovnatsky ]; + mainProgram = "kubectl-relay"; }; } diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index bab73c41f5f..89bbd0cb7d6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -60,9 +60,10 @@ buildGoModule rec { meta = with lib; { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; - license = licenses.asl20; homepage = "http://www.openshift.org"; + license = licenses.asl20; maintainers = with maintainers; [ offline bachp moretea stehessel ]; + mainProgram = "oc"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e4088c3c460..9c50cb28ec1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -45,6 +45,7 @@ let changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ joko peterhoeg andrew-d ]; + mainProgram = target; platforms = platforms.unix; }; }; diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 0e06cf2f65a..fbeea839962 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -23,6 +23,7 @@ in stdenv.mkDerivation { description = "Simple plaintext todo list manager"; homepage = "http://todotxt.com"; license = lib.licenses.gpl3; + mainProgram = "todo.sh"; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index eb5937bbc3c..b463faa4a25 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor viraptor ]; + mainProgram = "kal"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 79dcab19acb..4875a4818f8 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -51,6 +51,7 @@ in stdenv.mkDerivation { description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; + mainProgram = "SoapySDRUtil"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 20c33f0fbae..4e808dd8f19 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "abc"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index aee1a9c63f8..5a48abfc4aa 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -115,6 +115,7 @@ in stdenv.mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; + mainProgram = executable-name; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index bfc2ab7f9b0..4a30107bbec 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -87,10 +87,11 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ kuznero ]; + homepage = "https://dotnet.github.io/"; license = licenses.mit; + maintainers = with maintainers; [ kuznero ]; + mainProgram = "dotnet"; + platforms = builtins.attrNames srcs; }; } diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index fc0f50d0797..eb81efe2de0 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; - license = licenses.asl20; changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; - platforms = with platforms; darwin ++ linux; + license = licenses.asl20; maintainers = with maintainers; [ gebner pnmadelaine ]; + mainProgram = "fstar.exe"; + platforms = with platforms; darwin ++ linux; }; } diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 7642ae4aff2..dbacda5c479 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -34,8 +34,9 @@ stdenv.mkDerivation rec { meta = { description = "A workbench for high-assurance and high-speed cryptography"; homepage = "https://github.com/jasmin-lang/jasmin/"; - platforms = lib.platforms.all; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "jasminc"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 0c24e67123c..065e4462f2e 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; maintainers = with maintainers; [ Madouura ]; + mainProgram = "v"; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 24e10eb7306..cfc1c12d192 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { description = "An interpreter of K, APL-like programming language"; homepage = "https://github.com/kevinlawler/kona/"; maintainers = with maintainers; [ raskin ]; + mainProgram = "k"; platforms = platforms.all; license = licenses.isc; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 6ecc3ad6053..08c225603eb 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; homepage = "https://moarvm.org"; license = licenses.artistic2; - platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + mainProgram = "moar"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index efeaf9df507..7d9dbe6f393 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -76,8 +76,9 @@ let ''; homepage = "https://github.com/com-lihaoyi/Ammonite"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.nequissimus ]; + mainProgram = "amm"; + platforms = platforms.all; }; }; in { diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 7d56e55ebdb..21e9abd04f2 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -40,10 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "info" ]; meta = with lib; { - homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - longDescription = '' Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. @@ -54,8 +51,11 @@ stdenv.mkDerivation rec { should write a makefile for it, so that it is possible to use Make to build and install the program. ''; + homepage = "https://www.gnu.org/software/make/"; - platforms = platforms.all; + license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 183548f5e31..7c4b0ad4650 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -37,10 +37,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; meta = with lib; { - homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - longDescription = '' Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. @@ -51,8 +48,11 @@ stdenv.mkDerivation rec { should write a makefile for it, so that it is possible to use Make to build and install the program. ''; + homepage = "https://www.gnu.org/software/make/"; - platforms = platforms.all; + license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/jam/ftjam.nix b/pkgs/development/tools/build-managers/jam/ftjam.nix index 6007b67f148..1f106401c0d 100644 --- a/pkgs/development/tools/build-managers/jam/ftjam.nix +++ b/pkgs/development/tools/build-managers/jam/ftjam.nix @@ -42,10 +42,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://freetype.org/jam/"; description = "Freetype's enhanced, backwards-compatible Jam clone"; + homepage = "https://freetype.org/jam/"; license = licenses.free; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "jam"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index b13762d63b1..675160751d1 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/michaelforney/samurai"; description = "ninja-compatible build tool written in C"; longDescription = '' samurai is a ninja-compatible build tool with a focus on simplicity, @@ -50,8 +49,10 @@ stdenv.mkDerivation rec { .ninja_deps as the original ninja tool, currently version 5 and 4 respectively. ''; + homepage = "https://github.com/michaelforney/samurai"; license = with licenses; [ mit asl20 ]; # see LICENSE maintainers = with maintainers; [ dtzWill AndersonTorres ]; + mainProgram = "samu"; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 26770276372..fa59649dd23 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -67,11 +67,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = - "A more featureful runner for sbt, the simple/scala/standard build tool"; + description = "A more featureful runner for sbt, the simple/scala/standard build tool"; homepage = "https://github.com/paulp/sbt-extras"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nequissimus puffnfresh ]; + mainProgram = "sbt"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 9244a80672e..88f8846a47b 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam ]; + mainProgram = "buildctl"; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5c95c99814d..e3562282afb 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; + mainProgram = "jenkins-cli"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 96b86719e6c..d0d32de0ce1 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -28,9 +28,10 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://dapr.io"; description = "A CLI for managing Dapr, the distributed application runtime"; + homepage = "https://dapr.io"; license = licenses.mit; maintainers = with maintainers; [ lucperkins ]; + mainProgram = "dapr"; }; } diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix index 79470814ada..c9ed951d596 100644 --- a/pkgs/development/tools/ent/default.nix +++ b/pkgs/development/tools/ent/default.nix @@ -31,10 +31,11 @@ buildGoModule rec { meta = with lib; { description = "An entity framework for Go"; + homepage = "https://entgo.io/"; downloadPage = "https://github.com/ent/ent"; license = licenses.asl20; - homepage = "https://entgo.io/"; maintainers = with maintainers; [ superherointj ]; + mainProgram = "ent"; }; } diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 708cdb511a8..afc91cb6030 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -27,9 +27,10 @@ stdenv.mkDerivation { dontFixup = true; meta = with lib; { - homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; + homepage = "https://www.gnu.org/software/gnulib/"; license = licenses.gpl3Plus; + mainProgram = "gnulib-tool"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 8c340b2ccf6..9f53c702014 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/swaggo/swag"; license = licenses.mit; maintainers = with maintainers; [ stephenwithph ]; + mainProgram = "swag"; }; } diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 56b47bd8c60..4290d1501eb 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -17,9 +17,10 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - homepage = "https://goa.design"; description = "A framework for building microservices in Go using a unique design-first approach"; + homepage = "https://goa.design"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; + mainProgram = "goagen"; }; } diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix index 96fd79d62fc..26c9eeedacd 100644 --- a/pkgs/development/tools/jd-diff-patch/default.nix +++ b/pkgs/development/tools/jd-diff-patch/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/josephburnett/jd"; license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 blaggacao ]; + mainProgram = "jd"; }; } diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index 5abbf71e7f4..c9510a35d10 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -16,7 +16,8 @@ buildGoPackage rec { meta = with lib; { description = "A JMESPath implementation in Go"; homepage = "https://github.com/jmespath/go-jmespath"; - maintainers = with maintainers; [ cransom ]; license = licenses.asl20; + maintainers = with maintainers; [ cransom ]; + mainProgram = "jpgo"; }; } diff --git a/pkgs/development/tools/kustomize/3.nix b/pkgs/development/tools/kustomize/3.nix index aa99256faa8..d9eb6ce298e 100644 --- a/pkgs/development/tools/kustomize/3.nix +++ b/pkgs/development/tools/kustomize/3.nix @@ -36,5 +36,6 @@ buildGoModule rec { homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; maintainers = with maintainers; [ carlosdagos vdemeester zaninime Chili-Man saschagrunert ]; + mainProgram = "kustomize"; }; } diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 1582ca87402..1a71b9bc857 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation { meta = with lib; { description = "A literate programming tool for any language"; - homepage = "http://literate.zbyedidia.webfactional.com/"; + homepage = "https://zyedidia.github.io/literate/"; license = licenses.mit; + mainProgram = "lit"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index 1aef6d52075..cbe22351327 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,8 @@ in stdenv.mkDerivation rec { description = "Changes the current Ruby"; homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; + mainProgram = "chruby-exec"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 806625934d9..e0f71b2b3c3 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; meta = { - homepage = "https://www.gnu.org/software/m4/"; description = "GNU M4, a macro processor"; - longDescription = '' GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible although it has some @@ -38,8 +36,10 @@ stdenv.mkDerivation rec { recursion etc... m4 can be used either as a front-end to a compiler or as a macro processor in its own right. ''; + homepage = "https://www.gnu.org/software/m4/"; license = lib.licenses.gpl3Plus; + mainProgram = "m4"; platforms = lib.platforms.unix ++ lib.platforms.windows; }; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 35c651f4a18..e3c4aef87bd 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "https://premake.github.io/"; description = "A simple build configuration and project generation tool using lua"; + homepage = "https://premake.github.io/"; license = lib.licenses.bsd3; - platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; + mainProgram = "premake4"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 4d17680471d..eb6c8bd7619 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://goosecode.com/watson/"; license = with licenses; mit; maintainers = with maintainers; [ robertodr nicknovitski ]; + mainProgram = "watson"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index f77e2feb4ff..458b4a10c8d 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -46,7 +46,8 @@ in rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/rust-lang/rust-bindgen"; license = with licenses; [ bsd3 ]; - platforms = platforms.unix; maintainers = with maintainers; [ johntitor ralith ]; + mainProgram = "bindgen"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 92d731c79b5..7b2493ba985 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -61,5 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://rust-analyzer.github.io"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ oxalica ]; + mainProgram = "rust-analyzer"; }; } diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 61959b98b4c..943d6b60b60 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; + license = licenses.asl20; maintainers = with maintainers; [ coconnor offline ]; + mainProgram = "selenium-server"; platforms = platforms.all; - license = licenses.asl20; }; } diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index a87892c5f14..3d2901bc9ac 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -33,11 +33,11 @@ crystal.buildCrystalPackage rec { ''; meta = with lib; { - description = - "A Crystal library for creating and running tasks. Also generates Lucky projects"; + description = "A Crystal library for creating and running tasks. Also generates Lucky projects"; homepage = "https://luckyframework.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "lucky"; platforms = platforms.unix; broken = lib.versionOlder crystal.version "0.35.1"; }; diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix index a3ec7ff3f31..e6f164f2bca 100644 --- a/pkgs/development/web/shopify-cli/default.nix +++ b/pkgs/development/web/shopify-cli/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { description = "CLI which helps you build against the Shopify platform faster"; homepage = "https://github.com/Shopify/shopify-cli"; license = licenses.mit; - platforms = ruby.meta.platforms; maintainers = with maintainers; [ onny ]; + mainProgram = "shopify"; + platforms = ruby.meta.platforms; }; } diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index c5170c9845c..fd893559469 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -57,10 +57,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/Bugdom"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = with licenses; [ cc-by-sa-40 ]; maintainers = with maintainers; [ lux ]; + mainProgram = "Bugdom"; platforms = platforms.unix; }; } diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index 607a53579c7..eb1dd25811a 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/foldex/r2mod_cli"; license = licenses.gpl3Only; maintainers = [ maintainers.reedrw ]; + mainProgram = "r2mod"; platforms = platforms.unix; }; } diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index b2796225a6c..b74d3630e0e 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -21,7 +21,8 @@ tcl.mkTclDerivation rec { homepage = "https://github.com/dbohdan/2048.tcl"; description = "The game of 2048 implemented in Tcl"; license = lib.licenses.mit; - platforms = lib.platforms.all; maintainers = with lib.maintainers; [ dbohdan ]; + mainProgram = "2048"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index e7b3d1c496d..e6e089e8861 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -49,10 +49,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/rhaberkorn/openrussian-cli"; description = "Offline Console Russian Dictionary (based on openrussian.org)"; + homepage = "https://github.com/rhaberkorn/openrussian-cli"; license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; maintainers = with maintainers; [ zane ]; + mainProgram = "openrussian"; platforms = platforms.unix; }; } diff --git a/pkgs/misc/platformsh/default.nix b/pkgs/misc/platformsh/default.nix index 9c0410b4738..64b9168fee4 100644 --- a/pkgs/misc/platformsh/default.nix +++ b/pkgs/misc/platformsh/default.nix @@ -42,9 +42,10 @@ stdenv.mkDerivation { meta = with lib; { description = "The unified tool for managing your Platform.sh services from the command line."; - license = licenses.mit; homepage = "https://github.com/platformsh/platformsh-cli"; + license = licenses.mit; maintainers = with maintainers; [ shyim ]; + mainProgram = "platform"; platforms = platforms.all; }; } diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 99626018750..bbabd02f475 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; + homepage = "https://github.com/pipeseroni/pipes.sh"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "pipes.sh"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 5636f51a169..875a2fa2c1f 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -37,9 +37,10 @@ stdenv.mkDerivation rec { mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; meta = with lib; { - homepage = "https://github.com/soabase/exhibitor"; description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; + homepage = "https://github.com/soabase/exhibitor"; license = licenses.asl20; + mainProgram = "startExhibitor.sh"; platforms = platforms.unix; }; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 8f3739b4ebf..3df2d833e0b 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -54,6 +54,7 @@ buildGoModule rec { homepage = "https://gotify.net"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "server"; }; } diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 651c7398868..e02b54e9eef 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -29,7 +29,8 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://www.icinga.com/products/icinga-web-2/"; license = licenses.gpl2Only; - platforms = platforms.all; maintainers = with maintainers; [ das_j ]; + mainProgram = "icingacli"; + platforms = platforms.all; }; } diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix index 62b01cf9266..bda3f1cda4c 100644 --- a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix +++ b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix @@ -22,9 +22,10 @@ buildGoModule rec { }; meta = with lib; { - homepage = "https://github.com/poolpOrg/filter-rspamd"; description = "OpenSMTPD filter integration for the Rspamd daemon"; + homepage = "https://github.com/poolpOrg/filter-rspamd"; license = licenses.isc; maintainers = with maintainers; [ Flakebi ]; + mainProgram = "filter-rspamd"; }; } diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 6d63c6b1d66..904b2182dbe 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/prometheus-community/json_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; + mainProgram = "json_exporter"; }; } diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index 386e49594d2..748e135b634 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { homepage = "https://github.com/xperimental/nextcloud-exporter"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; + mainProgram = "nextcloud-exporter"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/t-rex/default.nix b/pkgs/servers/t-rex/default.nix index 551282b6058..fb132da8587 100644 --- a/pkgs/servers/t-rex/default.nix +++ b/pkgs/servers/t-rex/default.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "t_rex"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/servers/unifiedpush-common-proxies/default.nix index b969902b253..4c41a7c9fde 100644 --- a/pkgs/servers/unifiedpush-common-proxies/default.nix +++ b/pkgs/servers/unifiedpush-common-proxies/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/UnifiedPush/common-proxies"; license = licenses.mit; maintainers = with maintainers; [ yuka ]; + mainProgram = "up_rewrite"; }; } diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 22abbdac08c..d154b1cee11 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -42,9 +42,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; - license = licenses.gpl2; homepage = "https://engelsystem.de"; + license = licenses.gpl2; maintainers = with maintainers; [ kloenk ]; + mainProgram = "migrate"; platforms = platforms.all; }; } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 843e6f71165..5526d8fe31f 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada ]; + mainProgram = "lemmy_server"; }; } diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 2917c0e2400..5d01868725a 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -52,6 +52,7 @@ buildGoModule rec { homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ em0lar ]; + mainProgram = "vikunja"; platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix index d35eb345dda..0660bbe7e7b 100644 --- a/pkgs/shells/zsh/zplug/default.nix +++ b/pkgs/shells/zsh/zplug/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { description = "A next-generation plugin manager for zsh"; homepage = "https://github.com/zplug/zplug"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.s1341 ]; + mainProgram = "zplug-env"; + platforms = platforms.all; }; } diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index be5c6650557..9f88d972e7d 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -25,10 +25,11 @@ buildGoModule rec { meta = with lib; { description = "A CLI to provide enhanced history for your ZSH shell"; - license = licenses.mit; homepage = "https://github.com/b4b4r07/history"; - platforms = platforms.unix; + license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "history"; + platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index fcc92e673a5..9be1ea7f4d4 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -45,9 +45,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = "https://www.gnu.org/software/tar/"; description = "GNU implementation of the `tar' archiver"; - longDescription = '' The Tar program provides the ability to create tar archives, as well as various other kinds of manipulation. For example, you @@ -62,10 +60,12 @@ stdenv.mkDerivation rec { pipes), it can even access remote devices or files (as archives). ''; + homepage = "https://www.gnu.org/software/tar/"; license = lib.licenses.gpl3Plus; maintainers = [ ]; + mainProgram = "tar"; platforms = lib.platforms.all; priority = 10; diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 60585c3b354..0f13addfcd9 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite glib curl ]; meta = with lib; { - license = licenses.lgpl3; description = "A music related metadata searchengine"; homepage = "https://github.com/sahib/glyr"; + license = licenses.lgpl3; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "glyrc"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index fbaab91d093..27d0141ff75 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; + mainProgram = "xdelta3"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index 03366e5b1ce..2ac8398dbc2 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -60,6 +60,7 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; + mainProgram = "xdelta3"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index 379ed14f8ef..beebae6542b 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -38,6 +38,7 @@ buildRubyGem rec { homepage = "https://anystyle.io/"; license = licenses.bsd2; maintainers = with maintainers; [ shamilton ]; + mainProgram = "anystyle"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index cd7b8270a1a..3839d117afd 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hisbaan/didyoumean"; license = licenses.gpl3Plus; maintainers = with maintainers; [ evanjs ]; + mainProgram = "dym"; }; } diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix index 771f3493157..e608ad121cc 100644 --- a/pkgs/tools/misc/go.rice/default.nix +++ b/pkgs/tools/misc/go.rice/default.nix @@ -16,9 +16,10 @@ buildGoModule rec { subPackages = [ "." "rice" ]; meta = with lib; { - homepage = "https://github.com/GeertJohan/go.rice"; description = "A Go package that makes working with resources such as html, js, css, images, templates very easy"; + homepage = "https://github.com/GeertJohan/go.rice"; license = licenses.bsd2; maintainers = with maintainers; [ blaggacao ]; + mainProgram = "rice"; }; } diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 1480f099f9f..5db9e8f00fb 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { description = "Open source log management solution"; homepage = "https://www.graylog.org/"; license = licenses.gpl3; - platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; + mainProgram = "graylogctl"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 680e3738768..d3e24c55984 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "Convert MySQL dump files to PostgreSQL-loadable files"; homepage = "https://pgfoundry.org/projects/mysql2pgsql/"; license = lib.licenses.bsdOriginal; + mainProgram = "mysql2psql"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 384c448e1d9..e158f1c3f44 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -31,8 +31,6 @@ buildGoModule rec { ]; meta = with lib; { - homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; - changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; description = "OpenTelemetry Collector superset with additional community collectors"; longDescription = '' The OpenTelemetry Collector offers a vendor-agnostic implementation on how @@ -44,7 +42,10 @@ buildGoModule rec { components that are only useful to a relatively small number of users and is multiple times larger as a result. ''; + homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ uri-canva jk ]; + mainProgram = "otelcontribcol"; }; } diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index de746f39b47..26a80c6a659 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { to install the wakatime CLI interface manually. ''; license = licenses.bsd3; + mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 51cfda5e0aa..d16410c3153 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { variables (overwriting and restoring). ''; homepage = "https://github.com/Tarrasch/zsh-autoenv"; + mainProgram = "zsh-autoenv-share"; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 64e601c375c..d279f061737 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -16,5 +16,6 @@ buildGoModule rec { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "obfs4proxy"; }; } diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index b6feafb4a00..01c5b637676 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://ooni.org/install/cli"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "ooniprobe"; }; } diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 44546465d9e..158cac0a734 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { description = "Send copies of (UDP) datagrams to multiple receivers"; homepage = "https://github.com/sleinen/samplicator/"; license = lib.licenses.gpl2Plus; + mainProgram = "samplicate"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 25e426dc43e..ed6a817058c 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = { license = lib.licenses.mit; maintainers = [ lib.maintainers.qyliss ]; + mainProgram = "slack"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 2387c903a9b..2ca679b16c8 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ''; homepage="http://www.tinc-vpn.org/"; license = lib.licenses.gpl2Plus; + mainProgram = "tincd"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index e20f36b1ef9..a33833a230d 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nix-community/nixos-generators"; license = licenses.mit; maintainers = with maintainers; [ lassulus ]; + mainProgram = "nixos-generate"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index ba80734e5cf..ae831bf8675 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation { supergenpass will ask for your master password interactively, and it will not be displayed on your terminal. ''; + homepage = "https://github.com/lanzz/bash-supergenpass"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; - homepage = "https://github.com/lanzz/bash-supergenpass"; + mainProgram = "supergenpass"; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 4803430018e..50477cf92f0 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -95,5 +95,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://sequoia-pgp.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson doronbehar ]; + mainProgram = "sq"; }; } diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 048d06f2004..d1a26f25724 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -52,10 +52,11 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update-bin.sh; meta = with lib; { - homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + homepage = "https://www.vaultproject.io"; license = licenses.mpl20; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick ]; + mainProgram = "vault"; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index 05d2d853b24..4693763a89c 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/nats-io/nkeys"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "nk"; }; } diff --git a/pkgs/tools/system/taskspooler/default.nix b/pkgs/tools/system/taskspooler/default.nix index 9899a9fb3f6..26925954778 100644 --- a/pkgs/tools/system/taskspooler/default.nix +++ b/pkgs/tools/system/taskspooler/default.nix @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple single node task scheduler"; - license = licenses.gpl2Plus; homepage = "https://vicerveza.homeunix.net/~viric/wsgi-bin/hgweb.wsgi/ts"; - platforms = platforms.unix; + license = licenses.gpl2Plus; maintainers = [ maintainers.sheepforce ]; + mainProgram = "ts"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index dd03bcfa6a3..44d50c0c963 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; maintainers = with maintainers; [ shell ]; + mainProgram = "markdown"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 058c2ba3daa..62b83636b37 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { patches = [./malloc.patch]; meta = { - homepage = "https://replace.richardlloyd.org.uk/"; description = "A tool to replace verbatim strings"; + homepage = "https://replace.richardlloyd.org.uk/"; + mainProgram = "replace-literal"; platforms = lib.platforms.unix; }; } From 9e4be532219685cdd81e4db54f9fc061d250ba25 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 4 May 2022 17:52:27 -0700 Subject: [PATCH 051/182] treewide: add meta.mainProgram to some libraries where a single bin is provided and someone might actually want to run it --- pkgs/development/libraries/appstream/default.nix | 3 ++- pkgs/development/libraries/aribb25/default.nix | 5 +++-- pkgs/development/libraries/audio/libsmf/default.nix | 1 + pkgs/development/libraries/aws-c-s3/default.nix | 3 ++- pkgs/development/libraries/boolstuff/default.nix | 1 + pkgs/development/libraries/capstone/default.nix | 3 ++- pkgs/development/libraries/check/default.nix | 1 + pkgs/development/libraries/faad2/default.nix | 2 ++ pkgs/development/libraries/fcgi/default.nix | 1 + pkgs/development/libraries/flatbuffers/generic.nix | 5 +++-- pkgs/development/libraries/gdk-pixbuf/default.nix | 3 ++- pkgs/development/libraries/gensio/default.nix | 1 + pkgs/development/libraries/glpk/default.nix | 1 + pkgs/development/libraries/keystone/default.nix | 1 + pkgs/development/libraries/ldns/default.nix | 5 +++-- pkgs/development/libraries/libargon2/default.nix | 1 + pkgs/development/libraries/libaudec/default.nix | 3 ++- pkgs/development/libraries/libb64/default.nix | 2 ++ pkgs/development/libraries/libbencodetools/default.nix | 1 + pkgs/development/libraries/libburn/default.nix | 3 ++- pkgs/development/libraries/libcddb/default.nix | 1 + pkgs/development/libraries/libcdio-paranoia/default.nix | 5 +++-- pkgs/development/libraries/libcmis/default.nix | 3 ++- pkgs/development/libraries/libdc1394/default.nix | 3 ++- pkgs/development/libraries/libdigidoc/default.nix | 3 ++- pkgs/development/libraries/libeatmydata/default.nix | 1 + pkgs/development/libraries/libee/default.nix | 5 +++-- pkgs/development/libraries/libexttextcat/default.nix | 3 ++- pkgs/development/libraries/libiconv/default.nix | 1 + pkgs/development/libraries/libirecovery/default.nix | 5 +++-- pkgs/development/libraries/liblognorm/default.nix | 3 ++- pkgs/development/libraries/libmaxminddb/default.nix | 3 ++- pkgs/development/libraries/libnatpmp/default.nix | 3 ++- pkgs/development/libraries/libnotify/default.nix | 7 ++++--- pkgs/development/libraries/libpostal/default.nix | 1 + pkgs/development/libraries/libpsl/default.nix | 3 ++- pkgs/development/libraries/libqalculate/default.nix | 3 ++- pkgs/development/libraries/libroxml/default.nix | 5 +++-- pkgs/development/libraries/librsvg/default.nix | 1 + pkgs/development/libraries/librsync/default.nix | 3 ++- pkgs/development/libraries/libsecret/default.nix | 1 + pkgs/development/libraries/libshout/default.nix | 1 + pkgs/development/libraries/libu2f-host/default.nix | 3 ++- pkgs/development/libraries/libubox/default.nix | 3 ++- pkgs/development/libraries/libvmaf/default.nix | 5 +++-- pkgs/development/libraries/libxkbcommon/default.nix | 1 + pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix | 1 + pkgs/development/libraries/libxls/default.nix | 3 ++- pkgs/development/libraries/libykneomgr/default.nix | 3 ++- pkgs/development/libraries/matio/default.nix | 5 +++-- pkgs/development/libraries/md4c/default.nix | 3 ++- pkgs/development/libraries/mongoc/default.nix | 3 ++- pkgs/development/libraries/nanomsg/default.nix | 1 + pkgs/development/libraries/ndpi/default.nix | 1 + pkgs/development/libraries/pe-parse/default.nix | 3 ++- pkgs/development/libraries/precice/default.nix | 5 +++-- pkgs/development/libraries/proj-datumgrid/default.nix | 3 ++- pkgs/development/libraries/protobuf/generic-v3.nix | 3 ++- pkgs/development/libraries/rnnoise/default.nix | 3 ++- .../development/libraries/science/math/cliquer/default.nix | 5 +++-- .../development/libraries/science/math/flintqs/default.nix | 3 ++- pkgs/development/libraries/serd/default.nix | 3 ++- pkgs/development/libraries/silgraphite/graphite2.nix | 4 +++- pkgs/development/libraries/slang/default.nix | 1 + pkgs/development/libraries/soundtouch/default.nix | 3 ++- pkgs/development/libraries/sqlite/tools.nix | 6 ++++-- pkgs/development/libraries/stxxl/default.nix | 1 + pkgs/development/libraries/tecla/default.nix | 4 ++-- pkgs/development/libraries/tre/default.nix | 3 ++- pkgs/development/libraries/uriparser/default.nix | 5 +++-- pkgs/development/libraries/xmlsec/default.nix | 3 ++- pkgs/development/libraries/zlog/default.nix | 3 ++- 72 files changed, 139 insertions(+), 64 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 9b07697a6a9..56268146c5d 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -93,14 +93,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software metadata handling library"; - homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and can be consumed by other software. ''; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; license = licenses.lgpl21Plus; + mainProgram = "appstreamcli"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 3e171d75797..743850c5fdc 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -48,10 +48,11 @@ stdenv.mkDerivation rec { lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; meta = with lib; { - homepage = "https://code.videolan.org/videolan/aribb25"; description = "Sample implementation of the ARIB STD-B25 standard"; - platforms = platforms.all; + homepage = "https://code.videolan.org/videolan/aribb25"; license = licenses.isc; maintainers = with maintainers; [ midchildan ]; + mainProgram = "b25"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index b3e3a34973c..6737d76538e 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; + mainProgram = "smfsh"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 2868e6b80b8..15bfe3bb9b9 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { description = "C99 library implementation for communicating with the S3 service"; homepage = "https://github.com/awslabs/aws-c-s3"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ r-burns ]; + mainProgram = "s3"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index c7520ff783e..b49355f60e9 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; + mainProgram = "booldnf"; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index adc52da1e56..6f5a8e340ad 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation rec { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = lib.licenses.bsd3; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ris ]; + mainProgram = "cstool"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 37bde1caf43..8add9c62347 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://libcheck.github.io/check/"; license = licenses.lgpl2Plus; + mainProgram = "checkmk"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 396acbc1bdf..8b1757ed563 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; + homepage = "https://sourceforge.net/projects/faac/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; + mainProgram = "faad"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 434d445ceb4..5c7f0c44f91 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A language independent, scalable, open extension to CG"; homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ license = "FastCGI see LICENSE.TERMS"; + mainProgram = "cgi-fcgi"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/flatbuffers/generic.nix b/pkgs/development/libraries/flatbuffers/generic.nix index 1cdfb4b9c87..c06dad87d95 100644 --- a/pkgs/development/libraries/flatbuffers/generic.nix +++ b/pkgs/development/libraries/flatbuffers/generic.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation rec { access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. ''; - maintainers = [ maintainers.teh ]; + homepage = "https://google.github.io/flatbuffers/"; license = licenses.asl20; + maintainers = [ maintainers.teh ]; + mainProgram = "flatc"; platforms = platforms.unix; - homepage = "https://google.github.io/flatbuffers/"; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 1e9c881ae8c..cbed6a62a3c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -149,8 +149,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; - maintainers = [ maintainers.eelco ] ++ teams.gnome.members; license = licenses.lgpl21Plus; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; + mainProgram = "gdk-pixbuf-thumbnailer"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 84d54b3bc35..48e2d4fd8fb 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/ser2net/"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; + mainProgram = "gensiot"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index a46c84844e8..7551c15649e 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg ] ++ teams.sage.members; + mainProgram = "glpsol"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix index 70864bcf24a..0bb979f7a55 100644 --- a/pkgs/development/libraries/keystone/default.nix +++ b/pkgs/development/libraries/keystone/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keystone-engine.org"; license = licenses.gpl2Only; maintainers = with maintainers; [ luc65r ]; + mainProgram = "kstool"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 1ccb0e41e70..6712d7c6d3c 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -42,9 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with the aim of simplifying DNS programming in C"; - license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; - platforms = platforms.unix; + license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "drill"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index eb8e6333d41..19ca4fab401 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://www.argon2.com/"; license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; + mainProgram = "argon2"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix index 78e4b5cfa40..5340f62a32e 100644 --- a/pkgs/development/libraries/libaudec/default.nix +++ b/pkgs/development/libraries/libaudec/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; meta = with lib; { - homepage = "https://www.zrythm.org"; description = "A library for reading and resampling audio files"; + homepage = "https://www.zrythm.org"; license = licenses.agpl3Plus; + mainProgram = "audec"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 987a36cd79f..88bc059892c 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C routines for fast base64 encoding/decoding"; + homepage = "https://github.com/libb64/libb64"; license = lib.licenses.publicDomain; + mainProgram = "base64"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libbencodetools/default.nix b/pkgs/development/libraries/libbencodetools/default.nix index b8150a90f68..42e6fb9f4ed 100644 --- a/pkgs/development/libraries/libbencodetools/default.nix +++ b/pkgs/development/libraries/libbencodetools/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/heikkiorsila/bencodetools"; license = licenses.bsd2; maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "bencat"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f9b6538027d..ba24182ade8 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; + homepage = "http://libburnia-project.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; + mainProgram = "cdrskin"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index bf20211ee60..4848f5fcc26 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "C library to access data on a CDDB server (freedb.org)"; homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; + mainProgram = "cddb_query"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 999c0450489..36b591b0605 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation rec { This is a port of xiph.org's cdda paranoia to use libcdio for CDROM access. By doing this, cdparanoia runs on platforms other than GNU/Linux. ''; - license = licenses.gpl3; homepage = "https://github.com/rocky/libcdio-paranoia"; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3; maintainers = [ ]; + mainProgram = "cd-paranoia"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 2898c9a1c83..f5a9974f3bc 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ client library for the CMIS interface"; - homepage = "https://sourceforge.net/projects/libcmis/"; + homepage = "https://github.com/tdf/libcmis"; license = licenses.gpl2; + mainProgram = "cmis-client"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index a666eb3a650..379f5397ec0 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin CoreServices; meta = with lib; { - homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; + homepage = "https://sourceforge.net/projects/libdc1394/"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; + mainProgram = "dc1394_reset_bus"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 7ee268e4e7d..a639b4b3294 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { description = "Library for creating DigiDoc signature files"; homepage = "https://github.com/open-eid/libdigidoc"; license = licenses.lgpl2; - platforms = platforms.unix; maintainers = [ maintainers.jagajaga ]; + mainProgram = "cdigidoc"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 70fab2da568..3a3abdc5e9a 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "Small LD_PRELOAD library to disable fsync and friends"; homepage = "https://www.flamingspork.com/projects/libeatmydata/"; license = licenses.gpl3Plus; + mainProgram = "eatmydata"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index ae052971825..1269f6f0eff 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libestr]; meta = { - homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; - platforms = lib.platforms.unix; + homepage = "http://www.libee.org/"; license = lib.licenses.lgpl21Plus; + mainProgram = "libee-convert"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index c315379d92c..39369c5c3b6 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = "https://wiki.documentfoundation.org/Libexttextcat"; - platforms = platforms.all; license = licenses.bsd3; + mainProgram = "createfp"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 35d01cd3e82..5be5ecfd82e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; maintainers = [ ]; + mainProgram = "iconv"; # This library is not needed on GNU platforms. hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 6a2f926d79e..c10d46577ff 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -39,16 +39,17 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/libimobiledevice/libirecovery"; description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; longDescription = '' libirecovery is a cross-platform library which implements communication to iBoot/iBSS found on Apple's iOS devices via USB. A command-line utility is also provided. ''; + homepage = "https://github.com/libimobiledevice/libirecovery"; license = licenses.lgpl21; + maintainers = with maintainers; [ nh2 ]; + mainProgram = "irecovery"; # Upstream description says it works on more platforms, but packager hasn't tried that yet platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index af4190f9683..184d9932eb2 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with lib; { - homepage = "https://www.liblognorm.com/"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; + homepage = "https://www.liblognorm.com/"; license = licenses.lgpl21; + mainProgram = "lognormalizer"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 1c15519aaff..855296bddb4 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; - platforms = platforms.all; maintainers = [ maintainers.vcunat ]; + mainProgram = "mmdblookup"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 54177ad559d..f718170fc76 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; + homepage = "http://miniupnp.free.fr/libnatpmp.html"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; + mainProgram = "natpmpc"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index d3b857d7673..eb89fa124c4 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -61,10 +61,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libnotify"; description = "A library that sends desktop notifications to a notification daemon"; - platforms = platforms.unix; - maintainers = teams.gnome.members; + homepage = "https://gitlab.gnome.org/GNOME/libnotify"; license = licenses.lgpl21; + maintainers = teams.gnome.members; + mainProgram = "notify-send"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix index 6b616a61d51..30c7af9ccc5 100644 --- a/pkgs/development/libraries/libpostal/default.nix +++ b/pkgs/development/libraries/libpostal/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openvenues/libpostal"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; + mainProgram = "libpostal_data"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 0a710d648fb..fc85f537591 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -85,7 +85,8 @@ in stdenv.mkDerivation rec { homepage = "https://rockdaboot.github.io/libpsl/"; changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.c0bw3b ]; + mainProgram = "psl"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index ddaa6ae3e1d..afc2313df7a 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -41,8 +41,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced calculator library"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner doronbehar ]; + mainProgram = "qalc"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index 71d78a8b8e5..647e4c188a0 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; + homepage = "https://www.libroxml.net/"; license = licenses.lgpl3; - platforms = platforms.unix; maintainers = with maintainers; [ mpickering ]; + mainProgram = "roxml"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index b0935441384..6ef67af4b19 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; + mainProgram = "rsvg-convert"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index a0248e774b7..0594e9e6e20 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with lib; { + description = "Implementation of the rsync remote-delta algorithm"; homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; - description = "Implementation of the rsync remote-delta algorithm"; + mainProgram = "rdiff"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 95e2c69e4c7..b04012cec28 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { description = "A library for storing and retrieving passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/Libsecret"; license = lib.licenses.lgpl21Plus; + mainProgram = "secret-tool"; inherit (glib.meta) platforms maintainers; }; } diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index e231fb0ed6e..07025b26eea 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://www.icecast.org"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming ]; + mainProgram = "shout"; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 3be758c906f..9acbaa47906 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; + homepage = "https://developers.yubico.com/libu2f-host"; license = with licenses; [ gpl3Plus lgpl21Plus ]; + mainProgram = "u2f-host"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 9261d1b81ba..bb49ad4472c 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; license = licenses.isc; - platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + mainProgram = "jshn"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index a58f816e8af..e7add08871a 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; + homepage = "https://github.com/Netflix/vmaf"; changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md"; - platforms = platforms.unix; license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; + mainProgram = "vmaf"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 7bcc62af6ec..5c632009bee 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ primeos ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 539fca7456b..6578a86e35b 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 43c96027d08..8ba48e15f22 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { description = "Extract Cell Data From Excel xls files"; homepage = "https://github.com/libxls/libxls"; license = licenses.bsd2; - platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; + mainProgram = "xls2csv"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index 7f314410667..d0fc1cfd9fb 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; + homepage = "https://developers.yubico.com/libykneomgr"; license = licenses.bsd3; + mainProgram = "ykneomgr"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 7a227e57560..1805de0264c 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C library for reading and writing Matlab MAT files"; + homepage = "http://matio.sourceforge.net/"; license = licenses.bsd2; - platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = "http://matio.sourceforge.net/"; + mainProgram = "matdump"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/development/libraries/md4c/default.nix index 2ad77b2d2fd..6504d99af3e 100644 --- a/pkgs/development/libraries/md4c/default.nix +++ b/pkgs/development/libraries/md4c/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/mity/md4c"; description = "Markdown parser made in C"; longDescription = '' MD4C is Markdown parser implementation in C, with the following features: @@ -58,8 +57,10 @@ stdenv.mkDerivation rec { "Unicode"). See more details below. - Permissive license: MD4C is available under the MIT license. ''; + homepage = "https://github.com/mity/md4c"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "md2html"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index e9779cf0a05..8b5753b3aca 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The official C client library for MongoDB"; - homepage = "https://github.com/mongodb/mongo-c-driver"; + homepage = "http://mongoc.org"; license = licenses.asl20; + mainProgram = "mongoc-stat"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 49a93abd7fb..2bc86edef70 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; license = licenses.mit; + mainProgram = "nanocat"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 2e8a997299f..b798320c691 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; + mainProgram = "ndpiReader"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index 445188bd0d9..76ee7febfe7 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { description = "A principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; + mainProgram = "dump-pe"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index ba35a55d920..e700a5f9f11 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; - license = with lib.licenses; [ gpl3 ]; homepage = "https://precice.org/"; - platforms = lib.platforms.unix; + license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ Scriptkiddi ]; + mainProgram = "binprecice"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index 8251a17a83c..2593c04fa15 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { description = "Repository for proj datum grids"; homepage = "https://proj4.org"; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; + mainProgram = "nad2bin"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 6867940d1f2..130f681d849 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -48,9 +48,10 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; + homepage = "https://developers.google.com/protocol-buffers/"; license = lib.licenses.bsd3; + mainProgram = "protoc"; platforms = lib.platforms.unix; - homepage = "https://developers.google.com/protocol-buffers/"; }; passthru.version = version; diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index ad587f0f583..af4fcf30153 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation (rec { ''; meta = with lib; { - homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; description = "Recurrent neural network for audio noise reduction"; + homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; + mainProgram = "rnnoise_demo"; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 0d8bafffb44..fd89ede1efb 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://users.aalto.fi/~pat/cliquer.html"; - downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; longDescription = '' Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. @@ -31,8 +29,11 @@ stdenv.mkDerivation rec { It is designed with the aim of being efficient while still being flexible and easy to use. ''; + homepage = "https://users.aalto.fi/~pat/cliquer.html"; + downloadPage = src.meta.homepage; # autocliquer license = licenses.gpl2Plus; maintainers = teams.sage.members; + mainProgram = "cl"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index c956eae4f71..c5426ed67fc 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -30,10 +30,11 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; + homepage = "https://github.com/sagemath/FlintQS"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; + mainProgram = "QuadraticSieve"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 82237ef1434..1a1f3475c35 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with lib; { - homepage = "http://drobilla.net/software/serd"; description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; + homepage = "http://drobilla.net/software/serd"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; + mainProgram = "serdi"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index ea1bb493683..9255889c694 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -44,8 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced font engine"; + homepage = "https://graphite.sil.org/"; + license = licenses.lgpl21; maintainers = [ maintainers.raskin ]; + mainProgram = "gr2fonttest"; platforms = platforms.unix; - license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index fe32076858a..53d69a7e549 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "slsh"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index b29095f7e19..b03a7cc0722 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { description = "A program and library for changing the tempo, pitch and playback rate of audio"; homepage = "https://www.surina.net/soundtouch/"; license = licenses.lgpl21Plus; - platforms = platforms.all; maintainers = with maintainers; [ orivej ]; + mainProgram = "soundstretch"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index ebb887ffa01..73ce1c35f50 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -2,7 +2,7 @@ let archiveVersion = import ./archive-version.nix lib; - mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { + mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; version = "3.38.2"; @@ -20,7 +20,7 @@ let installPhase = "install -Dt $out/bin ${makeTarget}"; meta = with lib; { - inherit description homepage; + inherit description homepage mainProgram; downloadPage = "http://sqlite.org/download.html"; license = licenses.publicDomain; maintainers = with maintainers; [ johnazoidberg ]; @@ -34,11 +34,13 @@ in makeTarget = "sqldiff"; description = "A tool that displays the differences between SQLite databases"; homepage = "https://www.sqlite.org/sqldiff.html"; + mainProgram = "sqldiff"; }; sqlite-analyzer = mkTool { pname = "sqlite-analyzer"; makeTarget = "sqlite3_analyzer"; description = "A tool that shows statistics about SQLite databases"; homepage = "https://www.sqlite.org/sqlanalyze.html"; + mainProgram = "sqlite3_analyzer"; }; } diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 391424ee2c9..499532092f0 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; maintainers = with maintainers; [ ]; + mainProgram = "stxxl_tool"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 11918d76da6..7163f24815c 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; + homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; license = "as-is"; - + mainProgram = "enhance"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 9ac026ee94b..8cd0faf4867 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; - platforms = lib.platforms.unix; license = lib.licenses.bsd2; + mainProgram = "agrep"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 28eea052517..c39fdb03e89 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { - homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. API documentation is available on uriparser website. ''; + homepage = "https://uriparser.github.io/"; license = licenses.bsd3; - platforms = platforms.unix; maintainers = with maintainers; [ bosu ]; + mainProgram = "uriparse"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 5f255751480..187e6900aa0 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -68,10 +68,11 @@ stdenv.mkDerivation rec { ''; meta = { + description = "XML Security Library in C based on libxml2"; homepage = "http://www.aleksey.com/xmlsec"; downloadPage = "https://www.aleksey.com/xmlsec/download.html"; - description = "XML Security Library in C based on libxml2"; license = lib.licenses.mit; + mainProgram = "xmlsec1"; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index b115cf7b675..99163ae5dc6 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; - platforms = platforms.unix; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "zlog-chk-conf"; + platforms = platforms.unix; }; } From 7ffc224e4a3fd9b0a6e4b2e08851f52735c44661 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 28 Apr 2022 23:31:31 -0600 Subject: [PATCH 052/182] signal-desktop: 5.39.0 -> 5.42.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c96fb1b58a9..6afccfaaa07 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.39.0"; # Please backport all updates to the stable channel. + version = "5.42.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-Dy5orMKZvvnHZu/2U5YIJdDR4eDM3SBjXVGHuBv0kgc="; + sha256 = "sha256-xjSj7eKaDV8WB0SiPb4orxKK8mV2a2EWiMBK7BE8mgU="; }; nativeBuildInputs = [ From 58fe89e8462d5c24f84cbb9a41a3b2fc96481105 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 10:29:08 +0200 Subject: [PATCH 053/182] python310Packages.tldextract: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/tldextract/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 139f58660c4..fe32af26713 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.2.1"; + version = "3.3.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rJMEzfgLCcN+6pZXmeDZrAqhzLZTH65Uiqvgm68aJUk="; + hash = "sha256-rc0kq/Ic40UEF81aAPI7fldVTOiugnM03RK/y7YnTPE="; }; nativeBuildInputs = [ From e0b9154e58ede9becc73f1c3a8886125f11eeecc Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 3 May 2022 19:34:20 +0100 Subject: [PATCH 054/182] python3Packages.hy: 1.0a3 -> 1.0a4 --- pkgs/development/python-modules/hy/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 63625bd7ee6..b05233f4a63 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -11,21 +11,22 @@ buildPythonPackage rec { pname = "hy"; - version = "1.0a3"; + version = "1.0a4"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hylang"; repo = pname; rev = version; - sha256 = "1dqw24rvsps2nab1pbjjm1c81vrs34r4kkk691h3xdyxnv9hb84b"; + sha256 = "sha256-MBzp3jqBg/kH233wcgYYHc+Yg9GuOaBsXIfjFDihD1E="; }; propagatedBuildInputs = [ colorama funcparserlib - rply + rply # TODO: remove on the next release ] ++ lib.optionals (pythonOlder "3.9") [ astor ]; @@ -47,6 +48,6 @@ buildPythonPackage rec { description = "Python to/from Lisp layer"; homepage = "https://github.com/hylang/hy"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab thiagokokada ]; }; } From 72fd5b71bc8d0591b6afb7aab227940f3c670548 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 3 May 2022 20:01:54 +0100 Subject: [PATCH 055/182] hy: replace it with python3Packages.hy Add `hyDefinedPythonPackages` parameter to allow backwards compatibility with interpreters/hy. Fixes https://github.com/NixOS/nixpkgs/issues/171428. --- pkgs/development/interpreters/hy/builder.nix | 40 ------------------- pkgs/development/interpreters/hy/default.nix | 15 ------- .../development/python-modules/hy/default.nix | 12 ++++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 pkgs/development/interpreters/hy/builder.nix delete mode 100644 pkgs/development/interpreters/hy/default.nix diff --git a/pkgs/development/interpreters/hy/builder.nix b/pkgs/development/interpreters/hy/builder.nix deleted file mode 100644 index 6757f859ac1..00000000000 --- a/pkgs/development/interpreters/hy/builder.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, python3Packages -, hyDefinedPythonPackages /* Packages like with python.withPackages */ -, ... -}: -python3Packages.buildPythonApplication rec { - pname = "hy"; - version = "1.0a1"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "sha256-lCrbvbkeutSNmvvn/eHpTnJwPb5aEH7hWTXYSE+AJmU="; - }; - - checkInputs = with python3Packages; [ flake8 pytest ]; - - propagatedBuildInputs = with python3Packages; [ - appdirs - astor - clint - colorama - fastentrypoints - funcparserlib - rply - pygments - ] ++ (hyDefinedPythonPackages python3Packages); - - # Hy does not include tests in the source distribution from PyPI, so only test executable. - checkPhase = '' - $out/bin/hy --help > /dev/null - ''; - - meta = with lib; { - description = "A LISP dialect embedded in Python"; - homepage = "https://hylang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ nixy mazurel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix deleted file mode 100644 index f5d80c11d71..00000000000 --- a/pkgs/development/interpreters/hy/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib -, callPackage -, hyDefinedPythonPackages ? python-packages: [] /* Packages like with python.withPackages */ -}: -let - withPackages = ( - python-packages: callPackage ./builder.nix { - hyDefinedPythonPackages = python-packages; - } - ); -in -(withPackages hyDefinedPythonPackages) // { - # Export withPackages function for hy customization - inherit withPackages; -} diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index b05233f4a63..e5b7b9fd578 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -5,8 +5,10 @@ , fetchFromGitHub , funcparserlib , pytestCheckHook +, python , pythonOlder , rply +, hyDefinedPythonPackages ? python-packages: [] /* Packages like with python.withPackages */ }: buildPythonPackage rec { @@ -27,9 +29,13 @@ buildPythonPackage rec { colorama funcparserlib rply # TODO: remove on the next release - ] ++ lib.optionals (pythonOlder "3.9") [ + ] + ++ lib.optionals (pythonOlder "3.9") [ astor - ]; + ] + # for backwards compatibility with removed pkgs/development/interpreters/hy + # See: https://github.com/NixOS/nixpkgs/issues/171428 + ++ (hyDefinedPythonPackages python.pkgs); checkInputs = [ pytestCheckHook @@ -48,6 +54,6 @@ buildPythonPackage rec { description = "Python to/from Lisp layer"; homepage = "https://github.com/hylang/hy"; license = licenses.mit; - maintainers = with maintainers; [ fab thiagokokada ]; + maintainers = with maintainers; [ fab mazurel nixy thiagokokada ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b4b5760373..763b563b405 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35047,7 +35047,7 @@ with pkgs; simplenote = callPackage ../applications/misc/simplenote { }; - hy = callPackage ../development/interpreters/hy {}; + hy = with python3Packages; toPythonApplication hy; wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { }; From 927dffd2a7ec609c19f02c865a108e4dd5ee1830 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 3 May 2022 20:17:47 +0100 Subject: [PATCH 056/182] python3Packages.hy: fix version --- pkgs/development/python-modules/hy/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index e5b7b9fd578..e37923afad3 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -4,10 +4,12 @@ , colorama , fetchFromGitHub , funcparserlib +, hy , pytestCheckHook , python , pythonOlder , rply +, testers , hyDefinedPythonPackages ? python-packages: [] /* Packages like with python.withPackages */ }: @@ -25,6 +27,9 @@ buildPythonPackage rec { sha256 = "sha256-MBzp3jqBg/kH233wcgYYHc+Yg9GuOaBsXIfjFDihD1E="; }; + # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10 + HY_VERSION = version; + propagatedBuildInputs = [ colorama funcparserlib @@ -50,6 +55,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "hy" ]; + passthru.tests.version = testers.testVersion { + package = hy; + command = "hy -v"; + }; + meta = with lib; { description = "Python to/from Lisp layer"; homepage = "https://github.com/hylang/hy"; From d956922c41d333efb67dd07d3b64b311a5eb7b2c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 3 May 2022 21:55:21 +0100 Subject: [PATCH 057/182] python3Packages.hy: add passthru.withPackages attribute --- pkgs/development/python-modules/hy/default.nix | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index e37923afad3..cb6fc48aa6d 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -10,7 +10,8 @@ , pythonOlder , rply , testers -, hyDefinedPythonPackages ? python-packages: [] /* Packages like with python.withPackages */ +, toPythonApplication +, hyDefinedPythonPackages ? python-packages: [ ] /* Packages like with python.withPackages */ }: buildPythonPackage rec { @@ -55,9 +56,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "hy" ]; - passthru.tests.version = testers.testVersion { - package = hy; - command = "hy -v"; + passthru = { + tests.version = testers.testVersion { + package = hy; + command = "hy -v"; + }; + # also for backwards compatibility with removed pkgs/development/interpreters/hy + withPackages = python-packages: (toPythonApplication hy).override { + hyDefinedPythonPackages = python-packages; + }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 763b563b405..88aac1bbaab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35047,7 +35047,7 @@ with pkgs; simplenote = callPackage ../applications/misc/simplenote { }; - hy = with python3Packages; toPythonApplication hy; + hy = python3Packages.hy.withPackages (python-packages: [ ]); wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { }; From 2862810dfaa0a717fcf1924cad819cb186e689bd Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 4 May 2022 11:42:37 +0100 Subject: [PATCH 058/182] python3Packages.hy: update meta --- pkgs/development/python-modules/hy/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index cb6fc48aa6d..a962f86854f 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -68,8 +68,9 @@ buildPythonPackage rec { }; meta = with lib; { - description = "Python to/from Lisp layer"; - homepage = "https://github.com/hylang/hy"; + description = "A LISP dialect embedded in Python"; + homepage = "https://hylang.org/"; + changelog = "https://github.com/hylang/hy/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab mazurel nixy thiagokokada ]; }; From 821027934e64a96ac530811172e8c09e7d335f58 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 4 May 2022 12:42:06 +0100 Subject: [PATCH 059/182] hylure: init at 0.1 --- .../python-modules/hyrule/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/hyrule/default.nix diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix new file mode 100644 index 00000000000..46ed096486b --- /dev/null +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "hyrule"; + version = "0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hylang"; + repo = pname; + rev = version; + sha256 = "sha256-sqS5vOcbln+Vfv/Ji/8rJ4GTQpXIuhgf+MukjV0Kkuw="; + }; + + propagatedBuildInputs = [ + hy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Some tests depends on hy on PATH + preCheck = "PATH=${hy}/bin:$PATH"; + + pythonImportsCheck = [ "hyrule" ]; + + meta = with lib; { + description = "Hyrule is a utility library for the Hy programming language"; + homepage = "https://github.com/hylang/hyrule"; + changelog = "https://github.com/hylang/hylure/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 894e7f1da5d..66e889bf63a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3998,6 +3998,8 @@ in { hyppo = callPackage ../development/python-modules/hyppo { }; + hyrule = callPackage ../development/python-modules/hyrule { }; + i2c-tools = callPackage ../development/python-modules/i2c-tools { inherit (pkgs) i2c-tools; }; From 1a87016de5daf980152f275a125dc65fbbae18a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 10:58:13 +0200 Subject: [PATCH 060/182] erosmb: init at 0.1.1 --- pkgs/tools/security/erosmb/default.nix | 47 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/security/erosmb/default.nix diff --git a/pkgs/tools/security/erosmb/default.nix b/pkgs/tools/security/erosmb/default.nix new file mode 100644 index 00000000000..c0b4586c352 --- /dev/null +++ b/pkgs/tools/security/erosmb/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "erosmb"; + version = "0.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "viktor02"; + repo = "EroSmb"; + rev = "v${version}"; + hash = "sha256-d7iSl7weIHWXDnMYQKxafVd5JrZ0fnuWRDpEirBVdcg="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + chardet + colorama + cryptography + impacket + ldap3 + ldapdomaindump + pyasn1 + setuptools + six + ]; + + # Project has no tests + doCheck = false; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/erosmb --help + runHook postInstallCheck + ''; + + meta = with lib; { + description = "SMB network scanner"; + homepage = "https://github.com/viktor02/EroSmb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aca0f5950a..792cf6d7690 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -438,6 +438,8 @@ with pkgs; enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { }; + erosmb = callPackage ../tools/security/erosmb { }; + onesixtyone = callPackage ../tools/security/onesixtyone {}; oletools = with python3.pkgs; toPythonApplication oletools; From e2703d269756d27cff92ecb61c6da9d68ad8fdf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 24 May 2021 16:08:40 +0200 Subject: [PATCH 061/182] nixos/version: Warn about using the default of system.stateVersion --- nixos/modules/misc/version.nix | 9 +++++++++ nixos/modules/testing/test-instrumentation.nix | 3 +++ 2 files changed, 12 insertions(+) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 931201ade29..010acdb72f6 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -146,6 +146,15 @@ in "/etc/os-release".source = initrdRelease; "/etc/initrd-release".source = initrdRelease; }; + + # We have to use `warnings` because when warning in the default of the option + # the warning would also be shown when building the manual since the manual + # has to evaluate the default. + # + # TODO Remove this and drop the default of the option so people are forced to set it. + # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix + warnings = lib.optional (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority) + "system.stateVersion is not set, defaulting to ${config.system.stateVersion}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion."; }; # uses version info nixpkgs, which requires a full nixpkgs path diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 81541477b9e..4ab2578eb81 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -129,6 +129,9 @@ in # Make sure we use the Guest Agent from the QEMU package for testing # to reduce the closure size required for the tests. services.qemuGuest.package = pkgs.qemu_test.ga; + + # Squelch warning about unset system.stateVersion + system.stateVersion = lib.mkDefault lib.trivial.release; }; } From 4c5e7bde3e6056376e70448ee56a9baa7cc49dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 5 May 2022 00:56:54 +0200 Subject: [PATCH 062/182] nixos/matrix-synapse: Add a defaultText --- nixos/modules/services/matrix/matrix-synapse.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/matrix/matrix-synapse.nix b/nixos/modules/services/matrix/matrix-synapse.nix index a498aff7a55..87a977f8e1e 100644 --- a/nixos/modules/services/matrix/matrix-synapse.nix +++ b/nixos/modules/services/matrix/matrix-synapse.nix @@ -296,6 +296,7 @@ in { default = if lib.versionAtLeast config.system.stateVersion "22.05" then "${cfg.dataDir}/media_store" else "${cfg.dataDir}/media"; + defaultText = "${cfg.dataDir}/media_store for when system.stateVersion is at least 22.05, ${cfg.dataDir}/media when lower than 22.05"; description = '' Directory where uploaded images and attachments are stored. ''; From 0329256fd82af1a100e1b724efd9f735a5bec81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 5 May 2022 12:51:39 +0200 Subject: [PATCH 063/182] nixos-functions: Set system.stateVersion --- pkgs/test/nixos-functions/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index f2914455246..5e9857134de 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -24,6 +24,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( system.nixos = dummyVersioning; boot.loader.grub.enable = false; fileSystems."/".device = "/dev/null"; + system.stateVersion = lib.trivial.release; }).toplevel; nixosTest-test = pkgs.nixosTest ({ lib, pkgs, figlet, ... }: { @@ -31,6 +32,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( nodes.machine = { pkgs, ... }: { system.nixos = dummyVersioning; environment.systemPackages = [ pkgs.hello figlet ]; + system.stateVersion = lib.trivial.release; }; testScript = '' machine.succeed("hello | figlet >/dev/console") From 276402f933f4625019b27918e5d4ce77be60988e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 5 May 2022 12:52:59 +0200 Subject: [PATCH 064/182] vscode-extensions: Init alefragnani.bookmarks at 13.0.1 --- .../editors/vscode/extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ffe7f9a336a..db018bfb67e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -79,6 +79,18 @@ let }; }; + alefragnani.bookmarks = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "bookmarks"; + publisher = "alefragnani"; + version = "13.0.1"; + sha256 = "sha256-4IZCPNk7uBqPw/FKT5ypU2QxadQzYfwbGxxT/bUnKdE="; + }; + meta = { + license = lib.licenses.gpl3; + }; + }; + alefragnani.project-manager = buildVscodeMarketplaceExtension { mktplcRef = { name = "project-manager"; From 4c7f7f61a79f9a4b90634f28063e5858b7b2fffa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 14:27:25 +0200 Subject: [PATCH 065/182] trueseeing: init at 2.1.4 --- pkgs/tools/security/trueseeing/default.nix | 44 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/security/trueseeing/default.nix diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix new file mode 100644 index 00000000000..4aa9e1852ae --- /dev/null +++ b/pkgs/tools/security/trueseeing/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "trueseeing"; + version = "2.1.4"; + format = "flit"; + + src = fetchFromGitHub { + owner = "alterakey"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zc0AOv7OFmEPLl//eykbh538rM2j4kXBLHt5bgK1IRY="; + }; + + nativeBuildInputs = with python3.pkgs; [ + flit-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + ipython + jinja2 + lxml + pypubsub + pyyaml + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "trueseeing" + ]; + + meta = with lib; { + description = "Non-decompiling Android vulnerability scanner"; + homepage = "https://github.com/alterakey/trueseeing"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aca0f5950a..ef21d8006d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11000,6 +11000,8 @@ with pkgs; trousers = callPackage ../tools/security/trousers { }; + trueseeing = callPackage ../tools/security/trueseeing { }; + trx = callPackage ../tools/audio/trx { }; tryton = callPackage ../applications/office/tryton { }; From 6eaf63fec7ca21627708c62064ba514916e11498 Mon Sep 17 00:00:00 2001 From: Joshua Trees Date: Thu, 5 May 2022 15:45:27 +0200 Subject: [PATCH 066/182] tutanota-desktop: 3.91.10 -> 3.95.4 --- .../networking/mailreaders/tutanota-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index e5edfaa4670..92a8563633c 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.91.10"; + version = "3.95.4"; src = fetchurl { - url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-RlEgpXco0lkkjlJ8FZz4MxYznKLPl1Lxkb5MSmhOTzI="; + sha256 = "0kkkp0nw4fby4663w7g0k2y1sg89pm336slzii1s3n70h8cak3dx"; }; nativeBuildInputs = [ From 05cfbf0a55261ab711a385876ee057a0eb3586f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 17:19:16 +0200 Subject: [PATCH 067/182] python310Packages.whispers: build as package --- .../python-modules}/whispers/default.nix | 23 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 21 insertions(+), 6 deletions(-) rename pkgs/{tools/security => development/python-modules}/whispers/default.nix (70%) diff --git a/pkgs/tools/security/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix similarity index 70% rename from pkgs/tools/security/whispers/default.nix rename to pkgs/development/python-modules/whispers/default.nix index 07c1f1e707e..02a1b050f91 100644 --- a/pkgs/tools/security/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -1,20 +1,33 @@ { lib +, astroid +, beautifulsoup4 +, buildPythonPackage , fetchFromGitHub -, python3 +, jproperties +, luhn +, lxml +, pytest-mock +, pytestCheckHook +, python-Levenshtein +, pythonOlder +, pyyaml }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "whispers"; version = "1.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - sha256 = "sha256-jruUGyoZCyMu015QKtlvfx5WRMfxo/eYUue9wUIWb6o="; + hash = "sha256-jruUGyoZCyMu015QKtlvfx5WRMfxo/eYUue9wUIWb6o="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ astroid beautifulsoup4 jproperties @@ -24,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml ]; - checkInputs = with python3.pkgs; [ + checkInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aca0f5950a..c95c4630db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30386,7 +30386,7 @@ with pkgs; wafw00f = callPackage ../tools/security/wafw00f { }; - whispers = callPackage ../tools/security/whispers { }; + whispers = with python3Packages; toPythonApplication whispers; waon = callPackage ../applications/audio/waon { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16c87e27223..44fdd3e38db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10897,6 +10897,8 @@ in { whisper = callPackage ../development/python-modules/whisper { }; + whispers = callPackage ../development/python-modules/whispers { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; whodap = callPackage ../development/python-modules/whodap { }; From c505c32170f8cadb4e17839400278174af173d88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 17:22:58 +0200 Subject: [PATCH 068/182] swaggerhole: init at 1.1 --- pkgs/tools/security/swaggerhole/default.nix | 37 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/security/swaggerhole/default.nix diff --git a/pkgs/tools/security/swaggerhole/default.nix b/pkgs/tools/security/swaggerhole/default.nix new file mode 100644 index 00000000000..8455867b4be --- /dev/null +++ b/pkgs/tools/security/swaggerhole/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "swaggerhole"; + version = "1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Liodeus"; + repo = pname; + # Source is not tagged at the moment, https://github.com/Liodeus/swaggerHole/issues/2 + rev = "14846406fbd0f145d71ad51c3b87f383e4afbc3b"; + hash = "sha256-3HmIpn1A86PXZRL+SqMdr84O16hW1mCUWHKnOVolmx8="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + whispers + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "swaggerhole" + ]; + + meta = with lib; { + description = "Tool to searching for secret on swaggerhub"; + homepage = "https://github.com/Liodeus/swaggerHole"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c95c4630db0..9faf0a0a2d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10597,6 +10597,8 @@ with pkgs; swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { }; + swaggerhole = callPackage ../tools/security/swaggerhole { }; + swapview = callPackage ../os-specific/linux/swapview { }; swtpm = callPackage ../tools/security/swtpm { }; From 61fc98459ffecb70c2890d35eaa37e28bb08eda5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 5 May 2022 19:39:50 +0300 Subject: [PATCH 069/182] nixVersions.unstable: pre20220503 -> pre20220505 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index cf9b26a5603..b7fe55f8b41 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -89,12 +89,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.8"; - suffix = "pre20220503_${lib.substring 0 7 src.rev}"; + suffix = "pre20220505_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e"; - sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4="; + rev = "f4102de84ba4dd3b845a3e34fabab5400e066ad0"; + sha256 = "sha256-g3GDM8MSzJ27hJoGWj2QGjINZP/I1KCJpZZn+iPMmfM="; }; }); }) From 27194d6afb0d147cce93feb7bc1edcf3338bcaa7 Mon Sep 17 00:00:00 2001 From: Pawel Kruszewski Date: Thu, 5 May 2022 20:12:40 +0200 Subject: [PATCH 070/182] timeular: 4.7.1 -> 4.8.0 --- pkgs/applications/office/timeular/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 50298247d5a..aa591c225ad 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -7,31 +7,26 @@ }: let - version = "4.7.1"; + version = "4.8.0"; pname = "timeular"; - name = "${pname}-${version}"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256:0k8ywbdb41imq10ya9y27zks67a6drjb1h0hn8ycd7a6z6703rjz"; + sha256 = "sha256:0y2asw3jf2n4c7y0yr669jfqw4frp5nzzv3lffimfdr78gihma66"; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; - - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; + inherit pname version src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png substituteInPlace $out/share/applications/timeular.desktop \ From d3dae7864a3df5fe66a3b7f3efe634b5f5f1eeef Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 4 May 2022 18:40:27 +0000 Subject: [PATCH 071/182] victoriametrics: 1.59.0 -> 1.76.1 This fixes grafana + VictoriaMetrics on NixOS master; 1.59.0 somehow resulted in mostly empty charts. https://docs.victoriametrics.com/CHANGELOG.html#v1761 --- pkgs/servers/nosql/victoriametrics/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 4ef8fe9575f..d825543b8d7 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,17 +2,23 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.59.0"; + version = "1.76.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU="; + sha256 = "sha256-4cgSJi53EGK6YUwO4HlhNs4T07US94A/sPZi2QCx0aw="; }; vendorSha256 = null; + postPatch = '' + # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package + # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web + rm -f app/vmui/packages/vmui/web/{go.mod,main.go} + ''; + ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; @@ -21,7 +27,7 @@ buildGoModule rec { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; - maintainers = [ maintainers.yorickvp ]; + maintainers = with maintainers; [ yorickvp ivan ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; platforms = [ "x86_64-linux" ]; }; From 46f8180c5b0dff1ba3ea1fbb09fa209078795338 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 5 May 2022 19:15:15 +0000 Subject: [PATCH 072/182] victoriametrics: 1.76.1 -> 1.77.0 https://docs.victoriametrics.com/CHANGELOG.html#v1770 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index d825543b8d7..1f2ec463e8d 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.76.1"; + version = "1.77.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-4cgSJi53EGK6YUwO4HlhNs4T07US94A/sPZi2QCx0aw="; + sha256 = "sha256-Ike3yO93q/bna/cnHv1sg+gR7iS9cVmNzLViBsfFdVs="; }; vendorSha256 = null; From 11a1fb28e49cbcd6cd9e14509cdfba070f61a208 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 5 May 2022 19:23:43 +0000 Subject: [PATCH 073/182] victoriametrics: add comment about app/vmui/packages/vmui/web/ --- pkgs/servers/nosql/victoriametrics/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 1f2ec463e8d..8e676b5022a 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web + # + # This appears to be some of test server for development purposes only. rm -f app/vmui/packages/vmui/web/{go.mod,main.go} ''; From e06ba92957faa0431433062e257f2f67de0f6e8a Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Thu, 5 May 2022 22:27:47 +0200 Subject: [PATCH 074/182] drawio: 17.4.2 -> 18.0.1 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index f93e415bcd6..bb501947415 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "17.4.2"; + version = "18.0.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "294f99d9060bc394490b20d2ddab75ed5c0166d7960850f065eb8897ef31a2e3"; + sha256 = "4f3893f53e47a3937320676e02337a61c358c684d5cd0b378809b3d7deab0139"; }; nativeBuildInputs = [ From 5d789b1280052a68022a2e37432dd102c5d5fc5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 23:30:06 +0200 Subject: [PATCH 075/182] python310Packages.ciscoconfparse: 1.6.36 -> 1.6.40 --- .../python-modules/ciscoconfparse/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 49b36a5c658..535c46fc40a 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,24 +1,27 @@ { lib , buildPythonPackage -, fetchFromGitHub -, poetry-core -, passlib , dnspython +, fetchFromGitHub , loguru -, toml +, passlib +, poetry-core , pytestCheckHook +, pythonOlder +, toml }: buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.36"; + version = "1.6.40"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "mpenning"; repo = pname; rev = version; - sha256 = "sha256-nIuuqAxz8eHEQRuH8nfYVQ+vGMmcDcARJLizoI5Mty8="; + hash = "sha256-2j1AlCIwTxIjotZ0fSt1zhsgPfJTqJukZ6KQvh74NJ8="; }; postPatch = '' @@ -45,17 +48,19 @@ buildPythonPackage rec { ]; disabledTests = [ + # Tests require network access "test_dns_lookup" "test_reverse_dns_lookup" ]; - pythonImportsCheck = [ "ciscoconfparse" ]; + pythonImportsCheck = [ + "ciscoconfparse" + ]; meta = with lib; { - description = - "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; + description = "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; homepage = "https://github.com/mpenning/ciscoconfparse"; license = licenses.gpl3Only; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ astro ]; }; } From 5b8df072cb56f45e9b1655f26ee05f7772fbe49a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 23:59:45 +0200 Subject: [PATCH 076/182] pre-commit: 2.18.1 -> 2.19.0 --- pkgs/tools/misc/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index df211378f4b..f85490736d9 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -13,7 +13,7 @@ with python3Packages; buildPythonPackage rec { pname = "pre-commit"; - version = "2.18.1"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "pre-commit"; rev = "v${version}"; - sha256 = "sha256-d/ukUTjNgpqr6IeDJHDaOXQm0EdsX+vq0sVX7HG3gSE="; + sha256 = "sha256-5YV0FJhHiq/NJFKYvwddIWUQVxKJpnIJLLNmyY0NX4A="; }; patches = [ From f18cc2cf02695c9d21d33beb47f2eac7b7d0d079 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 4 May 2022 16:34:29 +0000 Subject: [PATCH 077/182] nixos/security/wrappers: chown user:group instead of user.group to fix warnings from coreutils 9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit activating the configuration... setting up /etc... chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.messagebus’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ reloading user units for root... --- nixos/modules/security/wrappers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index e63f19010de..169ef744262 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -98,7 +98,7 @@ let # Prevent races chmod 0000 "$wrapperDir/${program}" - chown ${owner}.${group} "$wrapperDir/${program}" + chown ${owner}:${group} "$wrapperDir/${program}" # Set desired capabilities on the file plus cap_setpcap so # the wrapper program can elevate the capabilities set on @@ -126,7 +126,7 @@ let # Prevent races chmod 0000 "$wrapperDir/${program}" - chown ${owner}.${group} "$wrapperDir/${program}" + chown ${owner}:${group} "$wrapperDir/${program}" chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" "$wrapperDir/${program}" ''; From 59a76614f3219348fb44389d19f933ddda4bf12c Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 5 May 2022 20:09:00 +0000 Subject: [PATCH 078/182] treewide: chown user:group instead of user.group to fix warnings from coreutils 9.1 --- .../installation/installing-from-other-distro.section.xml | 2 +- .../installation/installing-from-other-distro.section.md | 2 +- .../services/continuous-integration/hydra/default.nix | 8 ++++---- nixos/modules/services/networking/gateone.nix | 4 ++-- nixos/modules/services/networking/ircd-hybrid/ircd.conf | 2 +- nixos/modules/services/networking/pptpd.nix | 2 +- nixos/modules/services/networking/prayer.nix | 2 +- nixos/modules/services/networking/tinc.nix | 4 ++-- nixos/modules/services/networking/xl2tpd.nix | 6 +++--- nixos/modules/services/web-apps/restya-board.nix | 8 ++++---- nixos/tests/virtualbox.nix | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml index 525531a4781..024a24379dd 100644 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -248,7 +248,7 @@ $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-co (since your Nix install was probably single user): -$ sudo chown -R 0.0 /nix +$ sudo chown -R 0:0 /nix diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index d9060eb89c3..fa8806f791d 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -177,7 +177,7 @@ The first steps to all these are the same: was probably single user): ```ShellSession - $ sudo chown -R 0.0 /nix + $ sudo chown -R 0:0 /nix ``` 1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files: diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index cc5de97d6d1..90adab7fbf2 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -300,17 +300,17 @@ in }; preStart = '' mkdir -p ${baseDir} - chown hydra.hydra ${baseDir} + chown hydra:hydra ${baseDir} chmod 0750 ${baseDir} ln -sf ${hydraConf} ${baseDir}/hydra.conf mkdir -m 0700 -p ${baseDir}/www - chown hydra-www.hydra ${baseDir}/www + chown hydra-www:hydra ${baseDir}/www mkdir -m 0700 -p ${baseDir}/queue-runner mkdir -m 0750 -p ${baseDir}/build-logs - chown hydra-queue-runner.hydra ${baseDir}/queue-runner ${baseDir}/build-logs + chown hydra-queue-runner:hydra ${baseDir}/queue-runner ${baseDir}/build-logs ${optionalString haveLocalDB '' if ! [ -e ${baseDir}/.db-created ]; then @@ -338,7 +338,7 @@ in rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots fi - chown hydra.hydra ${cfg.gcRootsDir} + chown hydra:hydra ${cfg.gcRootsDir} chmod 2775 ${cfg.gcRootsDir} ''; serviceConfig.ExecStart = "${hydra-package}/bin/hydra-init"; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 3e3a3c1aa94..e68f8a47d5c 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -36,11 +36,11 @@ config = mkIf cfg.enable { preStart = '' if [ ! -d ${cfg.settingsDir} ] ; then mkdir -m 0750 -p ${cfg.settingsDir} - chown -R gateone.gateone ${cfg.settingsDir} + chown -R gateone:gateone ${cfg.settingsDir} fi if [ ! -d ${cfg.pidDir} ] ; then mkdir -m 0750 -p ${cfg.pidDir} - chown -R gateone.gateone ${cfg.pidDir} + chown -R gateone:gateone ${cfg.pidDir} fi ''; #unitConfig.RequiresMountsFor = "${cfg.settingsDir}"; diff --git a/nixos/modules/services/networking/ircd-hybrid/ircd.conf b/nixos/modules/services/networking/ircd-hybrid/ircd.conf index 17ef203840a..b82094cf5f0 100644 --- a/nixos/modules/services/networking/ircd-hybrid/ircd.conf +++ b/nixos/modules/services/networking/ircd-hybrid/ircd.conf @@ -98,7 +98,7 @@ serverinfo { * * openssl genrsa -out rsa.key 2048 * openssl rsa -in rsa.key -pubout -out rsa.pub - * chown . rsa.key rsa.pub + * chown : rsa.key rsa.pub * chmod 0600 rsa.key * chmod 0644 rsa.pub */ diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index 3e7753b9dd3..423e14e998f 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -108,7 +108,7 @@ with lib; #username pptpd password * EOF - chown root.root "$secrets" + chown root:root "$secrets" chmod 600 "$secrets" ''; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index ae9258b2712..513509eaca3 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -82,7 +82,7 @@ in serviceConfig.Type = "forking"; preStart = '' mkdir -m 0755 -p ${stateDir} - chown ${prayerUser}.${prayerGroup} ${stateDir} + chown ${prayerUser}:${prayerGroup} ${stateDir} ''; script = "${prayer}/sbin/prayer --config-file=${prayerCfg}"; }; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 31731b60d48..9bc019039e0 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -383,9 +383,9 @@ in }; preStart = '' mkdir -p /etc/tinc/${network}/hosts - chown tinc.${network} /etc/tinc/${network}/hosts + chown tinc:${network} /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/invitations - chown tinc.${network} /etc/tinc/${network}/invitations + chown tinc:${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 7dbe51422d9..9418488c1e9 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -116,18 +116,18 @@ with lib; #username xl2tpd password * EOF - chown root.root ppp/chap-secrets + chown root:root ppp/chap-secrets chmod 600 ppp/chap-secrets # The documentation says this file should be present but doesn't explain why and things work even if not there: [ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets - chown root.root l2tp-secrets + chown root:root l2tp-secrets chmod 600 l2tp-secrets popd > /dev/null mkdir -p /run/xl2tpd - chown root.root /run/xl2tpd + chown root:root /run/xl2tpd chmod 700 /run/xl2tpd ''; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 4b36cc8754c..0bfa2368787 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -294,7 +294,7 @@ in ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img" chmod g+w "${runDir}/tmp/cache" - chown -R "${cfg.user}"."${cfg.group}" "${runDir}" + chown -R "${cfg.user}":"${cfg.group}" "${runDir}" mkdir -m 0750 -p "${cfg.dataDir}" @@ -302,9 +302,9 @@ in mkdir -m 0750 -p "${cfg.dataDir}/client/img" cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media" cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img" - chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" + chown "${cfg.user}":"${cfg.group}" "${cfg.dataDir}" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/media" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/client/img" ${optionalString (cfg.database.host == null) '' if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 27093aab96e..4eb402a7d36 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -222,7 +222,7 @@ let machine.execute(ru("VBoxManage controlvm ${name} poweroff")) machine.succeed("rm -rf ${sharePath}") machine.succeed("mkdir -p ${sharePath}") - machine.succeed("chown alice.users ${sharePath}") + machine.succeed("chown alice:users ${sharePath}") def create_vm_${name}(): From 4ac44ce7218ac31be0cea74fd06f317269c2b1f8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:20:50 +0200 Subject: [PATCH 079/182] linux: 4.19.240 -> 4.19.241 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c03c5d5afd2..2e1f98af3e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.240"; + version = "4.19.241"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j"; + sha256 = "04zyi22c2d91k7v2w0s8v112cqqf24km599mn18k2nafq79njqjc"; }; } // (args.argsOverride or {})) From f6afb504da53fa0e0ba60bc24b94785f87642608 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 00:20:52 +0200 Subject: [PATCH 080/182] python310Packages.pyupgrade: 2.32.0 -> 2.32.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index e2c48948b97..ffd7a89dbb0 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.32.0"; + version = "2.32.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VSGi93R8O0LGKFBkWMclje64suOqq/Gf2vE2OHXLP5Q="; + sha256 = "sha256-fjahaMetgZaH+IzdyaZSkVbasgc0bqQL+1ae0OJriT0="; }; checkInputs = [ From f93833182bc4f09dc1212dc09c27501ff967a82d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:21:02 +0200 Subject: [PATCH 081/182] linux: 5.15.36 -> 5.15.37 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 44438676ae3..007258e7336 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.36"; + version = "5.15.37"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n"; + sha256 = "09n0l9ly111r6jbpgz1kw2q4n4mmcv5jxfhs5bcsiyjp44d0kgqq"; }; } // (args.argsOverride or { })) From cb10c6f5cfb6a9f8de3c9e6113e221e16be79973 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:21:47 +0200 Subject: [PATCH 082/182] linux/hardened/patches/4.14: 4.14.276-hardened1 -> 4.14.277-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cb73bbed557..dcac0289242 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.276-hardened1.patch", - "sha256": "1q0w8fqn9z32r35s3lil9dllkykydnpfp1dkhgvmy5rggbm801ay", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.276-hardened1/linux-hardened-4.14.276-hardened1.patch" + "name": "linux-hardened-4.14.277-hardened1.patch", + "sha256": "1jjbywmwglnsj80dbic14bip6wfllsgqgw7lcn9s8n12mdr42ps2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.277-hardened1/linux-hardened-4.14.277-hardened1.patch" }, - "sha256": "1rxksrmkh5raz930y9khfg85dglgphrgcvkj21n86m333pajs4mf", - "version": "4.14.276" + "sha256": "058vzn1gcsc194hgwrj78afawz2anm7ga8a1x5m5i4cw8p1arp73", + "version": "4.14.277" }, "4.19": { "patch": { From 4d43ae779d460f22edd40886bfa501235ff1ef02 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:21:59 +0200 Subject: [PATCH 083/182] linux/hardened/patches/4.19: 4.19.239-hardened1 -> 4.19.240-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index dcac0289242..0f9d847f594 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.239-hardened1.patch", - "sha256": "1w0h47av90aapz5g5ldny1vrq21n22kxag24byk4b43ndg6q0ksc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.239-hardened1/linux-hardened-4.19.239-hardened1.patch" + "name": "linux-hardened-4.19.240-hardened1.patch", + "sha256": "1qhrwpjfy5c75zcpvp1b0xb460vyjv04iml2inqrhnj9zcz1kgp8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.240-hardened1/linux-hardened-4.19.240-hardened1.patch" }, - "sha256": "0fsr9jy8d1rpg6ixp7av01pqz3vq50rgfcjd7vj16ccsdk15sz5z", - "version": "4.19.239" + "sha256": "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j", + "version": "4.19.240" }, "5.10": { "patch": { From bb404a9c09b7ec41f0bc063c462914240ea4f946 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:22:11 +0200 Subject: [PATCH 084/182] linux/hardened/patches/5.10: 5.10.112-hardened1 -> 5.10.113-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0f9d847f594..c7a75b0d92a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.112-hardened1.patch", - "sha256": "1sryrhl7bblx4r0smvlzw7p4xhc4l8bsqgwzlj2x8qamj544w464", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.112-hardened1/linux-hardened-5.10.112-hardened1.patch" + "name": "linux-hardened-5.10.113-hardened1.patch", + "sha256": "0v6blapny74fkhsm5rksxg632hv3chh81wgc96l6ql4sy7p19riv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.113-hardened1/linux-hardened-5.10.113-hardened1.patch" }, - "sha256": "19aa7fq8n75gh0vv01mpxg4cxkfpr5lj0sv6lxiyzcgbc71isv4c", - "version": "5.10.112" + "sha256": "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2", + "version": "5.10.113" }, "5.15": { "patch": { From ed9d1bfe64f2ccd7642dc0d1c14bee01649b9be4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:22:24 +0200 Subject: [PATCH 085/182] linux/hardened/patches/5.15: 5.15.35-hardened1 -> 5.15.36-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c7a75b0d92a..7cbab2d0d78 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.35-hardened1.patch", - "sha256": "10x2q01bckmfmgdzfg01khj43pav1drzzp3fr20hk718ywikvgax", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.35-hardened1/linux-hardened-5.15.35-hardened1.patch" + "name": "linux-hardened-5.15.36-hardened1.patch", + "sha256": "1y52bayw2n1lc1vp9jz8a39fz32x81ivaw24kc6hdr23yg0a8q5g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.36-hardened1/linux-hardened-5.15.36-hardened1.patch" }, - "sha256": "1n05c4c4ish25x483a2p5177zgda8pq7g4752n1b7chfygi5l6ha", - "version": "5.15.35" + "sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n", + "version": "5.15.36" }, "5.4": { "patch": { From 69a71a0ec2da81a4213e1f0ceedb95545d9e2414 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:22:25 -0700 Subject: [PATCH 086/182] spirv-llvm-translator: move spirv-tools to nativeBuildInputs --- pkgs/development/compilers/spirv-llvm-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index abcc93c62d5..8893f07b8c8 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; }; - nativeBuildInputs = [ pkg-config cmake llvm_11.dev ]; + nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ]; - buildInputs = [ spirv-headers spirv-tools llvm_11 ]; + buildInputs = [ spirv-headers llvm_11 ]; checkInputs = [ lit ]; From d14ebd795e9fedd0a03525bf7d0884396d05143a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:24:09 -0700 Subject: [PATCH 087/182] intel-graphics-compiler: reindent --- .../intel-graphics-compiler/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 75318351de7..9f1f9039227 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -56,17 +56,17 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \ - --replace '$'''{SPIRV-Tools_DIR}../../..' \ - '${spirv-tools}' \ - --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \ - 'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \ - --replace 'set_target_properties(SPIRV-Tools' \ - 'set_target_properties(SPIRV-Tools-shared' \ - --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \ - 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared' - substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \ - --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ - --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" + --replace '$'''{SPIRV-Tools_DIR}../../..' \ + '${spirv-tools}' \ + --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \ + 'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \ + --replace 'set_target_properties(SPIRV-Tools' \ + 'set_target_properties(SPIRV-Tools-shared' \ + --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \ + 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared' + substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \ + --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ + --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" ''; # Handholding the braindead build script From 37c0bfd127f2797ded4dbaef462ea2dc71df31b6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:26:20 -0700 Subject: [PATCH 088/182] spirv-llvm-translator: remove prePatch since we don't run tests --- .../development/compilers/spirv-llvm-translator/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 8893f07b8c8..3ae837ac46b 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" ]; - prePatch = '' - substituteInPlace ./test/CMakeLists.txt \ - --replace 'SPIRV-Tools' 'SPIRV-Tools-shared' - ''; - - # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; From f4f9691c9fef909ee5dd6f14da6f404852bfc3c3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:26:58 -0700 Subject: [PATCH 089/182] intel-graphics-compiler: remove INSTALL_SPIRVDLL --- pkgs/development/compilers/intel-graphics-compiler/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 9f1f9039227..fb88ebc5282 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { "-Wno-dev" "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" - "-DINSTALL_SPIRVDLL=0" "-DCCLANG_BUILD_PREBUILDS=ON" "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}" From eaaa1160167c9f0832f8c871db875a3d985195a0 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:27:48 -0700 Subject: [PATCH 090/182] intel-graphics-compiler: move substitutes to postPatch --- pkgs/development/compilers/intel-graphics-compiler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index fb88ebc5282..0eab971fb97 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # https://github.com/intel/intel-graphics-compiler/issues/98 doCheck = false; - patchPhase = '' + postPatch = '' substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \ --replace '$'''{SPIRV-Tools_DIR}../../..' \ '${spirv-tools}' \ From a22128d33a6d27ae2e04c9179289fd9f19fc810d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 00:33:59 +0200 Subject: [PATCH 091/182] checkov: 2.0.1110 -> 2.0.1118 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1245603c53a..52899ac238e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1110"; + version = "2.0.1118"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-HtXJGi20SbbOofL8TAZDZ9L3aFVx33Xz+QS/f7NxYFI="; + hash = "sha256-8zhCyIHI3Pl5fTqQGSe8l6+7DZQsI6YgyTSCs1BNe94="; }; nativeBuildInputs = with py.pkgs; [ From 99a8b82a6a47f724b6ee3092982a1557eb4dcb17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 00:38:09 +0200 Subject: [PATCH 092/182] python310Packages.scapy: disable failing tests --- pkgs/development/python-modules/scrapy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 073059aec62..70feaa7108e 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { pname = "scrapy"; version = "2.6.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -92,6 +94,7 @@ buildPythonPackage rec { "test_nested_xpath" "test_flavor_detection" # Requires network access + "AnonymousFTPTestCase" "FTPFeedStorageTest" "FeedExportTest" "test_custom_asyncio_loop_enabled_true" @@ -99,6 +102,7 @@ buildPythonPackage rec { "test_custom_loop_asyncio_deferred_signal" "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 "test_timeout_download_from_spider_nodata_rcvd" + "test_timeout_download_from_spider_server_hangs" # Fails with AssertionError "test_peek_fifo" "test_peek_one_element" From 01b99ebcffe2a03bc67744f78833d43e0d0e6747 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 6 May 2022 00:39:51 +0200 Subject: [PATCH 093/182] docker-compose_2: 2.4.1 -> 2.5.0 https://github.com/docker/compose/releases/tag/v2.5.0 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index fc264cdc590..1b58b4ee9cf 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-6yc+7Fc22b8xN8thRrxxpjdEz19aBYCWxgkh/nra784="; + sha256 = "sha256-gb2XFIzYU1dZh8WPheb4073AOLdfT7CbBD89HxobY9Y="; }; - vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ="; + vendorSha256 = "sha256-2pWBMXVnmKE4D7JXaKOqtuCz7nsX2a/58lyLp58OTYI="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 6401b21ad3973a3a84bca74c5ff0e38b2ca37439 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 6 May 2022 00:40:15 +0200 Subject: [PATCH 094/182] docker: 20.10.14 -> 20.10.15 https://docs.docker.com/engine/release-notes/#201015 https://github.com/moby/moby/releases/tag/v20.10.15 https://github.com/docker/cli/releases/tag/v20.10.15 https://github.com/containerd/containerd/releases/tag/v1.6.4 https://github.com/opencontainers/runc/releases/tag/v1.1.1 --- .../virtualization/docker/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ef9050f47d9..125061bedaf 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -186,7 +186,7 @@ rec { export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables export CGO_ENABLED=1 - go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker + go build -tags pkcs11 --ldflags "$GO_LDFLAGS" github.com/docker/cli/cmd/docker cd - ''; @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.14"; + version = "20.10.15"; rev = "v${version}"; - sha256 = "sha256-eDwgqFx4io++SMOjhxMxVzqzcOgOnv6Xe/qmmPCvZts="; + sha256 = "sha256-uzwnXDomho5/Px4Ou/zP8Vedo2J9hVfcaFzM9vWh2Mo="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-I5oxpFLH789I2Sb29OXDaM4fCbQT/KvPq0DYcAVp0aI="; + sha256 = "sha256-+Eds5WI+Ujz/VxkWb1ToaGLk7wROTwWwJYpiZRIxAf0"; }; - runcRev = "v1.0.3"; - runcSha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; - containerdRev = "v1.5.11"; - containerdSha256 = "sha256-YzFtv6DIjImSK0SywxhZrEeEmCnHTceAi3pfwnPubKg="; + runcRev = "v1.1.1"; + runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; + containerdRev = "v1.6.4"; + containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; From 202b93d7031212d1f59d0654a497fd50ca852904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 23:07:03 +0000 Subject: [PATCH 095/182] python3Packages.brunt: init at 1.2.0 --- .../python-modules/brunt/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/brunt/default.nix diff --git a/pkgs/development/python-modules/brunt/default.nix b/pkgs/development/python-modules/brunt/default.nix new file mode 100644 index 00000000000..1c11e92b234 --- /dev/null +++ b/pkgs/development/python-modules/brunt/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "brunt"; + version = "1.2.0"; + + disabled = pythonOlder "3.8"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "e704627dc7b9c0a50c67ae90f1d320b14f99f2b2fc9bf1ef0461b141dcf1bce9"; + }; + + postPatch = '' + sed -i '/--cov/d' setup.cfg + ''; + + propagatedBuildInputs = [ + aiohttp + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # tests require Brunt hardware + doCheck = false; + + pythonImportsCheck = [ "brunt" ]; + + meta = { + description = "Unofficial Python SDK for Brunt"; + homepage = "https://github.com/eavanvalkenburg/brunt-api"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ebd87e812a..b7ad7ba3d48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1388,6 +1388,8 @@ in { browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + brunt = callPackage ../development/python-modules/brunt { }; + bsddb3 = callPackage ../development/python-modules/bsddb3 { }; bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; From d8b0b625ddba37c15e012dc09ce7d6f64bb048f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 23:07:42 +0000 Subject: [PATCH 096/182] home-assistant: support brunt component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3ffb7594cd0..6f9187e193c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -311,7 +311,8 @@ "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ - ]; # missing inputs: brunt + brunt + ]; "bsblan" = ps: with ps; [ bsblan ]; @@ -3216,6 +3217,7 @@ "braviatv" "broadlink" "brother" + "brunt" "bsblan" "buienradar" "button" From 851130e9cdccce2fe6a78cbbf8c67d3afbdfdc85 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 6 May 2022 09:47:39 +1000 Subject: [PATCH 097/182] apkeep: 0.11.0 -> 0.12.0 https://github.com/EFForg/apkeep/blob/master/CHANGELOG.md#0120---2022-05-05 --- pkgs/tools/misc/apkeep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index f7d3daf9fbc..d1bb7d85d18 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.11.0"; + version = "0.12.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kwJ4/jkVVgem5Lb+uFDFPk4/6WWSWJs+SQDSyKkhG/8="; + sha256 = "sha256-SmzsFXS/geFpssy18pIluoCYGsJql9TAgYUNgAZlXmI="; }; - cargoSha256 = "sha256-kJ81kY2EmkH3yu8xL1aPxXPMhkDsGKWo0RWn1Ih7z2k="; + cargoSha256 = "sha256-bL79CW6X9pHx/Cn58KDxf8bVDwvrGRKkK9v/+Ygp5D4="; prePatch = '' rm .cargo/config.toml From 67b1fac192de8d7aa566001f7c7967c340a90a2b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 5 May 2022 17:09:27 -0700 Subject: [PATCH 098/182] nixos/tailscale: add glibc to PATH. For some features, tailscaled uses getent(1) to get the shell of OS users. getent(1) is in the glibc derivation. Without this derivation in the path, tailscale falls back to /bin/sh for all users. Signed-off-by: David Anderson --- nixos/modules/services/networking/tailscale.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 1f64113950a..c61af0d18b8 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.tailscale; in { - meta.maintainers = with maintainers; [ danderson mbaillie ]; + meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; options.services.tailscale = { enable = mkEnableOption "Tailscale client daemon"; @@ -40,7 +40,11 @@ in { systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; - path = [ pkgs.openresolv pkgs.procps ]; + path = [ + pkgs.openresolv # for configuring DNS in some configs + pkgs.procps # for collecting running services (opt-in feature) + pkgs.glibc # for `getent` to look up user shells + ]; serviceConfig.Environment = [ "PORT=${toString cfg.port}" ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' From 98ebce8e1cbba1af56621fa07f7b69034d9086fb Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 6 May 2022 00:23:26 +0000 Subject: [PATCH 099/182] vscode: 1.66.2 -> 1.67.0 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index f479c6686af..3d663c39ec9 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1si0r8nww5m3yn3vzw0pk3nykfvxnlwna4pp11bsli4vqj1ym2nz"; - x86_64-darwin = "002rkvc8fa7r9x2dsjhkwzmc1sp5mq998frrw5xd6bym0cp4j76l"; - aarch64-linux = "0w9gjk2a5z8cqlg43jn2r588asymiklm1b28l54gvqp7jawlb0fd"; - aarch64-darwin = "18h2kk6fcdz38xzyn37brbbj4nbrjgzv9xsz7c7iai8d01vh7s33"; - armv7l-linux = "16cs2ald40nh76m3fxxfd233hr687dhwbqdkvjz4s6xxwi0rhvwc"; + x86_64-linux = "0ss7c0dvlgnfqi0snhx73ndzjbw24xz6pcny4v52mrd1kfhcmpvd"; + x86_64-darwin = "0ds5jv5q6k1hzrwhcgkyvx0ls9p1q7zh0fqigpxandx6ysrd7cga"; + aarch64-linux = "12zz02hdhhw19rx9kbi3yd5x81w1vs8vxjrnqqvva8bj0jnwf4iq"; + aarch64-darwin = "07ws2dc2il7ky77j5pxaxqp5cyw0v04jnv98z1494pdmxyn8gf7q"; + armv7l-linux = "0khyzc69rbfz2pnbab9v3as1hdzkzxfg3mxvf6g7ax9npvsrqw92"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.66.2"; + version = "1.67.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From d8da6a153b7951f55f4e0243047ad4ae644b4ed5 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 4 May 2022 18:42:39 -0700 Subject: [PATCH 100/182] nimble-unwrapped: add meta --- pkgs/development/compilers/nim/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4b0e6e618e3..f7250885f14 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -183,6 +183,14 @@ in { install -Dt $out/bin src/nimble runHook postBuild ''; + + meta = with lib; { + description = "Package manager for the Nim programming language"; + homepage = "https://github.com/nim-lang/nimble"; + license = licenses.bsd3; + maintainers = with maintainers; [ ehmry ]; + mainProgram = "nimble"; + }; }; nim = let From d6881554a47bfad42e35a0cd0c405da4e774c5f9 Mon Sep 17 00:00:00 2001 From: Max Niederman Date: Wed, 27 Apr 2022 18:36:18 -0700 Subject: [PATCH 101/182] remnote: init at 1.7.6 --- pkgs/applications/misc/remnote/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/misc/remnote/default.nix diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix new file mode 100644 index 00000000000..d19d27153fa --- /dev/null +++ b/pkgs/applications/misc/remnote/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchurl, appimageTools }: + +appimageTools.wrapType2 rec { + pname = "remnote"; + version = "1.7.6"; + + src = fetchurl { + url = "https://download.remnote.io/RemNote-${version}.AppImage"; + sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM="; + }; + + meta = with lib; { + description = "A note-taking application focused on learning and productivity"; + homepage = "https://remnote.com/"; + maintainers = with maintainers; [ max-niederman ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e8a3c276c8..bdce9965f68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28381,6 +28381,8 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; + remnote = callPackage ../applications/misc/remnote { }; + remotebox = callPackage ../applications/virtualization/remotebox { }; restique = libsForQt5.callPackage ../applications/backup/restique { }; From 6ad85fcb619e19338a02c68273dc8cd6ec82ef4f Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 5 May 2022 19:48:10 -0400 Subject: [PATCH 102/182] vector: 0.21.1 -> 0.21.2 --- pkgs/tools/misc/vector/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index ec9958ec545..3375f4507bd 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -30,7 +30,7 @@ let pname = "vector"; - version = "0.21.1"; + version = "0.21.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eskm+H0D+SB3PB76T6Z+iL5jjyy51lOXy88QXsn/Azs="; + sha256 = "sha256-2iMD3QpVm1YmiEH17PdjgiNoD2Gt9BRJ5soMDB//b3Y="; }; - cargoSha256 = "sha256-fN6o8Fcqdhs5c3RID+ok1Xo5g6nF9m3f8EWIJ47dn/k="; + cargoSha256 = "sha256-OkK0COSHdZ6fHWUrZ90ltuFSCtVZ14QZiIWVwkHOvq8="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage { buildFeatures = features; # TODO investigate compilation failure for tests - # there are about 100 tests failing (out of 1100) for version 0.21.1 + # there are about 100 tests failing (out of 1100) for version 0.21.2 doCheck = false; checkFlags = [ From 6b628a3987f90c273d6c88d593421cb86c37ac6e Mon Sep 17 00:00:00 2001 From: Max Niederman Date: Sun, 2 Jan 2022 17:38:31 -0800 Subject: [PATCH 103/182] perseus-cli: 0.3.0 -> 0.3.1 --- pkgs/development/tools/perseus-cli/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index 9ec8aa21e2d..4b39fccdd36 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -1,17 +1,25 @@ -{ lib, rustPlatform, fetchCrate, makeWrapper, wasm-pack }: +{ lib +, stdenv +, rustPlatform +, fetchCrate +, makeWrapper +, wasm-pack +, CoreServices +}: rustPlatform.buildRustPackage rec { pname = "perseus-cli"; - version = "0.3.0"; + version = "0.3.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YyQQjuxNUxuo2PFluGyT/CpG22tgjRCfmFKA5MFRgHo="; + sha256 = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; }; - cargoSha256 = "sha256-SKxPsltXFH+ENexn/KDD43hGLSTgvtU9hv9Vdi2oeFA="; + cargoSha256 = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; postInstall = '' wrapProgram $out/bin/perseus \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9e5be50243..1b7ee63f68c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -519,7 +519,9 @@ with pkgs; packr = callPackage ../development/libraries/packr { }; - perseus-cli = callPackage ../development/tools/perseus-cli { }; + perseus-cli = callPackage ../development/tools/perseus-cli { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; pet = callPackage ../development/tools/pet { }; From 3fdac0f9817e1b9416d23bac91ac607df74ba820 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 5 May 2022 18:15:54 -0700 Subject: [PATCH 104/182] nixos/tailscale: warn if strict reverse path filtering is in use. Tailscale uses policy routing to enable certain traffic to bypass routes that lead into the Tailscale mesh. NixOS's reverse path filtering setup doesn't understand the policy routing at play, and so incorrectly interprets some of this traffic as spoofed. Since this only breaks some features of Tailscale, merely warn users about it, rather than make it a hard error. Updates tailscale/tailscale#4432 Signed-off-by: David Anderson --- nixos/modules/services/networking/tailscale.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index b46da401dd8..0133874d0e0 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -2,7 +2,11 @@ with lib; -let cfg = config.services.tailscale; +let + cfg = config.services.tailscale; + firewallOn = config.networking.firewall.enable; + rpfMode = config.networking.firewall.checkReversePath; + rpfIsStrict = rpfMode == true || rpfMode == "strict"; in { meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; @@ -36,6 +40,7 @@ in { }; config = mkIf cfg.enable { + warnings = optional (firewallOn && rpfIsStrict) "Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting `networking.firewall.checkReversePath` = 'loose'"; environment.systemPackages = [ cfg.package ]; # for the CLI systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { From de161602c5913f3852afc2d71bbadd25e74f9ef6 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 6 May 2022 01:48:20 +0000 Subject: [PATCH 105/182] python3Packages.widgetsnbextension: patch out unnecessary dependency --- .../python-modules/widgetsnbextension/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 5b4f535563c..563e792850d 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,13 +8,20 @@ buildPythonPackage rec { pname = "widgetsnbextension"; version = "3.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; + hash = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; }; - propagatedBuildInputs = [ notebook ]; + # setup.py claims to require notebook, but the source doesn't have any imports + # in it. + postPatch = '' + substituteInPlace setup.py --replace "'notebook>=4.4.1'," "" + ''; + + propagatedBuildInputs = [ ]; # No tests in archive doCheck = false; From a081afe9e978a09ec99219cf704ff3082dc45313 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 6 May 2022 01:48:31 +0000 Subject: [PATCH 106/182] python3Packages.nbconvert: clean up --- .../python-modules/nbconvert/default.nix | 65 +++++++++---------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 69aa660f142..9b85586f7d9 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -1,25 +1,19 @@ -{ lib +{ beautifulsoup4 +, bleach , buildPythonPackage +, defusedxml , fetchPypi -, pytestCheckHook -, glibcLocales -, entrypoints -, bleach -, mistune -, nbclient +, ipywidgets , jinja2 -, pygments -, traitlets -, jupyter_core , jupyterlab-pygments -, nbformat -, ipykernel +, lib +, markupsafe +, mistune +, nbclient , pandocfilters -, tornado -, jupyter-client -, defusedxml +, pyppeteer +, pytestCheckHook , tinycss2 -, beautifulsoup4 }: buildPythonPackage rec { @@ -42,37 +36,38 @@ buildPythonPackage rec { substituteAllInPlace ./nbconvert/exporters/templateexporter.py ''; - checkInputs = [ pytestCheckHook glibcLocales ]; - propagatedBuildInputs = [ - entrypoints bleach mistune jinja2 pygments traitlets - jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client - defusedxml tinycss2 beautifulsoup4 - nbclient + beautifulsoup4 + bleach + defusedxml + jinja2 jupyterlab-pygments + markupsafe + mistune + nbclient + pandocfilters + tinycss2 ]; - # disable preprocessor tests for ipython 7 - # see issue https://github.com/jupyter/nbconvert/issues/898 preCheck = '' - export LC_ALL=en_US.UTF-8 - HOME=$(mktemp -d) + export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ - "--ignore=nbconvert/preprocessors/tests/test_execute.py" - # can't resolve template paths within sandbox - "--ignore=nbconvert/tests/base.py" - "--ignore=nbconvert/tests/test_nbconvertapp.py" + checkInputs = [ + ipywidgets + pyppeteer + pytestCheckHook ]; + pytestFlagsArray = [ + # DeprecationWarning: Support for bleach <5 will be removed in a future version of nbconvert + "-W ignore::DeprecationWarning" + ]; disabledTests = [ + # Attempts network access (Failed to establish a new connection: [Errno -3] Temporary failure in name resolution) "test_export" - "test_webpdf_without_chromium" - #"test_cell_tag_output" - #"test_convert_from_stdin" - #"test_convert_full_qualified_name" + "test_webpdf_with_chromium" ]; # Some of the tests use localhost networking. From 2c95c2bf2187512a172c8b26d9017eb71cda0197 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 6 May 2022 01:48:57 +0000 Subject: [PATCH 107/182] python3Packages.jupyter_server: fix build --- pkgs/development/python-modules/jupyter_server/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 2cb7d06b646..dd8368676d1 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -10,6 +10,7 @@ , jinja2 , tornado , pyzmq +, ipykernel , ipython_genutils , traitlets , jupyter_core @@ -62,6 +63,7 @@ buildPythonPackage rec { ]; checkInputs = [ + ipykernel pytestCheckHook pytest-tornasync requests From df591a1268ea528f34bfcb54bedff3e2ba0b0ea8 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 6 May 2022 01:49:10 +0000 Subject: [PATCH 108/182] python3Packages.jupyter-sphinx: fix build --- pkgs/development/python-modules/jupyter-sphinx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 2da21db1eb1..56cd051ecf4 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -5,6 +5,7 @@ , sphinx , ipywidgets , pythonOlder +, nbconvert }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "37fc9408385c45326ac79ca0452fbd7ae2bf0e97842d626d2844d4830e30aaf2"; }; - propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; + propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; doCheck = false; From 4f67e636b3e7fd1537d646ff806433ec157a606e Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 6 May 2022 01:49:27 +0000 Subject: [PATCH 109/182] python3Packages.Pweave: fix build --- pkgs/development/python-modules/pweave/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index b97d5149652..c9e2ff020f8 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -7,6 +7,7 @@ , nbconvert , markdown , isPy3k +, ipykernel }: buildPythonPackage rec { @@ -21,7 +22,7 @@ buildPythonPackage rec { disabled = !isPy3k; buildInputs = [ mock pkgs.glibcLocales ]; - propagatedBuildInputs = [ matplotlib nbconvert markdown ]; + propagatedBuildInputs = [ ipykernel matplotlib nbconvert markdown ]; # fails due to trying to run CSS as test doCheck = false; From 57330c0d38231524d3631b90b04a988c4e1e6933 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 04:38:03 +0000 Subject: [PATCH 110/182] python310Packages.stripe: 2.75.0 -> 2.76.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c49dd79679d..b47f3917b92 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.75.0"; + version = "2.76.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iAjXsbeX+vZW8FtaJRIB5lR3EEkDUU/dPpLpdHSxLME="; + hash = "sha256-/T/Gk1w7YYmWcZFge2846+SQAFpZC00NQ/vjq6Rd7Kg="; }; propagatedBuildInputs = [ From 5cdfc935fa8d37297743af925091e5c7555414c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 03:21:04 +0000 Subject: [PATCH 111/182] python310Packages.azure-mgmt-msi: 6.0.0 -> 6.0.1 --- pkgs/development/python-modules/azure-mgmt-msi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 985c9828974..d36a1b985c7 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "6.0.0"; + version = "6.0.1"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-RpmYeF6LRKqu0KrjNAFAaOGxyfPuK+TImOumP+FPX2w="; + sha256 = "sha256-PPkQmUoBkJ8Su7h9G2/t8dVy/PT3uCYZjlf70fnY2vU="; }; propagatedBuildInputs = [ From 8c41f43ef2982c0822106374191c8eac05bde472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 03:15:04 +0000 Subject: [PATCH 112/182] python310Packages.pex: 2.1.84 -> 2.1.85 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index e582ad1a446..2098a1d10cf 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.84"; + version = "2.1.85"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tjPjLzNOO/PUU6EItLYyQw+KPekIwboTBn98T8wHpHw="; + hash = "sha256-ABRidGtJikMIHItT21MJdiIqpA26IUN1aFMNyRVKyDA="; }; nativeBuildInputs = [ From 578f540e4b5f211819435bf7bee449faafee4a4c Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 5 May 2022 08:07:42 -0700 Subject: [PATCH 113/182] collectd: support cross compile Prevent the double memory layout check from running during cross compile. Provide an answer that works for both x86_64 and aarch64. --- pkgs/tools/system/collectd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 8d272b15acf..e957c10a85c 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--disable-werror" - ] ++ plugins.configureFlags; + ] ++ plugins.configureFlags + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-fp-layout=nothing" ]; # do not create directories in /var during installPhase postConfigure = '' From d704edb7751e20e3dccbfcee59608bfe53c4d5f4 Mon Sep 17 00:00:00 2001 From: Jonathan Zielinski Date: Fri, 22 Apr 2022 08:39:48 +0200 Subject: [PATCH 114/182] morph: 1.6.0 -> 1.7.0 --- pkgs/tools/package-management/morph/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index e7b6b3adf1f..b8810ad36df 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -1,28 +1,25 @@ -{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: +{ buildGoModule, fetchFromGitHub, lib, makeWrapper, openssh }: buildGoModule rec { pname = "morph"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8"; + sha256 = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; }; vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; - nativeBuildInputs = [ makeWrapper go-bindata ]; + nativeBuildInputs = [ makeWrapper ]; ldflags = [ "-X main.version=${version}" + "-X main.assetRoot=${placeholder "lib"}" ]; - postPatch = '' - go-bindata -pkg assets -o assets/assets.go data/ - ''; - postInstall = '' mkdir -p $lib cp -v ./data/*.nix $lib From 857bb526706d49bca8a90b88815611dbcddbc9fa Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 5 May 2022 22:36:38 -0700 Subject: [PATCH 115/182] saleae-logic-2: 2.3.51 -> 2.3.52 --- pkgs/development/tools/misc/saleae-logic-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index c3349661c55..7478c27ce9f 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.51"; + version = "2.3.52"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-Z5GPA1cJbQJOjntWXe1uF26e7nJ99+ANoCP57Y/OO5A="; + sha256 = "sha256-Z1xDVb1qFPtTi40dZ1CBw6ZqtQbYjuUjeUinBV+wdw8="; }; desktopItem = makeDesktopItem { inherit name; From c0de15d581c9b9d11fdeafcc5289b2fe10a88c30 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Sun, 15 Nov 2020 16:59:19 +0200 Subject: [PATCH 116/182] transgui: patch to circumvent v3 rpc issue --- .../networking/p2p/transgui/default.nix | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index da7633221a5..a0e2388d16c 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,30 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus, -libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, fetchpatch, unzip +, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { pname = "transgui"; - version = "5.18.0"; + version = "unstable-2022-02-02"; src = fetchFromGitHub { owner = "transmission-remote-gui"; repo = "transgui"; - rev = "v${version}"; - sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; + rev = "0e2c2a07c1b21b1704c0a4945a111a8aa1050a1a"; + sha256 = "1x9wzii3q9zanpik4xc99jqsfrqch8vjmlx12jrvczxcfy51b1ba"; }; + patches = [ + # TDDO: remove when transgui updates for transmission-daemon v3 rpc protocol + (fetchpatch { + url = "https://github.com/transmission-remote-gui/transgui/commit/9275c3fb877dd753a1940d1b900630cdc09a0cc2.patch"; + sha256 = "0w2x7gcxp5kqczdz7ckfqhdz9hhkm62k8gcws54d6km7x9vc1023"; + }) + ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - fpc lazarus stdenv.cc - libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl + fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf + pango atk cairo openssl ]; - NIX_LDFLAGS = " - -L${stdenv.cc.cc.lib}/lib - -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 - -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo -lc -lcrypto - "; + NIX_LDFLAGS = '' + -L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 + -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo + -lc -lcrypto + ''; - prePatch = '' + postPatch = '' substituteInPlace restranslator.pas --replace /usr/ $out/ ''; @@ -33,23 +41,19 @@ stdenv.mkDerivation rec { lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus ''; - makeFlags = [ - "FPC=fpc" - "PP=fpc" - "INSTALL_PREFIX=$(out)" - ]; + makeFlags = [ "FPC=fpc" "PP=fpc" "INSTALL_PREFIX=$(out)" ]; LCL_PLATFORM = "gtk2"; - desktopItem = makeDesktopItem rec { - name = "transgui"; - exec = name + " %U"; - icon = name; + desktopItem = makeDesktopItem { + name = pname; + exec = "${pname} %U"; + icon = pname; type = "Application"; comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; + categories = [ "Network" "FileTransfer" "P2P" "GTK" ]; startupNotify = true; mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; @@ -64,10 +68,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A cross platform front-end for the Transmission Bit-Torrent client"; + description = "A cross platform front-end for the Transmission BitTorrent client"; homepage = "https://sourceforge.net/p/transgui"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ramkromberg ]; - platforms = lib.platforms.linux; + mainProgram = "transgui"; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } From 1a8afb33025a5e313e654df4afd97474559270c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 13:37:24 +0200 Subject: [PATCH 117/182] python310Packages.archinfo: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index b9b29a7167a..e6cd183d413 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-RWdY7tzT5wDVjAn1QIkQm8b5lIo++VzktsYZxn8taeg="; + hash = "sha256-wJEipAlqBsP2tgsRDVDe1ZtiEg1uhpP+1P1VGU7tBBw="; }; checkInputs = [ From 3d168b76e18206df1a38c81e5face4e24fdd5162 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 13:37:29 +0200 Subject: [PATCH 118/182] python310Packages.ailment: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 9f6828fd632..bc977348a71 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-F0t4vVxi4KUUtIZc8FJD9+2qf1XA58haFfjmHwAQaWA="; + hash = "sha256-JJ5wrjXazq0+6f4nccLRYaAgTg0d39REXmPHVchDzaE="; }; propagatedBuildInputs = [ From 83f95c3acfcec266f6c1816ffa80b541288f1fd7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 13:37:42 +0200 Subject: [PATCH 119/182] python310Packages.pyvex: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 799271371c7..509da93663d 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b6LZJmAyxklvZxvane19dK/kQfbLPjkk29RydiWMZCY="; + hash = "sha256-jfquDFZylrrtYb3PbDmLDy7wHcvM8H2nIv4dRqRvY2U="; }; propagatedBuildInputs = [ From b04d6718be17436018bf4c0b7eb12c7cefed65fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 13:37:47 +0200 Subject: [PATCH 120/182] python310Packages.claripy: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 8f66e8551ed..eafc0c3f427 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-pCqhSpZfX3u9vJ8Oy1yyicagBQYK5+jBVCEab0TnGA4="; + hash = "sha256-b07WygCR3IhRgyt7u1ipyyK4MM3TNeLW04WoZJ2eQZk="; }; propagatedBuildInputs = [ From 0aa4d1a135311c54edd2dbd89f9e7a0e55e4a291 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 13:37:52 +0200 Subject: [PATCH 121/182] python310Packages.cle: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 8ee898b445e..cbbb130a6aa 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.1"; + version = "9.2.2"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-OGdnrRFfx2LMMsw6giPC+4izWX603cYbpKHuslj4Gng="; + hash = "sha256-vEnhoVxn/p4CNzfHFM1cKaQ3ESsJx5U4+Lz4/LDCtao="; }; propagatedBuildInputs = [ From 2a83b508f6f83a4d2d9568ac186af74be7642709 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 13:37:58 +0200 Subject: [PATCH 122/182] python310Packages.angr: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 31629eab9d6..a65d681a17b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-7t4NV1udBq3tK7czuKYUsQ+9tLahFM8DlUUBT3d6bco="; + hash = "sha256-aniLMNKfEqlVkniS2mSCaeXIOc0EC4zOR59kiGTNUWk="; }; propagatedBuildInputs = [ From a19c0bc451ff55dc88ac2a3b8740154b6e32c7e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 May 2022 13:38:04 +0200 Subject: [PATCH 123/182] python310Packages.angrop: 9.2.1 -> 9.2.2 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d32441a989c..47ecddb0447 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-VhlsRd5IN8zF6aUU5Ji/ULkdecOpR+egU3vhYpi+KL8="; + hash = "sha256-LCgY/eOtRulnMeYt96ZYI8vPyyM+jxjlkxTd8Cmnfe0="; }; propagatedBuildInputs = [ From eabea3f1b60d82b1feb1db1027fe7b991cd2a703 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 07:21:30 +0000 Subject: [PATCH 124/182] python310Packages.proglog: 0.1.9 -> 0.1.10 --- pkgs/development/python-modules/proglog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index 9839ea9dd23..3b630f71905 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "proglog"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "13diln950wk6nnn4rpmzx37rvrnpa7f803gwygiwbq1q46zwri6q"; + sha256 = "sha256-ZYwoycguTK6y8l9Ij/+c6s4i+NabFdDByG1kJ15N2rQ="; }; propagatedBuildInputs = [ tqdm ]; From 63106c6b2a1078ea3ba4707a877b93177299d5b6 Mon Sep 17 00:00:00 2001 From: "Narazaki, Shuji" Date: Fri, 6 May 2022 16:13:31 +0900 Subject: [PATCH 125/182] cbqn: 0.pre+date=2021-12-1 -> 0.pre+date=2022-05-06 --- pkgs/development/interpreters/bqn/cbqn/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 992caf200a7..0426a72c81a 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -11,21 +11,21 @@ let name = "cbqn-bytecode-files"; owner = "dzaima"; repo = "CBQN"; - rev = "b000b951aa8f3590b196b4c09056604c0b32a168"; - hash = "sha256-znW0xOXogP4TfifUmk3cs4aN/9mMSpSD2WJppmeI1Fg="; + rev = "c39653c898531a2cdbf4cc5c764df6e37b1894a4"; + hash = "sha256-JCEmkwh5Rv5+NQoxvefSrYnayU892/Wam+gjMgcQmO0="; }; in assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.pre+date=2021-12-13"; + version = "0.pre+date=2022-05-06"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "e7662b0f6a44add0749fba2a6d7309a5c1eb2601"; - hash = "sha256-2nfkTZBIGHX5cok6Ea3KSewakZy8Ey8nSO2Fe4xGgvg="; + rev = "3496a939b670f8c9ca2a04927378d6b7e9abd68e"; + hash = "sha256-P+PoY4XF9oEw7VIpmybvPp+jxWHEo2zt1Lamayf1mHg="; }; dontConfigure = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { '' + (if genBytecode then '' ${bqn-path} genRuntime ${mbqn-source} '' else '' - cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/ + cp ${cbqn-bytecode-files}/src/gen/{compiles,formatter,runtime0,runtime1,src} src/gen/ ''); installPhase = '' @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dzaima/CBQN/"; description = "BQN implementation in C"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ]; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; platforms = platforms.all; }; } From 35d74bd918deaa426c151e7e841e692faa9c82ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 07:54:33 +0000 Subject: [PATCH 126/182] python310Packages.tweepy: 4.8.0 -> 4.9.0 --- pkgs/development/python-modules/tweepy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index a2c815b45e2..bcb6fbd3b06 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.8.0"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-RaM2JN2WOHyZY+AxzgQLvhXg6UnevDbSFSR4jFLsYrc="; + rev = "refs/tags/v${version}"; + hash = "sha256-BMRRunPRDW5J/7KU+pr2Uv9Qa6oHBwkA7tsGa5YdzLw="; }; propagatedBuildInputs = [ From 51512b35da1f86bfc0e6dafb3ef7f597fa1a9e1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 09:56:08 +0200 Subject: [PATCH 127/182] python310Packages.ttp-templates: init at 0.1.3 --- .../python-modules/ttp-templates/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/ttp-templates/default.nix diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix new file mode 100644 index 00000000000..46db94782be --- /dev/null +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, netmiko +, pytestCheckHook +, python +, pythonOlder +, ttp +}: + +buildPythonPackage rec { + pname = "ttp-templates"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dmulyalin"; + repo = "ttp_templates"; + rev = version; + hash = "sha256-Qx+z/srYgD67FjXzYrc8xtA99n8shWK7yWj/r/ETN2U="; + }; + + propagatedBuildInputs = [ + ttp + ]; + + checkInputs = [ + netmiko + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ttp_templates" + ]; + + pytestFlagsArray = [ + # The other tests requires data which is no part of the source + "test/test_ttp_templates_methods.py" + "test/test_yang_openconfig_lldp.py" + ]; + + meta = with lib; { + description = "Template Text Parser Templates collections"; + homepage = "https://github.com/dmulyalin/ttp_templates"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16c87e27223..ec1020743e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10357,6 +10357,8 @@ in { ttp = callPackage ../development/python-modules/ttp { }; + ttp-templates = callPackage ../development/python-modules/ttp-templates { }; + tubes = callPackage ../development/python-modules/tubes { }; tunigo = callPackage ../development/python-modules/tunigo { }; From 8f14ae6428114f88d2856dc4e736ef4cf710057f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 6 May 2022 08:10:53 +1000 Subject: [PATCH 128/182] aardvark-dns: 1.0.2 -> 1.0.3 https://github.com/containers/aardvark-dns/releases/tag/v1.0.3 --- pkgs/tools/networking/aardvark-dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 412b3e0349c..ec0ca525354 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d4YSCVZkNung4frgAeP46E9Ptpnu9y0HwmPRADo4t0U="; + sha256 = "sha256-m2uKTVRonnun+/V69RcPWkkRtDcoaiulMCQz0/CAdCw="; }; - cargoHash = "sha256-fu7ZopS55IzzeO7uzLx1wVHQ8A1Ff+9f7FagoZPerxk="; + cargoHash = "sha256-Z/OZgWlpwcdqns26ojTLPQBVNrwU/i86tZVx19sRUTw="; meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; From 9a45461cdf08663aef68672ae67355ca83472997 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 6 May 2022 08:10:54 +1000 Subject: [PATCH 129/182] netavark: 1.0.2 -> 1.0.3 https://github.com/containers/netavark/releases/tag/v1.0.3 --- pkgs/tools/networking/netavark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index 3116644eb68..fba769d2a55 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2ElEhKit/XysRsUw+dg7SnhDl+Zf+FJb5pIYpq1ALNs="; + sha256 = "sha256-M0jsCwle57YM0RO1hGMju5+8XvHPWc8tJqKWJL/sFsg="; }; - cargoHash = "sha256-w3qz4ygjIvn+Rxd1JEVO6Ax08leuuJvC4Bk7VygbBh4="; + cargoHash = "sha256-zTgHjDZdsseUpB5Xqn9yE5T6Tgqx22pQKQLlUtZq+lc="; nativeBuildInputs = [ installShellFiles mandown ]; From b79d9a846b51933229e0b9bfd625b1bb4324cc66 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:22:37 +0200 Subject: [PATCH 130/182] linux/hardened/patches/5.17: init at 5.17.5-hardened1 --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/linux-kernels.nix | 1 + 3 files changed, 12 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index f34d5d60794..1e60198abdd 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,6 +30,7 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened + linux_5_17_hardened linux_testing; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 7cbab2d0d78..97321f46cae 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -39,6 +39,16 @@ "sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n", "version": "5.15.36" }, + "5.17": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-5.17.5-hardened1.patch", + "sha256": "1cv43sp2amai7r75dw07bd2ys6fz1ri9pfra3kaajap55sbalsw0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.5-hardened1/linux-hardened-5.17.5-hardened1.patch" + }, + "sha256": "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v", + "version": "5.17.5" + }, "5.4": { "patch": { "extra": "-hardened1", diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9743acce4b6..454e1cdca76 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -541,6 +541,7 @@ in { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); + linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From e7675ff05daf09d96395f8add98594b183ca071f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 00:22:49 +0200 Subject: [PATCH 131/182] linux/hardened/patches/5.4: 5.4.190-hardened1 -> 5.4.191-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 97321f46cae..16b0ac27fc6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.190-hardened1.patch", - "sha256": "0z4w05fq20pmiyxf4bip61ywy5xg96klbnj62yxiaha68pfwlm29", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.190-hardened1/linux-hardened-5.4.190-hardened1.patch" + "name": "linux-hardened-5.4.191-hardened1.patch", + "sha256": "117v9xb9y3bmppxmrbya5a4d869fh6l7map25g5n03sca56g7c32", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.191-hardened1/linux-hardened-5.4.191-hardened1.patch" }, - "sha256": "157ifcl59xxj721r302hg82vmbqzx5hjrlihrc5s4maxfw3ygm41", - "version": "5.4.190" + "sha256": "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318", + "version": "5.4.191" } } From 29d63a169a51d49a15afd751101c9682231102b9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 29 Apr 2022 20:43:31 +0200 Subject: [PATCH 132/182] =?UTF-8?q?ocamlPackages.js=5Fof=5Focaml:=203.11.0?= =?UTF-8?q?=20=E2=86=92=204.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.incr_dom: fix for JSoO 4.0 ocamlPackages.ocsigen-toolkit: 3.1.1 → 3.2.0 --- .../ocaml-modules/janestreet/0.14.nix | 1 + .../janestreet/incr_dom_jsoo_4_0.patch | 24 +++++++++++++++++++ .../ocaml-modules/ocsigen-toolkit/default.nix | 4 ++-- .../tools/ocaml/js_of_ocaml/compiler.nix | 4 ++-- .../tools/ocaml/js_of_ocaml/ocamlbuild.nix | 21 ++++++++++++---- 5 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/incr_dom_jsoo_4_0.patch diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 800b1c1e531..cee30da45c9 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -313,6 +313,7 @@ with self; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ js_of_ocaml-ppx ]; propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ]; + patches = [ ./incr_dom_jsoo_4_0.patch ]; }; incr_map = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/incr_dom_jsoo_4_0.patch b/pkgs/development/ocaml-modules/janestreet/incr_dom_jsoo_4_0.patch new file mode 100644 index 00000000000..4e7a45ce96d --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/incr_dom_jsoo_4_0.patch @@ -0,0 +1,24 @@ +diff --git a/src/js_misc.ml b/src/js_misc.ml +index 65f7b44..bfef103 100644 +--- a/src/js_misc.ml ++++ b/src/js_misc.ml +@@ -28,17 +28,11 @@ type rows_or_columns = + [@@deriving sexp, bin_io, variants, compare] + + let innerHeight () = +- Js.Optdef.case +- Dom_html.window##.innerHeight +- (fun () -> Dom_html.document##.documentElement##.clientHeight) +- Fn.id ++ Dom_html.window##.innerHeight + ;; + + let innerWidth () = +- Js.Optdef.case +- Dom_html.window##.innerWidth +- (fun () -> Dom_html.document##.documentElement##.clientWidth) +- Fn.id ++ Dom_html.window##.innerWidth + ;; + + let element_is_in_viewport (elt : Dom_html.element Js.t) = diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 12a92c5be39..60a07d30d05 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "3.1.1"; + version = "3.2.0"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; nativeBuildInputs = [ ocaml findlib opaline eliom ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "sha256:1fm0vvccmjib9yj5m2760vhzb4z3392swlprp51az53g3vk4q218"; + sha256 = "sha256:13n0y8a80bl94la4lnp9dr2x7b8plhm17g9zgf0l6x42g3886pw7"; }; meta = { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 82d84c819dd..7805ca26403 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.11.0"; + version = "4.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "sha256:0flws9mw0yjfw4d8d3y3k408mivy2xgky70xk1br3iqs4zksz38m"; + sha256 = "sha256:0pj9jjrmi0xxrzmygv4b5whsibw1jxy3wgibmws85x5jwlczh0nz"; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index c67d05c1503..fa9ff95b0fd 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -1,13 +1,26 @@ -{ buildDunePackage, js_of_ocaml-compiler +{ lib, buildDunePackage, fetchFromGitHub , ocamlbuild }: -buildDunePackage { +buildDunePackage rec { pname = "js_of_ocaml-ocamlbuild"; - - inherit (js_of_ocaml-compiler) version src meta useDune2; + version = "4.0.0"; minimalOCamlVersion = "4.02"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = "852302c8f35b946e2ec275c529a79e46d8749be6"; + sha256 = "sha256:03ayvakvbh4wi4dwcgd7r9y8ka8cv3d59hb81yk2dxyd94bln145"; + }; + propagatedBuildInputs = [ ocamlbuild ]; + + meta = { + description = "An ocamlbuild plugin to compile to JavaScript"; + license = lib.licenses.lgpl2Only; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + }; } From 828c7cb950a59a4f75e461e3660ca32c880d40f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 03:48:19 +0000 Subject: [PATCH 133/182] glibmm_2_68: 2.72.0 -> 2.72.1 --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index e0ef34a451e..f1f3df86349 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.72.0"; + version = "2.72.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-eCkkvxNklvOHj9wqCqnvQPDFFeLD4FTK/6XS5SOAxx4="; + sha256 = "sha256-KnZJooq13FOsTau3bJ9hWZ+8Yokjq2p910v2ddkVXNg="; }; nativeBuildInputs = [ From b15a9584ee92cbf9d4c97cb30afc99e27624484e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:03:11 +0000 Subject: [PATCH 134/182] =?UTF-8?q?vala=5F0=5F56:=200.56.0=20=E2=86=92=200?= =?UTF-8?q?.56.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/-/compare/0.56.0...0.56.1 --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8013f283c70..8dc2b4c02bb 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,8 +100,8 @@ in rec { }; vala_0_56 = generic { - version = "0.56.0"; - sha256 = "2SvRPFYwkF7rapg9y3AiBNqXMUYMKm5OOfhnmW83EEA="; + version = "0.56.1"; + sha256 = "xRi4Hf3agtHN9Yaz+bIyMWLLlr08taLANlDOoCXZH7k="; }; vala = vala_0_54; From f3fe021cdd8c5ecd87bc507f60378aefd75b223e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:03:53 +0000 Subject: [PATCH 135/182] =?UTF-8?q?tepl:=206.00.0=20=E2=86=92=206.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Repo moved to https://gitlab.gnome.org/swilmet/tepl, the versioning is a bit of a mess. https://gitlab.gnome.org/swilmet/tepl/-/blob/6.0.1/NEWS --- pkgs/development/libraries/tepl/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index f561efb473c..a10ad67b23d 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -9,17 +9,19 @@ , gtksourceview4 , icu , pkg-config +, gtk-doc +, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "tepl"; - version = "6.00.0"; + version = "6.0.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8"; + sha256 = "J08Fa75V8wpq5EQq0i8VfQTTphtWjZC8hRF7txMgIME="; }; nativeBuildInputs = [ @@ -27,6 +29,8 @@ stdenv.mkDerivation rec { ninja gobject-introspection pkg-config + gtk-doc + docbook-xsl-nons ]; buildInputs = [ From c478079f2524ad3bbb00af796ee12baf81d0e50d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:14:33 +0000 Subject: [PATCH 136/182] =?UTF-8?q?amtk:=205.3.1=20=E2=86=92=205.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Repo moved to https://gitlab.gnome.org/swilmet/amtk https://gitlab.gnome.org/swilmet/amtk/-/compare/5.3.1...5.4.0 --- pkgs/development/libraries/amtk/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 5743a18c0fd..961c63a3037 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , gtk3 , meson , ninja , pkg-config , gobject-introspection +, gtk-doc +, docbook-xsl-nons , gnome , dbus , xvfb-run @@ -12,11 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.3.1"; + version = "5.4.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm"; + sha256 = "g10IUHo96sie91NRzOu0szWv/qNhuIvQ+mZ/QM53enA="; }; nativeBuildInputs = [ @@ -25,6 +30,8 @@ stdenv.mkDerivation rec { pkg-config dbus gobject-introspection + gtk-doc + docbook-xsl-nons ]; buildInputs = [ From 80adbe5e342d360acfd199dc0a18c4243ca92d96 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:15:01 +0000 Subject: [PATCH 137/182] =?UTF-8?q?glibmm:=202.66.3=20=E2=86=92=202.66.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.66.3...2.66.4 --- pkgs/development/libraries/glibmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 8ba33b98634..996eacd65f4 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.3"; + version = "2.66.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-r7liAkkUhdP0QQLZghmhctotP563j848+5JVm6SW5Jk="; + sha256 = "sha256-GZrOVoLYGxWh1WVIC0qVBoLy22QCyKpd1yF9ce3/gdU="; }; outputs = [ "out" "dev" ]; From 41b15d2c14f68b8df6322dc3ddd51fe1daf6f7f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:15:23 +0000 Subject: [PATCH 138/182] =?UTF-8?q?gnome.gnome-control-center:=2042.0=20?= =?UTF-8?q?=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/42.0...42.1 --- .../gnome/core/gnome-control-center/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index c7da1e43a15..dbe3665f1ef 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , substituteAll -, fetchpatch , accountsservice , adwaita-icon-theme , colord @@ -64,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BzLvp8QXHOCg7UEGWAtM41pXsQFSwOo20jkTSRN3fto="; + sha256 = "sha256-+zCv+Q++HSrVYQfW6fX4pKOq82NbvYiSDXW1aLt3Z4U="; }; patches = [ @@ -79,13 +78,6 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) - - # Fix Online Accounts configuration on X11 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1272 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/7fe322b9cedae313cd9af6f403eab9bfc6027674.patch"; - sha256 = "cv1abqv0Kbfkfu7mZzEaZKXPE85yVBcQbjNHW+8ODFE="; - }) ]; nativeBuildInputs = [ From 76b2cceb788893c125a1c334dafba238b0f1101e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:16:08 +0000 Subject: [PATCH 139/182] =?UTF-8?q?gnome-desktop:=2042.0=20=E2=86=92=2042.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/42.0...42.1 --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 5d682e23b27..49f21fa5404 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-88qik6Xob2zK0Y+BcnPbHGcGHmgNedg5qop1KOW7JtY="; + sha256 = "sha256-JDOrYG0kTDUk3luBIJTbimcPsR7Z/3GAwtAhrh/J/AU="; }; patches = [ From cd1f035c0d362790ec1308f39d03325c48a3da48 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:16:09 +0000 Subject: [PATCH 140/182] =?UTF-8?q?gnome-latex:=203.38.0=20=E2=86=92=203.4?= =?UTF-8?q?0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Repo moved to https://gitlab.gnome.org/swilmet/gnome-latex https://gitlab.gnome.org/swilmet/gnome-latex/-/compare/3.38.0...3.40.0 --- .../editors/gnome-latex/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 8fc6feecd57..fe8666fd741 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,7 +1,6 @@ -{ lib -, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , autoreconfHook , gtk-doc , vala @@ -22,22 +21,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.0"; + version = "3.40.0"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; + sha256 = "xad/55vUDjeOooyPRaZjJ/vIzFw7W48PCcAhfufMCpA="; }; - patches = [ - # Fix build with latest tepl. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch"; - sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook From 502aab908218e9487e0e6ca4145ee8f3d00fb434 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:16:33 +0000 Subject: [PATCH 141/182] =?UTF-8?q?gtkmm3:=203.24.5=20=E2=86=92=203.24.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/3.24.5...3.24.6 --- pkgs/development/libraries/gtkmm/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2d0921cf097..420dee6cbaa 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.5"; + version = "3.24.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"; + sha256 = "Sz4ULpROFjO7oAiQBgXDQak8/XVaf6KgCwXQQTQfEdY="; }; outputs = [ "out" "dev" ]; From ce919800560f981da3bf4b43cee3974bd96fbd50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 13:16:35 +0000 Subject: [PATCH 142/182] =?UTF-8?q?gtranslator:=2041.0=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtranslator/-/compare/41.0...42.0 --- pkgs/tools/text/gtranslator/default.nix | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index d5e7922831e..e15941b5fc8 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -12,11 +11,10 @@ , libxml2 , libgda6 , libhandy -, libsoup +, libsoup_3 , json-glib , gspell , glib -, libdazzle , gtk3 , gtksourceview4 , gnome @@ -25,22 +23,13 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "E28R/gOhlJkMQ6/jOL0eoK0U5+H26Gjlv3xbUsTF5eE="; + sha256 = "Kme8v+ZDBhsGltiaEIR9UL81kF/zNhuYcTV9PjQi8Ts="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:15:5: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch"; - sha256 = "aRg6dYweftV8F7FXykO7m0G+p4SLTFnhTcZx72UCMDE="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -55,11 +44,10 @@ stdenv.mkDerivation rec { libxml2 glib gtk3 - libdazzle gtksourceview4 libgda6 libhandy - libsoup + libsoup_3 json-glib gettext gspell From b380589e3efa5d3f80085c2da36560b45ff81f08 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 16:10:47 +0200 Subject: [PATCH 143/182] =?UTF-8?q?networkmanager-sstp:=20unstable-2020-04?= =?UTF-8?q?-20=20=E2=86=92=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/network-manager-sstp/-/compare/735d8ca078f933e085029f60a737e3cf1d8c29a8...release-1.3.0 - Maintained again, moved to GNOME servers - GTK4 support - clean up --- .../networkmanager/sstp/default.nix | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 8b75db6495f..93fd87b005b 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -1,51 +1,59 @@ -{ lib, stdenv -, autoreconfHook -, fetchFromGitHub -, fetchpatch +{ stdenv +, lib +, fetchurl , file , glib , gnome , gtk3 +, gtk4 , intltool , libnma +, libnma-gtk4 , libsecret , networkmanager , pkg-config , ppp , sstp -, substituteAll -, withGnome ? true }: +, withGnome ? true +}: -let +stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; - version = "unstable-2020-04-20"; -in stdenv.mkDerivation { + version = "1.3.0"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - src = fetchFromGitHub { - owner = "enaess"; - repo = "network-manager-sstp"; - rev = "735d8ca078f933e085029f60a737e3cf1d8c29a8"; - sha256 = "0aahfhy2ch951kzj6gnd8p8hv2s5yd5y10wrmj68djhnx2ml8cd3"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "+IJw3jvOYs/+NDS9HvCrSQ6wxh1x1yqwiFij7UZb+rU="; }; - buildInputs = [ sstp networkmanager glib ppp ] - ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; + nativeBuildInputs = [ + file + intltool + pkg-config + ]; - nativeBuildInputs = [ file intltool autoreconfHook pkg-config ]; + buildInputs = [ + sstp + networkmanager + glib + ppp + ] ++ lib.optionals withGnome [ + gtk3 + gtk4 + libsecret + libnma + libnma-gtk4 + ]; postPatch = '' sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c sed -i 's#/sbin/sstpc#${sstp}/bin/sstpc#' src/nm-sstp-service.c ''; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - - preConfigure = "intltoolize"; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--enable-absolute-paths" ]; From b43b8c72453e7f24b1a302d4224e62042db2fbba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 May 2022 16:27:35 +0200 Subject: [PATCH 144/182] =?UTF-8?q?babl:=200.1.90=20=E2=86=92=200.1.92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/babl/-/compare/BABL_0_1_90...BABL_0_1_92 --- pkgs/development/libraries/babl/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 7a3c8bc727b..3d396a0b285 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -12,21 +11,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.90"; + version = "0.1.92"; outputs = [ "out" "dev" ]; - patches = [ - # Fix darwin build - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/babl/-/commit/33b18e74c9589fd4d5507ab88bd1fb19c15965dd.patch"; - sha256 = "bEjjOjHGTF55o1z31G9GNDqERxn/7vUuWZQYHosSEBQ="; - }) - ]; - src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bi67Y283WBWI49AkmbPS9p+axz40omL0KRHX9ZBqkkM="; + sha256 = "sha256-9mdzUCiUS2N1rRjxYKZM65P1x9zKqdh1HeNZd3SIosE="; }; nativeBuildInputs = [ From 98000933d72a97632caf0db0027ea3eb2e5e7f29 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 6 May 2022 00:35:49 +0200 Subject: [PATCH 145/182] =?UTF-8?q?xdg-desktop-portal:=201.14.3=20?= =?UTF-8?q?=E2=86=92=201.14.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.14.4 --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 9a8bee561c1..c8706c737b1 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.14.3"; + version = "1.14.4"; outputs = [ "out" "installedTests" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "CDqTQQ8dOatOxDKR+HiVQgSJKxH6ZstskKdR84U/870="; + sha256 = "///X0inMi9Znuhjn9n0HlVLa5/kFWpKorKS8RY9WeYM="; }; nativeBuildInputs = [ From e997da680051e87ad95fa198c87d4fb57071c237 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 08:55:39 +0000 Subject: [PATCH 146/182] open-watcom-v2-unwrapped: unstable-2022-05-03 -> unstable-2022-05-04 --- pkgs/development/compilers/open-watcom/v2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index c55ef1f97cc..751afe8556c 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-05-03"; + version = "unstable-2022-05-04"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "a927247a40e69261e7d8891b6f002c91450e01f2"; - sha256 = "/CuPNCEoSjxwYL07b07XqnaAeFZGS8NjXBuj+gFCsOA="; + rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5"; + sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y="; }; postPatch = '' From 89820be14319792341df96a8da4c8ef3be92071d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 May 2022 11:21:37 +0200 Subject: [PATCH 147/182] python3Packages.aioairzone: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 4865812023b..1b926074cba 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo="; + hash = "sha256-QLHM7M3x0QjTTzKNngsNioEzpPh4qG1ntEtSkHQPlfQ="; }; propagatedBuildInputs = [ From 024c603b717b4c9f53c5ff4dce1bc9c58f425c32 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 May 2022 11:22:45 +0200 Subject: [PATCH 148/182] python3Packages.PyChromecast: 12.0.0 -> 12.1.1 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 27e464f6e5f..7d38d99c696 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "12.0.0"; + version = "12.1.1"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4="; + sha256 = "sha256-lUWiKs2tyWYD9214eMbqF7rxMoJgz1YMiHyMEqrUyCw="; }; propagatedBuildInputs = [ From 694b6efcff8186d0251b376e31d035917d58f5dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 May 2022 11:31:02 +0200 Subject: [PATCH 149/182] home-assistant: 2022.5.0 -> 2022.5.1 https://github.com/home-assistant/core/releases/tag/2022.5.1 --- pkgs/servers/home-assistant/component-packages.nix | 6 +----- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0515f9a5198..288d094cc76 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.5.0"; + version = "2022.5.1"; components = { "abode" = ps: with ps; [ abodepy @@ -2244,10 +2244,6 @@ "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ - aiohttp-cors - ifaddr - netdisco - zeroconf ]; # missing inputs: pysabnzbd "safe_mode" = ps: with ps; [ pyturbojpeg diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b7d0faca0c1..8b3ad0c2b13 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -179,7 +179,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.5.0"; + hassVersion = "2022.5.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY="; + hash = "sha256-TsLKcrT31PFik9ZKvl3peMMciR6rma70c2p+dNDn+zk="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 1b3e50637be56bbad5cc02d5c35a94e32ed08af9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 11:53:01 +0200 Subject: [PATCH 150/182] python310Packages.aurorapy: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/aurorapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 7e59d9c8bc9..00eb71e3d7d 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aurorapy"; - version = "0.2.6"; + version = "0.2.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "energievalsabbia"; repo = pname; rev = version; - hash = "sha256-DMlzzLe94dbeHjESmLc045v7vQ//IEsngAv7TeVznHE="; + hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec="; }; propagatedBuildInputs = [ From d2d286451036617f623d60ea7c592d22810395c1 Mon Sep 17 00:00:00 2001 From: hexchen Date: Thu, 17 Jun 2021 01:20:35 +0000 Subject: [PATCH 151/182] maintainers: add hexchen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b760f0c1fe..d245f534648 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5029,6 +5029,12 @@ githubId = 222664; name = "Matthew Leach"; }; + hexchen = { + email = "nix@lilwit.ch"; + github = "hexchen"; + githubId = 41522204; + name = "hexchen"; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; From 6f33598b7e456db6a5ca207297aa99a76e615075 Mon Sep 17 00:00:00 2001 From: hexchen Date: Fri, 6 May 2022 06:51:18 +0000 Subject: [PATCH 152/182] alfaview: fix and update --- .../networking/instant-messengers/alfaview/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index eae63701d4d..94ad490aead 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -1,21 +1,22 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook , alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL , libinput, libpulseaudio, libsecret, libtiff, libxkbcommon , mesa, openssl, systemd, xorg }: stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.42.0"; + version = "8.43.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-O440sk6OJUsO+5TuzLxkUELnCfxKd5byoxSD+Rs4h1c="; + sha256 = "sha256-Rm1U3gxrToNCigL5AomftSUED7X3i7a6enmFnEzWV4c="; }; nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook + wrapGAppsHook ]; buildInputs = [ @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { freetype glib gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-base libGL libinput @@ -72,7 +74,7 @@ stdenv.mkDerivation rec { description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; homepage = "https://alfaview.com"; license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = with maintainers; [ wolfangaukang hexchen ]; platforms = [ "x86_64-linux" ]; }; } From 0b47302cc3610bcb29def433745dd803c7f76342 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 6 May 2022 12:22:56 +0200 Subject: [PATCH 153/182] gitlab-runner: 14.10.0 -> 14.10.1 (#171793) https://gitlab.com/gitlab-org/gitlab-runner/blob/v14.10.1/CHANGELOG.md --- .../tools/continuous-integration/gitlab-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 1fbb4244250..94286ae45d5 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.10.0"; + version = "14.10.1"; in buildGoModule rec { inherit version; @@ -20,7 +20,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "033b68hwqk5hn2by4hk1z7v6p08d505grl9hrx72p4wpyk18c80l"; + sha256 = "1ph8byrh8kbg6s3gm5fakqk0ss6995pidgm664z3rwibr0h6m7sm"; }; patches = [ From 96aaf29234d4dd39d3fcd49452039269f4730f4f Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 6 May 2022 12:38:28 +0200 Subject: [PATCH 154/182] Revert "Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers" This reverts commit 05417a66e7bfee5b0607a12eaf81db33a47a6afd, reversing changes made to 53e4f8d2376c68dfdd614a123d5da0a8b10cf3be. --- nixos/modules/services/networking/pleroma.nix | 8 ++--- nixos/tests/pleroma.nix | 20 ++++++++++-- pkgs/servers/pleroma/default.nix | 31 +------------------ 3 files changed, 23 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index c6d4c14dcb7..9b8382392c0 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -1,7 +1,6 @@ { config, options, lib, pkgs, stdenv, ... }: let cfg = config.services.pleroma; - cookieFile = "/var/lib/pleroma/.cookie"; in { options = { services.pleroma = with lib; { @@ -9,7 +8,7 @@ in { package = mkOption { type = types.package; - default = pkgs.pleroma.override { inherit cookieFile; }; + default = pkgs.pleroma; defaultText = literalExpression "pkgs.pleroma"; description = "Pleroma package to use."; }; @@ -101,6 +100,7 @@ in { after = [ "network-online.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; + environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -118,10 +118,10 @@ in { # Better be safe than sorry migration-wise. ExecStartPre = let preScript = pkgs.writers.writeBashBin "pleromaStartPre" '' - if [ ! -f "${cookieFile}" ] || [ ! -s "${cookieFile}" ] + if [ ! -f /var/lib/pleroma/.cookie ] then echo "Creating cookie file" - dd if=/dev/urandom bs=1 count=16 | ${pkgs.hexdump}/bin/hexdump -e '16/1 "%02x"' > "${cookieFile}" + dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie fi ${cfg.package}/bin/pleroma_ctl migrate ''; diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index 90a9a251104..bf3623fce38 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -32,7 +32,8 @@ import ./make-test-python.nix ({ pkgs, ... }: # system one. Overriding this pretty bad default behaviour. export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + export TOOT_LOGIN_CLI_PASSWORD="jamy-password" + toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" echo "Login OK" # Send a toot then verify it's part of the public timeline @@ -167,6 +168,21 @@ import ./make-test-python.nix ({ pkgs, ... }: cp key.pem cert.pem $out ''; + /* Toot is preventing users from feeding login_cli a password non + interactively. While it makes sense most of the times, it's + preventing us to login in this non-interactive test. This patch + introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to + provide a password to toot login_cli + + If https://github.com/ihabunek/toot/pull/180 gets merged at some + point, feel free to remove this patch. */ + custom-toot = pkgs.toot.overrideAttrs(old:{ + patches = [ (pkgs.fetchpatch { + url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch"; + sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg="; + }) ]; + }); + hosts = nodes: '' ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test ${nodes.client.config.networking.primaryIPAddress} client.nixos.test @@ -178,7 +194,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - toot + custom-toot send-toot ]; }; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index dd4025a76c0..ec7de2ac57c 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,8 +1,7 @@ { lib, beamPackages , fetchFromGitHub, fetchFromGitLab -, file, cmake, bash +, file, cmake , nixosTests, writeText -, cookieFile ? null , ... }: @@ -18,34 +17,6 @@ beamPackages.mixRelease rec { sha256 = "sha256-RcqqNNNCR4cxETUCyjChkpq+cQ1QzNOHHzdqBLtOc6g="; }; - preFixup = if (cookieFile != null) then '' - # There's no way to use a subprocess to cat the content of the - # file cookie using wrapProgram: it gets escaped (by design) with - # a pair of backticks :( - # We have to come up with our own custom wrapper to do this. - function wrapWithCookie () { - local hidden - hidden="$(dirname "$1")/.$(basename "$1")"-wrapped - while [ -e "$hidden" ]; do - hidden="''${hidden}_" - done - mv "$1" "''${hidden}" - - cat > "$1" << EOF - #!${bash}/bin/bash - export RELEASE_COOKIE="\$(cat "${cookieFile}")" - exec -a "\$0" "''${hidden}" "\$@" - EOF - chmod +x "$1" - } - - for f in "$out"/bin/*; do - if [[ -x "$f" ]]; then - wrapWithCookie "$f" - fi - done - '' else ""; - mixNixDeps = import ./mix.nix { inherit beamPackages lib; overrides = (final: prev: { From 764ec5dd394559238633323475b29eca51eedaed Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 6 May 2022 12:40:40 +0200 Subject: [PATCH 155/182] gitlab-runner: Add yayayayaka to maintainers (#171800) --- .../tools/continuous-integration/gitlab-runner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 94286ae45d5..946d660610e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -55,6 +55,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm globin ]; + maintainers = with maintainers; [ bachp zimbatm globin yayayayaka ]; }; } From 723af2912bdf290dc094736a11f495fbac978f5a Mon Sep 17 00:00:00 2001 From: Yuka Date: Fri, 6 May 2022 12:41:07 +0200 Subject: [PATCH 156/182] pleroma: 2.4.2 -> 2.4.3 (#171788) --- pkgs/servers/pleroma/default.nix | 4 ++-- pkgs/servers/pleroma/mix.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index ec7de2ac57c..99dd29db147 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-RcqqNNNCR4cxETUCyjChkpq+cQ1QzNOHHzdqBLtOc6g="; + sha256 = "sha256-x8j/2Eot/EEHsedgZntB5MPxlYMNDlFyZtmiMdhcS7U="; }; mixNixDeps = import ./mix.nix { diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index 31ab20c2940..9c512889531 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -1375,12 +1375,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.6.6"; + version = "0.7.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0wrm3wx1c4wg8xj8lx1pg9xdpxhsbbry71l3kwgsizwjz1cc87if"; + sha256 = "sha256-aJTmihIPRUU02ZBF6jMl93QOpxJgvDFfguKXMdVwpug="; }; beamDeps = []; From 2ad6508561abc09797fd851e5a0bb8c6d56d1eab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 10:43:56 +0000 Subject: [PATCH 157/182] python310Packages.dnachisel: 3.2.8 -> 3.2.9 --- pkgs/development/python-modules/dnachisel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 0f30113ba2f..1c86e3bccf6 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.8"; + version = "3.2.9"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; - rev = "v${version}"; - sha256 = "17jldscmsq5lwp3pnjlxg56k3vfpr7rj4qbcbzkzhphifrfgm729"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Fg0gkI+01xIt8LQmNmRzkzd4AObg/99x34y5NclMtDQ="; }; propagatedBuildInputs = [ From defb285c96a521555d48e8757bc482f71e8dd12f Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 6 May 2022 13:39:59 +0200 Subject: [PATCH 158/182] gitlab: 14.10.1 -> 14.10.2 (#171801) --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 4585eda4947..cc8cd00b7d1 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.10.1", - "repo_hash": "13868wb0zr862xaxapp8nxh16gjsawklw66rlxx95bhhm3r81nrp", + "version": "14.10.2", + "repo_hash": "0f7cfc1wrzz4m5yhd6jnp3dqpdy7vbj8bf826zjsi2ss48430bk0", "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.10.1-ee", + "rev": "v14.10.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.10.1", + "GITALY_SERVER_VERSION": "14.10.2", "GITLAB_PAGES_VERSION": "1.56.1", "GITLAB_SHELL_VERSION": "13.25.1", - "GITLAB_WORKHORSE_VERSION": "14.10.1" + "GITLAB_WORKHORSE_VERSION": "14.10.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 3126ce718e8..127a4ec461f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.10.1"; + version = "14.10.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,7 +23,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-4TbCfe41Nea1p0aDqGbF4SskUl5r9LRHKA16DH97jMI="; + sha256 = "sha256-hLTzkW5GDq1AgTwe1pVj6Tiyd0JpJ76ATFu3Q+m9MVg="; }; vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 602d8650f33..2613fe85f81 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.10.1"; + version = "14.10.2"; src = fetchFromGitLab { owner = data.owner; From 02479819d661fbeee9a219dd19e50b637f7cabf8 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 6 May 2022 15:00:13 +0300 Subject: [PATCH 159/182] Revert "nextcloud-client: remove inkscape from runtime closure" This reverts commit 1f70a0a9e07be3e2dde872f700e4ede82c98c2ab. --- pkgs/applications/networking/nextcloud-client/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 2c07d637bd4..a7df46d6503 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -50,18 +50,15 @@ mkDerivation rec { done ''; - # required to not include inkscape in the wrapper - strictDeps = true; - nativeBuildInputs = [ pkg-config cmake + extra-cmake-modules inkscape sphinx ]; buildInputs = [ - extra-cmake-modules inotify-tools libcloudproviders libsecret From bb91586815f1cc3963af2a2086f969ad84df483e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 14:53:05 +0200 Subject: [PATCH 160/182] python310Packages.azure-servicebus: 7.6.0 -> 7.6.1 --- .../azure-servicebus/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index a0864529177..0fd1ca89f08 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -3,22 +3,25 @@ , azure-core , buildPythonPackage , fetchPypi -, futures ? null , isodate -, isPy3k , msrestazure +, pythonOlder +, six +, typing-extensions , uamqp }: buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.6.0"; + version = "7.6.1"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-uZGxQ1Vl6wpBCMW1+80/CBuqelLV02yXf1sNlNtCpHU="; + hash = "sha256-wqt+uWKVklP2AxiQN9PeuOFUixtZuBUIUhN+WZBYrBI="; }; propagatedBuildInputs = [ @@ -26,16 +29,15 @@ buildPythonPackage rec { azure-core isodate msrestazure + six + typing-extensions uamqp - ] ++ lib.optionals (!isPy3k) [ - futures ]; - # has no tests + # Tests require dev-tools doCheck = false; - # python2 will fail due to pep 420 - pythonImportsCheck = lib.optionals isPy3k [ + pythonImportsCheck = [ "azure.servicebus" ]; From c767cecaad04e177355a139760ac5a59ca26c4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 23:52:57 +0000 Subject: [PATCH 161/182] rnote: 0.4.0 -> 0.5.0-hotfix-2 https://github.com/flxzt/rnote/releases/tag/v0.5.0-hotfix-2 --- pkgs/applications/graphics/rnote/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index ccccca8d65c..a496c4221a3 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, alsa-lib , appstream-glib , desktop-file-utils , gio-sharp @@ -21,19 +22,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.4.0"; + version = "0.5.0-hotfix-2"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0="; + fetchSubmodules = true; + hash = "sha256-8sv7GQopUbKv8JS1/UXRFeK++UZKk3CJBOzUMx9vZDU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480="; + hash = "sha256-N0qsph68FAkwOpyr9QUw0bDQKn7t22Hbz9BYYOs4pCM="; }; nativeBuildInputs = [ @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + alsa-lib gio-sharp glib gstreamer From 004a752f6f6040c943084a2a9bbf6a97c478f32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 May 2022 16:19:32 +0200 Subject: [PATCH 162/182] nextcloud-client: replace inkscape with the more light librsvg --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a7df46d6503..32dadb8e5f9 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -6,6 +6,7 @@ , inotify-tools , installShellFiles , libcloudproviders +, librsvg , libsecret , openssl , pcre @@ -20,7 +21,6 @@ , plasma5Packages , sphinx , sqlite -, inkscape , xdg-utils }: @@ -54,7 +54,7 @@ mkDerivation rec { pkg-config cmake extra-cmake-modules - inkscape + librsvg sphinx ]; From 70b3cbff57169566a22fb8df6a0fd3c3b9b21b6b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 May 2022 17:09:52 +0300 Subject: [PATCH 163/182] n8n: reenable tests --- pkgs/applications/networking/n8n/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 86403883631..84ac952846f 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs-16_x, stdenv, lib }: +{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }: let nodePackages = import ./node-composition.nix { @@ -18,7 +18,10 @@ nodePackages.n8n.override { ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n ''; - passthru.updateScript = ./generate-dependencies.sh; + passthru = { + updateScript = ./generate-dependencies.sh; + tests = nixosTests.n8n; + }; meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; From a4f017b03512759258a16ca257391ed0f4b94b1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 May 2022 07:45:24 -0700 Subject: [PATCH 164/182] nano: 6.2 -> 6.3 (#171639) --- pkgs/applications/editors/nano/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 658c18e5cb5..20b18814cb7 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "6.2"; + version = "6.3"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "K8oYBL6taq9K15H3VuR0m7Ve2GDuwQWpf7qGS8anfLM="; + sha256 = "61MtpJhWcnMLUA9oXbqriFpGbQj7v3QVgyuVgF5vhoc="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -41,9 +41,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - tests = { - expect = callPackage ./test-with-expect.nix {}; - }; + tests = { expect = callPackage ./test-with-expect.nix { }; }; updateScript = writeScript "update.sh" '' #!${stdenv.shell} From f4e5bd806439fb7010c4962295a786d61d4af305 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 16:56:47 +0200 Subject: [PATCH 165/182] nixos/nixos-generate-config: update comment for useDHCP --- nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 6d32d727501..b74ec838df4 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -585,8 +585,8 @@ sub generateNetworkingDhcpConfig { my $config = <.useDHCP`. + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; EOF From 14ca12f3f78bc5c739cfcc886781198d92e5ebbb Mon Sep 17 00:00:00 2001 From: Rene de la Garza Date: Fri, 6 May 2022 10:18:41 -0500 Subject: [PATCH 166/182] flyctl: update ldflags Update ldflags to match https://github.com/superfly/flyctl/blob/v0.0.323/.goreleaser.yml#L19-L22 --- pkgs/development/web/flyctl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 87b6ddfa923..8850f495027 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -17,10 +17,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}" - "-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000" - "-X github.com/superfly/flyctl/flyctl.Environment=production" - "-X github.com/superfly/flyctl/flyctl.Version=${version}" + "-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}" + "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000" + "-X github.com/superfly/flyctl/internal/buildinfo.environment=production" + "-X github.com/superfly/flyctl/internal/buildinfo.version=${version}" ]; preBuild = '' From 7f76009e1000c0d0d877996470f2ab2aa565745d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Wed, 16 Mar 2022 10:40:25 +0100 Subject: [PATCH 167/182] nixosTests.pleroma: fix test, remove toot patch Initially applied via e7f6370701a3e65082e67cd0f9696bcd32c2e9ec, then reverted by 96aaf29234d4dd39d3fcd49452039269f4730f4f. Re-applying this patch: the pleroma NixOS test is broken without it. It was originally impossible to login in toot without having an interactive shell. I opened https://github.com/ihabunek/toot/pull/180 upstream to fix that and fetch this patch for this test. The author decided to fix the issue using a slightly different approach at https://github.com/ihabunek/toot/commit/a3eb5dca24e3efa8f16ebcdc4b7d635dc9af03b7 Because of this upstream fix, our custom patch does not apply anymore. Using that stdin-based login upstream feature. Pointing pleroma_ctl to the right RELEASE_COOKIE as well. --- nixos/tests/pleroma.nix | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index bf3623fce38..8998716243a 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -32,8 +32,7 @@ import ./make-test-python.nix ({ pkgs, ... }: # system one. Overriding this pretty bad default behaviour. export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - export TOOT_LOGIN_CLI_PASSWORD="jamy-password" - toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" echo "Login OK" # Send a toot then verify it's part of the public timeline @@ -159,7 +158,9 @@ import ./make-test-python.nix ({ pkgs, ... }: # Waiting for pleroma to be up. timeout 5m bash -c 'while [[ "$(curl -s -o /dev/null -w '%{http_code}' https://pleroma.nixos.test/api/v1/instance)" != "200" ]]; do sleep 2; done' - pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y + # Toremove the RELEASE_COOKIE bit when https://github.com/NixOS/nixpkgs/issues/166229 gets fixed. + RELEASE_COOKIE="/var/lib/pleroma/.cookie" \ + pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y ''; tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' @@ -168,21 +169,6 @@ import ./make-test-python.nix ({ pkgs, ... }: cp key.pem cert.pem $out ''; - /* Toot is preventing users from feeding login_cli a password non - interactively. While it makes sense most of the times, it's - preventing us to login in this non-interactive test. This patch - introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to - provide a password to toot login_cli - - If https://github.com/ihabunek/toot/pull/180 gets merged at some - point, feel free to remove this patch. */ - custom-toot = pkgs.toot.overrideAttrs(old:{ - patches = [ (pkgs.fetchpatch { - url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch"; - sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg="; - }) ]; - }); - hosts = nodes: '' ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test ${nodes.client.config.networking.primaryIPAddress} client.nixos.test @@ -194,7 +180,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - custom-toot + toot send-toot ]; }; From 42a75e13733f75bfea768d9f6c6367cff53bb096 Mon Sep 17 00:00:00 2001 From: Nicolas M Date: Fri, 6 May 2022 18:04:41 +0200 Subject: [PATCH 168/182] charm: 0.12.0 -> 0.12.1 --- pkgs/applications/misc/charm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index faaea86a664..61f0307f7c2 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "charm"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-XXKzK5MXJsB3LE7iE5BqnLm0hPs7WbyHR0x9aTldrj4="; + sha256 = "sha256-vNy2ai1s7TKCymYznvT0Wo6lg9qEyDzz8l3SYzScz8g="; }; vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4="; @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { description = "Manage your charm account on the CLI"; homepage = "https://github.com/charmbracelet/charm"; + changelog = "https://github.com/charmbracelet/charm/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ penguwin ]; }; From 3025934acff713d328e7f30438338d79d062f9a2 Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Fri, 6 May 2022 17:00:53 +0100 Subject: [PATCH 169/182] earthly: licenses.bsl11 => licenses.mpl20 --- pkgs/development/tools/earthly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 06b17c1ff1f..5838f5e94b4 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Build automation for the container era"; homepage = "https://earthly.dev/"; changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; - license = licenses.bsl11; + license = licenses.mpl20; maintainers = with maintainers; [ zoedsoupe ]; }; } From 8a9a91025595640fb46e8392aa86785d1bc940c8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 18 Apr 2022 10:22:06 +0300 Subject: [PATCH 170/182] vis: add tre to buildInputs --- pkgs/applications/editors/vis/default.nix | 41 ++++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index b9fcfe10221..a05b0e48e0b 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem -, ncurses, libtermkey, lua -, acl ? null, libselinux ? null +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper +, copyDesktopItems, makeDesktopItem +, ncurses, libtermkey, lua, tre +, acl, libselinux }: let @@ -17,12 +18,13 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; buildInputs = [ ncurses libtermkey luaEnv + tre ] ++ lib.optionals stdenv.isLinux [ acl libselinux @@ -33,28 +35,27 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* $out/share/applications - echo wrapping $out/bin/vis with runtime environment wrapProgram $out/bin/vis \ --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; - desktopItem = makeDesktopItem { - name = "vis"; - exec = "vis %U"; - type = "Application"; - icon = "accessories-text-editor"; - comment = meta.description; - desktopName = "vis"; - genericName = "Text editor"; - categories = [ "Application" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "application/octet-stream" ]; - startupNotify = false; - terminal = true; - }; + desktopItems = [ + (makeDesktopItem { + name = "vis"; + exec = "vis %U"; + type = "Application"; + icon = "accessories-text-editor"; + comment = meta.description; + desktopName = "vis"; + genericName = "Text editor"; + categories = [ "Application" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "application/octet-stream" ]; + startupNotify = false; + terminal = true; + }) + ]; meta = with lib; { description = "A vim like editor"; From dcade93a2517b358936714a1c866ef7c10e49d4f Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Fri, 29 Apr 2022 14:27:06 +0100 Subject: [PATCH 171/182] factorio: Add loadLatestSave --- nixos/modules/services/games/factorio.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index ff73d7a46ed..bb6898a08c5 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -87,6 +87,18 @@ in a new map with default settings will be generated before starting the service. ''; }; + loadLatestSave = mkOption { + type = types.bool; + default = false; + description = '' + Load the latest savegame on startup. This overrides saveName, in that the latest + save will always be used even if a saved game of the given name exists. It still + controls the 'canonical' name of the savegame. + + Set this to true to have the server automatically reload a recent autosave after + a crash or desync. + ''; + }; # TODO Add more individual settings as nixos-options? # TODO XXX The server tries to copy a newly created config file over the old one # on shutdown, but fails, because it's in the nix store. When is this needed? @@ -250,8 +262,9 @@ in "--config=${cfg.configFile}" "--port=${toString cfg.port}" "--bind=${cfg.bind}" - "--start-server=${mkSavePath cfg.saveName}" + (optionalString (!cfg.loadLatestSave) "--start-server=${mkSavePath cfg.saveName}") "--server-settings=${serverSettingsFile}" + (optionalString cfg.loadLatestSave "--start-server-load-latest") (optionalString (cfg.mods != []) "--mod-directory=${modDir}") (optionalString (cfg.admins != []) "--server-adminlist=${serverAdminsFile}") ]; From 384d446910801ac29070cac4765761caba15fcd0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Apr 2022 08:43:12 -0700 Subject: [PATCH 172/182] arcanist: 20200711 -> 20220425 --- pkgs/development/tools/misc/arcanist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 0fa34c7eefe..16c056bc3ff 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -25,13 +25,13 @@ let makeArcWrapper = toolset: '' in stdenv.mkDerivation { pname = "arcanist"; - version = "20200711"; + version = "20220425"; src = fetchFromGitHub { owner = "phacility"; repo = "arcanist"; - rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; - sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; + rev = "da206314cf59f71334b187283e18823bddc16ddd"; + sha256 = "sha256-6VVUjFMwPQvk22Ni1YUSgks4ZM0j1JP+71VnYKD8onM="; }; patches = [ ./dont-require-python3-in-path.patch ]; From 58b1ba6acf5a1d5124a401a970d906d36981c9e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 May 2022 14:06:38 +0000 Subject: [PATCH 173/182] python310Packages.defcon: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/defcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index f40ba374d03..12cbdf0a210 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a009862a0bc3f41f2b1a1b1f80d6aeedb3a17ed77d598da09f5a1bd93e970b3c"; + sha256 = "sha256-+nlk9xG3mOCS4xHzp54J/V+he7HNMg1aMgFeTFTrMHA="; extension = "zip"; }; From 11af4a331fa718514869d94764a87bd7d88e504a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 6 May 2022 22:19:02 +0100 Subject: [PATCH 174/182] cidrgrep: Init at unstable-2020-11-17 --- pkgs/tools/text/cidrgrep/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/text/cidrgrep/default.nix diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix new file mode 100644 index 00000000000..cfbfee48938 --- /dev/null +++ b/pkgs/tools/text/cidrgrep/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "cidrgrep"; + version = "unstable-2020-11-17"; + + src = fetchFromGitHub { + owner = "tomdoherty"; + repo = "cidrgrep"; + rev = "8ad5af533e8dc33ea18ff19b7c6a41550748fe0e"; + sha256 = "sha256:0jvwm9jq5jd270b6l9nkvc5pr3rgf158sw83lrprmwmz7r4mr786"; + }; + + vendorSha256 = "sha256:0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + postInstall = '' + mv $out/bin/cmd $out/bin/cidrgrep + ''; + + meta = { + description = "Like grep but for IPv4 CIDRs"; + maintainers = with lib.maintainers; [ das_j ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 847e9b7f1d8..e004eafadec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1117,6 +1117,8 @@ with pkgs; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; + cidrgrep = callPackage ../tools/text/cidrgrep { }; + cope = callPackage ../tools/misc/cope { }; ejson2env = callPackage ../tools/admin/ejson2env { }; From e2942bccba6142ddfe6317389c8891e2f4cbf6e0 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 6 May 2022 15:25:50 -0600 Subject: [PATCH 175/182] python3Packages.protonvpn-nm-lib: 3.8.0 -> 3.9.0 --- .../0001-Patching-GIRepository.patch | 22 +++++++++++++++++++ .../protonvpn-nm-lib/default.nix | 16 +++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch b/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch new file mode 100644 index 00000000000..bb34dff0b5a --- /dev/null +++ b/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch @@ -0,0 +1,22 @@ +From 2867f022aad754fe54d95222b3ae52f6e7f14c2f Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Wed, 27 Apr 2022 21:49:12 -0600 +Subject: [PATCH] Patching GIRepository + +--- + protonvpn_nm_lib/__init__.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/protonvpn_nm_lib/__init__.py b/protonvpn_nm_lib/__init__.py +index e69de29..00b95f4 100644 +--- a/protonvpn_nm_lib/__init__.py ++++ b/protonvpn_nm_lib/__init__.py +@@ -0,0 +1,5 @@ ++import gi ++gi.require_version('GIRepository', '2.0') ++from gi.repository import GIRepository ++repo = GIRepository.Repository.get_default() ++repo.prepend_search_path('@networkmanager_path@') +-- +2.35.1 + diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 9f12f220cfe..44e4b8e237d 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, substituteAll , distro , jinja2 , keyring @@ -9,18 +10,19 @@ , pygobject3 , pyxdg , systemd +, networkmanager }: buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.8.0"; + version = "3.9.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = version; - sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4="; + sha256 = "sha256-yV3xeIyPc2DJj5DOa5PA1MHt00bjJ/Y9zZK77s/XRAA="; }; propagatedBuildInputs = [ @@ -33,7 +35,15 @@ buildPythonPackage rec { systemd ]; - # Project has a dummy test. + patches = [ + (substituteAll { + src = ./0001-Patching-GIRepository.patch; + networkmanager_path = "${networkmanager}/lib/girepository-1.0"; + }) + ]; + + # Checks cannot be run in the sandbox + # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" doCheck = false; pythonImportsCheck = [ "protonvpn_nm_lib" ]; From 0ffb521ac872dba81e413700a792eb781ab77f0b Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 6 May 2022 15:26:57 -0600 Subject: [PATCH 176/182] protonvpn-cli: 2.2.6 -> 3.11.1 --- .../networking/protonvpn-cli/default.nix | 44 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index e46909d2a7c..5182b5c256f 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -1,37 +1,41 @@ -{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }: +{ lib +, buildPythonApplication +, pythonOlder +, fetchFromGitHub +, protonvpn-nm-lib +, pythondialog +, dialog +}: -python3Packages.buildPythonApplication rec { - pname = "protonvpn-linux-cli"; - version = "2.2.6"; +buildPythonApplication rec { + pname = "protonvpn-cli"; + version = "3.11.1"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; - rev = "v${version}"; - sha256 = "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"; + rev = version; + sha256 = "sha256-u+POtUz7NoGS23aOmvDCZPUp2HW1xXGtfbZR88cWCBc="; }; - propagatedBuildInputs = (with python3Packages; [ - requests - docopt - setuptools - jinja2 - pythondialog - ]) ++ [ - dialog - openvpn - iptables - ]; + propagatedBuildInputs = [ + protonvpn-nm-lib + pythondialog + dialog + ]; - # No tests + # Project has a dummy test doCheck = false; meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; - maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; + maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; - mainProgram = "protonvpn"; + mainProgram = "protonvpn-cli"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8172605a210..33c5a803a77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29022,7 +29022,7 @@ with pkgs; protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; - protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; + protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; From ac247e0885f8638062c308181008b7c4afab2f1a Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 6 May 2022 15:28:06 -0600 Subject: [PATCH 177/182] protonvpn-cli_2: init at 2.2.11 Naming as protonvpn-cli_2 as this version uses openvpn to perform connections instead of NetworkManager as on the official version --- .../networking/protonvpn-cli/2.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/networking/protonvpn-cli/2.nix diff --git a/pkgs/applications/networking/protonvpn-cli/2.nix b/pkgs/applications/networking/protonvpn-cli/2.nix new file mode 100644 index 00000000000..c3e9bd2ac21 --- /dev/null +++ b/pkgs/applications/networking/protonvpn-cli/2.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pythonOlder +, requests +, docopt +, pythondialog +, jinja2 +, distro +, dialog +, iptables +, openvpn }: + +buildPythonApplication rec { + pname = "protonvpn-cli_2"; + version = "2.2.11"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Rafficer"; + repo = "linux-cli-community"; + # There is a tag and branch with the same name + rev = "refs/tags/v${version}"; + sha256 = "sha256-CWQpisJPBXbf+d5tCGuxfSQQZBeF36WFF4b6OSUn3GY="; + }; + + propagatedBuildInputs = [ + requests + docopt + pythondialog + jinja2 + distro + dialog + openvpn + iptables + ]; + + # No tests + doCheck = false; + + meta = with lib; { + description = "Linux command-line client for ProtonVPN using Openvpn"; + homepage = "https://github.com/Rafficer/linux-cli-community"; + maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "protonvpn"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33c5a803a77..de0ab8575cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29023,6 +29023,7 @@ with pkgs; protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { }; + protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; From 5f979ef4b9ddd1399c66af01f4df306bde65bdfa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 May 2022 00:21:52 +0200 Subject: [PATCH 178/182] home-assistant: 2022.5.1 -> 2022.5.2 https://github.com/home-assistant/core/releases/tag/2022.5.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 288d094cc76..d91ad268c9a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.5.1"; + version = "2022.5.2"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8b3ad0c2b13..61f207fadb1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -179,7 +179,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.5.1"; + hassVersion = "2022.5.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-TsLKcrT31PFik9ZKvl3peMMciR6rma70c2p+dNDn+zk="; + hash = "sha256-n8lM1Z5fkZRW0E9J7nPRYntoaUuug9XPoRAKl+5XC6Y="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 40d62b1611168469d0172229f69fe2f2b8108247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 18:16:38 +0000 Subject: [PATCH 179/182] libdeltachat: 1.79.0 -> 1.80.0 https://github.com/deltachat/deltachat-core-rust/blob/1.80.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index dd1707ec96f..462434f9839 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -5,6 +5,7 @@ , openssl , perl , pkg-config +, python3 , rustPlatform , sqlcipher , sqlite @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.79.0"; + version = "1.80.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-jwAPbTwMSWDucAvip5KcA7fb4LCWo70SiIspacijMvQ="; + hash = "sha256-4b2tf7QmLQ5ltnkxUGCwA1TZSQRoyKaRGcxBxbSKDaE="; }; patches = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Fn4M4CQV7VTE7SubvOszhpGBbmDyqemyUeZ0qDmcGUU="; + hash = "sha256-t1/xztmiuJMqNkIe7cBzO7MaZQb6GtnIX5wxEpC+IFo="; }; nativeBuildInputs = [ @@ -60,6 +61,10 @@ stdenv.mkDerivation rec { cargoCheckHook ]; + passthru.tests = { + python = python3.pkgs.deltachat; + }; + meta = with lib; { description = "Delta Chat Rust Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/"; From 4afcdf8271d42710634818e8242e871f122212a3 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 16 Apr 2022 18:12:17 +0200 Subject: [PATCH 180/182] taplo-cli: 0.5.0 -> 0.6.1 https://github.com/tamasfe/taplo/releases/tag/release-cli-0.6.1 --- pkgs/development/tools/taplo-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/taplo-cli/default.nix b/pkgs/development/tools/taplo-cli/default.nix index e19de1c3cdf..503be310966 100644 --- a/pkgs/development/tools/taplo-cli/default.nix +++ b/pkgs/development/tools/taplo-cli/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "taplo-cli"; - version = "0.5.0"; + version = "0.6.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-+0smR1FDeJMSa/LaRM2M53updt5p8717DEaFItNXCdM="; + sha256 = "sha256-0U7qoRnId3gKTQYPwbvrt/vzGfiSX6kcGwgRNc1uZ/I="; }; - cargoSha256 = "sha256-d7mysGYR72shXwvmDXr0oftSa+RtRoSbP++HBR40Mus="; + cargoSha256 = "sha256-FIcq8wwJrZRxATDr+jo4KOX4l6auriNg+rSpMNsG+Tk="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; From 5dde16145cd04e9f8de0895fa5d516e4533dc86a Mon Sep 17 00:00:00 2001 From: Rasmus Rendal Date: Sat, 7 May 2022 01:30:41 +0200 Subject: [PATCH 181/182] libuv: enable on windows (#171818) --- pkgs/development/libraries/libuv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 12f7f982c1d..92b8a99c72d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog"; maintainers = with maintainers; [ cstrahan ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; From 8679c785ace916fb4533d2ff6f9fbd9cfb21a0c5 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 6 May 2022 13:53:41 -0400 Subject: [PATCH 182/182] caddy: 2.5.0 -> 2.5.1 --- pkgs/servers/caddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 711c65f6617..0ba836eeb6b 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: let - version = "2.5.0"; + version = "2.5.1"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -18,7 +18,7 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-V9iIz/93n6EBJZ9v3MDKD6FivtplRFN9a/e0o7YX0/w="; + sha256 = "sha256-Y4GAx/8XcW7+6eXCQ6k4e/3WZ/6MkTr5za1AXp6El9o="; }; vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo=";