From feee7e0357a74ab0510b2d113a3bdede1d509759 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 13 Dec 2022 01:37:50 +0000 Subject: [PATCH 001/146] trust-dns: init at 0.22.0 [trust-dns](https://github.com/bluejekyll/trust-dns/) is a Rust-based DNS client/server/resolver. the server uses .zone files that are largely compatible with bind. i've had a server deployed to `ns{1,2}.uninsane.org` for about a week using this derivation: seems to be stable enough for casual use. this package also ships a DNS client and a resolver. BIND also ships a dig-like client but lives in pkgs/servers/dns. so i'm replicating that convention. --- pkgs/servers/dns/trust-dns/default.nix | 33 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/dns/trust-dns/default.nix diff --git a/pkgs/servers/dns/trust-dns/default.nix b/pkgs/servers/dns/trust-dns/default.nix new file mode 100644 index 000000000000..de21bdf252c1 --- /dev/null +++ b/pkgs/servers/dns/trust-dns/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "trust-dns"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "bluejekyll"; + repo = "trust-dns"; + rev = "v${version}"; + sha256 = "sha256-b9tK1JbTwB3ZuRPh0wb3cOFj9dMW7URXIaFzUq0Yipw="; + }; + cargoHash = "sha256-mpobdeTRWJzIEmhwtcM6UE66qRD5ot/0yLeQM6Tec+0="; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + # tests expect internet connectivity to query real nameservers like 8.8.8.8 + doCheck = false; + + meta = with lib; { + description = "A Rust based DNS client, server, and resolver"; + homepage = "https://trust-dns.org/"; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.linux; + license = with licenses; [ asl20 mit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c5966cb7eb4..7907ca2a2e2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26079,6 +26079,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + trust-dns = callPackage ../servers/dns/trust-dns { }; + tunctl = callPackage ../os-specific/linux/tunctl { }; twa = callPackage ../tools/networking/twa { }; From a53b77bf60fabb5a86586f396bc7e1a95d10f542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Wed, 14 Dec 2022 08:11:09 +0300 Subject: [PATCH 002/146] android-tools: 33.0.3p1 -> 33.0.3p2 --- pkgs/tools/misc/android-tools/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index f8ab129f789b..18d7bf02ed83 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -9,21 +9,13 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "33.0.3p1"; + version = "33.0.3p2"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg="; + hash = "sha256-a/a1LXOJ55/JK2PMIGRR7kL8T32naddpIhk+mNdfVgQ="; }; - patches = [ - (fetchpatch { - name = "add-macos-platform.patch"; - url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch"; - hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; From 26cc7bf3854af6887c1887597a15d0ff253421ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 14 Jan 2023 11:51:56 -0300 Subject: [PATCH 003/146] openasar: unstable-2022-12-11 -> unstable-2023-01-13 --- .../networking/instant-messengers/discord/openasar.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 50ca9a3a0fb6..95f1625f1af1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-12-11"; + version = "unstable-2023-01-13"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "0b1d4685cb2c94f42441fc616eb24e69eda04647"; - hash = "sha256-cRYXgVgA5B9MaDGJIACJYjFNDAMajReKud0akiGBR4Q="; + rev = "40b27dd1b8dd48277207db1b165c220c3441484c"; + hash = "sha256-tDJxcnbX0REu8DX+bQ7i4JzvLl6lRyB7+/dnAJI18Ss="; }; postPatch = '' From 26f9d69af3b1973125d38c03665e8bd8cf7537d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Jan 2023 02:00:06 +0100 Subject: [PATCH 004/146] openai-whisper: unstable-2022-09-30 -> 20230117 Diff: https://github.com/openai/whisper/compare/refs/tags/vunstable-2022-09-30...v20230117 --- pkgs/development/python-modules/openai-whisper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 73327d314af1..2e48666a1be6 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "unstable-2022-09-30"; + version = "20230117"; format = "setuptools"; src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = "60132ade70e00b843d93542fcb37b58c0d8bf9e7"; - hash = "sha256-4mhlCvewA0bVo5bq2sbSEKHq99TQ6jUauiCUkdRSdas="; + rev = "refs/tags/v${version}"; + hash = "sha256-DVYQw+h5xsgWLA6dD+qg4ud0pqFOn6oVAzTqRywE30g="; }; patches = [ From d1b048bb27bbbfd6145e7311d7ded9284f100a19 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 19 Jan 2023 11:28:52 +0100 Subject: [PATCH 005/146] faircamp: unstable-2022-10-08 -> unstable-2022-12-28 --- pkgs/applications/misc/faircamp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index a50c4e42706a..54a3a2ed14c6 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-10-08"; + version = "unstable-2022-12-28"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "630415985127298bf82bfc210d2fc8b214758db1"; - sha256 = "sha256-4pzDey0iV7LtHI0rbbcCjjuTaFt0CR88Vl0B1RU96v0="; + rev = "c77fd779cea6daecbac9a9beea65c1dc1ac56bc4"; + sha256 = "sha256-Tl3T/IoBIhYCNDEYT6cV1UyksDkoEDydBjYM9yzT4VQ="; }; - cargoHash = "sha256-GgWxxKHLGtsSGVbhli6HTfUu4TmbY4J9N7UA7AOzUkc="; + cargoHash = "sha256-20rtE8+LLDz97yvk0gKoUielsGZXEEOu2pfShf2WvHA="; nativeBuildInputs = [ makeWrapper From 2f95d02f3df75c27c3f76176c35f0ed425bf9af6 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 19 Jan 2023 12:01:50 +0100 Subject: [PATCH 006/146] domination: 1.2.5 -> 1.2.7 --- pkgs/games/domination/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 919d22b41dae..e46aaded0f13 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.5"; + version = "1.2.7"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "2212"; - sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM="; + rev = "2261"; + sha256 = "sha256-xvlPC7M6DaF3g2O3vQDmcdp7914qOaiikY02RTgAVkM="; }; nativeBuildInputs = [ From 2dd0b25e164946e597c1f8a1309d73f1bff03f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 19 Jan 2023 09:51:53 -0600 Subject: [PATCH 007/146] =?UTF-8?q?gmic:=203.1.6=20=E2=86=92=203.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/gmic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 8f66d054cde6..6e811e1aa3df 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "3.1.6"; + version = "3.2.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchFromGitHub { owner = "dtschump"; repo = "gmic"; - rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d"; - sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0="; + rev = "v.${version}"; + hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs="; }; # TODO: build this from source @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - sha256 = "adObp8s+2TWaS+X/bQSphWRK6o85h+DGwlIDol6XN/4="; + hash = "sha256-kWHzA1Dk7F4IROq/gk+RJllry3BABMbssJxhkQ6Cp2M="; }; nativeBuildInputs = [ From ac5c59f0b210b24a3f5a09d03c1d013877090bc5 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 19 Jan 2023 22:32:42 +0100 Subject: [PATCH 008/146] AusweisApp2: 1.26.1 -> 1.26.2 https://github.com/Governikus/AusweisApp2/releases/tag/1.26.2 --- pkgs/applications/misc/ausweisapp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index eb773b3c812e..8758e5fe92f6 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY="; + hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE="; }; nativeBuildInputs = [ cmake pkg-config ]; From 1f7c5db15d23a8c5ac6a03a6c9eb4f5b71569e0e Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 20 Jan 2023 01:10:24 +0100 Subject: [PATCH 009/146] dasel: 2.1.0 -> 2.1.1 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d69073d710e8..3f613041ff93 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,19 +5,19 @@ buildGoModule rec { pname = "dasel"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-7JGafJE9nwZ95bOWUyVw2uWA2LltE9HxolHGYU079to="; + sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI="; }; vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE="; ldflags = [ - "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" + "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" ]; doInstallCheck = true; From 5fba98444bb250effe594791127f1eb349cdbcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 20 Jan 2023 09:38:49 -0600 Subject: [PATCH 010/146] =?UTF-8?q?gmic-qt:=203.1.6=20=E2=86=92=203.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/gmic-qt/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index a937ea51784a..0e6d0b0adb4e 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -2,7 +2,6 @@ , mkDerivation , variant ? "standalone" , fetchFromGitHub -, fetchpatch , cmake , pkg-config , ninja @@ -59,13 +58,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.1.6"; + version = "3.2.0"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "sha256-/5wDHvJSMgEheg8YV4W40wUiHz25emIoFnGdfO8i92g="; + sha256 = "sha256-I5XC7zbDyBPFj4zul9rshoyeVV0hRQQ3aZQzEvYrgdc="; }; nativeBuildInputs = [ @@ -95,15 +94,6 @@ mkDerivation rec { "-DENABLE_SYSTEM_GMIC:BOOL=ON" ]; - patches = [ - # NOTE: this should be removed when a new version is released. - (fetchpatch { - name = "fix_filter_translation_scripts.patch"; - url = "https://github.com/c-koi/gmic-qt/commit/ccb9f29eda239d0c80663593cd90a6548c935b39.patch"; - sha256 = "sha256-OzuJ6yGuDJweQ+1uin/pmJqZV79bN9E1Zuo+0iciwzg="; - }) - ]; - postPatch = '' patchShebangs \ translations/filters/csv2ts.sh \ From 31f09f7643da2267f0781793d37e9f7df595d515 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sun, 22 Jan 2023 16:24:13 +0100 Subject: [PATCH 011/146] session-desktop: 1.10.3 -> 1.10.4 --- .../networking/instant-messengers/session-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 6d2d79c6c7a2..bb7c49c3106a 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.10.3"; + version = "1.10.4"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "sha256-I9YyzfI8EqH8LZe5E5BnD9lGPAdQo++l3yRClfN7+pY="; + sha256 = "sha256-pSVTfZvjqWVgx3FAbIJO6e26GHZbhZBppxEptEuozQo="; }; appimage = appimageTools.wrapType2 { inherit version pname src; From 4d97d4772ebe86d807063169068049b005d36fa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 18:26:17 +0100 Subject: [PATCH 012/146] python310Packages.pyunifiprotect: 4.6.1 -> 4.6.2 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.6.1...v4.6.2 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.6.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index eaceb6eb31fe..e75e99ceb340 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.6.1"; + version = "4.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5xHU4WC7HPDEJsfCX4bVsK3p6SWZ/fHH7APbFtDGC40="; + hash = "sha256-sEIjR6ScJNliJJJET06e22x5GMDrmB6fZAzyHr847sk="; }; postPatch = '' From fbb694c1b5ba57f061e949b913ad72cfa3cce1e8 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Sun, 22 Jan 2023 23:04:06 +0530 Subject: [PATCH 013/146] apx: init at 1.4.2 --- pkgs/tools/package-management/apx/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/package-management/apx/default.nix diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix new file mode 100644 index 000000000000..77fed6e67e7d --- /dev/null +++ b/pkgs/tools/package-management/apx/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, installShellFiles +, docker +, distrobox +}: + +buildGoModule rec { + pname = "apx"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "Vanilla-OS"; + repo = pname; + rev = version; + sha256 = "sha256-BswX4Jo/RReM/tXo29V9rIvKjN8ylECPe0oo0FCQcGY="; + }; + + vendorSha256 = null; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + postInstall = '' + mkdir -p $out/etc/apx + + cat > "$out/etc/apx/config.json" < Date: Sun, 22 Jan 2023 09:50:26 -0800 Subject: [PATCH 014/146] python310Packages.pycaption: 2.1.0 -> 2.1.1 https://github.com/pbs/pycaption/releases/tag/2.1.1 --- pkgs/development/python-modules/pycaption/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index c9dc3bf8e112..ad1c7c1cec50 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -5,13 +5,14 @@ , beautifulsoup4 , lxml , cssutils +, nltk , pytest-lazy-fixture , pytestCheckHook }: buildPythonPackage rec { pname = "pycaption"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; @@ -19,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-mV//EYdP7wKYD3Vc49z6LQVQeOuhzNKFZLf28RYdABk="; + hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I="; }; propagatedBuildInputs = [ @@ -28,6 +29,10 @@ buildPythonPackage rec { cssutils ]; + passthru.optional-dependencies = { + transcript = [ nltk ]; + }; + nativeCheckInputs = [ pytest-lazy-fixture pytestCheckHook From 6803ef067fe6b669d9c6db0ca017cec6ec344be7 Mon Sep 17 00:00:00 2001 From: Georgy Kibardin Date: Sun, 22 Jan 2023 22:11:34 +0300 Subject: [PATCH 015/146] lazpaint: 7.1.5 -> 7.2.2 --- .../applications/graphics/lazpaint/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 37ad3387f834..91562bb5d49e 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -7,24 +7,24 @@ let bgrabitmap = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgrabitmap"; - rev = "v11.2.5"; - sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1"; + rev = "v11.5.3"; + sha256 = "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8="; }; bgracontrols = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgracontrols"; - rev = "v7.0"; - sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy"; + rev = "v7.6"; + sha256 = "sha256-btg9DMdYg+C8h0H7MU+uoo2Kb4OeLHoxFYHAv7LbLBA="; }; in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.1.5"; + version = "7.2.2"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; rev = "v${version}"; - sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5"; + sha256 = "sha256-J6s0GnGJ7twEYW5+B72bB3EX4AYvLnhSPLbdhZWzlkw="; }; nativeBuildInputs = [ lazarus fpc makeWrapper ]; @@ -33,6 +33,10 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + preConfigure = '' + patchShebangs configure + ''; + buildPhase = '' cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols @@ -47,6 +51,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Reuse existing install script + substituteInPlace Makefile --replace "/bin/bash" $BASH cd lazpaint/release/debian substituteInPlace makedeb.sh --replace "rm -rf" "ls" patchShebangs ./makedeb.sh @@ -64,6 +69,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; - broken = true; # 2022-11-16 }; } From ab9efae911964d48812d1310d8f23fc0fde70acf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 21:56:27 +0000 Subject: [PATCH 016/146] python310Packages.pylsp-mypy: 0.6.4 -> 0.6.5 --- pkgs/development/python-modules/pylsp-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index d5d03eb3ab44..02139d368247 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-BpYg2noReHFgJ/5iQI09XUWNAN7UdcYgqpZ/IPr17Ao="; + hash = "sha256-LQ9Kw/dG3XA67WaVObE72fxERb21eZzk+MCqIp2Qy0o="; }; propagatedBuildInputs = [ From ee00af7a32def3d4d9b3e8d7f7f74e053432b9db Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 22 Jan 2023 15:12:40 -0800 Subject: [PATCH 017/146] attrsets: clarify that mapAttrs maps over *leaf* attrs --- lib/attrsets.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1a7b90593b1d..23d4a762f2fb 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -480,8 +480,10 @@ rec { /* Like `mapAttrs`, except that it recursively applies itself to - attribute sets. Also, the first argument of the argument - function is a *list* of the names of the containing attributes. + the *leaf* attributes of a potentially-nested attribute set: + the second argument of the function will never be an attrset. + Also, the first argument of the argument function is a *list* + of the names of the containing attributes. Example: mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) From a7f3447fbbca8ec524801bfaf512a74ee170996e Mon Sep 17 00:00:00 2001 From: dev-null-undefined Date: Mon, 23 Jan 2023 03:23:59 +0100 Subject: [PATCH 018/146] armcord: fix gsettings crash when selecting file --- .../networking/instant-messengers/armcord/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index bfe7ca2fcbd8..0c43ffbeea91 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , dpkg , makeWrapper +, wrapGAppsHook , alsa-lib , at-spi2-atk , at-spi2-core @@ -53,7 +54,9 @@ stdenv.mkDerivation rec { }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; buildInputs = [ alsa-lib @@ -109,6 +112,8 @@ stdenv.mkDerivation rec { # Wrap the startup command makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ "''${gappsWrapperArgs[@]}" From 00a6553266333d01236d4ebeaf769a1802c4e85a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 23 Jan 2023 11:59:57 +0800 Subject: [PATCH 019/146] nixos/gnome-documents: remove We disabled this in gnome module starting from dcbad82 and the package was removed e84c8d6. --- nixos/modules/module-list.nix | 1 - nixos/modules/programs/gnome-documents.nix | 54 ---------------------- nixos/modules/rename.nix | 1 + 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 nixos/modules/programs/gnome-documents.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 45a7acdedc41..cccd28d7c3c7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -172,7 +172,6 @@ ./programs/geary.nix ./programs/git.nix ./programs/gnome-disks.nix - ./programs/gnome-documents.nix ./programs/gnome-terminal.nix ./programs/gnupg.nix ./programs/gpaste.nix diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix deleted file mode 100644 index 2831ac9aff2e..000000000000 --- a/nixos/modules/programs/gnome-documents.nix +++ /dev/null @@ -1,54 +0,0 @@ -# GNOME Documents. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - meta = { - maintainers = teams.gnome.members; - }; - - # Added 2019-08-09 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome" "gnome-documents" "enable" ] - [ "programs" "gnome-documents" "enable" ]) - ]; - - ###### interface - - options = { - - programs.gnome-documents = { - - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to enable GNOME Documents, a document - manager application for GNOME. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.programs.gnome-documents.enable { - - environment.systemPackages = [ pkgs.gnome.gnome-documents ]; - - services.dbus.packages = [ pkgs.gnome.gnome-documents ]; - - services.gnome.gnome-online-accounts.enable = true; - - services.gnome.gnome-online-miners.enable = true; - - }; - -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d88baac7a5d4..b92561ed4859 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -36,6 +36,7 @@ with lib; '') (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) From 1b00e5af2fdff56affeb1f2c00db5b035c08fdcc Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 22 Jan 2023 23:47:20 -0500 Subject: [PATCH 020/146] waydroid: Add missing ambiant dependencies Fixes #211741 `waydroid first-launch` would fail due to missing gobject introspection bindings for Gtk. ``` ( ) [ ] ERROR: Namespace Gtk not available ( ) [ ] See also: ( ) [ ] Traceback (most recent call last): File "/nix/store/7c0jjr0jid4xhfdsv13jiwp7q4jl9khi-waydroid-1.3.3/lib/waydroid/tools/__init__.py", line 113, in main actions.remote_init_client(args) File "/nix/store/7c0jjr0jid4xhfdsv13jiwp7q4jl9khi-waydroid-1.3.3/lib/waydroid/tools/actions/initializer.py", line 205, in remote_init_client gi.require_version("Gtk", "3.0") File "/nix/store/y09awdg92zm58958q6bc6chacw35pfgm-python3.10-pygobject-3.42.2/lib/python3.10/site-packages/gi/__init__.py", line 126, in require_version raise ValueError('Namespace %s not available' % namespace) ValueError: Namespace Gtk not available ``` These changes add the necessary environment (the currently idiomatic way to solve such problems) to the existing wrapper. The use in `preFixup` is necessary, as the gapps wrapper will not have ran the required hooks before. The addition of `gobject-introspection` is necessary for the wrappers hooks to add GIR repositories to the wrapper args. --- pkgs/os-specific/linux/waydroid/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index efa21cfb26b5..8955bcfa5126 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -4,12 +4,15 @@ , dnsmasq , gawk , getent +, gobject-introspection +, gtk3 , kmod , lxc , iproute2 , nftables , util-linux , which +, wrapGAppsHook , xclip }: @@ -25,6 +28,15 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI="; }; + buildInputs = [ + gtk3 + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ gbinder-python pyclip @@ -35,9 +47,14 @@ python3Packages.buildPythonApplication rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; + dontWrapGApps = true; installPhase = '' make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} From 8145499e9c4186256ff20007643e49f02a8264a6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 Jan 2023 07:03:27 +0100 Subject: [PATCH 021/146] =?UTF-8?q?ocamlPackages.lutils:=201.51.2=20?= =?UTF-8?q?=E2=86=92=201.54.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/lutils/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix index c462eb9fe15d..20501e82451c 100644 --- a/pkgs/development/ocaml-modules/lutils/default.nix +++ b/pkgs/development/ocaml-modules/lutils/default.nix @@ -1,20 +1,18 @@ -{ lib, buildDunePackage, fetchurl, num }: +{ lib, buildDunePackage, fetchurl, camlp-streams, num }: buildDunePackage rec { pname = "lutils"; - version = "1.51.2"; - - useDune2 = true; + version = "1.54.1"; minimalOCamlVersion = "4.02"; src = fetchurl { - url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.1.51.2.tgz"; - sha512 = "f94696be379c62e888410ec3d940c888ca4b607cf59c2e364e93a2a694da65ebe6d531107198b795e80eecc3c6865eedb02659c7e7c4e15c9b28d74aa35d09f8"; + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${version}.tgz"; + hash = "sha512:d3c3b80286b1aa236ba922d9e18a133721fc80126c8b89520fb811dce9400e217aaa75b5d49e03988be7f6bf5f2e1a391d02ceeaa5ec0a0cd5ce218083a29514"; }; propagatedBuildInputs = [ - num + camlp-streams num ]; meta = with lib; { From e3374aff8a747472bafe7cfab2116f362f852590 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 23 Jan 2023 08:52:02 +0100 Subject: [PATCH 022/146] manifest-tool: init at v2.0.6 --- .../tools/manifest-tool/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/tools/manifest-tool/default.nix diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix new file mode 100644 index 000000000000..21e7f35ab6db --- /dev/null +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, stdenv +, testers +, manifest-tool +}: + +buildGoModule rec { + pname = "manifest-tool"; + version = "2.0.6"; + gitCommit = "2ed9312726765567a84f2acc44a0c8a6e50f4b7a"; + modRoot = "v2"; + + src = fetchFromGitHub { + owner = "estesp"; + repo = "manifest-tool"; + rev = "v${version}"; + sha256 = "sha256-oopk++IdNF6msxOszT0fKxQABgWKbaQZ2aNH9chqWU0="; + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse HEAD > $out/.git-revision + rm -rf $out/.git + ''; + }; + + vendorHash = null; + + nativeBuildInputs = [ git ]; + + preConfigure = '' + ldflags="-X main.gitCommit=$(cat .git-revision)" + ''; + + passthru.tests.version = testers.testVersion { + package = manifest-tool; + }; + + meta = with lib; { + description = "Command line tool to create and query container image manifest list/indexes"; + homepage = "https://github.com/estesp/manifest-tool"; + license = licenses.asl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afab231cfb9b..1dee9e3c9fcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8893,6 +8893,8 @@ with pkgs; mani = callPackage ../development/tools/mani { }; + manifest-tool = callPackage ../development/tools/manifest-tool { }; + mask = callPackage ../development/tools/mask { }; mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; From 2c5768fe8fbed772548f63165ee58f7bd94dbfce Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 23 Jan 2023 09:22:25 +0100 Subject: [PATCH 023/146] manifest-tool: add static binary support --- pkgs/development/tools/manifest-tool/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix index 21e7f35ab6db..6282619535b9 100644 --- a/pkgs/development/tools/manifest-tool/default.nix +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -33,6 +33,11 @@ buildGoModule rec { ldflags="-X main.gitCommit=$(cat .git-revision)" ''; + CGO_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + GO_EXTLINK_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + ldflags = lib.optionals stdenv.hostPlatform.isStatic [ "-w" "-extldflags" "-static" ]; + tags = lib.optionals stdenv.hostPlatform.isStatic [ "netgo" ]; + passthru.tests.version = testers.testVersion { package = manifest-tool; }; From c89e19eefed61f165b83eab32c59c046b8099a04 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 23 Jan 2023 10:55:21 +0100 Subject: [PATCH 024/146] peering-manager: 1.7.3 -> 1.7.4 --- .../web-apps/peering-manager/default.nix | 8 +--- .../peering-manager/redis-unix-sock.patch | 47 ------------------- 2 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index dd60980e3290..8b6e77ec0f1f 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -32,19 +32,15 @@ let in py.pkgs.buildPythonApplication rec { pname = "peering-manager"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vrRMdqEpsps4ZKgunMhznJr/TQ9+WVMNYFu76ZU7iMI="; + sha256 = "sha256-mXva4c5Rtjq/jFJl3yGGlVrggzGJ3awN0+xoDnDWBSA="; }; - patches = [ - ./redis-unix-sock.patch - ]; - format = "other"; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch b/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch deleted file mode 100644 index 5db0d0dd0125..000000000000 --- a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 1e64a7f6ca456249305f6a3c90f9acf84af194db -Author: Yureka -Date: Tue Nov 29 14:03:08 2022 +0100 - - support unix sockets for redis connections - -diff --git a/peering_manager/settings.py b/peering_manager/settings.py -index 739d6ff..b5edf4d 100644 ---- a/peering_manager/settings.py -+++ b/peering_manager/settings.py -@@ -270,6 +270,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get("PASSWORD", "") - TASKS_REDIS_DATABASE = TASKS_REDIS.get("DATABASE", 0) - TASKS_REDIS_DEFAULT_TIMEOUT = TASKS_REDIS.get("DEFAULT_TIMEOUT", 300) - TASKS_REDIS_SSL = TASKS_REDIS.get("SSL", False) -+TASKS_REDIS_UNIX_SOCKET_PATH = TASKS_REDIS.get("UNIX_SOCKET_PATH", "") - if "DEFAULT_TIMEOUT" in TASKS_REDIS: - warnings.warn( - "DEFAULT_TIMEOUT is no longer supported under REDIS configuration. Set RQ_DEFAULT_TIMEOUT instead." -@@ -294,6 +295,7 @@ CACHING_REDIS_PASSWORD = CACHING_REDIS.get("PASSWORD", "") - CACHING_REDIS_DATABASE = CACHING_REDIS.get("DATABASE", 0) - CACHING_REDIS_DEFAULT_TIMEOUT = CACHING_REDIS.get("DEFAULT_TIMEOUT", 300) - CACHING_REDIS_SSL = CACHING_REDIS.get("SSL", False) -+CACHING_REDIS_UNIX_SOCKET_PATH = CACHING_REDIS.get("UNIX_SOCKET_PATH", "") - - if CACHING_REDIS_USING_SENTINEL: - CACHEOPS_SENTINEL = { -@@ -301,6 +303,8 @@ if CACHING_REDIS_USING_SENTINEL: - "service_name": CACHING_REDIS_SENTINEL_SERVICE, - "db": CACHING_REDIS_DATABASE, - } -+elif CACHING_REDIS_UNIX_SOCKET_PATH != "": -+ CACHEOPS_REDIS = f"unix://{CACHING_REDIS_UNIX_SOCKET_PATH}?db={CACHING_REDIS_DATABASE}" - else: - REDIS_CACHE_CON_STRING = "rediss://" if CACHING_REDIS_SSL else "redis://" - if CACHING_REDIS_PASSWORD: -@@ -334,6 +338,11 @@ if TASKS_REDIS_USING_SENTINEL: - "SOCKET_TIMEOUT": None, - "CONNECTION_KWARGS": {"socket_connect_timeout": TASKS_REDIS_DEFAULT_TIMEOUT}, - } -+elif TASKS_REDIS_UNIX_SOCKET_PATH != "": -+ RQ_PARAMS = { -+ "UNIX_SOCKET_PATH": TASKS_REDIS_UNIX_SOCKET_PATH, -+ "DB": TASKS_REDIS_DATABASE, -+ } - else: - RQ_PARAMS = { - "HOST": TASKS_REDIS_HOST, From 7de8daa4b5caab9015d39ac585cb2fc6e4d2ecea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Jan 2023 13:55:01 +0100 Subject: [PATCH 025/146] libpcap: remove with lib over entire file --- pkgs/development/libraries/libpcap/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 443e4de04d9e..312e1dbf87cd 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -10,8 +10,6 @@ , withRemote ? false }: -with lib; - stdenv.mkDerivation rec { pname = "libpcap"; version = "1.10.1"; @@ -21,20 +19,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; }; - buildInputs = optionals withRemote [ libxcrypt ]; + buildInputs = lib.optionals withRemote [ libxcrypt ]; nativeBuildInputs = [ flex bison ] - ++ optionals withBluez [ bluez.dev pkg-config ]; + ++ lib.optionals withBluez [ bluez.dev pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. configureFlags = [ "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-universal" - ] ++ optionals withRemote [ + ] ++ lib.optionals withRemote [ "--enable-remote" - ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) + ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ]; postInstall = '' @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; platforms = platforms.unix; From 9f0ca1220abcb6f6489119d009440bc95ff19aa0 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 23 Jan 2023 15:47:42 +0100 Subject: [PATCH 026/146] platformio: 6.1.5 -> 6.1.6 https://github.com/platformio/platformio-core/releases/tag/v6.1.6 --- pkgs/development/embedded/platformio/default.nix | 4 ++-- .../embedded/platformio/use-local-spdx-license-list.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 241914fa3e1e..6fd8592a12cf 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -3,14 +3,14 @@ let callPackage = newScope self; - version = "6.1.5"; + version = "6.1.6"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "sha256-7Wx3O2zL5Dlbk7rooiHutpN63kAjhuYijgsZru+oaOI="; + sha256 = "sha256-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms="; }; self = { diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index 1f809822cb58..6db8585a55f3 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,13 +6,13 @@ index 1e5f935a..26d1ac6a 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.18" +- version = "3.19" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version - ) - return json.loads(fetch_remote_content(spdx_data_url)) -+ # version = "3.18" ++ # version = "3.19" + # spdx_data_url = ( + # "https://raw.githubusercontent.com/spdx/license-list-data/" + # "v%s/json/licenses.json" % version From 3cde183232d75b8b1c286dc44c934cb55bafab18 Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Mon, 23 Jan 2023 20:11:07 +0500 Subject: [PATCH 027/146] autorandr: 1.13.1 -> 1.13.2 --- pkgs/tools/misc/autorandr/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index bffb09c098da..85808e43c49c 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -4,14 +4,15 @@ , fetchFromGitHub , systemd , xrandr -, installShellFiles }: +, installShellFiles +, desktop-file-utils }: python3.pkgs.buildPythonApplication rec { pname = "autorandr"; - version = "1.13.1"; + version = "1.13.2"; format = "other"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.packaging ]; buildPhase = '' @@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { owner = "phillipberndt"; repo = "autorandr"; rev = "refs/tags/${version}"; - sha256 = "sha256-702x4O0rHW/VZIfu1+5G1gBSDQYVoAx167igz/M3Ea4="; + sha256 = "sha256-Yn950V7DgLhwYSoGyUvjTH0Vwg/FodxhKsBP5iLTgqA="; }; meta = with lib; { From 74cd601e9c2dacaa32a7e24d8cbdb004c40a344f Mon Sep 17 00:00:00 2001 From: Thomas BESSOU Date: Mon, 23 Jan 2023 18:58:02 +0100 Subject: [PATCH 028/146] smartgithg: 22.1.1 -> 22.1.3 --- pkgs/applications/version-management/smartgithg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 15d26406bb8d..362f13becfaa 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.1"; + version = "22.1.3"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-twN1Clnj17A2IUOOhvs8hs6PuvC81j9GqF0yKIk3IkQ="; + sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4="; }; nativeBuildInputs = [ wrapGAppsHook ]; From bf58eaf728fce6092ab1b9dc2391be23cbcc0618 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Jan 2023 16:35:14 -0500 Subject: [PATCH 029/146] hck: 0.7.5 -> 0.8.2 Diff: https://github.com/sstadick/hck/compare/v0.7.5...v0.8.2 Changelog: https://github.com/sstadick/hck/blob/v0.8.2/CHANGELOG.md --- pkgs/tools/text/hck/default.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index a888e7655241..c94580588056 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -3,26 +3,27 @@ , fetchFromGitHub , cmake , stdenv -, CoreFoundation -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.7.5"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-29uxcbqAnWCdxKqVdrMVtorXvSLUC+jlt4YwE19Gh+A="; + sha256 = "sha256-66wunZuRAJ6QVWgBUy2+HGaow33F5+16LitGSQC4kCE="; }; - cargoSha256 = "sha256-VHuzv6Zq83byXDEEyYDtlaPC4DZ3GNJaJfO0ACrrqO8="; + cargoSha256 = "sha256-4CAj94wm9qxr9wejD2ffKSdRV1UeofMhxNxLi++At+I="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # link System as a dylib instead of a framework on macos postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d7229e7d07b..2912b9ff2ded 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37205,9 +37205,7 @@ with pkgs; gummy = callPackage ../tools/misc/gummy { }; - hck = callPackage ../tools/text/hck { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + hck = callPackage ../tools/text/hck { }; helm = callPackage ../applications/audio/helm { }; From 451193a309576f04a173a175a5c147f0b5fb7382 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:52:31 +0100 Subject: [PATCH 030/146] dolphin-emu-beta: fix build on aarch64 platforms --- pkgs/applications/emulators/dolphin-emu/master.nix | 5 +++++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 83da181f24b4..7f68b5821495 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -141,6 +141,9 @@ stdenv.mkDerivation rec { "--set QT_XCB_NO_XI2 1" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + # Use nix-provided libraries instead of submodules postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ @@ -187,5 +190,7 @@ stdenv.mkDerivation rec { xfix ivar ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d7229e7d07b..6cd46c486ba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2206,8 +2206,13 @@ with pkgs; dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; + stdenv = + if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv + # https://github.com/NixOS/nixpkgs/issues/201254 + else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv + else stdenv; }; dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { From 3055e5d16c5fe978977fca1d0a456f14d723d7b3 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 24 Jan 2023 00:36:27 +0000 Subject: [PATCH 031/146] gotags: use buildGoModule --- pkgs/development/tools/gotags/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index c4c0b7cbb06f..9fa71187aa31 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gotags"; version = "1.4.1"; @@ -8,10 +8,20 @@ buildGoPackage rec { owner = "jstemmer"; repo = pname; rev = "4c0c4330071a994fbdfdff68f412d768fbcca313"; - sha256 = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; + hash = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; }; - goPackagePath = "github.com/jstemmer/gotags"; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/jstemmer/gotags/commit/9146999bce9a88e15b5f123d1aa1613926dd9a9c.patch"; + hash = "sha256-6v/Ws15y50S6iCI1c0kEw5WHSg+1WqVT4mwdQKoi5G8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "ctags-compatible tag generator for Go"; From 1d0d0a31ec7b96a6aad62b99694dcb9926da7854 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 24 Jan 2023 00:41:43 +0000 Subject: [PATCH 032/146] json-plot: use buildGoModule --- .../graphics/json-plot/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/json-plot/default.nix b/pkgs/applications/graphics/json-plot/default.nix index 9b43518a87d2..39c4b45cd1d6 100644 --- a/pkgs/applications/graphics/json-plot/default.nix +++ b/pkgs/applications/graphics/json-plot/default.nix @@ -1,10 +1,9 @@ { lib , fetchFromGitHub -, buildGoPackage +, fetchpatch +, buildGoModule }: -# upstream is pretty stale, but it still works, so until they merge module -# support we have to use gopath: see sgreben/jp#29 -buildGoPackage rec { +buildGoModule rec { pname = "json-plot"; version = "1.1.12"; @@ -15,7 +14,17 @@ buildGoPackage rec { hash = "sha256-WWARAh/CF3lGli3VLRzAGaCA8xQyryPi8WcuwvdInjk="; }; - goPackagePath = "github.com/sgreben/jp"; + vendorHash = "sha256-EPrlaUHAGATNFv3qgWKGmJdu9EHsV/0DJKEvQck+fWc="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/sgreben/jp/commit/9516fb4d7c5b011071b4063ea8e8e9667e57a777.patch"; + hash = "sha256-Vz5HnStrCpMN1L7dne7JDX5F57up3EBPPf/9hN9opRc="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Dead simple terminal plots from JSON (or CSV) data. Bar charts, line charts, scatter plots, histograms and heatmaps are supported."; From 51c953ff762638c25602180adf81f729cb12434a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 24 Jan 2023 01:04:06 +0000 Subject: [PATCH 033/146] sift: use buildGoModule --- pkgs/tools/text/sift/default.nix | 33 +++++++++++++++++++------------- pkgs/tools/text/sift/deps.nix | 29 ---------------------------- 2 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 pkgs/tools/text/sift/deps.nix diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index f282c28f8fe1..1e79570622c0 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,27 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "sift"; version = "0.9.0"; - rev = "v${version}"; - goPackagePath = "github.com/svent/sift"; + src = fetchFromGitHub { + owner = "svent"; + repo = "sift"; + rev = "v${version}"; + hash = "sha256-IZ4Hwg5NzdSXtrIDNxtkzquuiHQOmLV1HSx8gpwE/i0="; + }; + + vendorHash = "sha256-y883la4R4jhsS99/ohgBC9SHggybAq9hreda6quG3IY="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/svent/sift/commit/b56fb3d0fd914c8a6c08b148e15dd8a07c7d8a5a.patch"; + hash = "sha256-mFCEpkgQ8XDPRQ3yKDZ5qY9tKGSuHs+RnhMeAlx33Ng="; + }) + ]; nativeBuildInputs = [ installShellFiles ]; - src = fetchFromGitHub { - inherit rev; - owner = "svent"; - repo = "sift"; - sha256 = "0bgy0jf84z1c3msvb60ffj4axayfchdkf0xjnsbx9kad1v10g7i1"; - }; + ldflags = [ "-s" "-w" ]; postInstall = '' - installShellCompletion --cmd sift --bash go/src/github.com/svent/sift/sift-completion.bash + installShellCompletion --cmd sift --bash sift-completion.bash ''; - goDeps = ./deps.nix; - meta = with lib; { description = "A fast and powerful alternative to grep"; homepage = "https://sift-tool.org"; diff --git a/pkgs/tools/text/sift/deps.nix b/pkgs/tools/text/sift/deps.nix deleted file mode 100644 index 038555fa3cab..000000000000 --- a/pkgs/tools/text/sift/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/svent/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/svent/go-flags"; - rev = "4bcbad344f0318adaf7aabc16929701459009aa3"; - sha256 = "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34"; - }; - } - { - goPackagePath = "github.com/svent/go-nbreader"; - fetch = { - type = "git"; - url = "https://github.com/svent/go-nbreader"; - rev = "7cef48da76dca6a496faa7fe63e39ed665cbd219"; - sha256 = "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r"; - }; - } -] From 6e0448abf785860f8d8701bd07e6bfc65500b953 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 24 Jan 2023 04:20:00 +0000 Subject: [PATCH 034/146] nodejs-19_x: 19.4.0 -> 19.5.0 https://github.com/nodejs/node/releases/tag/v19.5.0 --- pkgs/development/web/nodejs/v19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index 454d647dad2c..b9cd476a1941 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.4.0"; - sha256 = "0qdj67dgxbjpllm2z9vm46c50s3dqk8a34hbp81vsa7mf3b42182"; + version = "19.5.0"; + sha256 = "sha256-KBMXvce6iVITi/jw9fB2SV95+G6FGmWb4fmD3sM8pXc="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch From ecc96fa8ce5cd1ea1553a141e1944c4f4df53d84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 24 Jan 2023 04:20:00 +0000 Subject: [PATCH 035/146] _1password: 2.12.0 -> 2.13.0 --- pkgs/applications/misc/1password/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index d0ace35400d5..e7f094844b9a 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.12.0"; + version = "2.13.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-WCu1/5dewsjVMyFo+BaAgCOcK08Fe3ldJhDzCl8B+2M=" "zip"; - i686-linux = fetch "linux_386" "sha256-eRNX7+IF9v3JzXxwp5WshqYOC5/uizniWOKSc3q2yL8=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-wvhWwcDufwvh8Isx4QpyyHEJ+3yU7f/0a4r5Itns68c=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-ZOU4huC1FUj0ZiqIgs+4tU8t/w5VVD/UiWGVFHS50sw=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-B9XVejPge8wxWAoxj974rLz0dfaZEAaGn2mUcPeqFIo=" "zip"; + i686-linux = fetch "linux_386" "sha256-kLW9PmhCNDosKn1nmtzo8tBjBOaUyzqlLad332UACio=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-jbvkTlIuAm5tHzGm42kO+jykUffKwfOVSOh33i0URtM=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-kA+NjXrNcX0dKh+gNJT82vbQGKFOU8zPvGPqBtuBqOA=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; From f9d18ffe5834305924f0fc5e43d0c8aae56d75d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 24 Jan 2023 01:02:59 -0500 Subject: [PATCH 036/146] lib.maintainers.doublec: remove --- maintainers/maintainer-list.nix | 6 ------ pkgs/development/interpreters/self/default.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e11e93f9735b..c3e1496c93be 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3747,12 +3747,6 @@ fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; }]; }; - doublec = { - email = "chris.double@double.co.nz"; - github = "doublec"; - githubId = 16599; - name = "Chris Double"; - }; dpaetzel = { email = "david.paetzel@posteo.de"; github = "dpaetzel"; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 58cac6bbe9b1..0da843d3f1a3 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; homepage = "https://selflanguage.org/"; license = licenses.bsd3; - maintainers = [ maintainers.doublec ]; + maintainers = [ ]; platforms = platforms.linux; }; } From af3f74b2d937d8312bcda489cdb5ff8aa009d4c0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Jan 2023 07:31:58 +0100 Subject: [PATCH 037/146] =?UTF-8?q?ott:=200.32=20=E2=86=92=200.33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/ott/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 4b7166ad9986..bbc96b2b681c 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ocaml, opaline }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ocamlPackages, opaline }: stdenv.mkDerivation rec { pname = "ott"; - version = "0.32"; + version = "0.33"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "sha256-vdDsfsIi1gRW1Sowf29VyQ4C5UKyQZaVgS2uTb8VeW4="; + hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE="; }; nativeBuildInputs = [ pkg-config opaline ]; - buildInputs = [ ocaml ]; + buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph ]; installTargets = "ott.install"; From d1375763018d381f002f6cd8e58794441b5258ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 08:36:28 +0100 Subject: [PATCH 038/146] python310Packages.fakeredis: 2.4.0 -> 2.5.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.4.0...v2.5.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.5.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 0352a4e7d174..e2c64333df02 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.4.0"; + version = "2.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-LKUDwx3EEcOQFhUjTe5xm3AQRuwTGsYY27Vmg2R9ofc="; + hash = "sha256-yb6Tuko7swrrFRQmtXAhm1kl16O813epOOCzOMEg58E="; }; nativeBuildInputs = [ From a6a3e0ef25760897229f6d00061ccc7c077f99fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 09:57:57 +0100 Subject: [PATCH 039/146] python310Packages.sfrbox-api: 0.0.4 -> 0.0.5 Changelog: https://github.com/hacf-fr/sfrbox-api/releases/tag/v0.0.5 --- pkgs/development/python-modules/sfrbox-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 12bf293a77d2..208e8b13a427 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sfrbox-api"; - version = "0.0.4"; + version = "0.0.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mdE7H17vbKwQS7JloYasap8qAjaacdLuDPvIPxJSUXI="; + hash = "sha256-6SwZAAWBnxeeunZwUAVQJBU8904czNVheBlRFg5yrOw="; }; postPatch = '' From 25b73ca0bac9c866060531dbee84f8caf2239d23 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 24 Jan 2023 09:00:10 +0000 Subject: [PATCH 040/146] protoscope: unstable-2022-10-04 -> unstable-2022-11-09 --- pkgs/development/tools/protoscope/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/protoscope/default.nix b/pkgs/development/tools/protoscope/default.nix index 12c120196f23..70eeab5f1575 100644 --- a/pkgs/development/tools/protoscope/default.nix +++ b/pkgs/development/tools/protoscope/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoscope"; - version = "unstable-2022-10-04"; + version = "unstable-2022-11-09"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protoscope"; - rev = "8b1d63939ee1a5d922b38f3976e1e58cae525163"; - sha256 = "sha256-/vt02rvKVsryJZ+Bw4QLaGzDErGI04/4NUbSBkbbN3Y="; + rev = "8e7a6aafa2c9958527b1e0747e66e1bfff045819"; + hash = "sha256-+VIy+CD6bKJzwtpHXRr9MqmsPE2MJ1dRdtvSMUkCh5I="; }; - vendorSha256 = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; + vendorHash = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; ldflags = [ "-s" "-w" ]; From a861f51bc82edde8b96f3ec6ccd633a544b5ec80 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 24 Jan 2023 09:05:04 +0000 Subject: [PATCH 041/146] gcsfuse: 0.41.10 -> 0.41.12 --- pkgs/tools/filesystems/gcsfuse/default.nix | 31 +++++++++------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index c0cd784aed47..02fa3de810b2 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,33 +5,28 @@ buildGoModule rec { pname = "gcsfuse"; - version = "0.41.10"; + version = "0.41.12"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; - rev = "refs/tags/v${version}"; - hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; + rev = "v${version}"; + hash = "sha256-s28vtcNodc5IL8SnZLTgSQBTPUf0FiIAv3TxZXMDuYE="; }; - vendorSha256 = null; + vendorHash = null; - subPackages = [ - "." - "tools/mount_gcsfuse" - ]; + subPackages = [ "." "tools/mount_gcsfuse" ]; - ldflags = [ - "-s" - "-w" - "-X main.gcsfuseVersion=${version}" - ]; + ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; preCheck = - let skippedTests = [ - "Test_Main" - "TestFlags" - ]; in + let + skippedTests = [ + "Test_Main" + "TestFlags" + ]; + in '' # Disable flaky tests buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") @@ -42,7 +37,7 @@ buildGoModule rec { ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; - meta = with lib;{ + meta = with lib; { description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; From bdcb0559d05344f7a5383e4dc59abd34d97f31c1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 19 Jan 2023 08:58:43 +0000 Subject: [PATCH 042/146] txtpbfmt: unstable-2022-06-08 -> unstable-2023-01-18 --- pkgs/development/tools/txtpbfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix index 3f1c9eab0475..a4e26cfb4cb6 100644 --- a/pkgs/development/tools/txtpbfmt/default.nix +++ b/pkgs/development/tools/txtpbfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "txtpbfmt"; - version = "unstable-2022-06-08"; + version = "unstable-2023-01-18"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b"; - sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM="; + rev = "fcc1fa29197ce17bc56812f84f5ff311f767fcd1"; + hash = "sha256-U+Kk2tQw+rJX7Xa8b5Hd7x0xY/6PN6TTYsLJkpB1Osg="; }; - vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; + vendorHash = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; ldflags = [ "-s" "-w" ]; From 3f21979fb1a04b5aff86cf1fc60d880e334130a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 09:30:48 +0000 Subject: [PATCH 043/146] rasdaemon: 0.6.8 -> 0.7.0 --- pkgs/os-specific/linux/rasdaemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix index cccd91fff8e1..35201d49b7f0 100644 --- a/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/pkgs/os-specific/linux/rasdaemon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rasdaemon"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; rev = "v${version}"; - sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q="; + sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg="; }; nativeBuildInputs = [ autoreconfHook ]; From 427acb2e1cc4ce9e83d0bf3da1e85188203a5dac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 09:42:49 +0000 Subject: [PATCH 044/146] haproxy: 2.6.6 -> 2.7.2 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 7928905762e5..1453fea66f53 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.6.6"; + version = "2.7.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-0MgMkMBK55WYtYuXSdU3h/APe1FRdefYID8nluamWU0="; + sha256 = "sha256-Y7xuwDAtDrvh+nacGWBmQN6DSsjLB0R7gHmctWPcDz8="; }; buildInputs = [ openssl zlib libxcrypt ] From ac0d4f035f756f8da7ba65b3292c6799bcbdadc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 24 Jan 2023 13:55:01 +0100 Subject: [PATCH 045/146] dwarf-fortress: set PRINT_MODE:STANDARD on macOS Fixes https://github.com/NixOS/nixpkgs/issues/204851 --- pkgs/games/dwarf-fortress/wrapper/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 89f980f8d5bc..a4433821d20d 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -56,7 +56,11 @@ let settings_ = lib.recursiveUpdate { init = { - PRINT_MODE = if enableTextMode then "TEXT" else if enableTWBT then "TWBT" else null; + PRINT_MODE = + if enableTextMode then "TEXT" + else if enableTWBT then "TWBT" + else if stdenv.hostPlatform.isDarwin then "STANDARD" # https://www.bay12games.com/dwarves/mantisbt/view.php?id=11680 + else null; INTRO = enableIntro; TRUETYPE = enableTruetype; FPS = enableFPS; From 17368ed4a478290466ae2091a35e05b720910cd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 14:26:01 +0100 Subject: [PATCH 046/146] python310Packages.anybadge: add changelog to meta - disable on unsuppoorted Python releases --- pkgs/development/python-modules/anybadge/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index fd17aa0c11e7..f4d35e00e258 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -9,11 +10,13 @@ buildPythonPackage rec { version = "1.14.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "jongracecox"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; + hash = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; }; # setup.py reads its version from the TRAVIS_TAG environment variable @@ -30,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool for generating badges for your projects"; homepage = "https://github.com/jongracecox/anybadge"; + changelog = "https://github.com/jongracecox/anybadge/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fabiangd ]; }; From a2b16c5a3a147aada68d4f027a38a39b66254f73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 14:31:06 +0100 Subject: [PATCH 047/146] python310Packages.anybadge: add missing inputs - disable failing tests --- .../python-modules/anybadge/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index f4d35e00e258..0418de37a251 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -1,8 +1,10 @@ { lib -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub +, packaging , pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { @@ -22,8 +24,23 @@ buildPythonPackage rec { # setup.py reads its version from the TRAVIS_TAG environment variable TRAVIS_TAG = "v${version}"; + propagatedBuildInputs = [ + packaging + ]; + nativeCheckInputs = [ pytestCheckHook + requests + ]; + + disabledTests = [ + # Comparison of CLI output fails + "test_module_same_output_as_main_cli" + ]; + + disabledTestPaths = [ + # No anybadge-server + "tests/test_server.py" ]; pythonImportsCheck = [ From 753281ea0a5f792ac34cabeb249eb39becba8285 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 14:42:05 +0000 Subject: [PATCH 048/146] python310Packages.flowlogs_reader: 4.0.0 -> 5.0.0 --- pkgs/development/python-modules/flowlogs_reader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index accc4472b43c..50bcdc78e14f 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flowlogs-reader"; - version = "4.0.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { repo = pname; # https://github.com/obsrvbl/flowlogs-reader/issues/57 rev = "refs/tags/v${version}"; - hash = "sha256-PGyuzOhq1TC/nGsGJYQYTDpcsYzcwNPiaHWd66tfzQQ="; + hash = "sha256-XHRibTSzFzWPz50elz+KdbCwTrd1DKfVMSg6UamNbzc="; }; propagatedBuildInputs = [ From ea0e8794bd4dd6a22419614ca4d04b73a3714b95 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 20 Jan 2023 13:16:01 -0500 Subject: [PATCH 049/146] dqlite: add adamcstephens as maintainer --- pkgs/development/libraries/dqlite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 07d753dd8333..ef1d0a1fab10 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko ]; + maintainers = with maintainers; [ joko adamcstephens ]; platforms = platforms.linux; }; } From dfd1bf80ad829c05537a9f3909c10b87c26f9515 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 20 Jan 2023 13:16:29 -0500 Subject: [PATCH 050/146] dqlite: 1.9.0 -> 1.13.0 --- pkgs/development/libraries/dqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index ef1d0a1fab10..331fe93e90de 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.9.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; - rev = "v${version}"; - sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn"; + rev = "refs/tags/v${version}"; + hash = "sha256-KVQa11gw/8h3Be+52V44W2M+fd7sB35emrS/aUEUGl0="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; From 37cab2f8e793e2038ea6019d5787482b09f01a37 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 24 Jan 2023 10:26:00 -0500 Subject: [PATCH 051/146] panamax: 1.0.3 -> 1.0.6 --- .../tools/rust/panamax/default.nix | 25 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 0d040afd421d..6dd1d5e32bd8 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -1,19 +1,34 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.3"; + version = "1.0.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M="; + sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw="; }; - cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw="; + cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71d2342c0224..f08278b93d2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15719,9 +15719,7 @@ with pkgs; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; - panamax = callPackage ../development/tools/rust/panamax { - inherit (darwin.apple_sdk.frameworks) Security; - }; + panamax = callPackage ../development/tools/rust/panamax { }; ograc = callPackage ../development/tools/rust/ograc { }; From 6fe502f5bc5f8577ebd2401a32fdfe2d55a9b046 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 24 Jan 2023 16:48:59 +0100 Subject: [PATCH 052/146] flexoptix-app: 5.13.1 -> 5.13.3 --- pkgs/tools/misc/flexoptix-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index b7318c119dac..50f51cfd7119 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.13.1"; + version = "5.13.3"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-+rHktjZd6P4JGYRhEXdZYVI64XMYc7cBGojAQNd8Mq8="; + hash = "sha256-kDw9+Llqvq4NgN89Cw/HwEqYlv42wLbho1eHjI6wVSQ="; }; udevRules = fetchurl { From 9cf3592d15d148df8f9674bcc1857f10d051e908 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Jan 2023 23:44:19 +0800 Subject: [PATCH 053/146] pantheon.elementary-mail: try-catch GLib.Uri.parse By using a merged patch. --- pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index c984824a8c52..31cf6d12eb89 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { # build: support webkit2gtk-4.1 # https://github.com/elementary/mail/pull/794 (fetchpatch { - url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; - sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch"; + sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs="; }) ]; From 4197cbd946e6dbe6067d0fbc7dc70a46a297ffac Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Jan 2023 23:47:11 +0800 Subject: [PATCH 054/146] pantheon.switchboard-plug-onlineaccounts: try-catch GLib.Uri.parse By using a merged patch. --- .../apps/switchboard-plugs/onlineaccounts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 52c92888f97f..11268ab814b4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { patches = [ # build: support evolution-data-server 3.45 - # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244 + # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/248 (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch"; - sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y="; + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/08faf7b4241547b7900596af12a03d816712a808.patch"; + sha256 = "sha256-QLe+NPHuo3hLM9n1f4hT5IK4nkWtYSe91L1wVSBzw6k="; }) ]; From 61eba16e9a8bec2702ec2d4a39eb30a3e741a22e Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 24 Jan 2023 18:06:52 +0100 Subject: [PATCH 055/146] bibata-extra-cursors: mark as broken Project is unable to be build with clickgen version 2.x and upstream archived it on Nov 9, 2022. --- pkgs/data/icons/bibata-cursors/extra.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index 15a746eabffb..ed9a70a6d321 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -50,5 +50,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill AdsonCicilioti ]; + # unmaintained as of Nov 9, 2022. unable to be build with clickgen version 2.x + broken = true; }; } From 9af21018cec6a2f29de73b20773acc62e5d9a9df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 18:44:38 +0100 Subject: [PATCH 056/146] python311Packages.python-engineio: add patch for mocking issue --- .../python-modules/python-engineio/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 0337029e248e..f1a079d5896e 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , eventlet , fetchFromGitHub +, fetchpatch , iana-etc , libredirect , mock @@ -24,10 +25,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; + patches = [ + # Address Python 3.11 mocking issue, https://github.com/miguelgrinberg/python-engineio/issues/279 + (fetchpatch { + name = "mocking-issue-py311.patch"; + url = "https://github.com/miguelgrinberg/python-engineio/commit/ac3911356fbe933afa7c11d56141f0e228c01528.patch"; + hash = "sha256-LNMhjX8kqOI3y8XugCHxCPEC6lF83NROfIczXWiLuqY="; + }) + ]; + nativeCheckInputs = [ aiohttp eventlet From c7330bfb287888b0a4f9ce8735da75e4e4088ac8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 24 Jan 2023 12:11:52 -0600 Subject: [PATCH 057/146] eris-go: 20230114 -> 20230123 --- pkgs/servers/eris-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/servers/eris-go/default.nix index 554aecfacbf8..3dbc3994e6d6 100644 --- a/pkgs/servers/eris-go/default.nix +++ b/pkgs/servers/eris-go/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "eris-go"; - version = "20230114"; + version = "20230123"; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; repo = pname; rev = version; - hash = "sha256-cJvSIeS9fKUJP5p7ZTH7Wi+UcBXeCS32Twhv6jBT+9Q="; + hash = "sha256-jdeh5lhbu2hxVNdnU0GiMsdXRi8004Xgu2/tgFhqPao="; }; - vendorHash = "sha256-DDV7LUnGnf24qQ2I9I4MDUx87s1+yDhisVz/Jw4XU6k="; + vendorHash = "sha256-mLyPaX5rDw0rR4PXtzpLMOrsYwTH3Y+COcrvwH7/qdo="; postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put"; # eris-get is a multicall binary From 53fe843d31741ba128e901a4247eebb88a42b16c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 20:52:09 +0100 Subject: [PATCH 058/146] python310Packages.stone: replace inspect.getargspec --- .../python-modules/stone/default.nix | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 1e20409b0ec9..a0d07fa51542 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -5,43 +5,53 @@ , ply , pytestCheckHook , six +, pythonOlder }: buildPythonPackage rec { pname = "stone"; version = "3.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi sdist misses requirements.txt src = fetchFromGitHub { owner = "dropbox"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; }; postPatch = '' - sed -i '/pytest-runner/d' setup.py + # https://github.com/dropbox/stone/issues/288 + substituteInPlace stone/frontend/ir_generator.py \ + --replace "inspect.getargspec" "inspect.getfullargspec" + substituteInPlace setup.py \ + --replace "'pytest-runner == 5.2.0'," "" ''; - propagatedBuildInputs = [ ply six ]; - - nativeCheckInputs = [ pytestCheckHook mock ]; - - # try to import from `test` directory, which is exported by the python interpreter - # and cannot be overridden without removing some py3 to py2 support - disabledTestPaths = [ - "test/test_tsd_types.py" - "test/test_js_client.py" + propagatedBuildInputs = [ + ply + six ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + ]; + disabledTests = [ "test_type_name_with_module" ]; - pythonImportsCheck = [ "stone" ]; + pythonImportsCheck = [ + "stone" + ]; meta = with lib; { description = "Official Api Spec Language for Dropbox"; homepage = "https://github.com/dropbox/stone"; + changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; From 18616e4869ceb28021515f2942ad9d944cc3ec57 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 24 Jan 2023 13:09:06 -0800 Subject: [PATCH 059/146] parsec-bin: 150_28 -> 150_86e --- pkgs/applications/misc/parsec/bin.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index b15ee2644a74..7aae31152f7f 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_28"; + version = "150_86e"; src = fetchurl { - url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb"; - sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc"; + url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb"; + sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; }; unpackPhase = '' @@ -76,6 +76,7 @@ stdenvNoCC.mkDerivation { meta = with lib; { homepage = "https://parsecgaming.com/"; + changelog = "https://parsec.app/changelog"; description = "Remote streaming service client"; license = licenses.unfree; maintainers = with maintainers; [ arcnmx ]; From 039cace1a6396f8f22f35ecc7e18c78ba4b44c3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 21:15:03 +0000 Subject: [PATCH 060/146] awscli2: 2.9.15 -> 2.9.17 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 61d2e1ee1d8a..b1add5d14252 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.15"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.17"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-yOqxz6ZsBV7iNKjG3NlV8SUHaezlchiUx8RRShRU6xo="; + hash = "sha256-5d/XEkM01SJj9M3e+5qbJrwWX+CU8fb097D45+Hp/Qc="; }; nativeBuildInputs = [ From 50b8f8fa2b8490f77d2db4c438f14bd2881a7f5e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 24 Jan 2023 22:16:05 +0100 Subject: [PATCH 061/146] awstats: 7.8 -> 7.9 Fixes CVE-2020-35176 and CVE-2022-46391. https://www.awstats.org/docs/awstats_changelog.txt --- pkgs/tools/system/awstats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index e0fb92b519f7..83625e305114 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -2,11 +2,11 @@ perlPackages.buildPerlPackage rec { pname = "awstats"; - version = "7.8"; + version = "7.9"; src = fetchurl { url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz"; - sha256 = "1f6l0hd01jmz7hpg0py8qixxiq50n8gl37iypayskxmy05z8craa"; + sha256 = "sha256-YVF47TE9NDFfFaUi2xpdEsqcOV43hbsGKAq/+V2aBUY="; }; postPatch = '' From f45624e43d990ce8415c12688aaf1f0cc5c40bba Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 24 Jan 2023 22:47:20 +0100 Subject: [PATCH 062/146] eternal-terminal: 6.2.1 -> 6.2.4 Fixes CVE-2022-48257 and CVE-2022-48258. https://github.com/MisterTea/EternalTerminal/releases/tag/et-v6.2.4 --- pkgs/tools/networking/eternal-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 900d54dc745c..c9ed68206b87 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.2.1"; + version = "6.2.4"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - hash = "sha256-YQ8Qx6RTmDoNWY8AQlnBJJendQl+tF1QA+Z6h/ar9qs="; + hash = "sha256-9W9Pz0VrFU+HNpf98I3CLrn8+kpjjNLOUK8gGcDJcI8="; }; nativeBuildInputs = [ From bd113dca77272a6a2bb1cef1a982afd2c9f40e50 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 24 Jan 2023 23:01:04 +0100 Subject: [PATCH 063/146] radare2: 5.8.0 -> 5.8.2 https://github.com/radareorg/radare2/releases/tag/5.8.2 --- .../tools/analysis/radare2/default.nix | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index e02ce86d8efb..14474f995509 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -31,47 +31,33 @@ let # FIXME: Compare revision with - # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35arm64/Makefile#L26-L27 + # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L26-L27 arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; - rev = "c9e7242972837ac11fc94db05fabcb801a8269c9"; - hash = "sha256-HFQj23GlLAyyzMGnPq40XaPv5qPDHdDlQOo0Hprc9Cs="; + rev = "55d73c6bbb94448a5c615933179e73ac618cf876"; + hash = "sha256-pZxxp5xDg8mgkGEx7LaBSoKxNPyggFYA4um9YaO20LU="; }; armv7 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-armv7"; - rev = "dde39f69ffea19fc37e681874b12cb4707bc4f30"; - - hash = "sha256-bnWQc0dScM9rhIdzf+iVXvMqYWq/bguEAUQPaZRgdlU="; + rev = "f270a6cc99644cb8e76055b6fa632b25abd26024"; + hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk="; }; in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.8.0"; + version = "5.8.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c="; + hash = "sha256-jwr3QPgJ6vKSk8yGxndQ69AickP8PorNDuGyJzHMpV4="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-4843.patch"; - url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch"; - sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ="; - }) - (fetchpatch { - name = "CVE-2023-0302.patch"; - url = "https://github.com/radareorg/radare2/commit/961f0e723903011d4f54c2396e44efa91fcc74ce.patch"; - hash = "sha256-QinRQDIY4p3P+M3Hh9w3Dv3N/2XTaf3N0nUluHPpAvg="; - }) - ]; - preBuild = '' - pushd ../libr/arch/p/arm/v35arm64 + pushd ../libr/arch/p/arm/v35 cp -r ${arm64} arch-arm64 chmod -R +w arch-arm64 From a5ffa79932244d21f7f7445b0ce35c2f0d37c5e8 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Tue, 24 Jan 2023 23:41:28 +0100 Subject: [PATCH 064/146] ocamlPackages.gd4o: fix build on darwin and probably on linux --- pkgs/development/ocaml-modules/gd4o/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix index 19a1b42f06bd..9923edc2e8db 100644 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/pkgs/development/ocaml-modules/gd4o/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib libjpeg libpng ]; propagatedBuildInputs = [ gd zlib freetype ]; + prePatch = '' + substituteInPlace Makefile --replace gcc cc + ''; preInstall = '' mkdir -p $OCAMLFIND_DESTDIR/stublibs From 9064fe2bd099d49818295f38a6d245b6151bae4f Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 24 Jan 2023 18:03:08 -0500 Subject: [PATCH 065/146] cargo-semver-checks: 0.15.2 -> 0.16.2 Diff: https://github.com/obi1kenobi/cargo-semver-checks/compare/v0.15.2...v0.16.2 --- pkgs/development/tools/rust/cargo-semver-checks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 30fda10323eb..71a340564343 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.15.2"; + version = "0.16.2"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+YRyShALdDQDfh5XDY36R29SzbBjlT8mCIucwJ++KrQ="; + sha256 = "sha256-2t3LWb2oeCYDAePXX1YuIN0o4LLEL58Hxt/1sNeuD3M="; }; - cargoSha256 = "sha256-wwsFqoQXasCKfnCBF4qGFIoD7Kj53K9IKQ1auuqTPAM="; + cargoSha256 = "sha256-K+eLQ7zGEGkh4vMABWucY/Ho2id/afwl4FSo5+Ca1Ec="; nativeBuildInputs = [ pkg-config ]; From 58c9ba22536a13bcf2b416b65f056e9003ab6c03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 23:12:55 +0000 Subject: [PATCH 066/146] python310Packages.jupyterlab: 3.5.2 -> 3.5.3 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 37f46414b91d..4813b80a2852 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.5.2"; + version = "3.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EKwJQhX/uHLd/74pgr8cA5p5/swybhkefMXv2E8zHa0="; + sha256 = "sha256-UeiJRIrhlO7vjlD2P1xPSH9yj0d77+Q26XSWcvdRHb4="; }; nativeBuildInputs = [ From 1f89ea230f5e3a7d847db4aed7651af7c46e48e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 23:53:59 +0000 Subject: [PATCH 067/146] python310Packages.requests-aws4auth: 1.1.2 -> 1.2.0 --- .../python-modules/requests-aws4auth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 9d074ca74c87..d2f56c62574d 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.1.2"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tedder"; repo = pname; - rev = "v${version}"; - hash = "sha256-/SqU/ojP9I4JXzR0c5tLzxx9UyNaVsON7LG/dbdeiH0="; + rev = "refs/tags/v${version}"; + hash = "sha256-a3OY0Z5GGr3gYa5m4V6ukqQmjZuqtgZjmLGJxmFOPqU="; }; propagatedBuildInputs = [ From 0f29dab46a8ed974963fd469bc1d2e3263da025a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 01:05:54 +0100 Subject: [PATCH 068/146] python310Packages.requests-aws4auth: add changelog to meta --- pkgs/development/python-modules/requests-aws4auth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index d2f56c62574d..f3da71e3e679 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Amazon Web Services version 4 authentication for the Python Requests library"; homepage = "https://github.com/sam-washington/requests-aws4auth"; + chnagelog = "https://github.com/tedder/requests-aws4auth/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ basvandijk ]; }; From 5fd6c8467bcb2340e9e8490ddfc7541e033755ea Mon Sep 17 00:00:00 2001 From: John Shaffer Date: Tue, 24 Jan 2023 18:41:42 -0600 Subject: [PATCH 069/146] srvc: 0.10.1 -> 0.13.0 --- pkgs/applications/version-management/srvc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 763c60f654bb..cba7be953173 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,23 +1,23 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.10.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-yeyAorVMHFl9wm57gmK6ZAI1w5daN2xl29Gqq0DsTtc="; + sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g="; }; - cargoHash = "sha256-/1TL0lWb4I9h6nGV7exx7U6ACrieN0EULTWg7Weexeg="; + cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - nativeCheckInputs = [ webfs ]; + nativeCheckInputs = [ git ]; # remove timeouts in tests to make them less flaky TEST_SRVC_DISABLE_TIMEOUT = 1; From fe16808b32d88a8f522cd653aa3c90271ff48483 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 01:17:32 +0000 Subject: [PATCH 070/146] python310Packages.denonavr: 0.10.12 -> 0.11.0 --- pkgs/development/python-modules/denonavr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 0e4b9b60bc71..2017fc831ae7 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.12"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "scarface-4711"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QNiDoPjOuwwAgUqDzXHzn0BE9bwXQrQKAIFlHCywl88="; + hash = "sha256-0zclIoEGKjA8Ro8k+HYX/d77U+ntQZv0vq6gC4Sa7zE="; }; propagatedBuildInputs = [ From c287407e07294ff85200ced6099d401b0a59ab7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 01:26:56 +0000 Subject: [PATCH 071/146] python310Packages.lightgbm: 3.3.3 -> 3.3.5 --- pkgs/development/python-modules/lightgbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index c59f28d6939d..493d70f3a8fc 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.3"; + version = "3.3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hX5VmuhKIpY84rYhaCkpadIa3TC8kkaoTU5+7a5nlm0="; + sha256 = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; }; nativeBuildInputs = [ From a2aee0de1e62cf4f9b9a3df0c143413a251277c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 02:14:16 +0000 Subject: [PATCH 072/146] python310Packages.whois: 0.9.23 -> 0.9.24 --- pkgs/development/python-modules/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 78368377fac4..7ec9251eb0ee 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.23"; + version = "0.9.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - hash = "sha256-HYzCdWX0gz1W73ZPlrdt+kqUPbBRrDnkGJE56nQ3UVc="; + hash = "sha256-DxjfRBJh/qLafxXN2VcXHTWuajDg6lvmJ5U86Na3L5g="; }; propagatedBuildInputs = [ From c72d62afa2defef10e44bc4f679e56bda01ece34 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Wed, 25 Jan 2023 10:48:59 +0800 Subject: [PATCH 073/146] trashy: 1.0.3 -> 2.0.0 --- pkgs/tools/misc/trashy/default.nix | 10 +++++++--- pkgs/tools/misc/trashy/lock-version.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/misc/trashy/lock-version.patch diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix index 7d3b3952a7ca..fb42a886fee5 100644 --- a/pkgs/tools/misc/trashy/default.nix +++ b/pkgs/tools/misc/trashy/default.nix @@ -2,16 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "trashy"; - version = "1.0.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "trashy"; rev = "v${version}"; - sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk="; + sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM="; }; - cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ="; + cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; + + # this patch must be removed after oberblastmeister/trashy#70 is solved or new + # version is released. + cargoPatches = [ ./lock-version.patch ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/trashy/lock-version.patch b/pkgs/tools/misc/trashy/lock-version.patch new file mode 100644 index 000000000000..3e95a3fbfdda --- /dev/null +++ b/pkgs/tools/misc/trashy/lock-version.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7af0268..dc197a0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -889,7 +889,7 @@ dependencies = [ + + [[package]] + name = "trashy" +-version = "1.0.3" ++version = "2.0.0" + dependencies = [ + "aho-corasick", + "ansi_term", From 52351987d61583ad150dc63a4e0ca08d62b45f96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 02:52:21 +0000 Subject: [PATCH 074/146] treesheets: unstable-2023-01-20 -> unstable-2023-01-23 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 926e97af80b3..5566906919a8 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-01-20"; + version = "unstable-2023-01-23"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "4d48bbe730b19963efeb3bb6f59e92aa3968b229"; - sha256 = "03REE7/jn1uuU89DKkGD1QqqzOt+DR6qmoyyaf8042c="; + rev = "f676cba7f9749825744ec705ee58b9fbea47db51"; + sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag="; }; nativeBuildInputs = [ From a4e3e16258210b3300aaf247033f941d36b58c28 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Wed, 25 Jan 2023 02:52:54 +0000 Subject: [PATCH 075/146] Update lib/attrsets.nix Co-authored-by: Robert Hensing --- lib/attrsets.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 23d4a762f2fb..1a51225a80ed 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -483,7 +483,10 @@ rec { the *leaf* attributes of a potentially-nested attribute set: the second argument of the function will never be an attrset. Also, the first argument of the argument function is a *list* - of the names of the containing attributes. + of the attribute names that form the path to the leaf attribute. + + For a function that gives you control over what counts as a leaf, + see `mapAttrsRecursiveCond`. Example: mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) From 61202db804d52d24aa2edcd82ed4bca4244f4729 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 24 Jan 2023 22:02:59 -0500 Subject: [PATCH 076/146] cargo-hack: 0.5.26 -> 0.5.27 Changelog: https://github.com/taiki-e/cargo-hack/blob/v0.5.27/CHANGELOG.md --- pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index a63af2476557..61bc71374870 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.26"; + version = "0.5.27"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ZVR3bycEWpOV4T/85OsERNjKooz2rwBF5kMSEfHnmEI="; + sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA="; }; - cargoSha256 = "sha256-4TChr6dKxUerpuaX63WShrWyXTLH4m85P6E30a5rmH8="; + cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc="; # some necessary files are absent in the crate version doCheck = false; From be3837249cc65f397d586047761cca22efffe636 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 03:05:08 +0000 Subject: [PATCH 077/146] python310Packages.google-cloud-asset: 3.17.0 -> 3.17.1 --- .../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 de650d07ac1a..e32bcf970264 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.17.0"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CsTfdEgDeHdrYWLqMt3WpYOcxT9BuQ2M8sqg0ZIwmvM="; + hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc="; }; propagatedBuildInputs = [ From 15944af6c556060369b5de5b2bcd59c5ffbbb821 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 03:15:43 +0000 Subject: [PATCH 078/146] python310Packages.google-cloud-securitycenter: 1.18.0 -> 1.18.2 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 30a44f5adfc5..aca5c258d813 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.18.0"; + version = "1.18.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-gtzSB70x7oN6EiTP1U5P1dV4a4eWZNGtRFInYz7AyCA="; + hash = "sha256-O1jSSozVmeDRoTCtRhsBDlZ/o8g/8ccGkJCg6hp7ob8="; }; propagatedBuildInputs = [ From 91bd7af0a516c39d07f0de5dcf753a641486b2e6 Mon Sep 17 00:00:00 2001 From: 360ied <19516527+360ied@users.noreply.github.com> Date: Tue, 24 Jan 2023 22:23:07 -0500 Subject: [PATCH 079/146] classicube: 1.3.4 -> 1.3.5 changelog: https://github.com/UnknownShadow200/ClassiCube/releases/tag/1.3.5 changes in nixpkgs build: - skins work again - build no longer use SDL2 (libXi no longer has problems now) --- pkgs/games/classicube/default.nix | 13 +++++-------- pkgs/games/classicube/fix-linking.patch | 2 +- pkgs/games/classicube/use-sdl.patch | 13 ------------- 3 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 pkgs/games/classicube/use-sdl.patch diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index 06c914e56f1b..ec2490196abb 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -5,7 +5,8 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, SDL2 +, libX11 +, libXi , libGL , curl , openal @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI="; + sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig="; }; nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; @@ -46,12 +47,8 @@ stdenv.mkDerivation rec { patches = [ # Fix hardcoded font paths ./font-location.patch - # ClassiCube doesn't compile with its X11 backend - # because of issues with libXi. - ./use-sdl.patch # For some reason, the Makefile doesn't link # with libcurl and openal when ClassiCube requires them. - # Also links with SDL2 instead of libX11 and libXi. ./fix-linking.patch ]; @@ -71,7 +68,7 @@ stdenv.mkDerivation rec { --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES" ''; - buildInputs = [ SDL2 libGL curl openal liberation_ttf ]; + buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ]; preBuild = "cd src"; diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/games/classicube/fix-linking.patch index 987c882367ee..197a3ab694e0 100644 --- a/pkgs/games/classicube/fix-linking.patch +++ b/pkgs/games/classicube/fix-linking.patch @@ -7,7 +7,7 @@ index 83188ce..3439cdb 100644 ifeq ($(PLAT),linux) -LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -+LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal ++LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal endif ifeq ($(PLAT),sunos) diff --git a/pkgs/games/classicube/use-sdl.patch b/pkgs/games/classicube/use-sdl.patch deleted file mode 100644 index 3456ef8b6469..000000000000 --- a/pkgs/games/classicube/use-sdl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Core.h b/src/Core.h -index e94a39e..96527d0 100644 ---- a/src/Core.h -+++ b/src/Core.h -@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */ - #define CC_BUILD_LINUX - #define CC_BUILD_POSIX - #define CC_BUILD_GL --#define CC_BUILD_X11 -+#define CC_BUILD_SDL - #define CC_BUILD_CURL - #define CC_BUILD_OPENAL - #if defined CC_BUILD_RPI From 1e41cbe2bd91b3b458ee76aefe867f972cd18ed5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 03:40:21 +0000 Subject: [PATCH 080/146] python310Packages.google-cloud-org-policy: 1.7.0 -> 1.7.1 --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 17e1006b3d54..43b5b09810e1 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.7.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V1Fpm8P4XD0USNNG1oD6OFrOeDcJyEvYPaHcWKQhLCQ="; + hash = "sha256-ivlerguhDb7zhRfizIPGQWwwLOUhyoj2xWAy9inSklQ="; }; propagatedBuildInputs = [ From c367b917a529ef1bc0eac2aab225949fc43ad63a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 03:06:26 +0000 Subject: [PATCH 081/146] =?UTF-8?q?terraform-providers.cloudflare:=203.32.?= =?UTF-8?q?0=20=E2=86=92=203.33.1?= 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 81d6f0e90494..9ff03dc88d8f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -222,13 +222,13 @@ "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" }, "cloudflare": { - "hash": "sha256-X7rNVMl5K/Z0w/N6+5fuODjR08gF9s3jQ1HqCo3b1WU=", + "hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.32.0", + "rev": "v3.33.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-7X2T3C775Nq5jc7n41nBREUsOa+EYmBsfBJM5YIo9xI=" + "vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8=" }, "cloudfoundry": { "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", From a5d2865e622a93f2a92949eaf002fd62a50147af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 03:09:45 +0000 Subject: [PATCH 082/146] =?UTF-8?q?terraform-providers.spotinst:=201.95.2?= =?UTF-8?q?=20=E2=86=92=201.96.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 9ff03dc88d8f..69bb9b2e3851 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1050,13 +1050,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-JT+kWE6k22qp905soDbnptr7gJZiZ8uRZ4+ZBw++8Mo=", + "hash": "sha256-2w4Qh9S0YxvcNdgtPLsNEumZiJn3+VH80zwamJW1FWQ=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.95.2", + "rev": "v1.96.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vW+1tH+3bT70RrHOTKemM23e0EoX3AO5AMXOAuyyKPA=" + "vendorHash": "sha256-SRQWZGyQDbESrpu0tsy6EBfvjY/l89fQexCdhSYPzGI=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", From d50dd52a6bb98abe88174d7dacac3c32317228ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 03:59:57 +0000 Subject: [PATCH 083/146] python310Packages.geoalchemy2: 0.12.5 -> 0.13.1 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 4b375abe89eb..0e18c64f44af 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.12.5"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "GeoAlchemy2"; inherit version; - hash = "sha256-McJQLc4xe1ezNeTrh1YtUB+jnkbHKL5RTZuGCR4I3Wc="; + hash = "sha256-VyRtRK6pC0xS+EwAb2dY0OGVHrkBjxBAmocUHwIVmxM="; }; nativeBuildInputs = [ From c52e921894b8817d68fa88db3429e6119d8f55d7 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Wed, 25 Jan 2023 09:43:42 +0530 Subject: [PATCH 084/146] maestro: 1.19.5 -> 1.20.0 --- pkgs/development/mobile/maestro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 3a39735aea60..778fddc8c3bb 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.19.5"; + version = "1.20.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1chrfwpxbnbn6k6ciwbflz1b8d7sd3r945m5g2d9gz1r1nn6d4v1"; + sha256 = "0hrfnx66yr1q57875m3ff4b2blq0k641iqjxjys8kwzp3nix34w2"; }; dontUnpack = true; From b30e0c15781ad01b7a2f3467526a50ac3dc61b14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 04:17:05 +0000 Subject: [PATCH 085/146] python310Packages.google-cloud-videointelligence: 2.10.0 -> 2.10.1 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 093d728d33f1..b8019c03cc5f 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SzCzTYyvf85E7BDBV0lX4g0hiNyZ5Ebo1m+WR4AjoBk="; + hash = "sha256-HlmuzMOaCl7z9NBVI5HoCH1vltQCeel30B5roX/+2HE="; }; propagatedBuildInputs = [ From 88d2ca01d0486695fe96c8bf7129ad0deb5763db Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 25 Jan 2023 12:30:58 +0800 Subject: [PATCH 086/146] pantheon.appcenter: 4.0.0 -> 7.0.0 We have to disable packagekit backend again because of some known nixos-specific issue :-( --- .../pantheon/apps/appcenter/default.nix | 10 +- .../disable-packagekit-backend.patch | 167 ++++++++++++++++++ 2 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 6516db101eb5..4fb9768ef7ee 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,15 +25,21 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "4.0.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-6QWvDBhOxoK8HjmygV92WPDgq2Jbk4igWDbXrXc7/FQ="; + sha256 = "sha256-fRurEkatWbtGiTRNe6tA2NyYk1IRCBW8SKBSUm4FrO4="; }; + patches = [ + # Having a working nix packagekit backend will supersede this. + # https://github.com/NixOS/nixpkgs/issues/177946 + ./disable-packagekit-backend.patch + ]; + nativeBuildInputs = [ dbus # for pkg-config meson diff --git a/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch b/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch new file mode 100644 index 000000000000..76d6245628b7 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch @@ -0,0 +1,167 @@ +diff --git a/src/Application.vala b/src/Application.vala +index a1c4e0d4..35555946 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -180,9 +180,6 @@ public class AppCenter.App : Gtk.Application { + } + + public override void activate () { +- if (fake_update_packages != null) { +- AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; +- } + + var client = AppCenterCore.Client.get_default (); + +@@ -200,12 +197,6 @@ public class AppCenter.App : Gtk.Application { + + if (local_path != null) { + var file = File.new_for_commandline_arg (local_path); +- +- try { +- local_package = AppCenterCore.PackageKitBackend.get_default ().add_local_component_file (file); +- } catch (Error e) { +- warning ("Failed to load local AppStream XML file: %s", e.message); +- } + } + + if (active_window == null) { +diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala +index 1747cd3b..20077394 100644 +--- a/src/Core/BackendAggregator.vala ++++ b/src/Core/BackendAggregator.vala +@@ -26,8 +26,6 @@ public class AppCenterCore.BackendAggregator : Backend, Object { + + construct { + backends = new Gee.ArrayList (); +- backends.add (PackageKitBackend.get_default ()); +- backends.add (UbuntuDriversBackend.get_default ()); + backends.add (FlatpakBackend.get_default ()); + + unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); +diff --git a/src/Core/Package.vala b/src/Core/Package.vala +index 40fa8262..e6b90dd9 100644 +--- a/src/Core/Package.vala ++++ b/src/Core/Package.vala +@@ -327,23 +327,13 @@ public class AppCenterCore.Package : Object { + public string origin_description { + owned get { + unowned string origin = component.get_origin (); +- if (backend is PackageKitBackend) { +- if (origin == APPCENTER_PACKAGE_ORIGIN) { +- return _("AppCenter"); +- } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { +- return _("elementary Updates"); +- } else if (origin.has_prefix ("ubuntu-")) { +- return _("Ubuntu (non-curated)"); +- } +- } else if (backend is FlatpakBackend) { ++ if (backend is FlatpakBackend) { + var fp_package = this as FlatpakPackage; + if (fp_package == null) { + return origin; + } + + return fp_package.remote_title; +- } else if (backend is UbuntuDriversBackend) { +- return _("Ubuntu Drivers"); + } + + return _("Unknown Origin (non-curated)"); +@@ -435,9 +425,7 @@ public class AppCenterCore.Package : Object { + + // The version on a PackageKit package comes from the package not AppStream, so only reset the version + // on other backends +- if (!(backend is PackageKitBackend)) { +- _latest_version = null; +- } ++ _latest_version = null; + + this.component = component; + } +diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala +index 4d844abc..457137eb 100644 +--- a/src/Core/UpdateManager.vala ++++ b/src/Core/UpdateManager.vala +@@ -71,35 +71,9 @@ public class AppCenterCore.UpdateManager : Object { + installed_package.update_state (); + } + +- Pk.Results pk_updates; +- unowned PackageKitBackend client = PackageKitBackend.get_default (); +- try { +- pk_updates = yield client.get_updates (cancellable); +- } catch (Error e) { +- warning ("Unable to get updates from PackageKit backend: %s", e.message); +- return 0; +- } +- + uint os_count = 0; + string os_desc = ""; + +- var package_array = pk_updates.get_package_array (); +- debug ("PackageKit backend reports %d updates", package_array.length); +- +- package_array.foreach ((pk_package) => { +- var pkg_name = pk_package.get_name (); +- debug ("Added %s to OS updates", pkg_name); +- os_count++; +- unowned string pkg_summary = pk_package.get_summary (); +- unowned string pkg_version = pk_package.get_version (); +- os_desc += Markup.printf_escaped ( +- " • %s\n\t%s\n\t%s\n", +- pkg_name, +- pkg_summary, +- _("Version: %s").printf (pkg_version) +- ); +- }); +- + os_updates.component.set_pkgnames ({}); + os_updates.change_information.clear_update_info (); + +@@ -207,30 +181,13 @@ public class AppCenterCore.UpdateManager : Object { + count += 1; + } + +- pk_updates.get_details_array ().foreach ((pk_detail) => { +- var pk_package = new Pk.Package (); +- try { +- pk_package.set_id (pk_detail.get_package_id ()); +- var pkg_name = pk_package.get_name (); +- +- var pkgnames = os_updates.component.pkgnames; +- pkgnames += pkg_name; +- os_updates.component.pkgnames = pkgnames; +- +- os_updates.change_information.updatable_packages.@set (client, pk_package.get_id ()); +- os_updates.change_information.size += pk_detail.size; +- } catch (Error e) { +- critical (e.message); +- } +- }); +- + os_updates.update_state (); + runtime_updates.update_state (); + return count; + } + + public void update_restart_state () { +- var should_restart = restart_file.query_exists () || PackageKitBackend.get_default ().is_restart_required (); ++ var should_restart = restart_file.query_exists (); + + if (should_restart) { + if (!restart_required) { +diff --git a/src/meson.build b/src/meson.build +index e0ef5342..14319492 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -12,10 +12,8 @@ appcenter_files = files( + 'Core/FlatpakBackend.vala', + 'Core/Job.vala', + 'Core/Package.vala', +- 'Core/PackageKitBackend.vala', + 'Core/ScreenshotCache.vala', + 'Core/Task.vala', +- 'Core/UbuntuDriversBackend.vala', + 'Core/UpdateManager.vala', + 'Dialogs/InstallFailDialog.vala', + 'Dialogs/StripeDialog.vala', From 9d3610a016b5a28cfe3df2d1938d45a72354faf6 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 24 Jan 2023 20:42:13 -0800 Subject: [PATCH 087/146] openai: 0.26.1 -> 0.26.2 Diff: https://github.com/openai/openai-python/compare/v0.26.1...v0.26.2 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 8aa091a25c71..a5529af2ab15 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.26.1"; + version = "0.26.2"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-M6ZaYTOBAwLogWPafSnBYw3rUry+sS9VwQWAM9tDfr8="; + hash = "sha256-rUXwrr8hgKwqJ/ittK2DOKaqxTAs8wKyVTSdEhfiWfI="; }; propagatedBuildInputs = [ From 1d7a73ec821499e336fe2f77f7ea11087ccaa8b5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 24 Jan 2023 23:53:08 -0500 Subject: [PATCH 088/146] comrak: 0.15.0 -> 0.16.0 Diff: https://github.com/kivikakk/comrak/compare/0.15.0...0.16.0 Changelog: https://github.com/kivikakk/comrak/blob/0.16.0/changelog.txt --- pkgs/tools/text/comrak/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/tools/text/comrak/default.nix index f4ad0f485e40..3f751dc4d7e6 100644 --- a/pkgs/tools/text/comrak/default.nix +++ b/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "sha256-F6MZxbB3FYEJ8tzJ0tp9/s0aLaH35QUnOJS6mCVfzUQ="; + sha256 = "sha256-ZKIqjeRsNTQYaa5itBSnqQ1w54Yq/iY2EQfDN713KGM="; }; - cargoSha256 = "sha256-+QPzwfoxt6+gpb4bDMd++1dBKoXOTON0z2EDdgmyy60="; + cargoSha256 = "sha256-Xafdt4AGympN6CLctOWfbCNfhwp4XN6XmSYESgjhRPk="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; From d469096dbd9ad40efeea430762f82b70a72f2d55 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 13:36:37 +0800 Subject: [PATCH 089/146] nixos/fwupd: do no use renamed options in tests --- nixos/tests/installed-tests/fwupd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixos/tests/installed-tests/fwupd.nix index 65614e2689d8..c095a50dc836 100644 --- a/nixos/tests/installed-tests/fwupd.nix +++ b/nixos/tests/installed-tests/fwupd.nix @@ -5,7 +5,7 @@ makeInstalledTest { testConfig = { services.fwupd.enable = true; - services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin + services.fwupd.daemonSettings.DisabledPlugins = lib.mkForce [ ]; # don't disable test plugin services.fwupd.enableTestRemote = true; }; } From 7513e9fdc2ab07b9f3d524b591677b6370749439 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 06:56:52 +0000 Subject: [PATCH 090/146] python310Packages.pynetbox: 7.0.0 -> 7.0.1 --- pkgs/development/python-modules/pynetbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index af1e0c171357..333f88e3f563 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.0.0"; + version = "7.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PFSnINbXSnEo1gvntjfH6KCVa/LeaNrsiuWM4H+fOvQ="; + hash = "sha256-RAUM79lDz7oNV7Li987Sz7JoNz/feO6BsEcWO0u/Ub8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 13a6aa4571befa4f012e6ce804ea65b3a96e2dc0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Jan 2023 09:19:20 +0100 Subject: [PATCH 091/146] =?UTF-8?q?ocamlPackages.ca-certs:=200.2.2=20?= =?UTF-8?q?=E2=86=92=200.2.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ca-certs/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 6c6fb87cf3dc..963989cb2236 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -5,21 +5,20 @@ buildDunePackage rec { pname = "ca-certs"; - version = "0.2.2"; + version = "0.2.3"; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; - sha256 = "sha256-Tx53zBJemZh3ODh/8izahxDoJvXvNFLyAA8LMM1mhlI="; + url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz"; + hash = "sha256-0tjWRX2RXvbXg974Lzvl7C9W+S4gIU9Y7dY8nC/GDpw="; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; - # Assumes nss-cacert < 3.74 https://github.com/mirage/ca-certs/issues/21 - doCheck = false; + doCheck = true; nativeCheckInputs = [ cacert # for /etc/ssl/certs/ca-bundle.crt alcotest From a0aeaab62361d7efc74696e74928228a2979ffed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 07:42:21 +0000 Subject: [PATCH 092/146] python310Packages.google-cloud-datastore: 2.11.0 -> 2.13.2 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 70e73d20aa1f..553b7a7dd143 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.11.0"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PSk6IYBfGL7g0FBCqUgT4T8k1IYprtLGQQQEybEO99o="; + hash = "sha256-ikstW53KrRr4vnmtbr0AOG8/kHaF8excJFbwclhCA7A="; }; propagatedBuildInputs = [ From cf14c0cbbd7a465deb95be59a2c0b133a9a40b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 13 Jan 2023 21:31:29 +0200 Subject: [PATCH 093/146] compdb: init at 0.2.0 --- pkgs/tools/misc/compdb/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/compdb/default.nix diff --git a/pkgs/tools/misc/compdb/default.nix b/pkgs/tools/misc/compdb/default.nix new file mode 100644 index 000000000000..c6d6d75283d9 --- /dev/null +++ b/pkgs/tools/misc/compdb/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "compdb"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "Sarcasm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nFAgTrup6V5oE+LP4UWDOCgTVCv2v9HbQbkGW+oDnTg="; + }; + + meta = with lib; { + description = "Command line tool to manipulate compilation databases"; + license = licenses.mit; + homepage = "https://github.com/Sarcasm/compdb"; + maintainers = [ maintainers.detegr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b17774ef388..c2e94362d2ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -421,6 +421,8 @@ with pkgs; commix = callPackage ../tools/security/commix { }; + compdb = callPackage ../tools/misc/compdb { }; + conserver = callPackage ../tools/misc/conserver { }; containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; From 5e3079f21aa2aa897c5ae3b870f4b289e22c8a15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 07:49:30 +0000 Subject: [PATCH 094/146] python310Packages.types-pyyaml: 6.0.12.2 -> 6.0.12.3 --- pkgs/development/python-modules/types-pyyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index 7198e4e923bd..f0b4056e2b58 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.2"; + version = "6.0.12.3"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-aECBmHHJLe6+aiBn+4AMEbigY2MutOPnVZFOerNgToM="; + sha256 = "sha256-F84Xs+rY8G5BajsdW43cbLgqQiuyACVN2LRpQ0sEX/w="; }; # Module doesn't have tests From b7c4364f4b18e6ad370e6b1d6abc945298f87f64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:24:53 +0100 Subject: [PATCH 095/146] python310Packages.google-cloud-securitycenter: update disabled --- .../python-modules/google-cloud-securitycenter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index aca5c258d813..28bf273bd561 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "1.18.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From de71f7ccdd82b1321fb74a5b0e2f36fa4f367b2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:27:09 +0100 Subject: [PATCH 096/146] python310Packages.denonavr: add changelog to meta --- pkgs/development/python-modules/denonavr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 2017fc831ae7..14fe85c6af51 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/scarface-4711/denonavr"; + changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ colemickens ]; }; From 7c76bc5c0126d558f466aaa673cd325df70371dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 08:29:37 +0000 Subject: [PATCH 097/146] python310Packages.google-cloud-datacatalog: 3.11.0 -> 3.11.1 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bf86294a4944..f2d8b6ec50c1 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.11.0"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wu53nKA4nmXHuJ+dr9r/A9xDYec1bkW4S8gfgiLBctw="; + hash = "sha256-X4h6hrEfjiroAgtG26bz70P2PsEileHmZ5Jq6iPHqCs="; }; propagatedBuildInputs = [ From a9842234c8a417f95332a64c3a49c09dac853ceb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:29:39 +0100 Subject: [PATCH 098/146] python310Packages.lightgbm: add changelog to meta --- .../python-modules/lightgbm/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 493d70f3a8fc..01be9fb86511 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , cmake @@ -6,15 +7,19 @@ , scipy , scikit-learn , llvmPackages ? null +, pythonOlder }: buildPythonPackage rec { pname = "lightgbm"; version = "3.3.5"; + format = "other"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; + hash = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; }; nativeBuildInputs = [ @@ -23,7 +28,10 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + buildInputs = lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + propagatedBuildInputs = [ numpy scipy @@ -38,11 +46,15 @@ buildPythonPackage rec { # repository. It contains c++ tests which don't seem to wired up to # `make check`. doCheck = false; - pythonImportsCheck = [ "lightgbm" ]; + + pythonImportsCheck = [ + "lightgbm" + ]; meta = with lib; { description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; homepage = "https://github.com/Microsoft/LightGBM"; + changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ teh costrouc ]; }; From 8aa14c8a8d889eb4cc1ab54c56cd12ca307e9bbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:35:22 +0100 Subject: [PATCH 099/146] python310Packages.requests-aws4auth: fix typo --- .../python-modules/requests-aws4auth/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index f3da71e3e679..9819c3df60e8 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -29,7 +29,9 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - httpx = [ httpx ]; + httpx = [ + httpx + ]; }; nativeCheckInputs = [ @@ -43,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Amazon Web Services version 4 authentication for the Python Requests library"; homepage = "https://github.com/sam-washington/requests-aws4auth"; - chnagelog = "https://github.com/tedder/requests-aws4auth/releases/tag/v${version}"; + changelog = "https://github.com/tedder/requests-aws4auth/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ basvandijk ]; }; From 32e9ef301d44e2c0a3e3faddba3810f9ce217343 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:41:01 +0100 Subject: [PATCH 100/146] python310Packages.jupyterlab: add changelog to meta --- pkgs/development/python-modules/jupyterlab/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 4813b80a2852..8ac600083f59 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UeiJRIrhlO7vjlD2P1xPSH9yj0d77+Q26XSWcvdRHb4="; + hash = "sha256-UeiJRIrhlO7vjlD2P1xPSH9yj0d77+Q26XSWcvdRHb4="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/jupyterlab/jupyterlab/releases/tag/v${version}"; description = "Jupyter lab environment notebook server extension"; license = with licenses; [ bsd3 ]; homepage = "https://jupyter.org/"; From 5a2d98d6b2d1a78d17acd0213ac2b84a4072b7a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:44:17 +0100 Subject: [PATCH 101/146] awstats: add changelog to meta --- pkgs/tools/system/awstats/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 83625e305114..21b76adf3e59 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchurl, perlPackages, jdk }: +{ lib +, fetchurl +, perlPackages +, jdk +}: perlPackages.buildPerlPackage rec { pname = "awstats"; @@ -15,6 +19,7 @@ perlPackages.buildPerlPackage rec { ''; outputs = [ "bin" "out" "doc" ]; # bin just links the user-run executable + propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle buildInputs = with perlPackages; [ ]; # plugins will need some @@ -53,10 +58,10 @@ perlPackages.buildPerlPackage rec { ''; meta = with lib; { + changelog = "https://www.awstats.org/docs/awstats_changelog.txt"; description = "Real-time logfile analyzer to get advanced statistics"; homepage = "https://awstats.org"; license = licenses.gpl3Plus; platforms = platforms.unix; }; } - From efce80c33ab28538eabfcd191bbd223e03c6d674 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 09:46:07 +0100 Subject: [PATCH 102/146] eternal-terminal: add changelog to meta --- pkgs/tools/networking/eternal-terminal/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index c9ed68206b87..22ed2dcb80e7 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; - rev = "et-v${version}"; + rev = "refs/tags/et-v${version}"; hash = "sha256-9W9Pz0VrFU+HNpf98I3CLrn8+kpjjNLOUK8gGcDJcI8="; }; @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; + changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux ++ platforms.darwin; From 4ef98ebcc1610b0a4ab3d455a0d987a95761bc6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Jan 2023 19:33:47 +0100 Subject: [PATCH 103/146] python311Packages.promise: add patch to remove @asyncio.coroutine --- .../python-modules/promise/default.nix | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index a4797ff6d6cc..a9c4c416b7fc 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -1,23 +1,37 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib -, six -, pytestCheckHook +, fetchpatch , mock , pytest-asyncio +, pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "promise"; version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "syrusakbary"; repo = "promise"; - rev = "v${version}"; - sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6"; + rev = "refs/tags/v${version}"; + hash = "sha256-5s6GMANSO4UpLOP/HAQxuNFSBSjPgvJCB9R1dOoKuJ4="; }; + patches = [ + # Convert @asyncio.coroutine to async def, https://github.com/syrusakbary/promise/pull/99 + (fetchpatch { + name = "use-async-def.patch"; + url = "https://github.com/syrusakbary/promise/commit/3cde549d30b38dcff81b308e18c7f61783003791.patch"; + hash = "sha256-XCbTo6RCv75nNrpbK3TFdV0h7tBJ0QK+WOAR8S8w9as="; + }) + ]; + postPatch = '' substituteInPlace tests/test_extra.py \ --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)" @@ -28,21 +42,24 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook mock pytest-asyncio + pytestCheckHook ]; disabledTestPaths = [ "tests/test_benchmark.py" ]; + pythonImportsCheck = [ + "promise" + ]; + meta = with lib; { description = "Ultra-performant Promise implementation in Python"; homepage = "https://github.com/syrusakbary/promise"; + changelog = "https://github.com/syrusakbary/promise/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } From c8d74eaf3c917637a588c3bf296b1f01044565ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 09:02:39 +0000 Subject: [PATCH 104/146] python310Packages.google-cloud-bigquery-datatransfer: 3.10.0 -> 3.10.1 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 32c3b74bec35..2c5d0a9a5474 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.10.0"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R6CIL1CA3UR81kUeIlFGJaxDGO33GBKOzT4Qo2LWlQk="; + hash = "sha256-GcgJhFT3L5TlVZYXjQQ9eENRcv/V176hF86BSsN7K/A="; }; propagatedBuildInputs = [ From df8af6cd1a5a526b1075eef9042253cffe3d3ef6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:05:22 +0100 Subject: [PATCH 105/146] python310Packages.graphene-django: add changelog to meta --- pkgs/development/python-modules/graphene-django/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 12ef2cc19a6b..1be9174f9774 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "graphene-django"; version = "3.0.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -61,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Integrate GraphQL into your Django project"; homepage = "https://github.com/graphql-python/graphene-django"; + changelog = "https://github.com/graphql-python/graphene-django/releases/tag/v{version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From d56f7d9fe4920e85092c36fa191ef05b58929774 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 25 Jan 2023 19:11:12 +1000 Subject: [PATCH 106/146] go: various gccgo changes (#211850) * gccgo: mark broken on darwin * gccgo12: init create versioned gccgo for bootstrapping go * go: use versioned gccgo for bootstrapping --- pkgs/development/compilers/go/1.18.nix | 2 +- pkgs/development/compilers/go/1.19.nix | 2 +- pkgs/development/compilers/go/1.20.nix | 2 +- pkgs/top-level/all-packages.nix | 17 ++++++++++++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 4a1e516ff1ce..3c089f02920a 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -18,7 +18,7 @@ let useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { }; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo118Module; }; diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index af6c99a50e25..27223e6dea6e 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -18,7 +18,7 @@ let useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { }; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo119Module; }; diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index ec2669ed868f..be569ed688c9 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -18,7 +18,7 @@ let useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap117.nix { }; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo120Module; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 437867c3baab..5ce449c85a7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14553,13 +14553,28 @@ with pkgs; gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; - gccgo = wrapCC ((if stdenv.hostPlatform.isMusl then gcc_latest else gcc).cc.override { + gccgo = wrapCC (gcc.cc.override { name = "gccgo"; langCC = true; #required for go. langC = true; langGo = true; langJit = true; profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; + }); + + gccgo12 = wrapCC (gcc12.cc.override { + name = "gccgo"; + langCC = true; #required for go. + langC = true; + langGo = true; + langJit = true; + profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; }); ghdl = ghdl-mcode; From 8e2e31f77c251512ad5e13e7fd09de1067433e71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:15:22 +0100 Subject: [PATCH 107/146] python311Packages.graphene-django: disable failing tests on Python 3.11 --- .../python-modules/graphene-django/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 1be9174f9774..3e8625ca6d41 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub @@ -59,6 +60,14 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # Pèython 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365 + "test_django_objecttype_convert_choices_enum_naming_collisions" + "test_django_objecttype_choices_custom_enum_name" + "test_django_objecttype_convert_choices_enum_list" + "test_schema_representation" + ]; + meta = with lib; { description = "Integrate GraphQL into your Django project"; homepage = "https://github.com/graphql-python/graphene-django"; From 9094b2889432eccd1c300be8d72559f84d5c3a15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:24:13 +0100 Subject: [PATCH 108/146] python310Packages.bthome-ble: 2.5.0 -> 2.5.1 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/refs/tags/v2.5.0...v2.5.1 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v2.5.1/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index adef9006fb7e..9baacd74d9b4 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.5.0"; + version = "2.5.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nNvPSp1Ij7JPXVFt8ediNtJaiuIDxRQFl3gySivJdqs="; + hash = "sha256-xxdCuTSpGe89TjF0YPmD4i1Fx1WfaQTTataFRnbcaos="; }; nativeBuildInputs = [ From c032bd783926f871c33b5f8b4db309ed50eb647e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:25:59 +0100 Subject: [PATCH 109/146] nuclei: 2.8.7 -> 2.8.8 Diff: https://github.com/projectdiscovery/nuclei/compare/v2.8.7...v2.8.8 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v2.8.8 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index de0e4be7bffc..579f79329793 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-kEc56cT8EgrQ8qHRHcVjf8L+DwFeK4UDEXhGqs24lJM="; + hash = "sha256-limgyp13eh2FuD1MzqQn+NQ30fOJsvr8UT4kZrxnIPM="; }; - vendorHash = "sha256-cEgJOL4qpbxdWBwGzVviI/+3Exe746Mu749vtrSjOVU="; + vendorHash = "sha256-nmZpYShVNAqBO8adxCSt9t3ocB3elWna06pIBG6dQNY="; modRoot = "./v2"; subPackages = [ From 79ecd28b0c064f1032da5a3c3f81733b3069ff9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:26:52 +0100 Subject: [PATCH 110/146] python310Packages.hahomematic: 2023.1.6 -> 2023.1.7 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.1.6...2023.1.7 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.1.7 --- 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 6181aa106a41..a5b2a8fffc28 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.6"; + version = "2023.1.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-bjONfnxJuqo0d/9K4VKyIurcpw5+RgyAij1Hm/mTeUc="; + sha256 = "sha256-n/j884ttxFCkNnpRuHquzDeWsJchHS0A13CR2CtO4lo="; }; nativeBuildInputs = [ From 6892cfc73dcef583ffad8e241e4594afaa6a6756 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:28:48 +0100 Subject: [PATCH 111/146] python310Packages.mailchecker: 5.0.6 -> 5.0.7 Changelog: https://github.com/FGRibreau/mailchecker/blob/v5.0.7/CHANGELOG.md --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 3a58e64beaa8..24ed5999a78e 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "5.0.6"; + version = "5.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g70FjY0tc4KjgdVweuBBkFrByt8xlGPJEPz/OvTtjZk="; + hash = "sha256-u5htHCI10mn6AQDlAShMpbyI4PcqiRgpRvsy5Q3km+0="; }; # Module has no tests From 03ba2e27e85619f624e78eafe299031d4e72a690 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:29:52 +0100 Subject: [PATCH 112/146] python310Packages.pyroute2: 0.7.3 -> 0.7.4 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 2d9efdf39e2d..b232a0bd8f41 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.3"; + version = "0.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cEEEDbHC0Yf7zNFRSFsSRMQddYvoIXhYR5RjcOtrtwY="; + hash = "sha256-d1rO/vTSrOdZHmIAAL3zg8cMi3lpgEhw9sLYIE+iF+A="; }; nativeBuildInputs = [ From 633c9d11608b9698dc2fd8c4ef354845a86b6daf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:42:59 +0100 Subject: [PATCH 113/146] linux: 4.14.303 -> 4.14.304 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c76fc306bb48..3e5cc009576e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.303"; + version = "4.14.304"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b"; + sha256 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"; }; } // (args.argsOverride or {})) From f9b2f16602f5c3a022c99b5d968a8e1ce55f8b42 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:43:09 +0100 Subject: [PATCH 114/146] linux: 4.19.270 -> 4.19.271 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 999cf84a5d2d..506d57d79713 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.270"; + version = "4.19.271"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11"; + sha256 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"; }; } // (args.argsOverride or {})) From c6851f531e0231520750fdcec260d9a3c5b378f1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:43:20 +0100 Subject: [PATCH 115/146] linux: 5.10.164 -> 5.10.165 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 86698c5f3a3b..7f984e43d7b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.164"; + version = "5.10.165"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc"; + sha256 = "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp"; }; } // (args.argsOverride or {})) From 795dd11c54707aff81b4d72d653c24d8f5dc2898 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:43:31 +0100 Subject: [PATCH 116/146] linux: 5.15.89 -> 5.15.90 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 35a9097c14c3..75f035ec2119 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.89"; + version = "5.15.90"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7"; + sha256 = "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6"; }; } // (args.argsOverride or { })) From 973d29d69e3c4324fba239a57477c68572cbaf4c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:43:41 +0100 Subject: [PATCH 117/146] linux: 5.4.229 -> 5.4.230 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a9b04d5bc07e..aef87aaa4211 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.229"; + version = "5.4.230"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5"; + sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; }; } // (args.argsOverride or {})) From f638ef65cd4e27c61383d6ac0604ec3ed089c8d9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:43:53 +0100 Subject: [PATCH 118/146] linux: 6.1.7 -> 6.1.8 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index dd42454b3ac6..f1fc40ee7644 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.7"; + version = "6.1.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a"; + sha256 = "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn"; }; } // (args.argsOverride or { })) From 7c71f485561693274e32325bdb9e294819214b10 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 25 Jan 2023 12:43:41 +0800 Subject: [PATCH 119/146] pantheon.elementary-code: 6.2.0 -> 7.0.0 --- .../pantheon/apps/elementary-code/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 4a33fc2e04a3..388feb83cfe7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -28,21 +28,21 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "6.2.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-QhJNRhYgGbPMd7B1X3kG+pnC/lGUoF7gc7O1PdG49LI="; + sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc="; }; patches = [ - # Fix drag and drop of accented text and between tabs - # https://github.com/elementary/code/pull/1194 + # Fix global search action disabled at startup + # https://github.com/elementary/code/pull/1254 (fetchpatch { - url = "https://github.com/elementary/code/commit/1ed7b590768ea9cb5b4658e27d9dc7ac224442ae.patch"; - sha256 = "sha256-VrYcEbkzQKi5gFB/Vw/0NITZvSXKXfuEv2R3m0VALVM="; + url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch"; + sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM="; }) ]; From c528f77d29da746c03d8ed19750e91a5afea537b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:44:35 +0100 Subject: [PATCH 120/146] linux/hardened/patches/4.14: 4.14.303-hardened1 -> 4.14.304-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 849f1861403c..26e3d448361c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.303-hardened1.patch", - "sha256": "1ihq6kf19fribpyiisv5wdax0467pylmlmsqn88vf50ps3akc4ix", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.303-hardened1/linux-hardened-4.14.303-hardened1.patch" + "name": "linux-hardened-4.14.304-hardened1.patch", + "sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch" }, - "sha256": "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b", - "version": "4.14.303" + "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4", + "version": "4.14.304" }, "4.19": { "patch": { From 51e2e1886f0d31adf6f4e2414434964a6b3ab0d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:44:45 +0100 Subject: [PATCH 121/146] linux/hardened/patches/4.19: 4.19.270-hardened1 -> 4.19.271-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 26e3d448361c..656e2c4a3739 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.270-hardened1.patch", - "sha256": "1xii5xchbxnswy7qhhvvivx6c6a5n7iw920yrvm2chrnp5s9mikh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.270-hardened1/linux-hardened-4.19.270-hardened1.patch" + "name": "linux-hardened-4.19.271-hardened1.patch", + "sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch" }, - "sha256": "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11", - "version": "4.19.270" + "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3", + "version": "4.19.271" }, "5.10": { "patch": { From 979280a84f7008b8fdb71f2630af4fc510aa0ebe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:44:58 +0100 Subject: [PATCH 122/146] linux/hardened/patches/5.10: 5.10.164-hardened1 -> 5.10.165-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 656e2c4a3739..cc88f3afe5cc 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.164-hardened1.patch", - "sha256": "1z2qd460wnna658zi8mbz2rqjwbvkxrk03ncicqszfjbinigxp6x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.164-hardened1/linux-hardened-5.10.164-hardened1.patch" + "name": "linux-hardened-5.10.165-hardened1.patch", + "sha256": "0gnvnywagqqdsdrbd9fbl671pzfv49mf2xqan9bk3q41mgcyyfgg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.165-hardened1/linux-hardened-5.10.165-hardened1.patch" }, - "sha256": "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc", - "version": "5.10.164" + "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", + "version": "5.10.165" }, "5.15": { "patch": { From d2cecf28119a2039e68eebba4bb6225d4a2437a2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:45:11 +0100 Subject: [PATCH 123/146] linux/hardened/patches/5.15: 5.15.89-hardened1 -> 5.15.90-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cc88f3afe5cc..740dd9908772 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.89-hardened1.patch", - "sha256": "0gwgdgmc9c7cpgp5vcyxwqxc5y2br3ghi6x3r11frs1kcwvqjix9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.89-hardened1/linux-hardened-5.15.89-hardened1.patch" + "name": "linux-hardened-5.15.90-hardened1.patch", + "sha256": "1zj80v6xpgz00z1lpw5j9qdm0gp44pk7vkflrngbk8m3cwmpw5ha", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.90-hardened1/linux-hardened-5.15.90-hardened1.patch" }, - "sha256": "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7", - "version": "5.15.89" + "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", + "version": "5.15.90" }, "5.4": { "patch": { From 664dec6fff4e986e7c254f35d53f245e3b2c21e6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:45:22 +0100 Subject: [PATCH 124/146] linux/hardened/patches/5.4: 5.4.229-hardened1 -> 5.4.230-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 740dd9908772..69e4f9a26f10 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.229-hardened1.patch", - "sha256": "0cww74kkh2n7apzqbdz72d04x39wkasxj5mi7giivpp0s2f0c24a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.229-hardened1/linux-hardened-5.4.229-hardened1.patch" + "name": "linux-hardened-5.4.230-hardened1.patch", + "sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch" }, - "sha256": "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5", - "version": "5.4.229" + "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7", + "version": "5.4.230" }, "6.1": { "patch": { From 0c5d652c65d41160f6d8ed162985f49cde30998c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Jan 2023 10:45:36 +0100 Subject: [PATCH 125/146] linux/hardened/patches/6.1: 6.1.7-hardened1 -> 6.1.8-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 69e4f9a26f10..a2cace8bc1e4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.7-hardened1.patch", - "sha256": "1hp3mbl8vfd2cwpxbhmqqy77nzyk265k1rcf1rz048ivnsppw4cx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.7-hardened1/linux-hardened-6.1.7-hardened1.patch" + "name": "linux-hardened-6.1.8-hardened1.patch", + "sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch" }, - "sha256": "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a", - "version": "6.1.7" + "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn", + "version": "6.1.8" } } From 1cbd2b55c71eb7a18f27fa8d4f8afe0db1833c81 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 25 Jan 2023 10:46:13 +0100 Subject: [PATCH 126/146] smartgithg: add changelog link --- pkgs/applications/version-management/smartgithg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 362f13becfaa..a9aabd7a87da 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for Git, Mercurial, Subversion"; homepage = "https://www.syntevo.com/smartgit/"; + changelog = "https://www.syntevo.com/smartgit/changelog.txt"; license = licenses.unfree; platforms = platforms.linux; maintainers = with lib.maintainers; [ jraygauthier ]; From 32a30629b454af4806f85199ab7dcbca8c8d4f1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:54:18 +0100 Subject: [PATCH 127/146] trufflehog: 3.25.2 -> 3.25.3 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.25.2...v3.25.3 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.25.3 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 43a97f8c8005..c5b83d3d5f62 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.25.2"; + version = "3.25.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-0cYaW55BF05tXCci76Eivn2rHMMJdjXl5WUkxvXbbnk="; + hash = "sha256-w2Wz1mGlpC7EQ7Xos1zDd88HVcLN0TITx3IEn4qyc0s="; }; - vendorHash = "sha256-UqoFEvixSk42UTMswc8tUDVxYVkfgkern3NeDyiUMMw="; + vendorHash = "sha256-71gPd42kaJaLpyXH1FpCf6sRiKmyGNuGxkX3QV8vvHY="; # Test cases run git clone and require network access doCheck = false; From 5a6308c80e6c75775597456eeb47ec0dd774f59d Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 25 Jan 2023 11:00:21 +0100 Subject: [PATCH 128/146] ocamlPackages.lutils: add changelog link --- pkgs/development/ocaml-modules/lutils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix index 20501e82451c..38bd10077ce0 100644 --- a/pkgs/development/ocaml-modules/lutils/default.nix +++ b/pkgs/development/ocaml-modules/lutils/default.nix @@ -18,6 +18,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"; description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)"; + changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${version}"; license = lib.licenses.cecill21; mainProgram = "gnuplot-rif"; }; From 5c01c6a97607ab7fef727d6a34421ce4ca5fee83 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 20 Jan 2023 21:24:50 +0100 Subject: [PATCH 129/146] rmate-sh: init at 1.0.2 --- pkgs/tools/misc/rmate-sh/default.nix | 54 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/misc/rmate-sh/default.nix diff --git a/pkgs/tools/misc/rmate-sh/default.nix b/pkgs/tools/misc/rmate-sh/default.nix new file mode 100644 index 000000000000..7fb51344edd1 --- /dev/null +++ b/pkgs/tools/misc/rmate-sh/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, patsh +, hostname +}: + +stdenv.mkDerivation rec { + pname = "rmate"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "aurora"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-fmK6h9bqZ0zO3HWfZvPdYuZ6i/0HZ1CA3FUnkS+E9ns="; + }; + + nativeBuildInputs = [ patsh ]; + + buildPhase = '' + runHook preBuild + + substituteInPlace rmate \ + --replace \ + 'echo "hostname"' \ + 'echo "${hostname}/bin/hostname"' + patsh -f rmate -s ${builtins.storeDir} + + runHook preBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 rmate $out/bin/rmate + + runHook postInstall + ''; + + meta = with lib; { + description = "Remote TextMate 2 implemented as shell script"; + longDescription = '' + TextMate 2 has a nice feature where it is possible to edit + files on a remote server using a helper script called 'rmate', + which feeds the file back to the editor over a reverse tunnel. + This is a rmate implementation in shell! + ''; + homepage = "https://github.com/aurora/rmate"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5371bc6b7798..4bf6d55a71c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5289,6 +5289,8 @@ with pkgs; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + rmate-sh = callPackage ../tools/misc/rmate-sh { }; + rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; rm-improved = callPackage ../applications/misc/rm-improved { }; From 0ea2d480e412236ea2d8970797901a21802a2465 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 Jan 2023 16:40:14 +0800 Subject: [PATCH 130/146] postgresqlTestHook: run postgresqlTestSetupPost hook after setting up --- doc/hooks/postgresql-test-hook.section.md | 6 ++++++ .../postgresql-test-hook/postgresql-test-hook.sh | 2 ++ .../build-support/setup-hooks/postgresql-test-hook/test.nix | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/hooks/postgresql-test-hook.section.md b/doc/hooks/postgresql-test-hook.section.md index c53d841883e5..8b37ca1e4b3e 100644 --- a/doc/hooks/postgresql-test-hook.section.md +++ b/doc/hooks/postgresql-test-hook.section.md @@ -46,6 +46,12 @@ Bash-only variables: - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended. - `postgresqlStartCommands`: defaults to `pg_ctl start`. +## Hooks {#sec-postgresqlTestHook-hooks} + +A number of additional hooks are ran in postgresqlTestHook + + - `postgresqlTestSetupPost`: ran after postgresql has been set up. + ## TCP and the Nix sandbox {#sec-postgresqlTestHook-tcp} `postgresqlEnableTCP` relies on network sandboxing, which is not available on macOS and some custom Nix installations, resulting in flaky tests. diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh index cfc9bd2f83d6..8131304cccf9 100644 --- a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh @@ -71,6 +71,8 @@ EOF header 'setting up postgresql' eval "$postgresqlTestSetupCommands" + runHook postgresqlTestSetupPost + } postgresqlStop() { diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix index adb65fca7ca6..9881ed1016cc 100644 --- a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { INSERT INTO hello VALUES ('it '||'worked'); SELECT * FROM hello; ''; + postgresqlTestSetupPost = '' + TEST_POST_HOOK_RAN=1 + ''; checkPhase = '' runHook preCheck psql <$sqlPath | grep 'it worked' @@ -21,7 +24,7 @@ stdenv.mkDerivation { runHook postCheck ''; installPhase = '' - [[ $TEST_RAN == 1 ]] + [[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]] touch $out ''; } From 5cc9f5fac3a41f3a00a7d9523a223c4771b05682 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 25 Jan 2023 12:04:02 +0100 Subject: [PATCH 131/146] nbxplorer: 2.3.54 -> 2.3.57 --- pkgs/applications/blockchains/nbxplorer/default.nix | 4 ++-- pkgs/applications/blockchains/nbxplorer/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 5e4b0afd385d..08def5dd7917 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.54"; + version = "2.3.57"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-WINanMGAlZioD6XP0xK6H+KTlF/NRMAmhylmRV6y2uI="; + sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 62aeee0f638e..e9b1de7ed900 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -34,8 +34,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.22"; sha256 = "1911mwz23qm9qnlfsm2j6qdkj1l43gjym4di8r50zikfnyd654sx"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) From 28dae7df2ee55daddc829886c360349a2fc8605a Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 25 Jan 2023 12:04:04 +0100 Subject: [PATCH 132/146] btcpayserver: 1.7.3 -> 1.7.5 --- .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 44 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index fb3912ab4db4..69004bb73c3f 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.3"; + version = "1.7.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ="; + sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 6b67883226fe..8a05f8276b3f 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.18"; sha256 = "1w1h6za2mjk04njkw4hny3lx38h2m03gmvwrihj9h2rak7jf2gij"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.24"; sha256 = "0i0lqpxx0gy9zbssjigz0vq0way88x0slyyfijsx4sasrhrbv5qs"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.23"; sha256 = "036cggc386448i05s38pnhzs7qqbix6lml7j2zn84gcgk8w741gi"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.16"; sha256 = "0l6pnjc6phsacwg145kwsakjpkd44jm1w53y0s166bwzpcdmljq0"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) @@ -38,7 +38,7 @@ (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "LNURL"; version = "0.0.27"; sha256 = "126rhls5yxxw4i419w59762cq3zmjccjd8x42qmb4nhqmbgybkzm"; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.28"; sha256 = "1fcrq5ib02scz6n4zvmnbvm2aahj6qwwq6wsfix90caqm2c2bq64"; }) (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) @@ -87,9 +87,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.10"; sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.5"; sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.10"; sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; }) @@ -98,9 +98,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.10"; sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.5"; sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.0"; sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.1.0"; sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "2.1.0"; sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.10"; sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) @@ -113,8 +113,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.0.0"; sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.1.0"; sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.1.0"; sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.0.0"; sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "6.0.9"; sha256 = "1g9jsqxaif9z5m228rci54w6cqmg07i0cm618iwa0jibsphx86fk"; }) @@ -156,19 +157,18 @@ (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) - (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; }) + (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.3"; sha256 = "0lf5qsf5yr5m1fx826mn47l237x5y2wkimv6klc3rvwwc7f10dmm"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "1.0.0.2"; sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "1.0.0.3"; sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) (fetchNuGet { pname = "NicolasDorier.RateLimits"; version = "1.2.3"; sha256 = "197cqb0yxd2hfxyikxw53m4lmxh87l9sqrr8xihg1j0knvwzgyyp"; }) - (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "1.0.0.18"; sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; }) + (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.1"; sha256 = "1jiinqj1y8vv78p766asml4bd0k5gwrpl9ksi176h0z7wsj6ilrx"; }) (fetchNuGet { pname = "NLog"; version = "4.7.14"; sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; }) (fetchNuGet { pname = "Npgsql"; version = "6.0.7"; sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; version = "6.0.7"; sha256 = "0gsvjf0vk7anmc889my8x68wpd47bsdgsk1rwbg77rrb9zsf4nxp"; }) From 9b24118fa0820e64878aef9563049ab98a0b269a Mon Sep 17 00:00:00 2001 From: Matt Russell Date: Wed, 25 Jan 2023 11:05:47 +0000 Subject: [PATCH 133/146] maintainers: add mdr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ebe9fdb6885..e36b0417456e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9119,6 +9119,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdr = { + email = "MattRussellUK@gmail.com"; + github = "mdr"; + githubId = 241257; + name = "Matt Russell"; + }; meain = { email = "mail@meain.io"; matrix = "@meain:matrix.org"; From 6b4e2bd5680efac09296c74f463c7e27ce53421a Mon Sep 17 00:00:00 2001 From: Matt Russell Date: Wed, 25 Jan 2023 11:06:12 +0000 Subject: [PATCH 134/146] detekt: init at 1.22.0 --- pkgs/development/tools/detekt/default.nix | 38 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/detekt/default.nix diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix new file mode 100644 index 000000000000..0c67c5dd66a9 --- /dev/null +++ b/pkgs/development/tools/detekt/default.nix @@ -0,0 +1,38 @@ +{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: +stdenv.mkDerivation rec { + pname = "detekt"; + version = "1.22.0"; + + jarfilename = "${pname}-${version}-executable.jar"; + + src = fetchurl { + url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; + sha256 = "sha256-NCOMBcAtk7cOlP3H8Bz/hfR/305j/DfaoFrwc504b/4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre_headless}/bin/java $out/bin/detekt \ + --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { package = detekt; }; + + meta = with lib; { + description = "Static code analysis for Kotlin"; + homepage = "https://detekt.dev/"; + license = licenses.asl20; + platforms = jre_headless.meta.platforms; + maintainers = with maintainers; [ mdr ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bd9165aca44..9fdf89147f3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17341,6 +17341,8 @@ with pkgs; datree = callPackage ../development/tools/datree { }; + detekt = callPackage ../development/tools/detekt { }; + dcadec = callPackage ../development/tools/dcadec { }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; From 4b0e37c4c75f5baaef24c6eb87149de403f1d04b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 25 Jan 2023 10:33:59 +0000 Subject: [PATCH 135/146] yeetgif: use buildGoModule --- .../applications/graphics/yeetgif/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix index 84bcdee5b76e..d464b56cb265 100644 --- a/pkgs/applications/graphics/yeetgif/default.nix +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -1,18 +1,29 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, fetchpatch, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "yeetgif"; version = "1.23.6"; - goPackagePath = "github.com/sgreben/yeetgif"; - src = fetchFromGitHub { owner = "sgreben"; repo = pname; rev = version; - sha256 = "05z1ylsra60bb4cvr383g9im94zsph1dgicqbv5p73qgs634ckk7"; + hash = "sha256-Z05GhtEPj3PLXpjF1wK8+pNUY3oDjbwZWQsYlTX14Rc="; }; + deleteVendor = true; + vendorHash = "sha256-LhkOMCuYO4GHezk21SlI2dP1UPmBp4bv2SdNbUQMKsI="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/sgreben/yeetgif/commit/5d2067b9832898c2b1ac51bf6a5f107619038270.patch"; + hash = "sha256-3eyqbpPyuQHjAN5mjQyZo0xY6L683T5Ytyx02II/iU4="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "gif effects CLI. single binary, no dependencies. linux, osx, windows. #1 workplace productivity booster. #yeetgif #eggplant #golang"; homepage = "https://github.com/sgreben/yeetgif"; From 87ee54054fcf1b7a3ab68ae80180a7204221557c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 25 Jan 2023 12:19:50 +0100 Subject: [PATCH 136/146] Revert "mdds: 2.0.3 -> 2.1.0" --- pkgs/development/libraries/mdds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index edce9518c3c5..23059b91e7c0 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mdds"; - version = "2.1.0"; + version = "2.0.3"; src = fetchFromGitLab { owner = "mdds"; repo = "mdds"; rev = finalAttrs.version; - hash = "sha256-RZ2wGwle4raWlogc5X+VEeriPGS0Nqs7CWGENFEotvs="; + hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI="; }; nativeBuildInputs = [ autoreconfHook ]; From 948a25ffd329f30e582aba359d7d76052bdb05dd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 25 Jan 2023 12:34:24 +0100 Subject: [PATCH 137/146] treewide: convert 16 fonts --- pkgs/data/fonts/liberastika/default.nix | 28 +++++++------- pkgs/data/fonts/mph-2b-damase/default.nix | 26 +++++++------ pkgs/data/fonts/mro-unicode/default.nix | 22 ++++++++--- pkgs/data/fonts/pretendard/default.nix | 31 ++++++++------- pkgs/data/fonts/ruwudu/default.nix | 22 ++++++----- pkgs/data/fonts/sampradaya/default.nix | 24 ++++++++---- pkgs/data/fonts/shrikhand/default.nix | 24 ++++++++---- pkgs/data/fonts/sil-abyssinica/default.nix | 28 ++++++++------ pkgs/data/fonts/sil-padauk/default.nix | 28 ++++++++------ .../data/fonts/sitelen-seli-kiwen/default.nix | 25 ++++++------ pkgs/data/fonts/stix-otf/default.nix | 26 +++++++------ pkgs/data/fonts/tai-languages/default.nix | 38 ++++++++++++------- pkgs/data/fonts/ttf-envy-code-r/default.nix | 24 ++++++------ pkgs/data/fonts/ttf-tw-moe/default.nix | 25 ++++++------ .../data/fonts/ubuntu-font-family/default.nix | 20 ++++++---- pkgs/data/fonts/victor-mono/default.nix | 27 ++++++------- 16 files changed, 245 insertions(+), 173 deletions(-) diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 5435a601d147..7c716c1a354b 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -1,31 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "liberastika"; version = "1.1.5"; -in fetchzip rec { - name = "liberastika-${version}"; - url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; + src = fetchzip { + url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; + stripRoot = false; + hash = "sha256-woUpOmxhj6eEw7PKJ8EyRcs3ORj0gCZhxHP5a5dy5z0="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - install -Dm644 $out/*.ttf -t $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "sha256-1hoETOjPRUIzzM+NUR+g/Ph16jXmH2ARSlZHjgEwoeM="; - meta = with lib; { description = "Liberation Sans fork with improved cyrillic support"; homepage = "https://sourceforge.net/projects/lib-ka/"; license = licenses.gpl2; platforms = platforms.all; - hydraPlatforms = []; maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 10a8dc38d954..d5623d907bee 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,17 +1,21 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "MPH-2B-Damase-2"; +stdenvNoCC.mkDerivation rec { + pname = "mph-2b-damase"; + version = "2"; - url = "http://www.wazu.jp/downloads/damase_v.2.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20160322114946/http://www.wazu.jp/downloads/damase_v.2.zip"; + hash = "sha256-4x78D+c3ZBxfhTQQ4+gyxvrsuztHF2ItXLh4uA0PxvU="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql"; - - meta = { - }; + meta = { }; } diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index 9f4eda63d0fa..9a522c1c2a36 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -1,13 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "mro-unicode-2013-05-25"; +stdenvNoCC.mkDerivation { + pname = "mro-unicode"; + version = "unstable-2013-05-25"; - url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf"; + src = fetchurl { + url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf"; + hash = "sha256-hcQmTuRWxaU5KEMXg/O0b1olE8YxXWz0PAlqAJknR/0="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf"; + dontUnpack = true; - sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/MroUnicode-Regular.ttf + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/phjamr/MroUnicode"; diff --git a/pkgs/data/fonts/pretendard/default.nix b/pkgs/data/fonts/pretendard/default.nix index 40175dc54056..60ecc61c7ec3 100644 --- a/pkgs/data/fonts/pretendard/default.nix +++ b/pkgs/data/fonts/pretendard/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let version = "1.3.3"; - mkPretendard = { pname, typeface, sha256 }: - fetchzip { - name = "${pname}-${version}"; + mkPretendard = { pname, typeface, hash }: + stdenvNoCC.mkDerivation { + inherit pname version; - url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip"; - inherit sha256; + src = fetchzip { + url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip"; + stripRoot = false; + inherit hash; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/ - install -Dm644 $out/public/static/*.otf -t $out/share/fonts/opentype - rm -rf $out/{public,web,LICENSE.txt} + install -Dm644 public/static/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; meta = with lib; { @@ -32,18 +35,18 @@ in pretendard = mkPretendard { pname = "pretendard"; typeface = "Pretendard"; - sha256 = "sha256-lRHRdCAg3i3+3Y6j0dCXUgwLdeS/VeI6KNkbDKchNEY="; + hash = "sha256-xCEZlwTPhrNIO6WODl55wo2oin+iMYOL/rVaEybpzr0="; }; pretendard-jp = mkPretendard { pname = "pretendard-jp"; typeface = "PretendardJP"; - sha256 = "sha256-VgGt/WoaaJJDAzw+gUQVgTQ+q34bdAaKUB4cA9eU0dQ="; + hash = "sha256-x0G7ULzkIJqZlK995+wWKHXZdWryUTRouGTa5LsJQzk="; }; pretendard-std = mkPretendard { pname = "pretendard-std"; typeface = "PretendardStd"; - sha256 = "sha256-FOlZrr6CHPfUm9Q+Yoi0HLQUI7cAhQYq6P6sJGXBIWg="; + hash = "sha256-/I8LZhFB86/+o+IzUP+bSIq7scKPOL7k/6/Bom0ZSqg="; }; } diff --git a/pkgs/data/fonts/ruwudu/default.nix b/pkgs/data/fonts/ruwudu/default.nix index 2002f4b67203..61f306c71024 100644 --- a/pkgs/data/fonts/ruwudu/default.nix +++ b/pkgs/data/fonts/ruwudu/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "ruwudu"; version = "2.000"; - url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; + src = fetchzip { + url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; + hash = "sha256-FP+ZHm1fKlozAAI2PbJ4r4v5OwRxBtYMRLmRwPbqx2I="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - rm -rf $out/web $out/manifest.json mkdir -p $out/share/{doc/${pname},fonts/truetype} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${pname}/ - ''; + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}/ - sha256 = "sha256-JCvVPbAFBWHL2eEnEUSgdTZ+Vkw3wkS3aS85xQZKNQs="; + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/ruwudu/"; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 749abb71dbd4..8c0545d2c7fe 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -1,16 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "sampradaya-2015-05-26"; +stdenvNoCC.mkDerivation rec { + pname = "sampradaya"; + version = "0.5.0"; - url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; + src = fetchurl { + url = "https://github.com/deepestblue/sampradaya/releases/download/v${version}/Sampradaya.ttf"; + hash = "sha256-ygKMNzHvbLR2A5HHrfY2C9ZUg0yng+JL3cyg6sBKqeQ="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf"; + dontUnpack = true; - sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/Sampradaya.ttf + + runHook postInstall + ''; meta = with lib; { - homepage = "https://bitbucket.org/OorNaattaan/sampradaya/"; + homepage = "https://github.com/deepestblue/sampradaya"; description = "Unicode-compliant Grantha font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; # See font metadata diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index 684f3d0395e9..0db94ebd4ecb 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "2016-03-03"; -in fetchzip { - name = "shrikhand-${version}"; +stdenvNoCC.mkDerivation { + pname = "shrikhand"; + version = "unstable-2016-03-03"; - url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; + src = fetchurl { + url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; + hash = "sha256-wHP1Bwu5Yw3a+RwDOHrmthsnuvwyCV4l6ma5EjA6EMA="; + }; - postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; + dontUnpack = true; - sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; + installPhase = '' + runHook preInstall + + install -D -m644 $src $out/share/fonts/truetype/Shrikhand-Regular.ttf + + runHook postInstall + ''; meta = with lib; { homepage = "https://jonpinhorn.github.io/shrikhand/"; diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index b61af144dcc0..f01c50b42608 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -1,18 +1,22 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "sil-abyssinica"; version = "2.200"; -in -fetchzip rec { - name = "sil-abyssinica-${version}"; - url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - sha256 = "sha256-Kvswqzw8remcu36QaVjeyk03cR4wW5BKQMDihiaxJoE="; - postFetch = '' - rm -rf $out/web - mkdir -p $out/share/{fonts/truetype,doc/${name}} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${name}/ + src = fetchzip { + url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; + hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{fonts/truetype,doc/${pname}-${version}} + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/data/fonts/sil-padauk/default.nix index b993ef5ae6b6..fe45da131738 100644 --- a/pkgs/data/fonts/sil-padauk/default.nix +++ b/pkgs/data/fonts/sil-padauk/default.nix @@ -1,19 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "sil-padauk"; version = "5.001"; -in -fetchzip rec { - name = "sil-padauk-${version}"; - url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip"; - sha256 = "sha256-6H9EDmXr1Ox2fgLw9sG5JrCAllK3tbjvMfLi8DTF1f0="; - postFetch = '' + src = fetchzip { + url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip"; + hash = "sha256-rLzuDUd+idjTN0xQxblXQ9V2rQtJPN2EtWGmTRY1R7U="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype - rm -rf $out/{manifest.json,web/} - mv $out/*.ttf $out/share/fonts/truetype/ - mkdir -p $out/share/doc/${name} - mv $out/*.txt $out/documentation/ $out/share/doc/${name}/ + mv *.ttf $out/share/fonts/truetype/ + mkdir -p $out/share/doc/${pname}-${version} + mv *.txt documentation/ $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/pkgs/data/fonts/sitelen-seli-kiwen/default.nix index 60f5c3e36e76..de0fec7b6f3e 100644 --- a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix +++ b/pkgs/data/fonts/sitelen-seli-kiwen/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - rev = "69132c99873894746c9710707aaeb2cea2609709"; -in -fetchzip { +stdenvNoCC.mkDerivation { pname = "sitelen-seli-kiwen"; version = "unstable-2022-06-28"; - url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/${rev}/sitelenselikiwen.zip"; - hash = "sha256-63sl/Ha2QAe8pVKCpLNs//DB0kjLdW01u6tVMrGquIU="; - stripRoot = false; + src = fetchzip { + url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/69132c99873894746c9710707aaeb2cea2609709/sitelenselikiwen.zip"; + stripRoot = false; + hash = "sha256-viOLAj9Rn60bcQkkDHVuKHCE8KPnIz/L0hIJhum1SSQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/{opentype,truetype} - mv $out/*.eot $out/share/fonts/opentype/ - mv $out/*.ttf $out/share/fonts/truetype/ + mv *.eot $out/share/fonts/opentype/ + mv *.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index 894fd22c36f9..c5505b7a7948 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -1,24 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "stix-otf"; version = "1.1.1"; -in fetchzip { - name = "stix-otf-${version}"; - url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip"; + src = fetchzip { + url = "https://sources.debian.org/src/fonts-stix/1.1.1-4.1/STIXv${version}-word.zip"; + stripRoot = false; + hash = "sha256-M3STue+RPHi8JgZZupV0dVLZYKBiFutbBOlanuKkD08="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 Fonts/STIX-Word/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; - meta = with lib; { homepage = "http://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 71ca170afb1d..4e4c689b6ac6 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -1,24 +1,34 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: { -tai-ahom = fetchzip { - name = "tai-ahom-2015-07-06"; + tai-ahom = stdenvNoCC.mkDerivation rec { + pname = "tai-ahom"; + version = "unstable-2015-07-06"; - url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; + src = fetchurl { + url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf"; + hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf"; + dontUnpack = true; - sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://github.com/enabling-languages/tai-languages"; - description = "Unicode-compliant Tai Ahom font"; - maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.ofl; # See font metadata - platforms = platforms.all; + install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/enabling-languages/tai-languages"; + description = "Unicode-compliant Tai Ahom font"; + maintainers = with maintainers; [ mathnerd314 ]; + license = licenses.ofl; # See font metadata + platforms = platforms.all; + }; }; -}; -# TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) + # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) } diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 871bfb0099b2..673d946a1e9a 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "ttf-envy-code-r"; version = "PR7"; -in fetchzip { - name = "${pname}-0.${version}"; - url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + src = fetchzip { + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + hash = "sha256-pJqC/sbNjxEwbVf2CVoXMBI5zvT3DqzRlKSqFT8I2sM="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}" + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/${pname} + + runHook postInstall ''; - sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; - meta = with lib; { homepage = "https://damieng.com/blog/tag/envy-code-r"; description = "Free scalable coding font by DamienG"; diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix index bf52d07c52e9..85b2ec1ce787 100644 --- a/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "ttf-tw-moe"; version = "2020-11-14"; -in -fetchzip { - name = "ttf-tw-moe"; - url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + hash = "sha256-9gy8xO93ViIPmpg1du0DbXVCR2FowourLH8nP9d6HK0="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; - meta = with lib; { homepage = "http://www.moe.gov.tw/"; description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 0458abf91d4f..331e34690a5e 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "ubuntu-font-family"; version = "0.83"; - url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip"; + src = fetchzip { + url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip"; + hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/ubuntu - mv $out/*.ttf $out/share/fonts/ubuntu - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.ttf $out/share/fonts/ubuntu - sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; + runHook postInstall + ''; meta = with lib; { description = "Ubuntu Font Family"; diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index f34baa8a8314..1708a43b8056 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -1,11 +1,8 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "victor-mono"; version = "1.5.4"; -in -fetchzip { - name = "victor-mono-${version}"; - stripRoot = false; # Upstream prefers we download from the website, # but we really insist on a more versioned resource. @@ -14,19 +11,23 @@ fetchzip { # so we extract it from the tagged release. # Both methods produce the same file, but this way # we can safely reason about what version it is. - url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; + src = fetchzip { + url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; + stripRoot = false; + hash = "sha256-E8j1bfYrM8yRtasiwgTvyE4EYx2LyAbmw3MXH1l+owk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p "$out/share/fonts/" - mv $out/OTF $out/share/fonts/opentype - mv $out/TTF $out/share/fonts/truetype + mv OTF $out/share/fonts/opentype + mv TTF $out/share/fonts/truetype - rm -r $out/{EOT,WOFF,WOFF2,LICENSE.txt} + runHook postInstall ''; - sha256 = "sha256-1si0d2lpuXaDcSc3giVMMMbZc/eKbHKU3wmwfYHZ8o0="; - meta = with lib; { description = "Free programming font with cursive italics and ligatures"; homepage = "https://rubjo.github.io/victor-mono"; From 3391ee339b2008bd74ab112dc66a84f3e103f840 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:47:48 +0100 Subject: [PATCH 138/146] cmus: remove clangGCC hack The compiler is overridable using the HOSTCC flag, so no hacks such as creating a fake gcc is needed. --- pkgs/applications/audio/cmus/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 61ff53aa1d75..6d37e33b5eee 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -88,14 +88,6 @@ let #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu) ]; - - clangGCC = runCommand "clang-gcc" {} '' - #! ${stdenv.shell} - mkdir -p $out/bin - ln -s ${stdenv.cc}/bin/clang $out/bin/gcc - ln -s ${stdenv.cc}/bin/clang++ $out/bin/g++ - ''; - in stdenv.mkDerivation rec { @@ -111,17 +103,18 @@ stdenv.mkDerivation rec { patches = [ ./option-debugging.patch ]; - configurePhase = "./configure " + lib.concatStringsSep " " ([ - "prefix=$out" - "CONFIG_WAV=y" - ] ++ 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 ] ++ lib.flatten (lib.concatMap (a: a.deps) opts); + prefixKey = "prefix="; + + configureFlags = [ + "CONFIG_WAV=y" + "HOSTCC=${stdenv.cc.targetPrefix}cc" + ] ++ lib.concatMap (a: a.flags) opts; + makeFlags = [ "LD=$(CC)" ]; meta = with lib; { From 74c4f2a2235e8c913444e0893347b796e22f732e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 25 Jan 2023 07:57:45 -0500 Subject: [PATCH 139/146] just: add adamcstephens as maintainer --- pkgs/development/tools/just/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 8bcc8a73fb92..6e5b0d56d027 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -64,6 +64,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; description = "A handy way to save and run project-specific commands"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd jk ]; + maintainers = with maintainers; [ xrelkd jk adamcstephens ]; }; } From 347504079ad48ab13359c6e8b0b4116dcc8dd2ec Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 25 Jan 2023 21:09:56 +0800 Subject: [PATCH 140/146] ashpd-demo: Fix build with Pipewire 0.3.64 https://hydra.nixos.org/build/206766948 --- pkgs/development/tools/ashpd-demo/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index 9b6d00c0efbc..f8e1a36a993e 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation rec { libshumate ]; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + passthru = { updateScript = nix-update-script { }; }; From fd1a6a66722dd76cbe5576221aed0a9de1563931 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Wed, 25 Jan 2023 14:17:15 +0100 Subject: [PATCH 141/146] ocamlPackages.gd4o: Support cross-compilation Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/development/ocaml-modules/gd4o/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix index 9923edc2e8db..cd2069648566 100644 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/pkgs/development/ocaml-modules/gd4o/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib libjpeg libpng ]; propagatedBuildInputs = [ gd zlib freetype ]; - prePatch = '' - substituteInPlace Makefile --replace gcc cc - ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; preInstall = '' mkdir -p $OCAMLFIND_DESTDIR/stublibs From fd06ea306516546796c461ffbbed66218a701f01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 13:29:16 +0000 Subject: [PATCH 142/146] python310Packages.google-cloud-container: 2.17.0 -> 2.17.1 --- .../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 11939a5195a3..6c022b84ab75 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.17.0"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UlZJ4nh7BOw4HfFGZucU7Kom7/EuSdgZZzZ30f4wL+0="; + hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA="; }; propagatedBuildInputs = [ From 771d1efe71aae8af4dbc91eed6d2b79a3ca5a548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 13:39:34 +0000 Subject: [PATCH 143/146] goda: 0.5.4 -> 0.5.5 --- pkgs/development/tools/goda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix index e2bddfb5dd89..0564cfa31577 100644 --- a/pkgs/development/tools/goda/default.nix +++ b/pkgs/development/tools/goda/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goda"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-5MkErXgRJtaXbThJYjGWyvt+RAbtULTe0VoXKU3HQug="; + sha256 = "sha256-yKhgk/DRcifh+exxTZFti1Aac/sgpvUsNKdioLAzmX0="; }; vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms="; From 8486c3d92e637e4d376e913e3341a4a4d76aa9ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 13:41:32 +0000 Subject: [PATCH 144/146] babashka: 1.0.170 -> 1.1.172 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 4f0259c65d85..d50ed8ff0520 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.170"; + version = "1.1.172"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-NM1lcDi60DuBr67kOx6CVLyO8p2DUq6c2oTZEiHBFjw="; + sha256 = "sha256-mdcG4zKC9zX0J2S2lWCvFdFFr5sOxfOe9/iPzvEyImM="; }; executable = "bb"; From 51c748a0ef607205df511fc8c546b10b5dae1128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 14:13:40 +0000 Subject: [PATCH 145/146] advancecomp: 2.4 -> 2.5 --- pkgs/tools/compression/advancecomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 1ed5939746d4..32bae24a6c45 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "advancecomp"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - hash = "sha256-nl1t1XbyCDYH7jKdIRSIXfXuRCj5N+5noC86VpbpWu4="; + hash = "sha256-dlVTMd8sm84M8JZsCfVR/s4jXMQWmrVj7xwUVDsehQY="; }; nativeBuildInputs = [ autoreconfHook ]; From 35fda913a85f513393e26fdf0b8693d612ec2cb4 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 25 Jan 2023 07:57:55 -0500 Subject: [PATCH 146/146] just: 1.11.0 -> 1.13.0 --- pkgs/development/tools/just/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 6e5b0d56d027..fd97cc2634fd 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,22 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; - rev = version; - hash = "sha256-TYw2YrilrEUCvyT9VvzrQnHcSnhPrNiAMRjLEk/QjgU="; + rev = "refs/tags/${version}"; + hash = "sha256-5JI3QaUuWvwI3pClZXMPU8v1lcPZ5YioMPGKl/lIjQ0="; }; - cargoHash = "sha256-pgktCRxYlxo/kMdBm3/dzdU3rOXSNFY9IIE8j8Dgro0="; + cargoHash = "sha256-91C/5m2avsW7GKQDg/Ez9fzzFhe8ih1De1RbV/MBJbM="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - nativeCheckInputs = [ coreutils bash ]; - preCheck = '' # USER must not be empty export USER=just-user