From 5526aca9e5c807e11da68adc708ea3cc55e7804a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 29 Jun 2023 15:44:34 +0200 Subject: [PATCH 01/80] synology-drive-client: 3.2.1 -> 3.3.0 --- .../networking/synology-drive-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 850692f18547..34d33e326ab4 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.2.1-13272"; + version = "3.3.0-15082"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0="; + sha256 = "sha256-ha3KRpEIT7w6pUVUwZV011W1F/v/hNq9f3ArfzU0ZGc="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE="; + sha256 = "sha256-dxmpB31ZjO1uAnAbY13OjVR81CCDLf9vJC20iZaPZJ4="; }; nativeBuildInputs = [ cpio xar undmg ]; From ccb194910e938ef131b3b23d94cbb48061b03488 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Thu, 29 Jun 2023 19:35:23 +0530 Subject: [PATCH 02/80] ktlint: 0.49.1 -> 0.50.0 --- pkgs/development/tools/ktlint/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 8eefc895864b..1718821d2102 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.49.1"; + version = "0.50.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "1k2byxqvgr2xll4jj0ck8w3qdgkvjhwkag18inxjakcl99knygrb"; + sha256 = "01qh85kclksgv484cwma7jyaxlz8rgk14l4mxcvzp2flprdnzgd2"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { platforms = jre_headless.meta.platforms; changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } From e7efe3c4d89dd64f45b1e88c139028a14942d38a Mon Sep 17 00:00:00 2001 From: Marek Generowicz Date: Thu, 29 Jun 2023 16:29:06 +0200 Subject: [PATCH 03/80] ledger-live-desktop: 2.60.0->2.62.2 ledger-live-desktop: 2.60.0->2.62.2 --- .../applications/blockchains/ledger-live-desktop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 8531456a73d3..858931058fce 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,13 +2,14 @@ let pname = "ledger-live-desktop"; - version = "2.60.0"; + version = "2.62.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-dR6F6elUxZW3EuH71d5P9SOSDq5f5lAsYnrfWrsj2KA="; + hash = "sha256-Rb611v2QirGmJ01lZj6F3iHLTPI2eJp5acZDEQ4Ude0=="; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 739ebed245173738ff3429e678f809e1f9eac55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Thu, 29 Jun 2023 19:39:59 +0200 Subject: [PATCH 04/80] pulsarctl: init at 2.10.3.3 --- pkgs/tools/admin/pulsarctl/default.nix | 76 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/tools/admin/pulsarctl/default.nix diff --git a/pkgs/tools/admin/pulsarctl/default.nix b/pkgs/tools/admin/pulsarctl/default.nix new file mode 100644 index 000000000000..400e6dc7ae04 --- /dev/null +++ b/pkgs/tools/admin/pulsarctl/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, nix-update-script +, testers +, pulsarctl +}: + +buildGoModule rec { + pname = "pulsarctl"; + version = "2.10.3.3"; + + src = fetchFromGitHub { + owner = "streamnative"; + repo = "pulsarctl"; + rev = "v${version}"; + hash = "sha256-BOVFBIG+XKBOmLOx/IzseEArcPeriJWzn30FOERBy9s="; + }; + + vendorHash = "sha256-ao8Bxaq9LHvC6Zdd1isyMKxoTJ0MGelSPPxwgqVJcK8="; + + nativeBuildInputs = [ installShellFiles ]; + + preBuild = let + buildVars = { + ReleaseVersion = version; + BuildTS = "None"; + GitHash = src.rev; + GitBranch = "None"; + GoVersion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')"; + }; + buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X github.com/streamnative/pulsarctl/pkg/cmdutils.${k}=${v}") buildVars); + in + '' + buildFlagsArray+=("-ldflags=${buildVarsFlags}") + ''; + + excludedPackages = [ + "./pkg/test" + "./pkg/test/bookkeeper" + "./pkg/test/bookkeeper/containers" + "./pkg/test/pulsar" + "./pkg/test/pulsar/containers" + "./site/gen-pulsarctldocs" + "./site/gen-pulsarctldocs/generators" + ]; + + doCheck = false; + + postInstall = '' + installShellCompletion --cmd pulsarctl \ + --bash <($out/bin/pulsarctl completion bash) \ + --fish <($out/bin/pulsarctl completion fish) \ + --zsh <($out/bin/pulsarctl completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = pulsarctl; + command = "pulsarctl --version"; + version = "v${version}"; + }; + }; + + meta = with lib; { + description = " a CLI for Apache Pulsar written in Go"; + homepage = "https://github.com/streamnative/pulsarctl"; + license = with licenses; [ asl20 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "pulsarctl"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ca99c980872..8bbc08b72a3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5869,6 +5869,8 @@ with pkgs; pscale = callPackage ../development/tools/pscale { }; + pulsarctl = callPackage ../tools/admin/pulsarctl { }; + psstop = callPackage ../tools/system/psstop { }; precice = callPackage ../development/libraries/precice { }; From b016259f93ce8abf6c278f1981dd5eb231f34b25 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 30 Jun 2023 02:33:17 +0000 Subject: [PATCH 05/80] func: 1.7.0 -> 1.10.0 --- pkgs/applications/networking/cluster/func/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/func/default.nix b/pkgs/applications/networking/cluster/func/default.nix index 306ce8ba25e4..7145d1277c9b 100644 --- a/pkgs/applications/networking/cluster/func/default.nix +++ b/pkgs/applications/networking/cluster/func/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "func"; - version = "1.7.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "knative"; repo = "func"; rev = "knative-v${version}"; - sha256 = "sha256-LrWRY22deh+YL/cLb+ZwK93okVPgysBoMCmo2MrbqIs="; + hash = "sha256-x/SrRkgeLvjcd9LNgMGOf5TLU1GXpjY2Z2MyxrBZckc="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/func" ]; From a8e7b9684f1ad62fc200eb0ce3ad11308cb91802 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 30 Jun 2023 02:37:26 +0000 Subject: [PATCH 06/80] kbst: 0.1.5 -> 0.2.1 --- pkgs/applications/networking/cluster/kbst/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/kbst/default.nix b/pkgs/applications/networking/cluster/kbst/default.nix index 9a949bc8c800..30207b07457f 100644 --- a/pkgs/applications/networking/cluster/kbst/default.nix +++ b/pkgs/applications/networking/cluster/kbst/default.nix @@ -2,15 +2,17 @@ buildGoModule rec { pname = "kbst"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub{ owner = "kbst"; repo = "kbst"; rev = "v${version}"; - sha256 = "0cz327fl6cqj9rdi8zw6xrazzigjymhn1hsbjr9xxvfvfnn67xz2"; + hash = "sha256-tbSYNJp/gzEz+wEAe3bvIiZL5axZvW+bxqTOBkYSpMY="; }; + vendorHash = "sha256-+FY6KGX606CfTVKM1HeHxCm9PkaqfnT5XeOEXUX3Q5I="; + ldflags = let package_url = "github.com/kbst/kbst"; in [ @@ -22,8 +24,6 @@ buildGoModule rec { "-X ${package_url}.gitTreeState=clean" ]; - vendorSha256 = "sha256-DZ47Bj8aFfBnxU9+e1jZiTMF75rCJtcj4yUfZRJWCic="; - doCheck = false; doPostInstallCheck = true; From 10cf856dc1dcbb9b7f38042dd8d0fcf9175a136b Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 30 Jun 2023 08:30:45 +0200 Subject: [PATCH 07/80] netbox: 3.5.3 -> 3.5.4 --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 5903c5183335..0e2c4c999cf0 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -23,8 +23,8 @@ in }; netbox = callPackage generic { - version = "3.5.3"; - hash = "sha256-F8rsTOOxARI3ll545AF0+HFaG4wNO+RWwsl5y9kAyE4="; + version = "3.5.4"; + hash = "sha256-CJ7NgKDDEmOFFULaG6wjP5pvGieyU4YRsvmIvqve5qg="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch From c85b190a7a89068a491afa6b885355690d71a816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Fri, 30 Jun 2023 09:19:43 +0200 Subject: [PATCH 08/80] calibre: 6.21.0 -> 6.22.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f24c4432dd5b..1e90b17eced4 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.21.0"; + version = "6.22.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-gGgXnJbGbp6uK9tFK6wqHBKf+zWidF5u5wI2lclrJGk="; + hash = "sha256-TBXdEf6MBP64heY6uAaVJtZc+SnhF4BNJghcCuTopUc="; }; # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1 From 761ffd78d0305b4c65a3aed3417f719070f82145 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Jun 2023 13:16:22 +0200 Subject: [PATCH 09/80] evcc: 0.118.1 -> 0.118.2 https://github.com/evcc-io/evcc/releases/tag/0.118.2 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 77e9d73d078c..d2d25006fa88 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.118.1"; + version = "0.118.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-EAvY+JNk1V4oWW5mbbEIRjaUqTOib6zY8hab0Mw2hUk="; + hash = "sha256-4zbXNXNWrnsghbL2cvatCShuio7uIXbLtLmG0o4PGq0="; }; - vendorHash = "sha256-CkJpTXbjHRXcZp+FWGal91kkFkIMoKZ6/zmY+8Udmos="; + vendorHash = "sha256-SFs7Bua3/bgTcdzvSisTn3Xx+7jD84LrMdaUhDXp9VI="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-w2xMG0vHx4g9AAvNWRwR3u9w6PrHtQV7TETnDRkmkBk="; + hash = "sha256-Kwt6YzaqJhEF90+r4+BjYwgmD5xXQBSEzwp6dg3X9GQ="; }; nativeBuildInputs = [ From 744ddf36185d85719c5f50f7d1d9e4a46908e82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Thu, 29 Jun 2023 23:16:14 +0200 Subject: [PATCH 10/80] owntracks-recorder: init at 0.9.3 --- pkgs/servers/owntracks-recorder/default.nix | 82 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/servers/owntracks-recorder/default.nix diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix new file mode 100644 index 000000000000..47b3b696fd4c --- /dev/null +++ b/pkgs/servers/owntracks-recorder/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, mosquitto +, curl +, openssl +, lmdb +, lua +, libsodium +, libuuid +, libconfig +, testers +, owntracks-recorder +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "owntracks-recorder"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "owntracks"; + repo = "recorder"; + rev = finalAttrs.version; + hash = "sha256-w0wk69hERGz6fs6uXBYiomcVlQeeTGCfTICu2q7ryNg="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + (lib.getDev curl) + (lib.getLib libconfig) + (lib.getDev openssl) + (lib.getDev lmdb) + (lib.getDev mosquitto) + (lib.getDev libuuid) + (lib.getDev lua) + (lib.getDev libsodium) + ]; + + configurePhase = '' + runHook preConfigure + + cp config.mk.in config.mk + + substituteInPlace config.mk \ + --replace "INSTALLDIR = /usr/local" "INSTALLDIR = $out" \ + --replace "WITH_LUA ?= no" "WITH_LUA ?= yes" \ + --replace "WITH_ENCRYPT ?= no" "WITH_ENCRYPT ?= yes" + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + install -m 0755 ot-recorder $out/bin + install -m 0755 ocat $out/bin + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = owntracks-recorder; + command = "ocat --version"; + version = finalAttrs.version; + }; + + meta = with lib; { + description = "Store and access data published by OwnTracks apps"; + homepage = "https://github.com/owntracks/recorder"; + changelog = "https://github.com/owntracks/recorder/blob/master/Changelog"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "ot-recorder"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21b83d86d6d1..c44703a6a899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11119,6 +11119,8 @@ with pkgs; owncast = callPackage ../servers/owncast { }; + owntracks-recorder = callPackage ../servers/owntracks-recorder { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit; From c09a0a837a75b91a580587d15c6f9e8fcfada834 Mon Sep 17 00:00:00 2001 From: Erik Skytthe Date: Fri, 30 Jun 2023 15:08:03 +0200 Subject: [PATCH 11/80] apacheKafka: 3.5.0, 3.4.1, 3.3.1 -> 3.3.2 --- nixos/tests/kafka.nix | 2 ++ pkgs/servers/apache-kafka/default.nix | 18 +++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 79af02710c32..864253fd8c73 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -72,5 +72,7 @@ in with pkgs; { kafka_3_1 = makeKafkaTest "kafka_3_1" apacheKafka_3_1; kafka_3_2 = makeKafkaTest "kafka_3_2" apacheKafka_3_2; kafka_3_3 = makeKafkaTest "kafka_3_3" apacheKafka_3_3; + kafka_3_4 = makeKafkaTest "kafka_3_4" apacheKafka_3_4; + kafka_3_5 = makeKafkaTest "kafka_3_5" apacheKafka_3_5; kafka = makeKafkaTest "kafka" apacheKafka; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index cb3691460bd7..114a0ce96f0e 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,10 +3,22 @@ let versionMap = { - "3.3" = { - kafkaVersion = "3.3.1"; + "3.5" = { + kafkaVersion = "3.5.0"; scalaVersion = "2.13"; - sha256 = "sha256-GK2KNl+xEd4knTu4vzyWzRrwYOyPs+PR/Ep64Q2QQt4="; + sha256 = "sha256-KjpGjgab5XDxbWEqgZbC96kge36shlvpNNIM4SUusvg="; + jre = jdk17_headless; + }; + "3.4" = { + kafkaVersion = "3.4.1"; + scalaVersion = "2.13"; + sha256 = "sha256-p28XpSuPLNMd4RVx/zZqcUggtuTgKJOwFZ0J2w7a+Zg="; + jre = jdk17_headless; + }; + "3.3" = { + kafkaVersion = "3.3.2"; + scalaVersion = "2.13"; + sha256 = "sha256-Gv5XrpXnEajH8fSbcfIfURz+QPcqTrJ1oe3SGXYLNRc="; jre = jdk17_headless; }; "3.2" = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41438b17e46f..ded8cdc81a18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18014,12 +18014,14 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_3_3; + apacheKafka = apacheKafka_3_5; apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; }; apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; }; apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; + apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; }; + apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; kt = callPackage ../tools/misc/kt { }; From fb8fdc33e87f8a1fdcc354ba35775c3f606bfff4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 30 Jun 2023 19:37:17 +0300 Subject: [PATCH 12/80] makeSetupHook: unbreak structuredAttrsByDefault --- pkgs/build-support/trivial-builders/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 2af36008c7a5..871f9722a4a2 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -624,6 +624,10 @@ rec { script: runCommand name (substitutions // { + # TODO(@Artturin:) substitutions should be inside the env attrset + # but users are likely passing non-substitution arguments through substitutions + # turn off __structuredAttrs to unbreak substituteAll + __structuredAttrs = false; inherit meta; inherit depsTargetTargetPropagated; propagatedBuildInputs = From 59a54a4fa6066fe28dfbdf9b2ef3585e3531263b Mon Sep 17 00:00:00 2001 From: meppu Date: Fri, 30 Jun 2023 20:01:45 +0300 Subject: [PATCH 13/80] elixir_1_15: 1.15.0 -> 1.15.1 --- pkgs/development/interpreters/elixir/1.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix index 6dada168cc37..578db897fce5 100644 --- a/pkgs/development/interpreters/elixir/1.15.nix +++ b/pkgs/development/interpreters/elixir/1.15.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.15.0"; - sha256 = "sha256-o5MfA0UG8vpnPCH1EYspzcN62yKZQcz5uVUY47hOL9w="; + version = "1.15.1"; + sha256 = "sha256-TP97vnhX+ZZGmOzAfqKf0dSqObPMh+34xcVpFnSb11w="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; escriptPath = "lib/elixir/scripts/generate_app.escript"; From febd3fa64f07d2ebf39a7f623684760355017273 Mon Sep 17 00:00:00 2001 From: StepBroBD Date: Fri, 30 Jun 2023 11:14:08 -0600 Subject: [PATCH 14/80] raycast: 1.53.4 -> 1.54.1 --- pkgs/os-specific/darwin/raycast/default.nix | 14 +++++++------- pkgs/os-specific/darwin/raycast/update.sh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index d37cdff0ca86..df6c5c36d7a3 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -4,14 +4,14 @@ , undmg }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.53.4"; + version = "1.54.1"; src = fetchurl { name = "Raycast.dmg"; - url = "https://releases.raycast.com/releases/${version}/download?build=universal"; - sha256 = "sha256-bkNlGHCpYnHlKdzDyKGPF5jnoq2cSe1sdg9W2DwVrWc="; + url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; + hash = "sha256-lnP0wSTC7oCji24RSk1fY+QSwoYioMPtvOb4Ey1MzVY="; }; dontPatch = true; @@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Control your tools with a few keystrokes"; homepage = "https://raycast.app/"; - license = licenses.unfree; + license = with licenses; [ unfree ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ lovesegfault stepbrobd ]; - platforms = platforms.darwin; + platforms = [ "aarch64-darwin" "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/os-specific/darwin/raycast/update.sh b/pkgs/os-specific/darwin/raycast/update.sh index f338f5f278fc..6c81c02b8f97 100755 --- a/pkgs/os-specific/darwin/raycast/update.sh +++ b/pkgs/os-specific/darwin/raycast/update.sh @@ -3,7 +3,7 @@ set -eo pipefail -new_version=$(curl --silent https://releases.raycast.com/releases/latest | jq -r '.version') +new_version=$(curl --silent https://releases.raycast.com/releases/latest?build=universal | jq -r '.version') old_version=$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix) if [[ $new_version == $old_version ]]; then @@ -16,5 +16,5 @@ else fi hash=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://releases.raycast.com/releases/$new_version/download?build=universal" | jq -r '.hash') -sed -Ei.bak '/ *sha256 = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' ./default.nix +sed -Ei.bak '/ *hash = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' ./default.nix rm ./default.nix.bak From 62dddab336c352959f03050775b138e7b3166864 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 30 Jun 2023 20:44:27 +0300 Subject: [PATCH 15/80] enblend-enfuse: use fetchhg instead of sourceforge snapshots See also discussion at: https://github.com/NixOS/nixpkgs/pull/239140#discussion_r1248079360 --- pkgs/tools/graphics/enblend-enfuse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 4cf5970c5a69..2fffa3bfa9c7 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip +{ lib, stdenv, fetchhg , autoreconfHook , boost , freeglut @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { pname = "enblend-enfuse"; version = "unstable-2022-03-06"; - src = fetchzip { - url = "https://sourceforge.net/code-snapshots/hg/e/en/enblend/code/enblend-code-0f423c72e51872698fe2985ca3bd453961ffe4e0.zip"; + src = fetchhg { + url = "http://hg.code.sf.net/p/enblend/code"; + rev = "0f423c72e51872698fe2985ca3bd453961ffe4e0"; sha256 = "sha256-0gCUSdg3HR3YeIbOByEBCZh2zGlYur6DeCOzUM53fdc="; - stripRoot = true; }; buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; From a7e4673e15103ded6a90c5331bbf7cdd4942b5a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jun 2023 09:17:16 +0200 Subject: [PATCH 16/80] python311Packages.pycookiecheat: init at 0.5.0 --- .../python-modules/pycookiecheat/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/pycookiecheat/default.nix diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix new file mode 100644 index 000000000000..a8898e4b627e --- /dev/null +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, keyring +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, playwright +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pycookiecheat"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "n8henrie"; + repo = "pycookiecheat"; + rev = "refs/tags/v${version}"; + hash = "sha256-3I7iw/dwF4lRqmVM3OR402InZCFoV9gzKpRQrx4F9KA="; + }; + + pythonRelaxDeps = [ + "cryptography" + "keyring" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + cryptography + keyring + ]; + + nativeCheckInputs = [ + playwright + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pycookiecheat" + ]; + + disabledTests = [ + # Tests want to use playwright executable + "test_no_cookies" + "test_fake_cookie" + ]; + + meta = with lib; { + description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; + homepage = "https://github.com/n8henrie/pycookiecheat"; + changelog = "https://github.com/n8henrie/pycookiecheat/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ea87c051748..ae473ed1315a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7797,6 +7797,8 @@ self: super: with self; { pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; + pycookiecheat = callPackage ../development/python-modules/pycookiecheat { }; + pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { }; pyfibaro = callPackage ../development/python-modules/pyfibaro { }; From 059e9e432c7e6f9e105afb29d0a5a15c265f3698 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 20:20:51 +0200 Subject: [PATCH 17/80] pentestgpt: init at unstable-2023-06-27 --- pkgs/tools/security/pentestgpt/default.nix | 57 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/tools/security/pentestgpt/default.nix diff --git a/pkgs/tools/security/pentestgpt/default.nix b/pkgs/tools/security/pentestgpt/default.nix new file mode 100644 index 000000000000..328ba0ca9a8f --- /dev/null +++ b/pkgs/tools/security/pentestgpt/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pentestgpt"; + version = "unstable-2023-06-27"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "GreyDGL"; + repo = "PentestGPT"; + rev = "e63a91f466a035e036827e8f492bc47c5c1135af"; + hash = "sha256-m0R/kMmbr5Ixuqvw6ZRoaAGCnI3j86Iwk4+TYqv0WbU="; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "playwright==1.28.0" "playwright" \ + --replace "beautifulsoup4~=4.11.2" "" \ + --replace "black" "" \ + --replace "pytest" "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + colorama + google + langchain + loguru + openai + playwright + prompt-toolkit + pycookiecheat + pyyaml + requests + rich + sqlmap + tiktoken + ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ + "pentestgpt" + ]; + + meta = with lib; { + description = "GPT-empowered penetration testing tool"; + homepage = "https://github.com/GreyDGL/PentestGPT"; + changelog = "https://github.com/GreyDGL/PentestGPT/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b2417f9a41..4144d74c0091 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33855,6 +33855,8 @@ with pkgs; pencil = callPackage ../applications/graphics/pencil { }; + pentestgpt = callPackage ../tools/security/pentestgpt { }; + perseus = callPackage ../applications/science/math/perseus { }; petrifoo = callPackage ../applications/audio/petrifoo { From 21db11de342e05d1313fbfc568a4c78c5a1ef31b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jun 2023 09:18:11 +0200 Subject: [PATCH 18/80] python311Packages.google: init at 3.0.0 --- .../python-modules/google/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/google/default.nix diff --git a/pkgs/development/python-modules/google/default.nix b/pkgs/development/python-modules/google/default.nix new file mode 100644 index 000000000000..7dc34933d452 --- /dev/null +++ b/pkgs/development/python-modules/google/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google"; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FDUwEi7lEwUJrV6YnwUS98shiy1O3br7rUD9EOjYzL4="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "googlesearch" + ]; + + meta = with lib; { + description = "Python bindings to the Google search engine"; + homepage = "https://pypi.org/project/google/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae473ed1315a..7ffd4237e1cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4189,6 +4189,8 @@ self: super: with self; { goodwe = callPackage ../development/python-modules/goodwe { }; + google = callPackage ../development/python-modules/google { }; + google-ai-generativelanguage = callPackage ../development/python-modules/google-ai-generativelanguage { }; google-api-core = callPackage ../development/python-modules/google-api-core { }; From cfebc30bb0f2bb200263b4e852991a25cce38789 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jun 2023 18:41:16 +0000 Subject: [PATCH 19/80] ckbcomp: 1.221 -> 1.222 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index c418d2f8ad0c..c5f44792c3b1 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.221"; + version = "1.222"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-4/g2RR3jDeEjntEC9IySn3hHofK23zKb8+kvTcbnpTI="; + sha256 = "sha256-2HviEt/PJS3QFgGPa8WsUeDhotGaHRLs51LlSimfTYQ="; }; buildInputs = [ perl ]; From 3d16ae44d4cdd87eb7ea16d54c5396c523a537d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 20:55:51 +0200 Subject: [PATCH 20/80] python311Packages.decli: 0.5.2 -> 0.6.1 Changelog: https://github.com/woile/decli/blob/v0.6.1/CHANGELOG.md --- .../python-modules/decli/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix index 2926d2d10287..376b011f0f46 100644 --- a/pkgs/development/python-modules/decli/default.nix +++ b/pkgs/development/python-modules/decli/default.nix @@ -1,22 +1,34 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "decli"; - version = "0.5.2"; + version = "0.6.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8s3lUDSnXIGcYwx2VahExhLyWYxCwhKZFgRl32rUY60="; + hash = "sha256-7YjMuUdwHo5VCbeUX9pW4VDirHSmnyXUeshe8wqwwPA="; }; - pythonImportsCheck = [ "decli" ]; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "decli" + ]; meta = with lib; { description = "Minimal, easy to use, declarative command line interface tool"; homepage = "https://github.com/Woile/decli"; + changelog = "https://github.com/woile/decli/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; From b7d65a106b80c27805fd10b3cfdb9f34f61ce0da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 21:00:07 +0200 Subject: [PATCH 21/80] python311Packages.decli: enable tests --- .../python-modules/decli/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix index 376b011f0f46..a1d6e0db2ead 100644 --- a/pkgs/development/python-modules/decli/default.nix +++ b/pkgs/development/python-modules/decli/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub +, pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -12,15 +13,21 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7YjMuUdwHo5VCbeUX9pW4VDirHSmnyXUeshe8wqwwPA="; + src = fetchFromGitHub { + owner = "woile"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE="; }; nativeBuildInputs = [ setuptools ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "decli" ]; From 77d98ded4f5c083dfdc2fe93c6ec7c266a511763 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jun 2023 19:34:53 +0000 Subject: [PATCH 22/80] vitess: 16.0.2 -> 17.0.0 --- pkgs/development/tools/database/vitess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index e5743e8e2e4b..192b29c15227 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "16.0.2"; + version = "17.0.0"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-8nFvNO+zb7Z0g2BMnlk+obDolCQrlfClOIg0mPW8gAU="; + hash = "sha256-J/lvOP8MsHOWnq7kKRqIktME0ewtilkyOv8pD1wSnPc="; }; - vendorHash = "sha256-hC0skrEDXn6SXjH75ur77I0pHnGSURErAy97lmVvqro="; + vendorHash = "sha256-QcCgDOqKSI+NPCdQJY4v6qU31nLQPIF8fs2qkLOk+DU="; buildInputs = [ sqlite ]; From d448321ac0d980aaa3a83682d15fc19c4c417a17 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 30 Jun 2023 16:38:14 -0400 Subject: [PATCH 23/80] projectable: 1.2.0 -> 1.3.0 Diff: https://github.com/dzfrias/projectable/compare/1.2.0...1.3.0 Changelog: https://github.com/dzfrias/projectable/releases/tag/1.3.0 --- pkgs/applications/file-managers/projectable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/applications/file-managers/projectable/default.nix index 7ef32c5c48af..8f2a131ce7c9 100644 --- a/pkgs/applications/file-managers/projectable/default.nix +++ b/pkgs/applications/file-managers/projectable/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "projectable"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dzfrias"; repo = "projectable"; rev = version; - hash = "sha256-mN8kqh17qGJWOwrdH9fCPApFQBbgCs6FaVg38SNJGP0="; + hash = "sha256-yN4OA3glRCzjk87tTadwlhytMoh6FM/ke37BsX4rStQ="; }; - cargoHash = "sha256-SQ117gFkqex3GFl7RnorSfPo7e0Eefg1l3L0Vyi/tpU="; + cargoHash = "sha256-GGoL681Lv3sXnao2WfhLy4VMgtJFFttzn68lArQO1Uc="; nativeBuildInputs = [ pkg-config From b9b078309ae4d0d4b7b30c3c7553a5739ef9666a Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 30 Jun 2023 23:45:00 +0200 Subject: [PATCH 24/80] global: 6.6.7 -> 6.6.10 ChangeLog: https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-6_6_10 --- pkgs/development/tools/misc/global/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 70ec9278ae13..ed0596fef8a0 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,24 +6,24 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.7"; + version = "6.6.10"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "sha256-aaD3f1OCfFVoF2wdOCFm3zYedCY6BH8LMFiqLyrVijw="; + hash = "sha256-LdHmqUXpPAE5D7lBpOaU9McbvXVp1kFJwE6Se79NzOg="; }; nativeBuildInputs = [ libtool makeWrapper ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses sqlite ]; propagatedBuildInputs = [ pygments ]; configureFlags = [ "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" - "--with-ncurses=${ncurses.dev}" - "--with-sqlite3=${sqlite.dev}" + "--with-ncurses=${ncurses}" + "--with-sqlite3" "--with-exuberant-ctags=${ctags}/bin/ctags" "--with-universal-ctags=${universal-ctags}/bin/ctags" "--with-posix-sort=${coreutils}/bin/sort" @@ -57,5 +57,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub peterhoeg ]; platforms = platforms.unix; + changelog = "https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-${lib.replaceStrings [ "." ] [ "_" ] version}"; }; } From 56963d1234c2355312dde54b78fdedf85bdadc1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 00:03:16 +0200 Subject: [PATCH 25/80] commitizen: 2.42.1 -> 3.5.2 Diff: commitizen-tools/commitizen@refs/tags/v2.42.1...3.5.2 Changelog: https://github.com/commitizen-tools/commitizen/blob/v3.5.2/CHANGELOG.md --- .../version-management/commitizen/default.nix | 86 +++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 34 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index ab15b09a4d18..7cdcc5bf812b 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -1,79 +1,60 @@ -{ buildPythonApplication -, charset-normalizer -, colorama +{ lib , commitizen -, decli , fetchFromGitHub , git -, jinja2 -, lib -, packaging -, poetry-core -, py -, pytest-freezer -, pytest-mock -, pytest-regressions -, pytestCheckHook -, pyyaml -, questionary -, termcolor +, python3 , testers -, tomlkit -, typing-extensions -, argcomplete -, nix-update-script -, pre-commit }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "2.42.1"; + version = "3.5.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; - rev = "v${version}"; - hash = "sha256-lrZfMqmslwx3B2WkvFosm3EmCHgpZEA/fOzR6UYf6f8="; + rev = "refs/tags/v${version}"; + hash = "sha256-4m3NCnGUX9lHCk6czwzxXLqf8GLi2u2A/crBZYTyplA="; }; - format = "pyproject"; + pythonRelaxDeps = [ + "decli" + ]; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' \ - --replace 'argcomplete = ">=1.12.1,<2.1"' 'argcomplete = ">=1.12.1"' - ''; - - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ + argcomplete charset-normalizer - termcolor - questionary colorama decli - tomlkit + importlib-metadata jinja2 - pyyaml - argcomplete - typing-extensions packaging + pyyaml + questionary + termcolor + tomlkit + ]; + + nativeCheckInputs = with python3.pkgs; [ + argcomplete + deprecated + git + py + pytest-freezer + pytest-mock + pytest-regressions + pytestCheckHook ]; doCheck = true; - nativeCheckInputs = [ - pre-commit - py - pytestCheckHook - pytest-freezer - pytest-mock - pytest-regressions - argcomplete - git - ]; - - # the tests require a functional git installation + # The tests require a functional git installation # which requires a valid HOME directory. preCheck = '' export HOME="$(mktemp -d)" @@ -101,7 +82,6 @@ buildPythonApplication rec { package = commitizen; command = "cz version"; }; - updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd9f78d1f96c..0de1d219bedf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4408,7 +4408,7 @@ with pkgs; comma = callPackage ../tools/package-management/comma { }; - commitizen = python3Packages.callPackage ../applications/version-management/commitizen { }; + commitizen = callPackage ../applications/version-management/commitizen { }; common-licenses = callPackage ../data/misc/common-licenses { }; From 0000092757f3b1a262e9910a0bdfb92df644a293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 1 Jul 2023 03:39:22 +0200 Subject: [PATCH 26/80] parquet-tools: disable sensitive test --- pkgs/tools/misc/parquet-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 38a71dd02a13..10247064cd97 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -56,6 +56,8 @@ buildPythonApplication rec { # These tests try to read Python code as parquet and fail "test_local_wildcard" "test_local_and_s3_wildcard_files" + # test file is 2 bytes bigger than expected + "test_excute_simple" ]; pythonImportsCheck = [ From b2c352f6b5d4598e019f11e96af59643f3df179f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 30 Jun 2023 22:09:53 -0400 Subject: [PATCH 27/80] protox: init at 0.4.1 https://github.com/andrewhickman/protox --- .../development/tools/misc/protox/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/protox/default.nix diff --git a/pkgs/development/tools/misc/protox/default.nix b/pkgs/development/tools/misc/protox/default.nix new file mode 100644 index 000000000000..6875292d241b --- /dev/null +++ b/pkgs/development/tools/misc/protox/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "protox"; + version = "0.4.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-n72Fvdo6LLk8pzYS2/5zk+dbsLRPAm6NZ5DsMRyHCTY="; + }; + + cargoHash = "sha256-wW4UcC3QAtriLEiXPndP+tZATftWP7ySavpIV6cGVCA="; + + buildFeatures = [ "bin" ]; + + # tests are not included in the crate source + doCheck = false; + + meta = with lib; { + description = "A rust implementation of the protobuf compiler"; + homepage = "https://github.com/andrewhickman/protox"; + changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b42eeb42cdb..7d3617d0bb64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19367,6 +19367,8 @@ with pkgs; procodile = callPackage ../tools/system/procodile { }; + protox = callPackage ../development/tools/misc/protox { }; + proxmove = callPackage ../tools/admin/proxmove { }; pry = callPackage ../development/tools/pry { }; From 53fcee79c85287cb6f2c4ae77df8367d2f727596 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Jul 2023 04:20:00 +0000 Subject: [PATCH 28/80] arti: 1.1.5 -> 1.1.6 Diff: https://gitlab.torproject.org/tpo/core/arti/-/compare/arti-v1.1.5...arti-v1.1.6 Changelog: https://gitlab.torproject.org/tpo/core/arti/-/raw/arti-v1.1.6/CHANGELOG.md --- pkgs/tools/security/arti/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index f7945cdedd3d..e0b553a8e441 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-FrawcoE+cUhRq9NPpSspUuk0ZPjnJcmDHD25syV/18E="; + sha256 = "sha256-6VmpBt1KxWRdZJLVPNeqETQnZITGoX+rz29eIiOnHnU="; }; - cargoHash = "sha256-34qNdizJ89fo/6AQXuB8FqvYSv/Zy5N+gXX9Yl5sywM="; + cargoHash = "sha256-Q/1zgfF1v3D5Mg+JhS0K9mF4BN9xHV2tf7AtsBHZGh0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 0202c5347256d869ee39ff5d97bdbcb1043f49a6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Jul 2023 05:14:18 +0000 Subject: [PATCH 29/80] buf: 1.21.0 -> 1.23.1 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 7342697ca32c..02feb124c519 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.21.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-7aS48tfONrDdE+NoTpoz+5TOBDQfEgCwKKkoBnrUTW8="; + hash = "sha256-6Zp4QuH0wJQCt8w2230Ugrds8tFmnCcICxgWJiqTBWc="; }; - vendorHash = "sha256-zk7cj3DwfaZg7PRS50qw0tS8lguX4yWcCiPk+2HYah8="; + vendorHash = "sha256-e4frrLrG6OxOUcr5iqY+QEokdy95glmc3Rw2HPWUPEI="; patches = [ # Skip a test that requires networking to be available to work. From fed733188dccff7ff2748f385982cf4f41f98158 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 1 Jul 2023 14:31:30 +0900 Subject: [PATCH 30/80] python310Packages.rabbitpy: remove rabbitpy is unmaintained and broken --- .../python-modules/rabbitpy/default.nix | 47 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/development/python-modules/rabbitpy/default.nix diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix deleted file mode 100644 index 9287c72441cc..000000000000 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, mock -, nose -, pamqp -}: - -buildPythonPackage rec { - version = "2.0.1"; - pname = "rabbitpy"; - - # No tests in the pypi tarball, so we directly fetch from git - src = fetchFromGitHub { - owner = "gmr"; - repo = pname; - rev = version; - sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; - }; - - propagatedBuildInputs = [ pamqp ]; - nativeCheckInputs = [ mock nose ]; - - checkPhase = '' - runHook preCheck - rm tests/integration_tests.py # Impure tests requiring network - nosetests tests - runHook postCheck - ''; - - postPatch = '' - # See: https://github.com/gmr/rabbitpy/issues/118 - substituteInPlace setup.py \ - --replace 'pamqp>=2,<3' 'pamqp' - ''; - - meta = with lib; { - description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; - homepage = "https://pypi.python.org/pypi/rabbitpy"; - license = licenses.bsd3; - - # broken by pamqp==3, tracked in - # https://github.com/gmr/rabbitpy/issues/125 - broken = true; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5d4a015ff530..91e78eae47f2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -283,6 +283,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; + rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 retworkx = rustworkx; # added 2023-05-14 repeated_test = repeated-test; # added 2022-11-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d36f88d764a..977984700fa4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10498,8 +10498,6 @@ self: super: with self; { r2pipe = callPackage ../development/python-modules/r2pipe { }; - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - rachiopy = callPackage ../development/python-modules/rachiopy { }; radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { From 8d88b37bdb37a7a1ea2029708978c869c959b1b3 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Sat, 1 Jul 2023 01:31:45 -0400 Subject: [PATCH 31/80] fpattern: init at v1.9 --- .../libraries/fpattern/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/fpattern/default.nix diff --git a/pkgs/development/libraries/fpattern/default.nix b/pkgs/development/libraries/fpattern/default.nix new file mode 100644 index 000000000000..b0ab2c3d2cea --- /dev/null +++ b/pkgs/development/libraries/fpattern/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation (finalAttrs: { + version = "1.9"; + pname = "fpattern"; + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "Loadmaster"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-/QvMQCmoocaXfDm3/c3IAPyfZqR6d7IiJ9UoFKZTpVI="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out $dev/include + cp *.c *.h $dev/include + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/Loadmaster/fpattern"; + description = "Filename pattern matching library functions for DOS, Windows, and Unix"; + license = licenses.mit; + maintainers = with maintainers; [ hughobrien ]; + platforms = with platforms; linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85950f1e450..c628635d9b35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7846,6 +7846,8 @@ with pkgs; fpart = callPackage ../tools/misc/fpart { }; + fpattern = callPackage ../development/libraries/fpattern { }; + fping = callPackage ../tools/networking/fping { }; fpm = callPackage ../tools/package-management/fpm { }; From 61925cc7737f1805c1fa3d6ae83bb630881e7a2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 05:40:54 +0000 Subject: [PATCH 32/80] vgmtools: unstable-2023-05-04 -> unstable-2023-06-29 --- pkgs/tools/audio/vgmtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index 2300609beea1..857bf7c503f3 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2023-05-04"; + version = "unstable-2023-06-29"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "0a7814304b9664ff1cf167e209ff354d222773a4"; - hash = "sha256-YEOuT5RN0zFT7rU4KfxYS0Ec+rUL3Flsgx9IrELnhGg="; + rev = "e1f3e053e390bde6bd53b81bd853a0298ccb0ab4"; + hash = "sha256-evIvW9Nk9g7R+EmaQXLmr0ecpAS5Ashditk3komBwyw="; }; nativeBuildInputs = [ From 2fcb62cd72cad8cfbd2f35152be067127c46a886 Mon Sep 17 00:00:00 2001 From: Earth Engine Date: Sat, 1 Jul 2023 05:54:22 +0000 Subject: [PATCH 33/80] flowgger: init at 0.3.1 --- pkgs/tools/misc/flowgger/default.nix | 42 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/misc/flowgger/default.nix diff --git a/pkgs/tools/misc/flowgger/default.nix b/pkgs/tools/misc/flowgger/default.nix new file mode 100644 index 000000000000..a57398ae660b --- /dev/null +++ b/pkgs/tools/misc/flowgger/default.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, stdenv +, fetchCrate +, pkg-config +, openssl +, capnproto +, CoreServices +}: + +rustPlatform.buildRustPackage rec { + pname = "flowgger"; + version = "0.3.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-PRlcfSVfQWt+rQEJjblY7/AMrjhGYO2/G7EX60aGApA="; + }; + + cargoHash = "sha256-hp2LrEVWo0gk95dPROqVcHEEG5N9fWms0mZkY9QILg0="; + + nativeBuildInputs = [ + pkg-config + capnproto + ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin CoreServices; + + checkFlags = [ + # test failed + "--skip=flowgger::encoder::ltsv_encoder::test_ltsv_full_encode_multiple_sd" + "--skip=flowgger::encoder::ltsv_encoder::test_ltsv_full_encode_no_sd" + ]; + + meta = with lib; { + homepage = "https://github.com/awslabs/flowgger"; + description = "A fast, simple and lightweight data collector written in Rust"; + license = licenses.bsd2; + maintainers = with maintainers; [ earthengine ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 840aa77ae1b1..72b4b16b3e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5033,6 +5033,10 @@ with pkgs; flitter = callPackage ../tools/misc/flitter { }; + flowgger = callPackage ../tools/misc/flowgger { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + frangipanni = callPackage ../tools/text/frangipanni { }; frawk = callPackage ../tools/text/frawk { }; From bdc849902634099083bf40c35b63a97f0bcb5c1c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 30 Jun 2023 23:51:43 -0700 Subject: [PATCH 34/80] python310Packages.jaraco_collections: 3.8.0 -> 4.3.0 --- .../python-modules/jaraco_collections/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index e60da3771297..07cc11ec92e6 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm , jaraco_classes , jaraco_text @@ -8,12 +9,12 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.8.0"; + version = "4.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; + hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; }; postPatch = '' @@ -22,9 +23,12 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools setuptools-scm ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ jaraco_classes jaraco_text @@ -39,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Models and classes to supplement the stdlib 'collections' module"; homepage = "https://github.com/jaraco/jaraco.collections"; + changelog = "https://github.com/jaraco/jaraco.collections/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 1dfe3538084d22c01af0e8c7f13df38fc0006a86 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 30 Jun 2023 23:52:11 -0700 Subject: [PATCH 35/80] python310Packages.jaraco-email: patch to work with jaraco.collections 4+ --- .../python-modules/jaraco-email/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix index b99eff746f47..6e036379b5ce 100644 --- a/pkgs/development/python-modules/jaraco-email/default.nix +++ b/pkgs/development/python-modules/jaraco-email/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , setuptools , setuptools-scm , jaraco_text @@ -26,6 +27,19 @@ buildPythonPackage rec { hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y="; }; + patches = [ + (fetchpatch { + name = "dos2unix-line-endings.patch"; + url = "https://github.com/jaraco/jaraco.email/commit/ab9643598e26cca9c9cdbd34b00c972f547b9236.patch"; + hash = "sha256-Z2WOnR+ELzQciVyUiUq4jaP+Vnc4aseLP7+LWJZoOU8="; + }) + (fetchpatch { + name = "jaraco-collections-4-compatibility.patch"; + url = "https://github.com/jaraco/jaraco.email/commit/e65e5fed0178ddcd009d16883b381c5582f1a9df.patch"; + hash = "sha256-mKxa0ZU1JFeQPemrjQl94buLNY5gXnMCCRKBxdO870M="; + }) + ]; + nativeBuildInputs = [ setuptools setuptools-scm From c6fcddbaa19b6110478a6b13d379cdee63f3c6a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 08:02:19 +0000 Subject: [PATCH 36/80] gtkcord4: 0.0.11 -> 0.0.11-1 --- pkgs/applications/audio/gtkcord4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index fde6a0632691..ce9d26229c6c 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.11"; + version = "0.0.11-1"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-0d656gjfFlgNdKbPJK+6KIU7zvp88j3bGIlGPwJNRdM="; + hash = "sha256-GkjUURmPS1KOwgYn7kO9/oGIUX9fnSgYjyU7PHXtE5w="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ buildGoModule rec { install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png ''; - vendorHash = "sha256-+zbaRaGOF6w8C7lmtd3k5Rh/0a+OnqTL9Qhg1ErTHBo="; + vendorHash = "sha256-RJ6dLa5EzfLMPR3LMIplFhmph+tcdsieiB5Uv95lqIs="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; From 7bb9292bcbafc89a7bd95c23b2a2c64faa75b5b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 10:17:14 +0000 Subject: [PATCH 37/80] discord-canary: 0.0.161 -> 0.0.162 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index db408e10b0f9..e6d237ee5817 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.27"; ptb = "0.0.43"; - canary = "0.0.161"; + canary = "0.0.162"; development = "0.0.217"; } else { stable = "0.0.273"; @@ -24,7 +24,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-jX7+tDACTzDqDIzL2VuQPHcdMBth6wbHJ4zfVJJmJ68="; + sha256 = "sha256-eSWcwSw46hKJmDLxHtolBZgKrIS2QnTbVoYe0EI4Njs="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 1453f87209654fc128fc48d970f2a556c607537d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 12:19:48 +0200 Subject: [PATCH 38/80] python311Packages.appthreat-vulnerability-db: 5.1.4 -> 5.2.0 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v5.1.4...v5.2.0 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v5.2.0 --- .../appthreat-vulnerability-db/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index eb1a5bdf50aa..0a2dd009f6a4 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -11,13 +11,14 @@ , pythonOlder , pythonRelaxDepsHook , semver +, setuptools , tabulate }: buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.1.4"; - format = "setuptools"; + version = "5.2.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,15 +26,12 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-IOQyQ78u9Pr27UKchjSqzCl47UajknI8MYZZy2DheSk="; + hash = "sha256-OtaoyqYRsZVoWezrTAy3zROyNeRLbZmCT+z7YCwf9Ow="; }; postPatch = '' substituteInPlace pytest.ini \ --replace " --cov-append --cov-report term --cov vdb" "" - # https://github.com/AppThreat/vulnerability-db/pull/48 - substituteInPlace vdb/lib/utils.py \ - --replace "isvalid(" "is_valid(" ''; pythonRelaxDeps = [ @@ -42,6 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ From 73adeb81adec04ffbf8a0fbd2306132c9b7debeb Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 09:01:40 -0400 Subject: [PATCH 39/80] rustypaste-cli: 0.4.0 -> 0.5.0 Diff: https://github.com/orhun/rustypaste-cli/compare/v0.4.0...v0.5.0 Changelog: https://github.com/orhun/rustypaste-cli/blob/v0.5.0/CHANGELOG.md --- pkgs/tools/misc/rustypaste-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/tools/misc/rustypaste-cli/default.nix index e82465afcd47..dc0c03fdc819 100644 --- a/pkgs/tools/misc/rustypaste-cli/default.nix +++ b/pkgs/tools/misc/rustypaste-cli/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste-cli"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "orhun"; repo = "rustypaste-cli"; rev = "v${version}"; - hash = "sha256-Jl7fytDIW6MLY6VX7rDuX9PcZaIqENQbUTMUJKCa8Mg="; + hash = "sha256-lMXd/wllk/67W3dJr/ps36s/p+tMCyu2HU9gWYubejw="; }; - cargoHash = "sha256-hICwrgzNpyYmNW1gEKgTsSjWyqCaOHc4X37O0R2oSzY="; + cargoHash = "sha256-6ddjSP072+jYjPVcTZcQndM1pElUE30hU3M/sf5Lnsk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From b7cc8c3d6289518d6563994c8363437faa3cc50b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 09:30:49 -0400 Subject: [PATCH 40/80] gtree: 1.8.3 -> 1.8.4 Diff: https://github.com/ddddddO/gtree/compare/v1.8.3...v1.8.4 Changelog: https://github.com/ddddddO/gtree/releases/tag/v1.8.4 --- pkgs/tools/text/gtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index a79656f18ba6..5e67358bbe3a 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-7ABfmSKHdCDR1vLsyQd5bysHk0lNsjgpDINibSpVyOc="; + hash = "sha256-FbJc12hr4lmz1jEsfWdLZpd9Z17HDFgLBUMw9noakqM="; }; vendorHash = "sha256-BMfJFR4sqJNNlJ7Y3q2GlXWjMDH+DXhuFQVX5I9Czkc="; From 8716d4d8d42899cbeaa95299def93b1670d6c793 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 14:08:42 +0000 Subject: [PATCH 41/80] python310Packages.pyopencl: 2023.1 -> 2023.1.1 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 03549ea2977d..c5336d788560 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -24,13 +24,13 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2023.1"; + version = "2023.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE="; + hash = "sha256-CtkleKlKC+De3Vyk/Lbie1p13k5frHV/BMkES9nUJEQ="; }; nativeBuildInputs = [ setuptools ]; From b89ac122a7d63edab3f9ca0af5f6c8371cea84c5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:09:53 +0000 Subject: [PATCH 42/80] =?UTF-8?q?epiphany:=2044.3=20=E2=86=92=2044.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.3...44.5 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 52711726ec5e..ee31ca4fa565 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.3"; + version = "44.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9ekEsuUQIQTYt/46YVA0rdeN4DEWSStUy968ooC92Jk="; + sha256 = "PEdeBO0qD0EMtEuWk3VjaXB5GTrJt6UMkUhfubCDFas="; }; nativeBuildInputs = [ From 02edd3494b1da79dae4b29574be93836ef6c357c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:00:19 +0000 Subject: [PATCH 43/80] =?UTF-8?q?evolution:=203.48.3=20=E2=86=92=203.48.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.48.3...3.48.4 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index d2bfc24662fc..fd0e436ec45c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.48.3"; + version = "3.48.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZhJexH/XcBcRdNDAhYZu/7aoNEQBW34sdkEpUtbLDiM="; + sha256 = "oC+Z66BQp3HyxH1D/FLgCyJg/IbQYyD79S68fozni7c="; }; nativeBuildInputs = [ From 128b83fc3af7f6ed2a6d956d869773acb25d941d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:05:40 +0000 Subject: [PATCH 44/80] =?UTF-8?q?evolution-data-server:=203.48.3=20?= =?UTF-8?q?=E2=86=92=203.48.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.48.3...3.48.4 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 950be481eced..a604efb9cc59 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.48.3"; + version = "3.48.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "tx5BLlL1Z8gzlLWSbfkrT09tLN3rrThKUXxyBnH62ZY="; + sha256 = "mX4/k7F++wr/zAF77oeAul+iwAnjZVG7yRoIrlUtbWA="; }; patches = [ From c67fc8664304f310841f36df469db2bab6b238b5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:07:53 +0000 Subject: [PATCH 45/80] =?UTF-8?q?gnome.gnome-control-center:=2044.2=20?= =?UTF-8?q?=E2=86=92=2044.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/44.2...44.3 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 2eee6813a0a2..e9fd74c9222d 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -65,11 +65,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "44.2"; + version = "44.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BiPX0hz+lw0u80QgYjVFpZRbmJLmQfmgEc7Owhr9oQw="; + sha256 = "sha256-BmplBS/D7ProYAJehfeX5qsrh6WMT4q5xm7CBxioDHo="; }; patches = [ From ab9edafb637251cc55ee8c4f380b17e3114df2a3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:08:38 +0000 Subject: [PATCH 46/80] =?UTF-8?q?gnome.gnome-software:=2044.2=20=E2=86=92?= =?UTF-8?q?=2044.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/44.2...44.3 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 9bfac3ca793d..bee1f9e86db5 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.2"; + version = "44.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wC3OcOUrN80pwDdlCzcq2xmyfSD+RLwJIdgalZ01YWw="; + sha256 = "Mlq7ciyrILaqZ/FY6i/y6omYMMoKiD4kWU2d74X9FiI="; }; patches = [ From 223e8ed5b5cfed020da404f5a2d6a69c5a2ade9e Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 1 Jul 2023 16:20:09 +0200 Subject: [PATCH 47/80] python3Packages.django-compressor: 4.3.1 -> 4.4 --- .../python-modules/django-compressor/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 0df2ebc96239..795d9c89e5ad 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -11,21 +11,15 @@ buildPythonPackage rec { pname = "django-compressor"; - version = "4.3.1"; + version = "4.4"; format = "setuptools"; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-aIWMDabMCZzCmgIthsO6iu0RTanXCe7OsNe4GBtfiUI="; + hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \ - --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0" - ''; - propagatedBuildInputs = [ rcssmin rjsmin From 005fa5b3c4b9a478361e4bd009c06dabd1169f23 Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Sat, 1 Jul 2023 17:11:35 +0200 Subject: [PATCH 48/80] homebank: 5,5,6 -> 5.6.5 --- pkgs/applications/office/homebank/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 17a9cbb59244..e82aa82edd1d 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.5.6"; + version = "5.6.5"; src = fetchurl { - url = "http://homebank.free.fr/public/homebank-${version}.tar.gz"; - sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o="; + url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"; + hash = "sha256-tUlN/Ph9eoVyaWoq+ioESWunnjhXzT47GKwDvRttLKg="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; From e62eb7cbbe5da9d022d07d09b049ee61ce5b91a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 15:32:23 +0000 Subject: [PATCH 49/80] python311Packages.crc: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/crc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 6117ad4c5aea..16f04f180e45 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "crc"; - version = "4.2.0"; + version = "4.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Nicoretti"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h/RVMIJX+Lyted0FHNBcKY54EiirSclkBXCpAQSATq8="; + hash = "sha256-rH/jc6/gxww3NSCYrhu+InZX1HTTdJFfa52ioU8AclY="; }; nativeBuildInputs = [ poetry-core ]; From 1eb7b7ff8e220f8b5ac58e67bb5f2f269806ce66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 15:49:55 +0000 Subject: [PATCH 50/80] ghz: 0.115.0 -> 0.117.0 --- pkgs/tools/networking/ghz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/tools/networking/ghz/default.nix index bebc2626652a..495d9dd3a1f3 100644 --- a/pkgs/tools/networking/ghz/default.nix +++ b/pkgs/tools/networking/ghz/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghz"; - version = "0.115.0"; + version = "0.117.0"; src = fetchFromGitHub { owner = "bojand"; repo = "ghz"; rev = "v${version}"; - sha256 = "sha256-Y/RvXBE2+ztAPJrSBek1APkN7F3LIWAz13TGQUgFzR0="; + sha256 = "sha256-aAqbSPcz7qQID4H0Vu3VTnbECvlj+We9K5F656k9jTw="; }; - vendorHash = "sha256-BTfdKH2FBfIeHOG4dhOopoPQWHjhlJstQWWOkMwEOGs="; + vendorHash = "sha256-jtzCOF5TAHv3PiGxBx65IR/3x6JpqMzsWW8amab8hqQ="; subPackages = [ "cmd/ghz" "cmd/ghz-web" ]; From a0e1da0b60a4a416556035d8cb9b6546fae99ce0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 15:59:12 +0000 Subject: [PATCH 51/80] libamqpcpp: 4.3.24 -> 4.3.25 --- pkgs/development/libraries/libamqpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 180a8874e50e..98fc4ae1774d 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.24"; + version = "4.3.25"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-65/LsH1ZDkeBrtQUmKc5/5C2ce4nw4nSHXnJqZMKenI="; + sha256 = "sha256-9nqp7VM5korICwzZF0XTlC4uKwjSY5MoILVJBzKulPk="; }; buildInputs = [ openssl ]; From 7f83fd6f0e69d41b373df6c4d9b3dddb836a9680 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 09:04:59 -0400 Subject: [PATCH 52/80] rustypaste: 0.10.1 -> 0.11.1 Diff: https://github.com/orhun/rustypaste/compare/v0.10.1...v0.11.1 Changelog: https://github.com/orhun/rustypaste/blob/v0.11.1/CHANGELOG.md --- pkgs/servers/rustypaste/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 725cf317980e..b7b4e3c4ee6e 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WLuMG9gC2kSdyrYa0CNnInjetXph0OL/Jmjskih4tuw="; + sha256 = "sha256-5yttOaDsWcRCFBzziOW4H1Nrs7/X/pGFlnPNUQRf+w8="; }; - cargoHash = "sha256-A651PTooQjITjxCLKPhnFSCxa27uesTOP8ZbAlRbOUk="; + cargoHash = "sha256-8lv0AGcV4LW6r+K0rIZNV0NPhX4j3+wbMw4JeJkNuXw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices @@ -20,11 +20,14 @@ rustPlatform.buildRustPackage rec { # Some tests need network checkFlags = [ "--skip=paste::tests::test_paste_data" + "--skip=server::tests::test_index_with_landing_page_file_not_found" "--skip=server::tests::test_upload_file" "--skip=server::tests::test_upload_remote_file" "--skip=util::tests::test_get_expired_files" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A minimal file upload/pastebin service"; homepage = "https://github.com/orhun/rustypaste"; From b520edce0259644afbf6cddbaf9651e0498efc17 Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Sat, 1 Jul 2023 12:16:57 -0400 Subject: [PATCH 53/80] maintainers: add mac-chaffee --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23e585871ace..149ea5179439 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9841,6 +9841,11 @@ fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; }]; }; + mac-chaffee = { + name = "Mac Chaffee"; + github = "mac-chaffee"; + githubId = 7581860; + }; maddiethecafebabe = { email = "maddie@cafebabe.date"; github = "maddiethecafebabe"; From e109ab32b5f0fe4a5770baff1b56c50c31daea08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 16:28:27 +0000 Subject: [PATCH 54/80] bearer: 1.14.0 -> 1.15.0 --- pkgs/development/tools/bearer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 718015ace1a9..aece15601314 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-7h+7lP4K4Dbf5V2HDrb2lJKWqINtOpqybBAyae0S6EE="; + hash = "sha256-fmEvXSiWtQuFCsaUxiruEi+pU8FnHg23Z1YXtpKyCy8="; }; - vendorHash = "sha256-D8LdufbOx3ogLbeSwBTsDnQ4NpZF+Ro2QiUg4hPGGYI="; + vendorHash = "sha256-NkqMmMwm6CvJn8rPyG1gFmBiayws28kgobTVPJh2l5o="; subPackages = [ "cmd/bearer" From abd715655377091ecfd7f63e47d1c0ca94d240a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 1 Jul 2023 18:32:36 +0200 Subject: [PATCH 55/80] consul: 1.15.3 -> 1.16.0 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 171724598d44..1f9b68060321 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.15.3"; + version = "1.16.0"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-Xe+baALN8Ow6vjneWAvC65cBSsrMAsdxjEQRBcvWxCw="; + hash = "sha256-7F0kutAWyi22OxI242P8m1Aoj+l/7F91wmxDSt4ttyA="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-tbwX/uF9+yIhd+KSGF2v7HjxGtfaZYSm+1GIspQmC9A="; + vendorHash = "sha256-aZRW+z9oW7if+yMOrETNXFC521Wo0feq1FDv8/Q4ejY="; doCheck = false; From 64ded123c60230f4669e00e81f3a52adfa750ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 1 Jul 2023 18:36:07 +0200 Subject: [PATCH 56/80] release-notes: Mention Consul 1.16 upgrade --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 50847f663f50..b8c1d2938a99 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -38,6 +38,8 @@ - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides +- `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version. + - `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details. - The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream. From a61134c74c0d6a27ad61e93b04d5eec6088eb2bf Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 15:54:06 +0200 Subject: [PATCH 57/80] python310Packages.django-compressor: Enable more tests --- .../django-compressor/default.nix | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 0df2ebc96239..4d4c2d7b0fbe 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -7,43 +7,52 @@ , beautifulsoup4 , brotli , pytestCheckHook +, django-sekizai +, pytest-django +, csscompressor +, calmjs +, jinja2 +, python }: buildPythonPackage rec { pname = "django-compressor"; - version = "4.3.1"; + version = "4.4"; format = "setuptools"; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-aIWMDabMCZzCmgIthsO6iu0RTanXCe7OsNe4GBtfiUI="; + hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \ - --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0" - ''; - propagatedBuildInputs = [ + beautifulsoup4 + calmjs + django-appconf + jinja2 rcssmin rjsmin - django-appconf ]; - pythonImportsCheck = [ - "compressor" - ]; - - doCheck = false; # missing package django-sekizai - - nativeCheckInputs = [ + checkInputs = [ beautifulsoup4 brotli + csscompressor + django-sekizai pytestCheckHook + pytest-django ]; + # Getting error: compressor.exceptions.OfflineGenerationError: You have + # offline compression enabled but key "..." is missing from offline manifest. + # You may need to run "python manage.py compress" + disabledTestPaths = [ + "compressor/tests/test_offline.py" + ]; + + pythonImportsCheck = [ "compressor" ]; + DJANGO_SETTINGS_MODULE = "compressor.test_settings"; meta = with lib; { From 43b5e1479bf00fa229c4dd4fde7d8c281a98da0e Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 16:04:56 +0200 Subject: [PATCH 58/80] python310Packages.django-sekizai: init at 4.1.0 --- .../python-modules/django-sekizai/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/django-sekizai/default.nix diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix new file mode 100644 index 000000000000..3c4e351f25b4 --- /dev/null +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchPypi +, buildPythonPackage +, django_classytags +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-sekizai"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; + }; + + propagatedBuildInputs = [ + django_classytags + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + pythonImportsCheck = [ "sekizai" ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + meta = with lib; { + description = "Define placeholders where your blocks get rendered and append to those blocks"; + homepage = "https://github.com/django-cms/django-sekizai"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c96209231f2..09dc8082131e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2875,6 +2875,8 @@ self: super: with self; { django-reversion = callPackage ../development/python-modules/django-reversion { }; + django-sekizai = callPackage ../development/python-modules/django-sekizai { }; + django-sesame = callPackage ../development/python-modules/django-sesame { }; django_silk = callPackage ../development/python-modules/django_silk { }; From 6a2abb1ea6ed6faa270e0e48edf58bed514d1017 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 16:15:39 +0200 Subject: [PATCH 59/80] python310Packages.calmjs: init at 3.4.4 --- .../python-modules/calmjs/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/calmjs/default.nix diff --git a/pkgs/development/python-modules/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix new file mode 100644 index 000000000000..2f27dbc98523 --- /dev/null +++ b/pkgs/development/python-modules/calmjs/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchPypi +, buildPythonPackage +, calmjs-types +, calmjs-parse +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "calmjs"; + version = "3.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; + extension = "zip"; + }; + + propagatedBuildInputs = [ + calmjs-parse + calmjs-types + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # ModuleNotFoundError: No module named 'calmjs.types' + # Not yet clear how to run these tests correctly + # https://github.com/calmjs/calmjs/issues/63 + # https://github.com/NixOS/nixpkgs/pull/186298 + disabledTestPaths = [ + "src/calmjs/tests/test_dist.py" + "src/calmjs/tests/test_testing.py" + "src/calmjs/tests/test_artifact.py" + "src/calmjs/tests/test_interrogate.py" + "src/calmjs/tests/test_loaderplugin.py" + "src/calmjs/tests/test_npm.py" + "src/calmjs/tests/test_runtime.py" + "src/calmjs/tests/test_toolchain.py" + "src/calmjs/tests/test_vlqsm.py" + "src/calmjs/tests/test_yarn.py" + "src/calmjs/tests/test_command.py" + ]; + + pythonImportsCheck = [ "calmjs" ]; + + meta = with lib; { + description = "Framework for building toolchains and utilities for working with the Node.js ecosystem"; + homepage = "https://github.com/calmjs/calmjs"; + license = licenses.gpl2; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09dc8082131e..98c030ffa3cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1637,6 +1637,8 @@ self: super: with self; { callee = callPackage ../development/python-modules/callee { }; + calmjs = callPackage ../development/python-modules/calmjs { }; + calmjs-parse = callPackage ../development/python-modules/calmjs-parse { }; calysto = callPackage ../development/python-modules/calysto { }; From 19c7a65eefbbd11473da5030e5ad2352eabf14df Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 16:20:31 +0200 Subject: [PATCH 60/80] python310Packages.calmjs-types: init at 1.0.1 --- .../python-modules/calmjs-types/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/calmjs-types/default.nix diff --git a/pkgs/development/python-modules/calmjs-types/default.nix b/pkgs/development/python-modules/calmjs-types/default.nix new file mode 100644 index 000000000000..9f940e92c502 --- /dev/null +++ b/pkgs/development/python-modules/calmjs-types/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "calmjs-types"; + version = "1.0.1"; + + src = fetchPypi { + pname = "calmjs.types"; + inherit version; + sha256 = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; + extension = "zip"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "calmjs.types" ]; + + meta = with lib; { + description = "Types for the calmjs framework"; + homepage = "https://github.com/calmjs/calmjs.types"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98c030ffa3cd..8c0581b83f03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1641,6 +1641,8 @@ self: super: with self; { calmjs-parse = callPackage ../development/python-modules/calmjs-parse { }; + calmjs-types = callPackage ../development/python-modules/calmjs-types { }; + calysto = callPackage ../development/python-modules/calysto { }; calysto-scheme = callPackage ../development/python-modules/calysto-scheme { }; From 61cb4170fdd0c0f1002fc96cb905c0e7a7b94930 Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Sat, 1 Jul 2023 12:17:39 -0400 Subject: [PATCH 61/80] nixos/static-web-server: create module which uses upstream systemd units This commit creates a nixos module for static-web-server. The module uses upstream systemd units to start static-web-server. It also includes options for configuring static-web-server. --- nixos/modules/module-list.nix | 1 + .../web-servers/static-web-server.nix | 68 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/web-servers/static-web-server.nix | 32 +++++++++ pkgs/servers/static-web-server/default.nix | 9 ++- 5 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/web-servers/static-web-server.nix create mode 100644 nixos/tests/web-servers/static-web-server.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e728dcb3f192..12c854335efe 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1282,6 +1282,7 @@ ./services/web-servers/pomerium.nix ./services/web-servers/rustus.nix ./services/web-servers/stargazer.nix + ./services/web-servers/static-web-server.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix ./services/web-servers/trafficserver/default.nix diff --git a/nixos/modules/services/web-servers/static-web-server.nix b/nixos/modules/services/web-servers/static-web-server.nix new file mode 100644 index 000000000000..07187f00fecc --- /dev/null +++ b/nixos/modules/services/web-servers/static-web-server.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.static-web-server; + toml = pkgs.formats.toml {}; + configFilePath = toml.generate "config.toml" cfg.configuration; +in { + options = { + services.static-web-server = { + enable = lib.mkEnableOption (lib.mdDoc ''Static Web Server''); + listen = lib.mkOption { + default = "[::]:8787"; + type = lib.types.str; + description = lib.mdDoc '' + The "ListenStream" used in static-web-server.socket. + This is equivalent to SWS's "host" and "port" options. + See here for specific syntax: + ''; + }; + root = lib.mkOption { + type = lib.types.path; + description = lib.mdDoc '' + The location of files for SWS to serve. Equivalent to SWS's "root" config value. + NOTE: This folder must exist before starting SWS. + ''; + }; + configuration = lib.mkOption { + default = { }; + type = toml.type; + example = { + general = { log-level = "error"; directory-listing = true; }; + }; + description = lib.mdDoc '' + Configuration for Static Web Server. See + . + NOTE: Don't set "host", "port", or "root" here. They will be ignored. + Use the top-level "listen" and "root" options instead. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.static-web-server ]; + systemd.packages = [ pkgs.static-web-server ]; + # Have to set wantedBy since systemd.packages ignores the "Install" section + systemd.sockets.static-web-server = { + wantedBy = [ "sockets.target" ]; + # Start with empty string to reset upstream option + listenStreams = [ "" cfg.listen ]; + }; + systemd.services.static-web-server = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + # Remove upstream sample environment file; use config.toml exclusively + EnvironmentFile = [ "" ]; + ExecStart = [ "" "${pkgs.static-web-server}/bin/static-web-server --fd 0 --config-file ${configFilePath} --root ${cfg.root}" ]; + # Supplementary groups doesn't work unless we create the group ourselves + SupplementaryGroups = [ "" ]; + # If the user is serving files from their home dir, override ProtectHome to allow that + ProtectHome = if lib.hasPrefix "/home" cfg.root then "tmpfs" else "true"; + BindReadOnlyPaths = cfg.root; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ mac-chaffee ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 02bef2039075..d62a4dd49fbf 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -709,6 +709,7 @@ in { sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; stargazer = runTest ./web-servers/stargazer.nix; starship = handleTest ./starship.nix {}; + static-web-server = handleTest ./web-servers/static-web-server.nix {}; step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {}; stratis = handleTest ./stratis {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; diff --git a/nixos/tests/web-servers/static-web-server.nix b/nixos/tests/web-servers/static-web-server.nix new file mode 100644 index 000000000000..da1a9bdec5d2 --- /dev/null +++ b/nixos/tests/web-servers/static-web-server.nix @@ -0,0 +1,32 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : { + name = "static-web-server"; + meta = { + maintainers = with lib.maintainers; [ mac-chaffee ]; + }; + + nodes.machine = { pkgs, ... }: { + services.static-web-server = { + enable = true; + listen = "[::]:8080"; + root = toString (pkgs.writeTextDir "nixos-test.html" '' +

Hello NixOS!

+ ''); + configuration = { + general = { directory-listing = true; }; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("static-web-server.socket") + machine.wait_for_open_port(8080) + # We don't use wait_until_succeeds() because we're testing socket + # activation which better work on the first request + response = machine.succeed("curl -fsS localhost:8080") + assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" + response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") + assert "Hello NixOS!" in response + machine.wait_for_unit("static-web-server.service") + ''; +}) diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 0cedcd50768d..24024d235ff0 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, nixosTests }: rustPlatform.buildRustPackage rec { pname = "static-web-server"; @@ -24,6 +24,13 @@ rustPlatform.buildRustPackage rec { "--skip=handle_precondition" ]; + # Need to copy in the systemd units for systemd.packages to discover them + postInstall = '' + install -Dm444 -t $out/lib/systemd/system/ systemd/static-web-server.{service,socket} + ''; + + passthru.tests = { inherit (nixosTests) static-web-server; }; + meta = with lib; { description = "An asynchronus web server for static files-serving"; homepage = "https://static-web-server.net/"; From b1afa702b9adf6846f59c6793fd5dd7acc696a12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 16:52:37 +0000 Subject: [PATCH 62/80] ncpamixer: 1.3.3.3 -> 1.3.3.4 --- pkgs/applications/audio/ncpamixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index d557a7d2da7c..db5aa416b0ce 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ncpamixer"; - version = "1.3.3.3"; + version = "1.3.3.4"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; rev = version; - sha256 = "sha256-TxSfiBSsCAImzCXv6o64Jy7tSefpYCkU0xtuHx26Ss4="; + sha256 = "sha256-JvIxq9CYFR/4p03e2LeJbLn3NUNwhRNF0GlqN6aPfMo="; }; nativeBuildInputs = [ cmake pkg-config ]; From abaecff35863db2b103d1cddb30a92cfe9a91455 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 17:01:35 +0000 Subject: [PATCH 63/80] python310Packages.wagtail-localize: 1.5 -> 1.5.1 --- pkgs/development/python-modules/wagtail-localize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index fdd2e0e39a0e..085eca293d11 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.5"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-aNz4OoUUXWMCahMxuYBxvNWnw7Inxd5svBgwLgoirW8="; + hash = "sha256-RjJyx3sr69voJxa3lH8Nq/liZ3eMoTfZ4phykj7neZA="; }; nativeBuildInputs = [ From 5803226cfef2489111a65b37569b8497d455f3b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 17:06:08 +0000 Subject: [PATCH 64/80] python310Packages.openaiauth: 1.0.2 -> 2.0.0 --- pkgs/development/python-modules/openaiauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index 7cc6e6d99e9a..c8f7b29b6f59 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "openaiauth"; - version = "1.0.2"; + version = "2.0.0"; src = fetchPypi { inherit version; pname = "OpenAIAuth"; - hash = "sha256-0Vd8gvE2guHNlrPBahu23NpUFrJHvm6Q6NSNawX9gbY="; + hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; }; propagatedBuildInputs = [ requests ]; From 5cd399600639bc2724a8ab9152cf4fc8b86d4e3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Jul 2023 19:38:43 +0200 Subject: [PATCH 65/80] python310Packages.lightning-utilities: 0.8.0 -> 0.9.0 Diff: https://github.com/Lightning-AI/utilities/compare/refs/tags/v0.8.0...v0.9.0 Changelog: https://github.com/Lightning-AI/utilities/releases/tag/v0.9.0 --- .../python-modules/lightning-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 22a312d26630..e03e005ad7b2 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-uwmX+/SK2zBkZQbN/t/DZ3i+XbdAJ/RM+Q649QwMUz0="; + hash = "sha256-vSeHtvsIt4L4qJCVlTPVjIjd62+08JWBnr9+9+ujOfw="; }; nativeBuildInputs = [ From bfb398b80bf196b7177f3bac0ff0490d1eec4e15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 17:45:25 +0000 Subject: [PATCH 66/80] morgen: 2.7.3 -> 2.7.4 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 1bdc378b11c0..30cc891d0999 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-8cGL2xQI4NYDPGqnvlnVVvha3wXFT8IcjRWTTGO7OJQ="; + sha256 = "sha256-jrDu4tXuYl2ttTRHpKHZDucqWO4mYc6zwAdRd0rQht4="; }; nativeBuildInputs = [ From c370fa7514e1dca0ceed6740ab76cc9dc196e248 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:27:04 +0200 Subject: [PATCH 67/80] python310Packages.openaiauth: add format - disable on unsupported Python releases - Update ordering --- .../python-modules/openaiauth/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index c8f7b29b6f59..68eead616b47 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -1,12 +1,16 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , requests }: buildPythonPackage rec { pname = "openaiauth"; version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; @@ -14,8 +18,11 @@ buildPythonPackage rec { hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -23,10 +30,10 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python library for authenticating with the OpenAI API"; - license = licenses.mit; - maintainers = with maintainers; [ realsnick ]; + description = "Library for authenticating with the OpenAI API"; homepage = "https://github.com/acheong08/OpenAIAuth"; changelog = "https://github.com/acheong08/OpenAIAuth/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ realsnick ]; }; } From 96ac17cf98a3b150f4c2ce58faad250241615731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:30:03 +0200 Subject: [PATCH 68/80] python311Packages.crc: disable on unsupported Python releases - update ordering --- .../python-modules/crc/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 16f04f180e45..eee1f058366f 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , poetry-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -10,6 +11,8 @@ buildPythonPackage rec { version = "4.3.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "Nicoretti"; repo = pname; @@ -17,13 +20,21 @@ buildPythonPackage rec { hash = "sha256-rH/jc6/gxww3NSCYrhu+InZX1HTTdJFfa52ioU8AclY="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - pythonImportsCheck = [ "crc" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "crc" + ]; - disabledTestPaths = [ "test/bench" ]; + disabledTestPaths = [ + "test/bench" + ]; meta = with lib; { changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; From 464e1a42e076fb9a289f8d51a9cadb53c53f0577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:43:06 +0200 Subject: [PATCH 69/80] python3Packages.django-compressor: add changelog to meta --- pkgs/development/python-modules/django-compressor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 795d9c89e5ad..788eab0ae326 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; - homepage = "https://django-compressor.readthedocs.org/en/latest/"; + homepage = "https://django-compressor.readthedocs.org/"; + changelog = "https://github.com/django-compressor/django-compressor/blob/${version}/docs/changelog.txt"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; }; From 26b4a919207a2ce8520b8947d44cdcbd48701d4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:51:45 +0200 Subject: [PATCH 70/80] python311Packages.natsort: 8.3.1 -> 8.4.0 Changelog: https://github.com/SethMMorton/natsort/blob/8.4.0/CHANGELOG.md --- pkgs/development/python-modules/natsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 975e4a8d2eca..fc5d5ab4d590 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "8.3.1"; + version = "8.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UXWVSS3eVwpP1ranb2REQMG6UeIzjIpnHX8Edf2o+f0="; + hash = "sha256-RTEsSg5VB1k9oZPe3QSrsUaSU7YB7K9jRFrYDwoepYE="; }; propagatedBuildInputs = [ From 755b664031761e9fc7c82556a4a4791785ce7966 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 1 Jul 2023 21:31:28 +0200 Subject: [PATCH 71/80] nim: 1.6.12 -> 1.6.14 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 43274b3d9d16..692f5331d0b8 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -86,12 +86,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.12"; + version = "1.6.14"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-rO8LCrdzYE1Nc5S2hRntt0+zD0aRIpSyi8J+DHtLTcI="; + hash = "sha256-0HDS8oriQA33/kpJ7OufRc1TmQaxB0gYVqCveo+oLck="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ] From e8daa26290cb6ca0ed926073e7bb0ada76559746 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 1 Jul 2023 21:31:51 +0200 Subject: [PATCH 72/80] alacritty: 0.12.1 -> 0.12.2 (#240962) --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2a6f958b1a27..be1ccdc354ea 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jw66pBKIhvvaQ+Q6tDV6i7ALa7Z0Pw7dp6gAVPqy5bs="; + hash = "sha256-X3Z+f5r8surBW9FSsmWKZ/fr82ThXBUkS8fr/sTYR50="; }; - cargoHash = "sha256-rDcNliuUDGsd4VA2H9k+AiJTf1ylmFyqCUzxwCtM3T8="; + cargoHash = "sha256-JOmDmJl/y4WNsBnCixJykl4PgYgb5cSyo6MCdYmQAzQ="; nativeBuildInputs = [ cmake From 47192222e8c7ff130c3ba23201a9d00f84450f9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 19:38:10 +0000 Subject: [PATCH 73/80] python310Packages.auth0-python: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index f1294133dc5a..19066c748d04 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DyFRCQGjyv75YVBPN+1xWjKQtPUv29xblYu2TehkkVo="; + hash = "sha256-enSG8rO0gMpSaf6otdx94xncyxc6Uv570VKVVQkit1g="; }; propagatedBuildInputs = [ From b03ec6c15f5886ebf8ed69228266bd750f48faa9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 2 Jul 2023 04:26:36 +0800 Subject: [PATCH 74/80] verifpal: 0.26.1 -> 0.27.0 (#240880) --- pkgs/tools/security/verifpal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index 821118f598c5..2c02e1249d14 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "verifpal"; - version = "0.26.1"; + version = "0.27.0"; src = fetchgit { url = "https://source.symbolic.software/verifpal/verifpal.git"; rev = "v${version}"; - sha256 = "sha256-y07RXv2QSyUJpGuFsLJ2sGNo4YzhoCYQr3PkUj4eIOY="; + hash = "sha256-rihY5p6nJ1PKjI+gn3NNXy+uzeBG2UNyRYy3UjScf2Q="; }; - vendorSha256 = "sha256-gUpgnd/xiLqRNl1bPzVp+0GM/J5GEx0VhUfo6JsX8N8="; + vendorHash = "sha256-XOCRwh2nEIC+GjGwqd7nhGWQD7vBMLEZZ2FNxs0NX+E="; nativeBuildInputs = [ pigeon ]; From d186c2cff96a714feb3ae3f8a173dbd7286feb67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 23:09:28 +0000 Subject: [PATCH 75/80] intel-compute-runtime: 23.17.26241.15 -> 23.17.26241.24 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index fe1bb139a10b..3dba3de332c2 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.17.26241.15"; + version = "23.17.26241.24"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-A0gtSM6e+VcfcGG/6zReV2LIXq6tGbWIwDQFlQ2TW28="; + sha256 = "sha256-FcI9bBJc23UlPP7qSBUc+t4e1X3UEJTYiy86N3KVWrs="; }; nativeBuildInputs = [ cmake pkg-config ]; From 20bb934115dc1dd8074f5dc1f5992aafde355898 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 17:51:55 -0400 Subject: [PATCH 76/80] tailer: unstable-2023-06-26 -> 0.1.1 Diff: https://github.com/hionay/tailer/compare/2f32e2640a220c990ae419d1562889971c9ed535...v0.1.1 --- pkgs/tools/misc/tailer/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/tools/misc/tailer/default.nix index 7f39dfd5815f..19b7d8423919 100644 --- a/pkgs/tools/misc/tailer/default.nix +++ b/pkgs/tools/misc/tailer/default.nix @@ -3,20 +3,24 @@ , fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "tailer"; - version = "unstable-2023-06-26"; + version = "0.1.1"; src = fetchFromGitHub { owner = "hionay"; repo = "tailer"; - rev = "2f32e2640a220c990ae419d1562889971c9ed535"; - hash = "sha256-L+5HlUv6g2o6ghqp8URfR7k5NlWqFhVBmEIsEjGy7aU="; + rev = "v${version}"; + hash = "sha256-gPezz2ksqdCffgdAHwU2NMTar2glp5YGfA5C+tMYPtE="; }; vendorHash = "sha256-nQqSvfN+ed/g5VkbD6XhZNA1G3CGGfwFDdadJ5+WoD0="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; meta = with lib; { description = "A CLI tool to insert lines when command output stops"; From 885617e288a03500abc46a6762214ae006db7430 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 17:53:09 -0400 Subject: [PATCH 77/80] tailer: add version test --- pkgs/tools/misc/tailer/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/tools/misc/tailer/default.nix index 19b7d8423919..f3c4d3545252 100644 --- a/pkgs/tools/misc/tailer/default.nix +++ b/pkgs/tools/misc/tailer/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, tailer }: buildGoModule rec { @@ -22,6 +24,12 @@ buildGoModule rec { "-X=main.version=${version}" ]; + passthru.tests = { + version = testers.testVersion { + package = tailer; + }; + }; + meta = with lib; { description = "A CLI tool to insert lines when command output stops"; homepage = "https://github.com/hionay/tailer"; From 1057042ccc0780c157ac756135e903865eeabe75 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:56:25 +1000 Subject: [PATCH 78/80] aardvark-dns: 1.6.0 -> 1.7.0 Diff: https://github.com/containers/aardvark-dns/compare/v1.6.0...v1.7.0 Changelog: https://github.com/containers/aardvark-dns/releases/tag/v1.7.0 --- pkgs/tools/networking/aardvark-dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 3689a4fb127f..106fac53d682 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-l240kejJjv3rVb4S9ngXo88kmByuS/Co3AB/SSv+iIA="; + hash = "sha256-bScL8hFV/Kot7P9nJRMDDhB8pllPUsejtJpbjmQ8skI="; }; - cargoHash = "sha256-d3u/He8+Ei+tX37EgYTGW5gjcalawlTdPekV9iLK7XI="; + cargoHash = "sha256-rrn+ZTAsFs7UTP4xQL3Cy8G6RG7vwT0wMKnXHHIkB90="; passthru.tests = { inherit (nixosTests) podman; }; From 6efe434d39b10a159d6d0cfbce5e90e29ee78c13 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:57:22 +1000 Subject: [PATCH 79/80] netavark: 1.6.0 -> 1.7.0 Diff: https://github.com/containers/netavark/compare/v1.6.0...v1.7.0 Changelog: https://github.com/containers/netavark/releases/tag/v1.7.0 --- pkgs/tools/networking/netavark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index c205f4d35eb2..f1a0aafe0f2c 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-USGmYLBv2ynnLx5jg+WkRle0AMtO7dDgf41VIepoHN0="; + hash = "sha256-amvy8sR2gpTYU7wcfkFeYyaTvrhZC558zidNdHwxqaI="; }; - cargoHash = "sha256-zj1eE7f4/wSVe+78abMePqsIrCPl6Uhtavn8hq7+ZRY="; + cargoHash = "sha256-v8djyU+MvBmg929oFVPZlRPtj7zK8eZg3/KmCsFNWpw="; nativeBuildInputs = [ installShellFiles mandown protobuf ]; From f5c560df566f09f212370b830551b70b0e425ee1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:58:25 +1000 Subject: [PATCH 80/80] gvproxy: 0.6.1 -> 0.6.2 Diff: https://github.com/containers/gvisor-tap-vsock/compare/v0.6.1...v0.6.2 Changelog: https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.6.2 --- pkgs/tools/networking/gvproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix index 0a8ec3d44bc0..4c6e69c600b4 100644 --- a/pkgs/tools/networking/gvproxy/default.nix +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-LkSKJVnWwqWSId/qdb7hTIiryxdazjW4oluZZN47orQ="; + hash = "sha256-3WBL+ByYSiYKXzFkeoUnCxTdhvy3XxLKUHgJ2hO6oIo="; }; vendorHash = null;