From 64b7c29da1b0187a2a496f6e7df294baa72bdd62 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 31 Jan 2022 20:35:00 -0500 Subject: [PATCH 001/338] darwin.cctools-apple: init at 973.0.1-609 --- pkgs/os-specific/darwin/cctools/apple.nix | 118 ++++++++++++++++++ ...tools-add-missing-vtool-libstuff-dep.patch | 11 ++ pkgs/top-level/darwin-packages.nix | 4 + 3 files changed, 133 insertions(+) create mode 100644 pkgs/os-specific/darwin/cctools/apple.nix create mode 100644 pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch diff --git a/pkgs/os-specific/darwin/cctools/apple.nix b/pkgs/os-specific/darwin/cctools/apple.nix new file mode 100644 index 000000000000..f8ff90dbb13f --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/apple.nix @@ -0,0 +1,118 @@ +{ lib, stdenv, fetchurl, symlinkJoin, xcbuildHook, tcsh, libobjc, libtapi, libunwind, llvm, memstreamHook, xar }: + +let + +cctools = stdenv.mkDerivation rec { + pname = "cctools"; + version = "973.0.1"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/cctools/cctools-${version}.tar.gz"; + hash = "sha256-r/6tsyyfi3R/0cLl+lN/B9ZaOaVF+Z7vJ6xj4LzSgiQ="; + }; + + patches = [ + ./cctools-add-missing-vtool-libstuff-dep.patch + ]; + + postPatch = '' + for file in libstuff/writeout.c misc/libtool.c misc/lipo.c; do + substituteInPlace "$file" \ + --replace '__builtin_available(macOS 10.12, *)' '0' + done + substituteInPlace libmacho/swap.c \ + --replace '#ifndef RLD' '#if 1' + ''; + + nativeBuildInputs = [ xcbuildHook memstreamHook ]; + buildInputs = [ libobjc llvm ]; + + xcbuildFlags = [ + "MACOSX_DEPLOYMENT_TARGET=10.12" + ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + + Products/Release/libstuff_test + rm Products/Release/libstuff_test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + rm -rf "$out/usr" + mkdir -p "$out/bin" + find Products/Release -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \; + cp -r include "$out/" + + ln -s ./nm-classic "$out"/bin/nm + ln -s ./otool-classic "$out"/bin/otool + + runHook postInstall + ''; +}; + +ld64 = stdenv.mkDerivation rec { + pname = "ld64"; + version = "609"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/ld64/ld64-${version}.tar.gz"; + hash = "sha256-SqQ7SqmK+uOPijzxOTqtkEu3qYmcth6H7rrQ03R1Q+4="; + }; + + postPatch = '' + substituteInPlace ld64.xcodeproj/project.pbxproj \ + --replace "/bin/csh" "${tcsh}/bin/tcsh" \ + --replace 'F9E8D4BE07FCAF2A00FD5801 /* PBXBuildRule */,' "" \ + --replace 'F9E8D4BD07FCAF2000FD5801 /* PBXBuildRule */,' "" + + sed -i src/ld/Options.cpp -e '1iconst char ldVersionString[] = "${version}";' + ''; + + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ + libtapi + libunwind + llvm + xar + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + find Products/Release-assert -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \; + + runHook postInstall + ''; +}; + +in + +symlinkJoin rec { + name = "cctools-${version}"; + version = "${cctools.version}-${ld64.version}"; + + paths = [ + cctools + ld64 + ]; + + # workaround for the fetch-tarballs script + passthru = { + inherit (cctools) src; + ld64_src = ld64.src; + }; + + meta = with lib; { + description = "MacOS Compiler Tools"; + homepage = "http://www.opensource.apple.com/source/cctools/"; + license = licenses.apsl20; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch b/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch new file mode 100644 index 000000000000..1cd65ec6bcf1 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch @@ -0,0 +1,11 @@ +diff -ru a/cctools.xcodeproj/project.pbxproj b/cctools.xcodeproj/project.pbxproj +--- a/cctools.xcodeproj/project.pbxproj 2021-02-24 20:30:55.000000000 -0500 ++++ b/cctools.xcodeproj/project.pbxproj 2022-01-31 20:01:09.000000000 -0500 +@@ -2558,6 +2558,7 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( ++ DE97E92421F3B86100C7947D /* libstuff.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 2e031e27307a..8cc710f280a1 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -98,6 +98,10 @@ impure-cmds // appleSourcePackages // chooseLibs // { stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; }; + cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix { + stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; + }; + # TODO: remove alias. cf-private = self.apple_sdk.frameworks.CoreFoundation; From 6c6d100c5fbe5d7a02d66638e2f66018c2290a86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 15:03:06 +0000 Subject: [PATCH 002/338] aeolus: 0.9.9 -> 0.10.4 --- pkgs/applications/audio/aeolus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index d8ef7d2b4fa5..df61d3896155 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.9"; + version = "0.10.4"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; + sha256 = "sha256-J9xrd/N4LrvGgi89Yj4ob4ZPUAEchrXJJQ+YVJ29Qhk="; }; buildInputs = [ From b8942b84795af66a20b7c791ec71f5c8e7d5b5a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 15:20:50 +0000 Subject: [PATCH 003/338] bacula: 11.0.6 -> 13.0.1 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 35c5a36a8c9f..d9bf3c3b4709 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.6"; + version = "13.0.1"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-AZWgi81PV4rkqc4Nkff4ZzHGNNVrgQU0ci1yGyqe7Lc="; + sha256 = "sha256-1jhI1pWsFcHM/BF4knUzFLy5IyqFLEDjLMqIwOkYl4o="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 4d4f149f1e735dbb4351ade2fa522ece7c05ae67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Aug 2022 09:43:18 +0000 Subject: [PATCH 004/338] bonzomatic: 2022-02-05 -> 2022-08-20 --- pkgs/applications/editors/bonzomatic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index caa1d2ab79b9..e435e834e7e5 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "bonzomatic"; - version = "2022-02-05"; + version = "2022-08-20"; src = fetchFromGitHub { owner = "Gargaj"; repo = pname; rev = version; - sha256 = "sha256-y0zNluIDxms+Lpg7yBiEJNNyxx5TLaSiWBKXjqXiVJg="; + sha256 = "sha256-AaUMefxQd00O+MAH4OLoyQIXZCRQQbt2ucgt7pVvN24="; }; nativeBuildInputs = [ cmake makeWrapper ]; From aaa1ee0fc75db9679162be9848c643be553c803a Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 23 Aug 2022 06:08:58 +0200 Subject: [PATCH 005/338] belle-sip: linphone-4.4.1 -> 5.1.55 Bump the version to 5.1.55 and also use its actual version as version number for the package instead of the version number of linphone. Signed-off-by: Felix Singer --- pkgs/development/libraries/belle-sip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 22817feadeda..13ba11de1c6d 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "linphone-4.4.1"; + version = "5.1.55"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "44d5977570280763ee1fecdb920736715bad58a3"; - sha256 = "sha256-w++v3YlDZfpCHAbUQA/RftjRNGkz9J/zYoxZqRgtvnA="; + rev = version; + sha256 = "sha256-wMf570/RP2Q4yluedECs+AKoH92PQQ8yVY+eBGGSAP4="; }; nativeBuildInputs = [ cmake ]; From 717ce7ac2c7d637e3b242a50995a9a411b81ea4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 03:48:13 +0000 Subject: [PATCH 006/338] gam: 6.22 -> 6.25 --- pkgs/tools/admin/gam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/tools/admin/gam/default.nix index 191785dd0308..1b90de1d4674 100644 --- a/pkgs/tools/admin/gam/default.nix +++ b/pkgs/tools/admin/gam/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gam"; - version = "6.22"; + version = "6.25"; format = "other"; src = fetchFromGitHub { owner = "GAM-team"; repo = "gam"; - rev = "v${version}"; - sha256 = "sha256-G/S1Rrm+suiy1CTTFLcBGt/QhARL7puHgR65nCxodH0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/VmBFMjCkd1xhudlcjYGGv+6tgEsyY/xqQoGdupJvOg="; }; sourceRoot = "source/src"; From 76da07ebfb0cdcb295c58bdfd3066a2fe41f6525 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 04:44:53 +0000 Subject: [PATCH 007/338] bada-bib: 0.7.2 -> 0.8.0 --- pkgs/applications/science/misc/bada-bib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 2304e9f77f4c..43d1923de6fc 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.7.2"; + version = "0.8.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+b4Ko2srWZUs8zsH9jU+aiKQYZti3z2Bil8PogfpPlc="; + sha256 = "sha256-mdAoJh3qOwtPX8cMCYw7MDDNy10GdhynnS8gtszJROI="; }; nativeBuildInputs = [ From 7b41fe494fc7586b92bdf5b2b77d87589d934b81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 05:23:54 +0000 Subject: [PATCH 008/338] catcli: 0.8.2 -> 0.8.7 --- pkgs/tools/filesystems/catcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 663aecfcbb16..eedbdcc22285 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.8.2"; + version = "0.8.7"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-IHHlxF/7U7C+wO6YicesZPFV6BSBmdkPWaZn7awplNk="; + sha256 = "sha256-hVunxgc/aUapQYe6k3hKdkC+2Jw0x1HjI/kl/fJdWUo="; }; propagatedBuildInputs = [ docopt anytree ]; From 1dbabf2811847dfbc01e4f13c183f65a33ade89b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 08:42:48 +0000 Subject: [PATCH 009/338] drumgizmo: 0.9.19 -> 0.9.20 --- pkgs/applications/audio/drumgizmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 71841a616a35..d6f468dbc563 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.19"; + version = "0.9.20"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl"; + sha256 = "sha256-AF8gQLiB29j963uI84TyNHIC0qwEWOCqmZIUWGq8V2o="; }; configureFlags = [ "--enable-lv2" ]; From 2208ff5992e08f3e08693238d8310bdeae52b6ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 09:04:02 +0000 Subject: [PATCH 010/338] embree: 3.13.4 -> 3.13.5 --- pkgs/development/libraries/embree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index fb8db3a218e6..e4509d058dae 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.4"; + version = "3.13.5"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-WmblxU1kHiC8+hYAfUDcbJ1/e80f1LcKX8qCwgaBwGc="; + sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80="; }; postPatch = '' From 17f3cf36e849bd2845a42f00f5e15a8784d0bbc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Sep 2022 21:44:51 +0000 Subject: [PATCH 011/338] ibus-engines.m17n: 1.4.11 -> 1.4.17 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 4636eedc56cd..2137bd1c9319 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.11"; + version = "1.4.17"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-y9cWQ6Z7sxGCdRgWRoKPGH3TDWyrzCwXDEx0pfTjgyM="; + sha256 = "sha256-s+CYVJjeOuD5SYme+cDVTl1N8pKJJ4CNT6QQXjIqLQI="; }; nativeBuildInputs = [ From d4ef646216f03b42a3942f41acd99be9d4bc8457 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 01:45:14 +0000 Subject: [PATCH 012/338] profile-sync-daemon: 6.47 -> 6.48 --- pkgs/tools/misc/profile-sync-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 6ab2369a822a..b2e6deea725f 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "profile-sync-daemon"; - version = "6.47"; + version = "6.48"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-sync-daemon"; rev = "v${version}"; - hash = "sha256-BAr+EvSjSPBKdSX49tEgXOpMK3NB5JZ+cmfuKkyDbGs="; + hash = "sha256-EHzRuE24Bj+lqRiPTCAPEAV4zVMK8iW2cF6OgO1izZw="; }; installPhase = '' From 8820f4bbd0570170f21f70c2df6bfeabdfb09bbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 17:02:28 +0000 Subject: [PATCH 013/338] moonlight-embedded: 2.5.2 -> 2.5.3 --- pkgs/applications/misc/moonlight-embedded/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 51e1a15b47ba..51cd4df77bfa 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-YZEPm+k0YzJB8OQAiFUOPc0QR2C0AkSgpNYdoh8jX8E="; + sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs="; fetchSubmodules = true; }; From ee700a2f127c7a45b016a88e15cb7654d8c3f690 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 20:16:07 +0000 Subject: [PATCH 014/338] gromit-mpx: 1.4.2 -> 1.4.3 --- pkgs/tools/graphics/gromit-mpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 122dfe8a8bf1..c3cc4453e9cf 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "sha256-2inmcKSdvHs7WaU095liH12Og9ezsNSs2qygltWOclw="; + sha256 = "sha256-nbSyWcccu07FZbvOESFhlnuxgTNgJ+/6ujVQvEyQGGo="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; From 54333fd494f32cb3ef20784b4a826f02638319a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 02:17:54 +0000 Subject: [PATCH 015/338] sstp: 1.0.17 -> 1.0.18 --- pkgs/tools/networking/sstp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index b297f2565f9a..4cbd6e6edb4e 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sstp-client"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz"; - sha256 = "sha256-Kd07nHERrWmDzWY9Wi8Gnh+KlakTqryOFmlwFGZXkl0="; + sha256 = "sha256-2Hn081q36uh0hu3Ei1D5mpr2X162+0QnmTyleLsODcg="; }; postPatch = '' From 77f00071714905146061aa8efd22ebe3317e4638 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 03:39:31 +0000 Subject: [PATCH 016/338] wcslib: 7.11 -> 7.12 --- .../libraries/science/astronomy/wcslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 32b3d5b5624a..bea05468cedc 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.11"; + version = "7.12"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Rr77/fUM1JU4lmdqfVcAlNx2YeKulnewkuf7E87j2l8="; + sha256 = "sha256-nPjeUOEJqX+gRRHUER6NFL0KRAdxMqz3PmzwAp/pa9Q="; }; nativeBuildInputs = [ flex ]; From 881895aae2ac656da0fb5f45c97a8644f727e47b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 17:42:45 +0000 Subject: [PATCH 017/338] logisim-evolution: 3.7.2 -> 3.8.0 --- pkgs/applications/science/logic/logisim-evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 9650d97814bf..affbfc170b90 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "sha256-RI+ioOHj13UAGuPzseAAy3oQBQYkja/ucjj4QMeRZhw="; + sha256 = "sha256-TFm+fa3CMp0OMhnKBc6cLIWGQbIG/OpOOCG7ea7wbCw="; }; dontUnpack = true; From 5239a347440cfdb666c29b051d11c7f1a35344d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 09:10:58 +0000 Subject: [PATCH 018/338] envconsul: 0.13.0 -> 0.13.1 --- pkgs/tools/system/envconsul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index daa92dc77260..5d17f07854d8 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "envconsul"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "envconsul"; rev = "v${version}"; - sha256 = "sha256-Zt4jCqHfDTxSrAIASQgUqtYgcHU9xUs025YOxGXhTAg="; + sha256 = "sha256-9X0mSEMaLGdchf9g5EyRUsn7z6cvbG4QBPoaris7RwQ="; }; - vendorSha256 = "sha256-qxt2LNPDxdiszkjSjgzP7PG26BsZYq1itiyQfy9uaVI="; + vendorSha256 = "sha256-Vunq3lsM1aSXNIr3ZMqE03f0jEI5BpWwMYhZ41tiB9M="; ldflags = [ "-s" From 2d296495e7a8d042a173cab98fcba598f49404ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 11:25:48 +0000 Subject: [PATCH 019/338] libofx: 0.10.7 -> 0.10.9 --- pkgs/development/libraries/libofx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index dd14504bf8b6..4d3de82d1b0c 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.7"; + version = "0.10.9"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-zbSVmduEH7iO/8N6hEpQQMUYDVG6CaNycGOl5bd6fsw="; + sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg="; }; preConfigure = "./autogen.sh"; From 80d45bffa6b3bafe44dfbba469ba7fbf5f550746 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Oct 2022 19:53:31 +0000 Subject: [PATCH 020/338] leatherman: 1.12.8 -> 1.12.9 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index fe5c23b36105..4b84584d53e2 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.8"; + version = "1.12.9"; src = fetchFromGitHub { - sha256 = "sha256-5xcwktlwgP9Ltild4BliaGJBqlheDLSTKQLZjzK+nGk="; + sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk="; rev = version; repo = "leatherman"; owner = "puppetlabs"; From 92bc5dbbae7089db294898dedc7c2b876adeb497 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 00:09:59 +0000 Subject: [PATCH 021/338] picard-tools: 2.27.4 -> 2.27.5 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4696b63d7a17..f6f2f3c43bb2 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.27.4"; + version = "2.27.5"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-H52iduXuZXkH7i+1qGq05DTPgLGZD2ke6US5nTzmvDg="; + sha256 = "sha256-Exyj4GJqPvEug5l5XnpJ+Cm7ToXXG0ib9PIx0hpsMZk="; }; nativeBuildInputs = [ makeWrapper ]; From 12cab28e364b27e3a6194b9fb25446ab0eca5f54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 05:15:01 +0000 Subject: [PATCH 022/338] agi: 3.0.1 -> 3.2.1 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index b9402e230670..13e8705f768c 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation rec { pname = "agi"; - version = "3.0.1"; + version = "3.2.1"; src = fetchzip { url = "https://github.com/google/agi/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-793lOJL1/wqETkWfiksnLY3Lmxx500fw4PIzT9ZQqQs="; + sha256 = "sha256-wguQERJ5Zvcodk7QMtloCwI4qYmatmHCFhgArbS07EA="; }; nativeBuildInputs = [ From 00cb2a10cc5cd07e4cd3a26d0741d66d7401d94f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 03:31:49 +0000 Subject: [PATCH 023/338] gama: 2.22 -> 2.23 --- pkgs/applications/science/geometry/gama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 9ca7cc10c77f..cdaeaf4fcc23 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jOyoWPcZvHWuddLasjIjHSn8MOV3viIgmBrsuzY7P6U="; + sha256 = "sha256-OKVAgmHdhQoS3kCwclE9ljON3H2NVCCvpR2hgwfqnA0="; }; buildInputs = [ expat ]; From d5f0439c6e93f89ff7e6987c64593538ccc00080 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Oct 2022 00:05:47 +0000 Subject: [PATCH 024/338] semver-tool: 3.3.0 -> 3.4.0 --- pkgs/development/tools/misc/semver-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix index 434fba18c592..a26c99171662 100644 --- a/pkgs/development/tools/misc/semver-tool/default.nix +++ b/pkgs/development/tools/misc/semver-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semver-tool"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "sha256-LqZTHFiis4BYL1bnJoeuW56wf8+o38Ygs++CV9CKNhM="; + sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y="; }; dontBuild = true; # otherwise we try to 'make' which fails. From 60f30ce2149b812d0ae5a33f87fc1ffdefddf44f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Oct 2022 08:35:02 +0000 Subject: [PATCH 025/338] kubevirt: 0.57.1 -> 0.58.0 --- pkgs/tools/virtualization/kubevirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index ebca61513362..47c75e930dc2 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "0.57.1"; + version = "0.58.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-b832NNAoLYiHfvAm2eWGa8Odlppj8hLKl7jQA09s+4k="; + sha256 = "sha256-SZ7NN93/lnN2DsNrxKEziiJsLDkFkaCbWMTcUWYiO+w="; }; vendorSha256 = null; From a7b8172046add8cd82c7624b8bfbe4fafe741801 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Oct 2022 21:40:58 +0000 Subject: [PATCH 026/338] surface-control: 0.4.3-1 -> 0.4.3-2 --- pkgs/applications/misc/surface-control/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index d8af8fe07c20..e4409d1ac760 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.3-1"; + version = "0.4.3-2"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bqrp/XS4OJIRW2ChHnf9gMh/TgCPUEb9fP2soeT1Qe4="; + sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4="; }; - cargoSha256 = "sha256-TWXK36cN8WuqfrMX7ybO2lnNiGnSKmfK6QGWMBM1y0o="; + cargoSha256 = "sha256-LPcN5xWOrl+MYVDKRIAlJoDepSSE9LTEN4fUS7bPS2U="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ udev ]; From c9e344912b5d0dae7184e3e228d95693d65f673d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 06:24:00 +0000 Subject: [PATCH 027/338] csound-manual: 6.17.0 -> 6.18.0 --- pkgs/applications/audio/csound/csound-manual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index 53c1340ba2a2..ffb4821d767d 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "csound-manual"; - version = "6.17.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "csound"; repo = "manual"; rev = version; - sha256 = "sha256-8X9Egn/MIwlNDEKUmEEz4Dnw6rGa37jRjYsVEt8ziW8="; + sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I="; }; prePatch = '' From c3df8b7855909c181b73b01107e0223c5d39889e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Oct 2022 12:07:07 +0000 Subject: [PATCH 028/338] dbmate: 1.15.0 -> 1.16.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 5acfd6ea9987..09c3fce04def 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-eBes5BqoR7K6ntCKjWECwWuoTwAodNtLqcTei5WocLU="; + sha256 = "sha256-6M7ruiBjvXO6LTdZNuGwUIVwa3QzdBQo0Y34UslCGAE="; }; - vendorSha256 = "sha256-U9VTS0rmLHxweFiIcFyoybHMBihy5ezloDC2iLc4IMc="; + vendorSha256 = "sha256-DwQUrNBfKZaVIpqI8yI/C9CQF5Ok/sApOrsLeIxt3hM="; doCheck = false; From b1c253feba8c73dd18be20653fffb7e542699df3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Oct 2022 22:03:09 +0000 Subject: [PATCH 029/338] nwg-launchers: 0.6.3 -> 0.7.1.1 --- pkgs/applications/misc/nwg-launchers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 24deebce1781..34600bb351ec 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.6.3"; + version = "0.7.1.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QWDYy0TBxoYxfRAOtAEVM8wsPUi2SnzMXsu38guAURU="; + sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM="; }; nativeBuildInputs = [ From 600a5eb28957b89a38a37f695b926f9ce65ea479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 18:57:47 +0000 Subject: [PATCH 030/338] irqbalance: 1.9.0 -> 1.9.2 --- pkgs/os-specific/linux/irqbalance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index d09b5f38f916..585c1661b8af 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "irqbalance"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "sha256-OifGlOUT/zFz5gussEmLL24w4AovGeyNfbg/yCfzerw="; + sha256 = "sha256-dk5gdDCXNELTlbZ34gUOVwPHvXF3N07v/ZqeNVfGTGw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 757fff82ba941ef513ca647e21a1d52d46285bae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 20:43:31 +0000 Subject: [PATCH 031/338] ibus-engines.table: 1.16.11 -> 1.16.13 --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index aa45805806e5..97beeadc4853 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.16.11"; + version = "1.16.13"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-lojHn6esoE5MLyPZ/U70+6o0X2D8EH+R69dgQo+59t4="; + sha256 = "sha256-hkSUmxBC7n2VTEVfI7rLgdo//xh0iZHxnAmjOayrJu0="; }; postPatch = '' From ae9790ebe658336d89feaea979053163983a56e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Nov 2022 14:41:15 +0000 Subject: [PATCH 032/338] remarkable-mouse: 7.0.3 -> 7.1.1 --- .../applications/misc/remarkable/remarkable-mouse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index d6ec124f7451..64baaf5d1b08 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "remarkable-mouse"; - version = "7.0.3"; + version = "7.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e6xJBZmWXAPOHNNUMOGLjbe3QmvW0SRwfMNJVZsM3gw="; + sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; From 3f6b17e9e2503b5a51d0a53c13264cbb703240bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Nov 2022 14:25:29 +0000 Subject: [PATCH 033/338] azure-storage-azcopy: 10.16.0 -> 10.16.2 --- pkgs/development/tools/azcopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c4572f9e1bf9..55c6a3475879 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.16.0"; + version = "10.16.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-FLrYovepVOE1NUB46Kc8z/l5o6IMFbJyY3smxPyuIsI="; + sha256 = "sha256-Pab4IYktNWWTudAY7Zx9dI+fRp0yihD78L0MmBHxeNY="; }; subPackages = [ "." ]; From 78898fa218991593988d5fb88de06ac22e4b6894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 17:16:20 +0000 Subject: [PATCH 034/338] elasticmq-server-bin: 1.3.9 -> 1.3.14 --- pkgs/servers/elasticmq-server-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 8fa65600e9ac..cdef822ee7d1 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -3,11 +3,11 @@ let elasticmq-server = stdenv.mkDerivation rec { pname = "elasticmq-server"; - version = "1.3.9"; + version = "1.3.14"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar"; - sha256 = "sha256-+l7QX/2HrcPuAJ3kHPAKx1yWtF5mkODzoFjYIPxc6oU="; + sha256 = "sha256-diTfRYV51d9QYx1E6ZbSSaM6qDIaqVPum9qsBagIcec="; }; # don't do anything? From acd4d5bae07250f672ffd8cfb63355519d707127 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Tue, 15 Nov 2022 22:56:19 +0100 Subject: [PATCH 035/338] clini: init at 0.1.0 --- pkgs/tools/misc/clini/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/misc/clini/default.nix diff --git a/pkgs/tools/misc/clini/default.nix b/pkgs/tools/misc/clini/default.nix new file mode 100644 index 000000000000..751cb3147026 --- /dev/null +++ b/pkgs/tools/misc/clini/default.nix @@ -0,0 +1,20 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "clini"; + version = "0.1.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo="; + }; + + cargoHash = "sha256-hOPj3c3WIISRqP/9Kpc/Yh9Z/wfAkHQ/731+BkWElIQ="; + + meta = with lib; { + description = "A simple tool to do basic modification of ini files"; + homepage = "https://github.com/domgreen/clini"; + license = licenses.mit; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a672f2e5a8..3326ed340bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3580,6 +3580,8 @@ with pkgs; changedetection-io = callPackage ../servers/web-apps/changedetection-io { }; + clini = callPackage ../tools/misc/clini { }; + clipster = callPackage ../tools/misc/clipster { }; clockify = callPackage ../applications/office/clockify { From c8e2d5bd74d37a893134e45f9e961ad3ef401a5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 05:13:35 +0000 Subject: [PATCH 036/338] ace: 7.0.8 -> 7.0.10 --- pkgs/development/libraries/ace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 612aa472b025..3de86d457269 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.8"; + version = "7.0.10"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-bZQKtNIdTzCbwE3T/fF7e/1CETG4S42Hq8S9RDxCZdw="; + sha256 = "sha256-G3H1MBGseD/G9kigS3r9TrwRk8TYi2KC1CueKhtlNzA="; }; enableParallelBuilding = true; From f988244e9fff4b8a5ed0e3e31c4e0e5664159298 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 12:29:39 +0000 Subject: [PATCH 037/338] flacon: 9.2.0 -> 9.5.1 --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 3a78e89717ab..98b9faf8d24a 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "9.2.0"; + version = "9.5.1"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-qnjWpsgCRAi09o9O7CBc0R9MN1EpXVmCoxB2npc9qpM="; + sha256 = "sha256-45aA2Ib69Gb1Mg/5907rp1nfRbNyQq12pm/aFwTdgeA="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From f26a48275eaa7f71722a2a0c0d5b7550c29bb17a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Nov 2022 08:45:46 +0000 Subject: [PATCH 038/338] kube-router: 1.5.1 -> 1.5.3 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2b88d1ddd24b..cb349e0c5634 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J/wQyrEEdBki8bq1Qesgu4Kqj2w33zzvEEOecFdiGak="; + sha256 = "sha256-aO72wvq31kue75IKfEByhKxUwSSGGmPLzHDBSvTChTM="; }; vendorSha256 = "sha256-+3uTIaXuiwbU0fUgn2th4RNDQ5gCDi3ntPMu92S+mXc="; From 512fafc446ded1ce304016979e5c1c4616b0cb02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 05:10:28 +0000 Subject: [PATCH 039/338] basex: 10.2 -> 10.4 --- pkgs/tools/text/xml/basex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 36d7dea4cea2..387e3735c7cd 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "10.2"; + version = "10.4"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-byx1gY/tzUmdi120tQzUywj9XroLyxYVMb4UilkChNk="; + hash = "sha256-lwPEy4VVe2D36T3t0vnEodL6L8/Q6adOTGqWI0m7YpM="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; From f4170e0ab28461d9884b27b9aef648edf498fc8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 06:37:06 +0000 Subject: [PATCH 040/338] commonsDaemon: 1.3.1 -> 1.3.3 --- pkgs/development/libraries/java/commons/daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index e41c475c829d..dbecabec2d51 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.3"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw="; + sha256 = "sha256-FVWmj20LiigRvfK82363Wy8/ie9+wlIlRx49AwQnhOA="; }; installPhase = '' From 45bc567937022fdf56959fd6c9b7c9f13dfcfd3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 20:40:41 +0000 Subject: [PATCH 041/338] qtstyleplugin-kvantum-qt4: 1.0.4 -> 1.0.7 --- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 09f0d05dd59d..b52837aa1705 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.4"; + version = "1.0.7"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk="; + hash = "sha256-Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; }; nativeBuildInputs = [ qmake4Hook ]; From bc42cb997fc98c29a0eea6af4951ed3a44ca761a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 23:28:51 +0000 Subject: [PATCH 042/338] rgbds: 0.6.0 -> 0.6.1 --- pkgs/development/compilers/rgbds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 955635d3f84c..b58f24c151aa 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "sha256-2nyjI6z6W959/Yc8EwdQVmGnG0PKwsndPLmeDlNpj18="; + sha256 = "sha256-3mx4yymrOQnP5aJCzPWl5G96WBxt1ixU6tdzhhOsF04="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; From 56172aec1a5354e5462f2c3a8777e368739ba697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 05:14:51 +0000 Subject: [PATCH 043/338] bctoolbox: 5.1.17 -> 5.2.0 --- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 2bc457cac18e..9091749db442 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.1.17"; + version = "5.2.0"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-p1rpFFMCYG/c35lqQT673j/Uicxe+PLhaktQfM6uF8Y="; + sha256 = "sha256-HbKo5E1K+W5tPqRbcG4+ymUXv87iqc094pTeng94Aao="; }; # Do not build static libraries From 69b683ad17c8f0860a67790b9accf30af4951de7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 16:02:54 +0000 Subject: [PATCH 044/338] cglm: 0.8.5 -> 0.8.8 --- pkgs/development/libraries/cglm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 5929c9dcbd3b..d21c0243bf3d 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.5"; + version = "0.8.8"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-PJHDZXc0DD/d+K/4uouv5F8gAf1sE5e3jLkGILPMpnI="; + sha256 = "sha256-BzZb8NDgf1NnkZaaxs+0YlVuYod/uiWJxA3geaYN7e0="; }; nativeBuildInputs = [ cmake ]; From 9d00dfc285fafffe2044590550b7c8e6c575bbb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 23:39:41 +0000 Subject: [PATCH 045/338] erlang-ls: 0.41.2 -> 0.46.1 --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index d35339ea0a8d..2a5ff4f3ed6d 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.41.2"; + version = "0.46.1"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -24,7 +24,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-LUgiQtK0OsdTmg1jEdxJ0x+39U3PXoFYsGlOv4l7/Ig="; + sha256 = "sha256-UiXnamLl6Brp+XOsoldeahNxJ9OKEUgSs1WLRmB9yL8="; rev = version; }; releaseType = "escript"; From 2c3439ef741cf13e341d72a36977551f23ea31a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Dec 2022 10:05:35 +0000 Subject: [PATCH 046/338] besu: 22.7.6 -> 22.10.3 --- pkgs/applications/blockchains/besu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 68ddcca4a138..7993887be65a 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "22.7.6"; + version = "22.10.3"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nlOIUvFv05uITEw0K+qtgT4zqySJBjTAHu49N9wdqJM="; + sha256 = "sha256-chP5RFqEoZbpSuGHfG/bHlHTe/sZYV2gLvUSHU9A44w="; }; nativeBuildInputs = [ makeWrapper ]; From 336925f7c4ad7a2f2f62279c6eaa3f69c3b02033 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 10 Nov 2022 16:44:09 +0100 Subject: [PATCH 047/338] amdvlk: 2022.Q3.5 -> 2022.Q4.4 --- pkgs/development/libraries/amdvlk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 0895698378d0..4fd87c69d71d 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q3.5"; + version = "2022.Q4.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "YY9/njuzGONqAtbM54OGGvC1V73JyL+IHkLSZs4JSYs="; + sha256 = "sha256-MKU7bfjrvH4M2kON2tr5463nYjN1xoGAknsC9YmklEc="; }; buildInputs = [ @@ -68,6 +68,7 @@ in stdenv.mkDerivation rec { xorg.libX11 xorg.libxcb xorg.libxshmfence + zlib ]; cmakeDir = "../drivers/xgl"; From 84463a443e3c74d61320395fe11d04b8c0e82fdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 03:14:14 +0000 Subject: [PATCH 048/338] trillian: 1.5.0 -> 1.5.1 --- pkgs/tools/misc/trillian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 4a76a3a0045d..c437369c91b3 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.5.0"; - vendorSha256 = "sha256-235uQK4E/GLl5XLBd6lkTIgWIjT9MZZGnyfZbOoTFo0="; + version = "1.5.1"; + vendorSha256 = "sha256-L2aZYwlJq9yVaaKgxa9NoqXTKD/pUq2OMiFftP364Kw="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XZHVGuIN+5mFbaxOprhdHlpgz2NE2NsJxGWJciDMUqI="; + sha256 = "sha256-v5feUTiK6ql0YcRR6RDAj+pS/PZ7vDnSf0ue2rtWb8k="; }; subPackages = [ From 6099bd12c3614a44b19f3d4ed1d20140abc4e76c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 08:04:25 +0000 Subject: [PATCH 049/338] vk-bootstrap: 0.5 -> 0.6 --- pkgs/development/libraries/vk-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix index 8b7ce6cd930a..ef76d6db9dbc 100644 --- a/pkgs/development/libraries/vk-bootstrap/default.nix +++ b/pkgs/development/libraries/vk-bootstrap/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "vk-bootstrap"; - version = "0.5"; + version = "0.6"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "charles-lunarg"; repo = "vk-bootstrap"; rev = "v${version}"; - sha256 = "sha256-rKyfUWfRYiVNzLWh6y44ASHW4j+yabY0kZTdZi8j2Dc="; + sha256 = "sha256-T24SCJSGta4yuK58NcQnMeiO3sg9P9/O3kaFJFO/eOE="; }; postPatch = '' From 0b7ec912c93e1aa0d8ce5377480a223c9b5b441c Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 20 Dec 2022 14:06:26 +0100 Subject: [PATCH 050/338] vulkan-cts: init at 1.3.4.1 --- pkgs/tools/graphics/vulkan-cts/default.nix | 147 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 149 insertions(+) create mode 100644 pkgs/tools/graphics/vulkan-cts/default.nix diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix new file mode 100644 index 000000000000..a5581e7d6f1d --- /dev/null +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -0,0 +1,147 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchurl +, cmake +, libdrm +, libglvnd +, libffi +, libpng +, libX11 +, libXau +, libXdmcp +, libxcb +, makeWrapper +, ninja +, pkg-config +, python3 +, vulkan-loader +, wayland +, wayland-protocols +, zlib +}: +let + renderdoc = fetchurl { + url = "https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h"; + hash = "sha256-57XwqlsbDq3GOhxiTAyn9a8TOqhX1qQnGw7z0L22ho4="; + }; + + # The build system expects all these dependencies inside the external folder and + # does not search for system-wide installations. + # It also expects the version specified in the repository, which can be incompatible + # with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages. + amber = fetchFromGitHub { + owner = "google"; + repo = "amber"; + rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed"; + hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA="; + }; + jsoncpp = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = "9059f5cad030ba11d37818847443a53918c327b1"; + hash = "sha256-m0tz8w8HbtDitx3Qkn3Rxj/XhASiJVkThdeBxIwv3WI="; + }; + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "22d39cd684d136a81778cc17a0226ffad40d1cee"; + hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw="; + }; + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0"; + hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0="; + }; + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468"; + hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc="; + }; + vulkan-docs = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Docs"; + rev = "135da3a538263ef0d194cab25e2bb091119bdc42"; + hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "vulkan-cts"; + version = "1.3.4.1"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "VK-GL-CTS"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g="; + }; + + outputs = [ "out" "lib" ]; + + prePatch = '' + mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs + + cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h + + cp -r ${amber} external/amber/src + cp -r ${jsoncpp} external/jsoncpp/src + cp -r ${glslang} external/glslang/src + cp -r ${spirv-tools} external/spirv-tools/src + cp -r ${spirv-headers} external/spirv-headers/src + cp -r ${vulkan-docs} external/vulkan-docs/src + chmod u+w -R external + ''; + + buildInputs = [ + libdrm + libffi + libglvnd + libpng + libX11 + libXau + libXdmcp + libxcb + spirv-headers + spirv-tools + wayland + wayland-protocols + zlib + ]; + + nativeBuildInputs = [ + cmake + glslang + makeWrapper + ninja + pkg-config + python3 + ]; + + # Fix cts cmake not coping with absolute install dirs + cmakeFlags = [ + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postInstall = '' + mv $out $lib + + mkdir -p $out/bin $out/archive-dir + cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ + cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/ + cp -a external/vulkancts/modules/vulkan/vk-default $out/ + + wrapProgram $out/bin/deqp-vk \ + --add-flags '--deqp-vk-library-path=${vulkan-loader}/lib/libvulkan.so' \ + --add-flags "--deqp-archive-dir=$out/archive-dir" + ''; + + meta = with lib; { + description = "Khronos Vulkan Conformance Tests"; + homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md"; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d58efc3c6ac..2ac88184d5a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22933,6 +22933,8 @@ with pkgs; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; + vulkan-cts = callPackage ../tools/graphics/vulkan-cts { }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; From 0df348ed0a446a3e29d10f1e84436250421818b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 02:10:29 +0000 Subject: [PATCH 051/338] zef: 0.14.2 -> 0.14.6 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 3af1b408b3d6..cfdeac264cbd 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.14.2"; + version = "0.14.6"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-+U9K6PRcWbs5JzlJudcpCCk3zHkqE8L1Sq/wkf68jyY="; + sha256 = "sha256-3FRzqHbzNhmYg3wRvajMzTWB7lOlgrxwQvvnB3fggGM="; }; nativeBuildInputs = [ makeWrapper ]; From 53b3a6bc4dd6b5931e6b9a4394574ee0b90d303a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 16:15:42 +0000 Subject: [PATCH 052/338] rssguard: 4.2.4 -> 4.2.7 --- pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index e94c981e489f..a5debadc8005 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.2.4"; + version = "4.2.7"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-6JRANTUbHyMAuA7lhAQtlgJIW6l39XNUtKQMVN6FHJU="; + sha256 = "sha256-X5hZspl9IekhC8XXpZS285cmVZek2oxIV3tYOz/ZBec="; }; buildInputs = [ qtwebengine qttools ]; From f47b9eeceba06cc601a1468924b65a70479425cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 16:45:33 +0000 Subject: [PATCH 053/338] phockup: 1.7.1 -> 1.9.2 --- pkgs/applications/misc/phockup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/phockup/default.nix b/pkgs/applications/misc/phockup/default.nix index f93c2b78c4a1..7db0690da891 100644 --- a/pkgs/applications/misc/phockup/default.nix +++ b/pkgs/applications/misc/phockup/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "phockup"; - version = "1.7.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ivandokov"; repo = "phockup"; rev = version; - sha256 = "sha256-Ho9aZjBvSwFMur2NubhP4olPN31SNTEdQGCUV7nX0uE="; + sha256 = "sha256-ge34Iv/+B0xdrSNc7w3nZJw0DHBUvuh2k/I8v/RRg10="; }; nativeBuildInputs = [ makeWrapper ]; From ca014f24e29bf8a6329784798a9ade4d05bf2619 Mon Sep 17 00:00:00 2001 From: NomisIV Date: Fri, 30 Dec 2022 10:11:38 +0100 Subject: [PATCH 054/338] gtk-layer-shell: 0.7.0 -> 0.8.0 --- pkgs/development/libraries/gtk-layer-shell/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index ba7950d72561..92a126bd7e8f 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -9,11 +9,12 @@ , wayland , gtk3 , gobject-introspection +, vala }: stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.7.0"; + version = "0.8.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "sha256-0S1WBpxXpWoMOecJQS6FKEXRZdw4E5hrjURPyhkxiMc="; + sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + vala ]; buildInputs = [ From 056d990d4755c71152cc8756efa0b6ac85229ae1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 23:13:59 +0100 Subject: [PATCH 055/338] python310Packages.gassist-text: init at 0.0.7 --- .../python-modules/gassist-text/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/gassist-text/default.nix diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix new file mode 100644 index 000000000000..7abff1aee252 --- /dev/null +++ b/pkgs/development/python-modules/gassist-text/default.nix @@ -0,0 +1,55 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, google-auth +, grpcio +, protobuf +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "gassist-text"; + version = "0.0.7"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tronikos"; + repo = "gassist_text"; + rev = "refs/tags/${version}"; + hash = "sha256-NLktSHiZK0AmXbET8cVVYM8QfPuet7HwTZC+6oVtxAs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + google-auth + grpcio + protobuf + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gassist_text" + ]; + + meta = with lib; { + description = "Module for interacting with Google Assistant API via text"; + homepage = "https://github.com/tronikos/gassist_text"; + changelog = "https://github.com/tronikos/gassist_text/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c07ff886535e..129e76005154 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3620,6 +3620,8 @@ self: super: with self; { garminconnect = callPackage ../development/python-modules/garminconnect { }; + gassist-text = callPackage ../development/python-modules/gassist-text { }; + gast = callPackage ../development/python-modules/gast { }; gatt = callPackage ../development/python-modules/gatt { }; From 7fa675ecd2ea086ddf0218433855ea7df5e1dd71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Jan 2023 20:47:34 +0100 Subject: [PATCH 056/338] home-assistant: update component-packages --- 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 dee4a13077ac..941855477590 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1233,8 +1233,9 @@ "google_assistant_sdk" = ps: with ps; [ aiohttp-cors fnvhash + gassist-text sqlalchemy - ]; # missing inputs: gassist-text + ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -4310,6 +4311,7 @@ "goodwe" "google" "google_assistant" + "google_assistant_sdk" "google_domains" "google_pubsub" "google_sheets" From b8a81fd742e777e9de0cf116f9481440c20a9ec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 13:53:45 +0000 Subject: [PATCH 057/338] pluto: 5.11.0 -> 5.12.0 --- pkgs/applications/networking/cluster/pluto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 8fc55abe9282..c9af58b1a8a8 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-eyJ81i9kTuojBuo/rwfgnl3BRpiTnKst0SnL+oWfSWQ="; + sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; }; - vendorSha256 = "sha256-QH/mKq7QydYvUHZIPjoBWy015Sghh30VdEWu76KZdPE="; + vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; ldflags = [ "-w" "-s" From 7001c5c07d086f1b356e77ad4958a61ed8b59692 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 18:10:37 +0000 Subject: [PATCH 058/338] kronosnet: 1.23 -> 1.25 --- pkgs/development/libraries/kronosnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix index fb9c5c57eca1..7fb8520348a2 100644 --- a/pkgs/development/libraries/kronosnet/default.nix +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.23"; + version = "1.25"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uQXV5tOLsBPFzfFHqwV1Oz4+KwZMkdjO8zfIljV+ro="; + sha256 = "sha256-NEmkgKTm+R4lzqjbQTyQ6TDpjoTQtMKiTpzn25HUfYk="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; From e1fbea009d8ba5915c58067acc4fb3121564cf17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 22:16:52 +0000 Subject: [PATCH 059/338] faudio: 22.08 -> 23.01 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index bd179c6ee739..b658cece4d8a 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "22.08"; + version = "23.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-ZGyLP7dsVDKPCGA/6MNSEifd1rOcYqLdcEXYIQxrgtE="; + sha256 = "sha256-/XfwQUkhn82vAKa7ZyiPbD4c7XJhCIncxvWkj/m2P0M="; }; nativeBuildInputs = [cmake]; From 0f5cf127fd8a7ceed19fa3591516d24361983b77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 21:18:12 +0000 Subject: [PATCH 060/338] orcania: 2.3.0 -> 2.3.2 --- pkgs/development/libraries/orcania/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index abe45b63372f..9acffa9285ca 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; + sha256 = "sha256-xF6QIXfsI+6WqshcG74/J98MgjSkYjRkTW64zeH6DDY="; }; nativeBuildInputs = [ cmake ]; From 751b9063a7b865defeafcc13cff7ef2758e1a678 Mon Sep 17 00:00:00 2001 From: Robert Obryk Date: Sat, 3 Dec 2022 22:48:44 +0100 Subject: [PATCH 061/338] nixos/restic: assert that repository name is specified --- nixos/modules/services/backup/restic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 869ed5d9976c..2b4188492e58 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -270,6 +270,10 @@ in config = { warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups); + assertions = mapAttrsToList (n: v: { + assertion = (v.repository == null) != (v.repositoryFile == null); + message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set"; + }) config.services.restic.backups; systemd.services = mapAttrs' (name: backup: From 2a46ef4fff95d3ac23b65a97a1c9be54cca3ddb4 Mon Sep 17 00:00:00 2001 From: Robert Obryk Date: Sun, 4 Dec 2022 19:42:58 +0100 Subject: [PATCH 062/338] nixos/tests/restic: test that restoring works This commit also moves the indicator files out of the directory that's being backed up, so that the directory remains static throughout the backup operation. --- nixos/tests/restic.nix | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 3681c4cf190e..0a4fc4c6455b 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -7,15 +7,24 @@ import ./make-test-python.nix ( rcloneRepository = "rclone:local:/tmp/restic-rclone-backup"; backupPrepareCommand = '' - touch /opt/backupPrepareCommand - test ! -e /opt/backupCleanupCommand + touch /tmp/backupPrepareCommand + test ! -e /tmp/backupCleanupCommand ''; backupCleanupCommand = '' - rm /opt/backupPrepareCommand - touch /opt/backupCleanupCommand + rm /tmp/backupPrepareCommand + touch /tmp/backupCleanupCommand ''; + testDir = pkgs.stdenvNoCC.mkDerivation { + name = "test-files-to-backup"; + unpackPhase = "true"; + installPhase = '' + mkdir $out + touch $out/some_file + ''; + }; + passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}"; paths = [ "/opt" ]; pruneOpts = [ @@ -94,16 +103,20 @@ import ./make-test-python.nix ( ) server.succeed( # set up - "mkdir -p /opt", - "touch /opt/some_file", + "cp -rT ${testDir} /opt", "mkdir -p /tmp/restic-rclone-backup", # test that remotebackup runs custom commands and produces a snapshot "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + # test that restoring that snapshot produces the same directory + "mkdir /tmp/restore-1", + "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-1", + "diff -ru ${testDir} /tmp/restore-1/opt", + # test that remote-from-file-backup produces a snapshot "systemctl start restic-backups-remote-from-file-backup.service", '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', @@ -120,27 +133,27 @@ import ./make-test-python.nix ( # test that we can create four snapshots in remotebackup and rclonebackup "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', From 9dbdb059245ccdb8e7e8161c6a37301a5397ef6d Mon Sep 17 00:00:00 2001 From: Robert Obryk Date: Sun, 4 Dec 2022 00:00:58 +0100 Subject: [PATCH 063/338] nixos/restic: add exclude parameter This provides an easy way to specify exclude patterns in config. It was already possible via extraBackupOptions; this change creates a simpler, similar to other backup services, way to specify them. --- nixos/modules/services/backup/restic.nix | 19 ++++++++++++++++++- nixos/tests/restic.nix | 8 +++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 2b4188492e58..66bfc7abdb3a 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -126,6 +126,21 @@ in ]; }; + exclude = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc '' + Patterns to exclude when backing up. See + https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files for + details on syntax. + ''; + example = [ + "/var/cache" + "/home/*/.cache" + ".git" + ]; + }; + timerConfig = mkOption { type = types.attrsOf unitOption; default = { @@ -249,6 +264,7 @@ in example = { localbackup = { paths = [ "/home" ]; + exclude = [ "/home/*/.cache" ]; repository = "/mnt/backup-hdd"; passwordFile = "/etc/nixos/secrets/restic-password"; initialize = true; @@ -280,6 +296,7 @@ in let extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; resticCmd = "${backup.package}/bin/restic${extraOptions}"; + excludeFlags = if (backup.exclude != []) then ["--exclude-file=${pkgs.writeText "exclude-patterns" (concatStringsSep "\n" backup.exclude)}"] else []; filesFromTmpFile = "/run/restic-backups-${name}/includes"; backupPaths = if (backup.dynamicFilesFrom == null) @@ -315,7 +332,7 @@ in restartIfChanged = false; serviceConfig = { Type = "oneshot"; - ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ]) + ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ]) ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 0a4fc4c6455b..42af0783863e 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -27,6 +27,7 @@ import ./make-test-python.nix ( passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}"; paths = [ "/opt" ]; + exclude = [ "/opt/excluded_file_*" ]; pruneOpts = [ "--keep-daily 2" "--keep-weekly 1" @@ -47,17 +48,17 @@ import ./make-test-python.nix ( { services.restic.backups = { remotebackup = { - inherit passwordFile paths pruneOpts backupPrepareCommand backupCleanupCommand; + inherit passwordFile paths exclude pruneOpts backupPrepareCommand backupCleanupCommand; repository = remoteRepository; initialize = true; }; remote-from-file-backup = { - inherit passwordFile paths pruneOpts; + inherit passwordFile paths exclude pruneOpts; initialize = true; repositoryFile = pkgs.writeText "repositoryFile" remoteFromFileRepository; }; rclonebackup = { - inherit passwordFile paths pruneOpts; + inherit passwordFile paths exclude pruneOpts; initialize = true; repository = rcloneRepository; rcloneConfig = { @@ -104,6 +105,7 @@ import ./make-test-python.nix ( server.succeed( # set up "cp -rT ${testDir} /opt", + "touch /opt/excluded_file_1 /opt/excluded_file_2", "mkdir -p /tmp/restic-rclone-backup", # test that remotebackup runs custom commands and produces a snapshot From 5ebf548b742be55dcc7e157e492d501e3984dac5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 23:23:32 +0000 Subject: [PATCH 064/338] sickgear: 0.25.47 -> 0.25.60 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 8a092447c001..dbfe0f22bfa9 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.47"; + version = "0.25.60"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-CnAJ2qpE+k8TvBD06WbZWOvlF740Xgx/Q0JWf3rJcWI="; + sha256 = "sha256-5I6hJgUN2BdHc80RrcmWWxdq0iz6rcO4aX16CDtwu/g="; }; patches = [ From 0a2917831f403e1ce3cda9995ee8b58fab829fe3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 22:32:42 +0000 Subject: [PATCH 065/338] featherpad: 1.3.1 -> 1.3.5 --- pkgs/applications/editors/featherpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dc00e09b9743..b7cca4ff3ec9 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-OLipBhSrXf9lLpSYLwjjOv5AYJDt46MlnEW4YetXZjI="; + sha256 = "sha256-deQDLcymci8x9QvVOfNwroZPvifovxV6+jT9Grl3sxA="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; From aff371a6db958bf096e65a0467213aa37c15ae31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 23:40:53 +0000 Subject: [PATCH 066/338] hyperrogue: 12.1a -> 12.1h --- pkgs/games/hyperrogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 2370b008225b..f8f0d55fb9c3 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1a"; + version = "12.1h"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-VmWZkIjDy/yv0g9YCW9x8b0LE5guHIA/KZc3OXJoCdA="; + sha256 = "sha256-9ChPO0YCsrAyQ81TAbKCMJSgSXoUtkvvNPMTPimPBUo="; }; CXXFLAGS = [ From f400af6df1e9d65b15e9b9a357517618baf6c1f2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Jan 2023 22:40:42 +0100 Subject: [PATCH 067/338] google-cloud-sdk: deprecate phases --- pkgs/tools/admin/google-cloud-sdk/components.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index 4a57b99e2bae..72d293de211a 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -97,7 +97,7 @@ let in mkComponent { - name = component.id; + pname = component.id; version = component.version.version_string; src = if lib.hasAttrByPath [ "data" "source" ] component @@ -120,7 +120,7 @@ let # Make a google-cloud-sdk component mkComponent = - { name + { pname , version # Source tarball, if any , src ? "" @@ -135,7 +135,7 @@ let # The snapshot corresponding to this component , snapshot }: stdenv.mkDerivation { - inherit name version snapshot; + inherit pname version snapshot; src = if src != "" then builtins.fetchurl @@ -143,7 +143,7 @@ let url = src; inherit sha256; } else ""; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install @@ -159,7 +159,7 @@ let fi # Write the snapshot file to the `.install` folder - cp $snapshotPath $out/google-cloud-sdk/.install/${name}.snapshot.json + cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json ''; passthru = { dependencies = filterForSystem dependencies; From 5a89f1480c641ac5c3c9662c32daa8eb5f6e6db2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Jan 2023 11:52:35 +0100 Subject: [PATCH 068/338] python310Packages.gassist-text: 0.0.7 -> 0.0.10 Diff: https://github.com/tronikos/gassist_text/compare/refs/tags/0.0.7...0.0.10 Changelog: https://github.com/tronikos/gassist_text/releases/tag/0.0.10 --- pkgs/development/python-modules/gassist-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix index 7abff1aee252..b413c19d4093 100644 --- a/pkgs/development/python-modules/gassist-text/default.nix +++ b/pkgs/development/python-modules/gassist-text/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gassist-text"; - version = "0.0.7"; + version = "0.0.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "gassist_text"; rev = "refs/tags/${version}"; - hash = "sha256-NLktSHiZK0AmXbET8cVVYM8QfPuet7HwTZC+6oVtxAs="; + hash = "sha256-BSMflCSYNAaQVTOqKWyr9U9Q70ley1jjF6ndOVum+GA="; }; nativeBuildInputs = [ From 8b427b92778ba196ef41a4675df42249f2ff5511 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 13:27:13 +0000 Subject: [PATCH 069/338] nwg-drawer: 0.3.0 -> 0.3.7 --- pkgs/applications/misc/nwg-drawer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index ff0127c106e7..2bb14c1b2988 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.0"; + version = "0.3.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o69ZCtIT0jh4QnlspiAh58aA61aFkkKu0FdmscHLMIk="; + sha256 = "sha256-OcOF43SOlseb6UGTxLtGH0MRokZob0x+cczpdJc8Hq4="; }; - vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; + vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From c9960f6b5b9d61b4e58ce05ad5106af8580cdcab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 02:17:21 +0000 Subject: [PATCH 070/338] igprof: 5.9.16 -> 5.9.18 --- pkgs/development/tools/misc/igprof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix index 91d78d0f5fdc..a4e170f31b2a 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: stdenv.mkDerivation rec { - version = "5.9.16"; + version = "5.9.18"; pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; repo = "igprof"; rev = "v${version}"; - sha256 = "0rx3mv8zdh9bmcpfbzkib3d52skzfr8600gh5gv21wcsh50jnifx"; + sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; }; postPatch = '' From 37d4c2c752f8149dbb48a20e3e4bc15b30fd79ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 04:08:40 +0000 Subject: [PATCH 071/338] smartdns: 37.1 -> 40 --- pkgs/tools/networking/smartdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index e9259724241d..d02a1ccac11e 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "37.1"; + version = "40"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-fj9NA8HLF/FdYNoS2g9KKDvqr3m41P+VU0eiVm7ku8A="; + sha256 = "sha256-Un4LUBWVwbWYK4rZY2+gdk6Zi+n36Xawma8Dok2Sa0U="; }; buildInputs = [ openssl ]; From adaa5289673eea472d9c9ced26f09f6d79fbde75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 07:31:19 +0000 Subject: [PATCH 072/338] codeql: 2.11.0 -> 2.12.0 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 27f758f39b5a..ec333520ca54 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.11.0"; + version = "2.12.0"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-nY31/coUnBNkKg10SOd64sBBkV44g+eIXyKIrPq1IWU="; + sha256 = "sha256-V+UXodw84NGZPi3Ws4hKyftqnGibn9uFgrkGXxpRAZc="; }; nativeBuildInputs = [ From f30f496d9250dd90ac81ddd0e7292fb2df38a720 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 07:40:54 +0000 Subject: [PATCH 073/338] consul-template: 0.29.4 -> 0.30.0 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index d923f74a7ff0..7e8e242d7bd1 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.29.4"; + version = "0.30.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-jFj5iVUS7qpH4Aq35KS8IDKA7PzGgire+flBpkCgwuA="; + sha256 = "sha256-Q2mNMgGnwyYXVsmP6cVVlGEs2fHUZKwrWepmmQXmNLo="; }; - vendorSha256 = "sha256-GKohljwH4/kBPoI3/RfxYsvzISv1WmVAo96sjKJrnHk="; + vendorHash = "sha256-75IFVVd4L70kEV5L7Ub9RpR9LMhkz3fB4b5eAYwkPPk="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 713988a1db329ef18fa426e88666df13e26d7356 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Jan 2023 10:55:02 +0100 Subject: [PATCH 074/338] python310Packages.pyahocorasick: add changelog to meta --- pkgs/development/python-modules/pyahocorasick/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index fd2c6de2c25c..98f42b62e08d 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WojciechMula"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk="; }; @@ -36,6 +36,7 @@ buildPythonPackage rec { key strings occurrences at once in some input text. ''; homepage = "https://github.com/WojciechMula/pyahocorasick"; + changelog = "https://github.com/WojciechMula/pyahocorasick/blob/${version}/CHANGELOG.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; From 6a23c1aac46283b58f138343228ba05505c66012 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Jan 2023 10:55:45 +0100 Subject: [PATCH 075/338] python310Packages.pyahocorasick: 2.0.0b1 -> 2.0.0 Diff: https://github.com/WojciechMula/pyahocorasick/compare/refs/tags/2.0.0b1...2.0.0 Changelog: https://github.com/WojciechMula/pyahocorasick/blob/2.0.0/CHANGELOG.rst --- pkgs/development/python-modules/pyahocorasick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index 98f42b62e08d..9717adc5231d 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyahocorasick"; - version = "2.0.0b1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "WojciechMula"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk="; + hash = "sha256-Ugl7gHyubXpxe4aots2e9stLuQAZEWsrlDuAHdSC0SA="; }; checkInputs = [ From c2dc3100be320541b05c08e4485227da0e767938 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sun, 15 Jan 2023 15:17:29 +0100 Subject: [PATCH 076/338] blflash: 0.3.3 -> 0.3.5 --- pkgs/tools/misc/blflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/blflash/default.nix b/pkgs/tools/misc/blflash/default.nix index d8c1aec35a0c..8cb5d6fcba11 100644 --- a/pkgs/tools/misc/blflash/default.nix +++ b/pkgs/tools/misc/blflash/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "blflash"; - version = "0.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = "spacemeowx2"; repo = "blflash"; rev = "v${version}"; - sha256 = "sha256-hPScmivtugtZm848Itzg4Tb9rppZny+rKi3IBuUxxQY="; + sha256 = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; }; - cargoSha256 = "sha256-/y3R8B2TOf8jeB9tcewoA9EGN6kj/EPMTjU6rfTF5Vc="; + cargoSha256 = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; meta = with lib; { description = "An bl602 serial flasher written in Rust"; From 8efb217f88c49b66b85458df261f8cd089baaaf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 02:10:52 +0000 Subject: [PATCH 077/338] typos: 1.13.6 -> 1.13.7 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 78ad7429452f..a1d6044871cf 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.6"; + version = "1.13.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-aaKjtxy0SVZB9/dcARmDkiiPM8XzwFHYqEctY3kfPWg="; + hash = "sha256-9adccECtWty9GURjzUd6sPYn8qojGWzCrDIpUxswx4k="; }; - cargoHash = "sha256-tTArwBfxzbX6FJiOsAuyT6HRbdelp1txcmcDszACfn8="; + cargoHash = "sha256-5hg+w2IZOI6d06H7sAokO0v4b6ofxvak64v3he5n4LI="; meta = with lib; { description = "Source code spell checker"; From 35d1b354425fed266e986313d4ecd32573785119 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 02:56:27 +0000 Subject: [PATCH 078/338] iosevka-bin: 17.0.2 -> 17.0.4 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 5d55dfbac88b..262bdcfbcf06 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "17.0.2"; + version = "17.0.4"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index c2b4f0268f86..91b1af2de8ea 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "004vj7r84kansfvdh0d7qmp9xdsrbw4x0iqa8k37pvg0czzvzz14"; - iosevka-aile = "0mm9y56z6rlfj1w3giql4n12190i95rizd182id9jgjiap75nqdi"; - iosevka-curly = "0z3hd4wbpz4r1njdprafad8jlq77scwjyy60j6nb900bid0s130b"; - iosevka-curly-slab = "1v3wrydar72l3nrnjajlrqkz3brqwc5g8vsix1c2acw7k8pj4adq"; - iosevka-etoile = "04vlvi5dzfpz6qvkv8r4ba0zp36bwdxqyspf7za8a1cqpwg6dhv1"; - iosevka-slab = "0b7n3rvf6irp4scpm5g9pr5ikik2q7mkw35qdy63wq0d7vy7k67m"; - iosevka-ss01 = "0xa0hrn6hjzj094xs1wilp9csb3i3yfpngfw9g9p59wnsphq12k7"; - iosevka-ss02 = "00ygpybyq5qa1fva5d5lbmpl34cf6w18kba958rjzydc5zj4hfk1"; - iosevka-ss03 = "1l2s01a32mblgmd7c6n11nwk9fxh7iflba6da9wb9rszwj9kh7fb"; - iosevka-ss04 = "1pqvclbhw8nrlaasi03l3mjmg8sh48fhh6fl1ngmsc86k15ym8xy"; - iosevka-ss05 = "1vg827f694kx841fnsjkmwvs4nbcy9jpbxfr6cbjmhr9g9hp8qis"; - iosevka-ss06 = "1zkndj11ld5crkkyf8pbn6bd8xigm4mvs9h0mb15hqym09phsvbf"; - iosevka-ss07 = "0ssalch56zkdr7q97s215iwjsiny0a4svjp5qij0w0w9vfh1c8q4"; - iosevka-ss08 = "0i1v47ji7wn13vmad9jkskislqg1zgi3vsk2fjygx8z9b39svs1h"; - iosevka-ss09 = "1bk9lr4zafj97p53pdqryi01malijniqhn9mkz984m0z7fnyh35j"; - iosevka-ss10 = "1rqmak3bwmj32s9s85ipxfyplcxqljj1z8p1s3i6l8njqfx9hmv9"; - iosevka-ss11 = "0d13sgam6kpw0pp0g0ibhi7ji63yijfjgrid32fs99i7l636f7y0"; - iosevka-ss12 = "1ya76hfizg56ryfmf12lmb9wivdhx8wps55m3mryldaqw3ys5fh5"; - iosevka-ss13 = "0gdz4g9l2p4ah5ms2nhnwz14h8bvw1mszxzjj6v474za2py989dh"; - iosevka-ss14 = "14l6vk0yzk4c2gk28s30ys9k26ic3p9sywbbwinzm7y67knqsc2b"; - iosevka-ss15 = "1vpx2ksdjmlp37difs12b4cs25x73v5qlqzjvck2z9ikbgf9drn7"; - iosevka-ss16 = "088zf8q75v4qgpdinlf80rfkblviwxk94kzf0qa7zsk1hg9xmb59"; - iosevka-ss17 = "0wz5z58aalk4xp9xhcq3xrm6mf2l28gp5qydxgajgzz7lh405znh"; - iosevka-ss18 = "12r294lrwy1a663dzfs0hxsg113v127365nwb2wn5q7jksmaxxd6"; - sgr-iosevka = "13fy2vyslhrikf9vf668754gdqfz1dyqfx9kk0r5yzi0g6ysvdkx"; - sgr-iosevka-aile = "0qjyag5axpcfqng6cqv4j0fh0a6f0v834iwhf8zx7qgh1h6j1vvy"; - sgr-iosevka-curly = "1gvi7clwyl24dyrmrcb2i4n96p9rqhxxl6cvl1bdv9v6qi9y65lc"; - sgr-iosevka-curly-slab = "10ha1h64w2189azpszdg328c0p1nfg8r9rwrk1qxs7cv7mkmr5fj"; - sgr-iosevka-etoile = "0yd95kn3ickra7ssb62m8c61c8aarxkljcxk9j470rf679fsj3rp"; - sgr-iosevka-fixed = "00qiswcfhqf1jsw4xwbqdpaq2jhxvkcdq5vhjg26q97nv5hdqk9w"; - sgr-iosevka-fixed-curly = "1bqcsqysxf3x5g5970hgsazy0qgdkqhjdh1pqknqng2r8awrpi45"; - sgr-iosevka-fixed-curly-slab = "1jcxc19q83k7rxcsyg99ahg267i7q86kf9kxzb06bj48f52ypkd3"; - sgr-iosevka-fixed-slab = "1dgjqn7pniq45f5m2sqj47nmdmrgkk2g1860f262b48aydh3lfnh"; - sgr-iosevka-fixed-ss01 = "0g9jwlc616b52r9wakpdi61ny79vr64zg2cch5jrvsn03gkp47jv"; - sgr-iosevka-fixed-ss02 = "0lvc2m8cwrfsp1lnnl3fshqj6xskv0gdj4xr3m16axkwa60h2qcb"; - sgr-iosevka-fixed-ss03 = "0fhsrmbvwwnrg3jicark56r0zirnq5yp1lg2xaznx8wmw08221z5"; - sgr-iosevka-fixed-ss04 = "0wy4mja82xrxwfmdpkmil9d8q6681a8dj44wb3h8hvybd40qm8xf"; - sgr-iosevka-fixed-ss05 = "1rhilqnw3kay2mgjmjzxaappgyz3rib4gq142j717m0scbd7c5dw"; - sgr-iosevka-fixed-ss06 = "0ci3sfy39850zks4glnlr7ml40akhh290rz43s4qd7lcpsyiqaw8"; - sgr-iosevka-fixed-ss07 = "1i0r4sb9jpipp08cw43n8ajskfyzk5yz2d08h4z0bfd4k8ap9vd0"; - sgr-iosevka-fixed-ss08 = "1jgqdr09gpv2rysi8yj3p6wc79xhx81hncaim3vmj32gkv3pqpbx"; - sgr-iosevka-fixed-ss09 = "1m9085hmpljn3pfnxjc3h2q0agkidqdi5b2dl744xs9p1nzm7y9c"; - sgr-iosevka-fixed-ss10 = "03j0bv0yfd15jjc2ssffsbhq7vcg38prxycvzh1nbc9g0rl3ji24"; - sgr-iosevka-fixed-ss11 = "0kgjjnsihycxyqlgc4zngfqiynqp8agnic7mydni8mqwl1jxaw17"; - sgr-iosevka-fixed-ss12 = "0v0gva1v3q9xhvzyv1qlggb0dy96a9fm2vm682jj913j925mh23m"; - sgr-iosevka-fixed-ss13 = "06jd2lggi8i9lmaqjhss837wplaypc60k8fnjall16wzdg3an8di"; - sgr-iosevka-fixed-ss14 = "1qvdyran2c56wrzwnz5l42ld1iy6y7bvadw3mgrjfi01xfs43ncb"; - sgr-iosevka-fixed-ss15 = "06kpf9fzvq8flvn2fw6cg5n9c629qnwpxh8vx0z9bqn29kqvf0d1"; - sgr-iosevka-fixed-ss16 = "0sdm5h1zbr812pa2i1c8qz1a884pcdcng47xyk7li5v1y2gznmij"; - sgr-iosevka-fixed-ss17 = "109d2cl2cs8wzqq2g9sjcfbxl8x2zl4pssh3jsns8n2yx63lmkxf"; - sgr-iosevka-fixed-ss18 = "1pjy2zb0qgjqy11mbj4ia8pdxm8h888ifwsjyjy0zm9q6v8y5xcb"; - sgr-iosevka-slab = "0vak6d76ignsik1561s8dm1r4pqn02w32vavls668mjg3i051llq"; - sgr-iosevka-ss01 = "0p195gvj4ljjw4difg78hq139l5hmpk4jbjm8pzfrxmn643z0yi4"; - sgr-iosevka-ss02 = "01llc2hykx7i7r9bp7gcc650iw9ry5c17s2ap06j0vv7gz0a47h5"; - sgr-iosevka-ss03 = "0m208v1mdxm2w5c92cijpvbcqh4hxg2mchghwchq9kyk00b1ld2d"; - sgr-iosevka-ss04 = "15x7i8pxy5i512whh6464x4l72qygvrd0rs1y3y1kbavp1scb5ck"; - sgr-iosevka-ss05 = "1xqxc66nfb5n38hyr8s3r7yrm4v27ymr8mfkqp10jnpyyi47mwg5"; - sgr-iosevka-ss06 = "1wskdfz3y24ia402b0mn34393w9nbjszqryg7x8ka1c4fjvccwdn"; - sgr-iosevka-ss07 = "09ahix65wcspjmsjnw9f7mad8pl7m9yl4kzlh2awv3ag448cgj3s"; - sgr-iosevka-ss08 = "03g23ni2jqvwjbibhpbn6i2ddc3yr5znvxhinwgag45vrjfr629m"; - sgr-iosevka-ss09 = "0n1vi5r5yjxrrdx0w5ab1hd31dwzrg9n8cp6gcj1d532mk6y7y74"; - sgr-iosevka-ss10 = "034ai6djsw32jd0y037svfp2mlrsg99gwxl9awjvip219n6gqly2"; - sgr-iosevka-ss11 = "1ngkjmgiq99p51ar2hff8xf27xq18m32wrw2igk8mr58r35xzkpi"; - sgr-iosevka-ss12 = "1wdh48px6ywj990nm45w8nmllvl9f8k9pj2jf5frfrr9qshvzsmz"; - sgr-iosevka-ss13 = "0wh2dq3crpdx002wv6lzznirx7bvgkl04x429nzfvkkwp28y2jj9"; - sgr-iosevka-ss14 = "05w3bl8kxj9qgm2vqhl93bz0zyhkdhbsmxh82fwl74mxs530sjpj"; - sgr-iosevka-ss15 = "09xf5xlzz4d4whw4blwa9hlyij0kfihi8q3q448p40r116kvl2zy"; - sgr-iosevka-ss16 = "1d6jfaxz8ivn3a7zsk408z0hr9rjh2gv93zqq41a191zpgd7zj3g"; - sgr-iosevka-ss17 = "12x3nlcq89c6ldq70bi5w418iqwmb2i8jq7csh9cg7ghbl4bmr9x"; - sgr-iosevka-ss18 = "0z9pg0y56ix679br1zdfmqsf9an704gb1gf420mypkr9dyf2yh50"; - sgr-iosevka-term = "1ry11xwl715lpiy6psh4l4bwjsf5f14igrv6wzag60xk0ip91qgv"; - sgr-iosevka-term-curly = "0jkblgqmpixh4qjr96sjv6mag1faak2yz7251g63x4gbf2sbahlq"; - sgr-iosevka-term-curly-slab = "1yjcy6y31nyilkxmid6laxwsrmf61akgsaz5ybjy20vhhkylj1hj"; - sgr-iosevka-term-slab = "1cxv8qh4mjs0xl0v3ckgz916dir3n4wvmibhv161valvd5cswrci"; - sgr-iosevka-term-ss01 = "0i6qkxwgbq2iz4gzqcfi5jdnw7rdrasdh5cmbah72fxrxmwbwxrx"; - sgr-iosevka-term-ss02 = "13hgq4airgimi26c2bi54m6405w7gi3pl3i76nxr009vkia50nsk"; - sgr-iosevka-term-ss03 = "1n0f4kmnaibsf7ss34shc1yhdjsfsia76qycpsl2jhhq3531z080"; - sgr-iosevka-term-ss04 = "11fq16w1h4ajzs24qx6ng0nnh0c0pbqa9m75bavn47vjhl10d1v9"; - sgr-iosevka-term-ss05 = "1ym9hq8hk687b4ahg2dq1hp7gb7xjxnak12ijsppzsgp42dmjbjl"; - sgr-iosevka-term-ss06 = "1zc70ywxzk2m69rrmcah8kq994j9y40bhm0wnb9cbl45zkgacms1"; - sgr-iosevka-term-ss07 = "03cd38wnjmqkm93v23ga4yd03w5l58yb8ipw1pi9s8i7vicicvb5"; - sgr-iosevka-term-ss08 = "0226qnp4nabsynd7nxvis237vm31785k7msh2vpxnmbl8m2h54b6"; - sgr-iosevka-term-ss09 = "1c63qiiz8pw49x7xjfxbnm36isc486bk9d19zbfhylchbd0yfbxx"; - sgr-iosevka-term-ss10 = "1pl3b935mbdf126m0bjq17wfy80rdcvq3zmh13w2hb8pmx0m31gg"; - sgr-iosevka-term-ss11 = "1nqzh75ia7z74f3v6m9jkh51qhjpxnmhqxnz3ks5s5rb3qgvj1h6"; - sgr-iosevka-term-ss12 = "0z9xafdp75c88g1mf5hyh6h88n1w3qs6fid7bvwy1jjnsnai835s"; - sgr-iosevka-term-ss13 = "0bccy0fhr5kqx1b53wb6gcijn7axlbg2x24vp8mh72mnw306qnf3"; - sgr-iosevka-term-ss14 = "174srnn43rwsc1l8qjk6hrqg3qndk2sf61cii3v2hk1pnrqxs85r"; - sgr-iosevka-term-ss15 = "15lg2p7hpdkd21f8nkywxzp8gmxg3wpi2q33m0bchvcr1cb6p326"; - sgr-iosevka-term-ss16 = "0b20m1akm95nbkjy7cqgn4gfiaashdkwc1nf6abwhpm8iydwas3v"; - sgr-iosevka-term-ss17 = "1x0n4z4si9qzkqanbdp1lqn73hynbxa7s59rwc9z0s902vyqpgcx"; - sgr-iosevka-term-ss18 = "19b3nx5mvdr6r6hbcqjxrdsyr975ym42v0i670l4550bg0z24cyl"; + iosevka = "1765nh5502m1blmnxmfpbc6qwscp3h78c361sz2libypiwsh20fl"; + iosevka-aile = "0jnkaln0yyvj2cvh7ckwi181hzpw67lvyk9zclwjhzbmqy1w289c"; + iosevka-curly = "0m9qq02wfvd42zg4b33jvz6aiy4hlpvd25a812hd231763i3nixa"; + iosevka-curly-slab = "16xnrzmarrk90gphbmn4cp7hvqba5j8w8lhxb5p9vjp9avg81bvy"; + iosevka-etoile = "0dwnysyaf1ig8pdfbd16gv3lssivnwyx0mqvx24r42yvg6f4k043"; + iosevka-slab = "0724dz6q4hlxgakbqhzr5cxrlap16kqrr4m04rdvmnml606g3msh"; + iosevka-ss01 = "09i8f2mzbsz211nypr3c6k4mkpng53p5xspxd0srnix48hn0yl16"; + iosevka-ss02 = "1ar36zm8x4s5wspis4mmk0bl0lgyj75dkhpx9h3hg8gk0y7rd2kl"; + iosevka-ss03 = "1m66m6hangpzxbdmcpzqnrx79sc7w9id8c7w3l6lik3xkhwlqj9q"; + iosevka-ss04 = "096h5zgv69j96a4ylyzjiy94qiyyk411n27by7dsxmj0kfzcrlyx"; + iosevka-ss05 = "0r9xln2zmzns4abrxaznv9qi6y2sdaq957sh0v5w866bkgcbdrd6"; + iosevka-ss06 = "0dhj8hqf5ja1zyqlsw7blw4al713014khdbh5mm44qilgxzp5s2p"; + iosevka-ss07 = "0d8sycqnfvw1v4b5smj1nbwf1n7bkjqky4m6f0a0xmbgbd50aaz3"; + iosevka-ss08 = "1psrg7dmkgyg47a96p1k5izsnhnw6jqp9zkv91r92yxx6dlag6fd"; + iosevka-ss09 = "0mws0jakjybkj6bh9fsksi1mam642ravlcyz7j8q9h301ibkbm07"; + iosevka-ss10 = "1rz8qxjydcvr124rrvdd2hn0ykcwhpvyv40rs5kqc8saz9v60wcv"; + iosevka-ss11 = "1bz2lbp0d31222b1mxj7s5vr9irfb1iy4pfq8fhh24gfdgnznr73"; + iosevka-ss12 = "00xnqbpdgklxlkr7vnznrqh65zwn7szs4pb4bhd3z9mx6rb6ai7a"; + iosevka-ss13 = "162xr2kgq5sv7c3lnb8wvxzb5ddw20njy52q8p6mvyak47h1wh0k"; + iosevka-ss14 = "17vlj4z8y0i9q7cb6b4h35wj82cv3cq7x0wyjnm0amzsn3xvv09j"; + iosevka-ss15 = "1czw0r76b9414vk098rzaf204z3a37xsvwy919ibiszd2pc9fsyl"; + iosevka-ss16 = "08bc0qj1dcgnmhj1x07xncy82bi6mzhx1wl9x0s9bfkjx69cf9rk"; + iosevka-ss17 = "1q239m4xz7whdf61ic8n56ymvqmk7f1ab898zs6x1ylv65ai9ixz"; + iosevka-ss18 = "0ccicy1862rpmgihdaj0624437cbjci24ivlqlj9k61p5zrg0gn9"; + sgr-iosevka = "0jc6j2lzh3qj72wi5wp7b7adk865nmfb4jxlj7mgn14ni0chd3sx"; + sgr-iosevka-aile = "0vx2rx09749f28xbi0i2ml9hfk1rhr2wx4afsg151gx37slvrc4w"; + sgr-iosevka-curly = "18lpx5rxl2c5mg69wym63nggaq2vgi84b071ikjz3z77zv7ykdy8"; + sgr-iosevka-curly-slab = "0g2x2v9ld536c8qrxwmdw9gv8lbg3g5xmmd9zpmqlc302v43arpz"; + sgr-iosevka-etoile = "172003jxpf5867x7yr1741561k7lbmn152djjf54313273s62imc"; + sgr-iosevka-fixed = "08cwln0q0w2sf9kjngq21150azp4550np9lmxg07bvj7r1h1x8yg"; + sgr-iosevka-fixed-curly = "1fnxxxrnqdgm3c5f0n8sbv53x4drmmjcwy03fwax2zsmhx8v545i"; + sgr-iosevka-fixed-curly-slab = "1n6fcmnwbxcrylh9dkidd0sdn4sw8b3xymh9dr521acnnp4zcbmc"; + sgr-iosevka-fixed-slab = "08pyarvnwnkf4yvmnls60ydbnkrkkvm91fkvc7hj237hi11ka3mh"; + sgr-iosevka-fixed-ss01 = "0gfffkjpqwhcazcr4p287fhi81rlb3pdxxljpx8m08anq5g8lzb9"; + sgr-iosevka-fixed-ss02 = "1k0433d552j7j7bdaq9vink6v2kkbfhj66f3riw6a6bfcda15j7b"; + sgr-iosevka-fixed-ss03 = "1i11pgx8ifp654y08m5wjvzlghvcaf47946s6rv0x0n4v3ybjnan"; + sgr-iosevka-fixed-ss04 = "1jlghxl8ca4yx3w9m1v6y8abyh7pi1chnrmfn4xjxnrmchn6zjvc"; + sgr-iosevka-fixed-ss05 = "1xkz9vw6qk1al3brxy9ay3dny5s0bi3vjhg9j10igs4n5m2gba1a"; + sgr-iosevka-fixed-ss06 = "1bch2vm22s9hv8njvwkjz5bsf4529q911k0p76pwmx389hqm2dcm"; + sgr-iosevka-fixed-ss07 = "0is0pg745kyvy78la73zaic9bp44xd2d3gcqy1bj0hncj573m0zc"; + sgr-iosevka-fixed-ss08 = "1a3jpfcix555pkm6ifvb6zqwhq9vbg7rv3q6w826wzkmvcbc94wx"; + sgr-iosevka-fixed-ss09 = "0wfpwljxrqrrjm3c9salbwz628qqz7j0hvwwqkjr0cva4gqwrzjy"; + sgr-iosevka-fixed-ss10 = "0pcpi1cycdj41b4m2h2aa39aak673d4hp8gbs9j665c2749mfllq"; + sgr-iosevka-fixed-ss11 = "0jiv860lr20v67b2w1dss5qm10ydpkl82857rx9bq6jc3a5wld06"; + sgr-iosevka-fixed-ss12 = "1wsidq0v01ww8ylkv2fxy518k96gqmfgfd8f7j0nb63a0qh1iqlf"; + sgr-iosevka-fixed-ss13 = "19wvawm8ygkr7h5nsgln4vmkxdq5g35j035l8rbfsvbn6hb0znnn"; + sgr-iosevka-fixed-ss14 = "1jvj70n5qj7mriczy6l7fn94d4mk3kkljg0f62n3bhp749n4h28j"; + sgr-iosevka-fixed-ss15 = "07lnaask7qrl6fjvf4ddxl8ijisga34h3prydhm4h2v4l1hwhiyg"; + sgr-iosevka-fixed-ss16 = "06hg2mfb9kvn7s34vd7jkvr4mhsrs3z0xaw8ny2g4bx4nwb3cwsz"; + sgr-iosevka-fixed-ss17 = "0ggx0g673d1kb8pxn9iyixqidi2kniggvaadkqryn22xxppvyn72"; + sgr-iosevka-fixed-ss18 = "0yiii5jf76dqrs5ivnnf5dk8lyf8snrl2iycpfyrfp2mi786qw8l"; + sgr-iosevka-slab = "10m4p6vgkbvk5m0y10bpxm8v913k1xrm50f6c6gghsgvsd5954wc"; + sgr-iosevka-ss01 = "0rmjdx4cigazb47cismx51qni7kvb5zylhl504gq0l7rw4f941mw"; + sgr-iosevka-ss02 = "18i85pbcz2ikaa0k52gslmh4pnirdmwg50rxqcw5dpf3sfd64k1s"; + sgr-iosevka-ss03 = "0466l4kdfyy6qga0gw0iihlx4jh3zsw3nscgr0mp5rff8kxrllyv"; + sgr-iosevka-ss04 = "0h8zji83q4c12bs0dnllb78s66c852ffqwr377ma4clk0d70qgdx"; + sgr-iosevka-ss05 = "0gnlpf4j0d01a7ihv94ac5rlskzpcdyrxzy38d7fg7x8z13bi507"; + sgr-iosevka-ss06 = "0q8q8q83p95yrgszcm8yk0vqrmi5g8psymvx8lrl9caskjyf5gk1"; + sgr-iosevka-ss07 = "1n9k9nk1izx9rw3c17bvr1fhj7nqq1sl1j3r9v9s7wh99wliwzvb"; + sgr-iosevka-ss08 = "0b6gm4aq21lf60dmw0bbi0wm37qf5yd5x53fvd1zd3iqk9jcr4jb"; + sgr-iosevka-ss09 = "17iwjzh5dg4gsnzihakbriwwyqnb8rk0z33ay4zn2hml0b7g03kv"; + sgr-iosevka-ss10 = "1jj8fy5l96dfd5fn3v1dqzpiyqimhqh6cplzgg7mzp94pabwrrrx"; + sgr-iosevka-ss11 = "02hw77qwi5gazpf153cfhkf24ngsfjfkxn4mjxxr89b1z6jsbkv6"; + sgr-iosevka-ss12 = "1365v9chsg93lyjsv1p239kr9p11x9cz87s9l0pzdx1liaby6zdl"; + sgr-iosevka-ss13 = "1bzl0zr4g0rxkwbkgpdqxw6l01g0wlqi868c0b9lzkf14dpl4g7f"; + sgr-iosevka-ss14 = "0iksdqrylgbyykixa4h5ajwrsjd818l626f176kih4cwl1l31hlh"; + sgr-iosevka-ss15 = "018wl1pv1phq0msw16wc8h77vhpmx30z7z85i09lwi5lsa8k6sqh"; + sgr-iosevka-ss16 = "1843xvzppkssaz7w43gqk606c3qv5gkj83s91gv1zcj5dkw7r6s4"; + sgr-iosevka-ss17 = "1x8i1ixs99wwvxs0hpvjw87dzwix0kllnvkbyj9mikdprlaj5fv0"; + sgr-iosevka-ss18 = "0jday3yxajg79xkf346rak7qk34fil7bm4821j84nlpx2pv9hnl8"; + sgr-iosevka-term = "1a5j06ch0sbbbg5gka4anlx7jdgdma0imbd69jkcp6wimdr5scjh"; + sgr-iosevka-term-curly = "1ba099crsfljg8isvc7bvwxg6w4nv98q9451b92vwr6szmz18a6v"; + sgr-iosevka-term-curly-slab = "0linlp56r1zxjk5517npy92flnw2iy2pdjpzklhm6f42yzpkz6a0"; + sgr-iosevka-term-slab = "1m19gxb5cyvswmdccyskfy9b0ymgibcnxsmcrn56k5df15hlb12f"; + sgr-iosevka-term-ss01 = "1b1ixxjv0ryyahm17w4cr9cydwq41vg4nzyii4pj6agzpi28yczg"; + sgr-iosevka-term-ss02 = "1155c7gcfcrb6i5w2qbwicnvbhda9vg753wghkwc6fbzyg95236c"; + sgr-iosevka-term-ss03 = "14nm4nn3szvj3is3c0b88li6ks7yizr4fjgw2jj0sl76ypj4if8z"; + sgr-iosevka-term-ss04 = "0j58sbffmmwa7i4b0slz789j5lrlqaizxbmfg8qzgccwp75q1s4a"; + sgr-iosevka-term-ss05 = "0jmiiacpjp3x5x70sybbhnnjqsmjhs4l1pgj4baqxc0lgj2j5xxl"; + sgr-iosevka-term-ss06 = "1w8b708njfhjcv36vpagnxvsij81gylmlwhn69ahnw17wvhw63c5"; + sgr-iosevka-term-ss07 = "1v7545d84jraa7mxm9k2yx7ik5wp1hy6r4lfpwsxd3n8x5kgvbcr"; + sgr-iosevka-term-ss08 = "10v9c4rmb2932zsh7qz9ij1q04r0d7y08rxlnjr8w6g57kn7mmd9"; + sgr-iosevka-term-ss09 = "0j12j6qwnrvkyh46qvzgzip4jpkxcbg80bfkplrskrwglcdxig68"; + sgr-iosevka-term-ss10 = "1racjzqllhlz6xpad5cnms0m8psmrv3b4flqivdh4w8r6alpavpw"; + sgr-iosevka-term-ss11 = "1vn3s084z46sszil1g5mf2z31hndxpb7a835b306rklnrsv87h3k"; + sgr-iosevka-term-ss12 = "0pm9c06vfx9c322zqyq54ibfmrhnfmn8yqa682z3y4sss20gw2nb"; + sgr-iosevka-term-ss13 = "1ixd92l81hanzkdmkgvz302ghjdx9x96rcl4j5qf4amxa77hn341"; + sgr-iosevka-term-ss14 = "108l7wb90fyimfzzxc08rw0z67iabvd9mliybsqp4cv73d408lni"; + sgr-iosevka-term-ss15 = "0knhyvjy9wsrd209sy5h3q4mrkj49kgr76fdzgn4j4mmssnjkvp2"; + sgr-iosevka-term-ss16 = "1hydhyhd25gpj0r3xlv2n3m34vbx0nfqgy07vibywhq0pm29ywkr"; + sgr-iosevka-term-ss17 = "1j84529d54kxvxf7xlilh6xpn1nrv8ablkyg829y5v2ad06db14m"; + sgr-iosevka-term-ss18 = "03vvcmvrhkb4rsj1vvvnvprawzwk71s4756wvr0dfngc838nrmg5"; } From 54d220114a04b583bcfddeba6283c914ca2ae605 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 Jan 2023 09:03:09 +0100 Subject: [PATCH 079/338] cargo-llvm-cov: 0.5.8 -> 0.5.9 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 5805bd971e96..28be262ca70d 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.8"; + version = "0.5.9"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-APUr3eSEw//ruDeBG3NeJCgN62A7J+125DiYjg2GktA="; + sha256 = "sha256-GEnEcVYejDMnnJtGTbbMHOC85hYjGFEOIF9/Jdm3288="; }; - cargoSha256 = "sha256-0DetcbwAv8FtIZWH7VQWxjAf6r16nbgWxxQe6lkkT5k="; + cargoSha256 = "sha256-Yk43FM6YswlM/XYJD+XiunFsOY4+n/xVmnIIEo1ogKY="; # skip tests which require llvm-tools-preview checkFlags = [ From 751c42b62b7d9d01171832dc4f7fd5977bc3d649 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 17 Jan 2023 02:24:12 +0100 Subject: [PATCH 080/338] pagsuite: fetchzip -> fetchurl --- .../applications/science/math/pagsuite/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/math/pagsuite/default.nix b/pkgs/applications/science/math/pagsuite/default.nix index e8ae3318eeba..6994712e18fd 100644 --- a/pkgs/applications/science/math/pagsuite/default.nix +++ b/pkgs/applications/science/math/pagsuite/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, fetchzip +, fetchurl , cmake +, unzip , gmp , scalp }: @@ -10,17 +11,16 @@ stdenv.mkDerivation rec { pname = "pagsuite"; version = "1.80"; - src = fetchzip { + src = fetchurl { url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-JuRuDPhKKBGz8jUBkZcZW5s2berOewjsPNR/n7kuofY="; - stripRoot = false; - postFetch = '' - mv $out/pagsuite*/* $out - ''; + hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ="; }; + sourceRoot = "pagsuite_${lib.replaceStrings ["."] ["_"] version}"; + nativeBuildInputs = [ cmake + unzip ]; buildInputs = [ From c6d416c1e360363e0317e1a93938c9f1d375966f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Jan 2023 09:41:58 +0100 Subject: [PATCH 081/338] python310Packages.eth-typing: add changelog to meta --- .../python-modules/eth-typing/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 6c8bc6cb5707..d2185302239d 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -8,25 +8,30 @@ buildPythonPackage rec { pname = "eth-typing"; version = "3.1.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; - rev = "v${version}"; - sha256 = "sha256-Xk/IfW1zuNbGdYAxXTNL9kL+ZW1bWruZ21KFV9+lv/E="; + rev = "refs/tags/v${version}"; + hash = "sha256-Xk/IfW1zuNbGdYAxXTNL9kL+ZW1bWruZ21KFV9+lv/E="; }; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "eth_typing" ]; + pythonImportsCheck = [ + "eth_typing" + ]; - meta = { + meta = with lib; { description = "Common type annotations for Ethereum Python packages"; homepage = "https://github.com/ethereum/eth-typing"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; + changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 7f2e083d7a1cde20571cadd9a5a7e89d13d5e8bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Jan 2023 09:43:16 +0100 Subject: [PATCH 082/338] python310Packages.eth-typing: 3.1.0 -> 3.2.0 Diff: https://github.com/ethereum/eth-typing/compare/refs/tags/v3.1.0...v3.2.0 Changelog: https://github.com/ethereum/eth-typing/blob/v3.2.0/docs/release_notes.rst --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index d2185302239d..e89f85d8492f 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-typing"; rev = "refs/tags/v${version}"; - hash = "sha256-Xk/IfW1zuNbGdYAxXTNL9kL+ZW1bWruZ21KFV9+lv/E="; + hash = "sha256-klN38pIQ9ZOFV7dzXNvylPGfifR8pXRLTJ3VE579AY0="; }; checkInputs = [ From a52714f65680a16cad805c362ff24d25a694fad8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Jan 2023 12:12:34 +0100 Subject: [PATCH 083/338] python310Packages.dulwich: 0.20.50 -> 0.21.0 Changelog: https://github.com/dulwich/dulwich/blob/dulwich-0.21.0/NEWS --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index c3bab1180cf9..fb8b2f2f88a8 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.50"; + version = "0.21.0"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4="; + hash = "sha256-wizAXwIKlq012U1lIPgHAnC+4KN7V1aG0JwCeYsl7YY="; }; LC_ALL = "en_US.UTF-8"; From f928257a857a6a196a7e8ee82b52b8e8fed3a66f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Jan 2023 14:39:47 +0000 Subject: [PATCH 084/338] thonny: 4.0.1 -> 4.0.2 --- pkgs/applications/editors/thonny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index d859b5c88840..73cd6139ba14 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-VGP9JVw92rk1yXZDqTKcMzJt8t+T8YAg8zYxFaWxGr4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TxfpzKAsU/5ble4VzJ+4pokCiyJsdisjmNwWfxOMKzE="; }; nativeBuildInputs = [ copyDesktopItems ]; From 875a3567e01cf1e438de2015d3fbba475cfb04a7 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 4 Jan 2023 20:19:52 -0500 Subject: [PATCH 085/338] binaryen: 109 -> 111 --- pkgs/development/compilers/binaryen/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 96483df724c7..8a85468b46c9 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,25 +4,25 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "109"; + version = "111"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-HMPoiuTvYhTDaBUfSOfh/Dt4FdO9jGqUaFpi92pnscI="; + sha256 = "sha256-wSwLs/YvrH7nswDSbtR6onOMArCdPE2zi6G7oA10U4Y="; }; patches = [ - # https://github.com/WebAssembly/binaryen/pull/4321 + # https://github.com/WebAssembly/binaryen/pull/5378 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch"; - sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU="; + url = "https://github.com/WebAssembly/binaryen/commit/a96fe1a8422140072db7ad7db421378b87898a0d.patch"; + sha256 = "sha256-Wred1IoRxcQBi0nLBWpiUSgt2ApGoGsq9GkoO3mSS6o="; }) - # https://github.com/WebAssembly/binaryen/pull/4913 + # https://github.com/WebAssembly/binaryen/pull/5391 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/b70fe755aa4c90727edfd91dc0a9a51febf0239d.patch"; - sha256 = "sha256-kjPLbdiMVQepSJ7J1gK6dRSMI/2SsH39k7W5AMOIrkM="; + url = "https://github.com/WebAssembly/binaryen/commit/f92350d2949934c0e0ce4a27ec8b799ac2a85e45.patch"; + sha256 = "sha256-fBwdGSIPjF2WKNnD8I0/2hnQvqevdk3NS9fAxutkZG0="; }) ]; From 275bb9b54493a116ed4ad0f7d84861a15fdbda6a Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 4 Jan 2023 22:24:16 -0500 Subject: [PATCH 086/338] emscripten: backport support for binaryen 111 --- pkgs/development/compilers/emscripten/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 3daaccd7e0b3..02b1f6f03b2a 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages -, symlinkJoin, makeWrapper, substituteAll +, symlinkJoin, makeWrapper, substituteAll, fetchpatch , buildNpmPackage , emscripten }: @@ -44,6 +44,16 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) + # https://github.com/emscripten-core/emscripten/pull/18219 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch"; + sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU="; + }) + # https://github.com/emscripten-core/emscripten/pull/18220 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch"; + sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8="; + }) ]; buildPhase = '' From f1bb94710d436824720b2ad31319e799ac166c8a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Jan 2023 22:38:44 +0300 Subject: [PATCH 087/338] =?UTF-8?q?iterm2:=203.4.18=20=E2=86=92=203.4.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/terminal-emulators/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index dbc4c444c7df..c547e3d0d769 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.18"; + version = "3.4.19"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "sha256-jXaymp0GIM+UD51z1zsgz8OBHP1LiqKFGvrzutw8ecY="; + hash = "sha256-UioKFhlwVdrkHtoS1ixXE2rykVO5aQeNQ8TnC5kNSUc="; }; dontFixup = true; From 29dfae7f7b1b39bebb654c9af0876f32411a2564 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 18:06:25 +0000 Subject: [PATCH 088/338] libcue: update homepage --- pkgs/development/libraries/libcue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 227dfd77f463..2669cee42501 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { a file pointer. For handling of the parsed data a convenient API is available. ''; - homepage = "https://sourceforge.net/projects/libcue/"; + homepage = "https://github.com/lipnitsk/libcue"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux ++ platforms.darwin; From 39ca460d26bef32fe010f49e6a18fb511e060b06 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 18:06:45 +0000 Subject: [PATCH 089/338] libcue: clarify license --- pkgs/development/libraries/libcue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 2669cee42501..bebc9172caf6 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { available. ''; homepage = "https://github.com/lipnitsk/libcue"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux ++ platforms.darwin; }; From 11e5444ba52b7f4f71c0ef10080fb0cc0a83f57b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 18:06:59 +0000 Subject: [PATCH 090/338] libcue: broaden platforms Builds fine for FreeBSD and NetBSD. --- pkgs/development/libraries/libcue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index bebc9172caf6..0b03ec6ee0b2 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lipnitsk/libcue"; license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } From 867504bff8bcbb1f32f000f40edade1a2a784704 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 01:05:01 +0000 Subject: [PATCH 091/338] gotestsum: 1.8.2 -> 1.9.0 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 09c6e4b77ae4..4e7a6e0aaa89 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-BpT5FxqDOLnlWtOHMqwruR/CkD46xEgU7D8sAzsVO14="; + sha256 = "sha256-22srQmvbVu8eWVAbLDZG93yod/bJS6hfoc/YwFs64pY="; }; - vendorSha256 = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; + vendorHash = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; doCheck = false; From e969b9fef228b8735cd087163929ecd1fe6c0c31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 02:06:11 +0000 Subject: [PATCH 092/338] nixpacks: 1.1.0 -> 1.1.1 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 2328e19a9eee..c41779459454 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rbpHi00LQiXQDzjRTSYnVG12ezJxi5ypZFXNIXipyqk="; + sha256 = "sha256-SrNYvkJy97GwneA7UClNLaO0fd+ZiMSxCCSgqwESw5Y="; }; - cargoHash = "sha256-gMxj1UtGcHmI9s/RPWKC0rlewaBtUan0nPHwZbgqWFM="; + cargoHash = "sha256-S/V2PVkL9T/USXAzorDpo0nhRm9DOkNtfw5CADg4oKM="; # skip test due FHS dependency doCheck = false; From 53dbec2944c1ce0dd834269d0788cb460d8417fd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 Jan 2023 04:20:00 +0000 Subject: [PATCH 093/338] redis: 7.0.7 -> 7.0.8 https://github.com/redis/redis/releases/tag/7.0.8 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index b34c18a08bc6..52b0bd7c760b 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - hash = "sha256-jTJ9foh9G7MI/Deq9xegv3n1gSnjc5Bpqu6uiJVaxYY="; + hash = "sha256-BqM55JEwZ4Pc9VuX8VpdvL3AHMvebcIwJ8R1yrc16RQ="; }; nativeBuildInputs = [ pkg-config ]; From 315d6e3930f12f69d609701e4f16be80117a0fba Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 18 Jan 2023 06:43:57 +0000 Subject: [PATCH 094/338] oras: 0.15.1 -> 0.16.0 --- pkgs/development/tools/oras/default.nix | 31 +++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix index b0adcadd8440..183e26d70494 100644 --- a/pkgs/development/tools/oras/default.nix +++ b/pkgs/development/tools/oras/default.nix @@ -1,25 +1,37 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, testers, oras }: buildGoModule rec { pname = "oras"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - sha256 = "sha256-8QmMC4eB7WNxfEsVRUzv/gb7QmNBvcgDEENa1XxpCug="; + hash = "sha256-7fmrWkJ2f9LPaBB0vqLqPCCLpkdsS1gVfJ1xn6K/M3E="; }; - vendorSha256 = "sha256-THqrGnJnNDL6BJpRxeNLPjWB+SEUMUhiVOcJZDTM6n8="; + + vendorHash = "sha256-BLjGu1xk5OCNILc2es5Q0fEIqoexq/lHnJtHz72w6iI="; + + nativeBuildInputs = [ installShellFiles ]; + + excludedPackages = [ "./test/e2e" ]; ldflags = [ "-s" "-w" - "-X github.com/oras-project/oras/internal/version.Version=${version}" - "-X github.com/oras-project/oras/internal/version.BuildMetadata=" - "-X github.com/oras-project/oras/internal/version.GitTreeState=clean" + "-X oras.land/oras/internal/version.Version=${version}" + "-X oras.land/oras/internal/version.BuildMetadata=" + "-X oras.land/oras/internal/version.GitTreeState=clean" ]; + postInstall = '' + installShellCompletion --cmd oras \ + --bash <($out/bin/oras completion bash) \ + --fish <($out/bin/oras completion fish) \ + --zsh <($out/bin/oras completion zsh) + ''; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck @@ -30,6 +42,11 @@ buildGoModule rec { runHook postInstallCheck ''; + passthru.tests.version = testers.testVersion { + package = oras; + command = "oras version"; + }; + meta = with lib; { homepage = "https://oras.land/"; changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; From ba29c7fb94e3735a910bca8880dc431df5c89f3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 14:08:45 +0000 Subject: [PATCH 095/338] unrar: 6.2.1 -> 6.2.3 --- pkgs/tools/archivers/unrar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 41c8f384e4a7..226300952222 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - hash = "sha256-XMj33tJi0nwp0B56EZ0v0j7dpCdxGCBFTy62ZwRKiQA="; + hash = "sha256-Egk25B+CbNY9d6WArupkwbef0+JDT1jOgYTng7UeWwE="; }; postPatch = '' From 02376a27840b9363da958c2e04803919763bacba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 15:21:08 +0000 Subject: [PATCH 096/338] intel-compute-runtime: 22.43.24595.35 -> 22.43.24595.41 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index d2d7c6218ae7..3e5ea9849709 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.43.24595.35"; + version = "22.43.24595.41"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-CWiWkv3CmHhXAk2M92voeQ06ximSOnT9hgIA4rIxWmM="; + sha256 = "sha256-AdAQX8wurZjXHf3z8IPxnW57CDOwwYlgJ09dNNDhUYQ="; }; nativeBuildInputs = [ cmake pkg-config ]; From 19520e75557b4a30a847f2421fb5177a3d275b3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 18:00:53 +0000 Subject: [PATCH 097/338] uhk-agent: 1.5.17 -> 2.1.1 --- pkgs/os-specific/linux/uhk-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 688a743fa9c1..0b7739012eca 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -1,11 +1,11 @@ { appimageTools, lib, fetchurl, polkit, udev }: let pname = "uhk-agent"; - version = "1.5.17"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc="; + sha256 = "sha256-NhDHwQeh+zbA7XykriSMaygNm1SorMd+yy/m6sPgAhg="; }; appimageContents = appimageTools.extract { From 876158337ff6c42b9056d565d940352b199afaa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 18:32:17 +0000 Subject: [PATCH 098/338] python310Packages.google-cloud-dlp: 3.10.1 -> 3.11.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 513d034b530a..b7a2f02e0eab 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.10.1"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M7JhzttLvWMPC9AEJN/X9ofIFBtNzWGgXjnun8k1CwA="; + hash = "sha256-5zysTKqmzRAiePBwLkbUhiAG91sKwao2BCTOBnVHlYg="; }; propagatedBuildInputs = [ From 73852a5d9ee297386a828c5d704dbc90c7245f30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 19:14:40 +0000 Subject: [PATCH 099/338] python310Packages.google-cloud-automl: 2.9.0 -> 2.10.0 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 51fb6d04dcf6..a59f2980c68a 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8E+RvHHs4IK1RrbTtY8wwuBLNQKcDnb058vN6hKfy6Q="; + hash = "sha256-BiXbDc1nX2y1ru8+t1rrhIzFg9wLAYMj3WJhIUb6VJ8="; }; propagatedBuildInputs = [ From dc998de75abd995f43030b967db01b3db043c1a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 21:09:43 +0000 Subject: [PATCH 100/338] v2ray: 5.2.0 -> 5.2.1 --- pkgs/tools/networking/v2ray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 51f70abcc71d..b0cca0985b6f 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-/n8GyKcTsus7BWspg6Br4ALH98A1dSpkNFNKkRlIqHs="; + hash = "sha256-Q7yro9jHNr+HSJkoO7D+T05+AK26eLtw9NfvDTWeMw8="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorSha256 = "sha256-85k6XWe12m2siejfoPJru87/AYdVSl+ag09jUkBIc0M="; + vendorSha256 = "sha256-uXxqqPNSa2s1KmBPzvYVdTmOLxaWer9+AupdvL3+qYU="; ldflags = [ "-s" "-w" "-buildid=" ]; From 39d41aeac3645f2b431dedb75f91ae1630afe391 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 21:41:09 +0000 Subject: [PATCH 101/338] kthxbye: 0.15 -> 0.16 --- pkgs/servers/monitoring/prometheus/kthxbye.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/servers/monitoring/prometheus/kthxbye.nix index ab7812081fad..897a58926d34 100644 --- a/pkgs/servers/monitoring/prometheus/kthxbye.nix +++ b/pkgs/servers/monitoring/prometheus/kthxbye.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kthxbye"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub rec { owner = "prymitive"; repo = "kthxbye"; rev = "v${version}"; - hash = "sha256-N1MzutjzLk9MnE1b7dKRsiS7LL4Nb61+NpmjTBPGohI="; + hash = "sha256-B6AgD79q0kA67iC9pIfv8PH8xejx2srpRccdds1GsZo="; }; - vendorHash = "sha256-PtINxblqX/wxJyN42mS+hmwMy0lCd6FcQgmBnxTUdcc="; + vendorHash = "sha256-BS9+2w18tvrgmPzRMP0XyUlyPAR9AJMLXUd3GYEJr8E="; buildPhase = '' make -j$NIX_BUILD_CORES From ba2f59a4661b42e2452cda7667d021dc9c8c839c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 23:04:06 +0100 Subject: [PATCH 102/338] gotestsum: add changelog to meta --- pkgs/development/tools/gotestsum/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 4e7a6e0aaa89..7ee87aa3f10c 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "gotestsum"; @@ -7,20 +10,25 @@ buildGoModule rec { src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; - rev = "v${version}"; - sha256 = "sha256-22srQmvbVu8eWVAbLDZG93yod/bJS6hfoc/YwFs64pY="; + rev = "refs/tags/v${version}"; + hash = "sha256-22srQmvbVu8eWVAbLDZG93yod/bJS6hfoc/YwFs64pY="; }; vendorHash = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; doCheck = false; - ldflags = [ "-s" "-w" "-X gotest.tools/gotestsum/cmd.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X gotest.tools/gotestsum/cmd.version=${version}" + ]; subPackages = [ "." ]; meta = with lib; { homepage = "https://github.com/gotestyourself/gotestsum"; + changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; description = "A human friendly `go test` runner"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; From bcbdc21e391ce76482431659a91f8e4dff6b34f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 23:28:56 +0100 Subject: [PATCH 103/338] python310Packages.scmrepo: 0.1.6 -> 0.1.7 Diff: https://github.com/iterative/scmrepo/compare/refs/tags/0.1.6...0.1.7 Changelog: https://github.com/iterative/scmrepo/releases/tag/0.1.7 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index f40f0f5b6f36..0f2ffa7138e6 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.6"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qSD8FsaJ0wZ8h0mO6qge3Q5fKIbMrONvJraprKVoNDE="; + hash = "sha256-F+t/3Nfcw+LG9Kh0Je2JwPWUWBNsZXTEaQOKaTT5ig0="; }; postPatch = '' From ad991de3688298ab7b39fcdf52f278ef69abf5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Wed, 18 Jan 2023 23:48:46 +0100 Subject: [PATCH 104/338] scala-cli: 0.1.19 -> 0.1.20 --- .../tools/build-managers/scala-cli/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index f2d895598f64..85a3563f020c 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "0.1.19", + "version": "0.1.20", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1n5x07n3g7r8cx22mv9prfq1gs9sjj41xdj615lbs4dbfjp8z66d" + "sha256": "0gb6xmv5qm77nfn49p7r180hz91a3kpilw27s9all8zcmca2xhml" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "02mwinm4ggpqr9j6c0ap1nsa4bgad5h3xgkplamwrzqa2kvqxx2i" + "sha256": "1ax9yqzp4l7aa74x3lgr75h58pl3w92921fjsg8yw3imi2j57h09" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0cz5dd6f3j6czrbjiz9l6bf0ycfrba9h2wjpa6l80nn86yyr7i4r" + "sha256": "1i5g8afgcg701g7n22sgbs2639mlwgjmr5jhmw7bz6wvj8h5nz1z" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "19fcj631gwg6cjx3q5rqywgdafw18bdjkan52jj2awh2vxpikgdm" + "sha256": "0a53kxhl9n6p9mblk4r0zy8aklhpsvkg0g42il8hqvf72y0kl4ks" } } } From 11371b510af48620ce9d0621c1f7d1edaee09a07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Jan 2023 00:21:23 +0100 Subject: [PATCH 105/338] python310Packages.license-expression: 30.0.0 -> 30.1.0 Changelog: https://github.com/nexB/license-expression/blob/v30.1.0/CHANGELOG.rst Diff: nexB/license-expression@refs/tags/v30.0.0...v30.1.0 --- .../python-modules/license-expression/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index e1f77e45dcc7..b57601f445b7 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.0.0"; + version = "30.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nexB"; repo = "license-expression"; - rev = "v${version}"; - hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; + rev = "refs/tags/v${version}"; + hash = "sha256-QPjVSSndgKlAdGY6nZjjOrnyyVfOVu8ggfBwGWi+RyE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -43,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library to parse, normalize and compare License expressions"; homepage = "https://github.com/nexB/license-expression"; + changelog = "https://github.com/nexB/license-expression/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From e1336d7efb3efb4f83c8a132f9b158050a51c8a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 01:42:52 +0000 Subject: [PATCH 106/338] glooctl: 1.13.2 -> 1.13.3 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 57f507ba608b..5f8781665f4c 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-sCtRNdQRSPpIBSwtQMoetKmFLYUe3w1esogdkLqTHbk="; + hash = "sha256-nxClmCY/joLJw87IQx9DvAZLv5LgOLGlp9Unh37OKgg="; }; subPackages = [ "projects/gloo/cli/cmd" ]; From 9ad7ca73f46eea2f70259cbd7218bc76f60a460e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 02:05:32 +0000 Subject: [PATCH 107/338] autorandr: 1.13 -> 1.13.1 --- pkgs/tools/misc/autorandr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 1f22401a4190..bffb09c098da 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autorandr"; - version = "1.13"; + version = "1.13.1"; format = "other"; nativeBuildInputs = [ installShellFiles ]; @@ -58,8 +58,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; - rev = version; - sha256 = "sha256-pTWwDKBCZV3wkX/VHuWrwMFgUAMDvik11y+ysKiN3HU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-702x4O0rHW/VZIfu1+5G1gBSDQYVoAx167igz/M3Ea4="; }; meta = with lib; { From 86d280ea96ea01ff1e7c2b6d3f1090eb8a022866 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 02:43:58 +0000 Subject: [PATCH 108/338] helmsman: 3.16.0 -> 3.16.1 --- pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index ddc254adc93a..fb268db1810a 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-84Lxix2UFEW9XymKMxFaAwZfPepPn4MjKaz8jXfB9AI="; + sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko="; }; - vendorHash = "sha256-dzzgHda1kW2V9u9x/A9oYhpvTpUDa2DVZA/sHrieiWo="; + vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE="; doCheck = false; From 177c90a6eca6175256d3e8d1a4dedb237a5f66e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 03:25:01 +0000 Subject: [PATCH 109/338] python310Packages.zeroc-ice: 3.7.8 -> 3.7.8.2 --- pkgs/development/python-modules/zeroc-ice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 1c015d4d75a7..4fd287f3beb3 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.8"; + version = "3.7.8.2"; src = fetchPypi { inherit version pname; - sha256 = "sha256-kodRHIkMXdFUBGNVRtSyjbVqGQRxPaHqgp6ddFT5ZIY="; + sha256 = "sha256-ZDiiyNT871XMDHNPOhKHm4NzgXHcJ0fN/iO4sEz8pRE="; }; buildInputs = [ openssl bzip2 ]; From f5bde9dca0e2d194dc2b4ebfbc7f2ea20a7d36bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 04:19:19 +0000 Subject: [PATCH 110/338] spire: 1.4.1 -> 1.5.4 --- pkgs/tools/security/spire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 3addaf3dc2ce..7c7562d1adb6 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.4.1"; + version = "1.5.4"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YUsam6dIm5jDjUQ8U9puG3jvrNWCS0epaOvwo4hjixc="; + sha256 = "sha256-DHN1JL4CYnme3hPbkNPXWXsgFpJ9BIRnGPl/csr43iY="; }; - vendorSha256 = "sha256-EZWoMSBxdvnrdBmSrRYf4+2d1LCka7oUIhRAW+2n7CU="; + vendorHash = "sha256-5MveK7wZ4KpUEZ4lhm95/8bOi5NtYR4n0fSfZhC+GPo="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; From 4870496cfaa56f0c41886b143dac7028ce7f32c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 04:45:58 +0000 Subject: [PATCH 111/338] kubeseal: 0.19.3 -> 0.19.4 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index da452e9769d6..a97054a9071f 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-KssClU/jWdBH29TFhCeui6mN6t6IJlIKM3LzaWdPG7Q="; + sha256 = "sha256-okQJBZLIFujHg5Tn/AbCox8mRrump/GjYjyQzkJAtFg="; }; - vendorSha256 = "sha256-58+MJMn687wh9c25qtwGQdy4uGcZN3T2bWK/cvxlLvQ="; + vendorHash = "sha256-Nzef+cfC4Fosm1e1Whpz/BrGqRlcbD0NpyST8V1iwiU="; subPackages = [ "cmd/kubeseal" ]; From 59073a3fd5fcd0192950838783ed51ffbc9b5a9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 04:58:32 +0000 Subject: [PATCH 112/338] asdf-vm: 0.11.0 -> 0.11.1 --- pkgs/tools/misc/asdf-vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/tools/misc/asdf-vm/default.nix index 5c6b94191c77..17e3dc37a5e6 100644 --- a/pkgs/tools/misc/asdf-vm/default.nix +++ b/pkgs/tools/misc/asdf-vm/default.nix @@ -37,13 +37,13 @@ ${asdfReshimFile} ''; in stdenv.mkDerivation rec { pname = "asdf-vm"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; rev = "v${version}"; - sha256 = "sha256-0dO+IYLhiWe83iaP2CHj7D4o7UVqQemZBPW+6vu+RQY="; + sha256 = "sha256-SCMDf+yEJNDIeF2EqGkgfA+xJek1OmMysxolBdIEnUM="; }; nativeBuildInputs = [ From b830a90725a47468dd1fd9ad3425852c220ea991 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 05:21:51 +0000 Subject: [PATCH 113/338] kubebuilder: 3.8.0 -> 3.9.0 --- .../applications/networking/cluster/kubebuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index df1e6ab78882..c2818505a809 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-UTzQyr5N8CButeLKYZs9a8hAV/cezVfLLQ7b4YJQzXU="; + hash = "sha256-AT7BrLVe5sSqAnQyhrkDktxVhuh1e0o5eB8oWWVbL8Q="; }; - vendorHash = "sha256-VvCM0aBk0SnnXVPZRvEGcb1Bl4Uunbc4u1KzukYMGqA="; + vendorHash = "sha256-wxKEywUs5ezeOlIRT2k3C4G0XaX6h1ORt9/G6+FzVic="; subPackages = ["cmd"]; From 54108e13e72e61e7839e811a5ffb8ff0e83048f9 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 28 Nov 2022 10:14:11 +0100 Subject: [PATCH 114/338] udp2raw: init at 20200818.0 --- pkgs/tools/networking/udp2raw/default.nix | 41 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/networking/udp2raw/default.nix diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/tools/networking/udp2raw/default.nix new file mode 100644 index 000000000000..fdb95b121f2d --- /dev/null +++ b/pkgs/tools/networking/udp2raw/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, iptables +}: + +stdenv.mkDerivation rec { + pname = "udp2raw"; + version = "20200818.0"; + + src = fetchFromGitHub { + owner = "wangyu-"; + repo = "udp2raw"; + rev = version; + hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "dynamic" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp udp2raw_dynamic $out/bin/udp2raw + wrapProgram $out/bin/udp2raw --prefix PATH : "${lib.makeBinPath [ iptables ]}" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/wangyu-/udp2raw"; + description = "A tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket"; + license = licenses.mit; + changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}"; + maintainers = with maintainers; [ chvp ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc604ffd5989..3779de26dcb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12665,6 +12665,8 @@ with pkgs; udftools = callPackage ../tools/filesystems/udftools {}; + udp2raw = callPackage ../tools/networking/udp2raw { }; + udpreplay = callPackage ../tools/networking/udpreplay { }; udpt = callPackage ../servers/udpt { }; From f87ce1755466ba675873e23802429d56e55077b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 17:27:07 +0000 Subject: [PATCH 115/338] easyrsa: 3.1.1 -> 3.1.2 --- pkgs/tools/networking/easyrsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index bcc0a81d5e1c..b69906a3431c 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "sha256-errF7bNhX3oYEMDwB/B1W5hBWhOD+GCgET3lA121PHc="; + sha256 = "sha256-nZjEBAJnho2Qis5uzQs1sVZVFHHSgJVa5aJS+dAfFCg="; }; nativeBuildInputs = [ makeWrapper ]; From 8313e5f289c6c1e7859edabea0545f057fdccf51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Sat, 7 Jan 2023 13:13:34 +0100 Subject: [PATCH 116/338] pulumi: 3.49.0 -> 3.52.0 --- pkgs/development/python-modules/pulumi/default.nix | 4 ++-- pkgs/tools/admin/pulumi/default.nix | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index ad779eb2ffc4..2d8c861bf45d 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { "test/" ]; - sourceRoot = "source/sdk/python/lib"; + sourceRoot = "${src.name}/sdk/python/lib"; # we apply the modifications done in the pulumi/sdk/python/Makefile # but without the venv code @@ -44,7 +44,7 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio==1.47" "grpcio" + --replace "grpcio==1.50" "grpcio" ''; # Allow local networking in tests on Darwin diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index e95a265ebd6f..d8f5c1e68807 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,23 @@ buildGoModule rec { pname = "pulumi"; - version = "3.49.0"; + version = "3.52.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-gM3VpX6r/BScUyvk/XefAfbx0qYzdzSBGaWZN+89BS8="; + sdkVendorHash = "sha256-y45TlQF8jJeDLeKEI+ZMcEQqwUIrHPjgTaz1QkjTlEI="; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-WO+bTkTIAyaXl3nYwsMUTdovsYibivfGsKz6A7wj2zM="; + hash = "sha256-UxVIk7LMF7h/Ba09EgkIuna5iAfqKEuzU0qSKJRPpfw="; + # Some tests rely on checkout directory name + name = "pulumi"; }; - vendorSha256 = "sha256-q7ZusTYD8l2RyiwP/Wf6dP6AoosWEwpaylbdhfE5cUA="; + vendorSha256 = "sha256-tr3sp9b9xh5NLK1AO88QQVzYbIysmmgRW2s1IRNHFUI="; - sourceRoot = "source/pkg"; + sourceRoot = "${src.name}/pkg"; nativeBuildInputs = [ installShellFiles ]; From 8ed5d72d60766ad7379709c81276f8ff45437fe4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Jan 2023 20:18:52 +0100 Subject: [PATCH 117/338] grafana-loki: 2.6.1 -> 2.7.1 --- pkgs/servers/monitoring/loki/default.nix | 8 +-- pkgs/servers/monitoring/loki/go119.patch | 68 ------------------------ 2 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 pkgs/servers/monitoring/loki/go119.patch diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 871f2b0c400b..58d795793fb7 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,20 +8,16 @@ }: buildGoModule rec { - version = "2.6.1"; + version = "2.7.1"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-6g0tzI6ZW+wwbPrNTdj0t2H0/M8+M9ioJl6iPL0mAtY="; + sha256 = "sha256-k/HfFeVQBubKMYERhgXKN0Pma1oj9xz1wxlHIjikAzo="; }; - patches = [ - ./go119.patch - ]; - vendorSha256 = null; subPackages = [ diff --git a/pkgs/servers/monitoring/loki/go119.patch b/pkgs/servers/monitoring/loki/go119.patch deleted file mode 100644 index d67c0f1f60ab..000000000000 --- a/pkgs/servers/monitoring/loki/go119.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/go.mod b/go.mod -index f6b5af8bb..3b0598d16 100644 ---- a/go.mod -+++ b/go.mod -@@ -265,7 +265,7 @@ require ( - go.uber.org/multierr v1.7.0 // indirect - go.uber.org/zap v1.19.1 // indirect - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect -- go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect -+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect - golang.org/x/mod v0.5.1 // indirect - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect -diff --git a/go.sum b/go.sum -index bf4a83f17..1b52f1793 100644 ---- a/go.sum -+++ b/go.sum -@@ -2028,8 +2028,9 @@ go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= - go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= - go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= --go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA= - go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= -+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= -+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= - golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -@@ -2345,11 +2346,9 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go -index 01377f77e..da4d943f6 100644 ---- a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go -+++ b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go -@@ -2,8 +2,8 @@ - // Use of this source code is governed by a BSD-style - // license that can be found in the LICENSE file. - --//go:build go1.19 --// +build go1.19 -+//go:build go1.20 -+// +build go1.20 - - package assume_no_moving_gc - -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 7bef3766d..0cde8aac9 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -1178,7 +1178,7 @@ go.uber.org/zap/zapgrpc - # go4.org/intern v0.0.0-20211027215823-ae77deb06f29 - ## explicit; go 1.13 - go4.org/intern --# go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 -+# go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 - ## explicit; go 1.11 - go4.org/unsafe/assume-no-moving-gc - # golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 From 058951e85d708bb3f0e475969391edf874406745 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 19 Jan 2023 22:52:45 +0300 Subject: [PATCH 118/338] nixos/installer/cd-dvd: removing duplicate nixpkgs --- nixos/modules/installer/cd-dvd/channel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 4b4c2e393348..8426ba8fac00 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -42,7 +42,7 @@ in # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021 nix.registry.nixpkgs.to = { type = "path"; - path = nixpkgs; + path = "${channelSources}/nixos"; }; # Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required From 1e0b7ce9f4c7d700681ef67adba5313b3dac3bfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 22:49:30 +0000 Subject: [PATCH 119/338] belcard: 5.1.12 -> 5.2.12 --- pkgs/development/libraries/belcard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 0f251f73e81b..eb0ea3c94b28 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.1.12"; + version = "5.2.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-ZxO0Y4R04T+3K+08fEJ9krWfYSodQLrjBZYbGrKOrXI="; + sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY="; }; buildInputs = [ bctoolbox belr ]; From 4babff9d9f4c2ba9fc27001d20746e8260f7f21f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 00:22:44 +0000 Subject: [PATCH 120/338] your-editor: 1403 -> 1503 --- pkgs/applications/editors/your-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 094274aa7bd7..09bc1793818a 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1403"; + version = "1503"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-hG0ZRAxWOdFtDgKcDysu89LOdULZmJHLi7grfVjAbwM="; + sha256 = "sha256-tRS01z2SnWTDDUfQxZTWiagQuIULDA4aQ8390ZFBqn0="; }; installPhase = '' From caa22c43dbb8ab9576b3a6ddcfcf4b1e4f7cf282 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 00:35:32 +0000 Subject: [PATCH 121/338] tbls: 1.57.1 -> 1.58.0 --- pkgs/tools/misc/tbls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 8014461b542c..737752660a9e 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.57.1"; + version = "1.58.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-tFUkI+QNvvlorg2xk0obeFdEVKxv0T1rXr3tZUP0sGE="; + hash = "sha256-uHTE4x8cCM2O4dtqqV7zm7Eqi8xsqqxSUbcFvV2Vgv8="; }; - vendorHash = "sha256-E44gUzA9FW1TM0wfjVEmF5w/bgBrockluNIDkA7/hnU="; + vendorHash = "sha256-qMkAmtt9ERYcZEdxqFAI9P99niP3l13iQ6M4cDCz5Kw="; CGO_CFLAGS = [ "-Wno-format-security" ]; From 31f7acfbb5e1db8055d5931e9ffa4112bb49a64c Mon Sep 17 00:00:00 2001 From: Mel Bourgeois Date: Sat, 12 Nov 2022 19:36:51 -0600 Subject: [PATCH 122/338] yarn2nix: add easy yarn & nodejs pkg overrides Projects often require a specific major version of NodeJS, and sometimes a specific yarn version. Since yarn2nix utilities are accessed from nixpkgs now, there is no simple way to override versions of nodejs and yarn without complex solutions like an overlay. This adds `yarn` and `nodejs` as optional attribute arguments to `mkYarnModules`, `mkYarnPackage`, and `mkYarnWorkspace`. They default to the same versions that are currently being used, and the nodejs input to yarn is overridden so that it will match if only `nodejs` is overridden by the user. These arguments will also cascade from `mkYarnWorkspace` -> `mkYarnPackage` -> `mkYarnModules`, making per-package overrides very simple. --- .../tools/yarn2nix-moretea/yarn2nix/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 459de3928209..3af3e43fe21d 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -2,7 +2,7 @@ , nodejs ? pkgs.nodejs , yarn ? pkgs.yarn , allowAliases ? pkgs.config.allowAliases -}: +}@inputs: let inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal; @@ -70,6 +70,8 @@ in rec { offlineCache ? importOfflineCache yarnNix, yarnFlags ? [ ], ignoreScripts ? true, + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, pkgConfig ? {}, preBuild ? "", postBuild ? "", @@ -169,6 +171,8 @@ in rec { src, packageJSON ? src + "/package.json", yarnLock ? src + "/yarn.lock", + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, packageOverrides ? {}, ... }@attrs: @@ -226,7 +230,7 @@ in rec { inherit name; value = mkYarnPackage ( builtins.removeAttrs attrs ["packageOverrides"] - // { inherit src packageJSON yarnLock packageResolutions workspaceDependencies; } + // { inherit src packageJSON yarnLock nodejs yarn packageResolutions workspaceDependencies; } // lib.attrByPath [name] {} packageOverrides ); }) @@ -241,6 +245,8 @@ in rec { yarnLock ? src + "/yarn.lock", yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, yarnFlags ? [ ], yarnPreBuild ? "", yarnPostBuild ? "", @@ -268,7 +274,7 @@ in rec { preBuild = yarnPreBuild; postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig packageResolutions; + inherit packageJSON pname version yarnLock offlineCache nodejs yarn yarnFlags pkgConfig packageResolutions; }; publishBinsFor_ = unlessNull publishBinsFor [pname]; From a127c4bbb2d72854c77d749a6f799d3379fd5050 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 02:12:10 +0000 Subject: [PATCH 123/338] railway: 2.0.13 -> 2.1.0 --- pkgs/development/tools/railway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 31510c45d7f1..43eb79c0e1a4 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "railway"; - version = "2.0.13"; + version = "2.1.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NYYzMwwRm49YPcXUeriYIXjjK4ZJbbtF9Otr3MWXsiY="; + sha256 = "sha256-JpIy8u6L7yOZgTFxFft+vhcat3uPT9EvOXAQOmrpvpc="; }; ldflags = [ "-s" "-w" ]; - vendorSha256 = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + vendorHash = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; postInstall = '' mv $out/bin/cli $out/bin/railway From a7ed7f1fedc413cc51959fe044776846c8fc4ddd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 04:43:05 +0000 Subject: [PATCH 124/338] gfxreconstruct: 0.9.16.1 -> 0.9.17 --- pkgs/tools/graphics/gfxreconstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix index 9dfd0def4a97..2c486b475322 100644 --- a/pkgs/tools/graphics/gfxreconstruct/default.nix +++ b/pkgs/tools/graphics/gfxreconstruct/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gfxreconstruct"; - version = "0.9.16.1"; + version = "0.9.17"; src = fetchFromGitHub { owner = "LunarG"; repo = "gfxreconstruct"; rev = "v${version}"; - hash = "sha256-6yUWXIJlfwaPT1SDVjSfO7Sj10DcpOLAbzASC4dLS1E="; + hash = "sha256-CkZxxMoV2cqyh4ck81ODPxTYuSeQ8Q33a/4lL7UOfIY="; fetchSubmodules = true; }; From 7e17e3ef7a10f35cbb9f5267a485e08ac0a7bb94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 04:50:17 +0000 Subject: [PATCH 125/338] pspg: 5.7.1 -> 5.7.2 --- pkgs/tools/misc/pspg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 3a3ab90d30b9..f2a2adca4c7e 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.7.1"; + version = "5.7.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-4h0W9jw95vOxpseyY7SydiWSFDArAY/ms4+Sk/1esHk="; + sha256 = "sha256-IwkvQ3zKdnZ0lefmRQCxD5aeMw7aFbUzfFQZG7GtXlo="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; From d26e77131a2e153d41587770631311bc378005f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 09:28:52 +0000 Subject: [PATCH 126/338] python310Packages.nbsphinx: 0.8.11 -> 0.8.12 --- pkgs/development/python-modules/nbsphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index ac562279a1e0..3a93825f8e0c 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.11"; + version = "0.8.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q+GMBLM9m837PWbxGV9rDVHuykY+ywf2Bh3kl+QzFuQ="; + hash = "sha256-dlcEFs3svrIdv1w9aqIEztbB3X6+9Ad7XCG4xuzpUz8="; }; propagatedBuildInputs = [ From bd52382cd209e5e80b6f397a88710816991cbdcf Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 20 Jan 2023 10:19:20 +0000 Subject: [PATCH 127/338] mysql-shell: 8.0.31 -> 8.0.32 --- pkgs/development/tools/mysql-shell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index 26dd21ef0dd4..c16cab26b7bc 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -39,16 +39,16 @@ let in stdenv.mkDerivation rec { pname = "mysql-shell"; - version = "8.0.31"; + version = "8.0.32"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - sha256 = "sha256-VA9dqvPmw2WXP3hAJS2xRTvxBM8D/IPsWYIaYwRZI/s="; + hash = "sha256-GUkeZ856/olOssiqkb3qc8ddnianVGXwrcW6hrIG3wE="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o="; + hash = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig="; }) ]; From 66389a20e5d4178cc4bddac4d2791c13583fd571 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 12:49:01 +0000 Subject: [PATCH 128/338] python310Packages.python-osc: 1.8.0 -> 1.8.1 --- pkgs/development/python-modules/python-osc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index ade67876ea0c..8c6fc7cc3d54 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2f8c187c68d239960fb2eddcb5346a62a9b35e64f2de045b3e5e509f475ca73d"; + sha256 = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; }; pythonImportsCheck = [ "pythonosc" ]; From e4da27936118b6c199f95f648c286fb6dc4f6ef7 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Fri, 20 Jan 2023 14:30:48 +0000 Subject: [PATCH 129/338] treewide: remove ninjin as maintainer --- maintainers/maintainer-list.nix | 9 --------- pkgs/development/compilers/julia/1.6-bin.nix | 2 +- pkgs/development/compilers/julia/1.8-bin.nix | 2 +- pkgs/development/tools/misc/om4/default.nix | 2 +- pkgs/tools/networking/fdm/default.nix | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3f534813908c..4c353c22b624 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10272,15 +10272,6 @@ githubId = 1219785; name = "Félix Baylac-Jacqué"; }; - ninjin = { - email = "pontus@stenetorp.se"; - github = "ninjin"; - githubId = 354934; - name = "Pontus Stenetorp"; - keys = [{ - fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; - }]; - }; nioncode = { email = "nioncode+github@gmail.com"; github = "nioncode"; diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index 79203ce7e0a3..cf72457a1434 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = [ "x86_64-linux" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index 198eeb445548..24eac49df9db 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin nickcao wegank ]; + maintainers = with lib.maintainers; [ raskin nickcao wegank ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/tools/misc/om4/default.nix b/pkgs/development/tools/misc/om4/default.nix index 30f1bb273fd3..4425ae52fb5f 100644 --- a/pkgs/development/tools/misc/om4/default.nix +++ b/pkgs/development/tools/misc/om4/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 bsd3 isc publicDomain ]; mainProgram = "m4"; platforms = platforms.unix; - maintainers = [ maintainers.ninjin ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index c67ceec69e8c..731fe83dc9bc 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with maintainers; [ ninjin raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux; homepage = "https://github.com/nicm/fdm"; downloadPage = "https://github.com/nicm/fdm/releases"; From dd931ff613f885a41bb9ddd73d9406355cef8ce7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 15:06:11 +0000 Subject: [PATCH 130/338] python310Packages.google-cloud-bigquery: 3.4.1 -> 3.4.2 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index bc80fc531ffe..cb72b6cdc524 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iEaJcU2YojZN3px8Nn6CKMcRYQi7rXpjZd/eORY4mFs="; + hash = "sha256-Ik3DKbxa0J1hTbdlyV8LuLJPCIGz0qSFQGLKNG+IlvA="; }; propagatedBuildInputs = [ From 2c0eceb86ce8a93711d9e0fe7cb638c9d9635414 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 17:21:35 +0000 Subject: [PATCH 131/338] python310Packages.google-cloud-speech: 2.16.2 -> 2.17.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 0bc05828dd19..c60c5507c963 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.16.2"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aegM+pgdKsM7qC8sfPMxV74gwPYasArFWzkJ/p9ESzU="; + hash = "sha256-Lb2oV2r7CE1qc5iaxzGpIm3xZKpsORx1Nofkjno6xNs="; }; propagatedBuildInputs = [ From ecb06398e741b754fa84e22257c24c81ef31194b Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 4 Jan 2023 20:15:25 +0100 Subject: [PATCH 132/338] Revert "nixos/nginx: disable configuration validation for now" This reverts commit 7ef58bce9d2e261ecfd4f0b5c1fb4a7da6888dc0. --- nixos/modules/services/web-servers/nginx/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6fafae8928a6..b2dd58180f1d 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -581,9 +581,7 @@ in }; validateConfig = mkOption { - # FIXME: re-enable if we can make of the configurations work. - #default = pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; - default = false; + default = pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; defaultText = literalExpression "pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform"; type = types.bool; description = lib.mdDoc '' From aa4780077a715970541db2e382e5a108de51098e Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 4 Jan 2023 20:15:57 +0100 Subject: [PATCH 133/338] Revert "nixos: add release notes for nginx config validation" This reverts commit 26a411b2cb177f88856dfbd1c85367a7647d4d61. --- .../manual/from_md/release-notes/rl-2305.section.xml | 10 ---------- nixos/doc/manual/release-notes/rl-2305.section.md | 2 -- 2 files changed, 12 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 82e28b913a19..0424d269ac7c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -248,16 +248,6 @@ llvmPackages_rocm.clang-unwrapped. - - - The Nginx module now validates the syntax of config files at - build time. For more complex configurations (using - include with out-of-store files notably) - you may need to disable this check by setting - services.nginx.validateConfig - to false. - - The EC2 image module previously detected and automatically diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b01d372c2dcb..2fe557949b05 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -67,8 +67,6 @@ In addition to numerous new and upgraded packages, this release has the followin - `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. -- The Nginx module now validates the syntax of config files at build time. For more complex configurations (using `include` with out-of-store files notably) you may need to disable this check by setting [services.nginx.validateConfig](#opt-services.nginx.validateConfig) to `false`. - - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. From cb73862665c040d89fbb4a66210ead376f69e468 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 4 Jan 2023 20:16:10 +0100 Subject: [PATCH 134/338] Revert "nixos/nginx: validate syntax of config file at build time" This reverts commit a768871934dd263423fca2979cedd7f5e8c7379d. This is too fragile, it breaks at least on: * ssl dh params * hostnames in proxypass and upstreams are resolved in the sandbox --- .../services/web-servers/nginx/default.nix | 47 ++----------------- nixos/tests/nginx.nix | 2 +- 2 files changed, 4 insertions(+), 45 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index b2dd58180f1d..c723b962c847 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -288,7 +288,7 @@ let configPath = if cfg.enableReload then "/etc/nginx/nginx.conf" - else finalConfigFile; + else configFile; execCommand = "${cfg.package}/bin/nginx -c '${configPath}'"; @@ -440,38 +440,6 @@ let ); mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; - - snakeOilCert = pkgs.runCommand "nginx-config-validate-cert" { nativeBuildInputs = [ pkgs.openssl.bin ]; } '' - mkdir $out - openssl genrsa -des3 -passout pass:xxxxx -out server.pass.key 2048 - openssl rsa -passin pass:xxxxx -in server.pass.key -out $out/server.key - openssl req -new -key $out/server.key -out server.csr \ - -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com" - openssl x509 -req -days 1 -in server.csr -signkey $out/server.key -out $out/server.crt - ''; - validatedConfigFile = pkgs.runCommand "validated-nginx.conf" { nativeBuildInputs = [ cfg.package ]; } '' - # nginx absolutely wants to read the certificates even when told to only validate config, so let's provide fake certs - sed ${configFile} \ - -e "s|ssl_certificate .*;|ssl_certificate ${snakeOilCert}/server.crt;|g" \ - -e "s|ssl_trusted_certificate .*;|ssl_trusted_certificate ${snakeOilCert}/server.crt;|g" \ - -e "s|ssl_certificate_key .*;|ssl_certificate_key ${snakeOilCert}/server.key;|g" \ - > conf - - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so \ - NIX_REDIRECTS="/etc/resolv.conf=/dev/null" \ - nginx -t -c $(readlink -f ./conf) > out 2>&1 || true - if ! grep -q "syntax is ok" out; then - echo nginx config validation failed. - echo config was ${configFile}. - echo 'in case of false positive, set `services.nginx.validateConfig` to false.' - echo nginx output: - cat out - exit 1 - fi - cp ${configFile} $out - ''; - - finalConfigFile = if cfg.validateConfig then validatedConfigFile else configFile; in { @@ -580,15 +548,6 @@ in ''; }; - validateConfig = mkOption { - default = pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; - defaultText = literalExpression "pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform"; - type = types.bool; - description = lib.mdDoc '' - Validate the generated nginx config at build time. The check is not very robust and can be disabled in case of false positives. This is notably the case when cross-compiling or when using `include` with files outside of the store. - ''; - }; - additionalModules = mkOption { default = []; type = types.listOf (types.attrsOf types.anything); @@ -1126,7 +1085,7 @@ in }; environment.etc."nginx/nginx.conf" = mkIf cfg.enableReload { - source = finalConfigFile; + source = configFile; }; # This service waits for all certificates to be available @@ -1145,7 +1104,7 @@ in # certs are updated _after_ config has been reloaded. before = sslTargets; after = sslServices; - restartTriggers = optionals cfg.enableReload [ finalConfigFile ]; + restartTriggers = optionals cfg.enableReload [ configFile ]; # Block reloading if not all certs exist yet. # Happens when config changes add new vhosts/certs. unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames); diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 73f1133bd6ca..d9d073822a14 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -61,7 +61,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { specialisation.reloadWithErrorsSystem.configuration = { services.nginx.package = pkgs.nginxMainline; - services.nginx.virtualHosts."hello".extraConfig = "access_log /does/not/exist.log;"; + services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;"; }; }; }; From 184e1bd255d611d985fa5f3c7195fdd7464013c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Jan 2023 11:42:04 -0800 Subject: [PATCH 135/338] python311Packages.urwid: fix tests apply https://github.com/urwid/urwid/pull/517 --- pkgs/development/python-modules/urwid/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 57e64ba97a89..6e93f6007caf 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , glibcLocales }: @@ -15,6 +16,15 @@ buildPythonPackage rec { sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; }; + patches = [ + # https://github.com/urwid/urwid/pull/517 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/urwid/urwid/commit/42c1ed1eeb663179b265bae9b384d7ec11c8a9b5.patch"; + hash = "sha256-Oz8O/M6AdqbB6C/BB5rtxp8FgdGhZUxkSxKIyq5Dmho="; + }) + ]; + # tests need to be able to set locale LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales ]; From 66095d913ba5c7cd2894f76acfa275a0a3b13153 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 20:02:48 +0000 Subject: [PATCH 136/338] libyang: 2.1.4 -> 2.1.30 --- pkgs/development/libraries/libyang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index 2bf595aae1ba..fa7d125f91b4 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.4"; + version = "2.1.30"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-qmJHCADFqxjnxdDYxGmgZId3pxxgB8kw2UGBwYGauOc="; + sha256 = "sha256-EtAm6VbxTDNOEna5zCnGW23CPWlAxe4LpWwXmLPvo/Y="; }; nativeBuildInputs = [ From e1729f54e3ea25163f4ea26dc3e4ca448188ec46 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 20 Jan 2023 21:43:14 +0100 Subject: [PATCH 137/338] bundler: 2.4.3 -> 2.4.4 --- .../ruby-modules/bundler/default.nix | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 4645a3530c58..032b61958fa1 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,32 +1,40 @@ -{ lib, buildRubyGem, ruby, writeScript }: +{ lib, buildRubyGem, ruby, writeScript, testers, bundler }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.3"; - source.sha256 = "sha256-AfX4PydFNdghhYk3cApKLxtTw8L8sLEvU3Y49nKHxwA="; + version = "2.4.4"; + source.sha256 = "sha256-gwAxWVkd9nptMRtaZc++8PmJZdIDVr66wUv1xi1NPJ0="; dontPatchShebangs = true; - passthru.updateScript = writeScript "gem-update-script" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts jq - - set -eu -o pipefail - - latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) - update-source-version ${gemName} "$latest_version" - ''; - postFixup = '' sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle ''; + passthru = { + updateScript = writeScript "gem-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts jq + + set -eu -o pipefail + + latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) + update-source-version ${gemName} "$latest_version" + ''; + tests.version = testers.testVersion { + package = bundler; + command = "bundler -v"; + version = version; + }; + }; + meta = with lib; { description = "Manage your Ruby application's gem dependencies"; homepage = "https://bundler.io"; changelog = "https://github.com/rubygems/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [anthonyroussel]; + maintainers = with maintainers; [ anthonyroussel ]; + mainProgram = "bundler"; }; } From a20c3c53ea7a66b6e00a57d5e1dae7d02956573c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 20:58:56 +0000 Subject: [PATCH 138/338] python310Packages.beartype: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/beartype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 1a238a3937c5..1c4368cfb99f 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-OFS1Dqqpi7iUkL5X5zxpx3eg8wRXTnBDrH2pisanNaY="; + hash = "sha256-O3VFs/MzprBwQraLECFBVUya3S6Xnat7D47WN49699c="; }; checkInputs = [ From a48603ca4091d81d752f610c1bf85d2aa6bc5d3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 21:18:59 +0000 Subject: [PATCH 139/338] python310Packages.pytorch-lightning: 1.8.6 -> 1.9.0 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index b5957968ba55..65d2cf850a9a 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.8.6"; + version = "1.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-5AyOCeRFiV7rdmoBPx03Xju6eTR/3jiE+HQBiEmdzmo="; + hash = "sha256-zlOIZYwNoUkznRcwNn8LQIEM4UuG6mPnqQIH+O4Jun4="; }; preConfigure = '' From 435992b527f753cf69d0239182d70a71f52cc3d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 21:38:20 +0000 Subject: [PATCH 140/338] libva-utils: 2.17.0 -> 2.17.1 --- pkgs/development/libraries/libva/utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index dff497fbdc30..a46af497a55d 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-zv62Jznifw3GG5n8CIE7rJu0POx0aT8btO9N6CoBfAE="; + sha256 = "sha256-xsKOoDVt6L3L+6uBrKo/pyeHvQ4GgH312WKesT8XVLs="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From ec8d74d58a215a75f062a0d9f7b2e6437d1bce30 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Fri, 20 Jan 2023 22:39:16 +0100 Subject: [PATCH 141/338] nixos/systemd-confinement: remove unused rootName --- nixos/modules/security/systemd-confinement.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index be04741f4d06..cdf6c22ef1b6 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -94,7 +94,6 @@ in { }; config = let - rootName = "${mkPathSafeName name}-chroot"; inherit (config.confinement) binSh fullUnit; wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs"); in lib.mkIf config.confinement.enable { From 94dcb01e54bfb3e9beb9dbb55f3c5055030009b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 21:53:29 +0000 Subject: [PATCH 142/338] kube-capacity: 0.7.1 -> 0.7.3 --- .../networking/cluster/kube-capacity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index c7d14748e80f..7e7bba1d37b3 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-+1qewL8N3WTS7GW6fpL2+RPbFQQ/3DDMgShtBi+lRtg="; + sha256 = "sha256-lNpUOA6O9sOBugYp9fDklKo6U2E0nKz1ORr3qO2tibg="; }; - vendorSha256 = "sha256-sMobdarMMktf34LbQnyZ6sgbfiJhWxWSQR0F+4x5J58="; + vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; meta = with lib; { description = From 9f4081dee6701a74053bc56f9e726744286f133f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 23:03:25 +0000 Subject: [PATCH 143/338] circleci-cli: 0.1.22924 -> 0.1.23117 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 29be3fe3edad..a6ba7777bf13 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.22924"; + version = "0.1.23117"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zfkvSfwjh3HUE0aKvBLQuNnT+GBWCOWM+mwrAdZUJ9U="; + sha256 = "sha256-w7vBDJnkfpdOaNJWlo0fCRvdqEzImCn9y22Xflg/aH0="; }; - vendorSha256 = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; + vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; nativeBuildInputs = [ installShellFiles ]; From dd43a864fd6b83e0b048d71f1a6fd52aad7ef81f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 23:04:24 +0000 Subject: [PATCH 144/338] minio: 2022-12-12T19-27-27Z -> 2023-01-18T04-36-38Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index c513f0e860b9..3e61b500a427 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-12-12T19-27-27Z"; + version = "2023-01-18T04-36-38Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gHtWLCmjzaN1+7x5w9QKjF1pGNZB9mIun2KnvQyVnE4="; + sha256 = "sha256-2MCaC6rgeNNjm7KRv/FsOCBCkERqUaoCQH76y2S8YTU="; }; - vendorSha256 = "sha256-0ryxdAdixnUbp3kj5KN2CB4t153azfYML75T4ROMoHw="; + vendorHash = "sha256-+m/zzT+w05f4xboZ+yYsVWP8bG8Z0W+UlXefSB1b5Po="; doCheck = false; From 6293b70394d638e7102fb4510b15b33d98439e13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 00:23:01 +0000 Subject: [PATCH 145/338] rocksdb: 7.8.3 -> 7.9.2 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 233a69e57b4e..057baafdc610 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.8.3"; + version = "7.9.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HVLxLltOZ0e9BCekynjdc+f/fTS9vz15GZVKB77uDXo="; + sha256 = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; nativeBuildInputs = [ cmake ninja ]; From 4d6d77ce36c12679ae2a78c6b283c975f73ed28f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 21 Jan 2023 01:28:39 +0100 Subject: [PATCH 146/338] python3Packages.hdf5plugin: init at 4.1.0 --- .../python-modules/hdf5plugin/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/hdf5plugin/default.nix diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix new file mode 100644 index 000000000000..0716c65f2fb4 --- /dev/null +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, h5py +}: + +buildPythonPackage rec { + pname = "hdf5plugin"; + version = "4.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "silx-kit"; + repo = "hdf5plugin"; + rev = "refs/tags/v${version}"; + hash = "sha256-fFR5t8jHOQc6eDNDhDcntibaveGAmI+j/dVte1tdcyk="; + }; + + propagatedBuildInputs = [ + h5py + ]; + + checkPhase = '' + python test/test.py + ''; + pythonImportsCheck = [ + "hdf5plugin" + ]; + + preBuild = '' + mkdir src/hdf5plugin/plugins + ''; + + meta = with lib; { + description = "Additional compression filters for h5py"; + longDescription = '' + hdf5plugin provides HDF5 compression filters and makes them usable from h5py. + Supported encodings: Blosc, Blosc2, BitShuffle, BZip2, FciDecomp, LZ4, SZ, SZ3, Zfp, ZStd + ''; + homepage = "http://www.silx.org/doc/hdf5plugin/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e1a758e4d4c..7c31e50feef8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4155,6 +4155,8 @@ self: super: with self; { hdate = callPackage ../development/python-modules/hdate { }; + hdf5plugin = callPackage ../development/python-modules/hdf5plugin { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; From e118890edb7bbd38b09db406c6def95cf8ec6aa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 00:49:02 +0000 Subject: [PATCH 147/338] terragrunt: 0.42.7 -> 0.43.0 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 920c687176e7..bfe34115719a 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.42.7"; + version = "0.43.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WbvRqXzqPBBhJU2ELgNC2jHnOYxmR7dZ1ynA8ObWdxU="; + hash = "sha256-GOYSFhKfe8+9YBNyfCEUDCMssH9cXZi1S/KJTqPgBhY="; }; - vendorHash = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4="; + vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; doCheck = false; From 2c5a3273ce7242ac6e7f80877d43639d98432661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 00:56:58 +0000 Subject: [PATCH 148/338] kubergrunt: 0.10.0 -> 0.10.1 --- pkgs/applications/networking/cluster/kubergrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 94441c960c01..eb098b2c6c78 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-HJZrE0fHlyOTQF9EqdrtQNmaHlrMA2RwNg4P7B2lYI0="; + sha256 = "sha256-vIqmE9U/0WGIaTpy8NfUadIkaTdN8YKqvRLQ/69NgBE="; }; - vendorSha256 = "sha256-9hWX6INN5HWXyeFQRjkqr+BsGv56lInVYacvT6Imahw="; + vendorHash = "sha256-K/Cw7Sh/2OqTbWQPEsoQbj/ejyaXcLxFT8Rg5Ore5DE="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure From dbfbb823b772d314bd85ce499c804db8f8b2e793 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 01:00:04 +0000 Subject: [PATCH 149/338] cubiomes-viewer: 2.6.1 -> 3.0.0 --- pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 5f7f101ad613..4b1a2b2a69f0 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.6.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-ZXqe+696dNYTkNidEA+s5QQ7Euu7WOdl0EMLU5pKdOY="; + sha256 = "sha256-yT8PDmMntnd5meDPJm1rekfDVgmWFSZTNFEH03AKCy0="; fetchSubmodules = true; }; From a9f4ee567cc1132b89fd9f14e94b5bf135f0dba6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Jan 2023 09:26:04 +0800 Subject: [PATCH 150/338] libquotient: 0.7.0 -> 0.7.1 --- pkgs/development/libraries/libquotient/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index c112f0a33485..4d029ec8030f 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -1,20 +1,24 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia, qtkeychain }: +{ mkDerivation, lib, fetchFromGitHub, cmake, olm, openssl, qtmultimedia, qtkeychain }: mkDerivation rec { pname = "libquotient"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-9NAWphpAI7/qWDMjsx26s+hOaQh0hbzjePfESC7PtXc="; + hash = "sha256-3xnv1dcyeX3Kl5EH2Tlf6nXobLG1zXsFmYstnvmSAXA="; }; - buildInputs = [ qtmultimedia qtkeychain ]; + buildInputs = [ olm openssl qtmultimedia qtkeychain ]; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DQuotient_ENABLE_E2EE=ON" + ]; + # https://github.com/quotient-im/libQuotient/issues/551 postPatch = '' substituteInPlace Quotient.pc.in \ @@ -23,7 +27,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "A Qt5 library to write cross-platform clients for Matrix"; + description = "A Qt5/Qt6 library to write cross-platform clients for Matrix"; homepage = "https://matrix.org/docs/projects/sdk/quotient"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens ]; From 46c363cd3062e6eac691439082cfbd03938e3fba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 02:31:33 +0000 Subject: [PATCH 151/338] python310Packages.flake8-bugbear: 23.1.17 -> 23.1.20 --- pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 0f6e27e637a6..ba9448038ad2 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.1.17"; + version = "23.1.20"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XfHBQWtx8Chf23U6oxOl9yUsoenxWE3EYV0/edJobAM="; + hash = "sha256-JO6S9LjCEZKeUKxUpkqEw+RJ47HLbwQOOOKhHwnmWVI="; }; propagatedBuildInputs = [ From abb32825d9ab180861b9cc9c00bef303a830a409 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 03:42:16 +0000 Subject: [PATCH 152/338] python310Packages.cupy: 11.4.0 -> 11.5.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 5af0f0813043..79f1e1084603 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "11.4.0"; + version = "11.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-A9UrJibgKjorRtcUwc0D5wLI/jORX8ym7Y3lxTmWT0k="; + sha256 = "sha256-S8hWW97SLMibIQ/Z+0il1TFvMHAeErsjhSpgMU4fn24="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both From ea5910f66cdc898251303e2b34d2d14333026aa0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 1 Jan 2023 16:14:13 +0300 Subject: [PATCH 153/338] forgejo: 1.18.0-rc1-1 -> 1.18.2-0 --- .../version-management/forgejo/default.nix | 57 ++++++++++++++++--- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 2cc8bb3c816a..819f9bf8b716 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -1,25 +1,66 @@ -{ fetchurl, gitea, lib }: +{ lib +, stdenv +, buildGoPackage +, fetchurl +, makeWrapper +, git +, bash +, gzip +, openssh +, pam +, pamSupport ? true +, sqliteSupport ? true +}: -gitea.overrideAttrs (old: rec { +buildGoPackage rec { pname = "forgejo"; - version = "1.18.0-rc1-1"; + version = "1.18.2-0"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/976c426a-3e04-49ff-9762-47fab50624a3"; - hash = "sha256-kreBMHlMVB1UeG67zMbszGrgjaROateCRswH7GrKnEw="; + url = "https://codeberg.org/attachments/5d59ec04-9f29-4b32-a1ef-bec5c3132e26"; + hash = "sha256-RLShwdx8geyFr1Jk5qDVbsEt2hCjdrwX0lNHea7P+pk="; }; - postInstall = old.postInstall or "" + '' - mv $out/bin/{${old.pname},${pname}} + outputs = [ "out" "data" ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = lib.optional pamSupport pam; + + patches = [ + ./../gitea/static-root-path.patch + ]; + + postPatch = '' + substituteInPlace modules/setting/setting.go --subst-var data ''; + tags = lib.optional pamSupport "pam" + ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + ldflags = [ + "-X main.Version=${version}" + "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + ]; + + postInstall = '' + mkdir $data + cp -R ./go/src/${goPackagePath}/{public,templates,options} $data + mkdir -p $out + cp -R ./go/src/${goPackagePath}/options/locale $out/locale + wrapProgram $out/bin/gitea \ + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} + ''; + + goPackagePath = "code.gitea.io/gitea"; + meta = with lib; { description = "A self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; + broken = stdenv.isDarwin; }; -}) +} From 06acfe84796e2c91f18659eebf83a62a6deb770a Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 20 Jan 2023 23:31:13 -0500 Subject: [PATCH 154/338] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index bd0299ccdcfb..25736a7944da 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2769,12 +2769,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-15"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "1953c0f2541446e8a56ba4e2f4477e91e78f6d13"; - sha256 = "0q2mqnag7nv30p511xkrn50jb2w8m8jaw5ryxs3wy1r92mbbbjqc"; + rev = "39bd110fc3fa7afa0b59e7665564b37c4b82d0a0"; + sha256 = "0xadgrkfb19c4g7gl46mj5pw29d04jdjxx21nyvzma09g94jdkam"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3348,12 +3348,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-01-12"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "addd6e174a85fc1c4007ab0b65d77e6555b417bf"; - sha256 = "09gnk8szbdxc26g46hyjw6zb41i9nswz7pxcadmx9x2f0j9sma3m"; + rev = "7b37bd5c2dd4d7abc86f2af096af79120608eeca"; + sha256 = "19kna3rjdzfx2ys07jwb413saj9dg25i9ym6r8037r7h65h42yz2"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3599,12 +3599,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-18"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "3cc3274f1275a7335b60c8199c43e4c03b5ea210"; - sha256 = "0gfypscwh5zzfk7967h9a7a5cc060ax0wyyxdf3wsiizq9nd89vc"; + rev = "a6082394ad65116784ea4a747a25b4831708d4e9"; + sha256 = "1mzxnlw3ml3xrsbbgsbyxn1mlnffarxz91j04g4d6vmz94a1d34w"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4139,12 +4139,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-19"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "75dcd5741d76e09b1a41c771fbc8b010a109b5cb"; - sha256 = "0p0idwnzx0x3v7vsjsk2ld4i61xgpa036cs7h3jdgynssgwdp8yg"; + rev = "96d759d1cbd8b0bd0ea0a0c2987f99410272f348"; + sha256 = "0jdgrj5m7iax90djx9n75lh8y9cwhzzrzg99w9rfk5zifb02j9qh"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4654,12 +4654,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-18"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "af60ac12fa1349dbad479fc1e95d5aea977c0c37"; - sha256 = "17md5a9rr7zrhj5yn45dmjqdx1fyvy92la7z6sfni2zqhl9kar1g"; + rev = "8c23e1af82bdafa86556a36c4e075079dd167771"; + sha256 = "1ngvfnb2qh04bc5bkrjw69ksq3aslbnpzxk0fhp8lp42g0xc0984"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4751,12 +4751,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-19"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "db162f3f32e54f3a4ee2f03c1ea08a5253a0500a"; - sha256 = "0scz36d4r3iz5d5g4bvxcqs15sqcdz9ry8fhhxrfz5zcsvwlj0wx"; + rev = "9660a811b2e0bd959b63c7f7d41853b49546544d"; + sha256 = "0ckaw9dqlcgqz4p103pl3di9sk7n8rmhyfyhpnqir5089a61h2c1"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5183,12 +5183,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-18"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "699b1c632b72be003ed9996b98ad168b561d9f75"; - sha256 = "0q1i11wc7xqbjkvbz33hp2vfslwnrkq50pq5cvg2f4yjkfv4fvr3"; + rev = "1970a31188a5cbae13f676b699cd35dafb52642f"; + sha256 = "00rdairr0rglipki6j6xw7d99hmfncn0hv3yn7msxs954kk5l7dn"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5207,12 +5207,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-18"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "15e9e7c1daa22ce83757cf1c304a038f0549cf47"; - sha256 = "177kpbrngvip2m1r4b8bhhpkqr0zrnpbpaxqy82s4npvb4p9yi33"; + rev = "e905fb76f78fa19500ca3b9fac256b057aad535a"; + sha256 = "1vhn1mqph5yp2xxciyvlnprsawbfcy1i4cd6dvnqid38fhq1936w"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-01-12"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "981207efd10425fef82ca09fa8bd22c3ac3e622d"; - sha256 = "16rfvllp4w1d3sph1zdilprp5kfwsc669zaspxnclyk0nyi8cs8b"; + rev = "30265e7a1bdf59361b37e293cdcecc167851c602"; + sha256 = "0fk29ggvncc26zx8zxdbyhqydxmvw3k71nf7ipp7pcxgkgm4zj4s"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5531,12 +5531,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-19"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "06816026ccce2e8246e952d55ea87ddd26a9d2a4"; - sha256 = "1wmf4f7z537fhnr79ijg05bb198wrl7im56m1phb6naa5fbpr0zc"; + rev = "3cdc23e302d6283d294f42ef5b57edb6dc9b6c5e"; + sha256 = "173w8i7blg9hxkda6qqk39zinw1v9qhq4qb9rjy39dry7g1j0z25"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5591,12 +5591,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-12-23"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "418e2507dcff84a7cb993ae4f37697b98e0c92ca"; - sha256 = "0zjlxq8xa7and5952lxz0irklxsrmh7k4bn905ggcd62hbpd5q6v"; + rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1"; + sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5639,12 +5639,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-01-19"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "ef3d4a438f96865e3ae018e33ed30156a955ed00"; - sha256 = "0aq4w4dsnzi31h2qqm2fdqnn9h021l5j1h9qm4xzk7ywa10ikq73"; + rev = "33cfeb7a761f08e8535dca722d4b237cabadd371"; + sha256 = "1lna5833nvk8db5jv549147078m6mzgzqvc42gqby8ma54rn6dq3"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5687,12 +5687,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-01-08"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "f00eb3b766c370cb34fdabc29c760338ba9e4c6c"; - sha256 = "147s9mq3vlvsf4wzm0x5aiwr374zhi3d6d2b9y52iwndwjvjkh0b"; + rev = "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc"; + sha256 = "1jiwwmm87d2i76jgimk40mydsg2jddpl7q9axy94g6411hkdq261"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5987,12 +5987,12 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2022-09-28"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "5d20935b99d976ffa0d8226a78a8b2e091f0f699"; - sha256 = "0mqczqcrz2iz0k52k5bglad6rbsr8dddm5mvb1gsihbqp0ijyj85"; + rev = "af051bfe2971fc888d21cdfc59f5444904353b43"; + sha256 = "0xi4546f7qcdmyq04l1rjzyvw7rj9dlhmhskwk1pzq90rnd8xa5w"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; @@ -6035,12 +6035,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-01-18"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "0a9c88dc0eee8bbe41cac4d3e16475a3c78f1242"; - sha256 = "16ari6m1jj1xvaaf9n118qsdcc30x55r9drf3x2s689h0f3kvj64"; + rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920"; + sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -6119,12 +6119,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-19"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d228bcf7cd94611929482a09e114a42c41fe81a8"; - sha256 = "0ad4yb1j6pizvy3fa4d9b7lzq5nv2pipb19fg6wz6xv62xymdly6"; + rev = "bb5675b2daa220a8716eda2c27b23307434f1c31"; + sha256 = "0bwlr193j6wpnmivr090njmdip9a66nqh0d6wma0c368fvsj5vcg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6359,24 +6359,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-17"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "e8a89db1bbc06510a76fc935754b4e99a3e5e8a7"; - sha256 = "1hhcayk60whd88d3nfhig00qjqx0h3shssl8xvhr7m8lkrkysigb"; + rev = "96506fee49542f3aedab76368d400a147fea344e"; + sha256 = "137gwzb6xq32mwkbzwqiw2i3bgjz07nd1xx7d6ys825a9akkddcn"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-19"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "42c3a3c51e8fef027655e7facd293aae7c6984bb"; - sha256 = "18sjvl4r02h8s88261kpfw6s084qf4cjhzdrciawhx34b6si9i52"; + rev = "c9615952e71397cec4cf89a9a0db0fb9c491a5e1"; + sha256 = "19lalxdy3q77bwhmr3mrnzjw34fyikpkyqcfg1z108slnxxkvz85"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6478,12 +6478,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-09"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "6c38926351372ea87034dec26182b62c835ff3bc"; - sha256 = "1qvpzja9j9hlnafmmsw5bjbbcf2fbn260bmcsmdy7pi17mrd5aha"; + rev = "9ca185ed23cc47bef66d97332f0694be568121e8"; + sha256 = "0wwilr4ic38x1navr8bkgv7p3fxrgjd7nyxqwla336981nrgg9y3"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6574,12 +6574,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-19"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "f5961e731f641206727eaded197e5879694c35f7"; - sha256 = "1q4wcmdbpx2si4ynq4hldbq2asq16qqwrf0lmcpqrldpziffgdv2"; + rev = "4e853eabcb002650096ef78f098253fe12ba3d8f"; + sha256 = "1w4smhf7givrpiwwl1cprvl1l6i74rl189q7frhl5ankhrlsi6l1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7297,12 +7297,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-01-17"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "49b538d095936733062fb2d24f7d6e4cee32a844"; - sha256 = "0v290jk7qkd7ywixmysxbbfz4c2a4gdy5h4488nrfdzpm88alwdr"; + rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7"; + sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -8527,12 +8527,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-18"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "b82c0d235440b44edb077a42179dbcc89a81629e"; - sha256 = "13iw5psvj41axdjyi3pvg7gk5zqhapgyw5k2pkib18hhwb31yxbv"; + rev = "15a2262dfcd7848fbafa5afea8adec3941b83c12"; + sha256 = "1jv13wvg6jcca3cw5swirna0jq5m3mj0pq7q113cpy11hd74bzh7"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -13849,12 +13849,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-01-19"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "e1fc2c3ade0d8872665d7570c493bbd5e11919c7"; - sha256 = "0svhbb1860wsgms9qp03y28p5v2iz9kw5n7sxz5zz7a33dwcrjdk"; + rev = "3d0c37ceb9412202ed53da879dfb33f32ede7bcb"; + sha256 = "1ijzrwa5pkblc7j6bdgn91q58abycwdy8cmyqn7f4kcq9d4v1nvn"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13921,12 +13921,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-01-19"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "ca5bc84ef68f18c6dc99962791f08dbc0163dce8"; - sha256 = "17kl1cwbr92c279jbvl230q98dc7i006hnz2d8lc23xki6ym8zix"; + rev = "57a29c0286bf16ea3c4f20d5938fc6680a198940"; + sha256 = "15yz5sg1lgibbmm3dk6xwvpmifwhzw107vrdk19zq2fxz5a8g5b7"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; From 39449304a01cd5a9198c90636db9be0770113381 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 20 Jan 2023 23:32:36 -0500 Subject: [PATCH 155/338] vimPlugins.term-edit-nvim: init at 2023-01-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 25736a7944da..729e83c66888 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8308,6 +8308,18 @@ final: prev: meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; + term-edit-nvim = buildVimPluginFrom2Nix { + pname = "term-edit.nvim"; + version = "2023-01-20"; + src = fetchFromGitHub { + owner = "chomosuke"; + repo = "term-edit.nvim"; + rev = "28a095d6c9691039a5680b644676bbc80c6bcc35"; + sha256 = "1qlq09wxmiqqkz23id2679lj7x3rnjlyzqd67vfcp06gahnb0wky"; + }; + meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; + }; + terminus = buildVimPluginFrom2Nix { pname = "terminus"; version = "2021-12-28"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2ba8c991512e..aa02a8971584 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -697,6 +697,7 @@ https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, +https://github.com/chomosuke/term-edit.nvim/,HEAD, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, https://github.com/ternjs/tern_for_vim/,, From 2ecfd2db3ba38d7380feeca28108bcba6bccf644 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 20 Jan 2023 23:32:54 -0500 Subject: [PATCH 156/338] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 5411c58f1489..a32f0fda65ab 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -115,12 +115,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "2574501"; + version = "eed2576"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "2574501b475b7ba7bc10d08dd1ff9732d3769662"; - hash = "sha256-bXwGZJ+lYTJyaD7kbQGL6hagpkgqqCsPHBiz9AOXfNc="; + rev = "eed2576ae17aae83595c4a4ce1e9c1cbf7071bb6"; + hash = "sha256-4X8X8l62bcv48Hti95MJ1GLtaeoAYi2tHy/oBt8qQVo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -349,12 +349,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "a8b8b0e"; + version = "14fd388"; source = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "a8b8b0e16c4f5552f5e85af3dec976a5d16af8b9"; - hash = "sha256-6eiRiTTPdMBRsxVHIHYuw0sIfRDvP4pZIEyckoo304Q="; + rev = "14fd38870c26dcae2ede1b989dc6531f1187f15e"; + hash = "sha256-TnVuHoJG3vYpjOiOQRkE+gB1aNWIaE8cbIV6x92swNk="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -1247,12 +1247,12 @@ }; scala = buildGrammar { language = "scala"; - version = "f6bbf35"; + version = "802eba3"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "f6bbf35de41653b409ca9a3537a154f2b095ef64"; - hash = "sha256-GNGD5UIPzpRQbGCp/fcBV6laPRhU5YQGbNiaAGis0CY="; + rev = "802eba33a1ae1ad9d873e5269dfcc9c4d86e4116"; + hash = "sha256-WZe4QjzdGAo9KWQlS66rUUxJax9pbl4p2YE/GfAmkAQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1439,12 +1439,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "7c5452a"; + version = "d3ef05e"; source = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "7c5452a0720271a349d6174b8778e76b189bebef"; - hash = "sha256-DJIA2gvwWWqTGrC48FZiRZNt048KiQ/4sZxYSnHmlEg="; + rev = "d3ef05eec4473094e2d691243aa243ce63de6406"; + hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; From dab5667370f3a2882834fee31eeb892f7d0305e2 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 21 Jan 2023 02:59:45 +0000 Subject: [PATCH 157/338] phosh: 0.22.0 -> 0.23.0 also added `updateScript` to ease future updates: ```sh $ nix-shell maintainers/scripts/update.nix --argstr package phosh ``` changelog: abbreviated changelog (included inline below): > phosh 0.23.0 > ------------ > Released December 2022 > * New lockscreen plugin for personal/emergency information > * Allow plugins to have UI to set preferences > * Ease creating plugin by better examples, improved helpers > and less duplication. > * Switch docs to gi-docgen --- .../window-managers/phosh/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index f18ca995b14b..441f4f255f78 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -1,11 +1,13 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config , python3 , wrapGAppsHook +, libadwaita , libhandy , libxkbcommon , libgudev @@ -13,7 +15,7 @@ , pulseaudio , evince , glib -, gtk3 +, gtk4 , gnome , gnome-desktop , gcr @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -43,10 +45,11 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-q2AYm+zbL4/pRG1wn+MT6IYM8CZt15o48U9+piMPf74="; + sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; }; nativeBuildInputs = [ + libadwaita meson ninja pkg-config @@ -71,7 +74,7 @@ stdenv.mkDerivation rec { gnome.gnome-control-center gnome-desktop gnome.gnome-session - gtk3 + gtk4 pam systemd upower @@ -127,11 +130,16 @@ stdenv.mkDerivation rec { ]; tests.phosh = nixosTests.phosh; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = with lib; { description = "A pure Wayland shell prototype for GNOME on mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; + changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; From bed9c9319f9b0c7bef1b70fc47cc5e8fd25107f9 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 21 Jan 2023 03:00:03 +0000 Subject: [PATCH 158/338] phosh-mobile-settings: 0.21.1 -> 0.23.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit also added `updateScript` to ease future updates: ```sh $ nix-shell maintainers/scripts/update.nix --argstr package phosh-mobile-settings ``` changelog: abbreviated changelog (included inline below): > phosh-mobile-settings 0.23.1 > ---------------------------- > Released: Junary 2023 > * Fix enabling plugins > > phosh-mobile-settings 0.23.0 > ---------------------------- > Released: December 2022 > * Allow lockscreen plugins to have preferences > > phosh-mobile-settings 0.22.0 > ---------------------------- > Released: September 2022 > * Avoid flicker on startup > * Minor fixes > * Sync version with phosh > * Contributors: > Guido Günther --- .../window-managers/phosh/phosh-mobile-settings.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 6786576e6edc..c09df0065ef4 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config @@ -17,19 +18,20 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.21.1"; + version = "0.23.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "guidog"; repo = "phosh-mobile-settings"; rev = "v${version}"; - sha256 = "sha256-60AXaKSF8bY+Z3TNlIIa7jZwQ2IkHqCbZ3uIlhkx6i0="; + sha256 = "sha256-D605efn25Dl3Bj92DZiagcx+MMcRz0GRaWxplBRcZhA="; }; nativeBuildInputs = [ meson ninja + phosh pkg-config wrapGAppsHook ]; @@ -41,7 +43,6 @@ stdenv.mkDerivation rec { libadwaita lm_sensors phoc - phosh wayland-protocols ]; @@ -56,9 +57,14 @@ stdenv.mkDerivation rec { --replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings" ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "A settings app for mobile specific things"; homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; + changelog = "https://gitlab.gnome.org/guidog/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; From 5adbb121e1172855c62bc34a6d4eb8baf56e3ec0 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 21 Jan 2023 00:15:00 -0500 Subject: [PATCH 159/338] =?UTF-8?q?python3Packages.debugpy:=201.6.5=20?= =?UTF-8?q?=E2=86=92=201.6.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/debugpy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index d5f500cb4058..ce4f772c3d0f 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Microsoft"; - repo = pname; + owner = "microsoft"; + repo = "debugpy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-98hyNer2Xtx6D2R3pFhLC3tb/2DFTawXO36xfwhIfEg="; + sha256 = "sha256-GanRWzGyg0Efa+kuU7Q0IOmO0ohXZIjuz8RZYERTpzo="; }; patches = [ From bc954f6b81ecd3a1a48f305c4354589d5c349d6d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Jan 2023 07:28:51 +0100 Subject: [PATCH 160/338] ocamlPackages.bjack: minor cleaning --- pkgs/development/ocaml-modules/bjack/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix index a102d27c2879..197d31638d61 100644 --- a/pkgs/development/ocaml-modules/bjack/default.nix +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -4,13 +4,11 @@ buildDunePackage rec { pname = "bjack"; version = "0.1.6"; - useDune2 = true; - src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-bjack"; rev = "v${version}"; - sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c"; + hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70="; }; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; From 4d33f74bec415989a3d7c6093f2a00d8165f3f16 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Jan 2023 07:28:57 +0100 Subject: [PATCH 161/338] ocamlPackages.opus: use Dune 3 --- pkgs/development/ocaml-modules/opus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/opus/default.nix b/pkgs/development/ocaml-modules/opus/default.nix index ecaf2090ca0f..104846b87f6e 100644 --- a/pkgs/development/ocaml-modules/opus/default.nix +++ b/pkgs/development/ocaml-modules/opus/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "opus"; version = "0.2.2"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-opus"; rev = "v${version}"; - sha256 = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg="; + hash = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg="; }; nativeBuildInputs = [ pkg-config ]; From 644c8f5cd5513ea66fbaed509bddd2ac2d44ab1e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Jan 2023 07:29:01 +0100 Subject: [PATCH 162/338] ocamlPackages.theora: use Dune 3 --- pkgs/development/ocaml-modules/theora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix index 0f7b4aca1c79..6849056d2ded 100644 --- a/pkgs/development/ocaml-modules/theora/default.nix +++ b/pkgs/development/ocaml-modules/theora/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "theora"; version = "0.4.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-theora"; rev = "v${version}"; - sha256 = "1sggjmlrx4idkih1ddfk98cgpasq60haj4ykyqbfs22cmii5gpal"; + hash = "sha256-VN1XYqxMCO0W9tMTqSAwWKv7GErTtRZgnC2SnmmV7+k="; }; buildInputs = [ dune-configurator ]; From a2339d5193b08d2c0dfd820e041cb71220c7e779 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Jan 2023 07:29:05 +0100 Subject: [PATCH 163/338] ocamlPackages.vorbis: use Dune 3 --- pkgs/development/ocaml-modules/vorbis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/vorbis/default.nix b/pkgs/development/ocaml-modules/vorbis/default.nix index f33182e5fc19..5bfb230e6c7c 100644 --- a/pkgs/development/ocaml-modules/vorbis/default.nix +++ b/pkgs/development/ocaml-modules/vorbis/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "vorbis"; version = "0.8.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-vorbis"; rev = "v${version}"; - sha256 = "1acy7yvf2y5dggzxw4vmrpdipakr98si3pw5kxw0mh7livn08al8"; + hash = "sha256-iCoE7I70wAp4n4XfETVKeaob2811E97/e6144bY/nqk="; }; buildInputs = [ dune-configurator ]; From 64e23c8501f4ae0b039d379e7dcfced88f169833 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Jan 2023 07:29:10 +0100 Subject: [PATCH 164/338] =?UTF-8?q?ocamlPackages.fdkaac:=200.3.2=20?= =?UTF-8?q?=E2=86=92=200.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/fdkaac/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix index d794e4acce79..f31a94e2c7d6 100644 --- a/pkgs/development/ocaml-modules/fdkaac/default.nix +++ b/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -4,16 +4,14 @@ buildDunePackage rec { pname = "fdkaac"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-fdkaac"; - rev = version; - sha256 = "10i6hsjkrpw7zgx99zvvka3sapd7zy53k7z4b6khj9rdrbrgznv8"; + rev = "v${version}"; + hash = "sha256-cTPPQKBq0EFo35eK7TXlszbodHYIg1g7v+yQ/rG7Y9I="; }; - useDune2 = true; - buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ fdk_aac ]; From 05ba3600263fa05202074f61f606116c460fe62c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 09:00:18 +0000 Subject: [PATCH 165/338] chezmoi: 2.29.2 -> 2.29.3 --- pkgs/tools/misc/chezmoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 0c5f59824bed..3d2214cc0bcc 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.29.2"; + version = "2.29.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-dbs1NMgLACbpjKBU3u+Sqczv2PgoLTH7mMIyAcHkMZQ="; + hash = "sha256-WrGbCyAjrwZHBMXxqrw7vC5J8b7xn7FUeoZ9IANRf0g="; }; vendorHash = "sha256-0heLEQFKxKxeNZGBd3GcTsOfhmDyxZRynVrAkF6vHvk="; From 553d3d63aa30d748c4ce61eb7f1b6f7935e35046 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 21 Jan 2023 10:04:55 +0100 Subject: [PATCH 166/338] cargo-public-api: 0.27.0 -> 0.27.1 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 2c21bf90bf18..5d1b99f02d8a 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.27.0"; + version = "0.27.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-NpOufmqaNsJeWv0I0PYRMs60rvWnUA3CrwsJ9U/t8Ps="; + sha256 = "sha256-mG+OjoOlpmmCpsAIs3m3FIRO36CrmWWgki9LgoXxiKo="; }; - cargoSha256 = "sha256-eFCqUV5P4QSvxqCjj4Esb/E0PosU5wJK31O92pRt1XA="; + cargoSha256 = "sha256-zfqqreNQhxetldE801e6/5KYFKsywXJVt7oIkm8ldS8="; nativeBuildInputs = [ pkg-config ]; From f8a3c4e94fb526d108fa8564fbe1fc1b416eea5e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 21 Jan 2023 10:16:41 +0100 Subject: [PATCH 167/338] nixos/grafana-image-renderer: use grafana freeform settings in provisioning --- nixos/modules/services/monitoring/grafana-image-renderer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index 60f6e84c63c7..7ea17b07567c 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -108,7 +108,7 @@ in { services.grafana.settings.rendering = mkIf cfg.provisionGrafana { url = "http://localhost:${toString cfg.settings.service.port}/render"; - callback_url = "http://localhost:${toString config.services.grafana.port}"; + callback_url = "http://localhost:${toString config.services.grafana.settings.server.http_port}"; }; services.grafana-image-renderer.chromium = mkDefault pkgs.chromium; From 6330f679b22faf8dfbd18e99884e14bca9029ed8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 11:41:28 +0100 Subject: [PATCH 168/338] python310Packages.cupy: add changelog to meta --- .../python-modules/cupy/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 79f1e1084603..56e7bf59519b 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,6 +1,15 @@ -{ lib, buildPythonPackage -, fetchPypi, isPy3k, cython -, fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cython +, fastrlock +, numpy +, six +, wheel +, pytestCheckHook +, mock +, setuptools , cudaPackages , addOpenGLRunpath }: @@ -14,7 +23,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S8hWW97SLMibIQ/Z+0il1TFvMHAeErsjhSpgMU4fn24="; + hash = "sha256-S8hWW97SLMibIQ/Z+0il1TFvMHAeErsjhSpgMU4fn24="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both @@ -67,6 +76,7 @@ in buildPythonPackage rec { meta = with lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; homepage = "https://cupy.chainer.org/"; + changelog = "https://github.com/cupy/cupy/releases/tag/v${version}"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; From 091ed1dd014aea82bb8b752b2daea424063f43e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 11:43:33 +0100 Subject: [PATCH 169/338] python310Packages.cupy: disable on unsupported Python releases --- pkgs/development/python-modules/cupy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 56e7bf59519b..b739ae865473 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,17 +1,16 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , cython , fastrlock , numpy -, six , wheel , pytestCheckHook , mock , setuptools , cudaPackages , addOpenGLRunpath +, pythonOlder }: let @@ -19,7 +18,8 @@ let in buildPythonPackage rec { pname = "cupy"; version = "11.5.0"; - disabled = !isPy3k; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -51,7 +51,6 @@ in buildPythonPackage rec { nccl fastrlock numpy - six setuptools wheel ]; From a4d747ca2fcafb868d99055f5dc7dfe490b99e3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 11:48:52 +0100 Subject: [PATCH 170/338] python310Packages.flake8-bugbear: update disabled --- pkgs/development/python-modules/flake8-bugbear/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index ba9448038ad2..b73aafa03b15 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "23.1.20"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; From 624d7907949ffd837ddd605180d940edefc0a442 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 11:47:56 +0000 Subject: [PATCH 171/338] minisign: 0.10 -> 0.11 --- pkgs/tools/security/minisign/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index a0e634730422..2ab1babcafc7 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minisign"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { repo = "minisign"; owner = "jedisct1"; rev = version; - sha256 = "sha256-uqlX4m1e5NTqqyI99j1c6/w/YQWeJC39FufpxAf4JT4="; + sha256 = "sha256-sczGs6du797WUkfr3JiTI/bUHp7vKEeZtJdCryFcYu8="; }; nativeBuildInputs = [ cmake pkg-config ]; From d56f961f10c4932121905a648bfc492ce6efe312 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 12:53:27 +0100 Subject: [PATCH 172/338] python310Packages.ormar: add changelog to meta --- pkgs/development/python-modules/ormar/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 873fe5b07261..57b43c3b562e 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -124,6 +124,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async ORM with fastapi in mind and pydantic validation"; homepage = "https://github.com/collerek/ormar"; + changelog = "https://github.com/collerek/ormar/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; From ed0605fe549127c989d58047302b0552d75442f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 11:54:34 +0000 Subject: [PATCH 173/338] ansible-lint: 6.10.2 -> 6.11.0 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index a4bf438f5ab3..1b5194c0acdf 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.10.2"; + version = "6.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4ihEmsLxDRwW3zXEdpKCtSmsH+K1B2czP60chaYt9nE="; + hash = "sha256-NIrDVsOBem25j7aZPsF7WyNsFjEiOHWfCj8U81Q6nlA="; }; postPatch = '' From 3d176d96a2b2746c4455f16a969797b4462e20c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 13:00:28 +0100 Subject: [PATCH 174/338] python310Packages.ormar: switch to pythonRelaxDepsHook --- .../python-modules/ormar/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 57b43c3b562e..e9b8dc358ede 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -8,6 +8,7 @@ , databases , fastapi , fetchFromGitHub +, httpx , importlib-metadata , mysqlclient , orjson @@ -18,6 +19,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , sqlalchemy , typing-extensions }: @@ -36,8 +38,15 @@ buildPythonPackage rec { hash = "sha256-B6dC9+t/pe7vsPb7rkGAbJWLfCAF7lIElFvt1pUu5yA="; }; + pythonRelaxDeps = [ + "databases" + "pydantic" + "SQLAlchemy" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -61,6 +70,7 @@ buildPythonPackage rec { aiosqlite asyncpg fastapi + httpx mysqlclient psycopg2 pymysql @@ -68,15 +78,10 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'SQLAlchemy = ">=1.3.18,<1.4.42"' 'SQLAlchemy = ">=1.3.18"' \ - --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.6.2"' 'databases = ">=0.5.5"' - ''; - disabledTests = [ # TypeError: Object of type bytes is not JSON serializable "test_bulk_operations_with_json" + "test_all_endpoints" # Tests require a database "test_model_multiple_instances_of_same_table_in_schema" "test_load_all_multiple_instances_of_same_table_in_schema" From fb4810b5e645fb3bdde7b0161a4521ba9ac5ec5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 13:04:36 +0100 Subject: [PATCH 175/338] python310Packages.json-logging: add missing input --- pkgs/development/python-modules/json-logging/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix index 35959520b35c..bd7188696f85 100644 --- a/pkgs/development/python-modules/json-logging/default.nix +++ b/pkgs/development/python-modules/json-logging/default.nix @@ -3,6 +3,7 @@ , fastapi , fetchFromGitHub , flask +, httpx , pytestCheckHook , pythonOlder , requests @@ -28,6 +29,7 @@ buildPythonPackage rec { checkInputs = [ fastapi flask + httpx pytestCheckHook # quart requests From 02197a1ae3e7894fcd2d82f2cd153dd2c2235a65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 12:20:29 +0000 Subject: [PATCH 176/338] astc-encoder: 4.2.0 -> 4.3.0 --- pkgs/tools/graphics/astc-encoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index b9d30adf396a..310045cd2320 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-zE0rXCmRz3z1P1wLm8aO7iQ/Yf1TJeEZqz9fB0Shsz4="; + sha256 = "sha256-FIskGHamKYYUtYmgwh7dS+bs2UPWIyBiviPkDAbVY+0="; }; nativeBuildInputs = [ cmake ]; From 63bc21662ff01fe52987e3e55627d520914a9684 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 12:21:15 +0000 Subject: [PATCH 177/338] convco: 0.3.14 -> 0.3.15 --- pkgs/development/tools/convco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index e00c3ed1aa0b..c3b0af4e8226 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-irn6L8tKOrtgTExLw5ycPLNZcnCKNEW6RayZVePVofw="; + sha256 = "sha256-a/C93Uuf++FIBqZSA0LaUQX4ZQoUMD2lHnV5MRlCw4g="; }; - cargoHash = "sha256-eoWtmUQf1/X4cd/b1aiNoN8HS+qrylaoTdq21/97kPU="; + cargoHash = "sha256-JQvLezX8L2yEDyiVxH93Uk1V5qFjwXNVQWEI9ur9YOQ="; nativeBuildInputs = [ cmake pkg-config ]; From 31210707b6e15e5509e6f3d5f9606a8e5bc382a0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 21 Jan 2023 12:18:22 +0100 Subject: [PATCH 178/338] chromiumBeta: 110.0.5481.30 -> 110.0.5481.38 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 89357423ab29..f63ffd997b45 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "110.0.5481.30", - "sha256": "03r2mpnrw9p188lajf69lpd94rcgj5a9hs2nlf01f0czl6nij0bx", - "sha256bin64": "0bpv4qgbbi8651x5mp8qyqxlxqm5x9csml1yi3789f7d40hs4vj9", + "version": "110.0.5481.38", + "sha256": "0y3clfzqnbyz0v53w3ha1kx4jb9skdf22ihs09i8b568dj1m9mwj", + "sha256bin64": "0gvxsgw0ywq8d689g8790fymhksqg744m3j7kg4hcnmiyqdajl0n", "deps": { "gn": { "version": "2022-12-12", From 5d7923fe1dc6c04961ed96d799e1abf7eba50326 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 21 Jan 2023 12:18:22 +0100 Subject: [PATCH 179/338] chromiumDev: 111.0.5532.2 -> 111.0.5545.6 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 89357423ab29..0704c4aeeac7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "111.0.5532.2", - "sha256": "0aaxfi4f88s1cfzyhngmsmb84awy85xjy6a8pk3bfamssgxj0981", - "sha256bin64": "1jjmqi27qwbnmcfq043gxws31v47yfkzs7jk7mxzzxbaqj7v3wf6", + "version": "111.0.5545.6", + "sha256": "0c5v7w0fbhrgqialncx0adyyah2026icwrxjwywridah1jrbm90a", + "sha256bin64": "1m3s40hibs3f1j3g2asq102iijjd59xrqqz7iv82za1slnrcbfg5", "deps": { "gn": { "version": "2022-12-12", From c3ac6156f4c968ec96d836635cbcaf44c7e0463e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 14:33:36 +0100 Subject: [PATCH 180/338] python310Packages.maison: init at 1.4.0 --- .../python-modules/maison/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/maison/default.nix diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix new file mode 100644 index 000000000000..8fa3393d1e93 --- /dev/null +++ b/pkgs/development/python-modules/maison/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, poetry-core +, pydantic +, pytestCheckHook +, pythonOlder +, toml +}: + +buildPythonPackage rec { + pname = "maison"; + version = "1.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dbatten5"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Ny/n1vDWS6eA9zLIB0os5zrbwvutb+7sQ6iPXeid1M0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + pydantic + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "maison" + ]; + + meta = with lib; { + description = "Library to read settings from config files"; + homepage = "https://github.com/dbatten5/maison"; + changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc0f49178e9..dc5d0f42c90b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5610,6 +5610,8 @@ self: super: with self; { mailsuite = callPackage ../development/python-modules/mailsuite { }; + maison = callPackage ../development/python-modules/maison { }; + Mako = callPackage ../development/python-modules/Mako { }; malduck= callPackage ../development/python-modules/malduck { }; From 58ed3f22460d61b67e9b8eafa92d2dc7cedfcb85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 14:35:53 +0100 Subject: [PATCH 181/338] python310Packages.yamlfix: 0.8.2 -> 1.5.0 Changelog: https://github.com/lyz-code/yamlfix/blob/1.5.0/CHANGELOG.md --- .../python-modules/yamlfix/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index b789aab03701..732fc56b81d6 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -2,28 +2,37 @@ , buildPythonPackage , click , fetchFromGitHub +, maison +, pdm-pep517 , pytest-xdist , pytestCheckHook , pythonOlder , ruyaml +, setuptools }: buildPythonPackage rec { pname = "yamlfix"; - version = "0.8.2"; - format = "setuptools"; + version = "1.5.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lyz-code"; repo = pname; - rev = version; - sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0="; + rev = "refs/tags/${version}"; + hash = "sha256-TdW2vVj5wZw8xANSRY8ke1ECw8UTDwRjJDD1g+p9DV4="; }; + nativeBuildInputs = [ + setuptools + pdm-pep517 + ]; + propagatedBuildInputs = [ click + maison ruyaml ]; @@ -32,11 +41,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'python_paths = "."' "" - ''; - pythonImportsCheck = [ "yamlfix" ]; @@ -44,7 +48,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python YAML formatter that keeps your comments"; homepage = "https://github.com/lyz-code/yamlfix"; - license = licenses.gpl3Plus; + changelog = "https://github.com/lyz-code/yamlfix/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; maintainers = with maintainers; [ koozz ]; }; } From 0565c5afeb64525a10bbdd5b8f50e36d30442e6e Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 21 Jan 2023 15:18:40 +0100 Subject: [PATCH 182/338] hwinfo: 22.1 -> 22.2 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index b990ce1c2ed9..df5138268aa9 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "22.1"; + version = "22.2"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-nGWpUqBkpiiNuH5kEHWR1/+0aYIeLf9k3AmzQR85Swk="; + hash = "sha256-Z/brrDrT2J4RAS+pm1xaBqWO7PG6cAVgRpH3G6Nn39E="; }; nativeBuildInputs = [ From 0fca396a585a544d1ef313b122692300e7b5de55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 14:30:30 +0000 Subject: [PATCH 183/338] clib: 2.8.2 -> 2.8.3 --- pkgs/tools/package-management/clib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 8175a87c5bb0..229c63ab7744 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "2.8.2"; + version = "2.8.3"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "sha256-O8elmwH63LU1o2SP+0aovQuhe+QTKOFGjBQ6MAb/6p8="; + sha256 = "sha256-Ld6u+F25SOyYr+JWXVmn5G8grQ39eN8EY7j77WNycEE="; }; makeFlags = [ "PREFIX=$(out)" ]; From 6c7bcbc9f96ec05d975858fdea6ef814e95e8854 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 21 Jan 2023 15:31:11 +0100 Subject: [PATCH 184/338] lsyncd: 2.2.3 -> 2.3.1 --- pkgs/applications/networking/sync/lsyncd/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 85f30c7f001a..cc9663dd6fc2 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -3,23 +3,15 @@ stdenv.mkDerivation rec { pname = "lsyncd"; - version = "2.2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x"; + hash = "sha256-QBmvS1HGF3VWS+5aLgDr9AmUfEsuSz+DTFIeql2XHH4="; }; - patches = [ - (fetchpatch { - sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8"; - name = "fix-non-versioned-lua-not-search-in-cmake.patch"; - url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch"; - }) - ]; - postPatch = '' substituteInPlace default-rsync.lua \ --replace "/usr/bin/rsync" "${rsync}/bin/rsync" From 523e1db565110f4f0cdd76bcde2d815415596440 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 14:35:25 +0000 Subject: [PATCH 185/338] krill: 0.12.0 -> 0.12.1 --- pkgs/servers/krill/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index 3eed49ff5ea7..e9562a082afd 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-U74x6zEQS/3JjzIeYlosqISZoZM7cOMcheJKtRYnPyo="; + hash = "sha256-JDLY+TjhPgOieVgvzFCDygzXwMCca/fJNZPfx4WNeO0="; }; - cargoSha256 = "sha256-CH97R9VGT7SFdJs6kWDIdOaV5Q6FtOPZ1tKcmI+zRgE="; + cargoHash = "sha256-2kQcTiOqculnDbd4MKBJXNn03d5Ppm+DliIEh8YV2pU="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; From 7b89f03dcfb45a25b41cd91ce322173d3b97a04d Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 21 Jan 2023 15:45:07 +0100 Subject: [PATCH 186/338] ngrok: 3.1.0 -> 3.1.1 --- pkgs/tools/networking/ngrok/versions.json | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json index 1d71e81d9bba..bd2f75e5ebe2 100644 --- a/pkgs/tools/networking/ngrok/versions.json +++ b/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/26QHEgwoE5Z/ngrok-v3-3.1.0-linux-386", - "sha256": "85f1da543cd77021862c757186220c414b849bb25a31c9e8cc280bc843bb3ba6", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/64nFcrEHYrW/ngrok-v3-3.1.1-linux-386", + "sha256": "ab7aa2adfa5e29da618142878e1aec93cc55ea5c8f7e69c2582baaad2e149b64", + "version": "3.1.1" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/7UAdGDeyg6i/ngrok-v3-3.1.0-linux-amd64", - "sha256": "2f6d941d421987daa37fbf3c726d875c9e3ef1c2e26bbf452223d64c0d2b2adb", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/dqrwdoEvP2Q/ngrok-v3-3.1.1-linux-amd64", + "sha256": "9e6575f21e71b0b89b775bf66aecac68535573965391b48bfe488e18b1796b9a", + "version": "3.1.1" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/hAZN7QUBMxw/ngrok-v3-3.1.0-linux-arm", - "sha256": "27ace158cadd1e5e5c6e9b2f0652bdf7ab0d4cf39e3d9454fbefcc6c6ec03d56", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/biK8Eisfsar/ngrok-v3-3.1.1-linux-arm", + "sha256": "fe5c1e3918b8973397ec70a6a46d2c70c784720dc95add6e7059ed501bf498bd", + "version": "3.1.1" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/5skoQje3DKb/ngrok-v3-3.1.0-linux-arm64", - "sha256": "668cc681c4d5bd6b4d205b8332091f8236575ebebd900b5ef9d273116471d820", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/d45uz1Sks8d/ngrok-v3-3.1.1-linux-arm64", + "sha256": "bf1ba6948bb20d31427eb453504d7fb1bfe447c25665172b8b6b4547c5b65f0f", + "version": "3.1.1" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/h7mizaTkyfP/ngrok-v3-3.1.0-darwin-amd64", - "sha256": "5f607e9f3aa699ae4e85ceeb25c275d9e720614f457423bc4657b3f48168cfad", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/24zbF9PjSKm/ngrok-v3-3.1.1-darwin-amd64", + "sha256": "9b1d77f0701089fd10e03a2c0835b4f04f1cc5155339336128c5491821d48513", + "version": "3.1.1" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/46gUrn19J7F/ngrok-v3-3.1.0-darwin-arm64", - "sha256": "0a2119d6ef9dcc0b6203d38b536483c417a59c355d505e92a4b6c7c96810ef4b", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/kxP7ohERZDY/ngrok-v3-3.1.1-darwin-arm64", + "sha256": "886ca873580717ca25ba9e7e3d06a0710b07cfd16bd939a43c9aa128aee00951", + "version": "3.1.1" } } From 41ccb6908717e1c3f8914914426aa913d34cf0ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 14:49:40 +0000 Subject: [PATCH 187/338] murex: 2.11.2200 -> 3.0.9310 --- pkgs/shells/murex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index af274958baa3..1f8e77394221 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "murex"; - version = "2.11.2200"; + version = "3.0.9310"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nyrZttTOWpr7rBc2Ks04cWMGZFmd7lVIz6mHa0m+dDE="; + sha256 = "sha256-UjEEP5gDS20PXgzeN1q/j9eydEF/EaB2+TyugHPbbqE="; }; - vendorSha256 = "sha256-hLz36ESf6To6sT/ha/yXyhG0U1gGw8HDfnrPJnws25g="; + vendorHash = "sha256-vr8r0C01FlJOiAJjbkHxxFpC8hlQNPdoWGARZUl8YGs="; subPackages = [ "." ]; From c0bb9519d797d7b4cdeda7060eb06e4477dd4ea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 14:54:52 +0000 Subject: [PATCH 188/338] ticker: 4.5.4 -> 4.5.5 --- pkgs/applications/misc/ticker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 4d3baf3feaeb..310349a440ee 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2Q+5EVeF8kXO4RogQIQHafV0AKIEKBFGqt27Vkanwss="; + sha256 = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; }; - vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; + vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" From 61ddf369edf12e08d1d0a2a6b46c8a28c4353d38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:29:54 +0100 Subject: [PATCH 189/338] python310Packages.xml2rfc: add changelog to meta --- pkgs/development/python-modules/xml2rfc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 5a9b839c3b57..9406183651b1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; version = "3.15.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -34,7 +35,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; + hash = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; }; postPatch = '' @@ -71,18 +72,21 @@ buildPythonPackage rec { python-fontconfig ]; - # requires Noto Serif and Roboto Mono font + # Requires Noto Serif and Roboto Mono font doCheck = false; checkPhase = '' make tests-no-network ''; - pythonImportsCheck = [ "xml2rfc" ]; + pythonImportsCheck = [ + "xml2rfc" + ]; meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; homepage = "https://github.com/ietf-tools/xml2rfc"; + changelog = "https://github.com/ietf-tools/xml2rfc/blob/v${version}/CHANGELOG.md"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; From b6b24d2787176e653e120882a35e32d6136c2449 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:41:01 +0100 Subject: [PATCH 190/338] python311Packages.kitchen: update meta - add pythonImportsCheck --- .../python-modules/kitchen/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 0b6f41d2c199..e60650594855 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,16 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + buildPythonPackage rec { pname = "kitchen"; version = "1.2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q"; + hash = "sha256-uEz1gvG9FVa2DrxzcLnTMeuSR7awcM6J3+lZy6LAsDw="; }; + # Waiting for upstream's clean-up + doCheck = false; + + pythonImportsCheck = [ + "kitchen" + ]; + meta = with lib; { description = "Kitchen contains a cornucopia of useful code"; - license = licenses.lgpl2; + homepage = "https://github.com/fedora-infra/kitchen"; + changelog = "https://github.com/fedora-infra/kitchen/blob/${version}/NEWS.rst"; + license = licenses.lgpl2Only; maintainers = with maintainers; [ ]; }; } From 2acca392a20123d0e89226b77d9d44bd0d9cdf09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:43:40 +0100 Subject: [PATCH 191/338] python311Packages.xml2rfc: add missing input --- .../python-modules/xml2rfc/default.nix | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 9406183651b1..8eba965ec7d1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,27 +1,27 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, intervaltree -, pyflakes -, requests -, lxml -, google-i18n-address -, pycountry -, html5lib -, six -, kitchen -, pypdf2 -, dict2xml -, weasyprint -, pyyaml -, jinja2 -, configargparse , appdirs +, buildPythonPackage +, configargparse , decorator +, dict2xml +, fetchFromGitHub +, google-i18n-address +, html5lib +, intervaltree +, jinja2 +, lxml +, markupsafe , pycairo +, pycountry +, pyflakes +, pypdf2 , pytestCheckHook , python-fontconfig +, pythonOlder +, pyyaml +, requests +, six +, wcwidth }: buildPythonPackage rec { @@ -47,22 +47,22 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + appdirs + configargparse + dict2xml + google-i18n-address + html5lib intervaltree jinja2 + lxml + markupsafe + pycountry pyflakes + pypdf2 pyyaml requests - lxml - google-i18n-address - pycountry - html5lib six - kitchen - pypdf2 - dict2xml - weasyprint - configargparse - appdirs + wcwidth ]; checkInputs = [ From 2e3942ce2308b16cc18bc92b8c70511060b5ce23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:45:49 +0100 Subject: [PATCH 192/338] python311Packages.xml2rfc: 3.15.3 -> 3.16.0 Diff: https://github.com/ietf-tools/xml2rfc/compare/refs/tags/v3.15.3...v3.16.0 Changelog: https://github.com/ietf-tools/xml2rfc/blob/v3.16.0/CHANGELOG.md --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 8eba965ec7d1..0e252dda69ae 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.15.3"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; + hash = "sha256-H2m6WZTIu2xLIz3ysOZcicIibPj8mErrxYM2+F07aS0="; }; postPatch = '' From d7eab4d187d74287d0c650e91f9ce7d0b0c41abe Mon Sep 17 00:00:00 2001 From: linsui Date: Sat, 21 Jan 2023 23:52:29 +0800 Subject: [PATCH 193/338] weylus: fix build --- pkgs/applications/graphics/weylus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 6cef9384e4c7..0a238e87fac8 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -14,6 +14,7 @@ , pango , pipewire , cmake +, git , autoconf , libtool , nodePackages @@ -63,6 +64,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake + git nodePackages.typescript makeWrapper ] ++ lib.optionals stdenv.isLinux [ From 858559a8f6a37765a9b63bb63d57ccd89027aae0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 16:03:24 +0000 Subject: [PATCH 194/338] rabbitmq-server: 3.11.6 -> 3.11.7 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index dc47265ce4f3..e1ff2e14cf34 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.11.6"; + version = "3.11.7"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-gwLr5oXviZdgNxUpEezqNT+0n6Blt6RlHMe4+OZjFDc="; + hash = "sha256-m1O/k/w9WLSRpKADo79DU+vf4z41l6nfJpIwpY1dGgA="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; From 9cef2ea597d6bf277c4e02a9a04ccc3b777ab26a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 17:10:01 +0100 Subject: [PATCH 195/338] python311Packages.paver: add missing input --- .../python-modules/paver/default.nix | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 8721ef3dd601..d46d6eaa2934 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -1,33 +1,53 @@ { lib , buildPythonPackage -, fetchPypi -, nose , cogapp +, fetchPypi , mock +, nose +, pytestCheckHook +, pythonOlder +, six , virtualenv }: buildPythonPackage rec { + pname = "paver"; version = "1.3.4"; - pname = "Paver"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d3e6498881485ab750efe40c5278982a9343bc627e137b11adced627719308c7"; + pname = "Paver"; + inherit version; + hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc="; }; - buildInputs = [ cogapp mock virtualenv ]; + propagatedBuildInputs = [ + six + ]; - propagatedBuildInputs = [ nose ]; + checkInputs = [ + cogapp + mock + nose + pytestCheckHook + virtualenv + ]; - # the tests do not pass - doCheck = false; + pythonImportsCheck = [ + "paver" + ]; + + disabledTestPaths = [ + # Test depends on distutils + "paver/tests/test_setuputils.py" + ]; meta = with lib; { description = "A Python-based build/distribution/deployment scripting tool"; - homepage = "https://github.com/paver/paver"; + homepage = "https://github.com/paver/paver"; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; - } From 5f65fb8ed8bcf8c51427c340381e355fedee4d23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 16:21:26 +0000 Subject: [PATCH 196/338] opentelemetry-collector: 0.68.0 -> 0.69.1 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 42f127836e4a..647b6aa0c198 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.68.0"; + version = "0.69.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-hb+T4sEYagraqiAHjoy6rp+wFtsyuYmK+biX78TV7cA="; + sha256 = "sha256-p/epsqaDQNPS2gd3fN/Ny0XtGIeoKI7hdZVI1bqvg4s="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-WvZzAZtkkzWjE1TBzR4bCUdux6YyZ1VUl15hKRjNPyE="; + vendorHash = "sha256-AIn38bjnYX9gAaKXTyIA7Lv5/oRzy3BMK5Q+9JvapFI="; preBuild = '' # set the build version, can't be done via ldflags From 63ff217996b7d470905bbdcac256e144fbf6700d Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 21 Jan 2023 11:21:40 -0500 Subject: [PATCH 197/338] nixpkgs-hammering: init at unstable-2022-11-15 --- pkgs/tools/nix/nixpkgs-hammering/default.nix | 63 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/nix/nixpkgs-hammering/default.nix diff --git a/pkgs/tools/nix/nixpkgs-hammering/default.nix b/pkgs/tools/nix/nixpkgs-hammering/default.nix new file mode 100644 index 000000000000..8cec4597d30b --- /dev/null +++ b/pkgs/tools/nix/nixpkgs-hammering/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, stdenv +, makeWrapper +, python3 +, nix +}: + +let + version = "unstable-2022-11-15"; + + src = fetchFromGitHub { + owner = "jtojnar"; + repo = "nixpkgs-hammering"; + rev = "1b038ef38fececb39b65a4cdfa7273ed9d9359b4"; + hash = "sha256-5wZGGTahP1Tlu+WAgGx8Q9YnnHtyhfScl9j6X3W+Toc="; + }; + + meta = with lib; { + description = "A set of nit-picky rules that aim to point out and explain common mistakes in nixpkgs package pull requests"; + homepage = "https://github.com/jtojnar/nixpkgs-hammering"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; + + rust-checks = rustPlatform.buildRustPackage { + pname = "nixpkgs-hammering-rust-checks"; + inherit version src meta; + sourceRoot = "${src.name}/rust-checks"; + cargoHash = "sha256-YiC9mts6h15ZGdLKKmCVNNdTWDPtbDF0J5pwtjc6YKM="; + }; +in + +stdenv.mkDerivation { + pname = "nixpkgs-hammering"; + + inherit version src; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + AST_CHECK_NAMES=$(find ${rust-checks}/bin -maxdepth 1 -type f -printf "%f:") + + install -Dt $out/bin tools/nixpkgs-hammer + wrapProgram $out/bin/nixpkgs-hammer \ + --prefix PATH : ${lib.makeBinPath [ nix rust-checks ]} \ + --set AST_CHECK_NAMES ''${AST_CHECK_NAMES%:} + + cp -r lib overlays $out + + runHook postInstall + ''; + + meta = meta // { + mainProgram = "nixpkgs-hammer"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1df342fa13dd..93f48f592a76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37554,6 +37554,8 @@ with pkgs; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; + nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { }; + rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; From 0c541d2ac5953980ed8835c0a3167f85109f017b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 16:58:56 +0000 Subject: [PATCH 198/338] imgproxy: 3.13.0 -> 3.13.1 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 68064cbc3d5b..08df456cfea0 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-dPGqiNGUI5WwqT65DvY6JXv9/1lc1NZlJbMWUYGgfYY="; + sha256 = "sha256-4P8Q8VM2+O4Du2u+LFmqGQYw8qvEuBGq2nz9FxvGQhE="; rev = "v${version}"; }; From dc784f5c93b7206bfdde0dc938c37e3a84dbd62e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 17:07:25 +0000 Subject: [PATCH 199/338] doppler: 3.52.1 -> 3.53.0 --- pkgs/tools/security/doppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 630983842a46..f4accf3f8098 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.52.1"; + version = "3.53.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-ppgFUO5WxraG83zX8tHahT/ixSJjrTmmiIrJPpbkZVs="; + sha256 = "sha256-Z6GQQYvf+qXunrazNR0a7nCBx84JLtHWeK2+WV1RuwU="; }; - vendorSha256 = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784="; + vendorHash = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784="; ldflags = [ "-s -w" From 31e1a8e317024131c20e64722bee5b13e0801918 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 21 Jan 2023 18:25:58 +0100 Subject: [PATCH 200/338] v8: fix build on x86_64-darwin --- pkgs/development/libraries/v8/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index c3f04eae4ddf..7ca5080cb74c 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -105,6 +105,10 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} + ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace build/config/compiler/BUILD.gn \ + --replace "-Wl,-fatal_warnings" "" + ''} touch build/config/gclient_args.gni ''; From 92bb58819b76da9838909dfc499666e0368eca86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 17:50:04 +0100 Subject: [PATCH 201/338] python311Packages.python_fedora: update meta --- .../python-modules/python_fedora/default.nix | 47 ++++++++++++++++--- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 6a5c6a304f14..7f4e6e2a4fd5 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -1,22 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver -, six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }: +{ lib +, beautifulsoup4 +, buildPythonPackage +, bunch +, fetchPypi +, kitchen +, lockfile +, munch +, openidc-client +, paver +, pythonOlder +, requests +, six +, urllib3 +}: buildPythonPackage rec { pname = "python-fedora"; version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "56b9d841a39b4030e388e90c7b77dacd479f1ce5e2ff9b18c3954d97d5709a19"; + hash = "sha256-VrnYQaObQDDjiOkMe3fazUefHOXi/5sYw5VNl9Vwmhk="; }; - propagatedBuildInputs = [ kitchen requests bunch paver lockfile - six munch urllib3 beautifulsoup4 openidc-client ]; + + propagatedBuildInputs = [ + beautifulsoup4 + bunch + kitchen + lockfile + munch + openidc-client + paver + requests + six + urllib3 + ]; + doCheck = false; + pythonImportsCheck = [ + "fedora" + ]; + meta = with lib; { - description = "Python Fedora Module"; + description = "Module to interact with the infrastructure of the Fedora Project"; homepage = "https://github.com/fedora-infra/python-fedora"; - license = licenses.lgpl2; + changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/1.1.1"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; } From 7a9fe3580927ba74d5b5a5b827e33ec8f4406414 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 18:36:48 +0100 Subject: [PATCH 202/338] python311Packages.bunch: use fork --- .../python-modules/bunch/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index 2758ff5b4185..39c858ebb676 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -1,17 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: buildPythonPackage rec { pname = "bunch"; - version = "1.0.1"; + version = "unstable-2017-11-21"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; + disabled = pythonOlder "3.7"; + + # Use a fork as upstream is dead + src = fetchFromGitHub { + owner = "olivecoder"; + repo = pname; + rev = "71ac9d5c712becd4c502ab3099203731a0f1122e"; + hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "rU" "r" + ''; + + # No real tests available doCheck = false; + pythonImportsCheck = [ + "bunch" + ]; + meta = with lib; { + description = "Python dictionary that provides attribute-style access"; + homepage = "https://github.com/dsc/bunch"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } From 087b38754583e3f1f661ccd14b9b1084d24c871c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 18:42:57 +0100 Subject: [PATCH 203/338] ticker: add changelog to meta --- pkgs/applications/misc/ticker/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 310349a440ee..765462d78acf 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -10,14 +10,16 @@ buildGoModule rec { src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; + rev = "refs/tags/v${version}"; + hash = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; }; vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ - "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" + "-s" + "-w" + "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" ]; # Tests require internet @@ -26,6 +28,7 @@ buildGoModule rec { meta = with lib; { description = "Terminal stock ticker with live updates and position tracking"; homepage = "https://github.com/achannarasappa/ticker"; + changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ siraben ]; }; From 33edd6b3a00c85954454065758fdfc547813c13f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 18:19:42 +0000 Subject: [PATCH 204/338] snappymail: 2.24.5 -> 2.24.6 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index a87cba2cc3f1..3a5c3b47e6b0 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.24.5"; + version = "2.24.6"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-LqipclpQe2eDWNgapdEpgqzAh1jz4uyJHEQem0Z9g4w="; + sha256 = "sha256-CGpPmarY990084/Whkk3YjzupPqU4FqAfpTXNFXIAH4="; }; sourceRoot = "snappymail"; From ff2a1f4c80c3d24ac6981f7e48469ec31f8439d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 18:29:11 +0000 Subject: [PATCH 205/338] x11docker: 7.4.2 -> 7.6.0 --- pkgs/applications/virtualization/x11docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 7837bd3751a4..f6612f3d9aea 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.4.2"; + version = "7.6.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-oyxD6VCut7OfFYozdP0D2+ocOvidTrtaYrh0oCfZzBY="; + sha256 = "sha256-DehAWrEvoE/zWbfjQmF5Z7HTaQL5WMA/279Ee1Xm47g="; }; nativeBuildInputs = [ makeWrapper ]; From 1ca68ee7b5f66dda308b667f1c24bb7a35b43c9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 19:31:55 +0100 Subject: [PATCH 206/338] python310Packages.parameterized: switch to pytestCheckHook - disable failing tests - add changelog to meta --- .../python-modules/parameterized/default.nix | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index ae9537539884..a6083836714b 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,39 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales -, isPy3k , mock , nose +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "parameterized"; version = "0.8.1"; - disable = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; + hash = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; }; - nativeCheckInputs = [ - nose + checkInputs = [ mock - glibcLocales + nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - LC_ALL="en_US.UTF-8" nosetests -v - runHook postCheck - ''; + pytestFlagsArray = [ + "parameterized/test.py" + ]; - pythonImportsCheck = [ "parameterized" ]; + disabledTests = [ + # Tests seem outdated + "test_method" + "test_with_docstring_0_value1" + "test_with_docstring_1_v_l_" + "testCamelCaseMethodC" + ]; + + pythonImportsCheck = [ + "parameterized" + ]; meta = with lib; { description = "Parameterized testing with any Python test framework"; homepage = "https://github.com/wolever/parameterized"; + changelog = "https://github.com/wolever/parameterized/blob/v${version}/CHANGELOG.txt"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; From 4c61d3b499558199f7364e66fe6cfec464d432fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 18:52:05 +0000 Subject: [PATCH 207/338] brial: 1.2.11 -> 1.2.12 --- pkgs/development/libraries/science/math/brial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 142641398f56..6ec28ba1c226 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.11"; + version = "1.2.12"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "sha256-GkaeBggOCiIWNBZoIaCvAcqGDRc/whTOqPZbGpAxWIk="; + sha256 = "sha256-y6nlqRBJRWohGDAKe/F37qBP1SgtFHR1HD+erFJReOM="; }; # FIXME package boost-test and enable checks From d95c81cc615ca1996e642ccb0ddf05668e198b69 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Sat, 21 Jan 2023 16:15:32 -0300 Subject: [PATCH 208/338] protontricks: 1.7.0 -> 1.10.1 --- .../protontricks/default.nix | 4 +- .../protontricks/steam-run.patch | 361 ++++++++++++------ 2 files changed, 242 insertions(+), 123 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 5084bc48fb77..d8d3ff24450f 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -14,13 +14,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.7.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "sha256-StI9UdSILcCUmViQnxteOJr6xLSz+EgtxRpJis57lBY="; + sha256 = "sha256-gKrdUwX5TzeHHXuwhUyI4REPE6TNiZ6lhonyMCHcBCA="; }; patches = [ diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 92565f88fdd0..bcc1fc989836 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,19 +1,18 @@ diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py -index 8be6c71..f5772df 100755 +index c77d287..236c2a9 100755 --- a/src/protontricks/cli/main.py +++ b/src/protontricks/cli/main.py -@@ -14,8 +14,8 @@ import sys - - from .. import __version__ - from ..gui import select_steam_app_with_gui +@@ -17,8 +17,7 @@ from ..flatpak import (FLATPAK_BWRAP_COMPATIBLE_VERSION, + get_running_flatpak_version) + from ..gui import (prompt_filesystem_access, select_steam_app_with_gui, + select_steam_installation) -from ..steam import (find_legacy_steam_runtime_path, find_proton_app, -- find_steam_path, get_steam_apps, get_steam_lib_paths) -+from ..steam import (find_proton_app, find_steam_path, get_steam_apps, -+ get_steam_lib_paths) - from ..util import get_running_flatpak_version, FLATPAK_BWRAP_COMPATIBLE_VERSION, run_command +- find_steam_installations, get_steam_apps, ++from ..steam import (find_proton_app, find_steam_installations, get_steam_apps, + get_steam_lib_paths) + from ..util import run_command from ..winetricks import get_winetricks_path - from .util import (CustomArgumentParser, cli_error_handler, enable_logging, -@@ -60,8 +60,7 @@ def main(args=None): +@@ -67,8 +66,7 @@ def main(args=None, steam_path=None, steam_root=None): "WINE: path to a custom 'wine' executable\n" "WINESERVER: path to a custom 'wineserver' executable\n" "STEAM_RUNTIME: 1 = enable Steam Runtime, 0 = disable Steam " @@ -23,9 +22,9 @@ index 8be6c71..f5772df 100755 "PROTONTRICKS_GUI: GUI provider to use, accepts either 'yad' " "or 'zenity'" ), -@@ -151,17 +150,9 @@ def main(args=None): - if not steam_path: - exit_("Steam installation directory could not be found.") +@@ -204,17 +202,9 @@ def main(args=None, steam_path=None, steam_root=None): + if not steam_path: + exit_("No Steam installation was selected.") - # 2. Find the pre-installed legacy Steam Runtime if enabled - legacy_steam_runtime_path = None @@ -43,47 +42,99 @@ index 8be6c71..f5772df 100755 else: use_steam_runtime = False logger.info("Steam Runtime disabled.") -@@ -222,7 +213,6 @@ def main(args=None): +@@ -281,7 +271,6 @@ def main(args=None, steam_path=None, steam_root=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, command=[str(winetricks_path), "--gui"], - use_bwrap=use_bwrap - ) -@@ -290,7 +280,6 @@ def main(args=None): + use_bwrap=use_bwrap, + start_wineserver=start_background_wineserver +@@ -361,7 +350,6 @@ def main(args=None, steam_path=None, steam_root=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, + start_wineserver=start_background_wineserver, command=[str(winetricks_path)] + args.winetricks_command - ) -@@ -301,7 +290,6 @@ def main(args=None): +@@ -373,7 +361,6 @@ def main(args=None, steam_path=None, steam_root=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, + start_wineserver=start_background_wineserver, # Pass the command directly into the shell *without* - # escaping it +diff --git a/src/protontricks/data/scripts/bwrap_launcher.sh b/src/protontricks/data/scripts/bwrap_launcher.sh +index b5552e1..b11bc99 100644 +--- a/src/protontricks/data/scripts/bwrap_launcher.sh ++++ b/src/protontricks/data/scripts/bwrap_launcher.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # Helper script + set -o errexit + +@@ -80,6 +80,8 @@ done + log_info "Following directories will be mounted inside container: ${mount_dirs[*]}" + log_info "Using temporary directory: $PROTONTRICKS_TEMP_PATH" + +-exec "$STEAM_RUNTIME_PATH"/run --share-pid --launcher \ ++exec steam-run "$STEAM_RUNTIME_PATH"/pressure-vessel/bin/pressure-vessel-wrap \ ++--variable-dir="${PRESSURE_VESSEL_VARIABLE_DIR:-$STEAM_RUNTIME_PATH/var}" \ ++--share-pid --launcher \ + "${mount_params[@]}" -- \ + --bus-name="com.github.Matoking.protontricks.App${STEAM_APPID}_${PROTONTRICKS_SESSION_ID}" +diff --git a/src/protontricks/data/scripts/wine_launch.sh b/src/protontricks/data/scripts/wine_launch.sh +index 1f8a432..2d82f2b 100644 +--- a/src/protontricks/data/scripts/wine_launch.sh ++++ b/src/protontricks/data/scripts/wine_launch.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env -S steam-run bash + # Helper script created by Protontricks to run Wine binaries using Steam Runtime + set -o errexit + +@@ -158,8 +158,8 @@ if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$PROTON_LD_LIBRARY_PATH" + log_info "Appending to LD_LIBRARY_PATH: $PROTON_LD_LIBRARY_PATH" + elif [[ "$PROTONTRICKS_STEAM_RUNTIME" = "legacy" ]]; then +- export LD_LIBRARY_PATH="$PROTON_LD_LIBRARY_PATH" +- log_info "LD_LIBRARY_PATH set to $LD_LIBRARY_PATH" ++ export LD_LIBRARY_PATH="$PROTON_LD_LIBRARY_PATH":"$LD_LIBRARY_PATH" ++ log_info "Inserting to head of LD_LIBRARY_PATH: $PROTON_LD_LIBRARY_PATH" + fi + exec "$PROTON_DIST_PATH"/bin/@@name@@ "$@" || : + elif [[ "$PROTONTRICKS_STEAM_RUNTIME" = "bwrap" ]]; then +diff --git a/src/protontricks/data/scripts/wineserver_keepalive.sh b/src/protontricks/data/scripts/wineserver_keepalive.sh +index 8168dae..559de33 100644 +--- a/src/protontricks/data/scripts/wineserver_keepalive.sh ++++ b/src/protontricks/data/scripts/wineserver_keepalive.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # A simple keepalive script that will ensure a wineserver process is kept alive + # for the duration of the Protontricks session. + # This is accomplished by launching a simple Windows batch script that will diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index a291762..8af06c5 100644 +index c39b51d..79de098 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py -@@ -12,8 +12,8 @@ from .util import lower_dict, is_flatpak_sandbox +@@ -14,9 +14,8 @@ from .util import lower_dict __all__ = ( - "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", -- "find_legacy_steam_runtime_path", "get_appinfo_sections", -- "get_tool_appid", "find_steam_compat_tool_app", "find_appid_proton_prefix", -+ "get_appinfo_sections", "get_tool_appid", -+ "find_steam_compat_tool_app", "find_appid_proton_prefix", + "COMMON_STEAM_DIRS", "SteamApp", "find_steam_installations", +- "find_steam_path", "find_legacy_steam_runtime_path", +- "iter_appinfo_sections", "get_appinfo_sections", "get_tool_appid", +- "find_steam_compat_tool_app", "find_appid_proton_prefix", ++ "find_steam_path", "iter_appinfo_sections", "get_appinfo_sections", ++ "get_tool_appid", "find_steam_compat_tool_app", "find_appid_proton_prefix", "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", - "get_custom_compat_tool_installations_in_dir", "get_custom_compat_tool_installations", - "find_current_steamid3", "get_appid_from_shortcut", -@@ -326,37 +326,6 @@ def find_steam_path(): - return None, None + "get_custom_compat_tool_installations_in_dir", + "get_custom_compat_tool_installations", "find_current_steamid3", +@@ -393,37 +392,6 @@ def find_steam_path(): + return None, None -def find_legacy_steam_runtime_path(steam_root): @@ -118,30 +169,31 @@ index a291762..8af06c5 100644 - - APPINFO_STRUCT_HEADER = "<4sL" - APPINFO_STRUCT_SECTION = " Date: Sat, 21 Jan 2023 14:16:06 -0500 Subject: [PATCH 209/338] sic-image-cli: 0.21.0 -> 0.21.1 Diff: https://github.com/foresterre/sic/compare/v0.21.0...v0.21.1 Changelog: https://github.com/foresterre/sic/blob/v0.21.1/CHANGELOG.md --- pkgs/tools/graphics/sic-image-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/tools/graphics/sic-image-cli/default.nix index a16ff4df17b8..e3fbcf438857 100644 --- a/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-mXBiEicybtMilqXxPg8JDN0vPWT2KOFvyV+Ffo5AvlI="; + sha256 = "sha256-JSBvHbqGTwjiKRPuomXtFLgu77ZB4bOlV/JgzIxaWC0="; }; - cargoSha256 = "sha256-XuQnh+hww7/6htrYwZAF0Jl7+7lXUCDRT5/e5YwVEIo="; + cargoSha256 = "sha256-HWnYBLxiz7Kd5rmgTFeIG8XtiRzhRKuo/vunJRPLdWU="; nativeBuildInputs = [ installShellFiles nasm ]; From 24b49e4a6ffd6cdc155cd0d184c23d9b3a6a7f17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 20:07:50 +0000 Subject: [PATCH 210/338] frugal: 3.16.2 -> 3.16.12 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 3d2f3b867ca2..42f76eb092be 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.2"; + version = "3.16.12"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zZ4CueyDugaOY62KCyTcbF2QVvp0N8pI/ChmQSscn1w="; + sha256 = "sha256-Kdy3bh76c2sgwAwSxzCs83jTVLJmnH0YcYtKH9UvJew="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-0pPSEYPGluuRsDuTa2wmDPY6PqG3+YeJG6mphf8X96M="; + vendorHash = "sha256-S45/wxwyoSBmHsttY+pQSE1Ipg7oH3RrCoBeuC1pxeo="; meta = with lib; { description = "Thrift improved"; From bda05fe2a3dd49b225b2299488956562c52e9508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 21 Jan 2023 21:08:53 +0100 Subject: [PATCH 211/338] python310Packages.sqlalchemy-migrate: mark broken on python 3.11 --- .../sqlalchemy-migrate/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index bfae1d7b3b9d..e1f7fa15f589 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python -, scripttest, pytz, pbr, tempita, decorator, sqlalchemy -, six, sqlparse, testrepository +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, python +, pythonAtLeast +, scripttest +, pytz +, pbr +, tempita +, decorator +, sqlalchemy +, six +, sqlparse +, testrepository }: buildPythonPackage rec { @@ -51,5 +64,8 @@ buildPythonPackage rec { description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]); + # using deprecated inspect.getargspec function + # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/2003619 + broken = pythonAtLeast "3.11"; }; } From 50cd191b88f694669aed3c00d1f0891ab55ae2f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Jan 2023 21:13:57 +0000 Subject: [PATCH 212/338] esphome: 2022.12.3 -> 2022.12.4 https://github.com/esphome/esphome/releases/tag/2022.12.4 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 5a1f469f915a..6b891dcf3750 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.12.3"; + version = "2022.12.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9yyfcygEmnOcaooSg9bmGGOP2aph0i6d/Ot4nGlTPw4="; + hash = "sha256-HU4S6U5v0r93z4T6JpclEF6Cw6vy0VoprVyI4Z2Ti7s="; }; postPatch = '' From 840ad971499bd686abf4a45023892490d35eea47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Sat, 21 Jan 2023 22:12:08 +0100 Subject: [PATCH 213/338] litecli: ignore failing test The issue is introduced by sqlparse 0.4.3 Resolves #211482 --- pkgs/development/tools/database/litecli/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 98a4a27e4b53..34264dad65f6 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -28,6 +28,10 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "litecli" ]; + disabledTests = [ + "test_auto_escaped_col_names" + ]; + meta = with lib; { description = "Command-line interface for SQLite"; longDescription = '' From 62b9dc3abb57084d9c50806c34bbee8f098fad17 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Jan 2023 21:22:59 +0000 Subject: [PATCH 214/338] platformio: Relax starlette constraint --- pkgs/development/embedded/platformio/core.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 2df7e177e923..61a09e047344 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -22,7 +22,7 @@ with python3.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16"' \ - --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1,<=0.21"' \ + --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1"' \ --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ --replace 'wsproto==' 'wsproto>=' ''; From f3d85e35055703375911ddd3e4c989689bb633fd Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 21 Jan 2023 22:04:16 +0100 Subject: [PATCH 215/338] uptime-kuma: 1.19.2 -> 1.19.6 --- .../monitoring/uptime-kuma/default.nix | 13 +- .../monitoring/uptime-kuma/node-packages.nix | 463 +++++++++--------- .../monitoring/uptime-kuma/package.json | 11 +- 3 files changed, 245 insertions(+), 242 deletions(-) diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 83d8e1a9d52b..943ee9ce1589 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -4,16 +4,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uptime-kuma"; - version = "1.19.2"; + version = "1.19.6"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = finalAttrs.version; - sha256 = "yWQ3O3sCW6YKpE8BKgJjrKmLD9NyccaqyzQOXlSCC8I="; + sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8="; }; - uiSha256 = "sha256-aaQB1S8PmWU7brncRwEHG5bWEcyxD3amaq7Z6vpP92o="; + uiSha256 = "sha256-oeXklGxAPsUoLRT6DAVRgWm0kvKbLFW4IBc0Rh3j5V4="; patches = [ # Fixes the permissions of the database being not set correctly @@ -21,13 +21,6 @@ stdenv.mkDerivation (finalAttrs: { ./fix-database-permissions.patch ]; - postPatch = '' - substituteInPlace server/ping-lite.js \ - --replace "/bin/ping" "${iputils}/bin/ping" \ - --replace "/sbin/ping6" "${iputils}/bin/ping" \ - --replace "/sbin/ping" "${iputils}/bin/ping" - ''; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/servers/monitoring/uptime-kuma/node-packages.nix b/pkgs/servers/monitoring/uptime-kuma/node-packages.nix index 41dfb46aa606..d840c3968ba3 100644 --- a/pkgs/servers/monitoring/uptime-kuma/node-packages.nix +++ b/pkgs/servers/monitoring/uptime-kuma/node-packages.nix @@ -112,13 +112,13 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.32.0" = { + "@azure/msal-browser-2.32.1" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.0"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.0.tgz"; - sha512 = "uDP0vNmIefM6+RjILGKu+zOiN+VGnEvxRfUIV5hOWOWLLkG7kcDPYG/v/EJMoG+R5DYW9jXA5nvZT76t5HdEAQ=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz"; + sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g=="; }; }; "@azure/msal-common-7.6.0" = { @@ -130,31 +130,40 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.0.0" = { + "@azure/msal-common-9.0.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.0.tgz"; - sha512 = "uiFiFKVNTsRpmKio5bcObTuHcaHHZB2GEsjJJN8rbJNmzoYuZzNioOoK+J0QK0jEasRBgAoR5A8hSty2iKRzIg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz"; + sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ=="; }; }; - "@azure/msal-node-1.14.4" = { + "@azure/msal-common-9.0.2" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz"; + sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="; + }; + }; + "@azure/msal-node-1.14.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.4"; + version = "1.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.4.tgz"; - sha512 = "j9GzZu5mTLWtuJ+cYN6e67UNymIS5OysblrOzH8lakt9XxH0GCPYjuqbOEKTP84r+Rbj3io+TuW1KS+0Xxuj/g=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; + sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; }; }; - "@babel/runtime-7.20.1" = { + "@babel/runtime-7.20.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.1"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"; - sha512 = "mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; + sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; }; }; "@breejs/later-4.1.0" = { @@ -175,22 +184,31 @@ let sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; }; }; - "@grpc/proto-loader-0.7.3" = { + "@grpc/proto-loader-0.7.4" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.3.tgz"; - sha512 = "5dAvoZwna2Py3Ef96Ux9jIkp3iZ62TUsV00p3wVBPNX5K178UbNi8Q7gQVqwXT1Yq9RejIGG9G2IPEo93T6RcA=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; + sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; }; }; - "@js-joda/core-5.4.2" = { + "@js-joda/core-5.5.1" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.4.2"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.2.tgz"; - sha512 = "QIDIZ9a0NfDStgD47VaTgwiPjlw1p4QPLwjOB/9+/DqIztoQopPNNAd+HdtQMHgE+ibP3dJacd8/TVL/A1RaaA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.1.tgz"; + sha512 = "oTFmkyv5MhgkHdZhoe5lwRoKW0t4njPvK3g7ODvK/prkoC5bwylKcyQJMsmjvgHBXoy4u5iLnB5yQ7AljouHAA=="; + }; + }; + "@louislam/ping-0.4.2-mod.1" = { + name = "_at_louislam_slash_ping"; + packageName = "@louislam/ping"; + version = "0.4.2-mod.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@louislam/ping/-/ping-0.4.2-mod.1.tgz"; + sha512 = "KkRDo8qcF9kzzR0Hh8Iqz+XNnzKOdobUquP7UyBYrjxAB1jNT3qO0gvAZeDUknF28LXBPSzkiVlf1NG+tb/iyQ=="; }; }; "@louislam/sqlite3-15.1.2" = { @@ -382,13 +400,13 @@ let sha512 = "h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA=="; }; }; - "@types/cors-2.8.12" = { + "@types/cors-2.8.13" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.12"; + version = "2.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; - sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz"; + sha512 = "RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA=="; }; }; "@types/es-aggregate-error-1.0.2" = { @@ -400,22 +418,22 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.14" = { + "@types/express-4.17.15" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.14"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz"; + sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; - "@types/express-serve-static-core-4.17.31" = { + "@types/express-serve-static-core-4.17.32" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.31"; + version = "4.17.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; + sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; }; }; "@types/http-assert-1.5.3" = { @@ -463,13 +481,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.190" = { + "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.190"; + version = "4.14.191"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.190.tgz"; - sha512 = "5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; + sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; }; }; "@types/long-4.0.2" = { @@ -490,22 +508,22 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-14.18.33" = { + "@types/node-14.18.36" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.33"; + version = "14.18.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz"; - sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz"; + sha512 = "FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="; }; }; - "@types/node-18.11.9" = { + "@types/node-18.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.9"; + version = "18.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz"; - sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; + sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; "@types/qs-6.9.7" = { @@ -1093,13 +1111,13 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "colorette-2.0.16" = { + "colorette-2.0.19" = { name = "colorette"; packageName = "colorette"; - version = "2.0.16"; + version = "2.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz"; - sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; + url = "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"; + sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; }; }; "combine-errors-3.0.3" = { @@ -1129,15 +1147,6 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; "commander-9.4.1" = { name = "commander"; packageName = "commander"; @@ -1147,6 +1156,15 @@ let sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; + "commander-9.5.0" = { + name = "commander"; + packageName = "commander"; + version = "9.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; + }; + }; "commist-1.1.0" = { name = "commist"; packageName = "commist"; @@ -1327,13 +1345,13 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; - "dayjs-1.11.6" = { + "dayjs-1.11.7" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.6"; + version = "1.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz"; - sha512 = "zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"; + sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="; }; }; "debug-2.6.9" = { @@ -1354,15 +1372,6 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; "debug-4.3.4" = { name = "debug"; packageName = "debug"; @@ -1597,13 +1606,13 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; - "es-abstract-1.20.4" = { + "es-abstract-1.20.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.4"; + version = "1.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz"; + sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; }; }; "es-aggregate-error-1.0.9" = { @@ -1885,6 +1894,15 @@ let sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; }; + "get-package-type-0.1.0" = { + name = "get-package-type"; + packageName = "get-package-type"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"; + sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; + }; + }; "get-symbol-description-1.0.0" = { name = "get-symbol-description"; packageName = "get-symbol-description"; @@ -1894,13 +1912,13 @@ let sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; }; - "getopts-2.2.5" = { + "getopts-2.3.0" = { name = "getopts"; packageName = "getopts"; - version = "2.2.5"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/getopts/-/getopts-2.2.5.tgz"; - sha512 = "9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA=="; + url = "https://registry.npmjs.org/getopts/-/getopts-2.3.0.tgz"; + sha512 = "5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA=="; }; }; "getpass-0.1.7" = { @@ -1930,6 +1948,15 @@ let sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; + "gopd-1.0.1" = { + name = "gopd"; + packageName = "gopd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; + }; + }; "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -2047,13 +2074,13 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; - "http-graceful-shutdown-3.1.11" = { + "http-graceful-shutdown-3.1.12" = { name = "http-graceful-shutdown"; packageName = "http-graceful-shutdown"; - version = "3.1.11"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.11.tgz"; - sha512 = "tfOwKDZA8kJqDNBK2ur+o55HbhDHoflvDCDgjbmm5eAn0RhqhdlUjVygj8e258B5nn5kNsEFOl7DbXLskKrgGA=="; + url = "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.12.tgz"; + sha512 = "z3mH1HUwRESrauPjvjH5QuH2Ce4uLlWonPFgZnwAyxIFYROxIMcNNWwNltN+s8fHF/aGlsfQDOICHLXsabK43w=="; }; }; "http-proxy-agent-5.0.0" = { @@ -2137,13 +2164,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "internal-slot-1.0.3" = { + "internal-slot-1.0.4" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; }; "interpret-2.2.0" = { @@ -2506,13 +2533,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "jsonwebtoken-8.5.1" = { + "jsonwebtoken-9.0.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.5.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; - sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; "jsprim-1.4.2" = { @@ -2578,13 +2605,13 @@ let sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="; }; }; - "knex-0.95.15" = { + "knex-2.4.0" = { name = "knex"; packageName = "knex"; - version = "0.95.15"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/knex/-/knex-0.95.15.tgz"; - sha512 = "Loq6WgHaWlmL2bfZGWPsy4l8xw4pOE+tmLGkPG0auBppxpI0UcK+GYCycJcqz9W54f2LiGewkCVLBm3Wq4ur/w=="; + url = "https://registry.npmjs.org/knex/-/knex-2.4.0.tgz"; + sha512 = "i0GWwqYp1Hs2yvc2rlDO6nzzkLhwdyOZKRdsMTB8ZxOs2IXQyL5rBjSbS1krowCh6V65T4X9CJaKtuIfkaPGSA=="; }; }; "leven-2.1.0" = { @@ -2695,69 +2722,6 @@ let sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; - "lodash.includes-4.3.0" = { - name = "lodash.includes"; - packageName = "lodash.includes"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; - sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; - }; - }; - "lodash.isboolean-3.0.3" = { - name = "lodash.isboolean"; - packageName = "lodash.isboolean"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; - }; - }; - "lodash.isinteger-4.0.4" = { - name = "lodash.isinteger"; - packageName = "lodash.isinteger"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; - sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; - }; - }; - "lodash.isnumber-3.0.3" = { - name = "lodash.isnumber"; - packageName = "lodash.isnumber"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; - sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; - }; - }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; - }; - }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; - }; - }; "lodash.uniqby-4.5.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -2884,13 +2848,22 @@ let sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; - "minipass-3.3.4" = { + "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; - sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + }; + "minipass-4.0.0" = { + name = "minipass"; + packageName = "minipass"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; }; }; "minizlib-2.1.2" = { @@ -3541,6 +3514,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; + }; + }; "qs-6.5.3" = { name = "qs"; packageName = "qs"; @@ -3604,22 +3586,22 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "rechoir-0.7.0" = { + "rechoir-0.8.0" = { name = "rechoir"; packageName = "rechoir"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; - sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz"; + sha512 = "/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="; }; }; - "redbean-node-0.1.4" = { + "redbean-node-0.2.0" = { name = "redbean-node"; packageName = "redbean-node"; - version = "0.1.4"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/redbean-node/-/redbean-node-0.1.4.tgz"; - sha512 = "c1U6wnTeWS0c44tn9hkJWzjGgckLNJ8sN1E2bxnnnQsULOfvEVFLf8dLMjqhyyMrZ1L1mp8UvV4OfhRtH/ZrgQ=="; + url = "https://registry.npmjs.org/redbean-node/-/redbean-node-0.2.0.tgz"; + sha512 = "bHbNgVpkLOn7i/kvfvGDVGzfDgvf20qVRm4EvQV9tD2V2nhcegYUITzAF3XSL2XVirrb5vmWy85vxM44faBnYw=="; }; }; "regenerator-runtime-0.13.11" = { @@ -3748,15 +3730,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; "semver-6.3.0" = { name = "semver"; packageName = "semver"; @@ -4054,13 +4027,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "tar-6.1.12" = { + "tar-6.1.13" = { name = "tar"; packageName = "tar"; - version = "6.1.12"; + version = "6.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz"; - sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; }; "tarn-3.0.2" = { @@ -4216,6 +4189,15 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; + "underscore-1.13.6" = { + name = "underscore"; + packageName = "underscore"; + version = "1.13.6"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; + sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + }; + }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -4445,7 +4427,7 @@ let args = { name = "uptime-kuma"; packageName = "uptime-kuma"; - version = "1.19.2"; + version = "1.19.6"; src = ./.; dependencies = [ sources."@azure/abort-controller-1.1.0" @@ -4465,26 +4447,29 @@ let }) sources."@azure/keyvault-keys-4.6.0" sources."@azure/logger-1.0.3" - (sources."@azure/msal-browser-2.32.0" // { + (sources."@azure/msal-browser-2.32.1" // { dependencies = [ - sources."@azure/msal-common-9.0.0" + sources."@azure/msal-common-9.0.1" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.4" // { + (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.0.0" + sources."@azure/msal-common-9.0.2" ]; }) - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.7" sources."@breejs/later-4.1.0" sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.3" - sources."@js-joda/core-5.4.2" + sources."@grpc/proto-loader-0.7.4" + sources."@js-joda/core-5.5.1" + sources."@louislam/ping-0.4.2-mod.1" sources."@louislam/sqlite3-15.1.2" (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."@protobufjs/aspromise-1.1.2" @@ -4506,19 +4491,19 @@ let sources."@types/content-disposition-0.5.5" sources."@types/cookie-0.4.1" sources."@types/cookies-0.7.7" - sources."@types/cors-2.8.12" + sources."@types/cors-2.8.13" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-4.17.15" + sources."@types/express-serve-static-core-4.17.32" sources."@types/http-assert-1.5.3" sources."@types/http-errors-2.0.1" sources."@types/keygrip-1.0.2" sources."@types/koa-2.13.5" sources."@types/koa-compose-3.2.5" - sources."@types/lodash-4.14.190" + sources."@types/lodash-4.14.191" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.15.0" @@ -4585,6 +4570,7 @@ let sources."cliui-7.0.4" sources."code-point-at-1.1.0" sources."color-support-1.1.3" + sources."colorette-2.0.19" sources."combine-errors-3.0.3" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -4626,7 +4612,7 @@ let sources."css-what-6.1.0" sources."custom-error-instance-2.1.1" sources."dashdash-1.14.1" - sources."dayjs-1.11.6" + sources."dayjs-1.11.7" (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" @@ -4665,7 +4651,7 @@ let sources."engine.io-parser-5.0.4" sources."entities-4.4.0" sources."env-paths-2.2.1" - sources."es-abstract-1.20.4" + sources."es-abstract-1.20.5" sources."es-aggregate-error-1.0.9" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -4698,7 +4684,12 @@ let sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" @@ -4707,11 +4698,13 @@ let sources."generate-function-2.3.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.3" + sources."get-package-type-0.1.0" sources."get-symbol-description-1.0.0" - sources."getopts-2.2.5" + sources."getopts-2.3.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -4725,7 +4718,7 @@ let sources."hoek-6.1.3" sources."htmlparser2-8.0.1" sources."http-errors-1.8.1" - sources."http-graceful-shutdown-3.1.11" + sources."http-graceful-shutdown-3.1.12" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-interval-2.0.1" @@ -4733,7 +4726,7 @@ let sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-2.2.0" sources."ip-2.0.0" sources."ipaddr.js-1.9.1" @@ -4776,21 +4769,20 @@ let sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."lru-cache-6.0.0" + sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."just-performance-4.3.0" sources."jwa-1.4.1" sources."jws-3.2.2" sources."jwt-decode-3.1.2" - (sources."knex-0.95.15" // { + (sources."knex-2.4.0" // { dependencies = [ - sources."colorette-2.0.16" - sources."commander-7.2.0" - sources."debug-4.3.2" - sources."ms-2.1.2" + sources."commander-9.5.0" sources."resolve-from-5.0.0" ]; }) @@ -4805,16 +4797,8 @@ let sources."lodash._stringtopath-4.8.0" sources."lodash.camelcase-4.3.0" sources."lodash.get-4.4.2" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" sources."lodash.uniqby-4.5.0" sources."long-4.0.0" - sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -4824,12 +4808,23 @@ let sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.4" - sources."minizlib-2.1.2" + (sources."minipass-4.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-1.0.4" (sources."mqtt-4.3.7" // { dependencies = [ + sources."lru-cache-6.0.0" sources."mqtt-packet-6.10.0" + sources."yallist-4.0.0" ]; }) sources."ms-2.1.3" @@ -4838,7 +4833,12 @@ let sources."commander-9.4.1" ]; }) - sources."mysql2-2.3.3" + (sources."mysql2-2.3.3" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -4865,12 +4865,14 @@ let sources."are-we-there-yet-1.1.7" sources."gauge-2.7.4" sources."is-fullwidth-code-point-1.0.0" + sources."lru-cache-6.0.0" sources."npmlog-4.1.2" sources."readable-stream-2.3.7" sources."semver-7.3.8" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" + sources."yallist-4.0.0" ]; }) sources."node-radius-client-1.0.0" @@ -4938,6 +4940,7 @@ let sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."q-1.5.1" sources."qs-6.5.3" sources."radius-1.1.4" sources."range-parser-1.2.1" @@ -4948,10 +4951,10 @@ let ]; }) sources."readable-stream-3.6.0" - sources."rechoir-0.7.0" - (sources."redbean-node-0.1.4" // { + sources."rechoir-0.8.0" + (sources."redbean-node-0.2.0" // { dependencies = [ - sources."@types/node-14.18.33" + sources."@types/node-14.18.36" ]; }) sources."regenerator-runtime-0.13.11" @@ -5013,7 +5016,11 @@ let }) sources."strip-ansi-6.0.1" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."tarn-3.0.2" sources."tcp-ping-0.1.1" sources."tdigest-0.1.2" @@ -5035,6 +5042,7 @@ let sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."unbox-primitive-1.0.2" + sources."underscore-1.13.6" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -5057,7 +5065,6 @@ let sources."xmlhttprequest-ssl-2.0.0" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" sources."yup-0.32.9" diff --git a/pkgs/servers/monitoring/uptime-kuma/package.json b/pkgs/servers/monitoring/uptime-kuma/package.json index 18ae4770faba..55c8c436ee82 100644 --- a/pkgs/servers/monitoring/uptime-kuma/package.json +++ b/pkgs/servers/monitoring/uptime-kuma/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.19.2", + "version": "1.19.6", "license": "MIT", "repository": { "type": "git", @@ -31,6 +31,7 @@ "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine", "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push", "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push", + "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push", "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push", "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push", "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", @@ -38,7 +39,7 @@ "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push", "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.19.2 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", "mark-as-nightly": "node extra/mark-as-nightly.js", "reset-password": "node extra/reset-password.js", @@ -60,11 +61,13 @@ "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev", "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e", "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js", + "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js", "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"", "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go" }, "dependencies": { "@grpc/grpc-js": "~1.7.3", + "@louislam/ping": "~0.4.2-mod.1", "@louislam/sqlite3": "15.1.2", "args-parser": "~1.3.0", "axios": "~0.27.0", @@ -90,7 +93,7 @@ "https-proxy-agent": "~5.0.1", "iconv-lite": "~0.6.3", "jsesc": "~3.0.2", - "jsonwebtoken": "~8.5.1", + "jsonwebtoken": "~9.0.0", "jwt-decode": "~3.1.2", "limiter": "~2.1.0", "mqtt": "~4.3.7", @@ -106,7 +109,7 @@ "prom-client": "~13.2.0", "prometheus-api-metrics": "~3.2.1", "protobufjs": "~7.1.1", - "redbean-node": "0.1.4", + "redbean-node": "~0.2.0", "socket.io": "~4.5.3", "socket.io-client": "~4.5.3", "socks-proxy-agent": "6.1.1", From da89af6e5fc3cd66acd57c99e0de754d17f2fc2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 21 Jan 2023 22:59:19 +0100 Subject: [PATCH 216/338] nextcloud-client: 3.6.4 -> 3.6.6 Diff: https://github.com/nextcloud/desktop/compare/v3.6.4...v3.6.6 --- 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 f2d368af612f..e409551f1232 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.4"; + version = "3.6.6"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-ZtDgm9xlBQflVXsxjt4bFmRby6ni0wjaGYaoiEWH9Q0="; + sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; }; patches = [ From 68cf4666c8769f4b151af3edb5eb22508a6a4520 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 21 Jan 2023 14:02:09 -0800 Subject: [PATCH 217/338] authenticator: fix incompatibility with pipewire 0.3.64 --- pkgs/applications/misc/authenticator/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index 735355107ef2..7bf4beba9d97 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -69,6 +69,11 @@ stdenv.mkDerivation rec { zbar ]; + # https://gitlab.gnome.org/World/Authenticator/-/issues/362 + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED" + ''; + meta = { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; From 3866fa44a7f9fae7c83e53e7eea295e1f9212055 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sat, 21 Jan 2023 23:06:40 +0100 Subject: [PATCH 218/338] treewide: remove global with lib; in pkgs/{audio,blockchain,editors} --- pkgs/applications/audio/asunder/default.nix | 18 +++++------ pkgs/applications/audio/carla/default.nix | 10 +++--- pkgs/applications/audio/cmus/default.nix | 8 ++--- pkgs/applications/audio/crip/default.nix | 8 ++--- pkgs/applications/audio/fmit/default.nix | 16 +++++----- .../audio/goattracker/default.nix | 15 +++++---- pkgs/applications/audio/musescore/darwin.nix | 6 ++-- pkgs/applications/audio/ncmpc/default.nix | 6 ++-- pkgs/applications/audio/renoise/default.nix | 6 ++-- .../blockchains/bitcoin-knots/default.nix | 23 +++++++------- .../blockchains/bitcoin-unlimited/default.nix | 14 ++++----- .../blockchains/bitcoin/default.nix | 25 +++++++-------- .../blockchains/btcdeb/default.nix | 3 +- .../blockchains/digibyte/default.nix | 12 +++---- .../blockchains/dogecoin/default.nix | 31 +++++++++---------- .../blockchains/elements/default.nix | 23 +++++++------- .../blockchains/litecoin/default.nix | 12 +++---- .../blockchains/particl-core/default.nix | 6 ++-- .../blockchains/vertcoin/default.nix | 12 +++---- .../blockchains/wownero/default.nix | 3 +- .../display-managers/lightdm/default.nix | 8 ++--- .../editors/codeblocks/default.nix | 14 ++++----- pkgs/applications/editors/howl/default.nix | 4 +-- .../editors/jetbrains/default.nix | 12 +++---- pkgs/applications/editors/jetbrains/linux.nix | 8 ++--- pkgs/applications/editors/jucipp/default.nix | 4 +-- pkgs/applications/editors/kakoune/default.nix | 4 +-- pkgs/applications/editors/nano/default.nix | 6 ++-- pkgs/applications/editors/neovim/wrapper.nix | 18 +++++------ pkgs/applications/editors/rstudio/default.nix | 2 +- .../ms-vsliveshare-vsliveshare/default.nix | 6 ++-- 31 files changed, 145 insertions(+), 198 deletions(-) diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index c3cba87e300c..d6efada90763 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -9,8 +9,6 @@ #, aacSupport ? false, TODO: neroAacEnc }: -with lib; - stdenv.mkDerivation rec { version = "2.9.7"; pname = "asunder"; @@ -23,20 +21,20 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libcddb ]; runtimeDeps = - optional mp3Support lame ++ - optional oggSupport vorbis-tools ++ - optional flacSupport flac ++ - optional opusSupport opusTools ++ - optional wavpackSupport wavpack ++ - optional monkeysAudioSupport monkeysAudio ++ + lib.optional mp3Support lame ++ + lib.optional oggSupport vorbis-tools ++ + lib.optional flacSupport flac ++ + lib.optional opusSupport opusTools ++ + lib.optional wavpackSupport wavpack ++ + lib.optional monkeysAudioSupport monkeysAudio ++ [ cdparanoia ]; postInstall = '' wrapProgram "$out/bin/asunder" \ - --prefix PATH : "${makeBinPath runtimeDeps}" + --prefix PATH : "${lib.makeBinPath runtimeDeps}" ''; - meta = { + meta = with lib; { description = "A graphical Audio CD ripper and encoder for Linux"; homepage = "http://littlesvr.ca/asunder/index.php"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 82259d563ce9..70ef1ebdf644 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -5,8 +5,6 @@ withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with lib; - assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; assert withQt -> wrapQtAppsHook != null; @@ -30,13 +28,13 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ rdflib pyliblo - ] ++ optional withFrontend pyqt5; + ] ++ lib.optional withFrontend pyqt5; buildInputs = [ file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile - ] ++ optional withQt qtbase - ++ optional withGtk2 gtk2 - ++ optional withGtk3 gtk3; + ] ++ lib.optional withQt qtbase + ++ lib.optional withGtk2 gtk2 + ++ lib.optional withGtk3 gtk3; propagatedBuildInputs = pythonPath; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 66c172ff01d8..61ff53aa1d75 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -39,8 +39,6 @@ #, vtxSupport ? true, libayemu ? null }: -with lib; - assert samplerateSupport -> jackSupport; # vorbis and tremor are mutually exclusive @@ -113,16 +111,16 @@ stdenv.mkDerivation rec { patches = [ ./option-debugging.patch ]; - configurePhase = "./configure " + concatStringsSep " " ([ + configurePhase = "./configure " + lib.concatStringsSep " " ([ "prefix=$out" "CONFIG_WAV=y" - ] ++ concatMap (a: a.flags) opts); + ] ++ lib.concatMap (a: a.flags) opts); nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] - ++ flatten (concatMap (a: a.deps) opts); + ++ lib.flatten (lib.concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index d41ebed09606..f837ad6603e3 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -16,8 +16,6 @@ , which }: -with lib; - stdenv.mkDerivation rec { pname = "crip"; version = "3.9"; @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perlPackages.perl perlPackages.CDDB_get ]; nativeBuildInputs = [ makeWrapper ]; - toolDeps = makeBinPath [ + toolDeps = lib.makeBinPath [ cdparanoia coreutils eject @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin/ - for script in ${escapeShellArgs scripts}; do + for script in ${lib.escapeShellArgs scripts}; do cp $script $out/bin/ substituteInPlace $out/bin/$script \ @@ -63,6 +61,6 @@ stdenv.mkDerivation rec { description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; - maintainers = [ maintainers.endgame ]; + maintainers = [ lib.maintainers.endgame ]; }; } diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 7e376c89d36a..7fcfeb32fd3a 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -7,8 +7,6 @@ assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -with lib; - mkDerivation rec { pname = "fmit"; version = "1.2.14"; @@ -22,9 +20,9 @@ mkDerivation rec { nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] - ++ optionals alsaSupport [ alsa-lib ] - ++ optionals jackSupport [ libjack2 ] - ++ optionals portaudioSupport [ portaudio ]; + ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals jackSupport [ libjack2 ] + ++ lib.optionals portaudioSupport [ portaudio ]; postPatch = '' substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}' @@ -32,13 +30,13 @@ mkDerivation rec { preConfigure = '' qmakeFlags="$qmakeFlags \ - CONFIG+=${optionalString alsaSupport "acs_alsa"} \ - CONFIG+=${optionalString jackSupport "acs_jack"} \ - CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \ + CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \ + CONFIG+=${lib.optionalString jackSupport "acs_jack"} \ + CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIXSHORTCUT=$out" ''; - meta = { + meta = with lib; { description = "Free Musical Instrument Tuner"; longDescription = '' FMIT is a graphical utility for tuning musical instruments, with error diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 1fb848ae1eda..b85aa4c0df76 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -8,12 +8,11 @@ , isStereo ? false }: -with lib; let - pname = "goattracker" + optionalString isStereo "-stereo"; + pname = "goattracker" + lib.optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { name = pname; - desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; + desktopName = "GoatTracker 2" + lib.optionalString isStereo " Stereo"; genericName = "Music Tracker"; exec = if isStereo then "gt2stereo" @@ -30,7 +29,7 @@ in stdenv.mkDerivation rec { else "2.76"; # normal src = fetchurl { - url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; + url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${lib.optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal @@ -63,11 +62,11 @@ in stdenv.mkDerivation rec { meta = { description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" - + optionalString isStereo " - Stereo version"; + + lib.optionalString isStereo " - Stereo version"; homepage = "https://cadaver.github.io/tools.html"; downloadPage = "https://sourceforge.net/projects/goattracker2/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index add56f99d9b3..88b5d3b74c15 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -5,17 +5,15 @@ let appName = "MuseScore ${builtins.head versionComponents}"; in -with lib; - stdenv.mkDerivation rec { pname = "musescore-darwin"; - version = concatStringsSep "." versionComponents; + version = lib.concatStringsSep "." versionComponents; # The disk image contains the .app and a symlink to /Applications. sourceRoot = "${appName}.app"; src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; + url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; }; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 739d0c3c499e..870691ae1c3f 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -12,8 +12,6 @@ , pcreSupport ? false, pcre ? null }: -with lib; - assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { @@ -28,13 +26,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib ncurses libmpdclient boost ] - ++ optional pcreSupport pcre; + ++ lib.optional pcreSupport pcre; nativeBuildInputs = [ meson ninja pkg-config gettext ]; mesonFlags = [ "-Dlirc=disabled" "-Ddocumentation=disabled" - ] ++ optional (!pcreSupport) "-Dregex=disabled"; + ] ++ lib.optional (!pcreSupport) "-Dregex=disabled"; meta = with lib; { description = "Curses-based interface for MPD (music player daemon)"; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 1be3f53dce5f..44dbff6077bc 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,15 +1,13 @@ { lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib , mpg123, releasePath ? null }: -with lib; - # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the release version to some stable location. # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. let - urlVersion = replaceStrings [ "." ] [ "_" ]; + urlVersion = lib.replaceStrings [ "." ] [ "_" ]; in stdenv.mkDerivation rec { @@ -80,7 +78,7 @@ stdenv.mkDerivation rec { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index ae64247a8be2..d1e419425570 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -23,7 +23,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; version = "23.0.knots20220529"; @@ -35,24 +34,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -73,7 +72,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind-knots; }; - meta = { + meta = with lib; { description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; maintainers = with maintainers; [ prusnak mmahut ]; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index d019c3f02d6d..3fbf9615f7db 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -3,10 +3,8 @@ , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: -with lib; - stdenv.mkDerivation rec { - pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-unlimited"; version = "1.10.0.0"; src = fetchFromGitLab { @@ -17,19 +15,19 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ] - ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; + ++ lib.optionals withGui [ qtbase qttools qrencode ] + ++ lib.optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Unlimited client)"; longDescription= '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index de5ce51d0654..98483391973d 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -23,7 +23,6 @@ , withWallet ? true }: -with lib; let desktop = fetchurl { # c2e5f3e is the last commit when the debian/bitcoin-qt.desktop file was changed @@ -45,16 +44,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = optionalString withGui '' + postInstall = lib.optionalString withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png @@ -63,12 +62,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -89,7 +88,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind; }; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system"; longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 4f8a08333a86..f4c00d00858e 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -5,7 +5,6 @@ , openssl }: -with lib; stdenv.mkDerivation rec { pname = "btcdeb"; version = "unstable-2022-04-03"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; - meta = { + meta = with lib; { description = "Bitcoin Script Debugger"; homepage = "https://github.com/bitcoin-core/btcdeb"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/digibyte/default.nix b/pkgs/applications/blockchains/digibyte/default.nix index 90e84db3638e..4e563d21fa22 100644 --- a/pkgs/applications/blockchains/digibyte/default.nix +++ b/pkgs/applications/blockchains/digibyte/default.nix @@ -15,13 +15,11 @@ , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "digibyte"; version = "7.17.3"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "digibyte-core"; @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { libevent db4 zeromq - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -54,12 +52,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "DigiByte (DGB) is a rapidly growing decentralized, global blockchain"; homepage = "https://digibyte.io/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 6b6cfaa2398d..421c2fe667e0 100644 --- a/pkgs/applications/blockchains/dogecoin/default.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix @@ -6,9 +6,8 @@ , withGui, withUpnp ? true, withUtils ? true, withWallet ? true , withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }: -with lib; stdenv.mkDerivation rec { - pname = "dogecoin" + optionalString (!withGui) "d"; + pname = "dogecoin" + lib.optionalString (!withGui) "d"; version = "1.14.6"; src = fetchFromGitHub { @@ -18,32 +17,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-PmbmmA2Mq07dwB3cI7A9c/ewtu0I+sWvQT39Yekm/sU="; }; - preConfigure = optionalString withGui '' - export LRELEASE=${getDev qttools}/bin/lrelease + preConfigure = lib.optionalString withGui '' + export LRELEASE=${lib.getDev qttools}/bin/lrelease ''; nativeBuildInputs = [ pkg-config autoreconfHook util-linux ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl protobuf boost zlib libevent ] - ++ optionals withGui [ qtbase qrencode ] - ++ optionals withUpnp [ miniupnpc ] - ++ optionals withWallet [ db5 ] - ++ optionals withZmq [ zeromq ] - ++ optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals withGui [ qtbase qrencode ] + ++ lib.optionals withUpnp [ miniupnpc ] + ++ lib.optionals withWallet [ db5 ] + ++ lib.optionals withZmq [ zeromq ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configureFlags = [ "--with-incompatible-bdb" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!withGui) [ "--with-gui=no" ] - ++ optionals (!withUpnp) [ "--without-miniupnpc" ] - ++ optionals (!withUtils) [ "--without-utils" ] - ++ optionals (!withWallet) [ "--disable-wallet" ] - ++ optionals (!withZmq) [ "--disable-zmq" ]; + ] ++ lib.optionals (!withGui) [ "--with-gui=no" ] + ++ lib.optionals (!withUpnp) [ "--without-miniupnpc" ] + ++ lib.optionals (!withUtils) [ "--without-utils" ] + ++ lib.optionals (!withWallet) [ "--disable-wallet" ] + ++ lib.optionals (!withZmq) [ "--disable-zmq" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Wow, such coin, much shiba, very rich"; longDescription = '' Dogecoin is a decentralized, peer-to-peer digital currency that diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 0ffaa4c83c01..a39cbc341e89 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -22,7 +22,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; version = "22.0.2"; @@ -36,24 +35,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -70,11 +69,11 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol"; longDescription= '' The Elements blockchain platform is a collection of feature experiments and extensions to the diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index d150d7347493..3eeeafe8d815 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -9,10 +9,8 @@ , fmt }: -with lib; - mkDerivation rec { - pname = "litecoin" + optionalString (!withGui) "d"; + pname = "litecoin" + lib.optionalString (!withGui) "d"; version = "0.21.2.1"; src = fetchFromGitHub { @@ -25,11 +23,11 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq fmt miniupnpc glib protobuf util-linux libevent ] - ++ optionals stdenv.isDarwin [ AppKit ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -40,7 +38,7 @@ mkDerivation rec { ./src/test/test_litecoin ''; - meta = { + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index c55d04b03a28..942f0a71cbf4 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -14,8 +14,6 @@ , python3 }: -with lib; - stdenv.mkDerivation rec { pname = "particl-core"; version = "23.0.3.0"; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-bench" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--enable-tests=no" ]; @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs test"; enableParallelBuilding = true; - meta = { + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' diff --git a/pkgs/applications/blockchains/vertcoin/default.nix b/pkgs/applications/blockchains/vertcoin/default.nix index 87d9a8b64b21..90e4dd14a685 100644 --- a/pkgs/applications/blockchains/vertcoin/default.nix +++ b/pkgs/applications/blockchains/vertcoin/default.nix @@ -16,13 +16,11 @@ , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "vertcoin"; version = "0.18.0"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = pname + "-project"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { db4 zeromq gmp - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -56,12 +54,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "A digital currency with mining decentralisation and ASIC resistance as a key focus"; homepage = "https://vertcoin.org/"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 14e17c766dd9..9c68a094b878 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -2,7 +2,6 @@ , readline, libsodium, rapidjson }: -with lib; stdenv.mkDerivation rec { pname = "wownero"; version = "0.8.0.1"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { "-DMANUAL_SUBMODULES=ON" ]; - meta = { + meta = with lib; { description = '' A privacy-centric memecoin that was fairly launched on April 1, 2018 with no pre-mine, stealth-mine or ICO diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 348f4706411f..8365ac3b5a22 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -30,8 +30,6 @@ , yelp-tools }: -with lib; - stdenv.mkDerivation rec { pname = "lightdm"; version = "1.32.0"; @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { libxklavier pam polkit - ] ++ optional withQt5 qtbase; + ] ++ lib.optional withQt5 qtbase; patches = [ # Adds option to disable writing dmrc files @@ -96,7 +94,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-tests" "--disable-dmrc" - ] ++ optional withQt5 "--enable-liblightdm-qt5"; + ] ++ lib.optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=${placeholder "out"}/etc" @@ -120,7 +118,7 @@ stdenv.mkDerivation rec { }; - meta = { + meta = with lib; { homepage = "https://github.com/canonical/lightdm"; description = "A cross-desktop display manager"; platforms = platforms.linux; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 7a1c0af2c643..441b224ef022 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -2,8 +2,6 @@ , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: -with lib; - stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; version = "20.03"; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; buildInputs = [ wxGTK31 gtk3 ] - ++ optionals contribPlugins [ hunspell gamin boost ]; + ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch @@ -56,16 +54,16 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; - configureFlags = [ "--enable-pch=no" ] ++ optionals contribPlugins [ - ("--with-contrib-plugins" + optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ + ("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; - meta = { + meta = with lib; { maintainers = [ maintainers.linquize ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 2c959519f41f..ff9a30074120 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }: -with lib; - stdenv.mkDerivation rec { pname = "howl"; version = "0.6"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = { + meta = with lib; { homepage = "https://howl.io/"; description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3af1c001c081..913ef7570eee 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -11,15 +11,13 @@ , vmopts ? null }: -with lib; - let platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; inherit (stdenv.hostPlatform) system; - versions = builtins.fromJSON (readFile (./versions.json)); + versions = builtins.fromJSON (lib.readFile (./versions.json)); versionKey = if stdenv.isLinux then "linux" else system; products = versions.${versionKey} or (throw "Unsupported system: ${system}"); @@ -42,11 +40,11 @@ let maintainers = with maintainers; [ edwtjo mic92 ]; }; }).overrideAttrs (attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ lib.optionals (stdenv.isLinux) [ autoPatchelfHook patchelf ]; - buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [ + buildInputs = (attrs.buildInputs or []) ++ lib.optionals (stdenv.isLinux) [ python3 stdenv.cc.cc libdbusmenu @@ -54,7 +52,7 @@ let expat ]; dontAutoPatchelf = true; - postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ( cd $out/clion # bundled cmake does not find libc @@ -217,7 +215,7 @@ let ''; maintainers = with maintainers; [ ]; }; - }).overrideAttrs (finalAttrs: previousAttrs: optionalAttrs cythonSpeedup { + }).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup { buildInputs = with python3.pkgs; [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index f1529b29f92d..7443842e7bf9 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -5,10 +5,8 @@ { pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: -with lib; - -let loName = toLower productShort; - hiName = toUpper productShort; +let loName = lib.toLower productShort; + hiName = lib.toUpper productShort; vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; @@ -29,7 +27,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { startupWMClass = wmClass; }; - vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); + vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts); nativeBuildInputs = [ makeWrapper patchelf unzip ]; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index b06c93c10340..01ab62c6de4f 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -3,13 +3,11 @@ libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: -with lib; - stdenv.mkDerivation rec { pname = "juicipp"; version = "1.2.3"; - meta = { + meta = with lib; { homepage = "https://github.com/cppit/jucipp"; description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; license = licenses.mit; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 3366efb697a8..77d75eb131ff 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; version = "2022.10.31"; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { ln -s --relative "$autoload_target" autoload ''; - meta = { + meta = with lib; { homepage = "http://kakoune.org/"; description = "A vim inspired text editor"; license = licenses.publicDomain; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index cfb1d17c9129..69c7f3eb7af3 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -4,8 +4,6 @@ assert enableNls -> (gettext != null); -with lib; - let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; @@ -23,7 +21,7 @@ in stdenv.mkDerivation rec { sha256 = "V7p1Hpt1GfD23e5QUgLjh8dd3kQMH3qhuTEMw4FAaDY="; }; - nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; + nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; buildInputs = [ ncurses ]; outputs = [ "out" "info" ]; @@ -71,7 +69,7 @@ in stdenv.mkDerivation rec { ''; }; - meta = { + meta = with lib; { homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 01a9cf98954b..fac9b3c30990 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -5,8 +5,6 @@ , python3Packages , callPackage }: -with lib; - neovim: let @@ -32,7 +30,7 @@ let }@args: let - wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; + wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; # If configure != {}, we can't generate the rplugin.vim file with e.g # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in @@ -43,7 +41,7 @@ let finalMakeWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; @@ -57,22 +55,22 @@ let substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'Name=Neovim' 'Name=Neovim wrapper' '' - + optionalString withPython3 '' + + lib.optionalString withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' - + optionalString (rubyEnv != null) '' + + lib.optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' - + optionalString withNodeJs '' + + lib.optionalString withNodeJs '' ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' - + optionalString vimAlias '' + + lib.optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' - + optionalString viAlias '' + + lib.optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi '' - + optionalString (manifestRc != null) (let + + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ]; in '' diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 70e69503749b..71633c8c8e4a 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -206,7 +206,7 @@ in homepage = "https://www.rstudio.com/"; license = licenses.agpl3Only; maintainers = with maintainers; [ ciil cfhammill ]; - mainProgram = "rstudio" + optionalString server "-server"; + mainProgram = "rstudio" + lib.optionalString server "-server"; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix index 8aa121cbe203..f1ce06b7ca0f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix @@ -7,8 +7,6 @@ , desktop-file-utils, xprop, xsel }: -with lib; - let # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually libs = [ @@ -118,12 +116,12 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens # which will break when copying over the files. mv dotnet_modules/vsls-agent{,-wrapped} makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \ - --prefix LD_LIBRARY_PATH : "${makeLibraryPath libs}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" \ --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \ --set DOTNET_ROOT ${dotnet-sdk_3} ''; - meta = { + meta = with lib; { description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; license = licenses.unfree; From 2b01ef7616f32e3dfe0877d5b92ffa9889245d64 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 21 Jan 2023 17:13:11 -0500 Subject: [PATCH 219/338] askalono: init at 0.4.6 --- pkgs/tools/misc/askalono/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/askalono/default.nix diff --git a/pkgs/tools/misc/askalono/default.nix b/pkgs/tools/misc/askalono/default.nix new file mode 100644 index 000000000000..35d0bf5ff22a --- /dev/null +++ b/pkgs/tools/misc/askalono/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "askalono"; + version = "0.4.6"; + + src = fetchCrate { + pname = "askalono-cli"; + inherit version; + hash = "sha256-7l5bHSsmuMoHbbOI3TAYFeHwD3Y62JvfrrXZa08V3+U="; + }; + + cargoHash = "sha256-OkN8V37GApJvremRJlWG3HSpWgMC17Ge8JMTiQVoc/g="; + + meta = with lib; { + description = "A tool to detect open source licenses from texts"; + homepage = "https://github.com/jpeddicord/askalono"; + changelog = "https://github.com/jpeddicord/askalono/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 649e19e17661..ea11c2377bd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1336,6 +1336,8 @@ with pkgs; amidst = callPackage ../tools/games/minecraft/amidst { }; + askalono = callPackage ../tools/misc/askalono { }; + asleap = callPackage ../tools/networking/asleap { }; butler = callPackage ../games/itch/butler.nix { From 118290c00ae4713b66deddb8194757041ac57a57 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 22 Jan 2023 00:20:21 +0100 Subject: [PATCH 220/338] dpdk: 22.07 -> 22.11.1 Latest LTS release. https://doc.dpdk.org/guides-22.11/rel_notes/release_22_11.html --- pkgs/os-specific/linux/dpdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 1f53dc8e8343..16bf9605726d 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -9,14 +9,14 @@ let mod = kernel != null; - dpdkVersion = "22.07"; + dpdkVersion = "22.11.1"; in stdenv.mkDerivation rec { pname = "dpdk"; version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; - sha256 = "sha256-n2Tf3gdf21cIy2Leg4uP+4kVdf7R4dKusma6yj38m+o="; + sha256 = "sha256-3gdkZfcXSg1ScUuQcuSDenJrqsgtj+fcZEytXIz3TUw="; }; nativeBuildInputs = [ From b31ae5b7b207cd9870b97bd50d419d0e815b95b9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jan 2023 01:30:10 +0100 Subject: [PATCH 221/338] opa: restrict platforms --- pkgs/development/compilers/opa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index e4cd191683c9..2843625daef2 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "http://opalang.org/"; license = lib.licenses.gpl3; maintainers = [ ]; - platforms = with lib.platforms; unix; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } From 1b3361b71c4600cf057bdb027ceec00ef409f3e7 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Sun, 22 Jan 2023 03:39:32 +0300 Subject: [PATCH 222/338] mullvad-vpn: fix openvpn --- pkgs/applications/networking/mullvad-vpn/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 9b1a609d8325..15dc909aa646 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + wrapProgram $out/bin/mullvad-daemon \ + --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop runHook postInstall From c938476ca3d735a1f0595131d16024750e5afcac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Jan 2023 01:48:34 +0100 Subject: [PATCH 223/338] jdupes: 1.21.0 -> 1.21.1 --- pkgs/tools/misc/jdupes/default.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 72970d2dc9b4..c4d54f38110e 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -1,38 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-nDyRaV49bLVHlyqKJ7hf6OBWOLCfmHrTeHryK091c3w="; + sha256 = "sha256-VtwEDw0BBcXO2NVka0pddJSOm8hnQ8iqL2fzGI8uVFM="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. postFetch = "rm -r $out/testdir"; }; - patches = [ - (fetchpatch { - name = "darwin-stack-size.patch"; - url = "https://github.com/jbruchon/jdupes/commit/8f5b06109b44a9e4316f9445da3044590a6c63e2.patch"; - sha256 = "0saq92v0mm5g979chr062psvwp3i3z23mgqrcliq4m07lvwc7i3s"; - }) - (fetchpatch { - name = "linux-header-ioctl.patch"; - url = "https://github.com/jbruchon/jdupes/commit/0d4d98f51c99999d2c6dbbb89d554af551b5b69b.patch"; - sha256 = "sha256-lyuZeRp0Laa8I9nDl1HGdlKa59OvGRQJnRg2fTWv7mQ="; - }) - (fetchpatch { - name = "darwin-apfs-comp.patch"; - url = "https://github.com/jbruchon/jdupes/commit/517b7035945eacd82323392b13bc17b044bcc89d.patch"; - sha256 = "sha256-lvOab6tyEyKUtik3JBdIs5SHpVjcQEDfN7n2bfUszBw="; - }) - ]; - dontConfigure = true; makeFlags = [ From 399e77983ce69efc4d4052eb6b2697cba7a9776c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Jan 2023 01:58:00 +0100 Subject: [PATCH 224/338] parallel: 20221122 -> 20221222 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 72186c7aa873..ca7b47efad71 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20221122"; + version = "20221222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-qj2dIkNN8UjWk/GmIyMxoSZym2oi0vcmGxf7qa2ZU50="; + sha256 = "sha256-TakMe+wYqUQxtOPbSd1WP2XPIM6v0kX3zHtC74v4WX8="; }; outputs = [ "out" "man" "doc" ]; From 203e5461b25add434893bee7ba8bdfeeffffebf0 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 22 Jan 2023 00:35:37 +0100 Subject: [PATCH 225/338] dpdk: simplify optimization for CPU family Make it easier optimize DPDK for a CPU family. The conservative default remains (e.g. nehalem for x86_64), but a user may override it for better utilization of recent CPU models, e.g. `{ machine = "x86-64-v4"; }` for AVX512 support. --- pkgs/os-specific/linux/dpdk/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 16bf9605726d..78acb45bb3c7 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -5,7 +5,13 @@ , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core , doxygen, python3, pciutils , withExamples ? [] -, shared ? false }: +, shared ? false +, machine ? ( + if stdenv.isx86_64 then "nehalem" + else if stdenv.isAarch64 then "generic" + else null + ) +}: let mod = kernel != null; @@ -63,8 +69,7 @@ in stdenv.mkDerivation rec { # kni kernel driver is currently not compatble with 5.11 ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" ++ lib.optional (!shared) "-Ddefault_library=static" - ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" - ++ lib.optional stdenv.isAarch64 "-Dmachine=generic" + ++ lib.optional (machine != null) "-Dmachine=${machine}" ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; From 26aa60713ee4fc010cf84fd7e1e474615fd272cc Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 22 Jan 2023 02:01:57 +0100 Subject: [PATCH 226/338] pktgen: 22.04.1 -> 22.07.1 --- pkgs/os-specific/linux/pktgen/default.nix | 31 +++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 0ddda99bf592..20db1cdd74f9 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,19 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config -, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux -, gtk2, which, withGtk ? false +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, dpdk +, libbsd +, libpcap +, lua5_3 +, numactl +, util-linux +, gtk2 +, which +, withGtk ? false }: stdenv.mkDerivation rec { pname = "pktgen"; - version = "22.04.1"; + version = "22.07.1"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "0gbag98i2jq0p2hpvfgc3fiqy2sark1dm72hla4sxmn3gljy3p70"; + sha256 = "sha256-wBLGwVdn3ymUTVv7J/kbQYz4WNIgV246PHg51+FStUo="; }; + patches = [ + (fetchpatch { + # Ealier DPDK deprecated some macros, which were finally removed in >= 22.11 + url = "https://github.com/pktgen/Pktgen-DPDK/commit/089ef94ac04629f7380f5e618443bcacb2cef5ab.patch"; + sha256 = "sha256-ITU/dIfu7QPpdIVYuCuDhDG9rVF+n8i1YYn9bFmQUME="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ From e65b7e3a637d1e926f3f8988fb91f8492e2d0cf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 01:03:46 +0000 Subject: [PATCH 227/338] solo2-cli: 0.2.1 -> 0.2.2 --- pkgs/tools/security/solo2-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index ad3df92873a8..ea4b05b79a03 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "solo2-cli"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "solokeys"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+n+tc3BDHr93yc2TzvI1Xqpcl8fM+bF/KZdv0rWfIZ8="; + sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I="; }; - cargoSha256 = "sha256-2bBo5HXLYQj+R47exPyMbx/RIrykDHjRkLRNMjVAzEI="; + cargoHash = "sha256-X+IEeztSL312Yq9Loi3cNJuVfSGk/tRRBCsy0Juji7Y="; nativeBuildInputs = [ installShellFiles pkg-config ]; From 7a8db96d4fa43f55e5cda659e45fe2fd11bd957a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Jan 2023 14:45:58 -0800 Subject: [PATCH 228/338] python310Packages.pyquery: 1.4.3 -> 2.0.0 https://github.com/gawel/pyquery/blob/2.0.0/CHANGES.rst --- .../python-modules/pyquery/default.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 40139c795677..0e1203b901b0 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -3,18 +3,23 @@ , cssselect , fetchPypi , lxml +, pytestCheckHook , pythonOlder +, requests +, webob +, webtest }: buildPythonPackage rec { pname = "pyquery"; - version = "1.4.3"; - disabled = pythonOlder "3.5"; + version = "2.0.0"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6"; + hash = "sha256-lj6NTpAmL/bY3sBy6pcoXcN0ovacrXd29AgqvPah2K4="; }; propagatedBuildInputs = [ @@ -22,10 +27,23 @@ buildPythonPackage rec { lxml ]; - # circular dependency on webtest - doCheck = false; pythonImportsCheck = [ "pyquery" ]; + checkInputs = [ + pytestCheckHook + requests + webob + (webtest.overridePythonAttrs (_: { + # circular dependency + doCheck = false; + })) + ]; + + pytestFlagsArray = [ + # requires network + "--deselect=tests/test_pyquery.py::TestWebScrappingEncoding::test_get" + ]; + meta = with lib; { description = "A jquery-like library for Python"; homepage = "https://github.com/gawel/pyquery"; From e8ad29a8a9f4361a386208775417fcf9470df71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:25:06 -0800 Subject: [PATCH 229/338] python310Packages.marshmallow: 3.16.0 -> 3.19.0 https://github.com/marshmallow-code/marshmallow/blob/3.19.0/CHANGELOG.rst --- pkgs/development/python-modules/marshmallow/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index d23263771744..5fcaf478f186 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.16.0"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-bR10hYViK7OrAaBpKaeM7S5XyHQZhlGUQTwH/EJ0kME="; + hash = "sha256-b1brLHM48t45bwUXk7QreLLmvTzU0sX7Uoc1ZAgGkrE="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow/blob/${src.rev}/CHANGELOG.rst"; description = "Library for converting complex objects to and from simple Python datatypes"; homepage = "https://github.com/marshmallow-code/marshmallow"; license = licenses.mit; From 3db3e83674fdd0f6983ac763a6e73610b6fb2586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:24:54 -0800 Subject: [PATCH 230/338] python310Packages.marshmallow-oneofschema: 3.0.1 -> 3.0.2 https://github.com/marshmallow-code/marshmallow-oneofschema/blob/3.0.2/CHANGELOG.rst --- .../python-modules/marshmallow-oneofschema/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index dc00e4bc60d8..3e4faf8c6031 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-x0v8WkfjGkP2668QIQiewQViYFDIS2zBWMULcDThWas="; + hash = "sha256-Em2jQmvI5IiWREeOX/JAcdOQlpwP7k+cbCirkh82sf0="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${src.rev}/CHANGELOG.rst"; description = "Marshmallow library extension that allows schema (de)multiplexing"; homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = licenses.mit; From bdfb499f4074e4918bdcbe3fd85e0e63a4cb194f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:25:16 -0800 Subject: [PATCH 231/338] python310Packages.apispec: add meta.changelog --- pkgs/development/python-modules/apispec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 39a6a7662851..1a85922e5dd5 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/apispec/blob/${version}/CHANGELOG.rst"; description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; From 5ebf4e73e2c868e168e4243ba353a8685d96505d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:48:11 -0800 Subject: [PATCH 232/338] python311Packages.webtest-aiohttp: fix tests apply https://github.com/sloria/webtest-aiohttp/pull/7 --- .../python-modules/webtest-aiohttp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index 7d736d92862a..bfb30288120e 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; + patches = [ + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/sloria/webtest-aiohttp/commit/64e5ab1867ea9ef87901bb2a1a6142566bffc90b.patch"; + hash = "sha256-OKJGajqJLFMkcbGmGfU9G5hCpJaj24Gs363sI0z7YZw="; + }) + ]; + propagatedBuildInputs = [ webtest ]; From d972df3b1a41cf96d2f8f31aa8682bc9bd7a1908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 16:50:06 -0800 Subject: [PATCH 233/338] python310Packages.webtest-aiohttp: add meta.changelog --- pkgs/development/python-modules/webtest-aiohttp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/webtest-aiohttp/default.nix b/pkgs/development/python-modules/webtest-aiohttp/default.nix index bfb30288120e..34c61524f173 100644 --- a/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/sloria/webtest-aiohttp/blob/${src.rev}/CHANGELOG.rst"; description = "Provides integration of WebTest with aiohttp.web applications"; homepage = "https://github.com/sloria/webtest-aiohttp"; license = licenses.mit; From 460e16d242243dbfb843af2b0a1825e559b392b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:24:30 +0100 Subject: [PATCH 234/338] python310Packages.cached-property: fix build for Python 3.11 --- .../cached-property/default.nix | 42 +++++++++++++++---- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index 90cfc63b7626..555b1ce006e7 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -1,31 +1,55 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , pytestCheckHook , freezegun +, pythonOlder }: buildPythonPackage rec { pname = "cached-property"; version = "1.5.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydanny"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-DGI8FaEjFd2bDeBDKcA0zDCE+5I6meapVNZgycE1gzs="; }; - nativeCheckInputs = [ pytestCheckHook freezegun ]; + patches = [ + # Don't use asyncio.coroutine if it's not available, https://github.com/pydanny/cached-property/pull/267 + (fetchpatch { + name = "asyncio-coroutine.patch"; + url = "https://github.com/pydanny/cached-property/commit/297031687679762849dedeaf24aa3a19116f095b.patch"; + hash = "sha256-qolrUdaX7db4hE125Lt9ICmPNYsD/uBmQrdO4q5NG3c="; + }) + ]; + + checkInputs = [ + pytestCheckHook + freezegun + ]; disabledTests = [ # https://github.com/pydanny/cached-property/issues/131 "test_threads_ttl_expiry" ]; - meta = { + pythonImportsCheck = [ + "cached_property" + ]; + + meta = with lib; { description = "A decorator for caching properties in classes"; homepage = "https://github.com/pydanny/cached-property"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ericsagnes ]; + changelog = "https://github.com/pydanny/cached-property/releases/tag/${version}"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ ericsagnes ]; }; } From fe2df4be99ed2ee3c6754662bbbe172215fb37de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 18:32:59 +0100 Subject: [PATCH 235/338] python311Packages.softlayer: update postPatch --- .../python-modules/softlayer/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index abdaf2d59ccf..25bc231b814e 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,50 +1,52 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , click , fetchFromGitHub , mock +, prettytable , prompt-toolkit , ptable , pygments , pytestCheckHook , pythonOlder , requests +, rich , sphinx , testtools , tkinter , urllib3 -, prettytable -, rich , zeep }: buildPythonPackage rec { pname = "softlayer"; version = "6.1.3"; - disabled = pythonOlder "3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; + hash = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'rich == 12.3.0' 'rich >= 12.3.0' + --replace "rich ==" "rich >=" ''; propagatedBuildInputs = [ click + prettytable prompt-toolkit ptable pygments requests - urllib3 - prettytable rich + urllib3 ]; nativeCheckInputs = [ @@ -64,14 +66,17 @@ buildPythonPackage rec { disabledTestPaths = [ # Test fails with ConnectionError trying to connect to api.softlayer.com - "tests/transports/soap_tests.py" + "tests/transports/soap_tests.py.unstable" ]; - pythonImportsCheck = [ "SoftLayer" ]; + pythonImportsCheck = [ + "SoftLayer" + ]; meta = with lib; { description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; + changelog = "https://github.com/softlayer/softlayer-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; From 3773f56f7f520cf224cfabc8e0c0749450cf6592 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 01:34:01 +0000 Subject: [PATCH 236/338] goodvibes: 0.7.5 -> 0.7.6 --- pkgs/applications/audio/goodvibes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix index 1f09d99c8889..f51daf7081c2 100644 --- a/pkgs/applications/audio/goodvibes/default.nix +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY="; + hash = "sha256-w0nmTYcq2DBHSjQ23zWxT6optyH+lRAMRa210F7XEvE="; }; nativeBuildInputs = [ From 65d7e87fdb7ed8305012433753d7012312b95242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= Date: Sat, 21 Jan 2023 22:41:12 +0100 Subject: [PATCH 237/338] treewide: replace http by https when https is a permanent redirection --- pkgs/applications/audio/ario/default.nix | 2 +- pkgs/applications/audio/eq10q/default.nix | 2 +- pkgs/applications/audio/espeak/default.nix | 2 +- pkgs/applications/audio/espeak/edit.nix | 2 +- pkgs/applications/audio/flac123/default.nix | 2 +- pkgs/applications/audio/gjay/default.nix | 2 +- pkgs/applications/audio/gnaural/default.nix | 2 +- pkgs/applications/audio/id3v2/default.nix | 2 +- pkgs/applications/audio/jack-rack/default.nix | 2 +- pkgs/applications/audio/keyfinder/default.nix | 2 +- pkgs/applications/audio/klick/default.nix | 2 +- .../audio/littlegptracker/default.nix | 4 +-- pkgs/applications/audio/mp3gain/default.nix | 2 +- pkgs/applications/audio/mp3val/default.nix | 2 +- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/audio/munt/libmt32emu.nix | 2 +- pkgs/applications/audio/munt/mt32emu-qt.nix | 2 +- .../audio/munt/mt32emu-smf2wav.nix | 2 +- .../audio/paulstretch/default.nix | 2 +- pkgs/applications/audio/ssrc/default.nix | 2 +- .../audio/streamripper/default.nix | 2 +- .../audio/tap-plugins/default.nix | 2 +- pkgs/applications/audio/xmp/default.nix | 2 +- .../audio/xsynth-dssi/default.nix | 2 +- .../audio/zam-plugins/default.nix | 2 +- .../blockchains/miniscript/default.nix | 2 +- pkgs/applications/editors/aewan/default.nix | 2 +- pkgs/applications/editors/bvi/default.nix | 2 +- .../editors/eclipse/build-eclipse.nix | 2 +- .../session-management-for-emacs/default.nix | 2 +- pkgs/applications/editors/fte/default.nix | 2 +- .../editors/lifeograph/default.nix | 2 +- .../emulators/dgen-sdl/default.nix | 2 +- .../emulators/fuse-emulator/default.nix | 2 +- .../emulators/melonDS/default.nix | 2 +- pkgs/applications/graphics/apngasm/2.nix | 2 +- .../graphics/autotrace/default.nix | 2 +- .../applications/graphics/comical/default.nix | 2 +- pkgs/applications/graphics/djview/default.nix | 2 +- .../applications/graphics/fig2dev/default.nix | 2 +- pkgs/applications/graphics/freepv/default.nix | 2 +- .../applications/graphics/gcolor2/default.nix | 2 +- pkgs/applications/graphics/gocr/default.nix | 2 +- .../graphics/gpicview/default.nix | 2 +- .../graphics/gscan2pdf/default.nix | 2 +- .../graphics/luminance-hdr/default.nix | 2 +- .../graphics/minidjvu/default.nix | 2 +- .../applications/graphics/mtpaint/default.nix | 2 +- .../graphics/panotools/default.nix | 2 +- .../applications/graphics/potrace/default.nix | 4 +-- .../applications/graphics/xournal/default.nix | 2 +- pkgs/applications/misc/audio/sox/default.nix | 2 +- .../misc/audio/wavrsocvt/default.nix | 4 +-- pkgs/applications/misc/calcoo/default.nix | 2 +- pkgs/applications/misc/freemind/default.nix | 2 +- .../applications/misc/gtk2fontsel/default.nix | 2 +- .../applications/misc/nanoblogger/default.nix | 2 +- pkgs/applications/misc/navipowm/default.nix | 2 +- .../misc/spacenav-cube-example/default.nix | 2 +- pkgs/applications/misc/spnavcfg/default.nix | 2 +- pkgs/applications/misc/xcruiser/default.nix | 2 +- .../networking/browsers/w3m/default.nix | 2 +- .../networking/davmail/default.nix | 2 +- .../instant-messengers/centerim/default.nix | 2 +- .../mailreaders/mailcheck/default.nix | 2 +- .../networking/newsreaders/slrn/default.nix | 2 +- pkgs/applications/office/kexi/default.nix | 2 +- pkgs/applications/office/qnotero/default.nix | 2 +- pkgs/applications/office/timeline/default.nix | 4 +-- .../science/biology/bwa/default.nix | 2 +- .../science/biology/emboss/default.nix | 2 +- .../biology/samtools/samtools_0_1_19.nix | 2 +- .../science/biology/snpeff/default.nix | 2 +- .../science/biology/subread/default.nix | 2 +- .../science/electronics/qfsm/default.nix | 2 +- .../science/logic/cubicle/default.nix | 2 +- .../science/logic/metis-prover/default.nix | 2 +- .../science/logic/why3/default.nix | 2 +- .../science/math/fricas/default.nix | 2 +- .../science/math/weka/default.nix | 4 +-- .../molecular-dynamics/gromacs/default.nix | 2 +- pkgs/applications/search/grepm/default.nix | 2 +- .../terminal-emulators/mlterm/default.nix | 2 +- .../terminal-emulators/rxvt/default.nix | 2 +- .../git-annex-utils/default.nix | 2 +- .../version-management/gitstats/default.nix | 2 +- .../video/dvd-slideshow/default.nix | 2 +- pkgs/applications/video/dvdauthor/default.nix | 2 +- pkgs/applications/video/dvdbackup/default.nix | 2 +- pkgs/applications/video/xine-ui/default.nix | 2 +- .../window-managers/hackedbox/default.nix | 2 +- .../window-managers/vwm/default.nix | 2 +- pkgs/data/fonts/corefonts/default.nix | 4 +-- pkgs/data/fonts/hyperscrypt/default.nix | 2 +- pkgs/data/fonts/terminus-font/default.nix | 2 +- .../shared-desktop-ontologies/default.nix | 2 +- .../schemas/xml-dtd/xhtml1/default.nix | 2 +- .../development/compilers/aspectj/default.nix | 2 +- pkgs/development/compilers/eli/default.nix | 2 +- pkgs/development/compilers/flasm/default.nix | 2 +- pkgs/development/compilers/gwt/2.4.0.nix | 2 +- pkgs/development/compilers/jasmin/default.nix | 2 +- pkgs/development/compilers/sdcc/default.nix | 2 +- .../compilers/x11basic/default.nix | 2 +- pkgs/development/coq-modules/HoTT/default.nix | 2 +- pkgs/development/coq-modules/paco/default.nix | 2 +- .../development/embedded/xc3sprog/default.nix | 2 +- .../interpreters/boron/default.nix | 2 +- .../interpreters/metamath/default.nix | 2 +- .../interpreters/tinyscheme/default.nix | 4 +-- .../libraries/AntTweakBar/default.nix | 2 +- .../libraries/SDL_Pango/default.nix | 2 +- .../libraries/SDL_stretch/default.nix | 2 +- pkgs/development/libraries/aften/default.nix | 2 +- .../libraries/audio/libbs2b/default.nix | 2 +- pkgs/development/libraries/cutee/default.nix | 2 +- .../libraries/freeglut/default.nix | 2 +- .../development/libraries/fstrcmp/default.nix | 2 +- pkgs/development/libraries/gdcm/default.nix | 2 +- .../development/libraries/getdata/default.nix | 2 +- pkgs/development/libraries/glew/1.10.nix | 2 +- pkgs/development/libraries/glew/default.nix | 2 +- pkgs/development/libraries/glfw/2.x.nix | 2 +- pkgs/development/libraries/gsm/default.nix | 4 +-- .../libraries/gtkextra/default.nix | 2 +- pkgs/development/libraries/gtkspell/3.nix | 2 +- .../libraries/gtkspellmm/default.nix | 2 +- pkgs/development/libraries/gts/default.nix | 2 +- .../development/libraries/htmlcxx/default.nix | 2 +- .../development/libraries/incrtcl/default.nix | 2 +- pkgs/development/libraries/itktcl/default.nix | 2 +- .../libraries/java/saxon/default.nix | 4 +-- pkgs/development/libraries/judy/default.nix | 2 +- pkgs/development/libraries/lib3ds/default.nix | 2 +- pkgs/development/libraries/libHX/default.nix | 2 +- .../development/libraries/libcddb/default.nix | 2 +- .../libraries/libchewing/default.nix | 2 +- .../libraries/libdbi-drivers/default.nix | 2 +- pkgs/development/libraries/libdbi/default.nix | 2 +- .../libraries/libdigidocpp/default.nix | 2 +- .../libraries/libgringotts/default.nix | 2 +- .../libraries/libid3tag/default.nix | 2 +- .../libraries/libinklevel/default.nix | 2 +- .../libraries/libipfix/default.nix | 2 +- .../libraries/libivykis/default.nix | 2 +- .../libraries/libmodplug/default.nix | 2 +- .../libraries/libnatspec/default.nix | 2 +- pkgs/development/libraries/libofx/default.nix | 2 +- .../libraries/libosmscout/default.nix | 2 +- .../development/libraries/libpar2/default.nix | 2 +- pkgs/development/libraries/libpqxx/6.nix | 2 +- .../development/libraries/libpqxx/default.nix | 2 +- pkgs/development/libraries/librsb/default.nix | 2 +- .../libraries/librsync/default.nix | 2 +- .../libraries/libspectrum/default.nix | 2 +- .../libraries/libspnav/default.nix | 2 +- .../libraries/libthreadar/default.nix | 2 +- pkgs/development/libraries/libwmf/default.nix | 2 +- pkgs/development/libraries/libwpd/default.nix | 2 +- pkgs/development/libraries/libwps/default.nix | 2 +- .../libraries/libxmlxx/default.nix | 2 +- pkgs/development/libraries/libxmlxx/v3.nix | 2 +- pkgs/development/libraries/libxmp/default.nix | 2 +- pkgs/development/libraries/lime/default.nix | 2 +- .../development/libraries/log4cpp/default.nix | 2 +- pkgs/development/libraries/mac/default.nix | 2 +- pkgs/development/libraries/martyr/default.nix | 2 +- .../libraries/mediastreamer/default.nix | 2 +- .../development/libraries/mimetic/default.nix | 2 +- pkgs/development/libraries/mythes/default.nix | 2 +- pkgs/development/libraries/nco/default.nix | 2 +- pkgs/development/libraries/plib/default.nix | 4 +-- pkgs/development/libraries/pslib/default.nix | 2 +- .../libraries/pstreams/default.nix | 4 +-- pkgs/development/libraries/pxlib/default.nix | 2 +- .../libraries/python-qt/default.nix | 2 +- pkgs/development/libraries/qjson/default.nix | 2 +- .../libraries/quesoglc/default.nix | 2 +- .../libraries/rapidxml/default.nix | 2 +- pkgs/development/libraries/rote/default.nix | 2 +- .../libraries/science/math/itpp/default.nix | 2 +- pkgs/development/libraries/snap7/default.nix | 2 +- pkgs/development/libraries/soci/default.nix | 2 +- pkgs/development/libraries/tclap/default.nix | 2 +- pkgs/development/libraries/tclx/default.nix | 2 +- pkgs/development/libraries/tix/default.nix | 2 +- pkgs/development/libraries/tsocks/default.nix | 2 +- pkgs/development/libraries/vxl/default.nix | 2 +- pkgs/development/libraries/waffle/default.nix | 2 +- .../libraries/wildmidi/default.nix | 2 +- pkgs/development/libraries/wxSVG/default.nix | 2 +- pkgs/development/libraries/xavs/default.nix | 2 +- .../libraries/xine-lib/default.nix | 2 +- .../libraries/xmlrpc-c/default.nix | 2 +- pkgs/development/libraries/xylib/default.nix | 2 +- .../lua-modules/generated-packages.nix | 30 +++++++++---------- pkgs/development/misc/haskell/hasura/pool.nix | 2 +- .../node-packages/node-packages.nix | 8 ++--- .../ocaml-modules/gmetadom/default.nix | 2 +- .../ocaml-modules/note/default.nix | 2 +- .../python-modules/Pmw/default.nix | 2 +- .../python-modules/audiotools/default.nix | 2 +- .../python-modules/crcmod/default.nix | 2 +- .../python-modules/ftputil/default.nix | 2 +- .../python-modules/holoviews/default.nix | 2 +- .../python-modules/ipykernel/default.nix | 2 +- .../ipython_genutils/default.nix | 2 +- .../python-modules/ipywidgets/default.nix | 2 +- .../python-modules/mip/default.nix | 2 +- .../python-modules/myhdl/default.nix | 2 +- .../python-modules/pelican/default.nix | 2 +- .../python-modules/pydispatcher/default.nix | 2 +- .../python-modules/pyliblo/default.nix | 2 +- .../python-modules/pyopengl/default.nix | 2 +- .../python-modules/pysmf/default.nix | 2 +- .../python-modules/pyx/default.nix | 2 +- .../python-modules/traitlets/default.nix | 2 +- .../python-modules/xlrd/default.nix | 2 +- .../python-modules/yapsy/default.nix | 2 +- .../tools/analysis/cccc/default.nix | 2 +- .../tools/analysis/coan/default.nix | 2 +- .../tools/analysis/emma/default.nix | 2 +- .../tools/analysis/findbugs/default.nix | 2 +- .../tools/analysis/lcov/default.nix | 2 +- .../tools/build-managers/remake/default.nix | 2 +- .../tools/build-managers/tup/default.nix | 2 +- pkgs/development/tools/glslviewer/default.nix | 2 +- .../literate-programming/eweb/default.nix | 2 +- .../development/tools/misc/astyle/default.nix | 2 +- .../development/tools/misc/bashdb/default.nix | 2 +- .../development/tools/misc/cscope/default.nix | 2 +- pkgs/development/tools/misc/ctags/default.nix | 2 +- .../tools/misc/dfu-util/default.nix | 2 +- .../tools/misc/gtkperf/default.nix | 2 +- .../tools/misc/itstool/default.nix | 2 +- .../development/tools/misc/qtspim/default.nix | 2 +- .../tools/misc/srecord/default.nix | 2 +- pkgs/development/tools/misc/swig/2.x.nix | 2 +- pkgs/development/tools/misc/swig/3.x.nix | 2 +- pkgs/development/tools/misc/swig/4.nix | 2 +- pkgs/development/tools/misc/swig/default.nix | 2 +- .../tools/misc/uncrustify/default.nix | 2 +- pkgs/development/tools/misc/xspim/default.nix | 2 +- .../development/tools/parsing/flex/2.5.35.nix | 2 +- .../tools/parsing/jikespg/default.nix | 2 +- pkgs/development/tools/pxview/default.nix | 2 +- pkgs/development/web/xmlindent/default.nix | 2 +- pkgs/games/chessdb/default.nix | 2 +- pkgs/games/domination/default.nix | 4 +-- pkgs/games/egoboo/default.nix | 2 +- pkgs/games/fish-fillets-ng/default.nix | 2 +- pkgs/games/fltrator/default.nix | 2 +- .../garden-of-coloured-lights/default.nix | 2 +- pkgs/games/gav/default.nix | 2 +- pkgs/games/gogui/default.nix | 2 +- pkgs/games/gtetrinet/default.nix | 2 +- pkgs/games/hhexen/default.nix | 2 +- pkgs/games/mars/default.nix | 2 +- pkgs/games/ninvaders/default.nix | 2 +- pkgs/games/njam/default.nix | 2 +- pkgs/games/npush/default.nix | 2 +- pkgs/games/pioneers/default.nix | 2 +- pkgs/games/quakespasm/default.nix | 2 +- pkgs/games/rigsofrods/default.nix | 2 +- pkgs/games/rrootage/default.nix | 2 +- pkgs/games/scid-vs-pc/default.nix | 2 +- pkgs/games/scid/default.nix | 2 +- pkgs/games/speed-dreams/default.nix | 2 +- pkgs/games/tinyfugue/default.nix | 2 +- pkgs/games/torcs/default.nix | 2 +- pkgs/games/typespeed/default.nix | 4 +-- pkgs/games/uhexen2/default.nix | 2 +- pkgs/games/uqm/default.nix | 2 +- pkgs/games/zaz/default.nix | 2 +- pkgs/misc/drivers/spacenavd/default.nix | 2 +- pkgs/misc/drivers/xwiimote/default.nix | 2 +- pkgs/misc/talkfilters/default.nix | 2 +- pkgs/misc/uboot/default.nix | 2 +- pkgs/os-specific/linux/conky/default.nix | 2 +- .../firmware/intel2200BGFirmware/default.nix | 2 +- pkgs/os-specific/linux/libaio/default.nix | 2 +- pkgs/os-specific/linux/linuxptp/default.nix | 2 +- .../linux/lksctp-tools/default.nix | 2 +- .../linux/mwprocapture/default.nix | 2 +- .../linux/roccat-tools/default.nix | 2 +- pkgs/os-specific/linux/sysfsutils/default.nix | 2 +- pkgs/os-specific/linux/tunctl/default.nix | 2 +- pkgs/servers/gopher/gofish/default.nix | 2 +- .../apache-modules/mod_python/default.nix | 2 +- pkgs/servers/mail/dkimproxy/default.nix | 2 +- pkgs/servers/mail/dspam/default.nix | 2 +- pkgs/servers/mail/petidomo/default.nix | 2 +- pkgs/servers/monitoring/lcdproc/default.nix | 2 +- pkgs/servers/sql/mssql/jdbc/jtds.nix | 2 +- pkgs/servers/uftp/default.nix | 2 +- pkgs/tools/X11/imwheel/default.nix | 2 +- pkgs/tools/X11/xosview2/default.nix | 2 +- pkgs/tools/admin/tightvnc/default.nix | 2 +- pkgs/tools/archivers/s-tar/default.nix | 2 +- pkgs/tools/audio/abcmidi/default.nix | 2 +- pkgs/tools/audio/asap/default.nix | 2 +- pkgs/tools/audio/midicsv/default.nix | 4 +-- pkgs/tools/backup/luckybackup/default.nix | 2 +- pkgs/tools/cd-dvd/cdrdao/default.nix | 2 +- pkgs/tools/cd-dvd/cdrtools/default.nix | 2 +- pkgs/tools/filesystems/avfs/default.nix | 2 +- pkgs/tools/filesystems/djmount/default.nix | 2 +- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 +-- pkgs/tools/filesystems/ext4magic/default.nix | 2 +- .../tools/filesystems/extundelete/default.nix | 2 +- pkgs/tools/filesystems/genromfs/default.nix | 2 +- pkgs/tools/filesystems/httpfs/default.nix | 2 +- pkgs/tools/filesystems/mhddfs/default.nix | 4 +-- pkgs/tools/filesystems/svnfs/default.nix | 2 +- .../tools/graphics/enblend-enfuse/default.nix | 2 +- pkgs/tools/graphics/netpbm/default.nix | 2 +- pkgs/tools/graphics/nifskope/default.nix | 2 +- pkgs/tools/graphics/optipng/default.nix | 2 +- pkgs/tools/graphics/pfstools/default.nix | 2 +- pkgs/tools/graphics/ploticus/default.nix | 4 +-- pkgs/tools/graphics/pngnq/default.nix | 2 +- pkgs/tools/graphics/sng/default.nix | 2 +- pkgs/tools/misc/bbe/default.nix | 2 +- pkgs/tools/misc/cunit/default.nix | 2 +- pkgs/tools/misc/dbacl/default.nix | 2 +- pkgs/tools/misc/detox/default.nix | 2 +- pkgs/tools/misc/dtach/default.nix | 2 +- pkgs/tools/misc/eot-utilities/default.nix | 2 +- pkgs/tools/misc/expect/default.nix | 2 +- pkgs/tools/misc/ink/default.nix | 2 +- pkgs/tools/misc/libcpuid/default.nix | 2 +- pkgs/tools/misc/limitcpu/default.nix | 2 +- pkgs/tools/misc/memtest86+/default.nix | 2 +- pkgs/tools/misc/ms-sys/default.nix | 2 +- pkgs/tools/misc/pal/default.nix | 2 +- pkgs/tools/misc/rig/default.nix | 2 +- pkgs/tools/misc/smc/default.nix | 2 +- pkgs/tools/misc/ttf2pt1/default.nix | 2 +- pkgs/tools/networking/cdpr/default.nix | 2 +- pkgs/tools/networking/cntlm/default.nix | 2 +- pkgs/tools/networking/dirb/default.nix | 2 +- pkgs/tools/networking/libnids/default.nix | 2 +- pkgs/tools/networking/netcat/default.nix | 2 +- .../networking/p2p/gtk-gnutella/default.nix | 2 +- pkgs/tools/networking/pptp/default.nix | 2 +- pkgs/tools/networking/pptpd/default.nix | 2 +- pkgs/tools/networking/qodem/default.nix | 2 +- pkgs/tools/networking/sstp/default.nix | 2 +- pkgs/tools/networking/stuntman/default.nix | 2 +- pkgs/tools/networking/traceroute/default.nix | 2 +- pkgs/tools/networking/zssh/default.nix | 2 +- pkgs/tools/security/aespipe/default.nix | 2 +- pkgs/tools/security/ccrypt/default.nix | 2 +- .../security/gnupg-pkcs11-scd/default.nix | 2 +- pkgs/tools/security/pamtester/default.nix | 2 +- pkgs/tools/security/pdfcrack/default.nix | 2 +- pkgs/tools/security/rhash/default.nix | 2 +- pkgs/tools/security/trousers/default.nix | 2 +- pkgs/tools/security/wipe/default.nix | 2 +- pkgs/tools/system/bar/default.nix | 2 +- pkgs/tools/system/dcfldd/default.nix | 2 +- pkgs/tools/system/dog/default.nix | 2 +- pkgs/tools/system/foremost/default.nix | 4 +-- pkgs/tools/system/gt5/default.nix | 2 +- pkgs/tools/system/idle3tools/default.nix | 2 +- pkgs/tools/system/ipmiutil/default.nix | 2 +- pkgs/tools/text/multitran/data/default.nix | 2 +- .../tools/text/multitran/libbtree/default.nix | 2 +- .../tools/text/multitran/libfacet/default.nix | 2 +- .../text/multitran/libmtquery/default.nix | 2 +- .../text/multitran/libmtsupport/default.nix | 2 +- pkgs/tools/text/multitran/mtutils/default.nix | 2 +- pkgs/tools/text/sgml/openjade/default.nix | 2 +- pkgs/tools/text/sgml/opensp/default.nix | 2 +- .../tools/text/xml/html-xml-utils/default.nix | 2 +- pkgs/tools/text/xml/xmlstarlet/default.nix | 2 +- pkgs/tools/typesetting/docbook2x/default.nix | 2 +- .../tools/typesetting/tex/dblatex/default.nix | 2 +- pkgs/tools/video/yamdi/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 4 +-- 381 files changed, 417 insertions(+), 417 deletions(-) diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index f9fedfcc28ff..5b956e8f5961 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK client for MPD (Music player daemon)"; - homepage = "http://ario-player.sourceforge.net/"; + homepage = "https://ario-player.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.garrison ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index ba0715eb1dfb..84c8333d1857 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 64 bits floating point internal audio processing. Nice GUI with powerful metering for every plugin. ''; - homepage = "http://eq10q.sourceforge.net/"; + homepage = "https://eq10q.sourceforge.net/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index e5579175bbb7..2c59068720d0 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compact open source software speech synthesizer"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 2c86a036ceb2..6c4da056c848 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Phoneme editor for espeak"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index 09c7b44d92dd..5da071805cad 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libogg popt ]; meta = with lib; { - homepage = "http://flac-tools.sourceforge.net/"; + homepage = "https://flac-tools.sourceforge.net/"; description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 4bd9c6dcd8f8..29d676598203 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; - homepage = "http://gjay.sourceforge.net/"; + homepage = "https://gjay.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 1cdea4629bbc..42b28eacc4f4 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programmable auditory binaural-beat synthesizer"; - homepage = "http://gnaural.sourceforge.net/"; + homepage = "https://gnaural.sourceforge.net/"; maintainers = with maintainers; [ ehmry ]; license = with licenses; [ gpl2Only ]; }; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index f6c88bc456e9..7b8ece0e7182 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line editor for id3v2 tags"; - homepage = "http://id3v2.sourceforge.net/"; + homepage = "https://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; unix; }; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 25ee53d3f435..420c11562e2a 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { be controlled using the ALSA sequencer. It's phat; it turns your computer into an effects box. ''; - homepage = "http://jack-rack.sourceforge.net/"; + homepage = "https://jack-rack.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.astsmtl ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index c3667ee57a5d..24a72501db54 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { management, no track suggestions, no media player. Just a fast, efficient workflow tool. ''; - homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; + homepage = "https://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index cbe12a486efa..7c762adf371f 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { prefixKey = "PREFIX="; meta = { - homepage = "http://das.nasophon.de/klick/"; + homepage = "https://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 4d7d70aebd66..abeaa7dff427 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { channels. Additionally, the program can drive MIDI instruments (with the gp32 and gp2x a custom MIDI interface is required). ''; - homepage = "http://www.littlegptracker.com/"; - downloadPage = "http://www.littlegptracker.com/download.php"; + homepage = "https://www.littlegptracker.com/"; + downloadPage = "https://www.littlegptracker.com/download.php"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index ba2a757e090c..a0e6a0527f7d 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossless mp3 normalizer with statistical analysis"; - homepage = "http://mp3gain.sourceforge.net/"; + homepage = "https://mp3gain.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ devhell ]; diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 2435f0cecc62..559f04f919f1 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also other MPEG versions and layers. The tool is also aware of the most common types of tags (ID3v1, ID3v2, APEv2). ''; - homepage = "http://mp3val.sourceforge.net/index.shtml"; + homepage = "https://mp3val.sourceforge.net/index.shtml"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index e247ebeb2b1d..9a693c0eaa39 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://mpc123.sourceforge.net/"; + homepage = "https://mpc123.sourceforge.net/"; description = "A Musepack (.mpc) audio player"; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 08cfbada9313..4a73ddf03c87 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line MP3 player"; - homepage = "http://mpg321.sourceforge.net/"; + homepage = "https://mpg321.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index 571cd16e2aa8..75cf863fc769 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix index 92488ac587b6..51501de4a89e 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -63,7 +63,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "A synthesizer application built on Qt and libmt32emu"; longDescription = '' mt32emu-qt is a synthesiser application that facilitates both realtime diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index b9e87a305303..517d1b200aab 100644 --- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "Produces a WAVE file from a Standard MIDI file (SMF)"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index 1d701004622e..5e781a9f5115 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { special effects by "spectral smoothing" the sounds. It can transform any sound/music to a texture. ''; - homepage = "http://hypermammut.sourceforge.net/paulstretch/"; + homepage = "https://hypermammut.sourceforge.net/paulstretch/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 1ac1d6658f8d..d6d776c86058 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; version = version; - homepage = "http://shibatch.sourceforge.net/"; + homepage = "https://shibatch.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 6fae14e2b1ad..a44a77237d1f 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libogg libvorbis libmad ]; meta = with lib; { - homepage = "http://streamripper.sourceforge.net/"; + homepage = "https://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index 56ff4c0e1911..9b6f4efe1661 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter, TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato. ''; - homepage = "http://tap-plugins.sourceforge.net/ladspa.html"; + homepage = "https://tap-plugins.sourceforge.net/ladspa.html"; license = licenses.gpl3; maintainers = [ maintainers.fps ]; }; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 5f99555d376c..6c0d439a0d1b 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extended module player"; - homepage = "http://xmp.sourceforge.net/"; + homepage = "https://xmp.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 87305027e4c4..e28d773d6e2a 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { synths) with user interfaces, permitting them to be hosted in-process by audio applications. ''; - homepage = "http://dssi.sourceforge.net/download.html#Xsynth-DSSI"; + homepage = "https://dssi.sourceforge.net/download.html#Xsynth-DSSI"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index a9d041cfa428..c676e6a774b5 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.zamaudio.com/?p=976"; + homepage = "https://www.zamaudio.com/?p=976"; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index 5d8e887209a4..e9d68b756212 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compiler and inspector for the miniscript Bitcoin policy language"; longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; - homepage = "http://bitcoin.sipa.be/miniscript/"; + homepage = "https://bitcoin.sipa.be/miniscript/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ RaghavSood jb55 ]; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 8472a91c596f..6e817646d9e7 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; - homepage = "http://aewan.sourceforge.net/"; + homepage = "https://aewan.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index ddef8467646b..e4e41ec732b2 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Hex editor with vim style keybindings"; - homepage = "http://bvi.sourceforge.net/download.html"; + homepage = "https://bvi.sourceforge.net/download.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index de5a961fd1de..3c3102370d0e 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = "http://www.eclipse.org/"; + homepage = "https://www.eclipse.org/"; inherit description; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix index 71f9981f461a..f21e79c8f33d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; - homepage = "http://emacs-session.sourceforge.net/"; + homepage = "https://emacs-session.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index b4b5e74887c1..c2b3229d4523 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free text editor for developers"; - homepage = "http://fte.sourceforge.net/"; + homepage = "https://fte.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix index 895a9e11d5e8..099aec1558b2 100644 --- a/pkgs/applications/editors/lifeograph/default.nix +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://lifeograph.sourceforge.net/wiki/Main_Page"; + homepage = "https://lifeograph.sourceforge.net/wiki/Main_Page"; description = "Lifeograph is an off-line and private journal and note taking application"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index cbcdad4a3c2b..a501139ff47b 100644 --- a/pkgs/applications/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://dgen.sourceforge.net/"; + homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive diff --git a/pkgs/applications/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix index 35e28ba55f6a..91aec6d52ed6 100644 --- a/pkgs/applications/emulators/fuse-emulator/default.nix +++ b/pkgs/applications/emulators/fuse-emulator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://fuse-emulator.sourceforge.net/"; + homepage = "https://fuse-emulator.sourceforge.net/"; description = "ZX Spectrum emulator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index d1573ba5967b..06ef3d99088e 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; meta = with lib; { - homepage = "http://melonds.kuribo64.net/"; + homepage = "https://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ artemist benley shamilton xfix ]; diff --git a/pkgs/applications/graphics/apngasm/2.nix b/pkgs/applications/graphics/apngasm/2.nix index 0313115ddfa8..81d2915c96df 100644 --- a/pkgs/applications/graphics/apngasm/2.nix +++ b/pkgs/applications/graphics/apngasm/2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create highly optimized Animated PNG files from PNG/TGA images"; - homepage = "http://apngasm.sourceforge.net/"; + homepage = "https://apngasm.sourceforge.net/"; license = licenses.zlib; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index e3b966353ffe..502aeddf8146 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://autotrace.sourceforge.net/"; + homepage = "https://autotrace.sourceforge.net/"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 095905ff06d8..00733e8a603b 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; - homepage = "http://comical.sourceforge.net/"; + homepage = "https://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ viric wegank ]; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 244f0c27648f..6386c39ce910 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 984d67f6ba7b..80e13fda9222 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to convert Xfig files to other formats"; - homepage = "http://mcj.sourceforge.net/"; + homepage = "https://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.unix; maintainers = with maintainers; [ lesuisse ]; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index d11798a9b290..c69c9af184b0 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source panorama viewer using GL"; - homepage = "http://freepv.sourceforge.net/"; + homepage = "https://freepv.sourceforge.net/"; license = [ lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 5caa54167047..61a41abac5b0 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Simple GTK 2 color selector"; - homepage = "http://gcolor2.sourceforge.net/"; + homepage = "https://gcolor2.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ notthemessiah ]; platforms = with lib.platforms; unix; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 21ba4c662c22..36bba9eaa4a1 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://jocr.sourceforge.net/"; + homepage = "https://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 06c3b03ae533..f19c0282b187 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and fast image viewer for X"; - homepage = "http://lxde.sourceforge.net/gpicview/"; + homepage = "https://lxde.sourceforge.net/gpicview/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index fc686ad1f212..e737cbd36fc3 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -128,7 +128,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "A GUI to produce PDFs or DjVus from scanned documents"; - homepage = "http://gscan2pdf.sourceforge.net/"; + homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; }; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index c44ff57d18f3..d0cf9af97d21 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - homepage = "http://qtpfsgui.sourceforge.net/"; + homepage = "https://qtpfsgui.sourceforge.net/"; description = "A complete open source solution for HDR photography"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index f0693cc6121f..4a9b91d9c7b8 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.viric ]; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 0acc873b3968..740f9c7cb193 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Due to its simplicity and lack of dependencies it runs well on GNU/Linux, Windows and older PC hardware. ''; - homepage = "http://mtpaint.sourceforge.net/"; + homepage = "https://mtpaint.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vklquevs ]; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index dbc5b973fe9c..0bd1fc20c59f 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - homepage = "http://panotools.sourceforge.net/"; + homepage = "https://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 9392f27c1713..b46c2060ede0 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.16"; src = fetchurl { - url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; + url = "https://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; sha256 = "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://potrace.sourceforge.net/"; + homepage = "https://potrace.sourceforge.net/"; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = platforms.unix; maintainers = [ maintainers.pSub ]; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 2372178b974e..288f0446b34a 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xournal.sourceforge.net/"; + homepage = "https://xournal.sourceforge.net/"; description = "Note-taking application (supposes stylus)"; maintainers = [ maintainers.guibert ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 0862453d03aa..59af845e2948 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sample Rate Converter for audio"; - homepage = "http://sox.sourceforge.net/"; + homepage = "https://sox.sourceforge.net/"; maintainers = with maintainers; [ marcweber ]; license = if enableAMR then licenses.unfree else licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 10aac715b48a..c9f97c5602b2 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.0.2.0"; src = fetchurl { - url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz"; + url = "https://bricxcc.sourceforge.net/wavrsocvt.tgz"; sha256 = "15qlvdfwbiclljj7075ycm78yzqahzrgl4ky8pymix5179acm05h"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { supported sample rates in the standard NXT firmware). You can then upload these with e.g. nxt-python. ''; - homepage = "http://bricxcc.sourceforge.net/"; + homepage = "https://bricxcc.sourceforge.net/"; license = licenses.mpl11; maintainers = with maintainers; [ leenaars ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/applications/misc/calcoo/default.nix index 4af71bae653e..b0fc6da5eb46 100644 --- a/pkgs/applications/misc/calcoo/default.nix +++ b/pkgs/applications/misc/calcoo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://calcoo.sourceforge.net/"; + homepage = "https://calcoo.sourceforge.net/"; description = "RPN and algebraic scientific calculator"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index b87c43226e0a..ff84ecdf55f0 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mind-mapping software"; - homepage = "http://freemind.sourceforge.net/wiki/index.php/Main_Page"; + homepage = "https://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index b622d9f19cca..53344338bd03 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; - homepage = "http://gtk2fontsel.sourceforge.net/"; + homepage = "https://gtk2fontsel.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/gtk2fontsel/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index 0ae63d210e76..102991f00256 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; - homepage = "http://nanoblogger.sourceforge.net/"; + homepage = "https://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; mainProgram = "nb"; platforms = lib.platforms.unix; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 6527a4f57411..4ae3cdeebd06 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = { - homepage = "http://navipowm.sourceforge.net/"; + homepage = "https://navipowm.sourceforge.net/"; description = "Car navigation system"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix index 697d13c8c0e2..990aedbc71ec 100644 --- a/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "An example application to test the spacenavd driver"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/applications/misc/spnavcfg/default.nix index fcd4630e8039..6424204c460a 100644 --- a/pkgs/applications/misc/spnavcfg/default.nix +++ b/pkgs/applications/misc/spnavcfg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Interactive configuration GUI for space navigator input devices"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index d57eb4878173..7e3a391eb5bb 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It constructs a virtually 3-D formed universe from a directory tree and allows you to "cruise" within a visualized filesystem. ''; - homepage = "http://xcruiser.sourceforge.net/"; + homepage = "https://xcruiser.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 898c3febc170..1f53c184b3b0 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { LIBS = lib.optionalString x11Support "-lX11"; meta = with lib; { - homepage = "http://w3m.sourceforge.net/"; + homepage = "https://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = with maintainers; [ cstrahan anthonyroussel ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 68a14207e297..5826c94f4bb8 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - homepage = "http://davmail.sourceforge.net/"; + homepage = "https://davmail.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 78178f0021e2..2e4dc6dbb55e 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.centerim.org/"; + homepage = "https://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index e9e5fb5f70e9..43590c9d3361 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; - homepage = "http://mailcheck.sourceforge.net/"; + homepage = "https://mailcheck.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ kovirobi ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index e49ffe15ee28..b1fb3b2054f5 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The slrn (S-Lang read news) newsreader"; - homepage = "http://slrn.sourceforge.net/index.html"; + homepage = "https://slrn.sourceforge.net/index.html"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 4900dafb08e5..37240b8ac569 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { All database objects - tables, queries and forms - are stored in the database, making it easy to share data and design. ''; - homepage = "http://kexi-project.org/"; + homepage = "https://kexi-project.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index e13cdc9c71c0..fbfe11a2c947 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Quick access to Zotero references"; - homepage = "http://www.cogsci.nl/software/qnotero"; + homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.nico202 ]; diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index 7cf777ae13f1..822c2f7674c9 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -76,8 +76,8 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - homepage = "http://thetimelineproj.sourceforge.net/"; - changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; + homepage = "https://thetimelineproj.sourceforge.net/"; + changelog = "https://thetimelineproj.sourceforge.net/changelog.html"; description = "Display and navigate information on a timeline"; license = with licenses; [ gpl3Only cc-by-sa-30 ]; platforms = with platforms; unix; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index 801ad00876bf..d9ae226027a0 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A software package for mapping low-divergent sequences against a large reference genome, such as the human genome"; license = licenses.gpl3; - homepage = "http://bio-bwa.sourceforge.net/"; + homepage = "https://bio-bwa.sourceforge.net/"; maintainers = with maintainers; [ luispedro ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 29669d027303..d590a5da8a67 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; license = lib.licenses.gpl2; - homepage = "http://emboss.sourceforge.net/"; + homepage = "https://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index 590f10dd87a1..2472e4976cad 100644 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; - homepage = "http://samtools.sourceforge.net/"; + homepage = "https://samtools.sourceforge.net/"; platforms = platforms.unix; maintainers = [ maintainers.unode ]; }; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index a47a107349da..269d6e307f1d 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Genetic variant annotation and effect prediction toolbox"; license = licenses.lgpl3; - homepage = "http://snpeff.sourceforge.net/"; + homepage = "https://snpeff.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 987433a3a6d5..9206c4fbed7b 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - homepage = "http://subread.sourceforge.net/"; + homepage = "https://subread.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index b2e3704cba70..e22138997bea 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; - homepage = "http://qfsm.sourceforge.net/"; + homepage = "https://qfsm.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index 4719a69c0128..67f70e7165d4 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open source model checker for verifying safety properties of array-based systems"; - homepage = "http://cubicle.lri.fr/"; + homepage = "https://cubicle.lri.fr/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dwarfmaster ]; diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index fca3c20cd853..5b17403dc7f4 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Automatic theorem prover for first-order logic with equality"; - homepage = "http://www.gilith.com/research/metis/"; + homepage = "https://www.gilith.com/research/metis/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 160d67094f4c..8ca2a6baa889 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A platform for deductive program verification"; - homepage = "http://why3.lri.fr/"; + homepage = "https://why3.lri.fr/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vbgl ]; diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index af1be978459c..48c36b6677f5 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - homepage = "http://fricas.sourceforge.net/"; + homepage = "https://fricas.sourceforge.net/"; description = "An advanced computer algebra system"; license = lib.licenses.bsd3; diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index c29015402a39..004060f832c2 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; # The -Xmx1000M comes suggested from their download page: - # http://www.cs.waikato.ac.nz/ml/weka/downloading.html + # https://www.cs.waikato.ac.nz/ml/weka/downloading.html installPhase = '' mkdir -pv $out/share/weka cp -Rv * $out/share/weka @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; + homepage = "https://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 576c5745b35c..5093a586a85a 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { reference or manual for details), but there are also quite a few features that make it stand out from the competition. - See: http://www.gromacs.org/About_Gromacs for details. + See: https://www.gromacs.org/About_Gromacs for details. ''; platforms = platforms.unix; maintainers = with maintainers; [ sheepforce markuskowa ]; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 7a3210459d1b..14ac6ed69ce8 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Wrapper for grepmail utilizing mutt"; - homepage = "http://www.barsnick.net/sw/grepm.html"; + homepage = "https://www.barsnick.net/sw/grepm.html"; license = licenses.free; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 2783795f3e53..817042a7bcf0 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi Lingual TERMinal emulator"; - homepage = "http://mlterm.sourceforge.net/"; + homepage = "https://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index a6f4ab1321c3..9894a8cdb05a 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://rxvt.sourceforge.net/"; + homepage = "https://rxvt.sourceforge.net/"; description = "Colour vt102 terminal emulator with less features and lower memory consumption"; longDescription = '' rxvt (acronym for our extended virtual terminal) is a terminal diff --git a/pkgs/applications/version-management/git-annex-utils/default.nix b/pkgs/applications/version-management/git-annex-utils/default.nix index 07af33951dfb..2b63192ea3b0 100644 --- a/pkgs/applications/version-management/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-annex-utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { This is a set of utilities that are handy to use with git-annex repositories. Currently there is only one utility gadu, a du like utility for annexed files. ''; - homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; + homepage = "https://git-annex.mysteryvortex.com/git-annex-utils.html"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ woffs ]; mainProgram = "gadu"; diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index d9eaae3ecbca..a795f0f6f6dd 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://gitstats.sourceforge.net/"; + homepage = "https://gitstats.sourceforge.net/"; description = "Git history statistics generator"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 165cb4ab4d63..6499b6153c8d 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = { description = "Suite of command line programs that creates a slideshow-style video from groups of pictures"; - homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; + homepage = "https://dvd-slideshow.sourceforge.net/wiki/Main_Page"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.robbinch ]; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 941b0808886e..daf785b7139f 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; - homepage = "http://dvdauthor.sourceforge.net/"; + homepage = "https://dvdauthor.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 89995ab8cba7..3e998d0c4a17 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; - homepage = "http://dvdbackup.sourceforge.net/"; + homepage = "https://dvdbackup.sourceforge.net/"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bradediger ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 7fd00ec66d03..8becf629d153 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xine.sourceforge.net/"; + homepage = "https://xine.sourceforge.net/"; description = "Xlib-based frontend for Xine video player"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix index 0f608b83a70a..f38d0d6beb9b 100644 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A bastard hacked offspring of Blackbox"; - homepage = "http://github.com/museoa/hackedbox/"; + homepage = "https://github.com/museoa/hackedbox/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (libX11.meta) platforms; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index e1a8c8f3dd24..b0b40afc9e4c 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with lib; { - homepage = "http://vwm.sourceforge.net/"; + homepage = "https://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index db6ac715829f..f8ffc6a2b8e6 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -17,7 +17,7 @@ let ]; eula = fetchurl { - url = "http://corefonts.sourceforge.net/eula.htm"; + url = "https://corefonts.sourceforge.net/eula.htm"; sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; }; in @@ -87,7 +87,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://corefonts.sourceforge.net/"; + homepage = "https://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; license = licenses.unfreeRedistributable; diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index bd7e14a72f0b..29abcfd607f7 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -12,7 +12,7 @@ in sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m"; meta = with lib; { - homepage = "http://velvetyne.fr/fonts/hyper-scrypt/"; + homepage = "https://velvetyne.fr/fonts/hyper-scrypt/"; description = "A modern stencil typeface inspired by stained glass technique"; longDescription = '' The Hyper Scrypt typeface was designed for the Hyper Chapelle diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 348f341cea50..cbda0cc100c3 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold for 8x14 and 8x16. ''; - homepage = "http://terminus-font.sourceforge.net/"; + homepage = "https://terminus-font.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; }; diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index fd797d8d63f0..fdbd2991cdee 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - homepage = "http://oscaf.sourceforge.net/"; + homepage = "https://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' The shared-desktop-ontologies package brings the semantic web to the diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index f05788076a69..9a81fbb6e1b4 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = "http://www.w3.org/TR/xhtml1/"; + homepage = "https://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 8bc1e37ad3ce..9c7e8e3d0ac4 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [jre]; meta = { - homepage = "http://www.eclipse.org/aspectj/"; + homepage = "https://www.eclipse.org/aspectj/"; description = "A seamless aspect-oriented extension to the Java programming language"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 869d7fdeedf3..9931e45c9b66 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { construction with extensive libraries implementing common tasks, yet handling arbitrary special cases. Output is the C subset of C++. ''; - homepage = "http://eli-project.sourceforge.net/"; + homepage = "https://eli-project.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ timokau ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/development/compilers/flasm/default.nix index 02ee36642397..c1d2cfedc984 100644 --- a/pkgs/development/compilers/flasm/default.nix +++ b/pkgs/development/compilers/flasm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Assembler and disassembler for Flash (SWF) bytecode"; - homepage = "http://flasm.sourceforge.net/"; + homepage = "https://flasm.sourceforge.net/"; license = licenses.bsd2; maintainers = with maintainers; [ siraben ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 38f29cb3200c..b998266487cf 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.gwtproject.org/"; + homepage = "https://www.gwtproject.org/"; description = "A development toolkit for building and optimizing complex browser-based applications"; license = lib.licenses.asl20; platforms = lib.platforms.unix; diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix index c61f267bf1af..01f09772a84e 100644 --- a/pkgs/development/compilers/jasmin/default.nix +++ b/pkgs/development/compilers/jasmin/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An assembler for the Java Virtual Machine"; - homepage = "http://jasmin.sourceforge.net/"; + homepage = "https://jasmin.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 8f6bc5e6dac0..5b7eeb5b943e 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors. ''; - homepage = "http://sdcc.sourceforge.net/"; + homepage = "https://sdcc.sourceforge.net/"; license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 030c30b96a5a..3ce548c9b483 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://x11-basic.sourceforge.net/"; + homepage = "https://x11-basic.sourceforge.net/"; description = "A Basic interpreter and compiler with graphics capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index ad371f1b6acb..7b9ded1e399a 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -18,7 +18,7 @@ with lib; mkCoqDerivation { ''; meta = { - homepage = "http://homotopytypetheory.org/"; + homepage = "https://homotopytypetheory.org/"; description = "Homotopy type theory"; maintainers = with maintainers; [ siddharthist ]; }; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 82b6079bb2da..ea0988ef6073 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -25,7 +25,7 @@ with lib; mkCoqDerivation { ''; meta = { - homepage = "http://plv.mpi-sws.org/paco/"; + homepage = "https://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; maintainers = with maintainers; [ jwiegley ptival ]; }; diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix index ead48a004720..393a11f8a448 100644 --- a/pkgs/development/embedded/xc3sprog/default.nix +++ b/pkgs/development/embedded/xc3sprog/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; - homepage = "http://xc3sprog.sourceforge.net/"; + homepage = "https://xc3sprog.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/development/interpreters/boron/default.nix index 249a39c58f3a..e40ca2b5b4dc 100644 --- a/pkgs/development/interpreters/boron/default.nix +++ b/pkgs/development/interpreters/boron/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://urlan.sourceforge.net/boron/"; + homepage = "https://urlan.sourceforge.net/boron/"; description = "Scripting language and C library useful for building DSLs"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 9c6c64f73913..e83a724d25d2 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ASCII databases (set.mm and others) are also included in this derivation. ''; homepage = "http://us.metamath.org"; - downloadPage = "http://us.metamath.org/#downloads"; + downloadPage = "https://us.metamath.org/#downloads"; license = licenses.gpl2Plus; maintainers = [ maintainers.taneb ]; platforms = platforms.all; diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index 000b0534a104..1b298af4ac49 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation rec { TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. ''; - homepage = "http://tinyscheme.sourceforge.net/"; - changelog = "http://tinyscheme.sourceforge.net/CHANGES"; + homepage = "https://tinyscheme.sourceforge.net/"; + changelog = "https://tinyscheme.sourceforge.net/CHANGES"; license = licenses.bsdOriginal; mainProgram = pname; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index 4c67c927e57f..6c1eeff94118 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { (compatibility and core profiles), DirectX 9, DirectX 10 or DirectX 11 to interactively tweak parameters on-screen ''; - homepage = "http://anttweakbar.sourceforge.net/"; + homepage = "https://anttweakbar.sourceforge.net/"; license = lib.licenses.zlib; maintainers = [ lib.maintainers.razvan ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 7c90092fe8dd..e24af838c65e 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Connects the Pango rendering engine to SDL"; license = licenses.lgpl21Plus; platforms = platforms.all; - homepage = "http://sdlpango.sourceforge.net/"; + homepage = "https://sdlpango.sourceforge.net/"; maintainers = with maintainers; [ puckipedia ]; }; } diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index e6318b84859e..99f86dd258b3 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Stretch Functions For SDL"; - homepage = "http://sdl-stretch.sourceforge.net/"; + homepage = "https://sdl-stretch.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 11ed0f1b28b7..97b2230f0311 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; - homepage = "http://aften.sourceforge.net/"; + homepage = "https://aften.sourceforge.net/"; license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = with maintainers; [ emilytrau ]; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 720823852b02..fa390eaaa588 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://bs2b.sourceforge.net/"; + homepage = "https://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 748d495063de..07e2b7cbcee2 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Unit Testing Easy Environment"; - homepage = "http://www.codesink.org/cutee_unit_testing.html"; + homepage = "https://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 00b8dac9105d..776023f35f01 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { intended to be a full replacement for GLUT, and has only a few differences. ''; - homepage = "http://freeglut.sourceforge.net/"; + homepage = "https://freeglut.sourceforge.net/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index c91e8517b078..2dfa02e71059 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { comparisons of strings and byte arrays, including multi-byte character strings. ''; - homepage = "http://fstrcmp.sourceforge.net/"; + homepage = "https://fstrcmp.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/fstrcmp/"; license = licenses.gpl3; maintainers = [ maintainers.sephalon ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index b6aaa341da4d..ecc37b7e71f7 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; - homepage = "http://gdcm.sourceforge.net/"; + homepage = "https://gdcm.sourceforge.net/"; license = with licenses; [ bsd3 asl20 ]; maintainers = with maintainers; [ tfmoraes ]; }; diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 5978c3dc31c5..8617d7ddd2f2 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = "http://getdata.sourceforge.net/"; + homepage = "https://getdata.sourceforge.net/"; }; } diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index c0c4d6fe0ce9..a51b1060b8a5 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OpenGL extension loading library for C(++)"; - homepage = "http://glew.sourceforge.net/"; + homepage = "https://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] platforms = platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 94a2d2c967b1..1e30eb744ba8 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OpenGL extension loading library for C/C++"; - homepage = "http://glew.sourceforge.net/"; + homepage = "https://glew.sourceforge.net/"; license = with licenses; [ /* modified bsd */ free mit gpl2Only ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing platforms = with platforms; if enableEGL then diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index 75a7c97db2bd..545e7a418a5f 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "http://glfw.sourceforge.net/"; + homepage = "https://glfw.sourceforge.net/"; license = licenses.zlib; maintainers = [ lib.maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index ecf2d0e5ba5c..ff2217b6e36d 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.20"; src = fetchurl { - url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; + url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz"; sha256 = "sha256-YxXDhRi4HomcP8LtRjzGI68pxcIxpIwTeyQwIjSukL8="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossy speech compression codec"; - homepage = "http://www.quut.com/gsm/"; + homepage = "https://www.quut.com/gsm/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtkextra/default.nix b/pkgs/development/libraries/gtkextra/default.nix index 4c2f739cd965..ed860b7dde3f 100644 --- a/pkgs/development/libraries/gtkextra/default.nix +++ b/pkgs/development/libraries/gtkextra/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 glib cairo atk pango libtiff libpng libjpeg ]; meta = with lib; { - homepage = "http://gtkextra.sourceforge.net/"; + homepage = "https://gtkextra.sourceforge.net/"; description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+."; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index d3a1a178856b..3c7a6a3b3b23 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://gtkspell.sourceforge.net/"; + homepage = "https://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index 31380b5ab793..641ebbf9f08d 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ binding for the gtkspell library"; - homepage = "http://gtkspell.sourceforge.net/"; + homepage = "https://gtkspell.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 815dfb634c9f..5aa8aca6ffb3 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://gts.sourceforge.net/"; + homepage = "https://gts.sourceforge.net/"; license = lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 41d24b81bf69..41e86b275fe4 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://htmlcxx.sourceforge.net/"; + homepage = "https://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; platforms = platforms.all; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 0a57b3c26fff..4234e56edd70 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -30,7 +30,7 @@ tcl.mkTclDerivation rec { outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = "http://incrtcl.sourceforge.net/"; + homepage = "https://incrtcl.sourceforge.net/"; description = "Object Oriented Enhancements for Tcl/Tk"; license = licenses.tcltk; platforms = platforms.unix; diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix index 66039c61b4d5..b6a4788075f7 100644 --- a/pkgs/development/libraries/itktcl/default.nix +++ b/pkgs/development/libraries/itktcl/default.nix @@ -29,7 +29,7 @@ tcl.mkTclDerivation rec { outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = "http://incrtcl.sourceforge.net/"; + homepage = "https://incrtcl.sourceforge.net/"; description = "Mega-widget toolkit for incr Tk"; license = licenses.tcltk; platforms = platforms.unix; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 484f9017ae70..4ff3e69c34ce 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -28,7 +28,7 @@ let meta = with lib; { inherit description license; - homepage = "http://saxon.sourceforge.net/"; + homepage = "https://saxon.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; @@ -44,7 +44,7 @@ in { sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; description = "XSLT 1.0 processor"; - # http://saxon.sourceforge.net/saxon6.5.3/conditions.html + # https://saxon.sourceforge.net/saxon6.5.3/conditions.html license = lib.licenses.mpl10; java = jre8; }; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index da8e89f93565..618aee498466 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = "http://judy.sourceforge.net/"; + homepage = "https://judy.sourceforge.net/"; license = lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 78ee4172b57a..791d2ab523d0 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; - homepage = "http://lib3ds.sourceforge.net/"; + homepage = "https://lib3ds.sourceforge.net/"; license = "LGPL"; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 8b9190fc8274..e7172b493c79 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libhx.sourceforge.net/"; + homepage = "https://libhx.sourceforge.net/"; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 79c11d75db1d..11a0c259dfdb 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library to access data on a CDDB server (freedb.org)"; - homepage = "http://libcddb.sourceforge.net/"; + homepage = "https://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; mainProgram = "cddb_query"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index c6b7841ca400..7cfa864fc06f 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Intelligent Chinese phonetic input method"; - homepage = "http://chewing.im/"; + homepage = "https://chewing.im/"; license = licenses.lgpl21Only; maintainers = [ maintainers.ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 321c50b61c98..461a3c0b7bbd 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libdbi-drivers.sourceforge.net/"; + homepage = "https://libdbi-drivers.sourceforge.net/"; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index ffbc3f671007..f0cb74cb86d0 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libdbi.sourceforge.net/"; + homepage = "https://libdbi.sourceforge.net/"; description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 21da1a917bf1..101c6182f470 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for creating DigiDoc signature files"; - homepage = "http://www.id.ee/"; + homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 16595a12eb50..faa478b568c7 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small library to encapsulate data in an encrypted structure"; - homepage = "http://libgringotts.sourceforge.net/"; + homepage = "https://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 57786cad761f..c8c9d8bf5103 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ID3 tag manipulation library"; - homepage = "http://mad.sourceforge.net/"; + homepage = "https://mad.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix index f9c711df7043..0179009be3f9 100644 --- a/pkgs/development/libraries/libinklevel/default.nix +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { project is to create a vendor independent API for retrieving the ink level of a printer connected to a Linux or FreeBSD box. ''; - homepage = "http://libinklevel.sourceforge.net/"; + homepage = "https://libinklevel.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ samb96 ]; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index 8b0c35e0d148..ce9932102852 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { - homepage = "http://libipfix.sourceforge.net/"; + homepage = "https://libipfix.sourceforge.net/"; description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 9a1c728bd55d..c5e0c55854e6 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ file protobufc ]; meta = with lib; { - homepage = "http://libivykis.sourceforge.net/"; + homepage = "https://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness notification facilities diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 3f4f89c0a25c..c4fa6fcd7ce7 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MOD playing library"; - homepage = "http://modplug-xmms.sourceforge.net/"; + homepage = "https://modplug-xmms.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 304fb49f0274..360aba08e709 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libiconv ]; meta = with lib; { - homepage = "http://natspec.sourceforge.net/"; + homepage = "https://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index dd14504bf8b6..ad22dc5b61cc 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensource implementation of the Open Financial eXchange specification"; - homepage = "http://libofx.sourceforge.net/"; + homepage = "https://libofx.sourceforge.net/"; license = "LGPL"; platforms = lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index 76a1ba534b71..8452ccffe389 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = with lib; { description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; - homepage = "http://libosmscout.sourceforge.net/"; + homepage = "https://libosmscout.sourceforge.net/"; license = licenses.lgpl3Plus; maintainers = [ maintainers.Thra11 ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 0130af664597..772f3ff719d5 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = "http://parchive.sourceforge.net/"; + homepage = "https://parchive.sourceforge.net/"; license = lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libpqxx/6.nix b/pkgs/development/libraries/libpqxx/6.nix index c9e55fd9c019..1c2a98fcb3c9 100644 --- a/pkgs/development/libraries/libpqxx/6.nix +++ b/pkgs/development/libraries/libpqxx/6.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = "http://pqxx.org/development/libpqxx/"; + homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index d0116a742d26..235021769310 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = "http://pqxx.org/development/libpqxx/"; + homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix index 691975b1af4e..5f8783fcbac6 100644 --- a/pkgs/development/libraries/librsb/default.nix +++ b/pkgs/development/libraries/librsb/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { checkTarget = "tests"; meta = with lib; { - homepage = "http://librsb.sourceforge.net/"; + homepage = "https://librsb.sourceforge.net/"; description = "Shared memory parallel sparse matrix and sparse BLAS library"; longDescription = '' Library for sparse matrix computations featuring the Recursive Sparse diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 0594e9e6e20b..cc9778a3ba7d 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the rsync remote-delta algorithm"; - homepage = "http://librsync.sourceforge.net/"; + homepage = "https://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; mainProgram = "rdiff"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index c373f7c24ff3..3dda20ab6128 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://fuse-emulator.sourceforge.net/libspectrum.php"; + homepage = "https://fuse-emulator.sourceforge.net/libspectrum.php"; description = "ZX Spectrum input and output support library"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix index f6908aa3314f..d67b12a726b4 100644 --- a/pkgs/development/libraries/libspnav/default.nix +++ b/pkgs/development/libraries/libspnav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Device driver and SDK for 3Dconnexion 3D input devices"; longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 8e94275babfd..05aff273400e 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libthreadar.sourceforge.net/"; + homepage = "https://libthreadar.sourceforge.net/"; description = "A C++ library that provides several classes to manipulate threads"; longDescription = '' Libthreadar is a C++ library providing a small set of C++ classes to manipulate diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index e955fee57207..e6d598b54bac 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WMF library from wvWare"; - homepage = "http://wvware.sourceforge.net/libwmf.html"; + homepage = "https://wvware.sourceforge.net/libwmf.html"; downloadPage = "https://github.com/caolanm/libwmf/releases"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 1f54c2c2fb1a..47755e18e223 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for importing and exporting WordPerfect documents"; - homepage = "http://libwpd.sourceforge.net/"; + homepage = "https://libwpd.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 7dd7153bae9f..597370ad0e57 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with lib; { - homepage = "http://libwps.sourceforge.net/"; + homepage = "https://libwps.sourceforge.net/"; description = "Microsoft Works document format import filter library"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 16c29647a7c4..717ef7c70bde 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libxmlplusplus.sourceforge.net/"; + homepage = "https://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index b3ff59ad41e1..02c990ae3547 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libxmlplusplus.sourceforge.net/"; + homepage = "https://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 47dfcab5a499..7fc14677ed7f 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extended module player library"; - homepage = "http://xmp.sourceforge.net/"; + homepage = "https://xmp.sourceforge.net/"; longDescription = '' Libxmp is a library that renders module files to PCM data. It supports over 90 mainstream and obscure module formats including Protracker (MOD), diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 038d96cad76c..dc679b4ba549 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; - homepage = "http://www.linphone.org/technical-corner/lime"; + homepage = "https://www.linphone.org/technical-corner/lime"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index f7a10d9c31d3..18ef21f26a2e 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://log4cpp.sourceforge.net/"; + homepage = "https://log4cpp.sourceforge.net/"; description = "A logging framework for C++ patterned after Apache log4j"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index 7445d283c6f4..f2eb23423251 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "APE codec and decompressor"; - homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; + homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 609033e22ead..3221f2950c17 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; - homepage = "http://martyr.sourceforge.net/"; + homepage = "https://martyr.sourceforge.net/"; license = lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index bb5bc566bc1d..fd6df20fb892 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; - homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; + homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 5a965c3d7d92..668b2fdf10c9 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MIME handling library"; - homepage = "http://www.codesink.org/mimetic_mime_library.html"; + homepage = "https://www.codesink.org/mimetic_mime_library.html"; license = licenses.mit; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index 2c4312d6498d..4683940b9cc6 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ncurses pkg-config perl ]; meta = { - homepage = "http://hunspell.sourceforge.net/"; + homepage = "https://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; license = lib.licenses.bsd3; inherit (hunspell.meta) platforms; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index ef396f299937..f590d5433536 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; - homepage = "http://nco.sourceforge.net/"; + homepage = "https://nco.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ bzizou ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 49c50ed7bdc5..b420c17c8888 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { # XXX: The author doesn't use the orthodox SF way to store tarballs. - url = "http://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; + url = "https://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - homepage = "http://plib.sourceforge.net/"; + homepage = "https://plib.sourceforge.net/"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index b3439b7ee96f..94dead43a43e 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C-library for generating multi page PostScript documents"; - homepage = "http://pslib.sourceforge.net/"; + homepage = "https://pslib.sourceforge.net/"; changelog = "https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix index bb9b6bc9c84b..2baa3b355023 100644 --- a/pkgs/development/libraries/pstreams/default.nix +++ b/pkgs/development/libraries/pstreams/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { POSIX.2 functions popen(3) and pclose(3), using C++ iostreams instead of C's stdio library. ''; - homepage = "http://pstreams.sourceforge.net/"; - downloadPage = "http://pstreams.sourceforge.net/download/"; + homepage = "https://pstreams.sourceforge.net/"; + downloadPage = "https://pstreams.sourceforge.net/download/"; maintainers = with maintainers; [ arthur ]; license = licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix index 4b6b9ada7ab7..6b31ef3257dd 100644 --- a/pkgs/development/libraries/pxlib/default.nix +++ b/pkgs/development/libraries/pxlib/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to read and write Paradox files"; - homepage = "http://pxlib.sourceforge.net/"; + homepage = "https://pxlib.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.winpat ]; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index f4574a1704ef..f0b7c8478e08 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; - homepage = "http://pythonqt.sourceforge.net/"; + homepage = "https://pythonqt.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 7ab0d8c1ae7e..4308b46c5c1f 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight data-interchange format"; - homepage = "http://qjson.sourceforge.net/"; + homepage = "https://qjson.sourceforge.net/"; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 1a4fcca9d9b0..440d52d08f81 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { provides Unicode support and is designed to be easily ported to any platform that supports both FreeType and the OpenGL API. ''; - homepage = "http://quesoglc.sourceforge.net/"; + homepage = "https://quesoglc.sourceforge.net/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index e5ae16087cbd..3a353b7a2bda 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast XML DOM-style parser in C++"; - homepage = "http://rapidxml.sourceforge.net/"; + homepage = "https://rapidxml.sourceforge.net/"; license = licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ cpages ]; diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index e5fb04626836..4655d54ab98e 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ncurses as well so that you may render the virtual screen to the real screen when you need to. ''; - homepage = "http://rote.sourceforge.net/"; + homepage = "https://rote.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index c3ff2aeebfb4..b5e2f4b80d3b 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; - homepage = "http://itpp.sourceforge.net/"; + homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/development/libraries/snap7/default.nix index 3419c4c6c2a6..f83ee00d04fd 100644 --- a/pkgs/development/libraries/snap7/default.nix +++ b/pkgs/development/libraries/snap7/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://snap7.sourceforge.net/"; + homepage = "https://snap7.sourceforge.net/"; description = "Step7 Open Source Ethernet Communication Suite"; license = licenses.lgpl3; maintainers = with maintainers; [ freezeboy ]; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 142081da0153..154924922ad0 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Database access library for C++"; - homepage = "http://soci.sourceforge.net/"; + homepage = "https://soci.sourceforge.net/"; license = licenses.boost; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index c24768bbbdc8..cdb2b5193291 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://tclap.sourceforge.net/"; + homepage = "https://tclap.sourceforge.net/"; description = "Templatized C++ Command Line Parser Library"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 3c814e17207c..829015e8ebba 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -17,7 +17,7 @@ tcl.mkTclDerivation rec { ''; meta = { - homepage = "http://tclx.sourceforge.net/"; + homepage = "https://tclx.sourceforge.net/"; description = "Tcl extensions"; license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ kovirobi ]; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index b017b3eb6618..80b93823df94 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -52,7 +52,7 @@ tcl.mkTclDerivation { meta = with lib; { description = "A widget library for Tcl/Tk"; - homepage = "http://tix.sourceforge.net/"; + homepage = "https://tix.sourceforge.net/"; platforms = platforms.all; license = with licenses; [ bsd2 # tix diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index d31294411856..a489f679c6ce 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Transparent SOCKS v4 proxying library"; - homepage = "http://tsocks.sourceforge.net/"; + homepage = "https://tsocks.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 878271b43178..8fed0e47e43f 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = "http://vxl.sourceforge.net/"; + homepage = "https://vxl.sourceforge.net/"; license = "VXL License"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index e6d8a98b5335..0fc513b68f46 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; - homepage = "http://www.waffle-gl.org/"; + homepage = "https://www.waffle-gl.org/"; license = licenses.bsd2; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 88dd403a31fd..5e8adaf0c425 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { WildMIDI is a simple software midi player which has a core softsynth library that can be use with other applications. ''; - homepage = "http://wildmidi.sourceforge.net/"; + homepage = "https://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 52f6d679b99f..7b018c89f50d 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { - homepage = "http://wxsvg.sourceforge.net/"; + homepage = "https://wxsvg.sourceforge.net/"; description = "A SVG manipulation library built with wxWidgets"; longDescription = '' wxSVG is C++ library to create, manipulate and render Scalable Vector diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index 11d73a9decb7..25dd7fdad7ef 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AVS encoder and decoder"; - homepage = "http://xavs.sourceforge.net/"; + homepage = "https://xavs.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index aab4542ac383..263b6cd59590 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { - homepage = "http://xine.sourceforge.net/"; + homepage = "https://xine.sourceforge.net/"; description = "A high-performance, portable and reusable multimedia playback engine"; license = with licenses; [ gpl2Plus lgpl2Plus ]; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 2cb64fe6eb24..6e002a28543f 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight RPC library based on XML and HTTP"; - homepage = "http://xmlrpc-c.sourceforge.net/"; + homepage = "https://xmlrpc-c.sourceforge.net/"; # /doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 1e3cf38bc77d..ab2e3792eeab 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; - homepage = "http://xylib.sourceforge.net/"; + homepage = "https://xylib.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 52fbeabf068f..ee919197a8e8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -424,7 +424,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; + homepage = "https://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; license.fullName = "BSD"; }; @@ -593,7 +593,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/lewis6991/gitsigns.nvim"; + homepage = "https://github.com/lewis6991/gitsigns.nvim"; description = "Git signs written in pure lua"; license.fullName = "MIT/X11"; }; @@ -1038,7 +1038,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; }; @@ -1071,7 +1071,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; @@ -1105,7 +1105,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; @@ -1171,7 +1171,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/antirez/lua-cmsgpack"; + homepage = "https://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; }; @@ -1569,7 +1569,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/brimworks/lua-yajl"; + homepage = "https://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT/X11"; @@ -2086,7 +2086,7 @@ buildLuarocksPackage { sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; }).outPath; src = fetchzip { - url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + url = "https://github.com/luaposix/luaposix/archive/v34.1.1.zip"; sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; }; @@ -2094,7 +2094,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ bit32 lua ]; meta = { - homepage = "http://github.com/luaposix/luaposix/"; + homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; @@ -2329,7 +2329,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/bluebird75/luaunit"; + homepage = "https://github.com/bluebird75/luaunit"; description = "A unit testing framework for Lua"; maintainers = with lib.maintainers; [ lockejan ]; license.fullName = "BSD"; @@ -2355,7 +2355,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/starwing/luautf8"; + homepage = "https://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT"; @@ -2489,7 +2489,7 @@ buildLuarocksPackage { sha256 = "0d0h70kjl5fkq589y1sx8qy8as002dhcf88pf60pghvch002ryi1"; }).outPath; src = fetchzip { - url = "http://github.com/gvvaughan/lyaml/archive/v6.2.8.zip"; + url = "https://github.com/gvvaughan/lyaml/archive/v6.2.8.zip"; sha256 = "0r3jjsd8x2fs1aanki0s1mvpznl16f32c1qfgmicy0icgy5xfch0"; }; @@ -2497,7 +2497,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/gvvaughan/lyaml"; + homepage = "https://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; @@ -2723,7 +2723,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua luassert ]; meta = { - homepage = "http://github.com/nvim-lua/plenary.nvim"; + homepage = "https://github.com/nvim-lua/plenary.nvim"; description = "lua functions you don't want to write "; license.fullName = "MIT/X11"; }; @@ -2779,7 +2779,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua luaposix ]; meta = { - homepage = "http://pjb.com.au/comp/lua/readline.html"; + homepage = "https://pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; }; diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix index 48954114a4a1..c03b1fb88121 100644 --- a/pkgs/development/misc/haskell/hasura/pool.nix +++ b/pkgs/development/misc/haskell/hasura/pool.nix @@ -17,7 +17,7 @@ mkDerivation { vector ]; testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/bos/pool"; + homepage = "https://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lassulus ]; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 57364cbde497..9c30ac4dc6d9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -114174,7 +114174,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = "http://github.com/remy/inliner"; + homepage = "https://github.com/remy/inliner"; license = "MIT"; }; production = true; @@ -116541,7 +116541,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = "https://jshint.com/"; license = "MIT"; }; production = true; @@ -124046,7 +124046,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = "http://github.com/node-inspector/node-inspector"; + homepage = "https://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -129307,7 +129307,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "http://pm2.keymetrics.io/"; + homepage = "https://pm2.keymetrics.io/"; license = "AGPL-3.0"; }; production = true; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index fe4f85a0024f..4985459248ac 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = { - homepage = "http://gmetadom.sourceforge.net/"; + homepage = "https://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/note/default.nix b/pkgs/development/ocaml-modules/note/default.nix index 5f84296ede55..5bb0da7dd106 100644 --- a/pkgs/development/ocaml-modules/note/default.nix +++ b/pkgs/development/ocaml-modules/note/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - homepage = "http://erratique.ch/software/note"; + homepage = "https://erratique.ch/software/note"; description = "An OCaml module for functional reactive programming"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index 27c62ea66326..f88346d66489 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; - homepage = "http://pmw.sourceforge.net/"; + homepage = "https://pmw.sourceforge.net/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mounium ]; }; diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index d008498117b6..74b03a413ce2 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities and Python modules for handling audio"; - homepage = "http://audiotools.sourceforge.net/"; + homepage = "https://audiotools.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index 082369baf73a..70053eb16713 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; - homepage = "http://crcmod.sourceforge.net/"; + homepage = "https://crcmod.sourceforge.net/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index 4cb2fe442d32..f47588f79628 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; - homepage = "http://ftputil.sschwarzer.net/"; + homepage = "https://ftputil.sschwarzer.net/"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 4f94ff771318..8f109053b5e9 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python data analysis and visualization seamless and simple"; - homepage = "http://www.holoviews.org/"; + homepage = "https://www.holoviews.org/"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 384391138daf..b5afa47275b2 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix index 51cf6986349c..9a70c1aaf301 100644 --- a/pkgs/development/python-modules/ipython_genutils/default.nix +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Vestigial utilities from IPython"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index c3fc01390377..c61f1d099159 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "IPython HTML widgets for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix index 1b86734624a5..35ddc7f4c840 100644 --- a/pkgs/development/python-modules/mip/default.nix +++ b/pkgs/development/python-modules/mip/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "http://python-mip.com/"; + homepage = "https://python-mip.com/"; description = "A collection of Python tools for the modeling and solution of Mixed-Integer Linear programs (MIPs)"; downloadPage = "https://github.com/coin-or/python-mip/releases"; changelog = "https://github.com/coin-or/python-mip/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/myhdl/default.nix b/pkgs/development/python-modules/myhdl/default.nix index 77e793266e70..7c3bff91be40 100644 --- a/pkgs/development/python-modules/myhdl/default.nix +++ b/pkgs/development/python-modules/myhdl/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A free, open-source package for using Python as a hardware description and verification language."; - homepage = "http://www.myhdl.org/"; + homepage = "https://www.myhdl.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index f6268953fde3..f1083a489705 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -107,7 +107,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static site generator that requires no database or server-side logic"; - homepage = "http://getpelican.com/"; + homepage = "https://getpelican.com/"; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi ]; }; diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index 902f39e6b970..b1b88a3929bf 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://pydispatcher.sourceforge.net/"; + homepage = "https://pydispatcher.sourceforge.net/"; description = "Signal-registration and routing infrastructure for use in multiple contexts"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 321507c3ce6e..52f59cc3fc8d 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ liblo cython ]; meta = with lib; { - homepage = "http://das.nasophon.de/pyliblo/"; + homepage = "https://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 7370057ad720..5ba33acd2305 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://pyopengl.sourceforge.net/"; + homepage = "https://pyopengl.sourceforge.net/"; description = "PyOpenGL, the Python OpenGL bindings"; longDescription = '' PyOpenGL is the cross platform Python binding to OpenGL and diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix index 3b350954eae3..2fc1637d22a5 100644 --- a/pkgs/development/python-modules/pysmf/default.nix +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ libsmf glib ]; meta = with lib; { - homepage = "http://das.nasophon.de/pysmf/"; + homepage = "https://das.nasophon.de/pysmf/"; description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 78a834fd0d8d..85fdafa5064b 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for the generation of PostScript, PDF, and SVG files"; - homepage = "http://pyx.sourceforge.net/"; + homepage = "https://pyx.sourceforge.net/"; license = with licenses; [ gpl2 ]; }; } diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 565730bd34da..2d40d4376ad7 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Traitlets Python config system"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index bc88880f30a3..4c2b8fadb703 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://www.python-excel.org/"; + homepage = "https://www.python-excel.org/"; description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index a6471d8f07ef..278712019592 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "http://yapsy.sourceforge.net/"; + homepage = "https://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; # tests fail and are not using pytest to easily disable them diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index dc7cccd9dc1d..49c8fb140e59 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { on various metrics of the code. Metrics supported include lines of code, McCabe's complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; - homepage = "http://cccc.sourceforge.net/"; + homepage = "https://cccc.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.linquize ]; diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index ff564916dd3a..d88a4a8a92eb 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { respect to a specified configuration. Dead code removal is an application of this sort. ''; - homepage = "http://coan2.sourceforge.net/"; + homepage = "https://coan2.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index c8db40c7b61c..a1804eafd8cf 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://emma.sourceforge.net/"; + homepage = "https://emma.sourceforge.net/"; description = "A code coverage tool for Java"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index e758aa40d2f1..63301622c1fb 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A static analysis tool to find bugs in Java programs automatically"; - homepage = "http://findbugs.sourceforge.net/"; + homepage = "https://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index dc941f12291d..349b44730b8a 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { HTML output. ''; - homepage = "http://ltp.sourceforge.net/coverage/lcov.php"; + homepage = "https://ltp.sourceforge.net/coverage/lcov.php"; license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg ]; diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 5357dc805e87..f2589c1e75c6 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # make check fails, see https://github.com/rocky/remake/issues/117 meta = { - homepage = "http://bashdb.sourceforge.net/remake/"; + homepage = "https://bashdb.sourceforge.net/remake/"; license = lib.licenses.gpl3Plus; description = "GNU Make with comprehensible tracing and a debugger"; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index e53acd4e9e60..902508129cb2 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { algorithms to avoid doing unnecessary work. This means you can stay focused on your project rather than on your build system. ''; - homepage = "http://gittup.org/tup/"; + homepage = "https://gittup.org/tup/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index c5cbdef598cd..fcebe93aaa2d 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Live GLSL coding renderer"; - homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/"; + homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.hodapp ]; diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index caacc04903e6..7ad966c6b69f 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/pkgs/development/tools/literate-programming/eweb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://eweb.sourceforge.net/"; + homepage = "https://eweb.sourceforge.net/"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 4ce8c1edffd4..66e972826cb9 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - homepage = "http://astyle.sourceforge.net/"; + homepage = "https://astyle.sourceforge.net/"; license = licenses.lgpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index c7d261e6f5ac..2babde7afa6b 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Bash script debugger"; - homepage = "http://bashdb.sourceforge.net/"; + homepage = "https://bashdb.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index c79a2d252012..432f689d64dd 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = "BSD-style"; - homepage = "http://cscope.sourceforge.net/"; + homepage = "https://cscope.sourceforge.net/"; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index dc6ee4815238..b33d6cafbe4a 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { alternatively, the index entry created for that object). Many programming languages are supported. ''; - homepage = "http://ctags.sourceforge.net/"; + homepage = "https://ctags.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 2b9d543fb791..0ce3bb52cd4f 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; + url = "https://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4="; }; diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index ff5fe7bcba40..c977ca3070e4 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Application designed to test GTK performance"; - homepage = "http://gtkperf.sourceforge.net/"; + homepage = "https://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 2c189cbf5a61..d4950caaa9d8 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://itstool.org/"; + homepage = "https://itstool.org/"; description = "XML to PO and back again"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 7329ad509671..1ef63f1a431d 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New user interface for spim, a MIPS simulator"; - homepage = "http://spimsimulator.sourceforge.net/"; + homepage = "https://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index d986ef052433..1d542383bfb0 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of powerful tools for manipulating EPROM load files"; - homepage = "http://srecord.sourceforge.net/"; + homepage = "https://srecord.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 1068b3e2ad9d..ac03372d9761 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 109243b54ba1..f50c02d3e0cd 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 56106143027f..6b6d1bc02db9 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 3c1a5b82dc2a..41f33f4db67f 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 32b7ffe784b2..f1a66f547850 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; - homepage = "http://uncrustify.sourceforge.net/"; + homepage = "https://uncrustify.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix index 808e9f92da71..ccef80747a40 100644 --- a/pkgs/development/tools/misc/xspim/default.nix +++ b/pkgs/development/tools/misc/xspim/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A MIPS32 simulator"; - homepage = "http://spimsimulator.sourceforge.net/"; + homepage = "https://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index a80e75559df3..c13abf071c56 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { branch = "2.5.35"; - homepage = "http://flex.sourceforge.net/"; + homepage = "https://flex.sourceforge.net/"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 8179855e6ebc..e9bd83416933 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://jikes.sourceforge.net/"; + homepage = "https://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; platforms = platforms.all; license = licenses.ipl10; diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix index 20049215a70d..84bf11c44830 100644 --- a/pkgs/development/tools/pxview/default.nix +++ b/pkgs/development/tools/pxview/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Program to convert Paradox databases"; - homepage = "http://pxlib.sourceforge.net/pxview/"; + homepage = "https://pxlib.sourceforge.net/pxview/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.winpat ]; diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index f6df21d57660..0edbf41e2af2 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "XML stream reformatter"; - homepage = "http://xmlindent.sourceforge.net/"; + homepage = "https://xmlindent.sourceforge.net/"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 6de8726722ec..4b96662d84d7 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://chessdb.sourceforge.net/"; + homepage = "https://chessdb.sourceforge.net/"; description = "A free chess database"; platforms = lib.platforms.linux; }; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 919d22b41dae..6c607b39d141 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -88,8 +88,8 @@ in stdenv.mkDerivation { }; meta = with lib; { - homepage = "http://domination.sourceforge.net/"; - downloadPage = "http://domination.sourceforge.net/download.shtml"; + homepage = "https://domination.sourceforge.net/"; + downloadPage = "https://domination.sourceforge.net/download.shtml"; description = "A game that is a bit like the board game Risk or RisiKo"; longDescription = '' Domination is a game that is a bit like the well known board game of Risk diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 32678ecdf093..995d69d0a911 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "3D dungeon crawling adventure"; - homepage = "http://egoboo.sourceforge.net/"; + homepage = "https://egoboo.sourceforge.net/"; license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index e610f2427a2e..787795828f4f 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - homepage = "http://fillets.sourceforge.net/"; + homepage = "https://fillets.sourceforge.net/"; }; } diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index 9df7d9cccfd8..b1a2bb6b8c0d 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A simple retro style arcade side-scroller game"; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator - homepage = "http://fltrator.sourceforge.net/"; + homepage = "https://fltrator.sourceforge.net/"; platforms = platforms.linux; maintainers = [ maintainers.marius851000 ]; license = licenses.gpl3; diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 9f9e85905a0a..9d89a6d0b7b3 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Old-school vertical shoot-em-up / bullet hell"; - homepage = "http://garden.sourceforge.net/drupal/"; + homepage = "https://garden.sourceforge.net/drupal/"; maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index e94b73d763c5..dc2868ba21b5 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Remake of AV Arcade Volleyball"; - homepage = "http://gav.sourceforge.net/"; + homepage = "https://gav.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index c7b37b31c355..d2c25e031d2e 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = { maintainers = [ lib.maintainers.cleverca22 ]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; - homepage = "http://gogui.sourceforge.net/"; + homepage = "https://gogui.sourceforge.net/"; platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index d34b3775bd1b..af16d5e9f748 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { GTetrinet is a client program for Tetrinet, a multiplayer tetris game that is played over the internet. ''; - homepage = "http://gtetrinet.sourceforge.net/"; + homepage = "https://gtetrinet.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.chris-martin ]; diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix index 19a0b783efdd..d677962fbe68 100644 --- a/pkgs/games/hhexen/default.nix +++ b/pkgs/games/hhexen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux port of Raven Game's Hexen"; - homepage = "http://hhexen.sourceforge.net/hhexen.html"; + homepage = "https://hhexen.sourceforge.net/hhexen.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ djanatyn ]; }; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 9b715b02ae09..3ce42bb7748e 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { chmod +x "$out/bin/mars" ''; meta = with lib; { - homepage = "http://mars-game.sourceforge.net/"; + homepage = "https://mars-game.sourceforge.net/"; description = "A game about fighting with ships in a 2D space setting"; license = licenses.gpl3Plus; maintainers = [ maintainers.astsmtl ]; diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index df4a3ad111b6..c3f455b71b07 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Space Invaders clone based on ncurses"; - homepage = "http://ninvaders.sourceforge.net/"; + homepage = "https://ninvaders.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ _1000101 ]; platforms = platforms.all; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 6fbffc37d034..971cd1d0726c 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./logfile.patch ]; meta = { - homepage = "http://trackballs.sourceforge.net/"; + homepage = "https://trackballs.sourceforge.net/"; description = "Cross-platform pacman-like game"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/pkgs/games/npush/default.nix b/pkgs/games/npush/default.nix index fb7300a5f77d..34293ce4fc07 100644 --- a/pkgs/games/npush/default.nix +++ b/pkgs/games/npush/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; - homepage = "http://npush.sourceforge.net/"; + homepage = "https://npush.sourceforge.net/"; description = "A Sokoban-like game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 9e292da8c98b..f4122dc6bfb7 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Addicting game based on The Settlers of Catan"; - homepage = "http://pio.sourceforge.net/"; # https does not work + homepage = "https://pio.sourceforge.net/"; # https does not work license = licenses.gpl2Plus; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 6681370c79d6..51d0528ac933 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An engine for iD software's Quake"; - homepage = "http://quakespasm.sourceforge.net/"; + homepage = "https://quakespasm.sourceforge.net/"; longDescription = '' QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. It includes support for 64 bit CPUs and custom music playback, a new sound driver, diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index c3bf4498fa4b..580f0ef2b1dd 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; - homepage = "http://rigsofrods.sourceforge.net/"; + homepage = "https://rigsofrods.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix index 6cd5919c4e8f..a5b656a4044a 100644 --- a/pkgs/games/rrootage/default.nix +++ b/pkgs/games/rrootage/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Abstract shooter created by Kenta Cho"; - homepage = "http://rrootage.sourceforge.net/"; + homepage = "https://rrootage.sourceforge.net/"; license = licenses.bsd2; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 4711ffa2f549..63ffa4999e05 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -73,7 +73,7 @@ tcl.mkTclDerivation rec { meta = with lib; { description = "Chess database with play and training functionality"; - homepage = "http://scidvspc.sourceforge.net/"; + homepage = "https://scidvspc.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; platforms = lib.platforms.linux; diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index a1955e9cced0..792909f856f3 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -53,7 +53,7 @@ tcl.mkTclDerivation { meta = { description = "Chess database with play and training functionality"; maintainers = with lib.maintainers; [ agbrooks ]; - homepage = "http://scid.sourceforge.net/"; + homepage = "https://scid.sourceforge.net/"; license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index d06e3c1aa158..a44c3d670558 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; - homepage = "http://speed-dreams.sourceforge.net/"; + homepage = "https://speed-dreams.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index e75d2f12b945..46a5aae09ef3 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-fcommon"; meta = { - homepage = "http://tinyfugue.sourceforge.net/"; + homepage = "https://tinyfugue.sourceforge.net/"; description = "A terminal UI, screen-oriented MUD client"; longDescription = '' TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index e3ec82b549ae..4764db4413ed 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; - homepage = "http://torcs.sourceforge.net/"; + homepage = "https://torcs.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = lib.platforms.linux; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 0c2d928dd5ea..a6ae1d9866e5 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "http://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; + url = "https://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A curses based typing game"; - homepage = "http://typespeed.sourceforge.net/"; + homepage = "https://typespeed.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.auntie ]; diff --git a/pkgs/games/uhexen2/default.nix b/pkgs/games/uhexen2/default.nix index b9bde8d3e43a..1a43679bd127 100644 --- a/pkgs/games/uhexen2/default.nix +++ b/pkgs/games/uhexen2/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { HoT includes countless bug fixes, improved music, sound and video modes, opengl improvements, support for many operating systems and architectures, and documentation among many others. ''; - homepage = "http://uhexen2.sourceforge.net/"; + homepage = "https://uhexen2.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ xdhampus ]; platforms = platforms.all; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 797c41916f1c..7da4c1e597b5 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; - homepage = "http://sc2.sourceforge.net/"; + homepage = "https://sc2.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 81d42b1b2941..ebc7dff5406c 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A puzzle game about arranging balls in triplets, like Luxor, Zuma, or Puzzle Bobble"; - homepage = "http://zaz.sourceforge.net/"; + homepage = "https://zaz.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix index 5cc1b4601332..eb2fc165cccb 100644 --- a/pkgs/misc/drivers/spacenavd/default.nix +++ b/pkgs/misc/drivers/spacenavd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Device driver and SDK for 3Dconnexion 3D input devices"; longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 414a207fa544..69ffcdd78865 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-doxygen=no" ]; meta = { - homepage = "http://dvdhrm.github.io/xwiimote"; + homepage = "https://dvdhrm.github.io/xwiimote"; description = "Userspace utilities to control connected Nintendo Wii Remotes"; platforms = lib.platforms.linux; license = lib.licenses.mit; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 0f265f7e259c..3b785dfc5664 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; - homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html"; + homepage = "https://www.hyperrealm.com/talkfilters/talkfilters.html"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ikervagyok ]; platforms = with lib.platforms; unix; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 2358a59f5d5a..a36005872500 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -119,7 +119,7 @@ let dontStrip = true; meta = with lib; { - homepage = "http://www.denx.de/wiki/U-Boot/"; + homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 0d9fa44a8794..a5fbc2817db0 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://conky.sourceforge.net/"; + homepage = "https://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ maintainers.guibert ]; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 716c5e4d8288..af9a44b92f46 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Firmware for Intel 2200BG cards"; - homepage = "http://ipw2200.sourceforge.net/firmware.php"; + homepage = "https://ipw2200.sourceforge.net/firmware.php"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ sternenseemann ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index fe2e69e06fd7..324e2695dd53 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for asynchronous I/O in Linux"; - homepage = "http://lse.sourceforge.net/io/aio.html"; + homepage = "https://lse.sourceforge.net/io/aio.html"; platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index 4c14d2ecae3d..8901f6bcca1d 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; - homepage = "http://linuxptp.sourceforge.net/"; + homepage = "https://linuxptp.sourceforge.net/"; maintainers = [ maintainers.markuskowa ]; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index 19d6f10e3de1..24915143fbd0 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux Kernel Stream Control Transmission Protocol Tools"; - homepage = "http://lksctp.sourceforge.net/"; + homepage = "https://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 126b640f2d3d..96dc2e6ffada 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { broken = kernel.kernelAtLeast "5.16"; - homepage = "http://www.magewell.com/"; + homepage = "https://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index ef18dda1191d..38cbabad520e 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to configure ROCCAT devices"; - homepage = "http://roccat.sourceforge.net/"; + homepage = "https://roccat.sourceforge.net/"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index b5f067fffd72..113ba7939a65 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://linux-diag.sourceforge.net/Sysfsutils.html"; + homepage = "https://linux-diag.sourceforge.net/Sysfsutils.html"; longDescription = '' These are a set of utilites built upon sysfs, a new virtual diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 646e3702fed0..e71e349a2516 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://tunctl.sourceforge.net/"; + homepage = "https://tunctl.sourceforge.net/"; description = "Utility to set up and maintain TUN/TAP network interfaces"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index db3bcb47ecc7..d346c1372997 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight Gopher server"; - homepage = "http://gofish.sourceforge.net/"; + homepage = "https://gofish.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 1b7a7c31d4be..2f427d170fdf 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin libintl; meta = with lib; { - homepage = "http://modpython.org/"; + homepage = "https://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index c5ad8414cdd9..128a9ae8ff11 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SMTP-proxy that signs and/or verifies emails"; - homepage = "http://dkimproxy.sourceforge.net/"; + homepage = "https://dkimproxy.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 31f149f1dd42..852de800a6c9 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://dspam.sourceforge.net/"; + homepage = "https://dspam.sourceforge.net/"; description = "Community Driven Antispam Filter"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 447e643c5c93..64d9ef99bdd3 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "http://petidomo.sourceforge.net/"; + homepage = "https://petidomo.sourceforge.net/"; description = "A simple and easy to administer mailing list server"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index d614f699d1aa..1ce82c13311c 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client/server suite for controlling a wide variety of LCD devices"; - homepage = "http://lcdproc.org/"; + homepage = "https://lcdproc.org/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/sql/mssql/jdbc/jtds.nix b/pkgs/servers/sql/mssql/jdbc/jtds.nix index e67cc1b0ecb9..71561409c758 100644 --- a/pkgs/servers/sql/mssql/jdbc/jtds.nix +++ b/pkgs/servers/sql/mssql/jdbc/jtds.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pure Java (type 4) JDBC 3.0 driver for Microsoft SQL Server"; - homepage = "http://jtds.sourceforge.net/"; + homepage = "https://jtds.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 480857cc8a39..65447ecb74a1 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted UDP based FTP with multicast"; - homepage = "http://uftp-multicast.sourceforge.net/"; + homepage = "https://uftp-multicast.sourceforge.net/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.fadenb ]; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix index 7aa8a6cba6a7..79fbe65af1f2 100644 --- a/pkgs/tools/X11/imwheel/default.nix +++ b/pkgs/tools/X11/imwheel/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://imwheel.sourceforge.net/"; + homepage = "https://imwheel.sourceforge.net/"; description = "Mouse wheel configuration tool for XFree86/Xorg"; maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix index 653698c052b4..bd4234bae190 100644 --- a/pkgs/tools/X11/xosview2/default.nix +++ b/pkgs/tools/X11/xosview2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libX11 ]; meta = with lib; { - homepage = "http://xosview.sourceforge.net/index.html"; + homepage = "https://xosview.sourceforge.net/index.html"; description = "Lightweight graphical operating system monitor"; longDescription = '' xosview is a lightweight program that gathers information from your diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 3c8f56a650fe..5bc86f94c2bc 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = { license = lib.licenses.gpl2Plus; - homepage = "http://vnc-tight.sourceforge.net/"; + homepage = "https://vnc-tight.sourceforge.net/"; description = "Improved version of VNC"; longDescription = '' diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix index dd3fb8462889..89830322267c 100644 --- a/pkgs/tools/archivers/s-tar/default.nix +++ b/pkgs/tools/archivers/s-tar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { The way star acts may be modified by additional options. Note that unpacking tar archives may be a security risk because star may overwrite existing files. ''; - homepage = "http://cdrtools.sourceforge.net/private/star.html"; + homepage = "https://cdrtools.sourceforge.net/private/star.html"; license = lib.licenses.cddl; maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 78acccf084c0..fce137cf3b46 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://abc.sourceforge.net/abcMIDI/"; + homepage = "https://abc.sourceforge.net/abcMIDI/"; downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; license = licenses.gpl2Plus; description = "Utilities for converting between abc and MIDI"; diff --git a/pkgs/tools/audio/asap/default.nix b/pkgs/tools/audio/asap/default.nix index 5ce3a80bd737..820ff72c42be 100644 --- a/pkgs/tools/audio/asap/default.nix +++ b/pkgs/tools/audio/asap/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://asap.sourceforge.net/"; + homepage = "https://asap.sourceforge.net/"; mainProgram = "asap-sdl"; description = "Another Slight Atari Player"; longDescription = '' diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix index 698205a2b076..673503d51d7b 100644 --- a/pkgs/tools/audio/midicsv/default.nix +++ b/pkgs/tools/audio/midicsv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz"; sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Losslessly translate MIDI to CSV and back"; - homepage = "http://www.fourmilab.ch/webtools/midicsv/"; + homepage = "https://www.fourmilab.ch/webtools/midicsv/"; license = licenses.publicDomain; maintainers = with maintainers; [ orivej ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index a8f88e88b0e2..ad2e237b3fb7 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { before proceeding in any data manipulation), reliable and fully customizable. ''; - homepage = "http://luckybackup.sourceforge.net/"; + homepage = "https://luckybackup.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index c9d49cfd4390..0fa67bbd9320 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; - homepage = "http://cdrdao.sourceforge.net/"; + homepage = "https://cdrdao.sourceforge.net/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index f49826b99bfa..fa90ceb61611 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # parallel building fails on some linux machines meta = with lib; { - homepage = "http://cdrtools.sourceforge.net/private/cdrecord.html"; + homepage = "https://cdrtools.sourceforge.net/private/cdrecord.html"; description = "Highly portable CD/DVD/BluRay command line recording software"; license = with licenses; [ cddl gpl2 lgpl21 ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index b4fc7f1e4f6e..eea423b897a6 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://avf.sourceforge.net/"; + homepage = "https://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; platforms = lib.platforms.unix; license = lib.licenses.gpl2Only; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index b53656a069e3..bf1f7ba55d2b 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fcommon"; meta = { - homepage = "http://djmount.sourceforge.net/"; + homepage = "https://djmount.sourceforge.net/"; description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.jagajaga ]; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 0958bb2955b1..3be196586f5c 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -86,8 +86,8 @@ stdenv.mkDerivation rec { ''; }; meta = with lib; { - homepage = "http://e2fsprogs.sourceforge.net/"; - changelog = "http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; + homepage = "https://e2fsprogs.sourceforge.net/"; + changelog = "https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = with licenses; [ gpl2Plus diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index 9917bf8d965e..ed9fa6df969b 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { It's much more effective and works much better than extundelete. ''; - homepage = "http://ext4magic.sourceforge.net/ext4magic_en.html"; + homepage = "https://ext4magic.sourceforge.net/ext4magic_en.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.rkoe ]; diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 5992fd6a78e4..276f6139b794 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; - homepage = "http://extundelete.sourceforge.net/"; + homepage = "https://extundelete.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index 205d84791ec9..3427ce54a172 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://romfs.sourceforge.net/"; + homepage = "https://romfs.sourceforge.net/"; description = "Tool for creating romfs file system images"; license = licenses.gpl2; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 24233a8441d3..f7a42f192eef 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE-based HTTP filesystem for Linux"; - homepage = "http://httpfs.sourceforge.net/"; + homepage = "https://httpfs.sourceforge.net/"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 3a0d0ab2f65b..2cc6f69bb0ba 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.39"; src = fetchurl { - url = "http://mhddfs.uvw.ru/downloads/mhddfs_${version}.tar.gz"; + url = "https://mhddfs.uvw.ru/downloads/mhddfs_${version}.tar.gz"; sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://mhddfs.uvw.ru/"; + homepage = "https://mhddfs.uvw.ru/"; description = "Combines a several mount points into the single one"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.makefu ]; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 0512a8407dfb..cd6cbe5e7993 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystem for accessing Subversion repositories"; - homepage = "http://www.jmadden.eu/index.php/svnfs/"; + homepage = "https://www.jmadden.eu/index.php/svnfs/"; license = lib.licenses.gpl2Only; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 5b3431a919fc..4cf5970c5a69 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://enblend.sourceforge.net/"; + homepage = "https://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index ad75d6667dab..eb0a6ec11fc9 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; meta = { - homepage = "http://netpbm.sourceforge.net/"; + homepage = "https://netpbm.sourceforge.net/"; description = "Toolkit for manipulation of graphic images"; license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 508aec818612..f74b720ea9ea 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://niftools.sourceforge.net/wiki/NifSkope"; + homepage = "https://niftools.sourceforge.net/wiki/NifSkope"; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 65ebd8ddbd12..7b8ddaf713b3 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { '' else null; meta = with lib; { - homepage = "http://optipng.sourceforge.net/"; + homepage = "https://optipng.sourceforge.net/"; description = "A PNG optimizer"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 2bc40f1cc788..f02a056c3521 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -39,7 +39,7 @@ mkDerivation rec { patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ]; meta = with lib; { - homepage = "http://pfstools.sourceforge.net/"; + homepage = "https://pfstools.sourceforge.net/"; description = "Toolkit for manipulation of HDR images"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index f315dc9a63c0..3ee17eb630a1 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Use gd from Nixpkgs instead of the vendored one. # This is required for non-ASCII fonts to work: - # http://ploticus.sourceforge.net/doc/fonts.html + # https://ploticus.sourceforge.net/doc/fonts.html ./use-gd-package.patch ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - homepage = "http://ploticus.sourceforge.net/"; + homepage = "https://ploticus.sourceforge.net/"; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index 81f33c65af64..57b83cbf9e73 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://pngnq.sourceforge.net/"; + homepage = "https://pngnq.sourceforge.net/"; description = "A PNG quantizer"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index cec0b21cce24..8ebfd967828b 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; - homepage = "http://sng.sourceforge.net/"; + homepage = "https://sng.sourceforge.net/"; license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix index 5cd7326d7b17..1b734a83d3d3 100644 --- a/pkgs/tools/misc/bbe/default.nix +++ b/pkgs/tools/misc/bbe/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A sed-like editor for binary files"; - homepage = "http://bbe-.sourceforge.net/"; + homepage = "https://bbe-.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.hhm ]; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index e287306dfb94..77af6497a573 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { with a flexible variety of user interfaces. ''; - homepage = "http://cunit.sourceforge.net/"; + homepage = "https://cunit.sourceforge.net/"; license = lib.licenses.lgpl2; platforms = lib.platforms.unix; diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index eb2b445d069d..6a2700f482a9 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://dbacl.sourceforge.net/"; + homepage = "https://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; license = lib.licenses.gpl3; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 774ba885b4b1..bf289ff8c77c 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://detox.sourceforge.net/"; + homepage = "https://detox.sourceforge.net/"; description = "Utility designed to clean up filenames"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index f036ba9ea3e6..0e0d4ddd077c 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://dtach.sourceforge.net/"; + homepage = "https://dtach.sourceforge.net/"; description = "A program that emulates the detach feature of screen"; longDescription = '' diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 516c9e426175..bb9279687b1b 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; meta = { - homepage = "http://www.w3.org/Tools/eot-utils/"; + homepage = "https://www.w3.org/Tools/eot-utils/"; description = "Create Embedded Open Type from OpenType or TrueType font"; license = lib.licenses.w3c; maintainers = with lib.maintainers; [ leenaars ]; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 45f45e89e82d..bd876371ae26 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -38,7 +38,7 @@ tcl.mkTclDerivation rec { meta = with lib; { description = "A tool for automating interactive applications"; - homepage = "http://expect.sourceforge.net/"; + homepage = "https://expect.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/tools/misc/ink/default.nix index 8037d5413106..87173c953791 100644 --- a/pkgs/tools/misc/ink/default.nix +++ b/pkgs/tools/misc/ink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' Ink is a command line tool for checking the ink level of your locally connected printer on a system which runs Linux or FreeBSD. Canon BJNP network printers are supported too. ''; - homepage = "http://ink.sourceforge.net/"; + homepage = "https://ink.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ samb96 ]; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 86706d6dbe0b..a2c5f13b81e3 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { - homepage = "http://libcpuid.sourceforge.net/"; + homepage = "https://libcpuid.sourceforge.net/"; description = "A small C library for x86 CPU detection and feature extraction"; changelog = "https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/tools/misc/limitcpu/default.nix index 2d7fb55dcd9c..8be7f974707f 100644 --- a/pkgs/tools/misc/limitcpu/default.nix +++ b/pkgs/tools/misc/limitcpu/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - homepage = "http://limitcpu.sourceforge.net/"; + homepage = "https://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 31f0712dea49..a2dae74457df 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "http://www.memtest.org/"; + homepage = "https://www.memtest.org/"; description = "A tool to detect memory errors"; license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 0df6de82bd2f..c0f807318bbb 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program for writing Microsoft-compatible boot records"; - homepage = "http://ms-sys.sourceforge.net/"; + homepage = "https://ms-sys.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; linux; }; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index c37325170ace..5456ffdf061c 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://palcal.sourceforge.net/"; + homepage = "https://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index 5efa92ef1575..f21873df15e1 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = { - homepage = "http://rig.sourceforge.net/"; + homepage = "https://rig.sourceforge.net/"; description = "Random identity generator"; longDescription = '' RIG (Random Identity Generator) is a free replacement for a shareware diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index d58ff3fa8ed9..f3db213c84fe 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { SMC can also generate GraphViz state diagrams from the input file. ''; - homepage = "http://smc.sourceforge.net/"; + homepage = "https://smc.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl11; platforms = platforms.linux; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 7e0c12535bb6..2383a96eedfe 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "True Type to Postscript Type 3 converter, fpdf"; - homepage = "http://ttf2pt1.sourceforge.net/index.html"; + homepage = "https://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/tools/networking/cdpr/default.nix index a3f821bdbb35..6879b7e9d707 100644 --- a/pkgs/tools/networking/cdpr/default.nix +++ b/pkgs/tools/networking/cdpr/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cisco Discovery Protocol Reporter"; - homepage = "http://cdpr.sourceforge.net/"; + homepage = "https://cdpr.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.sgo ]; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index a3b0b9ac5544..238b93633197 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; - homepage = "http://cntlm.sourceforge.net/"; + homepage = "https://cntlm.sourceforge.net/"; license = licenses.gpl2; maintainers = [ diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index e8826ee6454b..957cbed63102 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = { description = "A web content scanner"; - homepage = "http://dirb.sourceforge.net/"; + homepage = "https://dirb.sourceforge.net/"; maintainers = with lib.maintainers; [ bennofs ]; license = with lib.licenses; [ gpl2 ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index a2cf239b56ba..f02e3bef9e19 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; - homepage = "http://libnids.sourceforge.net/"; + homepage = "https://libnids.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.symphorien ]; # probably also bsd and solaris diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index ef035d3c671a..1443794b7447 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility which reads and writes data across network connections"; - homepage = "http://netcat.sourceforge.net/"; + homepage = "https://netcat.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index dd165fa13844..3c9a6e723327 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GTK Gnutella client, optimized for speed and scalability"; - homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella + homepage = "https://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; maintainers = [ maintainers.doronbehar ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 7af9e324f2e0..142105e20283 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PPTP client for Linux"; - homepage = "http://pptpclient.sourceforge.net/"; + homepage = "https://pptpclient.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index 8a802281192e..c7bd929b1812 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://poptop.sourceforge.net/dox/"; + homepage = "https://poptop.sourceforge.net/dox/"; description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/networking/qodem/default.nix b/pkgs/tools/networking/qodem/default.nix index 3b16e30ac180..6451a7d8d316 100644 --- a/pkgs/tools/networking/qodem/default.nix +++ b/pkgs/tools/networking/qodem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses SDL gpm miniupnpc ]; meta = with lib; { - homepage = "http://qodem.sourceforge.net/"; + homepage = "https://qodem.sourceforge.net/"; description = "Re-implementation of the DOS-era Qmodem serial communications package"; longDescription = '' Qodem is a from-scratch clone implementation of the Qmodem diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index b297f2565f9a..eb769e59bd78 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SSTP client for Linux"; - homepage = "http://sstp-client.sourceforge.net/"; + homepage = "https://sstp-client.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/stuntman/default.nix b/pkgs/tools/networking/stuntman/default.nix index 1825a3971a74..3d2ff6eeb50c 100644 --- a/pkgs/tools/networking/stuntman/default.nix +++ b/pkgs/tools/networking/stuntman/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with lib; { description = "STUNTMAN - an open source STUN server and client"; - homepage = "http://www.stunprotocol.org/"; + homepage = "https://www.stunprotocol.org/"; license = licenses.asl20; maintainers = with maintainers; [ mattchrist ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 46a52b11b961..e3eac708aed0 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tracks the route taken by packets over an IP network"; - homepage = "http://traceroute.sourceforge.net/"; + homepage = "https://traceroute.sourceforge.net/"; changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index d512b03dbea5..3c4be71998e8 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; - homepage = "http://zssh.sourceforge.net/"; + homepage = "https://zssh.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = [ ]; # required by deepin-terminal platforms = lib.platforms.linux; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index dcef28f2258f..ad4cf36fa32d 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AES encrypting or decrypting pipe"; - homepage = "http://loop-aes.sourceforge.net/aespipe.README"; + homepage = "https://loop-aes.sourceforge.net/aespipe.README"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 2972fc9ae55f..9da5a6d42c55 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://ccrypt.sourceforge.net/"; + homepage = "https://ccrypt.sourceforge.net/"; description = "Utility for encrypting and decrypting files and streams with AES-256"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index 22c11b3f2b1f..f7c22cddb5cb 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gnupg-pkcs11 is a project to implement a BSD-licensed smart-card daemon to enable the use of PKCS#11 tokens with GnuPG. ''; - homepage = "http://gnupg-pkcs11.sourceforge.net/"; + homepage = "https://gnupg-pkcs11.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ matthiasbeyer philandstuff ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/tools/security/pamtester/default.nix index face92a00af3..d9e59290d676 100644 --- a/pkgs/tools/security/pamtester/default.nix +++ b/pkgs/tools/security/pamtester/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility program to test the PAM facility"; - homepage = "http://pamtester.sourceforge.net/"; + homepage = "https://pamtester.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix index 0aa94c4e8ab9..d4930b023b6f 100644 --- a/pkgs/tools/security/pdfcrack/default.nix +++ b/pkgs/tools/security/pdfcrack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://pdfcrack.sourceforge.net/"; + homepage = "https://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; license = with licenses; [ gpl2Plus ]; platforms = platforms.all; diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 4b4103ff9fb1..6e73375be208 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://rhash.sourceforge.net/"; + homepage = "https://rhash.sourceforge.net/"; description = "Console utility and library for computing and verifying hash sums of files"; license = licenses.bsd0; platforms = platforms.all; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 16536409b5e6..bec2084fd140 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Trusted computing software stack"; - homepage = "http://trousers.sourceforge.net/"; + homepage = "https://trousers.sourceforge.net/"; license = licenses.bsd3; maintainers = [ maintainers.ak ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix index 5b0f079e5a60..5ced99060fb7 100644 --- a/pkgs/tools/security/wipe/default.nix +++ b/pkgs/tools/security/wipe/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure file wiping utility"; - homepage = "http://wipe.sourceforge.net/"; + homepage = "https://wipe.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index ddea8881ca70..9ff8d2080f7f 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "Console progress bar"; - homepage = "http://clpbar.sourceforge.net/"; + homepage = "https://clpbar.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.rdnetto ]; platforms = lib.platforms.all; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 7dc6e1fc1237..7047d41c5bb5 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An enhanced version of GNU dd"; - homepage = "http://dcfldd.sourceforge.net/"; + homepage = "https://dcfldd.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 4073034a9b92..c0b3db95ab4e 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://lwn.net/Articles/421072/"; + homepage = "https://lwn.net/Articles/421072/"; description = "cat replacement"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index f3b353501ff0..0e1f118c2054 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h"; - url = "http://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz"; + url = "https://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz"; }; patches = [ ./makefile.patch ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { look at the data structures of a given file format allowing for a more reliable and faster recovery. ''; - homepage = "http://foremost.sourceforge.net/"; + homepage = "https://foremost.sourceforge.net/"; license = licenses.publicDomain; maintainers = [ maintainers.jiegec ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index 15b658c9916b..edd1a8ecfd48 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; - homepage = "http://gt5.sourceforge.net/"; + homepage = "https://gt5.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; all; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index f4de055a60a8..c0386fb66bcf 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://idle3-tools.sourceforge.net/"; + homepage = "https://idle3-tools.sourceforge.net/"; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 2166a671ab1c..d691a86e246c 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An easy-to-use IPMI server management utility"; - homepage = "http://ipmiutil.sourceforge.net/"; + homepage = "https://ipmiutil.sourceforge.net/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index bfc148df782b..78b6ee79ea0f 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran data english-russian"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 91c4bb0ea7f8..c10a65c271d4 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: library for reading Multitran's BTREE database format"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 0e6dd0d6e652..b035ce32cbf1 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: enchanced locale facets"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 5cc8e724e71f..41f17560d286 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: main engine to query translations"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 454709b8eb79..06317fe3043b 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: basic useful functions"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index 2428caada5b8..625f06734b2e 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran: simple command line utilities for dictionary maintenance"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index f87bd5d7b1a1..5e175518b692 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; license = lib.licenses.mit; - homepage = "http://openjade.sourceforge.net/"; + homepage = "https://openjade.sourceforge.net/"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index d55afbc5dd9b..848bd5ce82eb 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A suite of SGML/XML processing tools"; license = licenses.mit; - homepage = "http://openjade.sourceforge.net/"; + homepage = "https://openjade.sourceforge.net/"; platforms = platforms.unix; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 741dcaad344e..05c9a16ad38f 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities for manipulating HTML and XML files"; - homepage = "http://www.w3.org/Tools/HTML-XML-utils/"; + homepage = "https://www.w3.org/Tools/HTML-XML-utils/"; license = licenses.w3c; platforms = platforms.all; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 39d53088babf..d76e9d144964 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; - homepage = "http://xmlstar.sourceforge.net/"; + homepage = "https://xmlstar.sourceforge.net/"; license = lib.licenses.mit; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 42ac92698b0d..3fa76f56d0f0 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { format. ''; license = licenses.mit; - homepage = "http://docbook2x.sourceforge.net/"; + homepage = "https://docbook2x.sourceforge.net/"; platforms = platforms.all; }; } diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 5ccc9ed1566b..89eaf0346a4d 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; - homepage = "http://dblatex.sourceforge.net/"; + homepage = "https://dblatex.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index 92737e27ee30..6665637e6371 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Yet Another MetaData Injector for FLV"; - homepage = "http://yamdi.sourceforge.net/"; + homepage = "https://yamdi.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.ryanartecona ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de7f31117771..e42332b7ee96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9780,7 +9780,7 @@ let propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; buildInputs = [ TestPod ]; meta = { - homepage = "http://finance-quote.sourceforge.net/"; + homepage = "https://finance-quote.sourceforge.net/"; description = "Get stock and mutual fund quotes from various exchanges"; license = with lib.licenses; [gpl2 ]; }; @@ -20646,7 +20646,7 @@ let propagatedBuildInputs = [ DigestSHA1 URI ]; meta = { description = "Collaborative, content-based spam filtering network agent"; - homepage = "http://razor.sourceforge.net/"; + homepage = "https://razor.sourceforge.net/"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; From e96fe2271db17374201c2a9c1d4ca2c86e8f04f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 21 Jan 2023 17:57:51 -0800 Subject: [PATCH 238/338] flashfocus: use pythonRelaxDepsHook --- pkgs/misc/flashfocus/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 5f6df66dd422..e43dc00ba277 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -10,15 +10,17 @@ python3.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.py \ - --replace "pyyaml>=5.1,<6.0" "pyyaml>=5.1" - substituteInPlace bin/nc_flash_window \ --replace "nc" "${lib.getExe netcat-openbsd}" ''; nativeBuildInputs = with python3.pkgs; [ - pytest-runner + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pyyaml" + "xcffib" ]; propagatedBuildInputs = with python3.pkgs; [ From 1c7e7982770fba8758349be2b7d93547b289a66b Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 21 Jan 2023 18:03:43 -0800 Subject: [PATCH 239/338] authenticator: remove dotlambda as maintainer, add austinbutler --- pkgs/applications/misc/authenticator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index 7bf4beba9d97..5fb336d8de37 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ austinbutler ]; platforms = lib.platforms.linux; }; } From a2b154b4c28659a157aa2cd9f43ef9451dd44b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Jan 2023 01:35:10 +0100 Subject: [PATCH 240/338] diffoscope: 229 -> 233 --- pkgs/tools/misc/diffoscope/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1df7ef832b00..932b4072d105 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles, fetchpatch , abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R @@ -11,17 +11,22 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "229"; + version = "233"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-IyTBwlVqOIXERdjvZPTwxhIBPOn8Dt7QbvfBazj5J/A="; + sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch + # test_text_proper_indentation requires file >= 5.44 + (fetchpatch { + url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch"; + sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0="; + }) ]; postPatch = '' @@ -56,6 +61,11 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; + pytestFlagsArray = [ + # always show more information when tests fail + "-vv" + ]; + postInstall = '' make -C doc installManPage doc/diffoscope.1 From 875c913a8f2bf84883fafcc2b53add0d25d17fb3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 22 Jan 2023 03:06:33 +0000 Subject: [PATCH 241/338] =?UTF-8?q?terraform-providers.aci:=202.5.2=20?= =?UTF-8?q?=E2=86=92=202.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3ddccd2f48b2..2da6b6b31c82 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,14 +1,14 @@ { "aci": { "deleteVendor": true, - "hash": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", + "hash": "sha256-vTDuSZjO3ZHCUBaIYB7fvXvBPYywGJy307x2rCejOzk=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.5.2", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=" + "vendorHash": "sha256-dEnQa1GaYrx2jxsRSJWlMmy1hGsXACsp+5PtGmSDL6E=" }, "acme": { "hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=", From 450f6497c77f9530f4effdc615e20fd76ec05ae5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 04:12:29 +0000 Subject: [PATCH 242/338] tippecanoe: 2.17.0 -> 2.18.0 --- pkgs/applications/misc/tippecanoe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index c7e98282cdcb..916dacd5e52a 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-GQPex+NX1DDOBWs/tBUsCtIWZ/+jxeblTRQEvfS2WuA="; + hash = "sha256-+V6nV2L1lE5QEkZcDMg9WE3iiBuZN/QTMR+XX/IdjmA="; }; buildInputs = [ sqlite zlib ]; From d6370a633fc59bac63615dd86049572c37cdd479 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Jan 2023 04:20:00 +0000 Subject: [PATCH 243/338] minio: 2023-01-18T04-36-38Z -> 2023-01-20T02-05-44Z https://github.com/minio/minio/releases/tag/RELEASE.2023-01-20T02-05-44Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 3e61b500a427..f433b219f342 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-01-18T04-36-38Z"; + version = "2023-01-20T02-05-44Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-2MCaC6rgeNNjm7KRv/FsOCBCkERqUaoCQH76y2S8YTU="; + sha256 = "sha256-svy+rmc7RPxKaoF8VbJUpmcYTShqhX7NpPOqzSZdrt4="; }; - vendorHash = "sha256-+m/zzT+w05f4xboZ+yYsVWP8bG8Z0W+UlXefSB1b5Po="; + vendorHash = "sha256-5s70UG9N6A2PklOYpvIU4Ot2vMVCEjOtue4DBaU+ryU="; doCheck = false; From f19e1ef4863e36ed29af3111c09d8669b29c18d8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Jan 2023 04:20:00 +0000 Subject: [PATCH 244/338] twspace-dl: 2022.6.6.1 -> 2023.1.22.1 https://github.com/HoloArchivists/twspace-dl/releases/tag/2023.1.22.0 --- pkgs/tools/misc/twspace-dl/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/tools/misc/twspace-dl/default.nix index e1a3f06b2e99..f2451dc06a21 100644 --- a/pkgs/tools/misc/twspace-dl/default.nix +++ b/pkgs/tools/misc/twspace-dl/default.nix @@ -2,15 +2,18 @@ python3Packages.buildPythonApplication rec { pname = "twspace-dl"; - version = "2022.6.6.1"; + version = "2023.1.22.1"; - format = "setuptools"; + format = "pyproject"; src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "47622f306f2601185b00d6ef24f821810adcc581b7361c423eec979263725afc"; + inherit version; + pname = "twspace_dl"; + sha256 = "050e78b4583374351c288114e3b01ab34b0b19ad2d4971d15c5519521cf3f2f4"; }; + nativeBuildInputs = with python3Packages; [ poetry-core ]; + propagatedBuildInputs = with python3Packages; [ requests ]; From 04fc68068a0136766f18305c8675581c8065c63d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Jan 2023 04:20:00 +0000 Subject: [PATCH 245/338] ytarchive: 2022-05-28 -> 0.3.2 https://github.com/Kethsar/ytarchive/releases/tag/v0.3.2 --- pkgs/tools/misc/ytarchive/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index 65b801c76186..968a280dae82 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -1,17 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper, ffmpeg }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeBinaryWrapper, ffmpeg }: buildGoModule rec { pname = "ytarchive"; - version = "unstable-2022-05-28"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "8d48052f432ec6f78c6aed326e8a1db31ee8e706"; - sha256 = "sha256-IsG0YPVBzsbHLNs1m/AruDmm0n7vwN9Fj1KMOoQJQ+c="; + rev = "v${version}"; + hash = "sha256-fBYwLGg1h5pn8ZP5vZmzzIEvuXlBJ27p4tv7UVMwOEw="; }; - vendorSha256 = "sha256-r9fDFSCDItQ7YSj9aTY1LXRrFE9T3XD0X36ywCfu0R8="; + patches = [ + # Increase the Go version required. See https://github.com/Kethsar/ytarchive/pull/127 + (fetchpatch { + url = "https://github.com/Kethsar/ytarchive/commit/2a995ead4448d03c975378a1932ad975da1a6383.patch"; + sha256 = "sha256-Y+y/Sp/xOS9tBT+LQQ9vE+4n/2RH10umFEEEEVXgtuc="; + }) + ]; + + vendorHash = "sha256-8uTDcu8ucPzck+1dDoySGtc3l1+1USxCfUvdS+ncsnU="; nativeBuildInputs = [ makeBinaryWrapper ]; From 5b187c32529a7ee5ff001fca57ab3f803483cbcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 04:43:29 +0000 Subject: [PATCH 246/338] gifski: 1.8.0 -> 1.9.0 --- pkgs/tools/graphics/gifski/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 7751ecdf25eb..532201c4818a 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-KAm4ng+FIMmhHAxoFNNVo48GVbW3c+raX6Hcab+KCf8="; + sha256 = "sha256-iG7XaPBNTmt/yNMeSY8UKwesFJFUECAsOYQ0idegk1w="; }; - cargoSha256 = "sha256-xbE1Olf0lh6o4kF9ubZhdnTbZsJcd5TvLf7P1nWLf9Q="; + cargoHash = "sha256-7bjsxbUsHjsVER0HaQ+x0dkaAI2sb7if8mS6JwQIbzc="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 36cacfe01c5b9c372851da3302c5188fddf7ec42 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jan 2023 06:24:08 +0100 Subject: [PATCH 247/338] imgproxy: add changelog --- pkgs/servers/imgproxy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 08df456cfea0..7d2be47d140e 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Fast and secure on-the-fly image processing server written in Go"; homepage = "https://imgproxy.net"; + changelog = "https://github.com/imgproxy/imgproxy/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ paluh ]; }; From 5544335d8d82a49305e295373e2def36221ea5b7 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Sun, 22 Jan 2023 05:40:20 +0000 Subject: [PATCH 248/338] coost: init at 3.0.0 --- pkgs/development/libraries/coost/default.nix | 37 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/coost/default.nix diff --git a/pkgs/development/libraries/coost/default.nix b/pkgs/development/libraries/coost/default.nix new file mode 100644 index 000000000000..5d692edd434e --- /dev/null +++ b/pkgs/development/libraries/coost/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, gitUpdater +, withCurl ? true, withOpenSSL ? true }: + +stdenv.mkDerivation rec { + pname = "coost"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "idealvin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qpJh1yl0lYYszNHGo5Jkbzal2hnVzg7UUxiyg/Grva8="; + }; + + postPatch = '' + substituteInPlace cmake/coost.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional withCurl curl ++ lib.optional withOpenSSL openssl; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] + ++ lib.optional withCurl "-DWITH_LIBCURL=ON" + ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A tiny boost library in C++11"; + homepage = "https://github.com/idealvin/coost"; + license = licenses.mit; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 649e19e17661..88fc8139e7c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -425,6 +425,8 @@ with pkgs; containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + coost = callPackage ../development/libraries/coost { }; + crc = callPackage ../applications/networking/cluster/crc { }; coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; From c04241cbbaf57539902c926a2347a09b114c02d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 05:51:37 +0000 Subject: [PATCH 249/338] python310Packages.google-cloud-container: 2.16.0 -> 2.17.0 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 12121b880dc6..11939a5195a3 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.16.0"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T8rAle7q1/uiGkrLbCWtR8iiAPpW/QKJLppity8oWiY="; + hash = "sha256-UlZJ4nh7BOw4HfFGZucU7Kom7/EuSdgZZzZ30f4wL+0="; }; propagatedBuildInputs = [ From c0407c30ca849f2a28385be4066c28e3677e8f08 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jan 2023 09:14:34 +0100 Subject: [PATCH 250/338] mtxclient: fix build on aarch64-linux --- pkgs/development/libraries/mtxclient/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 505e58c1ec37..a3b829a754a8 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { spdlog ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + meta = with lib; { description = "Client API library for the Matrix protocol."; homepage = "https://github.com/Nheko-Reborn/mtxclient"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02a7df000c48..dc6083d5c9c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22021,7 +22021,10 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { }; + mtxclient = callPackage ../development/libraries/mtxclient { + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + }; mu = callPackage ../tools/networking/mu { texinfo = texinfo4; From a10858477fb9a384ad8aba8f2ade7488f92f4eeb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jan 2023 09:14:42 +0100 Subject: [PATCH 251/338] nheko: fix build on aarch64-linux --- .../networking/instant-messengers/nheko/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 680833ca2e6a..e6b3d84c7b79 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchFromGitHub , cmake , asciidoc @@ -26,12 +25,13 @@ , qttools , re2 , spdlog +, wrapQtAppsHook , voipSupport ? true , gst_all_1 , libnice }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nheko"; version = "0.11.1"; @@ -47,6 +47,7 @@ mkDerivation rec { cmake lmdbxx pkg-config + wrapQtAppsHook ]; buildInputs = [ @@ -82,6 +83,9 @@ mkDerivation rec { "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + preFixup = lib.optionalString voipSupport '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc6083d5c9c0..454c8d096ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31546,7 +31546,10 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; From b7d097438b9b0f782a707f3295d320d824810864 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 24 Sep 2022 22:00:46 -0700 Subject: [PATCH 252/338] lib/meta.nix: platformMatch: allow predicate functions --- lib/meta.nix | 7 ++++++- pkgs/stdenv/generic/check-meta.nix | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/meta.nix b/lib/meta.nix index 62894aeb316b..cdd3e1d596c0 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -78,10 +78,15 @@ rec { 2. (modern) a pattern for the platform `parsed` field. + 3. (functional) a predicate function returning a boolean. + We can inject these into a pattern for the whole of a structured platform, and then match that. */ - platformMatch = platform: elem: let + platformMatch = platform: elem: + if builtins.isFunction elem + then elem platform + else let pattern = if builtins.isString elem then { system = elem; } diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 751e19d1681a..94998bbfa0fe 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -271,7 +271,7 @@ let sourceProvenance = listOf lib.types.attrs; maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix priority = int; - platforms = listOf (either str (attrsOf anything)); # see lib.meta.platformMatch + platforms = listOf (oneOf [ str (attrsOf anything) (functionTo bool) ]); # see lib.meta.platformMatch hydraPlatforms = listOf str; broken = bool; unfree = bool; From 5b66b6b8c23bf2003b99fac9fee2c743eb3ac253 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 24 Sep 2022 22:03:24 -0700 Subject: [PATCH 253/338] systemd.meta.badPlatforms: include isStatic predicate --- pkgs/os-specific/linux/systemd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4799cdb06b76..fadb6a486c82 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -714,6 +714,7 @@ stdenv.mkDerivation { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; + badPlatforms = [ (plat: plat.isStatic) ]; # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; From 42815b4a0ca4b1a433ce58f7bf92fb5fa1aec064 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 21 Sep 2022 00:04:52 -0700 Subject: [PATCH 254/338] treewide: systemdSupport: use lib.meta.availableOn Many packages have some kind of flag indicating whether or not to build with systemd support. Most of these default to `stdenv.isLinux`, but systemd does not build on (and is marked `broken` for) `isStatic`. Only a few packages have the needed `&& !isStatic` in the default value for their parameter. This commit moves the logic for the default value of these flags into `systemd.meta.{platforms,badPlatforms}` and evaluates those conditions using `lib.meta.availableOn`. This provides three benefits: 1. The default values are set correctly (i.e. including `&& isStatic`) 2. The default values are set consistently 3. The way is paved for any future non-Linux systemd platforms (FreeBSD is reported to have experimental systemd support) --- pkgs/applications/audio/musikcube/default.nix | 8 ++++---- pkgs/applications/editors/emacs/generic.nix | 2 +- pkgs/applications/graphics/drawpile/default.nix | 2 +- pkgs/applications/misc/prusa-slicer/default.nix | 3 +-- pkgs/applications/misc/seatd/default.nix | 2 +- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- pkgs/applications/networking/msmtp/default.nix | 2 +- pkgs/applications/networking/p2p/transmission/default.nix | 2 +- pkgs/applications/networking/sync/onedrive/default.nix | 2 +- pkgs/applications/virtualization/docker/default.nix | 2 +- pkgs/applications/window-managers/sway/default.nix | 3 +-- pkgs/applications/window-managers/sway/idle.nix | 2 +- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- pkgs/development/interpreters/php/generic.nix | 2 +- pkgs/development/libraries/dbus/default.nix | 2 +- pkgs/development/libraries/polkit/default.nix | 2 +- pkgs/development/libraries/vte/default.nix | 2 +- pkgs/development/libraries/webkitgtk/default.nix | 2 +- pkgs/development/libraries/yder/default.nix | 2 +- pkgs/misc/cups/default.nix | 2 +- pkgs/misc/screensavers/xscreensaver/default.nix | 2 +- pkgs/os-specific/linux/procps-ng/default.nix | 2 +- pkgs/os-specific/linux/util-linux/default.nix | 2 +- pkgs/servers/ldap/389/default.nix | 3 +-- pkgs/servers/matrix-synapse/default.nix | 3 ++- pkgs/servers/mautrix-facebook/default.nix | 7 ++++--- pkgs/servers/mqtt/mosquitto/default.nix | 2 +- pkgs/servers/nfd/default.nix | 2 +- pkgs/servers/nosql/redis/default.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/servers/uwsgi/default.nix | 2 +- pkgs/tools/misc/brltty/default.nix | 2 +- pkgs/tools/misc/tmux/default.nix | 2 +- pkgs/tools/networking/dd-agent/datadog-agent.nix | 2 +- pkgs/tools/networking/openfortivpn/default.nix | 2 +- pkgs/tools/networking/openvpn/default.nix | 2 +- pkgs/tools/package-management/packagekit/default.nix | 2 +- pkgs/tools/system/htop/default.nix | 3 +-- pkgs/tools/system/hw-probe/default.nix | 2 +- pkgs/tools/system/rsyslog/default.nix | 2 +- pkgs/top-level/beam-packages.nix | 6 ++++-- 41 files changed, 51 insertions(+), 51 deletions(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 38e96c7f098e..7dd7670d67f7 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,4 +1,6 @@ -{ cmake +{ lib +, stdenv +, cmake , pkg-config , boost , curl @@ -12,13 +14,11 @@ , libopenmpt , mpg123 , ncurses -, lib -, stdenv , taglib # Linux Dependencies , alsa-lib , pulseaudio -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # Darwin Dependencies , Cocoa diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index cd68f0dbf5f3..feed7ba5b41e 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -44,7 +44,7 @@ else if withMotif then "motif" else if withAthena then "athena" else "lucid") -, withSystemd ? stdenv.isLinux, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: assert (libXft != null) -> libpng != null; # probably a bug diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 09d51db254ba..76409860ffa9 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -25,7 +25,7 @@ # optional server deps , libmicrohttpd , libsodium -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd ? null # options diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 14a0d4453a25..c0a1e7e0217d 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -26,12 +26,11 @@ , openvdb , pcre , qhull -, systemd , tbb , wxGTK31 , xorg , fetchpatch -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: let wxGTK-prusa = wxGTK31.overrideAttrs (old: rec { diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index 8c10219903db..f9a7cc928e10 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -5,7 +5,7 @@ , pkg-config , scdoc , stdenv -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 50cbc80e0c7e..23b47c84555f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -45,7 +45,7 @@ , ungoogled ? false, ungoogled-chromium # Optional dependencies: , libgcrypt ? null # cupsSupport -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 904239960181..479d0980919c 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -17,7 +17,7 @@ , Security , withKeyring ? true , libsecret -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index f3a33c2194cb..8d605877a62e 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -24,7 +24,7 @@ , enableQt ? false , qt5 , nixosTests -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , enableDaemon ? true , enableCli ? true , installLib ? false diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index d928978d3cf8..6c64b755be0a 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -8,7 +8,7 @@ , curl , sqlite , libnotify -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index fff9200285aa..5027a8fd5c91 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -15,7 +15,7 @@ rec { , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.isLinux, symlinkJoin - , withSystemd ? stdenv.isLinux, systemd + , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withBtrfs ? stdenv.isLinux, btrfs-progs , withLvm ? stdenv.isLinux, lvm2 , withSeccomp ? stdenv.isLinux, libseccomp diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index e49edbd19093..6cfc55240222 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -6,9 +6,8 @@ , nixosTests # Used by the NixOS module: , isNixOS ? false - , enableXWayland ? true, xorg -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , dbusSupport ? true , dbus , trayEnabled ? systemdSupport && dbusSupport diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 6479760a743e..b410919022f1 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, runtimeShell -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index bdfca31d7f7f..59e2286f84ee 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -21,7 +21,7 @@ , parallelBuild ? false , systemd , wxSupport ? true -, systemdSupport ? stdenv.isLinux # systemd support in epmd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd # updateScript deps , writeScript , common-updater-scripts diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 5a363822bcae..b8ceac621a61 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -52,7 +52,7 @@ let , cgotoSupport ? false , embedSupport ? false , ipv6Support ? true - , systemdSupport ? stdenv.isLinux + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 795c2c51ddfc..20856f2ad9b8 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , expat -, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , audit , libapparmor diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 3db9e21bc759..5c67eb1b65db 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -21,7 +21,7 @@ , docbook_xml_dtd_412 , gtk-doc , coreutils -, useSystemd ? stdenv.isLinux +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , elogind # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index f87557ac4623..3a82bafa3e12 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -24,7 +24,7 @@ , zlib , icu , systemd -, systemdSupport ? stdenv.hostPlatform.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , nixosTests }: diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index cfff2e7f853d..4e22df60f533 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -63,7 +63,7 @@ , addOpenGLRunpath , enableGeoLocation ? true , withLibsecret ? true -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index fb26e27bc3e8..43b181fc348f 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -6,7 +6,7 @@ , systemd , check , subunit -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index b707647377ca..06fdb4d65e72 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -9,7 +9,7 @@ , libtiff , pam , dbus -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , acl , gmp diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 72e283eaf11c..d2a6dfcec954 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,7 +5,7 @@ , gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam , systemd, coreutils , forceInstallAllHacks ? false -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index c87c337e61c3..67b839a1bd36 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -7,7 +7,7 @@ # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. -, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # procps is mostly Linux-only. Most commands require a running Linux diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 8df231c961e2..eeecc655aef9 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -6,7 +6,7 @@ , ncurses , pamSupport ? true , pam -, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , nlsSupport ? true , translateManpages ? true diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index ad857703baf3..4478c594330d 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -26,8 +26,7 @@ , python3 , rustPlatform , openssl -, systemd -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , zlib , rsync , withCockpit ? true diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 778444eda078..18041897f232 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3, openssl, rustPlatform -, enableSystemd ? stdenv.isLinux, nixosTests +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, nixosTests , enableRedis ? true , callPackage }: diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index e8eb6a8b86b6..fcef839a9ddf 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -1,9 +1,10 @@ -{ enableSystemd ? stdenv.isLinux +{ lib +, stdenv +, systemd +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , fetchFromGitHub , fetchpatch -, lib , python3 -, stdenv }: python3.pkgs.buildPythonPackage rec { diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 0c574e599757..f241f48ac52e 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -10,7 +10,7 @@ , libuv , libwebsockets , openssl -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , fetchpatch }: diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 08309213aaaf..58c4dd42936e 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -10,7 +10,7 @@ , systemd , wafHook , websocketpp -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withWebSocket ? true }: diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 5ec8361e2d7b..300a5dd20670 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests , tcl, which, ps, getconf -, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl }: diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 11c56b925412..57977ebf4096 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -9,7 +9,7 @@ , x11Support ? false -, useSystemd ? stdenv.isLinux +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , # Whether to support the JACK sound system as a backend. jackaudioSupport ? false diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 01fa28d5d41e..0a9ff0bcc1a2 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -3,7 +3,7 @@ # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux -, systemd, withSystemd ? stdenv.isLinux +, systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , libcap, withCap ? stdenv.isLinux , python2, python3, ncurses , ruby, php diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index fef13a893728..5838c24172f8 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez , tcl, acl, kmod, coreutils, shadow, util-linux, udev , alsaSupport ? stdenv.isLinux, alsa-lib -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 9ffe21c8cf5e..139cadc70642 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -6,7 +6,7 @@ , libevent , ncurses , pkg-config -, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index a0b3f357950e..b3552a28e531 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -8,7 +8,7 @@ , pkg-config , systemd , hostname -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , extraTags ? [ ] }: diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 0426066995d9..87b7ae1970cb 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -2,7 +2,7 @@ , openssl , ppp , systemd -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withPpp ? stdenv.isLinux }: diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index d13ea566910b..65e20ca67774 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -7,7 +7,7 @@ , openssl , openssl_1_1 , pam -, useSystemd ? stdenv.isLinux +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , update-systemd-resolved , util-linux diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 95fecd208506..b51a51da84f5 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -22,7 +22,7 @@ , enableCommandNotFound ? false , enableBashCompletion ? false , bash-completion ? null -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index e3dca89c4646..cb79607ebbf8 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -2,8 +2,7 @@ , ncurses , IOKit , sensorsSupport ? stdenv.isLinux, lm_sensors -, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic -, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: assert systemdSupport -> stdenv.isLinux; diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index d483bdad221b..ee538f92668a 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -30,7 +30,7 @@ , xz # Conditionally recommended -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # Recommended diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 09be16b1c945..859f66990c56 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -10,7 +10,7 @@ , fastJson , withKrb5 ? true , libkrb5 -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , withJemalloc ? true , jemalloc diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 2d0fde6d079c..c727db80db6a 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,11 +1,13 @@ -{ beam +{ lib +, beam , callPackage , openssl_1_1 , wxGTK32 , buildPackages , stdenv , wxSupport ? true -, systemdSupport ? stdenv.isLinux +, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: let From ee251dca0efe569927e259d6e0753d0c120d9535 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 09:29:18 +0100 Subject: [PATCH 255/338] python310Packages.trainer: add missing input --- pkgs/development/python-modules/trainer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 4a530c1300be..08a0665f6100 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -9,6 +9,7 @@ , torch-bin , tensorboardx , protobuf +, psutil , pytestCheckHook , soundfile @@ -37,10 +38,11 @@ buildPythonPackage { propagatedBuildInputs = [ coqpit fsspec - torch-bin + protobuf + psutil soundfile tensorboardx - protobuf + torch-bin ]; # only one test and that requires training data from the internet From 49e537eaa547b0ca89fad378c756bd27a05509f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 09:30:20 +0100 Subject: [PATCH 256/338] python310Packages.trainer: add changelog to meta --- pkgs/development/python-modules/trainer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 08a0665f6100..4145fdf1a4a4 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -60,6 +60,7 @@ buildPythonPackage { meta = with lib; { description = "A general purpose model trainer, as flexible as it gets"; homepage = "https://github.com/coqui-ai/Trainer"; + changelog = "https://github.com/coqui-ai/Trainer/releases/tag/v${version}"; license = licenses.asl20; maintainers = teams.tts.members; }; From ec37bd125dddc95b6327b229f5c85d52f3fa50ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 13:37:46 +0100 Subject: [PATCH 257/338] python310Packages.typed-settings: add changelog to meta --- pkgs/development/python-modules/typed-settings/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 9f01a0939f0f..eab4f67a87b8 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "typed-settings"; version = "2.0.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { @@ -43,11 +44,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "typed_settings" ]; + pythonImportsCheck = [ + "typed_settings" + ]; meta = { description = "Typed settings based on attrs classes"; homepage = "https://gitlab.com/sscherfke/typed-settings"; + changelog = "https://gitlab.com/sscherfke/typed-settings/-/blob/${version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; From fca25a448c4068bc6b334cd8b3c61a0fef594058 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 13:44:55 +0100 Subject: [PATCH 258/338] python310Packages.typed-settings: adjust inputs - add changelog to meta - add optional-dependencies --- .../python-modules/typed-settings/default.nix | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index eab4f67a87b8..11b82b798569 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -1,14 +1,15 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, setuptoolsBuildHook , attrs +, buildPythonPackage , cattrs -, toml -, pytestCheckHook , click , click-option-group +, fetchPypi +, hatchling +, pytestCheckHook +, pythonOlder +, tomli +, typing-extensions }: buildPythonPackage rec { @@ -25,23 +26,35 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptoolsBuildHook + hatchling ]; propagatedBuildInputs = [ attrs cattrs click-option-group - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; + passthru.optional-dependencies = { + click = [ + click + ]; + }; + + checkInputs = [ + pytestCheckHook + typing-extensions + ] ++ passthru.optional-dependencies.click; + pytestFlagsArray = [ "tests" ]; - nativeCheckInputs = [ - click - pytestCheckHook + disabledTests = [ + # AssertionError: assert [OptionInfo(p... + "test_deep_options" ]; pythonImportsCheck = [ From 125169d412103d51bdab682ba063188dd11d587e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 13:45:56 +0100 Subject: [PATCH 259/338] python310Packages.typed-settings: 2.0.0 -> 2.0.2 Changelog: https://gitlab.com/sscherfke/typed-settings/-/blob/2.0.2/CHANGELOG.rst --- pkgs/development/python-modules/typed-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 11b82b798569..af8b9c5ef364 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "2.0.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-o0cPD/7/DS9aUtLDA1YhxKrxUDE7Elv4B7zlKVSsFJQ="; + hash = "sha256-AYHA1xFS0g99cloGIjvi8loKS/Q/AteyLiLH8rf+2No="; }; nativeBuildInputs = [ From 38c6e498dec8f3a20440a274c1dafafabed4da37 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 10:11:23 +0100 Subject: [PATCH 260/338] python310Packages.pprintpp: add patch to remove u from open() - add changelog to meta - add pythonImportsCheck --- .../python-modules/pprintpp/default.nix | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index deb486b6b397..b72eeeebce47 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -1,29 +1,56 @@ -{ lib, fetchpatch, buildPythonPackage, fetchPypi, python, nose, parameterized }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, nose +, parameterized +, python +, pythonOlder +}: buildPythonPackage rec { pname = "pprintpp"; version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "00v4pkyiqc0y9qjnp3br58a4k5zwqdrjjxbcsv39vx67w84630pa"; + hash = "sha256-6oJhCOLH9J3G1mx1KXPD/JdJFCp5jWslTh4wHP28ZAM="; }; patches = [ + # Replace nose-parameterized with parameterized, https://github.com/wolever/pprintpp/pull/21 (fetchpatch { url = "https://github.com/wolever/pprintpp/commit/873217674cc824b4c1cfdad4867c560c60e8d806.patch"; - sha256 = "0rqxzxawr83215s84mfzh1gnjwjm2xv399ywwcl4q7h395av5vb3"; + hash = "sha256-Y+2yVUkDHkwo49ynNHYXVXJpX4DfVYJ0CWKgzFX/HWc="; + }) + # Remove "U" move from open(), https://github.com/wolever/pprintpp/pull/31 + (fetchpatch { + name = "remove-u.patch"; + url = "https://github.com/wolever/pprintpp/commit/deec5e5efad562fc2f9084abfe249ed0c7dd65fa.patch"; + hash = "sha256-I84pnY/KyCIPPI9q0uvj64t8oPeMkgVTPEBRANkZNa4="; }) ]; - nativeCheckInputs = [ nose parameterized ]; + nativeCheckInputs = [ + nose + parameterized + ]; + checkPhase = '' ${python.interpreter} test.py ''; + pythonImportsCheck = [ + "pprintpp" + ]; + meta = with lib; { - homepage = "https://github.com/wolever/pprintpp"; description = "A drop-in replacement for pprint that's actually pretty"; + homepage = "https://github.com/wolever/pprintpp"; + changelog = "https://github.com/wolever/pprintpp/blob/${version}/CHANGELOG.txt"; license = licenses.bsd2; maintainers = with maintainers; [ jakewaksbaum ]; }; From eef1570cd5241ed18257dd980af6e3f47a521eaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 10:22:12 +0100 Subject: [PATCH 261/338] python310Packages.audio-metadata: relax more-itertools constraint --- .../python-modules/audio-metadata/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index fc3adf2534e7..a96983732cd8 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -1,25 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , attrs , bidict , bitstruct , more-itertools , pprintpp , tbm-utils +, pythonRelaxDepsHook +, pythonOlder }: buildPythonPackage rec { pname = "audio-metadata"; version = "0.11.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "9e7ba79d49cf048a911d5f7d55bb2715c10be5c127fe5db0987c5fe1aa7335eb"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" - ''; + pythonRelaxDeps = [ + "attrs" + "more-itertools" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ attrs @@ -33,9 +44,14 @@ buildPythonPackage rec { # No tests doCheck = false; + pythonImportsCheck = [ + "audio_metadata" + ]; + meta = with lib; { homepage = "https://github.com/thebigmunch/audio-metadata"; description = "A library for reading and, in the future, writing metadata from audio files"; + changelog = "https://github.com/thebigmunch/audio-metadata/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; }; From 92d917ec334c2d96dff710b9a2b2d33ae1c1e4ec Mon Sep 17 00:00:00 2001 From: Daniel Hancock Date: Sat, 21 Jan 2023 13:47:37 +0800 Subject: [PATCH 262/338] linux_xanmod: 5.15.84 -> 5.15.89 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 5cbc94d5aba4..e077050fb9d5 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.84"; - hash = "sha256-CN3GOuwSicJ6Oa9BiKTyZg7fpzWc846v2SV9JRiOu3M="; + version = "5.15.89"; + hash = "sha256-wlb6er8L2EaqgJbmbATBdSxx1BGcJXNcsu+/4UBmYdQ="; variant = "lts"; }; From d0a31fabed3d57e807c0b8eb1d443238002cc057 Mon Sep 17 00:00:00 2001 From: "dhancock@camelot.network" Date: Sun, 22 Jan 2023 17:23:44 +0800 Subject: [PATCH 263/338] linux_xanmod: 6.1.3 -> 6.1.7 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e077050fb9d5..09562d42ec79 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.1.3"; - hash = "sha256-YtkmbbFEfvww7yJ4MpLQ3M6QjbBXSU9Pjwu0Dq/dIcs="; + version = "6.1.7"; + hash = "sha256-cgUxM40cDl4lzoF4St3ckKAtsle2PRehfSag3VaycrY="; variant = "main"; }; From 0bf93d55cc91f89a48ab36d2e8f6eea26f52cd3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 13:49:07 +0000 Subject: [PATCH 264/338] zoom-us: 5.13.4.711 -> 5.13.5.431 --- .../instant-messengers/zoom-us/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b8892113900f..af321660676b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,6 +30,7 @@ , libxkbcommon , udev , zlib +, krb5 # Runtime , coreutils , pciutils @@ -47,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.13.4.14461"; - versions.x86_64-darwin = "5.13.4.14461"; - versions.x86_64-linux = "5.13.4.711"; + versions.aarch64-darwin = "5.13.6.14918"; + versions.x86_64-darwin = "5.13.6.14918"; + versions.x86_64-linux = "5.13.5.431"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-gNlY7Cocv6t406o1biZj6UAiP5fwF+g/G2P2uN5bF7I="; + hash = "sha256-QY9z1bTKtL32HE4XWnBIvCNmDF+3x5N9BdfqJA+24fA="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-T5s8ERMNkdvIzsBq8ZtOUKu084/8uBjIoYgopkM09cI="; + hash = "sha256-eSPKzxDPXCbME0eTTDlfsI5KM5qRm79JTtnGJvpiS98="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-sQk5fS/bS7e0T0IJ7+UB956XmCAbeMYfS8BVwncpoy0="; + hash = "sha256-R0IMV/+R7AGFy/ZvNyyvIBv10t1x1U1X6jdHoo6UHKY="; }; }; @@ -106,6 +107,7 @@ let xorg.libXtst udev zlib + krb5 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in From 6d0c7f746f92669b3dae2b20109b449680e6b083 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 10:54:21 +0100 Subject: [PATCH 265/338] python310Packages.ward: init at 0.67.0b0 --- .../python-modules/ward/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/ward/default.nix diff --git a/pkgs/development/python-modules/ward/default.nix b/pkgs/development/python-modules/ward/default.nix new file mode 100644 index 000000000000..9d438d74258f --- /dev/null +++ b/pkgs/development/python-modules/ward/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, click +, click-completion +, click-default-group +, cucumber-tag-expressions +, fetchFromGitHub +, pluggy +, poetry-core +, pprintpp +, pythonOlder +, pythonRelaxDepsHook +, rich +, tomli +}: + +buildPythonPackage rec { + pname = "ward"; + version = "0.67.0b0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "darrenburns"; + repo = pname; + rev = "refs/tags/release%2F${version}"; + hash = "sha256-4dEMEEPySezgw3dIcYMl56HrhyaYlql9JvtamOn7Y8g="; + }; + + pythonRelaxDeps = [ + "rich" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + click + rich + tomli + pprintpp + cucumber-tag-expressions + click-default-group + click-completion + pluggy + ]; + + # Fixture is missing. Looks like an issue with the import of the sample file + doCheck = false; + + pythonImportsCheck = [ + "ward" + ]; + + meta = with lib; { + description = "Test framework for Python"; + homepage = "https://github.com/darrenburns/ward"; + changelog = "https://github.com/darrenburns/ward/releases/tag/release%2F${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48b188ddf43e..dcff126d93ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12058,6 +12058,8 @@ self: super: with self; { warcio = callPackage ../development/python-modules/warcio { }; + ward = callPackage ../development/python-modules/ward { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; From 4a05ecfd664b120aa3c4df96ded0c0ec10f4f7ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 10:59:42 +0100 Subject: [PATCH 266/338] python310Packages.audio-metadata: prepare for running the tests --- .../python-modules/audio-metadata/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index a96983732cd8..d1d6de0bcba8 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -1,34 +1,48 @@ { lib -, buildPythonPackage -, fetchPypi , attrs , bidict , bitstruct +, buildPythonPackage +, fetchFromGitHub +, fetchpatch , more-itertools +, poetry-core , pprintpp -, tbm-utils -, pythonRelaxDepsHook , pythonOlder +, pythonRelaxDepsHook +, tbm-utils }: buildPythonPackage rec { pname = "audio-metadata"; version = "0.11.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "9e7ba79d49cf048a911d5f7d55bb2715c10be5c127fe5db0987c5fe1aa7335eb"; + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg="; }; + patches = [ + # Switch to poetry-core, https://github.com/thebigmunch/audio-metadata/pull/41 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/thebigmunch/audio-metadata/commit/dfe91a69ee37e9dcefb692165eb0f9cd36a7e5b8.patch"; + hash = "sha256-ut3mqgZQu0YFbsTEA13Ch0+aSNl17ndMV0fuIu3n5tc="; + }) + ]; + pythonRelaxDeps = [ "attrs" "more-itertools" ]; nativeBuildInputs = [ + poetry-core pythonRelaxDepsHook ]; @@ -41,7 +55,7 @@ buildPythonPackage rec { tbm-utils ]; - # No tests + # Tests require ward which is not ready to be used doCheck = false; pythonImportsCheck = [ From ddbdd15287f05579e8ac3a4b899e73e6522ca882 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:04:36 +0100 Subject: [PATCH 267/338] expliot: relax pymodbus constraint - switch to pythonRelaxDepsHook --- pkgs/tools/security/expliot/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index 4ec31802710d..593ed498345a 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -30,6 +30,19 @@ buildPythonApplication rec { hash = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; }; + pythonRelaxDeps = [ + "pymodbus" + "pynetdicom" + "cryptography" + "python-can" + "pyparsing" + "zeroconf" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ aiocoap awsiotpythonsdk @@ -49,16 +62,6 @@ buildPythonApplication rec { zeroconf ]; - postPatch = '' - # https://gitlab.com/expliot_framework/expliot/-/merge_requests/113 - substituteInPlace setup.py \ - --replace "pynetdicom>=1.5.1,<2" "pynetdicom>=2,<3" \ - --replace "cryptography>=3.0,<4" "cryptography>=35,<40" \ - --replace "python-can>=3.3.3,<4" "python-can>=3.3.3,<5" \ - --replace "pyparsing>=2.4.7,<3" "pyparsing>=2.4.7,<4" \ - --replace "zeroconf>=0.30,<0.40" "zeroconf" - ''; - # Project has no tests doCheck = false; From 8af586882a1c42bbb172973e48bb949b2457ec6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:14:29 +0100 Subject: [PATCH 268/338] python310Packages.dvclive: add changelog to meta --- pkgs/development/python-modules/dvclive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index ffa8d68e0bdd..f3a3c4596608 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for logging machine learning metrics and other metadata in simple file formats"; homepage = "https://github.com/iterative/dvclive"; + changelog = "https://github.com/iterative/dvclive/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 7b66712871a5c8d39e19cc01011866bffdb2b1e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:17:20 +0100 Subject: [PATCH 269/338] python310Packages.dvc-render: add changelog to meta --- pkgs/development/python-modules/dvc-render/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index d8996ef8a4cb..26933ce2641b 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for rendering DVC plots"; homepage = "https://github.com/iterative/dvc-render"; + changelog = "https://github.com/iterative/dvc-render/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 641051ae5bcc67f95420fc815f1da8e03ad83533 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:18:57 +0100 Subject: [PATCH 270/338] python310Packages.dvclive: add missing input --- pkgs/development/python-modules/dvclive/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index f3a3c4596608..a62c459ef379 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, ruamel-yaml , setuptools , tabulate }: @@ -28,8 +29,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ dvc-render - tabulate # will be available as dvc-render.optional-dependencies.table - ]; + ruamel-yaml + ] ++ dvc-render.optional-dependencies.table; # Circular dependency with dvc doCheck = false; From 094062727293b987affec3cee5cf10787c45234c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:46:25 +0100 Subject: [PATCH 271/338] python310Packages.aio-geojson-client: add changelog to meta --- pkgs/development/python-modules/aio-geojson-client/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index b0629483d014..a7796367b8b0 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 7b61a2bf69212f907ba5e320b9097355090c6e76 Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sun, 22 Jan 2023 11:46:51 +0100 Subject: [PATCH 272/338] copyq: build with qt6 --- pkgs/applications/misc/copyq/default.nix | 24 ++++++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index fb00cdafad44..954d16ce3e73 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,20 +1,21 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake +, ninja , extra-cmake-modules , qtbase -, qtscript +, qtsvg +, qttools +, qtdeclarative , libXfixes , libXtst -, qtx11extras -, knotifications , qtwayland , wayland -, fetchpatch +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "CopyQ"; version = "6.4.0"; @@ -27,16 +28,18 @@ mkDerivation rec { nativeBuildInputs = [ cmake + ninja extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ qtbase - qtscript + qtsvg + qttools + qtdeclarative libXfixes libXtst - qtx11extras - knotifications qtwayland wayland ]; @@ -46,13 +49,14 @@ mkDerivation rec { --replace copyq "$out/bin/copyq" ''; + cmakeFlags = [ "-DWITH_QT6=ON" ]; + meta = with lib; { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3Only; maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. - # OSX build requires QT5. platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02a7df000c48..7db2316a20a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28386,7 +28386,7 @@ with pkgs; confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; - copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + copyq = qt6Packages.callPackage ../applications/misc/copyq { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; From 23fe71e2c5f21d7096b6cb3a2fbcb7f31ad738e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 10:48:58 +0000 Subject: [PATCH 273/338] libzdb: 3.2.2 -> 3.2.3 --- pkgs/development/libraries/libzdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 986f27e27c89..cfd4d38ac574 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.3"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "1blmy7228649iscwlldrc1ldf31nhps1ps9xfv44ms0yxqhlw7nm"; + sha256 = "sha256-oZV4Jvq3clSE/Ft0eApqfQ2Lf14uVNJuEGs5ngqGvrA="; }; buildInputs = [ sqlite ]; From 8f12f5e1d34a6632e08b82ef8fe72959bd586993 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 11:49:37 +0100 Subject: [PATCH 274/338] python311Packages.aio-geojson-client: remove asynctest --- .../python-modules/aio-geojson-client/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index a7796367b8b0..a23b41b66396 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -1,11 +1,12 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub +, fetchpatch , geojson , haversine +, mock , pytest-asyncio , pytestCheckHook , pythonOlder @@ -25,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; + patches = [ + # Remove asynctest, https://github.com/exxamalte/python-aio-geojson-client/pull/35 + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/exxamalte/python-aio-geojson-client/commit/bf617d9898a99b026b43b28bd87bb6479f518c0a.patch"; + hash = "sha256-uomH3LCaklfGURDs8SsnvNyHkubbe+5dleLEjW+I+M4="; + }) + ]; + propagatedBuildInputs = [ aiohttp geojson @@ -33,7 +43,7 @@ buildPythonPackage rec { checkInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; From 25a604c919ccecb8df5fd4418cdafbf75c93d430 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2023 13:34:56 +0100 Subject: [PATCH 275/338] python310Packages.pyrainbird: 0.7.1 -> 1.0.0 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/1.0.0 Switch to a maintained fork --- .../python-modules/pyrainbird/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 82c67f603d75..61d1ad389115 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -8,22 +8,23 @@ , pythonOlder , pyyaml , requests +, pydantic , requests-mock , responses }: buildPythonPackage rec { pname = "pyrainbird"; - version = "0.7.1"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "jbarrancos"; + owner = "allenporter"; repo = pname; - rev = version; - hash = "sha256-pN/QILpXJoQAccB7CSDLxCDYfijf/VJbYw+NRUI4kvs="; + rev = "refs/tags/${version}"; + hash = "sha256-5IEzoxuwIzMfHzW0oD/LC+iWf+yC05nfCJd5tzMccrc="; }; postPatch = '' @@ -46,6 +47,7 @@ buildPythonPackage rec { pytestCheckHook requests-mock responses + pydantic ]; pythonImportsCheck = [ @@ -54,8 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Rainbird controllers"; - homepage = "https://github.com/jbarrancos/pyrainbird/"; - changelog = "https://github.com/jbarrancos/pyrainbird/releases/tag/${version}"; + homepage = "https://github.com/allenporter/pyrainbird"; + changelog = "https://github.com/allenporter/pyrainbird/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 24b9734763fd56294d07515b70d5259babbfe98c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 12:40:27 +0100 Subject: [PATCH 276/338] python310Packages.pyrainbird: 1.0.0 -> 1.1.0 Diff: allenporter/pyrainbird@refs/tags/1.0.0...1.1.0 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/1.1.0 --- pkgs/development/python-modules/pyrainbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 61d1ad389115..ccc3b90979aa 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -3,19 +3,19 @@ , fetchFromGitHub , parameterized , pycryptodome +, pydantic , pytest-aiohttp , pytestCheckHook , pythonOlder , pyyaml , requests -, pydantic , requests-mock , responses }: buildPythonPackage rec { pname = "pyrainbird"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5IEzoxuwIzMfHzW0oD/LC+iWf+yC05nfCJd5tzMccrc="; + hash = "sha256-qAFc1LPGG8O46He2cjhs567yqaZy7d5CMeDH/sqnriw="; }; postPatch = '' @@ -37,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycryptodome + pydantic pyyaml requests ]; @@ -47,7 +48,6 @@ buildPythonPackage rec { pytestCheckHook requests-mock responses - pydantic ]; pythonImportsCheck = [ From a6346f68da8159fcdde507b47de1a7170e90b6ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 13:04:35 +0100 Subject: [PATCH 277/338] python311Packages.aio-geojson-geonetnz-volcano: remove asynctest --- .../aio-geojson-geonetnz-volcano/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 3ba2b430801e..618735527ae8 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -2,9 +2,10 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest +, mock , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytestCheckHook , pytz @@ -21,10 +22,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; }; + patches = [ + # Remove asynctest, https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/pull/18 + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/commit/d04a488130375c78efa541fd63a5d88bd6b0fd49.patch"; + hash = "sha256-ArG8CovJckzzNebd03WeU5i/jPqy2HRVBL3ICk5nZ5Y="; + }) + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -33,7 +43,7 @@ buildPythonPackage rec { checkInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -45,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From d82e054c13ab6776e518b2e18446fac85a95607a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Jan 2023 07:41:10 +0100 Subject: [PATCH 278/338] =?UTF-8?q?ocamlPackages.mirage-nat:=202.2.5=20?= =?UTF-8?q?=E2=86=92=203.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/mirage-nat/default.nix | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix index 1e51093654d8..0fdc6d4fa95a 100644 --- a/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -1,38 +1,29 @@ { lib, buildDunePackage, fetchurl -, ipaddr, cstruct, lwt, logs, lru -, tcpip, ethernet, stdlib-shims +, ipaddr, cstruct, logs, lru +, tcpip, ethernet , alcotest, mirage-clock-unix -, ppxlib, ppx_deriving }: buildDunePackage rec { pname = "mirage-nat"; - version = "2.2.5"; + version = "3.0.1"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - # due to cstruct - useDune2 = true; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "01xp0z4mywhawz7rxizi9ph342mqqwyfa5hqgvs8lhqzcym5d104"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-wReySOMulGkrPD60XxpgMrUoHzY9hQ7TZzYQyJ3eiik="; }; - buildInputs = [ - ppxlib - ]; - propagatedBuildInputs = [ ipaddr cstruct - lwt logs lru tcpip ethernet - stdlib-shims - ppx_deriving ]; doCheck = true; From 53e0df13906bc281195235d2295fed7e048d41b4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Jan 2023 07:41:15 +0100 Subject: [PATCH 279/338] ocamlPackages.tcpip: use Dune 3 --- pkgs/development/ocaml-modules/tcpip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index c29dd7d81c35..a388bea4e867 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { pname = "tcpip"; version = "7.1.2"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; From dcf9def93303590ac5d9dfb63b5425125eb94c93 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Jan 2023 07:41:19 +0100 Subject: [PATCH 280/338] ocamlPackages.arp: use Dune 3 --- pkgs/development/ocaml-modules/arp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/arp/default.nix b/pkgs/development/ocaml-modules/arp/default.nix index 20c9c64f6505..cdf657ea72e1 100644 --- a/pkgs/development/ocaml-modules/arp/default.nix +++ b/pkgs/development/ocaml-modules/arp/default.nix @@ -15,8 +15,8 @@ buildDunePackage rec { sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn"; }; - minimumOCamlVersion = "4.06"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; nativeBuildInputs = [ bisect_ppx From b5767c98717d4f44f7c1e2cf5ea311d07165e8e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Dec 2022 22:33:05 +0100 Subject: [PATCH 281/338] python310Packages.asyncio-mqtt: 0.14.0 -> 0.16.1 Diff: https://github.com/sbtinstruments/asyncio-mqtt/compare/refs/tags/v0.14.0...v0.16.1 Changelog: https://github.com/sbtinstruments/asyncio-mqtt/blob/v0.16.1/CHANGELOG.md --- .../python-modules/asyncio_mqtt/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index e76eec4dcf55..448ec3eca2ae 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -49,17 +49,17 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_client_filtered_messages" - "test_client_unfiltered_messages" - "test_client_unsubscribe" - "test_client_will" - "test_client_tls_context" - "test_client_tls_params" - "test_client_username_password " "test_client_logger" "test_client_max_concurrent_outgoing_calls" - "test_client_websockets" - "test_client_pending_calls_threshold" "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" + "test_client_pending_calls_threshold" + "test_client_tls_context" + "test_client_tls_params" + "test_client_unfiltered_messages" + "test_client_unsubscribe" + "test_client_username_password " + "test_client_websockets" + "test_client_will" "test_multiple_messages_generators" ]; @@ -67,7 +67,7 @@ buildPythonPackage rec { description = "Idomatic asyncio wrapper around paho-mqtt"; homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; license = licenses.bsd3; - changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/master/CHANGELOG.md"; + changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ hexa ]; }; } From 1f6f9d95c6bbd51f8f442d13c1addf35b2754481 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 20 Jan 2023 01:40:29 +0100 Subject: [PATCH 282/338] matrix-conduit: 0.4.0 -> 0.5.0 --- .../cargo-11192-workaround.patch | 259 ++++++++++++++++++ pkgs/servers/matrix-conduit/default.nix | 15 +- 2 files changed, 271 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/matrix-conduit/cargo-11192-workaround.patch diff --git a/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch b/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch new file mode 100644 index 000000000000..1a71b210dec8 --- /dev/null +++ b/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch @@ -0,0 +1,259 @@ +diff --git ruma-appservice-api/Cargo.toml ruma-appservice-api/Cargo.toml +index b48852c8..8641bc42 100644 +--- ruma-appservice-api/Cargo.toml ++++ ruma-appservice-api/Cargo.toml +@@ -23,11 +23,11 @@ unstable-msc2409 = [] + unstable-msc3202 = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } + + [dev-dependencies] +-assert_matches = { workspace = true } ++assert_matches = { version = "1.5.0" } + serde_yaml = "0.9.14" +diff --git ruma-client-api/Cargo.toml ruma-client-api/Cargo.toml +index ddd2e44b..5756c055 100644 +--- ruma-client-api/Cargo.toml ++++ ruma-client-api/Cargo.toml +@@ -31,16 +31,16 @@ client = [] + server = [] + + [dependencies] +-assign = { workspace = true } ++assign = { version = "1.1.1" } + bytes = "1.0.1" +-http = { workspace = true } +-js_int = { workspace = true, features = ["serde"] } ++http = { version = "0.2.8" } ++js_int = { version = "0.2.2", features = ["serde"] } + js_option = "0.1.1" +-maplit = { workspace = true } ++maplit = { version = "1.0.2" } + percent-encoding = "2.1.0" + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } + + [dev-dependencies] +-assert_matches = { workspace = true } ++assert_matches = { version = "1.5.0" } +diff --git ruma-common/Cargo.toml ruma-common/Cargo.toml +index 83f22461..4ba11cfb 100644 +--- ruma-common/Cargo.toml ++++ ruma-common/Cargo.toml +@@ -48,15 +48,15 @@ unstable-sanitize = ["dep:html5ever", "dep:phf"] + unstable-unspecified = [] + + [dependencies] +-base64 = { workspace = true } ++base64 = { version = "0.20.0" } + bytes = "1.0.1" + form_urlencoded = "1.0.0" + getrandom = { version = "0.2.6", optional = true } + html5ever = { version = "0.25.2", optional = true } +-http = { workspace = true, optional = true } ++http = { version = "0.2.8", optional = true } + indexmap = { version = "1.9.1", features = ["serde"] } + itoa = "1.0.1" +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + js_option = "0.1.0" + konst = { version = "0.2.19", features = ["rust_1_64", "alloc"] } + percent-encoding = "2.1.0" +@@ -66,25 +66,25 @@ rand = { version = "0.8.3", optional = true } + regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] } + ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false } + ruma-macros = { version = "0.10.5", path = "../ruma-macros" } +-serde = { workspace = true } +-serde_json = { workspace = true, features = ["raw_value"] } +-thiserror = { workspace = true } +-tracing = { workspace = true, features = ["attributes"] } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87", features = ["raw_value"] } ++thiserror = { version = "1.0.37" } ++tracing = { version = "0.1.37", default-features = false, features = ["std", "attributes"] } + url = "2.2.2" + uuid = { version = "1.0.0", optional = true, features = ["v4"] } + wildmatch = "2.0.0" + + # dev-dependencies can't be optional, so this is a regular dependency +-criterion = { workspace = true, optional = true } ++criterion = { version = "0.4.0", optional = true } + + [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] + js-sys = { version = "0.3", optional = true } + + [dev-dependencies] +-assert_matches = { workspace = true } +-assign = { workspace = true } +-http = { workspace = true } +-maplit = { workspace = true } ++assert_matches = { version = "1.5.0" } ++assign = { version = "1.1.1" } ++http = { version = "0.2.8" } ++maplit = { version = "1.0.2" } + trybuild = "1.0.71" + + [[bench]] +diff --git ruma-federation-api/Cargo.toml ruma-federation-api/Cargo.toml +index 380d1ed3..a4508a80 100644 +--- ruma-federation-api/Cargo.toml ++++ ruma-federation-api/Cargo.toml +@@ -26,11 +26,11 @@ unstable-msc3723 = [] + unstable-unspecified = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } + + [dev-dependencies] +-assert_matches = { workspace = true } +-http = { workspace = true } ++assert_matches = { version = "1.5.0" } ++http = { version = "0.2.8" } +diff --git ruma-identifiers-validation/Cargo.toml ruma-identifiers-validation/Cargo.toml +index cd79ba78..28a9cd9e 100644 +--- ruma-identifiers-validation/Cargo.toml ++++ ruma-identifiers-validation/Cargo.toml +@@ -15,5 +15,5 @@ all-features = true + compat = [] + + [dependencies] +-js_int = { workspace = true } +-thiserror = { workspace = true } ++js_int = { version = "0.2.2" } ++thiserror = { version = "1.0.37" } +diff --git ruma-identity-service-api/Cargo.toml ruma-identity-service-api/Cargo.toml +index 9dd4bc14..6edf1170 100644 +--- ruma-identity-service-api/Cargo.toml ++++ ruma-identity-service-api/Cargo.toml +@@ -19,9 +19,9 @@ client = [] + server = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api"] } +-serde = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } + + [dev-dependencies] +-serde_json = { workspace = true } ++serde_json = { version = "1.0.87" } +diff --git ruma-macros/Cargo.toml ruma-macros/Cargo.toml +index 70a6a7a6..e86c0631 100644 +--- ruma-macros/Cargo.toml ++++ ruma-macros/Cargo.toml +@@ -23,6 +23,6 @@ proc-macro-crate = "1.0.0" + proc-macro2 = "1.0.24" + quote = "1.0.8" + ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false } +-serde = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } + syn = { version = "1.0.57", features = ["extra-traits", "full", "visit"] } + toml = "0.5.9" +diff --git ruma-push-gateway-api/Cargo.toml ruma-push-gateway-api/Cargo.toml +index 5d589828..e08144ce 100644 +--- ruma-push-gateway-api/Cargo.toml ++++ ruma-push-gateway-api/Cargo.toml +@@ -20,7 +20,7 @@ client = [] + server = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } +diff --git ruma-signatures/Cargo.toml ruma-signatures/Cargo.toml +index dd1c9951..d06bffd9 100644 +--- ruma-signatures/Cargo.toml ++++ ruma-signatures/Cargo.toml +@@ -18,16 +18,16 @@ ring-compat = ["dep:subslice"] + unstable-exhaustive-types = [] + + [dependencies] +-base64 = { workspace = true } ++base64 = { version = "0.20.0" } + ed25519-dalek = "1.0.1" + pkcs8 = { version = "0.9.0", features = ["alloc"] } + # because dalek uses an older version of rand_core + rand = { version = "0.7", features = ["getrandom"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["canonical-json"] } +-serde_json = { workspace = true } ++serde_json = { version = "1.0.87" } + sha2 = "0.9.5" + subslice = { version = "0.2.3", optional = true } +-thiserror = { workspace = true } ++thiserror = { version = "1.0.37" } + + [dev-dependencies] +-assert_matches = { workspace = true } ++assert_matches = { version = "1.5.0" } +diff --git ruma-state-res/Cargo.toml ruma-state-res/Cargo.toml +index d23556f1..ec6088bc 100644 +--- ruma-state-res/Cargo.toml ++++ ruma-state-res/Cargo.toml +@@ -19,18 +19,18 @@ unstable-exhaustive-types = [] + + [dependencies] + itertools = "0.10.0" +-js_int = { workspace = true } ++js_int = { version = "0.2.2" } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } +-thiserror = { workspace = true } +-tracing = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } ++thiserror = { version = "1.0.37" } ++tracing = { version = "0.1.37", default-features = false, features = ["std"] } + + # dev-dependencies can't be optional, so this is a regular dependency +-criterion = { workspace = true, optional = true } ++criterion = { version = "0.4.0", optional = true } + + [dev-dependencies] +-maplit = { workspace = true } ++maplit = { version = "1.0.2" } + rand = "0.8.3" + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["unstable-pdu"] } + tracing-subscriber = "0.3.16" +diff --git ruma/Cargo.toml ruma/Cargo.toml +index 0b62cff1..05ce9990 100644 +--- ruma/Cargo.toml ++++ ruma/Cargo.toml +@@ -191,8 +191,8 @@ __ci = [ + ] + + [dependencies] +-assign = { workspace = true } +-js_int = { workspace = true } ++assign = { version = "1.1.1" } ++js_int = { version = "0.2.2" } + js_option = "0.1.1" + + ruma-common = { version = "0.10.5", path = "../ruma-common" } +@@ -208,4 +208,4 @@ ruma-identity-service-api = { version = "0.6.0", path = "../ruma-identity-servic + ruma-push-gateway-api = { version = "0.6.0", path = "../ruma-push-gateway-api", optional = true } + + [dev-dependencies] +-serde = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index 20de61bbc834..bcf47813e92d 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -2,16 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; rev = "v${version}"; - sha256 = "sha256-QTXDIvGz12ZxsWmPiMiJ8mBUWoJ2wnaeTZdXcwBh35o="; + sha256 = "sha256-GSCpmn6XRbmnfH31R9c6QW3/pez9KHPjI99dR+ln0P4="; }; - cargoSha256 = "sha256-vE44I8lQ5VAfZB4WKLRv/xudoZJaFJGTT/UuumTePBU="; + # https://github.com/rust-lang/cargo/issues/11192 + # https://github.com/ruma/ruma/issues/1441 + postPatch = '' + pushd $cargoDepsCopy + patch -p0 < ${./cargo-11192-workaround.patch} + for p in ruma*; do echo '{"files":{},"package":null}' > $p/.cargo-checksum.json; done + popd + ''; + + cargoSha256 = "sha256-WFoupcuaG7f7KYBn/uzbOzlHHLurOyvm5e1lEcinxC8="; nativeBuildInputs = [ rustPlatform.bindgenHook From aeea71595ea439c22a50b731f5a51d35b97dd868 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 20 Jan 2023 01:40:48 +0100 Subject: [PATCH 283/338] matrix-conduit: link against system rocksdb --- pkgs/servers/matrix-conduit/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index bcf47813e92d..5f8fe6a2cc20 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitLab, stdenv, darwin, nixosTests }: +{ lib, rustPlatform, fetchFromGitLab, stdenv, darwin, nixosTests, rocksdb_6_23 }: rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; @@ -30,6 +30,9 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + ROCKSDB_INCLUDE_DIR = "${rocksdb_6_23}/include"; + ROCKSDB_LIB_DIR = "${rocksdb_6_23}/lib"; + # tests failed on x86_64-darwin with SIGILL: illegal instruction doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); From 775589f43dedf01e7a32ff960bd1d0e990b55c81 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 13:48:18 +0100 Subject: [PATCH 284/338] python310Packages.cupy: fix lint issue --- pkgs/development/python-modules/cupy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index b739ae865473..eca5cb6e87ab 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -18,7 +18,7 @@ let in buildPythonPackage rec { pname = "cupy"; version = "11.5.0"; - + disabled = pythonOlder "3.7"; src = fetchPypi { From cfaedf6c3bd4156be3ab775faaad1585c455b7e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 13:15:34 +0000 Subject: [PATCH 285/338] changelogger: 0.5.3 -> 0.6.0 --- pkgs/tools/misc/changelogger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/changelogger/default.nix b/pkgs/tools/misc/changelogger/default.nix index c659aa543595..ce7a37c7cc1a 100644 --- a/pkgs/tools/misc/changelogger/default.nix +++ b/pkgs/tools/misc/changelogger/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changelogger"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AP5cuXAuh5LX6FTsku38Zh1Y4SVaa4l5XEBTMZnYr6g="; + sha256 = "sha256-g3d4BEVMQGBEKx+YVPjPrypWQNtEun/pSRgAsJY/RT4="; }; - vendorSha256 = "sha256-RmLSuLZdYpA557xN7fkPZm5ektxvRHil1E2u1qR7EO0="; + vendorHash = "sha256-E6J+0tZriskBnXdhQOQA240c3z+laXM5honoREjHPfM="; ldflags = [ "-s" From bee40cfe26cdcc52aef9ec7718168e131eef1435 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 22 Jan 2023 12:42:56 +0000 Subject: [PATCH 286/338] all-packages: never inherit libiconv from darwin libiconv and darwin.libiconv are the same thing on Darwin, but using darwin.libiconv means that packages will necessarily not be correct for other platforms where we don't include libiconv in libc, like FreeBSD. --- pkgs/top-level/all-packages.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35cf53a41a4d..819c43791048 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2087,9 +2087,7 @@ with pkgs; description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - mednafen = callPackage ../applications/emulators/mednafen { - inherit (darwin) libiconv; - }; + mednafen = callPackage ../applications/emulators/mednafen { }; mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; @@ -5318,7 +5316,6 @@ with pkgs; procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs { inherit (darwin.apple_sdk_11_0.frameworks) Security; inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin) libiconv; }; procyon = callPackage ../tools/misc/procyon { }; @@ -15620,7 +15617,6 @@ with pkgs; }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; }; @@ -16537,7 +16533,7 @@ with pkgs; rbenv = callPackage ../development/ruby-modules/rbenv { }; inherit (callPackage ../development/interpreters/ruby { - inherit (darwin) libiconv libobjc libunwind; + inherit (darwin) libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; }) mkRubyVersion @@ -20695,7 +20691,6 @@ with pkgs; libdeltachat = callPackage ../development/libraries/libdeltachat { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - inherit (darwin) libiconv; }; libdevil = callPackage ../development/libraries/libdevil { @@ -21744,7 +21739,6 @@ with pkgs; libxml2 = callPackage ../development/libraries/libxml2 { python = python3; - inherit (darwin) libiconv; }; libxml2Python = let @@ -29176,9 +29170,7 @@ with pkgs; wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { - inherit (darwin) libiconv; - }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; @@ -31094,7 +31086,6 @@ with pkgs; jujutsu = callPackage ../applications/version-management/jujutsu { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - inherit (darwin) libiconv; }; nbstripout = callPackage ../applications/version-management/nbstripout { }; @@ -34990,7 +34981,6 @@ with pkgs; moon-buggy = callPackage ../games/moon-buggy { }; inherit (callPackages ../games/minetest { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) minetestclient_5 minetestserver_5; From a85049edc0b8de7149166478f493247bbf38aac0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Jan 2023 04:20:00 +0000 Subject: [PATCH 287/338] zsv: 0.3.4-alpha -> 0.3.5-alpha https://github.com/liquidaty/zsv/releases/tag/v0.3.5-alpha --- pkgs/development/tools/zsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix index d5f188f80b68..639b9bcb4b26 100644 --- a/pkgs/development/tools/zsv/default.nix +++ b/pkgs/development/tools/zsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsv"; - version = "0.3.4-alpha"; + version = "0.3.5-alpha"; src = fetchFromGitHub { owner = "liquidaty"; repo = "zsv"; rev = "v${version}"; - sha256 = "sha256-3drVqKRs5bjkvQiHyEANI5geeF5g7ba2+RxmAhxbu84="; + hash = "sha256-HW/w2bJVnTELh36rUfGIzAsc6e+PTBGsAdHDz7gFAdI="; }; nativeBuildInputs = [ perl ]; From 3bf0cf2965b3c833c4db5366bb405a8149a2f795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 14:14:17 +0000 Subject: [PATCH 288/338] argocd: 2.5.6 -> 2.5.7 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index aaa07c0af804..034af9a07e5b 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-R00HW4jh6zohMoli9aomPCK/svzWSUi9fcRFvevMhyU="; + sha256 = "sha256-hEfPiDbEdmuD/IHM9Tfy0kUkKDpbTZ0HzMjIt/ifcPk="; }; proxyVendor = true; # darwin/linux hash mismatch From a7034be1bbde519d1bf12bc11a5900f3166b11c1 Mon Sep 17 00:00:00 2001 From: Budiman Jojo Date: Sun, 22 Jan 2023 20:34:05 +0700 Subject: [PATCH 289/338] wlroots_0_16: 0.16.0 -> 0.16.1 --- pkgs/development/libraries/wlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 761e97784013..9d03d193d81c 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -121,8 +121,8 @@ rec { }; wlroots_0_16 = generic { - version = "0.16.0"; - hash = "sha256-k7BFx1xvvsdCXNWX0XeZYwv8H/myk4p42i2Y6vjILqM="; + version = "0.16.1"; + hash = "sha256-UyPN7zmytre4emwx/ztZ4JefXHwixPV6UEEqnhSLbIY="; extraBuildInputs = [ vulkan-loader ]; extraNativeBuildInputs = [ glslang ]; extraPatch = '' From c39291b0b428715b6afba7d98e291257e976cc7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 14:33:42 +0000 Subject: [PATCH 290/338] autorestic: 1.7.4 -> 1.7.5 --- pkgs/tools/backup/autorestic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index fdd59a4713be..7bc9805117b9 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yg/R3f84nSLrfHA20Jtq28ldSK/y4c7rVm4GN4+DlDY="; + sha256 = "sha256-gf2sqMI8dG7+sVSqe2f5oG7vqQ9UDKAqPUS+MPVB7SI="; }; - vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; + vendorHash = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; nativeBuildInputs = [ installShellFiles ]; From 630b4c3a38d3dd092fcffbafa0456b8f632a8e5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:06:59 +0100 Subject: [PATCH 291/338] python310Packages.aiojobs: fix build - add changelog to meta --- .../python-modules/aiojobs/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 937ff406ed74..38f31bbaf259 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -1,33 +1,40 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub -, pythonOlder -, aiohttp -, pytestCheckHook , pytest-aiohttp -, pygments +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiojobs"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; + hash = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=aiojobs/ --cov=tests/" "" + ''; + nativeBuildInputs = [ - pygments + setuptools ]; propagatedBuildInputs = [ aiohttp + async-timeout ]; checkInputs = [ @@ -42,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jobs scheduler for managing background task (asyncio)"; homepage = "https://github.com/aio-libs/aiojobs"; + changelog = "https://github.com/aio-libs/aiojobs/blob/v${version}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; From df09c21fb262ed07f01099625ef9310a8a8392ae Mon Sep 17 00:00:00 2001 From: pennae Date: Sun, 15 Jan 2023 14:56:46 +0100 Subject: [PATCH 292/338] nixos/documentation: deprecate docbook option docs following the plan in https://github.com/NixOS/nixpkgs/pull/189318#discussion_r961764451 also adds an activation script to print the warning during activation instead of during build, otherwise folks using the new CLI that hides build logs by default might never see the warning. --- nixos/doc/manual/default.nix | 2 +- .../from_md/release-notes/rl-2305.section.xml | 16 ++++++++ .../manual/release-notes/rl-2305.section.md | 4 ++ nixos/lib/make-options-doc/default.nix | 11 ++++- nixos/lib/make-options-doc/mergeJSON.py | 40 ++++++++++++------- nixos/lib/testing/testScript.nix | 2 +- nixos/modules/misc/documentation.nix | 8 ++++ 7 files changed, 66 insertions(+), 17 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 9b72e840f4b1..a89e5e466500 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -209,7 +209,7 @@ let in rec { inherit generatedSources; - inherit (optionsDoc) optionsJSON optionsNix optionsDocBook; + inherit (optionsDoc) optionsJSON optionsNix optionsDocBook optionsUsedDocbook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index d5afcac8556d..17769ff0b45b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -416,6 +416,22 @@ sudo and sources the environment variables. + + + DocBook option documentation, which has been deprecated since + 22.11, will now cause a warning when documentation is built. + Out-of-tree modules should migrate to using CommonMark + documentation as outlined in + to silence this + warning. + + + DocBook option documentation support will be removed in the + next release and CommonMark will become the default. DocBook + option documentation that has not been migrated until then + will no longer render properly or cause errors. + + The dnsmasq service now takes configuration diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 74e048beb245..d4b31a9df1b8 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -101,6 +101,10 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. +- DocBook option documentation, which has been deprecated since 22.11, will now cause a warning when documentation is built. Out-of-tree modules should migrate to using CommonMark documentation as outlined in [](#sec-option-declarations) to silence this warning. + + DocBook option documentation support will be removed in the next release and CommonMark will become the default. DocBook option documentation that has not been migrated until then will no longer render properly or cause errors. + - The `dnsmasq` service now takes configuration via the `services.dnsmasq.settings` attribute set. The option `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index e2ed7bb71885..7595b66771a5 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -139,9 +139,10 @@ in rec { dst=$out/share/doc/nixos mkdir -p $dst + TOUCH_IF_DB=$dst/.used-docbook \ python ${./mergeJSON.py} \ ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ - ${lib.optionalString (! allowDocBook) "--error-on-docbook"} \ + ${if allowDocBook then "--warn-on-docbook" else "--error-on-docbook"} \ ${lib.optionalString markdownByDefault "--markdown-by-default"} \ $baseJSON $options \ > $dst/options.json @@ -153,6 +154,14 @@ in rec { echo "file json-br $dst/options.json.br" >> $out/nix-support/hydra-build-products ''; + optionsUsedDocbook = pkgs.runCommand "options-used-docbook" {} '' + if [ -e ${optionsJSON}/share/doc/nixos/.used-docbook ]; then + echo 1 + else + echo 0 + fi >"$out" + ''; + # Convert options.json into an XML file. # The actual generation of the xml file is done in nix purely for the convenience # of not having to generate the xml some other way diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index c4f490fc2ad8..3108b9e2197f 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -228,6 +228,7 @@ def convertMD(options: Dict[str, Any]) -> str: return options warningsAreErrors = False +warnOnDocbook = False errorOnDocbook = False markdownByDefault = False optOffset = 0 @@ -235,7 +236,10 @@ for arg in sys.argv[1:]: if arg == "--warnings-are-errors": optOffset += 1 warningsAreErrors = True - if arg == "--error-on-docbook": + if arg == "--warn-on-docbook": + optOffset += 1 + warnOnDocbook = True + elif arg == "--error-on-docbook": optOffset += 1 errorOnDocbook = True if arg == "--markdown-by-default": @@ -278,26 +282,27 @@ def is_docbook(o, key): # check that every option has a description hasWarnings = False hasErrors = False -hasDocBookErrors = False +hasDocBook = False for (k, v) in options.items(): - if errorOnDocbook: + if warnOnDocbook or errorOnDocbook: + kind = "error" if errorOnDocbook else "warning" if isinstance(v.value.get('description', {}), str): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} description uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} description uses DocBook\x1b[0m", file=sys.stderr) elif is_docbook(v.value, 'defaultText'): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} default uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} default uses DocBook\x1b[0m", file=sys.stderr) elif is_docbook(v.value, 'example'): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} example uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} example uses DocBook\x1b[0m", file=sys.stderr) if v.value.get('description', None) is None: @@ -310,10 +315,14 @@ for (k, v) in options.items(): f"\x1b[1;31m{severity}: option {v.name} has no type. Please specify a valid type, see " + "https://nixos.org/manual/nixos/stable/index.html#sec-option-types\x1b[0m", file=sys.stderr) -if hasDocBookErrors: +if hasDocBook: + (why, what) = ( + ("disallowed for in-tree modules", "contribution") if errorOnDocbook + else ("deprecated for option documentation", "module") + ) print("Explanation: The documentation contains descriptions, examples, or defaults written in DocBook. " + "NixOS is in the process of migrating from DocBook to Markdown, and " + - "DocBook is disallowed for in-tree modules. To change your contribution to "+ + f"DocBook is {why}. To change your {what} to "+ "use Markdown, apply mdDoc and literalMD and use the *MD variants of option creation " + "functions where they are available. For example:\n" + "\n" + @@ -326,6 +335,9 @@ if hasDocBookErrors: " example.package = mkPackageOptionMD pkgs \"your-package\" {};\n" + " imports = [ (mkAliasOptionModuleMD [ \"example\" \"args\" ] [ \"example\" \"settings\" ]) ];", file = sys.stderr) + with open(os.getenv('TOUCH_IF_DB'), 'x'): + # just make sure it exists + pass if hasErrors: sys.exit(1) diff --git a/nixos/lib/testing/testScript.nix b/nixos/lib/testing/testScript.nix index 5d4181c5f5dd..5c36d754d79d 100644 --- a/nixos/lib/testing/testScript.nix +++ b/nixos/lib/testing/testScript.nix @@ -7,7 +7,7 @@ in options = { testScript = mkOption { type = either str (functionTo str); - description = '' + description = mdDoc '' A series of python declarations and statements that you write to perform the test. ''; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index e44a9899772f..ecc40ad6adef 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -357,6 +357,14 @@ in (mkIf cfg.nixos.enable { system.build.manual = manual; + system.activationScripts.check-manual-docbook = '' + if [[ $(cat ${manual.optionsUsedDocbook}) = 1 ]]; then + echo -e "\e[31;1mwarning\e[0m: This configuration contains option documentation in docbook." \ + "Support for docbook is deprecated and will be removed after NixOS 23.05." \ + "See nix-store --read-log ${builtins.unsafeDiscardStringContext manual.optionsJSON.drvPath}" + fi + ''; + environment.systemPackages = [] ++ optional cfg.man.enable manual.manpages ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ]; From ad8d5cf731e7d0b2d0cca148fa01b805c4f5d3a3 Mon Sep 17 00:00:00 2001 From: pennae Date: Sun, 15 Jan 2023 15:05:30 +0100 Subject: [PATCH 293/338] nixos/manual: clarify mk{Enable,Package}Option MD usage the examples were incorrect, but not catastrophically. running a docs build would've issued a warning with the correct instructions. --- nixos/doc/manual/development/option-declarations.section.md | 6 +++--- .../from_md/development/option-declarations.section.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index aa747f47c9c8..18ec7ba903a9 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -78,7 +78,7 @@ For example: ::: {#ex-options-declarations-util-mkEnableOption-magic .example} ```nix -lib.mkEnableOption "magic" +lib.mkEnableOption (lib.mdDoc "magic") # is like lib.mkOption { type = lib.types.bool; @@ -113,7 +113,7 @@ Examples: ::: {#ex-options-declarations-util-mkPackageOption-hello .example} ```nix -lib.mkPackageOption pkgs "hello" { } +lib.mkPackageOptionMD pkgs "hello" { } # is like lib.mkOption { type = lib.types.package; @@ -125,7 +125,7 @@ lib.mkOption { ::: {#ex-options-declarations-util-mkPackageOption-ghc .example} ```nix -lib.mkPackageOption pkgs "GHC" { +lib.mkPackageOptionMD pkgs "GHC" { default = [ "ghc" ]; example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index cc4893939c28..af05e61363e4 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -128,7 +128,7 @@ options = { -lib.mkEnableOption "magic" +lib.mkEnableOption (lib.mdDoc "magic") # is like lib.mkOption { type = lib.types.bool; @@ -188,7 +188,7 @@ mkPackageOption pkgs "name" { default = [ "path" "in&qu -lib.mkPackageOption pkgs "hello" { } +lib.mkPackageOptionMD pkgs "hello" { } # is like lib.mkOption { type = lib.types.package; @@ -199,7 +199,7 @@ lib.mkOption { -lib.mkPackageOption pkgs "GHC" { +lib.mkPackageOptionMD pkgs "GHC" { default = [ "ghc" ]; example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } From 0c73df84905b7ef6637fc96a4309026950359e60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 16:13:15 +0000 Subject: [PATCH 294/338] python310Packages.findpython: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/findpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index ba48651227ba..2c8c0b616bb7 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.2.2"; + version = "0.2.3"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-gFV5YcBM8cjEukyjrHz3bsJ/qSeIpq9Cy3AeNFDElDA="; + hash = "sha256-wmWo/p/QVzYDHu1uWK1VUWNO8IGaocHkX6NTDltqRlY="; }; nativeBuildInputs = [ From 265d6b7784a00a7cf6418b056b9709720895da3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:16:35 +0100 Subject: [PATCH 295/338] gitleaks: 8.15.2 -> 8.15.3 Diff: https://github.com/zricethezav/gitleaks/compare/v8.15.2...v8.15.3 Changelog: https://github.com/zricethezav/gitleaks/releases/tag/v8.15.3 --- pkgs/tools/security/gitleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 607920e03082..adae9873010e 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.15.2"; + version = "8.15.3"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - hash = "sha256-3hDAkKuKBp3Q61rDWXy4NWgOteSQAjcdom0GzM35hlc="; + hash = "sha256-eY4RqXDeEsriSdVtEQQKw3NPBOe/UzhXjh1TkW3fWp0="; }; vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; From 551e069fbe682aebe971f9a14ca0d6014127fc34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:23:18 +0100 Subject: [PATCH 296/338] python310Packages.appthreat-vulnerability-db: 4.3.0 -> 4.3.1 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v4.3.0...v4.3.1 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v4.3.1 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 855269739a44..3fbd115edd4f 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "4.3.0"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-1WBaNTARe0ULWHf0g/6Jljo1yCffnJAS9ycbhGqzOUk="; + hash = "sha256-HZHHSY8a7xyJZAQLFeZ+5+CKixcquJcUkkjJTllFiyk="; }; propagatedBuildInputs = [ From 31833f54a733d706293400f4a11bd64012e2ca49 Mon Sep 17 00:00:00 2001 From: Xavier Lambein Date: Thu, 19 Jan 2023 20:34:33 +0100 Subject: [PATCH 297/338] maintainers: add xlambein --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6900d420a14f..61096b5981ce 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15420,6 +15420,12 @@ githubId = 17534323; name = "Quentin Vaucher"; }; + xlambein = { + email = "xlambein@gmail.com"; + github = "xlambein"; + githubId = 5629059; + name = "Xavier Lambein"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; From 3f3524a4473d9f0502a45d8bb10e59ef587e2230 Mon Sep 17 00:00:00 2001 From: Xavier Lambein Date: Thu, 19 Jan 2023 20:35:45 +0100 Subject: [PATCH 298/338] nixos/autosuspend: init at version 4.3.0 `autosuspend` is a daemon that periodically runs user-defined checks to verify whether the system should be suspended. It's already available in nixpkgs. This adds a NixOS module which starts the daemon as a systemd service. Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> --- .../from_md/release-notes/rl-2305.section.xml | 7 + .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/autosuspend.nix | 230 ++++++++++++++++++ 4 files changed, 240 insertions(+) create mode 100644 nixos/modules/services/misc/autosuspend.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 17769ff0b45b..8e9a81f3499a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -130,6 +130,13 @@ services.photoprism. + + + autosuspend, + a python daemon that suspends a system if certain conditions + are met, or not met. + +
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index d4b31a9df1b8..845f9037e722 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -42,6 +42,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [photoprism](https://photoprism.app/), a AI-Powered Photos App for the Decentralized Web. Available as [services.photoprism](options.html#opt-services.photoprism.enable). +- [autosuspend](https://github.com/languitar/autosuspend), a python daemon that suspends a system if certain conditions are met, or not met. + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 45a7acdedc41..e1c174a00f99 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -571,6 +571,7 @@ ./services/misc/atuin.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix + ./services/misc/autosuspend.nix ./services/misc/bazarr.nix ./services/misc/beanstalkd.nix ./services/misc/bees.nix diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix new file mode 100644 index 000000000000..b3e362533a09 --- /dev/null +++ b/nixos/modules/services/misc/autosuspend.nix @@ -0,0 +1,230 @@ +{ config, pkgs, lib, ... }: +let + inherit (lib) mapAttrs' nameValuePair filterAttrs types mkEnableOption + mdDoc mkPackageOptionMD mkOption literalExpression mkIf flatten + maintainers attrValues; + + cfg = config.services.autosuspend; + + settingsFormat = pkgs.formats.ini { }; + + checks = + mapAttrs' + (n: v: nameValuePair "check.${n}" (filterAttrs (_: v: v != null) v)) + cfg.checks; + wakeups = + mapAttrs' + (n: v: nameValuePair "wakeup.${n}" (filterAttrs (_: v: v != null) v)) + cfg.wakeups; + + # Whether the given check is enabled + hasCheck = class: + (filterAttrs + (n: v: v.enabled && (if v.class == null then n else v.class) == class) + cfg.checks) + != { }; + + # Dependencies needed by specific checks + dependenciesForChecks = { + "Smb" = pkgs.samba; + "XIdleTime" = [ pkgs.xprintidle pkgs.sudo ]; + }; + + autosuspend-conf = + settingsFormat.generate "autosuspend.conf" ({ general = cfg.settings; } // checks // wakeups); + + autosuspend = cfg.package; + + checkType = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options.enabled = mkEnableOption (mdDoc "this activity check") // { default = true; }; + + options.class = mkOption { + default = null; + type = with types; nullOr (enum [ + "ActiveCalendarEvent" + "ActiveConnection" + "ExternalCommand" + "JsonPath" + "Kodi" + "KodiIdleTime" + "LastLogActivity" + "Load" + "LogindSessionsIdle" + "Mpd" + "NetworkBandwidth" + "Ping" + "Processes" + "Smb" + "Users" + "XIdleTime" + "XPath" + ]); + description = mdDoc '' + Name of the class implementing the check. If this option is not specified, the check's + name must represent a valid internal check class. + ''; + }; + }; + + wakeupType = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options.enabled = mkEnableOption (mdDoc "this wake-up check") // { default = true; }; + + options.class = mkOption { + default = null; + type = with types; nullOr (enum [ + "Calendar" + "Command" + "File" + "Periodic" + "SystemdTimer" + "XPath" + "XPathDelta" + ]); + description = mdDoc '' + Name of the class implementing the check. If this option is not specified, the check's + name must represent a valid internal check class. + ''; + }; + }; +in +{ + options = { + services.autosuspend = { + enable = mkEnableOption (mdDoc "the autosuspend daemon"); + + package = mkPackageOptionMD pkgs "autosuspend" { }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options = { + # Provide reasonable defaults for these two (required) options + suspend_cmd = mkOption { + default = "systemctl suspend"; + type = with types; str; + description = mdDoc '' + The command to execute in case the host shall be suspended. This line can contain + additional command line arguments to the command to execute. + ''; + }; + wakeup_cmd = mkOption { + default = ''sh -c 'echo 0 > /sys/class/rtc/rtc0/wakealarm && echo {timestamp:.0f} > /sys/class/rtc/rtc0/wakealarm' ''; + type = with types; str; + description = mdDoc '' + The command to execute for scheduling a wake up of the system. The given string is + processed using Python’s `str.format()` and a format argument called `timestamp` + encodes the UTC timestamp of the planned wake up time (float). Additionally `iso` + can be used to acquire the timestamp in ISO 8601 format. + ''; + }; + }; + }; + default = { }; + example = literalExpression '' + { + enable = true; + interval = 30; + idle_time = 120; + } + ''; + description = mdDoc '' + Configuration for autosuspend, see + + for supported values. + ''; + }; + + checks = mkOption { + default = { }; + type = with types; attrsOf checkType; + description = mdDoc '' + Checks for activity. For more information, see: + - + - + ''; + example = literalExpression '' + { + # Basic activity check configuration. + # The check class name is derived from the section header (Ping in this case). + # Remember to enable desired checks. They are disabled by default. + Ping = { + hosts = "192.168.0.7"; + }; + + # This check is disabled. + Smb.enabled = false; + + # Example for a custom check name. + # This will use the Users check with the custom name RemoteUsers. + # Custom names are necessary in case a check class is used multiple times. + # Custom names can also be used for clarification. + RemoteUsers = { + class = "Users"; + name = ".*"; + terminal = ".*"; + host = "[0-9].*"; + }; + + # Here the Users activity check is used again with different settings and a different name + LocalUsers = { + class = "Users"; + name = ".*"; + terminal = ".*"; + host = "localhost"; + }; + } + ''; + }; + + wakeups = mkOption { + default = { }; + type = with types; attrsOf wakeupType; + description = mdDoc '' + Checks for wake up. For more information, see: + - + - + ''; + example = literalExpression '' + { + # Wake up checks reuse the same configuration mechanism as activity checks. + Calendar = { + url = "http://example.org/test.ics"; + }; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.autosuspend = { + description = "A daemon to suspend your server in case of inactivity"; + documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks)); + serviceConfig = { + ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon''; + }; + }; + + systemd.services.autosuspend-detect-suspend = { + description = "Notifies autosuspend about suspension"; + documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; + wantedBy = [ "sleep.target" ]; + after = [ "sleep.target" ]; + serviceConfig = { + ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend''; + }; + }; + }; + + meta = { + maintainers = with maintainers; [ xlambein ]; + }; +} From ca81442a99ff2acc4a669cea3ff0555da83382e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:25:02 +0100 Subject: [PATCH 299/338] python310Packages.dvc-objects: add changelog to meta --- pkgs/development/python-modules/dvc-objects/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index ec02d79b3ab8..45f5eccbc4d2 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for DVC objects"; homepage = "https://github.com/iterative/dvc-objects"; + changelog = "https://github.com/iterative/dvc-objects/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From d37f257e6baf1621725f7e8b7f8d555a12d07a7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:26:17 +0100 Subject: [PATCH 300/338] python310Packages.dvc-objects: 0.14.0 -> 0.19.0 Diff: https://github.com/iterative/dvc-objects/compare/refs/tags/0.14.0...0.19.0 Changelog: https://github.com/iterative/dvc-objects/releases/tag/0.19.0 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 45f5eccbc4d2..8af21a696a5a 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.14.0"; + version = "0.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Refpekyr114mIGvbaAynxldA+s83EtALeLoTQO73b/M="; + hash = "sha256-jwjhRY1SMqiTZ5UJmoZb4odg3g8uC9ehPmxRU2VsH8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b84d40d5e1f59a619921e5d7ee7502cdb25e6ff2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 17:28:00 +0100 Subject: [PATCH 301/338] python310Packages.dvc-data: add changelog to meta --- pkgs/development/python-modules/dvc-data/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index db7a8fe62fc1..29a8d835b63d 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "DVC's data management subsystem"; homepage = "https://github.com/iterative/dvc-data"; + changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 0f25d9fc4364a0910d725191801538c06fc55f95 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 22 Jan 2023 15:02:57 +0000 Subject: [PATCH 302/338] Revert "pkgsMusl.socat: fix build" This reverts commit 7ecf7a3493c60f1c1f853f0393551447aa16a437. This is no longer necessary as of socat 1.7.4.4, and in fact breaks the build. Fixes: 497c7f26aaf ("socat: 1.7.4.3 -> 1.7.4.4") --- pkgs/tools/networking/socat/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index aee97d1de58a..edd5b0603e6b 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { --replace /sbin/ifconfig ifconfig ''; - configureFlags = lib.optionals stdenv.hostPlatform.isMusl [ - # musl doesn't have getprotobynumber_r - "sc_cv_getprotobynumber_r=2" - ]; - buildInputs = [ openssl readline ]; hardeningEnable = [ "pie" ]; From 85c34d334bac9711c4a9a220308b0703cf1c5bb8 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 21 Jan 2023 21:56:59 +0100 Subject: [PATCH 303/338] nixos/uptime-kuma: add julienmalka as maintainer --- nixos/modules/services/monitoring/uptime-kuma.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 3dfbfe3652cf..455721b3a0e2 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -7,6 +7,8 @@ let in { + meta.maintainers = [ lib.maintainers.julienmalka ]; + options = { services.uptime-kuma = { enable = mkEnableOption (mdDoc "Uptime Kuma, this assumes a reverse proxy to be set."); From cf792cfde3dd2b98041fb8d9480364a765d3ad92 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 01:43:37 +0100 Subject: [PATCH 304/338] nixos/envfs: fix envfs package option default mdDoc is not valid here, but isn't currently rejected for xslt reasons. --- nixos/modules/tasks/filesystems/envfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix index ef8f655c532a..450b805f0f58 100644 --- a/nixos/modules/tasks/filesystems/envfs.nix +++ b/nixos/modules/tasks/filesystems/envfs.nix @@ -35,7 +35,7 @@ in { type = lib.types.package; description = lib.mdDoc "Which package to use for the envfs."; default = pkgs.envfs; - defaultText = lib.mdDoc "pkgs.envfs"; + defaultText = lib.literalExpression "pkgs.envfs"; }; }; }; From e067d9e33e1af155cddbe835bb06573a5ae38a02 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 15:31:32 +0100 Subject: [PATCH 305/338] nixos/redsocks: fix option description formatting --- nixos/modules/services/networking/redsocks.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix index 45feb1313c92..30d6a0a6336d 100644 --- a/nixos/modules/services/networking/redsocks.nix +++ b/nixos/modules/services/networking/redsocks.nix @@ -37,7 +37,7 @@ in - stderr - file:/path/to/file - syslog:FACILITY where FACILITY is any of "daemon", "local0", - etc. + etc. ''; }; @@ -125,6 +125,7 @@ in lib.mdDoc '' Way to disclose client IP to the proxy. - "false": do not disclose + http-connect supports the following ways: - "X-Forwarded-For": add header "X-Forwarded-For: IP" - "Forwarded_ip": add header "Forwarded: for=IP" (see RFC7239) From 2cb43da5870b6f0d3beb64afdce3cb8a04a071fc Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 00:07:01 +0100 Subject: [PATCH 306/338] nixos/make-options-doc: remove trailing whitespace from strings this was done only to make the conversion to MD easier to verify. we no longer need it, and not keeping whitespace does not affect rendered outputs. stripping will have to stay for now because description postprocessing would add empty paragraphs otherwise. --- nixos/lib/make-options-doc/mergeJSON.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 3108b9e2197f..c27cd9d3c6dd 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -105,9 +105,6 @@ class Renderer(mistune.renderers.BaseRenderer): if kind not in admonitions: raise NotImplementedError(f"admonition {kind} not supported yet") tag = admonitions[kind] - # we don't keep whitespace here because usually we'll contain only - # a single paragraph and the original docbook string is no longer - # available to restore the trailer. return f"<{tag}>{text.rstrip()}" def block_quote(self, text): return f"
{text}
" @@ -196,8 +193,7 @@ def convertMD(options: Dict[str, Any]) -> str: def convertString(path: str, text: str) -> str: try: rendered = md(text) - # keep trailing spaces so we can diff the generated XML to check for conversion bugs. - return rendered.rstrip() + text[len(text.rstrip()):] + return rendered.rstrip() except: print(f"error in {path}") raise From d1aa187c0e1fa3a91d1204b810794cc0f1d17842 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 01:04:21 +0100 Subject: [PATCH 307/338] nixos/make-options-doc: don't escape link urls twice mistune already does escaping. it does escaping for html, but the difference is small enough that can just ignore that we're actually targeting docbook here. --- nixos/lib/make-options-doc/mergeJSON.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index c27cd9d3c6dd..db14808e84e7 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -80,15 +80,14 @@ class Renderer(mistune.renderers.BaseRenderer): if text == "": tag = "xref" attr = "linkend" - link = quoteattr(link[1:]) + link = link[1:] else: # try to faithfully reproduce links that were of the form # in docbook format if text == link: text = "" attr = "xlink:href" - link = quoteattr(link) - return f"<{tag} {attr}={link}>{text}" + return f"<{tag} {attr}=\"{link}\">{text}" def list(self, text, ordered, level, start=None): if ordered: raise NotImplementedError("ordered lists not supported yet") From 2bd8129a4776f560516ad3e57825b5ca56d24e71 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 02:00:53 +0100 Subject: [PATCH 308/338] nixos/make-options-doc: make whitespace more md-compatible markdown-it-py creates different whitespace leaders/trailers than are currently emitted, and when we convert examples and defaults to render via markdown the spacing will change too. this has no effect on rendered output. --- nixos/lib/make-options-doc/mergeJSON.py | 2 +- nixos/lib/make-options-doc/options-to-docbook.xsl | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index db14808e84e7..1f30e4315cf8 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -73,7 +73,7 @@ class Renderer(mistune.renderers.BaseRenderer): return f"{escape(text)}" def block_code(self, text, info=None): info = f" language={quoteattr(info)}" if info is not None else "" - return f"\n{escape(text)}" + return f"{escape(text)}" def link(self, link, text=None, title=None): tag = "link" if link[0:1] == '#': diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index ac49659c681f..39d34fb8633c 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -75,7 +75,8 @@ Default: - + + @@ -83,7 +84,8 @@ Example: - + + @@ -124,7 +126,8 @@ - + + From 3a5f1ae029318b72d4bdbf8ad2c4cf7d04ce7d02 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 02:14:24 +0100 Subject: [PATCH 309/338] nixos/make-options-doc: render default/example contents through MD removes some trailing whitespaces from the html output, no other changes. --- nixos/lib/make-options-doc/mergeJSON.py | 32 ++++++++++++++---- .../make-options-doc/options-to-docbook.xsl | 33 ++++--------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 1f30e4315cf8..cdbf7cc21f0d 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -203,6 +203,30 @@ def convertMD(options: Dict[str, Any]) -> str: if '_type' not in option[key]: return False return option[key]['_type'] == typ + def convertCode(name: str, option: Dict[str, Any], key: str): + rendered = f"{key}-db" + if optionIs(option, key, 'literalMD'): + docbook = convertString(name, f"*{key.capitalize()}:*\n{option[key]['text']}") + option[rendered] = f"{docbook}" + elif optionIs(option, key, 'literalExpression'): + code = option[key]['text'] + # for multi-line code blocks we only have to count ` runs at the beginning + # of a line, but this is much easier. + multiline = '\n' in code + longest, current = (0, 0) + for c in code: + current = current + 1 if c == '`' else 0 + longest = max(current, longest) + # inline literals need a space to separate ticks from content, code blocks + # need newlines. inline literals need one extra tick, code blocks need three. + ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') + docbook = convertString(name, f"*{key.capitalize()}:*\n{ticks}{sep}{code}{sep}{ticks}") + option[rendered] = f"{docbook}" + elif optionIs(option, key, 'literalDocBook'): + option[rendered] = f"{key.capitalize()}: {option[key]['text']}" + elif key in option: + raise Exception(f"{name} {key} has unrecognized type", option[key]) + for (name, option) in options.items(): try: if optionIs(option, 'description', 'mdDoc'): @@ -210,12 +234,8 @@ def convertMD(options: Dict[str, Any]) -> str: elif markdownByDefault: option['description'] = convertString(name, option['description']) - if optionIs(option, 'example', 'literalMD'): - docbook = convertString(name, option['example']['text']) - option['example'] = { '_type': 'literalDocBook', 'text': docbook } - if optionIs(option, 'default', 'literalMD'): - docbook = convertString(name, option['default']['text']) - option['default'] = { '_type': 'literalDocBook', 'text': docbook } + convertCode(name, option, 'example') + convertCode(name, option, 'default') except Exception as e: raise Exception(f"Failed to render option {name}: {str(e)}") diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index 39d34fb8633c..7a80931df0de 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -72,22 +72,14 @@ - - - Default: - - - - + + - - - Example: - - - - + + @@ -123,19 +115,6 @@ - - - - - - - - - - - - - From c93e5dde6762764f09e9cdffbfcda4217092cb1f Mon Sep 17 00:00:00 2001 From: pennae Date: Thu, 19 Jan 2023 00:17:05 +0100 Subject: [PATCH 310/338] nixos/make-options-doc: rearrange paras in related packages/defaults/examples this mirrors what we will be able to create with markdown. no change to rendered outputs. --- nixos/lib/make-options-doc/mergeJSON.py | 7 +++++-- nixos/lib/make-options-doc/options-to-docbook.xsl | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index cdbf7cc21f0d..ef9f321e1141 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -220,8 +220,11 @@ def convertMD(options: Dict[str, Any]) -> str: # inline literals need a space to separate ticks from content, code blocks # need newlines. inline literals need one extra tick, code blocks need three. ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') - docbook = convertString(name, f"*{key.capitalize()}:*\n{ticks}{sep}{code}{sep}{ticks}") - option[rendered] = f"{docbook}" + docbook = convertString(name, f"{ticks}{sep}{code}{sep}{ticks}") + if multiline: + option[rendered] = f"{key.capitalize()}: {docbook}" + else: + option[rendered] = f"{key.capitalize()}: {docbook}" elif optionIs(option, key, 'literalDocBook'): option[rendered] = f"{key.capitalize()}: {option[key]['text']}" elif key in option: diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index 7a80931df0de..a74429596b85 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -85,10 +85,9 @@ Related packages: - - + From fa8a594c56063f12d4c2d9dbae64421c45a4007b Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 13:28:25 +0100 Subject: [PATCH 311/338] nixos/make-options-doc: deprecate \n\n parbreak only whitespace changes to rendered outputs, all in the vicinity or body of admonitions. previously admonitions would not receive paragraph breaks even when they should have because the description postprocessing did not match on their contents. --- nixos/lib/make-options-doc/mergeJSON.py | 28 +++++++++---------- .../make-options-doc/options-to-docbook.xsl | 8 ++---- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index ef9f321e1141..e78056f3f59f 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -66,9 +66,9 @@ class Renderer(mistune.renderers.BaseRenderer): def text(self, text): return escape(text) def paragraph(self, text): - return text + "\n\n" + return f"{text}" def newline(self): - return "\n" + return "\n" def codespan(self, text): return f"{escape(text)}" def block_code(self, text, info=None): @@ -91,11 +91,11 @@ class Renderer(mistune.renderers.BaseRenderer): def list(self, text, ordered, level, start=None): if ordered: raise NotImplementedError("ordered lists not supported yet") - return f"\n{text}\n" + return f"\n{text}\n" def list_item(self, text, level): - return f"{text}\n" + return f"{text}\n" def block_text(self, text): - return text + return self.paragraph(text) def emphasis(self, text): return f"{text}" def strong(self, text): @@ -104,7 +104,7 @@ class Renderer(mistune.renderers.BaseRenderer): if kind not in admonitions: raise NotImplementedError(f"admonition {kind} not supported yet") tag = admonitions[kind] - return f"<{tag}>{text.rstrip()}" + return f"<{tag}>{text.rstrip()}" def block_quote(self, text): return f"
{text}
" def command(self, text): @@ -192,7 +192,7 @@ def convertMD(options: Dict[str, Any]) -> str: def convertString(path: str, text: str) -> str: try: rendered = md(text) - return rendered.rstrip() + return rendered except: print(f"error in {path}") raise @@ -206,8 +206,7 @@ def convertMD(options: Dict[str, Any]) -> str: def convertCode(name: str, option: Dict[str, Any], key: str): rendered = f"{key}-db" if optionIs(option, key, 'literalMD'): - docbook = convertString(name, f"*{key.capitalize()}:*\n{option[key]['text']}") - option[rendered] = f"{docbook}" + option[rendered] = convertString(name, f"*{key.capitalize()}:*\n{option[key]['text']}") elif optionIs(option, key, 'literalExpression'): code = option[key]['text'] # for multi-line code blocks we only have to count ` runs at the beginning @@ -220,11 +219,8 @@ def convertMD(options: Dict[str, Any]) -> str: # inline literals need a space to separate ticks from content, code blocks # need newlines. inline literals need one extra tick, code blocks need three. ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') - docbook = convertString(name, f"{ticks}{sep}{code}{sep}{ticks}") - if multiline: - option[rendered] = f"{key.capitalize()}: {docbook}" - else: - option[rendered] = f"{key.capitalize()}: {docbook}" + code = f"{ticks}{sep}{code}{sep}{ticks}" + option[rendered] = convertString(name, f"*{key.capitalize()}:*\n{code}") elif optionIs(option, key, 'literalDocBook'): option[rendered] = f"{key.capitalize()}: {option[key]['text']}" elif key in option: @@ -236,6 +232,10 @@ def convertMD(options: Dict[str, Any]) -> str: option['description'] = convertString(name, option['description']['text']) elif markdownByDefault: option['description'] = convertString(name, option['description']) + else: + option['description'] = ("" + + option['description'] + + "") convertCode(name, option, 'example') convertCode(name, option, 'default') diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index a74429596b85..a2e88febdaff 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -53,12 +53,8 @@ - - - - - + From 248e1b957d07e4f45f0c279d0868932de3ce8563 Mon Sep 17 00:00:00 2001 From: pennae Date: Thu, 19 Jan 2023 00:39:17 +0100 Subject: [PATCH 312/338] nixos/make-options-doc: render related packages with md don't generate docbook for related packages, generate markdown instead. this could be extended further to not even generate markdown but have mergeJSON handle all of the rendering. markdown will work fine for now though. --- nixos/lib/make-options-doc/default.nix | 15 ++++++--------- nixos/lib/make-options-doc/mergeJSON.py | 3 +++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 7595b66771a5..3a5e1f2023d5 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -78,16 +78,13 @@ let title = args.title or null; name = args.name or (lib.concatStringsSep "." args.path); in '' - - - - ${lib.optionalString (title != null) "${title} aka "}pkgs.${name} - - - ${lib.optionalString (args ? comment) "${args.comment}"} - + - [`${lib.optionalString (title != null) "${title} aka "}pkgs.${name}`]( + https://search.nixos.org/packages?show=${name}&sort=relevance&query=${name} + )${ + lib.optionalString (args ? comment) "\n\n ${args.comment}" + } ''; - in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; + in lib.concatMapStrings (p: describe (unpack p)) packages; optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index e78056f3f59f..686c57ef7be0 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -239,6 +239,9 @@ def convertMD(options: Dict[str, Any]) -> str: convertCode(name, option, 'example') convertCode(name, option, 'default') + + if 'relatedPackages' in option: + option['relatedPackages'] = convertString(name, option['relatedPackages']) except Exception as e: raise Exception(f"Failed to render option {name}: {str(e)}") From 6865699e3963b243790df841c4c85a7f263d0e23 Mon Sep 17 00:00:00 2001 From: pennae Date: Thu, 19 Jan 2023 16:23:34 +0100 Subject: [PATCH 313/338] markdown-it-py, mdit-py-plugins: allow disabling the test suite the test suite pulls in a huge number of dependencies, from cryptography over sphinx to zope. since we want to use markdown-it-py in the nixos manual build and closure size is important we'll skip the test suite for the manual and rely on the regular builds to catch test failures. it's not ideal, but markdown-it-py is the closes thing to the official MyST parser we can get right now. --- pkgs/development/python-modules/markdown-it-py/default.nix | 4 ++++ pkgs/development/python-modules/mdit-py-plugins/default.nix | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 1f2bc34b000b..c1c5da228f0f 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -12,6 +12,9 @@ , pytestCheckHook , pythonOlder , typing-extensions +# allow disabling tests for the nixos manual build. +# the test suite closure is just too large. +, disableTests ? false }: buildPythonPackage rec { @@ -43,6 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ psutil py + ] ++ lib.optionals (! disableTests) [ pytest-benchmark pytest-regressions pytestCheckHook diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 291ea54c56bc..f93751ca71d5 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -6,6 +6,9 @@ , markdown-it-py , pytest-regressions , pytestCheckHook +# allow disabling tests for the nixos manual build. +# the test suite closure is just too large. +, disableTests ? false }: buildPythonPackage rec { @@ -30,7 +33,7 @@ buildPythonPackage rec { markdown-it-py ]; - nativeCheckInputs = [ + nativeCheckInputs = lib.optionals (!disableTests) [ pytestCheckHook pytest-regressions ]; From e2019c49d4a0b6f4d4b34aab814a8922e94c9445 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 18 Jan 2023 15:31:41 +0100 Subject: [PATCH 314/338] nixos/make-options-doc: use markdown-it-py for rendering only whitespace changes (mostly empty descriptions rendered as literal line breaks and trailing space toPretty generates, but that were dropped by mistune). --- nixos/lib/make-options-doc/default.nix | 15 +- nixos/lib/make-options-doc/mergeJSON.py | 307 +++++++++++++----------- 2 files changed, 184 insertions(+), 138 deletions(-) diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 3a5e1f2023d5..335217703c82 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -118,7 +118,20 @@ in rec { inherit self; includeSiteCustomize = true; }); - in self.withPackages (p: [ p.mistune ])) + in self.withPackages (p: + let + # TODO add our own small test suite when rendering is split out into a new tool + markdown-it-py = p.markdown-it-py.override { + disableTests = true; + }; + mdit-py-plugins = p.mdit-py-plugins.override { + inherit markdown-it-py; + disableTests = true; + }; + in [ + markdown-it-py + mdit-py-plugins + ])) ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 686c57ef7be0..2de0bbae1d91 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -3,9 +3,17 @@ import json import os import sys from typing import Any, Dict, List +from collections.abc import MutableMapping, Sequence +import inspect # for MD conversion -import mistune +import markdown_it +import markdown_it.renderer +from markdown_it.token import Token +from markdown_it.utils import OptionsDict +from mdit_py_plugins.container import container_plugin +from mdit_py_plugins.deflist import deflist_plugin +from mdit_py_plugins.myst_role import myst_role_plugin import re from xml.sax.saxutils import escape, quoteattr @@ -49,149 +57,174 @@ def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]: manpage_urls = json.load(open(os.getenv('MANPAGE_URLS'))) -admonitions = { - '.warning': 'warning', - '.important': 'important', - '.note': 'note' -} -class Renderer(mistune.renderers.BaseRenderer): - def _get_method(self, name): - try: - return super(Renderer, self)._get_method(name) - except AttributeError: - def not_supported(*args, **kwargs): - raise NotImplementedError("md node not supported yet", name, args, **kwargs) - return not_supported - - def text(self, text): - return escape(text) - def paragraph(self, text): - return f"{text}" - def newline(self): - return "\n" - def codespan(self, text): - return f"{escape(text)}" - def block_code(self, text, info=None): - info = f" language={quoteattr(info)}" if info is not None else "" - return f"{escape(text)}" - def link(self, link, text=None, title=None): - tag = "link" - if link[0:1] == '#': - if text == "": - tag = "xref" - attr = "linkend" - link = link[1:] - else: - # try to faithfully reproduce links that were of the form - # in docbook format - if text == link: - text = "" - attr = "xlink:href" - return f"<{tag} {attr}=\"{link}\">{text}" - def list(self, text, ordered, level, start=None): - if ordered: - raise NotImplementedError("ordered lists not supported yet") - return f"\n{text}\n" - def list_item(self, text, level): - return f"{text}\n" - def block_text(self, text): - return self.paragraph(text) - def emphasis(self, text): - return f"{text}" - def strong(self, text): - return f"{text}" - def admonition(self, text, kind): - if kind not in admonitions: - raise NotImplementedError(f"admonition {kind} not supported yet") - tag = admonitions[kind] - return f"<{tag}>{text.rstrip()}" - def block_quote(self, text): - return f"
{text}
" - def command(self, text): - return f"{escape(text)}" - def option(self, text): - return f"" - def file(self, text): - return f"{escape(text)}" - def var(self, text): - return f"{escape(text)}" - def env(self, text): - return f"{escape(text)}" - def manpage(self, page, section): - man = f"{page}({section})" - title = f"{escape(page)}" - vol = f"{escape(section)}" - ref = f"{title}{vol}" - if man in manpage_urls: - return self.link(manpage_urls[man], text=ref) - else: - return ref - - def finalize(self, data): - return "".join(data) - -def p_command(md): - COMMAND_PATTERN = r'\{command\}`(.*?)`' - def parse(self, m, state): - return ('command', m.group(1)) - md.inline.register_rule('command', COMMAND_PATTERN, parse) - md.inline.rules.append('command') - -def p_file(md): - FILE_PATTERN = r'\{file\}`(.*?)`' - def parse(self, m, state): - return ('file', m.group(1)) - md.inline.register_rule('file', FILE_PATTERN, parse) - md.inline.rules.append('file') - -def p_var(md): - VAR_PATTERN = r'\{var\}`(.*?)`' - def parse(self, m, state): - return ('var', m.group(1)) - md.inline.register_rule('var', VAR_PATTERN, parse) - md.inline.rules.append('var') - -def p_env(md): - ENV_PATTERN = r'\{env\}`(.*?)`' - def parse(self, m, state): - return ('env', m.group(1)) - md.inline.register_rule('env', ENV_PATTERN, parse) - md.inline.rules.append('env') - -def p_option(md): - OPTION_PATTERN = r'\{option\}`(.*?)`' - def parse(self, m, state): - return ('option', m.group(1)) - md.inline.register_rule('option', OPTION_PATTERN, parse) - md.inline.rules.append('option') - -def p_manpage(md): - MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' - def parse(self, m, state): - return ('manpage', m.group(1), m.group(2)) - md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) - md.inline.rules.append('manpage') - -def p_admonition(md): - ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::$\n*', flags=re.MULTILINE|re.DOTALL) - def parse(self, m, state): - return { - 'type': 'admonition', - 'children': self.parse(m.group(2), state), - 'params': [ m.group(1) ], +class Renderer(markdown_it.renderer.RendererProtocol): + __output__ = "docbook" + def __init__(self, parser=None): + self.rules = { + k: v + for k, v in inspect.getmembers(self, predicate=inspect.ismethod) + if not (k.startswith("render") or k.startswith("_")) + } | { + "container_{.note}_open": self._note_open, + "container_{.note}_close": self._note_close, + "container_{.important}_open": self._important_open, + "container_{.important}_close": self._important_close, + "container_{.warning}_open": self._warning_open, + "container_{.warning}_close": self._warning_close, } - md.block.register_rule('admonition', ADMONITION_PATTERN, parse) - md.block.rules.append('admonition') + def render(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping) -> str: + assert '-link-tag-stack' not in env + env['-link-tag-stack'] = [] + assert '-deflist-stack' not in env + env['-deflist-stack'] = [] + def do_one(i, token): + if token.type == "inline": + assert token.children is not None + return self.renderInline(token.children, options, env) + elif token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md token not supported yet", token) + return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + def renderInline(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping) -> str: + # HACK to support docbook links and xrefs. link handling is only necessary because the docbook + # manpage stylesheet converts - in urls to a mathematical minus, which may be somewhat incorrect. + for i, token in enumerate(tokens): + if token.type != 'link_open': + continue + token.tag = 'link' + # turn [](#foo) into xrefs + if token.attrs['href'][0:1] == '#' and tokens[i + 1].type == 'link_close': + token.tag = "xref" + # turn into links without contents + if tokens[i + 1].type == 'text' and tokens[i + 1].content == token.attrs['href']: + tokens[i + 1].content = '' -md = mistune.create_markdown(renderer=Renderer(), plugins=[ - p_command, p_file, p_var, p_env, p_option, p_manpage, p_admonition -]) + def do_one(i, token): + if token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md node not supported yet", token) + return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + + def text(self, token, tokens, i, options, env): + return escape(token.content) + def paragraph_open(self, token, tokens, i, options, env): + return "" + def paragraph_close(self, token, tokens, i, options, env): + return "" + def hardbreak(self, token, tokens, i, options, env): + return "\n" + def softbreak(self, token, tokens, i, options, env): + # should check options.breaks() and emit hard break if so + return "\n" + def code_inline(self, token, tokens, i, options, env): + return f"{escape(token.content)}" + def code_block(self, token, tokens, i, options, env): + return f"{escape(token.content)}" + def link_open(self, token, tokens, i, options, env): + env['-link-tag-stack'].append(token.tag) + (attr, start) = ('linkend', 1) if token.attrs['href'][0] == '#' else ('xlink:href', 0) + return f"<{token.tag} {attr}={quoteattr(token.attrs['href'][start:])}>" + def link_close(self, token, tokens, i, options, env): + return f"" + def list_item_open(self, token, tokens, i, options, env): + return "" + def list_item_close(self, token, tokens, i, options, env): + return "\n" + # HACK open and close para for docbook change size. remove soon. + def bullet_list_open(self, token, tokens, i, options, env): + return "\n" + def bullet_list_close(self, token, tokens, i, options, env): + return "\n" + def em_open(self, token, tokens, i, options, env): + return "" + def em_close(self, token, tokens, i, options, env): + return "" + def strong_open(self, token, tokens, i, options, env): + return "" + def strong_close(self, token, tokens, i, options, env): + return "" + def fence(self, token, tokens, i, options, env): + info = f" language={quoteattr(token.info)}" if token.info != "" else "" + return f"{escape(token.content)}" + def blockquote_open(self, token, tokens, i, options, env): + return "
" + def blockquote_close(self, token, tokens, i, options, env): + return "
" + def _note_open(self, token, tokens, i, options, env): + return "" + def _note_close(self, token, tokens, i, options, env): + return "" + def _important_open(self, token, tokens, i, options, env): + return "" + def _important_close(self, token, tokens, i, options, env): + return "" + def _warning_open(self, token, tokens, i, options, env): + return "" + def _warning_close(self, token, tokens, i, options, env): + return "" + # markdown-it emits tokens based on the html syntax tree, but docbook is + # slightly different. html has
{
{
}}
, + # docbook has {} + # we have to reject multiple definitions for the same term for time being. + def dl_open(self, token, tokens, i, options, env): + env['-deflist-stack'].append({}) + return "" + def dl_close(self, token, tokens, i, options, env): + env['-deflist-stack'].pop() + return "" + def dt_open(self, token, tokens, i, options, env): + env['-deflist-stack'][-1]['has-dd'] = False + return "" + def dt_close(self, token, tokens, i, options, env): + return "" + def dd_open(self, token, tokens, i, options, env): + if env['-deflist-stack'][-1]['has-dd']: + raise Exception("multiple definitions per term not supported") + env['-deflist-stack'][-1]['has-dd'] = True + return "" + def dd_close(self, token, tokens, i, options, env): + return "" + def myst_role(self, token, tokens, i, options, env): + if token.meta['name'] == 'command': + return f"{escape(token.content)}" + if token.meta['name'] == 'file': + return f"{escape(token.content)}" + if token.meta['name'] == 'var': + return f"{escape(token.content)}" + if token.meta['name'] == 'env': + return f"{escape(token.content)}" + if token.meta['name'] == 'option': + return f"" + if token.meta['name'] == 'manpage': + [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] + section = section[:-1] + man = f"{page}({section})" + title = f"{escape(page)}" + vol = f"{escape(section)}" + ref = f"{title}{vol}" + if man in manpage_urls: + return f"{ref}" + else: + return ref + raise NotImplementedError("md node not supported yet", token) + +md = ( + markdown_it.MarkdownIt(renderer_cls=Renderer) + # TODO maybe fork the plugin and have only a single rule for all? + .use(container_plugin, name="{.note}") + .use(container_plugin, name="{.important}") + .use(container_plugin, name="{.warning}") + .use(deflist_plugin) + .use(myst_role_plugin) +) # converts in-place! def convertMD(options: Dict[str, Any]) -> str: def convertString(path: str, text: str) -> str: try: - rendered = md(text) + rendered = md.render(text) return rendered except: print(f"error in {path}") From 6273b43743a7df55c4fcb25e816d63f6375c78c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:09:42 +0100 Subject: [PATCH 315/338] python310Packages.sqltrie: init at 0.0.26 --- .../python-modules/sqltrie/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/sqltrie/default.nix diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix new file mode 100644 index 000000000000..99ccab32acde --- /dev/null +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -0,0 +1,52 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pygtrie +, orjson +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "sqltrie"; + version = "0.0.26"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-QxQyxGOt6K3Q/ShdTMgI72lJML4J1+zZj1OoKyPAYVs="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + orjson + pygtrie + ]; + + # nox is not available at the moment + doCheck = false; + + pythonImportsCheck = [ + "sqltrie" + ]; + + meta = with lib; { + description = "DVC's data management subsystem"; + homepage = "https://github.com/iterative/sqltrie"; + changelog = "https://github.com/iterative/sqltrie/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc0f49178e9..69cbea823942 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10890,6 +10890,8 @@ self: super: with self; { sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + sqltrie = callPackage ../development/python-modules/sqltrie { }; + srp = callPackage ../development/python-modules/srp { }; srpenergy = callPackage ../development/python-modules/srpenergy { }; From 85256447c127db2b3e1671a26158f8677dc080ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:10:15 +0100 Subject: [PATCH 316/338] python310Packages.dvc-data: 0.28.4 -> 0.35.1 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/0.28.4...0.35.1 Changelog: https://github.com/iterative/dvc-data/releases/tag/0.35.1 --- pkgs/development/python-modules/dvc-data/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 29a8d835b63d..a5f557c2cc6f 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -8,13 +8,14 @@ , nanotime , pygtrie , pythonOlder -, shortuuid , setuptools-scm +, shortuuid +, sqltrie }: buildPythonPackage rec { pname = "dvc-data"; - version = "0.28.4"; + version = "0.35.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ocwOIhguH460+HJ0sE5Wj+KOiyG4NprJ+QaO+YtfTGU="; + hash = "sha256-MyYRkClbJDcMgwAHcESY0Bo7LgAFpDtkOVmVRUJ7jME="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,6 +41,7 @@ buildPythonPackage rec { nanotime pygtrie shortuuid + sqltrie ]; # Tests depend on upath which is unmaintained and only available as wheel From 5f2d29dd6b0b16e730bb1f5e319e3998f01a75f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:14:03 +0100 Subject: [PATCH 317/338] python310Packages.boschshcpy: 0.2.38 -> 0.2.43 Diff: https://github.com/tschamm/boschshcpy/compare/0.2.38...0.2.43 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 3a4c59a44831..4ed9de7d17f4 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.38"; + version = "0.2.43"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-PDS68JJsnKO2MVlNxvhlDEGuK7zlsGhCRVOLZ/TSlTM="; + sha256 = "sha256-qxJ1yt8KI3ekza1KNfRRBtpPLNC/X0q7ITPhZkS1hPM="; }; propagatedBuildInputs = [ From 0dcb8c76c058682e1ce46ae86f2722563ddc969c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:21:22 +0100 Subject: [PATCH 318/338] python310Packages.hahomematic: 2023.1.5 -> 2023.1.6 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.1.6 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 2c8f5030304f..6181aa106a41 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.1.5"; + version = "2023.1.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-FBsADagMSpuClk23QCi+u7e7bi2EI3PUnYP//nb8AAc="; + sha256 = "sha256-bjONfnxJuqo0d/9K4VKyIurcpw5+RgyAij1Hm/mTeUc="; }; nativeBuildInputs = [ From c9694c96802501afc99b0ebfe82677b6db128c6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 17:56:02 +0000 Subject: [PATCH 319/338] mdbook-katex: 0.3.2 -> 0.3.3 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 2d492f645dce..1f28ca3ff4aa 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.2"; + version = "0.3.3"; src = fetchCrate { inherit pname version; - hash = "sha256-K96zIjWIHQN20LmmiqGEBv5/gi0CzHQt/FgRC00Z/lE="; + hash = "sha256-PmNoux12A6MBlviyCy9kjGUHigBDxCiiqXlwf6Sc76I="; }; - cargoHash = "sha256-KIPP2tT9wrTrIy6YLgSCc4hgKJXT0ZJjp/ftSxs2row="; + cargoHash = "sha256-YSLJsiIkoeSAh3oUMkbk5jSW0NMdJLB6YsOt1YlGyfs="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; From 1205b7cac832e8767912ac2a7d88f308a16b8699 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 19:10:51 +0100 Subject: [PATCH 320/338] python310Packages.findpython: add changelog to meta --- pkgs/development/python-modules/findpython/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 2c8c0b616bb7..0b5ee1940892 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -47,6 +47,7 @@ buildPythonPackage { meta = with lib; { description = "A utility to find python versions on your system"; homepage = "https://github.com/frostming/findpython"; + changelog = "https://github.com/frostming/findpython/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From da775621419375dd377322fa53ba0675ccc17097 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jan 2023 19:22:06 +0100 Subject: [PATCH 321/338] shopify-cli: 2.14.0 -> 2.34.0 --- pkgs/development/web/shopify-cli/Gemfile.lock | 18 ++++++------ pkgs/development/web/shopify-cli/gemset.nix | 28 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/development/web/shopify-cli/Gemfile.lock index 06da84ee001d..79a4220d4ac2 100644 --- a/pkgs/development/web/shopify-cli/Gemfile.lock +++ b/pkgs/development/web/shopify-cli/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - bugsnag (6.24.2) + bugsnag (6.25.1) concurrent-ruby (~> 1.0) concurrent-ruby (1.1.10) ffi (1.15.5) @@ -10,21 +10,21 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mini_portile2 (2.8.0) - nokogiri (1.13.9) + mini_portile2 (2.8.1) + nokogiri (1.14.0) mini_portile2 (~> 2.8.0) racc (~> 1.4) - parser (3.1.2.1) + parser (3.2.0.0) ast (~> 2.4.1) - racc (1.6.0) + racc (1.6.2) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - shopify-cli (2.32.0) + shopify-cli (2.34.0) bugsnag (~> 6.22) listen (~> 3.7.0) - theme-check (~> 1.11.0) - theme-check (1.11.0) + theme-check (~> 1.14.0) + theme-check (1.14.0) liquid (>= 5.4.0) nokogiri (>= 1.12) parser (~> 3) @@ -36,4 +36,4 @@ DEPENDENCIES shopify-cli BUNDLED WITH - 2.3.25 + 2.4.3 diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/development/web/shopify-cli/gemset.nix index 74b31a136539..3bc3e2edef4b 100644 --- a/pkgs/development/web/shopify-cli/gemset.nix +++ b/pkgs/development/web/shopify-cli/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vlsqawqy8jn6cy03zcqw944p323zmr2lgadbw00m5r4lqc3bll4"; + sha256 = "108q00vcx3vkr85mpayns3ini6ids807bmhl8nfham9900ric27y"; type = "gem"; }; - version = "6.24.2"; + version = "6.25.1"; }; concurrent-ruby = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; type = "gem"; }; - version = "1.13.9"; + version = "1.14.0"; }; parser = { dependencies = ["ast"]; @@ -88,20 +88,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rb-fsevent = { groups = ["default"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwq99zlsk624g5k706daapzhwm9v4whc8l6h3yw48265b6wkdwv"; + sha256 = "0zzg2vv58s7ylbk35vfb3gj9q6wr59m18gb8sw9f2rnsgsmkivbr"; type = "gem"; }; - version = "2.32.0"; + version = "2.34.0"; }; theme-check = { dependencies = ["liquid" "nokogiri" "parser"]; @@ -141,9 +141,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0971ma7qnbbycfnlwwq3pfz8f6axcslif9dbzmgimv7ad0nrjpp2"; + sha256 = "1w5mmxnyc0h612c04x6h3xb8jjcq5l6mh2vql4138h2r2z98vdwq"; type = "gem"; }; - version = "1.11.0"; + version = "1.14.0"; }; } From e5dca17201e4a329f08a0342c50c5d538c5940a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 13:58:08 +0100 Subject: [PATCH 322/338] python311Packages.ansiwrap: patch test --- .../python-modules/ansiwrap/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 49cf4a63ba63..3dc3a8df13be 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -1,16 +1,18 @@ { lib , ansicolors , buildPythonPackage -, coverage , fetchPypi -, pytest-cov , pytestCheckHook +, pythonOlder , textwrap3 }: buildPythonPackage rec { pname = "ansiwrap"; version = "0.8.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -18,21 +20,31 @@ buildPythonPackage rec { sha256 = "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"; }; - nativeCheckInputs = [ + postPatch = '' + # https://github.com/jonathaneunice/ansiwrap/issues/18 + substituteInPlace test/test_ansiwrap.py \ + --replace "set(range(20, 120)).difference(LINE_LENGTHS)" "sorted(set(range(20, 120)).difference(LINE_LENGTHS))" \ + --replace "set(range(120, 400)).difference(LINE_LENGTHS)" "sorted(set(range(120, 400)).difference(LINE_LENGTHS))" + ''; + + checkInputs = [ ansicolors - coverage - pytest-cov pytestCheckHook ]; - propagatedBuildInputs = [ textwrap3 ]; + propagatedBuildInputs = [ + textwrap3 + ]; - pythonImportsCheck = [ "ansiwrap" ]; + pythonImportsCheck = [ + "ansiwrap" + ]; meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; homepage = "https://github.com/jonathaneunice/ansiwrap"; + changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 098cdb205648a4da56c022954a4d816b292b4643 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 19:20:48 +0100 Subject: [PATCH 323/338] python310Packages.vector: adjust inputs --- .../python-modules/vector/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index fcf4a306ca59..a1b153deefab 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -1,10 +1,16 @@ { lib +, awkward , buildPythonPackage , fetchPypi , hatch-vcs , hatchling +, numba , numpy +, notebook +, packaging +, papermill , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -12,6 +18,8 @@ buildPythonPackage rec { version = "0.11.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y="; @@ -21,17 +29,30 @@ buildPythonPackage rec { hatch-vcs hatchling ]; + propagatedBuildInputs = [ numpy + packaging ]; - nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ + awkward + notebook + numba + papermill + pytestCheckHook + ]; - pythonImportsCheck = [ "vector" ]; + pythonImportsCheck = [ + "vector" + ]; + + __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A Python 3.7+ library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; + description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; + changelog = "https://github.com/scikit-hep/vector/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; }; From 7eb824334de36d6fe7a15c95a958e00a50eac319 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 22 Jan 2023 15:09:54 +0100 Subject: [PATCH 324/338] dhcpcd: avoid crash Fixes #199200 --- pkgs/tools/networking/dhcpcd/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 81c721a20a49..87162c4e0d4d 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , udev , runtimeShellPackage @@ -18,6 +19,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-gZNXY07+0epc9E7AGyTT0/iFL+yLQkmSXcxWZ8VON2w="; }; + patches = [ + # dhcpcd with privsep SIGSYS's on dhcpcd -U + # https://github.com/NetworkConfiguration/dhcpcd/issues/147 + (fetchpatch { + url = "https://github.com/NetworkConfiguration/dhcpcd/commit/38befd4e867583002b96ec39df733585d74c4ff5.patch"; + hash = "sha256-nS2zmLuQBYhLfoPp0DOwxF803Hh32EE4OUKGBTTukE0="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev From b56418cbcb6fcce17f8ced91ed2f2581b3c1c8b3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 22 Jan 2023 22:29:18 +0400 Subject: [PATCH 325/338] python3Packages.pygmt: fix build --- pkgs/development/python-modules/pygmt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 9b6e8d6c2cae..43f6b2073211 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "pygmt"; version = "0.8.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; From 0db47bd50ee411b5ca291e86f5daa0ee668a600a Mon Sep 17 00:00:00 2001 From: Riey Date: Sat, 26 Nov 2022 00:29:05 +0900 Subject: [PATCH 326/338] kime: 2.5.6 -> 3.0.2 --- .../from_md/release-notes/rl-2305.section.xml | 11 +++ .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/i18n/input-method/kime.nix | 68 ++++++++++--------- pkgs/tools/inputmethods/kime/default.nix | 22 +++--- 4 files changed, 61 insertions(+), 42 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index a672deb20b64..1a9d3bdb6c6b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -276,6 +276,17 @@ or configure your firewall. + + + Kime has been updated from 2.5.6 to 3.0.2 and the + i18n.inputMethod.kime.config option has + been removed. Users should use + daemonModules, + iconColor, and + extraConfig options under + i18n.inputMethod.kime instead. + + llvmPackages_rocm.llvm will not contain diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index c0518d4cd6f0..2563da719f62 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -71,6 +71,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall. +- Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead. + - `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. diff --git a/nixos/modules/i18n/input-method/kime.nix b/nixos/modules/i18n/input-method/kime.nix index 29224a6bf75f..e82996926b28 100644 --- a/nixos/modules/i18n/input-method/kime.nix +++ b/nixos/modules/i18n/input-method/kime.nix @@ -1,40 +1,37 @@ { config, pkgs, lib, generators, ... }: -with lib; -let - cfg = config.i18n.inputMethod.kime; - yamlFormat = pkgs.formats.yaml { }; -in -{ - options = { - i18n.inputMethod.kime = { - config = mkOption { - type = yamlFormat.type; - default = { }; - example = literalExpression '' - { - daemon = { - modules = ["Xim" "Indicator"]; - }; +let imcfg = config.i18n.inputMethod; +in { + imports = [ + (lib.mkRemovedOptionModule [ "i18n" "inputMethod" "kime" "config" ] "Use i18n.inputMethod.kime.* instead") + ]; - indicator = { - icon_color = "White"; - }; - - engine = { - hangul = { - layout = "dubeolsik"; - }; - }; - } - ''; - description = lib.mdDoc '' - kime configuration. Refer to for details on supported values. - ''; - }; + options.i18n.inputMethod.kime = { + daemonModules = lib.mkOption { + type = lib.types.listOf (lib.types.enum [ "Xim" "Wayland" "Indicator" ]); + default = [ "Xim" "Wayland" "Indicator" ]; + example = [ "Xim" "Indicator" ]; + description = lib.mdDoc '' + List of enabled daemon modules + ''; + }; + iconColor = lib.mkOption { + type = lib.types.enum [ "Black" "White" ]; + default = "Black"; + example = "White"; + description = lib.mdDoc '' + Color of the indicator icon + ''; + }; + extraConfig = lib.mkOption { + type = lib.types.lines; + default = ""; + description = lib.mdDoc '' + extra kime configuration. Refer to for details on supported values. + ''; }; }; - config = mkIf (config.i18n.inputMethod.enabled == "kime") { + config = lib.mkIf (imcfg.enabled == "kime") { i18n.inputMethod.package = pkgs.kime; environment.variables = { @@ -43,7 +40,12 @@ in XMODIFIERS = "@im=kime"; }; - environment.etc."xdg/kime/config.yaml".text = replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.config); + environment.etc."xdg/kime/config.yaml".text = '' + daemon: + modules: [${lib.concatStringsSep "," imcfg.kime.daemonModules}] + indicator: + icon_color: ${imcfg.kime.iconColor} + '' + imcfg.kime.extraConfig; }; # uses attributes of the linked package diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/tools/inputmethods/kime/default.nix index 68a91d2bfca7..fc69d47a14fc 100644 --- a/pkgs/tools/inputmethods/kime/default.nix +++ b/pkgs/tools/inputmethods/kime/default.nix @@ -2,32 +2,34 @@ , withWayland ? true , withIndicator ? true, dbus, libdbusmenu , withXim ? true, xorg, cairo -, withGtk2 ? true, gtk2 , withGtk3 ? true, gtk3 +, withGtk4 ? true, gtk4 , withQt5 ? true, qt5 +, withQt6 ? false, qt6 }: let - cmake_args = lib.optionals withGtk2 ["-DENABLE_GTK2=ON"] - ++ lib.optionals withGtk3 ["-DENABLE_GTK3=ON"] - ++ lib.optionals withQt5 ["-DENABLE_QT5=ON"]; + cmake_args = lib.optionals withGtk3 ["-DENABLE_GTK3=ON"] + ++ lib.optionals withGtk4 ["-DENABLE_GTK4=ON"] + ++ lib.optionals withQt5 ["-DENABLE_QT5=ON"] + ++ lib.optionals withQt6 ["-DENABLE_QT6=ON"]; optFlag = w: (if w then "1" else "0"); in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.6"; + version = "3.0.2"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo="; + sha256 = "sha256-qLQ6DmV7KHhdXWR5KtO52cmXBm818zKJVj4nxsR14dc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw="; + sha256 = "sha256-/o9b7YvrpV+IujkllFWAz6Mg4CbS9BInF8antfZ0Vsw="; }; # Replace autostart path @@ -68,6 +70,7 @@ stdenv.mkDerivation rec { export KIME_ICON_DIR=share/icons export KIME_LIB_DIR=lib export KIME_QT5_DIR=lib/qt-${qt5.qtbase.version} + export KIME_QT6_DIR=lib/qt-${qt6.qtbase.version} bash scripts/install.sh "$out" runHook postInstall ''; @@ -84,9 +87,10 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withIndicator [ dbus libdbusmenu ] ++ lib.optionals withXim [ xorg.libxcb cairo ] - ++ lib.optionals withGtk2 [ gtk2 ] ++ lib.optionals withGtk3 [ gtk3 ] - ++ lib.optionals withQt5 [ qt5.qtbase ]; + ++ lib.optionals withGtk4 [ gtk4 ] + ++ lib.optionals withQt5 [ qt5.qtbase ] + ++ lib.optionals withQt6 [ qt6.qtbase ]; nativeBuildInputs = [ pkg-config From bccabe1d8a176b59b72f4d168d602f7bd218221e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Jan 2023 11:38:32 -0800 Subject: [PATCH 327/338] python310Packages.starlette: update dependencies --- .../python-modules/starlette/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 2166ec0ea4f8..54fe677dab22 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -6,20 +6,15 @@ # runtime , ApplicationServices -, aiofiles , anyio -, contextlib2 , itsdangerous , jinja2 , python-multipart , pyyaml +, httpx , typing-extensions # tests -, requests -, aiosqlite -, databases -, httpx , pytestCheckHook , pythonOlder , trio @@ -30,7 +25,7 @@ buildPythonPackage rec { version = "0.23.1"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "encode"; @@ -49,25 +44,19 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - aiofiles anyio itsdangerous jinja2 python-multipart pyyaml - requests - ] ++ lib.optionals (pythonOlder "3.8") [ + httpx + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - contextlib2 ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; nativeCheckInputs = [ - aiosqlite - databases - httpx pytestCheckHook trio typing-extensions From 94ea920df96146ee43e1ff5694004d249d0772d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Jan 2023 12:14:52 -0800 Subject: [PATCH 328/338] python310Packages.videocr: use Levenshtein --- pkgs/development/python-modules/videocr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix index 1158d9fa9171..0685b184c4ab 100644 --- a/pkgs/development/python-modules/videocr/default.nix +++ b/pkgs/development/python-modules/videocr/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "python-Levenshtein" "Levenshtein" \ --replace "opencv-python" "opencv" substituteInPlace videocr/constants.py \ --replace "master" "main" From 6405c525516a1e5bc115d5f307c8fd9dc2421d47 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 20 Jan 2023 16:01:45 +0100 Subject: [PATCH 329/338] python3Packages.django-login-required-middleware: init at 0.9.0 --- .../default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/django-login-required-middleware/default.nix diff --git a/pkgs/development/python-modules/django-login-required-middleware/default.nix b/pkgs/development/python-modules/django-login-required-middleware/default.nix new file mode 100644 index 000000000000..6c69ef7ef27a --- /dev/null +++ b/pkgs/development/python-modules/django-login-required-middleware/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-login-required-middleware"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CleitonDeLima"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + djangorestframework + ]; + + pythonImportsCheck = [ + "login_required" + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = with lib; { + description = "Requires login to all requests through middleware in Django"; + homepage = "https://github.com/CleitonDeLima/django-login-required-middleware"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30df1be08291..c6af3091cf24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2580,6 +2580,8 @@ self: super: with self; { django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django-login-required-middleware = callPackage ../development/python-modules/django-login-required-middleware { }; + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; django-model-utils = callPackage ../development/python-modules/django-model-utils { }; From 3094ec7d17eaddb647b3ce9e62fe1030a0d35020 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:01:20 +0100 Subject: [PATCH 330/338] python310Packages.pytibber: 0.26.9 -> 0.26.11 Diff: https://github.com/Danielhiversen/pyTibber/compare/refs/tags/0.26.9...0.26.11 Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.11 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index d6ba750f1628..e993567569ea 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.9"; + version = "0.26.11"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-Gq1UPiNjNT6eoOqitY+HOg56ouCzPtz+8xaXHMwuZf8="; + hash = "sha256-FVbp7FYTzoNuwROdvKGzSnVN5nAp1hboyzNMhAu6YDY="; }; propagatedBuildInputs = [ From 5dc8c24b3f7ca2155f7dbc9b4e52119f54bda138 Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:25:03 -0600 Subject: [PATCH 331/338] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 202 +++++++++--------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 729e83c66888..6b2a8bad1a6c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-01-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4c3ff7554d4853b5b6372c9c4a5077076977ceb7"; - sha256 = "003zdwjz7hzvv1p18fd9glqxbd0fc3f7yij05nhbyl1p52jvxaq0"; + rev = "e2b6cd07b45f8457ea183d16e483fdac3581b04f"; + sha256 = "0hx85bkbqcp94d2i1p9jd3c5n91xg1fhmm86yf7xjpx4knynsdbh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -847,12 +847,12 @@ final: prev: barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-11"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "231d6f545afd108330bd515fc69f4cb509c97c0c"; - sha256 = "04blr13rjyjpa47y58d8hlsl6zf7wb8bsiq8q4sl57ygvp6hrz8m"; + rev = "ab0d20b2d48551340b52b3cbe8922462caa06950"; + sha256 = "10382d94lg6k7g8inwqs40ddywzm8pfg6j0m97kansag4q7c8p4j"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1075,12 +1075,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4ea096a150fe2636782f6f68b97d3cff7ee28b4f"; - sha256 = "1jb4dd9bg7q2an963fnn2mclpj52bjqvfv6k642757zfasx20x6p"; + rev = "be0a8122fd77efb7b6a0d672bab10417e68fab8b"; + sha256 = "1w7km6b4r3pvnx5g5i4wndj9524klx3g4q9li8xv8z6lhdz27c15"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1795,12 +1795,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-12-25"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "95b43f67147391cf2c69e550bd001b742781d226"; - sha256 = "0rmva45znh39r4rhakk1zmqk9hrgi2d2daw8v1rfv1jd054w3vx1"; + rev = "e86b15bbcabc2cc1f20a40e7c127a424e7ad3850"; + sha256 = "1qh30yg082a6s55psa1z844n3s5z8s31pan7iywaygwcnpxhlgx6"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2083,12 +2083,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-07"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "5b911f2d8ecccc684c13fdb8af4145cca19dc3cf"; - sha256 = "13ckm0b8hgji4brmfw4dnc0spm8hslx2s4bg0vi8sll5i7vphpdd"; + rev = "6ca9b4b3eda9138406291493750a6890c927dbfa"; + sha256 = "00dfhj44hfqi66j1ayr7h424qc160l9d91wlbfb4hhbg2rcldp4l"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2107,24 +2107,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-15"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "e8fedcb9fbedc60c8d0f30accdd72b53e998d8af"; - sha256 = "0nqby971cys2a6q81pcp54xc5w5rq9b0z8yw454z0fr8agw0vxvd"; + rev = "0b78334e1edcd7eb3d2038621b388ff040f035fb"; + sha256 = "0ag9f1h03s0pfiqaxclcz73sra0lwkva23dyacg53svcmpi9bpic"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-15"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "c3cc8cfe780449d8773392a741d5b15e7e9fc83c"; - sha256 = "1h8p3zk8xra3rhppzmyv7b8raz3vsb5rs8gmx7yylhpb70rv3l4w"; + rev = "d48f1315617092a8c0db29c2fd2d81d5e244c555"; + sha256 = "1ddzfj9gg67jz5kx4i51iyyl3js1b3k7mzxxa8pp5fh1021pi1hy"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2143,12 +2143,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-01-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "929adacab097dd2c36c797c8f9323886b4439a9c"; - sha256 = "1v49552gmsk5g5aprvzysqf5pqk6im9nkiyyjhns8sgva7gswvpm"; + rev = "25232d23926c28c34f462dd9a57847d90b1af969"; + sha256 = "1ycf3mfrs2a4c43mbdc3rs2kby1y2gxpp0kxilv8vp0c1idibyxr"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2769,12 +2769,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "39bd110fc3fa7afa0b59e7665564b37c4b82d0a0"; - sha256 = "0xadgrkfb19c4g7gl46mj5pw29d04jdjxx21nyvzma09g94jdkam"; + rev = "ed23a49992a8adfc0a1db765cb5353adeb12f9ff"; + sha256 = "09bi47gv5xd7wf7i53kbp3d2n5xzbns408cg52faxixd001m0f71"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3599,12 +3599,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "a6082394ad65116784ea4a747a25b4831708d4e9"; - sha256 = "1mzxnlw3ml3xrsbbgsbyxn1mlnffarxz91j04g4d6vmz94a1d34w"; + rev = "6ac15db045393cb40c484b19f3903d89acf2b125"; + sha256 = "07rsq2wgdjqlav15jvaiwk4a33q6w07all7q6v7hzdpng8bmywgi"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4139,12 +4139,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "96d759d1cbd8b0bd0ea0a0c2987f99410272f348"; - sha256 = "0jdgrj5m7iax90djx9n75lh8y9cwhzzrzg99w9rfk5zifb02j9qh"; + rev = "cab4682d22a0451bc36a648694235621b5dd808e"; + sha256 = "0kxvb6l9pxdrs9cxh1cqf9p4y8nbfn9rx3a7zgd21h4c6126bcvh"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4499,12 +4499,12 @@ final: prev: lsp-inlayhints-nvim = buildVimPluginFrom2Nix { pname = "lsp-inlayhints.nvim"; - version = "2022-12-05"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "lvimuser"; repo = "lsp-inlayhints.nvim"; - rev = "a28c51a6362e3faa17f67749436cb5c8b55dcc6d"; - sha256 = "1hvn8y1mqd853aa2dm7156g4fvwq21qmmkicsl50czq4mf9vgvd1"; + rev = "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c"; + sha256 = "0fx0swsagjdng9m9x73wkfqnk464qk63q9wi32rhywllbm7gsflf"; }; meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; @@ -4582,12 +4582,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-01-17"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c1e9c2a5d0f0aa73c2544ad958c6f06973235d35"; - sha256 = "0n4pmcmqb7lynx1firq3p1g2z1xjw78b0wlbp7k3ag7ac5gfhzbf"; + rev = "b86f249cba85ec2f0f74c62b65898bade00b4413"; + sha256 = "0kbcws9dwsvjg6psfax4azd6j46n05jhkkdgsc1c4wjhyg74jas9"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4654,12 +4654,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "8c23e1af82bdafa86556a36c4e075079dd167771"; - sha256 = "1ngvfnb2qh04bc5bkrjw69ksq3aslbnpzxk0fhp8lp42g0xc0984"; + rev = "5955bdd7b20854aea74dc86c7ddf9989296d52d7"; + sha256 = "0yzhz6cyhsh7aypvi0cz20wapn1xcild6llif7yvqbmvl4ygrdl5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4751,12 +4751,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9660a811b2e0bd959b63c7f7d41853b49546544d"; - sha256 = "0ckaw9dqlcgqz4p103pl3di9sk7n8rmhyfyhpnqir5089a61h2c1"; + rev = "bb88357eff0d0c69ab8ecc5985952e0a9a72175a"; + sha256 = "0hfnwjv165w1d89xd7gs11q5j8a52zj43acxaash2qaxy5hl3zpz"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-01-19"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "91017a96693408ef96efe9a2513c6ace0a87dc8d"; - sha256 = "0xhc2npbpz7rhlis9cchda5pg7j5qkfxqb9qjsk86cxga1ma0c8r"; + rev = "1c11d5fdb71c1d766545e42b0dd99eda50f1e349"; + sha256 = "16g9yzwiibrjhl9ln911kw433li5av64p6nrhypj6pcf2n1dkrfc"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5183,12 +5183,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "1970a31188a5cbae13f676b699cd35dafb52642f"; - sha256 = "00rdairr0rglipki6j6xw7d99hmfncn0hv3yn7msxs954kk5l7dn"; + rev = "0d4a5197def6019f125444c3870aa5a8f251a2db"; + sha256 = "03shsrnagr37awsvr88pzm1yhdp680dbzzgknzxf5d9sw7c3jfsg"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5207,12 +5207,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-20"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "e905fb76f78fa19500ca3b9fac256b057aad535a"; - sha256 = "1vhn1mqph5yp2xxciyvlnprsawbfcy1i4cd6dvnqid38fhq1936w"; + rev = "34dd33cd283b3a89f70d32c8f55bb5ec4ce2de93"; + sha256 = "1skz0fj0v5s926mfg58nrdmivsadjzlhlymxfyz0zvkj3vkf7d50"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5531,12 +5531,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "3cdc23e302d6283d294f42ef5b57edb6dc9b6c5e"; - sha256 = "173w8i7blg9hxkda6qqk39zinw1v9qhq4qb9rjy39dry7g1j0z25"; + rev = "26fb0c6c5653b0bda95f29eae638305bab351123"; + sha256 = "0w9yy5c4rxw0k8z975p6zn1792lmjld1gch1m1gji0nvyyasvsbi"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6095,12 +6095,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-18"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "edd7bab99613849c8cccddcebece47aabb9e86b8"; - sha256 = "096vjyl6wl1y027pbn81773mjzfahswk4y5aj5b6gg9vwchzyf46"; + rev = "57a52fce9b4a045f0b371a4ca5cbb535b9db0bdd"; + sha256 = "0bliv6vzgqk6nz0wk334gkbsdmkzxv38rjs0pf7jdk5azvgczslh"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6119,12 +6119,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "bb5675b2daa220a8716eda2c27b23307434f1c31"; - sha256 = "0bwlr193j6wpnmivr090njmdip9a66nqh0d6wma0c368fvsj5vcg"; + rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17"; + sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6371,12 +6371,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c9615952e71397cec4cf89a9a0db0fb9c491a5e1"; - sha256 = "19lalxdy3q77bwhmr3mrnzjw34fyikpkyqcfg1z108slnxxkvz85"; + rev = "7bef1d53302f1087a07f83a4321582d835f44d4f"; + sha256 = "1v560a216ink7km0gr32kgjxd84lcvpiwy991pvp3s0xqxmw5bx7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6482,8 +6482,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "9ca185ed23cc47bef66d97332f0694be568121e8"; - sha256 = "0wwilr4ic38x1navr8bkgv7p3fxrgjd7nyxqwla336981nrgg9y3"; + rev = "13d06d74afad093d8312fe051633b55f24049c16"; + sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6574,12 +6574,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-20"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "4e853eabcb002650096ef78f098253fe12ba3d8f"; - sha256 = "1w4smhf7givrpiwwl1cprvl1l6i74rl189q7frhl5ankhrlsi6l1"; + rev = "6c6b7673af1314dd7c8254a95eb8d331f6b76ac6"; + sha256 = "0gwfl7hslgbr2fawx15wbd6p4j60jnd2l68v36rxrmxl9iqm1ra6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8262,12 +8262,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-01-16"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "2f32775405f6706348b71d0bb8a15a22852a61e4"; - sha256 = "166mzzwv95ab8yr4aadr6vy9fp6l64sj2kihhif5qis4k71qshkz"; + rev = "dce1156ca103b8222e4abbfc63f9c6887abf5ec6"; + sha256 = "194jkn7a4xh5733n8n1n8n9mwibvadkxj6vw44xvwd01w0db6zhx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8310,12 +8310,12 @@ final: prev: term-edit-nvim = buildVimPluginFrom2Nix { pname = "term-edit.nvim"; - version = "2023-01-20"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "28a095d6c9691039a5680b644676bbc80c6bcc35"; - sha256 = "1qlq09wxmiqqkz23id2679lj7x3rnjlyzqd67vfcp06gahnb0wky"; + rev = "eb9a18b77fa54d0416e315dc0f9793f480930419"; + sha256 = "0562rlcah3czb00m9fkc1dhhy0v9zgi5lx2hc3zjprccdhw9q41j"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -8767,12 +8767,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-16"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "216f15359dd3fe91415b32c62a1122dbe73175fb"; - sha256 = "0kjqw9lawqq7y12nz7wni065wb23z4rnl0wm5wbm1g991ydggc00"; + rev = "a9488d0803020e8d99ed13b95fd9def82941c978"; + sha256 = "0c78cr5f16vliiblafhcmmcq1xqybfnd70576drh6n7sr2fhss88"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -9103,12 +9103,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-19"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "31e01612f3b9eef79e6a71d4708b85505f50e255"; - sha256 = "0bvxqjhfizckshw59gkd1g3zx9qvswp0mgjdp80w7y0vsxl0m9rf"; + rev = "c7460aa8836bcb05cf32331cc751739ba9392ae7"; + sha256 = "1w2r5vwll0mfmviz7s9r6n00lr0b1fav7qmkj7zbvxh8hrf2z80b"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9499,12 +9499,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-16"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "0d630e4aa23315c086e858c1a41ff40e082d0fe7"; - sha256 = "0w8w5w9d23hw5cfa37wnphri42yfri2f11yq4wf6aldrlkg03ral"; + rev = "5a6ff035e16c57874fbf68951b1206535733827d"; + sha256 = "1v0fxyqnbcf3x5vv5aq1z9q75m1qym6l1f9jn9iwdwg06mj581wj"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -10231,12 +10231,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-09-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "c880254c0d56a9dba0bfe7bc3a5f99cd15273363"; - sha256 = "1zf2i2z2y2sdnl0yvbrhwg4j9vnz85v4ycplsqvas0kfvc2vcrka"; + rev = "baa0206f8d1685d1239d6c10f4b53869eb84c4a0"; + sha256 = "0hmdpn548bn46ygwm8w2wm609hiyn2nwj2kqc7nsi0ypa5pkbnnb"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13861,36 +13861,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-01-20"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "3d0c37ceb9412202ed53da879dfb33f32ede7bcb"; - sha256 = "1ijzrwa5pkblc7j6bdgn91q58abycwdy8cmyqn7f4kcq9d4v1nvn"; + rev = "6368edcd0b5e5cb5d9fb7cdee9d62cffe3e14f0e"; + sha256 = "1d1bb9js2i58qn2b8zjhqbawlrbjk3sn91cpkjaw43wldgm3samj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-11-24"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "2f0affc13228f6eac363612a3cce3677fcd0b490"; - sha256 = "0702bpvmyrr5p0r3fd09szsflrvr6qnngvgdws00x4spsq03nl1p"; + rev = "cf186cffa9b3b896b03e94247ac4b56994a09e34"; + sha256 = "17di30zm743sj707z8hg95z2g7687nd1wsxyyn20xy5s3f8lnx0v"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-01-17"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "3419e7614e69be6107b6a6f4a0c4c4bff0da33e2"; - sha256 = "0hmkd8vxb13x96hkc8n3md5rkp04iri2aq2pv44slgrh26kgvw5k"; + rev = "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17"; + sha256 = "1yhffffvb5ry4vcaiz68rnjv13r63v632962axkm0wgqbc5i62fc"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13933,12 +13933,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-01-21"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "57a29c0286bf16ea3c4f20d5938fc6680a198940"; - sha256 = "15yz5sg1lgibbmm3dk6xwvpmifwhzw107vrdk19zq2fxz5a8g5b7"; + rev = "8516da6a9c40a1d9ab81ad56c90673be29f188f7"; + sha256 = "1l3l1w75j6bal7l4jf27rvy7w5vx1w62z5650y9xgx9wjnc1y955"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; From 60d9b29eb1972752d28a410533c1e15907758ce6 Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:26:13 -0600 Subject: [PATCH 332/338] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6b2a8bad1a6c..8dce26f130b3 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4727,12 +4727,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-19"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "5b388c0de30f1605671ebfb9a20a620cda50ffce"; - sha256 = "1c01jacxp96s2xd8w2hvp46ai49lw8dsmv372l8jj6794dqm1bfv"; + rev = "d7ff61a828d59bc593ea3e2020508c114048d790"; + sha256 = "03rmdhp30kzvc98gaagxbm3cm0q1mqy28wjih6r7l14kp3qv8bv1"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; From 3ffdf2419dc1dd3e26be8360097560a33c5321ab Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:27:24 -0600 Subject: [PATCH 333/338] vimPlugins.solarized-nvim: init at 2022-12-02 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8dce26f130b3..98d7a8db2f4d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7500,6 +7500,18 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; + solarized-nvim = buildVimPluginFrom2Nix { + pname = "solarized.nvim"; + version = "2022-12-02"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "solarized.nvim"; + rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; + sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + }; + meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; + }; + sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; version = "2023-01-14"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index aa02a8971584..1cd0de9f1249 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -630,6 +630,7 @@ https://github.com/kovisoft/slimv/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, +https://github.com/shaunsingh/solarized.nvim/,HEAD, https://github.com/sainnhe/sonokai/,, https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, From ca390ee0162b164d780a999e9d08ca5c15a766ba Mon Sep 17 00:00:00 2001 From: "\"Zack Lalanne\"" <"zack.lalanne@gmail.com"> Date: Sun, 22 Jan 2023 14:30:38 -0600 Subject: [PATCH 334/338] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 69 ++++++++++++++----- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a32f0fda65ab..2a1deff81a38 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -115,23 +115,23 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "eed2576"; + version = "a29bac0"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "eed2576ae17aae83595c4a4ce1e9c1cbf7071bb6"; - hash = "sha256-4X8X8l62bcv48Hti95MJ1GLtaeoAYi2tHy/oBt8qQVo="; + rev = "a29bac0681802139710b4d3875540901504d15cb"; + hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; clojure = buildGrammar { language = "clojure"; - version = "50468d3"; + version = "262d6d6"; source = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "50468d3dc38884caa682800343d9a1d0fda46c9b"; - hash = "sha256-JOqkgsefFp+nvRijPsd+/01w1JsXeW5cNcZNow0ZRyY="; + rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; + hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; @@ -349,12 +349,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "14fd388"; + version = "f0e2f78"; source = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "14fd38870c26dcae2ede1b989dc6531f1187f15e"; - hash = "sha256-TnVuHoJG3vYpjOiOQRkE+gB1aNWIaE8cbIV6x92swNk="; + rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb"; + hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -668,6 +668,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; + htmldjango = buildGrammar { + language = "htmldjango"; + version = "b2dba02"; + source = fetchFromGitHub { + owner = "interdependence"; + repo = "tree-sitter-htmldjango"; + rev = "b2dba02eddab66be669022320273d0dfe1ff923d"; + hash = "sha256-FEsvr9i0Lys8CzDlm2lhdJEAQNnmqRSFjn4I+CcZYM8="; + }; + meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; + }; http = buildGrammar { language = "http"; version = "2c6c445"; @@ -679,6 +690,17 @@ }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; + ini = buildGrammar { + language = "ini"; + version = "1a0ce07"; + source = fetchFromGitHub { + owner = "justinmk"; + repo = "tree-sitter-ini"; + rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"; + hash = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU="; + }; + meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; + }; java = buildGrammar { language = "java"; version = "09d650d"; @@ -1038,12 +1060,12 @@ }; php = buildGrammar { language = "php"; - version = "47dd353"; + version = "973694f"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "47dd3532df8204a444dd6eb042135f1e7964f9cb"; - hash = "sha256-YU21aRugPfwlYuj+9xJAFD44Btopnln7QEoxANIlcLs="; + rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; + hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1093,12 +1115,12 @@ }; pug = buildGrammar { language = "pug"; - version = "148608f"; + version = "26f6ac8"; source = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "148608f3a88708829ac4e79ff9cb1c4a618e01b7"; - hash = "sha256-wEUJdu+2deObsc54BNPdUyTAR9Eih8hGbWRrwP5bhMk="; + rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; + hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; @@ -1247,12 +1269,12 @@ }; scala = buildGrammar { language = "scala"; - version = "802eba3"; + version = "067ee61"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "802eba33a1ae1ad9d873e5269dfcc9c4d86e4116"; - hash = "sha256-WZe4QjzdGAo9KWQlS66rUUxJax9pbl4p2YE/GfAmkAQ="; + rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20"; + hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1426,6 +1448,17 @@ location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; + thrift = buildGrammar { + language = "thrift"; + version = "999a27d"; + source = fetchFromGitHub { + owner = "duskmoon314"; + repo = "tree-sitter-thrift"; + rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633"; + hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw="; + }; + meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; + }; tiger = buildGrammar { language = "tiger"; version = "a233ebe"; From 523e62005a859bf1afe72f6b9ad2aec7b8ddb2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Jan 2023 11:17:52 +0100 Subject: [PATCH 335/338] nixUnstable: bump to latest nix version --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d8dba67d39b0..73e715bddb38 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -113,5 +113,5 @@ in lib.makeExtensible (self: { stable = self.nix_2_12; - unstable = self.stable; + unstable = self.nix_2_13; }) From fcc727798cd67905ba683af6f3d007f90e7b461e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 21:41:04 +0000 Subject: [PATCH 336/338] python310Packages.google-cloud-asset: 3.16.0 -> 3.17.0 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 1aaac7c96fc8..de650d07ac1a 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.16.0"; + version = "3.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hkuW9c5ORUuN0kbQJ2MG/GezORvqL0w51a7Ca9AdHkU="; + hash = "sha256-CsTfdEgDeHdrYWLqMt3WpYOcxT9BuQ2M8sqg0ZIwmvM="; }; propagatedBuildInputs = [ From 808663bd02143086e23418244b969ffe23f2a912 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sun, 22 Jan 2023 23:03:45 +0100 Subject: [PATCH 337/338] nixos/uptime-kuma: add ping in path (#212001) Co-authored-by: Sandro --- nixos/modules/services/monitoring/uptime-kuma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 455721b3a0e2..886e14b5f6c9 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -50,7 +50,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment = cfg.settings; - path = lib.mkIf cfg.appriseSupport (with pkgs; [ apprise ]); + path = with pkgs; [ unixtools.ping ] ++ lib.optional cfg.appriseSupport apprise; serviceConfig = { Type = "simple"; StateDirectory = "uptime-kuma"; From a67632bda0fc7562785fe5d1c2495014c436ebf7 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Sat, 21 Jan 2023 18:26:15 -0800 Subject: [PATCH 338/338] doc/langauge-frameworks/beam: fix broken link to `elixir-ls` --- doc/languages-frameworks/beam.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 63f49adccb2c..6b3a369c291f 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -128,7 +128,7 @@ You will need to run the build process once to fix the hash to correspond to you ###### FOD {#fixed-output-derivation} -A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir_ls.nix) for a usage example of FOD. +A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir-ls/default.nix) for a usage example of FOD. Practical steps