From d7b3ff6d566011c47e4b4d4f3c0ad1e0a74831e3 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Thu, 14 Apr 2022 22:12:25 -0700 Subject: [PATCH 01/21] minikube: disable update notifications Note that the kubectl download message setting was removed from the upstream program, so MINIKUBE_WANTKUBECTLDOWNLOADMSG=false no longer has an effect on behavior. --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d4a9ba4af7d..3ee00d4121a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -7,6 +7,7 @@ , which , libvirt , vmnet +, makeWrapper }: buildGoModule rec { @@ -24,7 +25,7 @@ buildGoModule rec { sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; }; - nativeBuildInputs = [ installShellFiles pkg-config which ]; + nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; @@ -35,9 +36,8 @@ buildGoModule rec { installPhase = '' install out/minikube -Dt $out/bin + wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false export HOME=$PWD - export MINIKUBE_WANTUPDATENOTIFICATION=false - export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false for shell in bash zsh fish; do $out/bin/minikube completion $shell > minikube.$shell From 7d9514667094595c3263c5dddf85ae737c64caf5 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 16 Apr 2022 01:26:38 +0000 Subject: [PATCH 02/21] codesearch: 1.0.0 -> 1.2.0 --- pkgs/tools/text/codesearch/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 40ee8c58fbc..b02d4fcd5fc 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "codesearch"; - version = "1.0.0"; - - goPackagePath = "github.com/google/codesearch"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "codesearch"; rev = "v${version}"; - sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k="; + sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; From 606333cb1e4480ecd0ef641790cdc202a3f916a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Apr 2022 05:35:07 +0000 Subject: [PATCH 03/21] logseq: 0.6.5 -> 0.6.6 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 153e50f9a87..1fdf48ac1a0 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.5"; + version = "0.6.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "WKROcCv0IzRnQd74j5Iget5jlfyDbeJ/PXgZmSNrSsQ="; + sha256 = "r6IBvhA8H8XnMIBgZZodyU61xtqNA4N9kCRv/QWQc9M="; name = "${pname}-${version}.AppImage"; }; From b6012814b6bb66f9a4b3b43cbe75a97f9d6cdb30 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 17 Apr 2022 00:52:48 +0000 Subject: [PATCH 04/21] aws-rotate-key: 1.0.6 -> 1.0.8 --- pkgs/tools/admin/aws-rotate-key/default.nix | 22 +++++++++------- pkgs/tools/admin/aws-rotate-key/deps.nix | 29 --------------------- 2 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 pkgs/tools/admin/aws-rotate-key/deps.nix diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 82b57739120..35221b3fb5b 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,25 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, aws-rotate-key }: -buildGoPackage rec { +buildGoModule rec { pname = "aws-rotate-key"; - version = "1.0.6"; - - goPackagePath = "github.com/Fullscreen/aws-rotate-key"; + version = "1.0.8"; src = fetchFromGitHub { - rev = "v${version}"; owner = "Fullscreen"; repo = "aws-rotate-key"; - sha256 = "1w9704g1l2b0y6g6mk79g28kk0yaswpgljkk85d0i10wyxq4icby"; + rev = "v${version}"; + sha256 = "sha256-5kV87uQDSc/qpm79Pd2nXo/EcbMlhZqFYaw+gJQa2uo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-h7tmJx/Um1Cy/ojiFjoKCH/LcOwhGU8ADb5WwmrkkJM="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = aws-rotate-key; + }; meta = with lib; { description = "Easily rotate your AWS key"; homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; - maintainers = [maintainers.mbode]; + maintainers = [ maintainers.mbode ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/aws-rotate-key/deps.nix b/pkgs/tools/admin/aws-rotate-key/deps.nix deleted file mode 100644 index 680a18e7e2d..00000000000 --- a/pkgs/tools/admin/aws-rotate-key/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "af26abd521cd7697481572fdbc4a53cbea3dde1b"; - sha256 = "1yribbqy9i4i70dfg3yrjhkn3n0fywpr3kismn2mvi882mm01pxz"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "f844700ba2a387dfee7ab3679e7544b5dbd6d394"; - sha256 = "0s9100bzqj58nnax3dxfgi5qr4rbaa53cb0cj3s58k9jc9z6270m"; - }; - } -] From f5032db47ea5b561f54abddafe0d667266603fa7 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 09:13:47 -0500 Subject: [PATCH 05/21] opencc: switch to python3 --- pkgs/tools/text/opencc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 5ad14295e87..fbff68abb69 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "opencc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI="; }; - nativeBuildInputs = [ cmake python2 ]; + nativeBuildInputs = [ cmake python3 ]; # let intermediate tools find intermediate library preBuild = lib.optionalString stdenv.isLinux '' From ee374505e008fe595d93db775d2264fb15e6a7e2 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 09:49:18 -0500 Subject: [PATCH 06/21] syslogng: switch to python3 --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 6948728f16b..990e7afc39a 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libcap, curl, which -, eventlog, pkg-config, glib, python2, systemd, perl +, eventlog, pkg-config, glib, python3, systemd, perl , riemann_c_client, protobufc, pcre, libnet , json_c, libuuid, libivykis, mongoc, rabbitmq-c , libesmtp @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { eventlog glib perl - python2 + python3 systemd riemann_c_client protobufc From 9f1019528df10b2b13d003f571df9a239b57bdea Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 09:56:21 -0500 Subject: [PATCH 07/21] ps_mem: switch to python3 --- pkgs/tools/system/ps_mem/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 073a0921f98..8408ed5e8d1 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,10 +1,8 @@ -{ lib, python2Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -let - version = "3.13"; +python3Packages.buildPythonApplication rec { pname = "ps_mem"; -in python2Packages.buildPythonApplication { - name = "${pname}-${version}"; + version = "3.13"; src = fetchFromGitHub { owner = "pixelb"; From 2cfd398b57b7c24f995140e78685d415959b07ef Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 15:04:13 -0500 Subject: [PATCH 08/21] ats2: 0.4.1 -> 0.4.2 --- pkgs/development/compilers/ats2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index e8c3af5d7e1..f8de9f57b5d 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.4.1" ; + versionPkg = "0.4.2"; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz"; - sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d"; + hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c="; }; postInstallContrib = lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz"; - sha256 = "0c4nqp6yzmpj0mcpg7ibmwyqi8hjw3sza8myvy4nzq3fa6wldy5l"; + hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; }; buildInputs = [ gmp ]; From 0c494de2fd173be1abcf6ce8356221fb16a43a07 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 27 Apr 2022 19:04:09 +0200 Subject: [PATCH 09/21] airwindows-lv2: init at 1.0 --- .../audio/airwindows-lv2/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/audio/airwindows-lv2/default.nix diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix new file mode 100644 index 00000000000..c3cc1a21ffc --- /dev/null +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, lv2 }: + +stdenv.mkDerivation rec { + pname = "airwindows-lv2"; + version = "1.0"; + src = fetchFromGitHub { + owner = "hannesbraun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ lv2 ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/lv2" ]; + + meta = with lib; { + description = "Airwindows plugins (ported to LV2)"; + homepage = "https://github.com/hannesbraun/airwindows-lv2"; + license = licenses.mit; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e1bda3c0e9..7a1a26b45f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1071,6 +1071,8 @@ with pkgs; airspyhf = callPackage ../applications/radio/airspyhf { }; + airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { }; + aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { From a318ca39c9cbdf0b1e752f2d87d9bcd8ff230d68 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 3 May 2022 01:24:10 +0000 Subject: [PATCH 10/21] exoscale-cli: 1.52.1 -> 1.54.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 27 +++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index b05f3380426..a745c693305 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,33 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "exoscale-cli"; - version = "1.52.1"; + version = "1.54.0"; src = fetchFromGitHub { - owner = "exoscale"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-CSltvSdKLAH711ubT6ROgkmq2EcFJplPmavsJa9xupM="; + owner = "exoscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-uvPJ1cOKMpDf1KfEPkSTWMIMNojUlfpqI1ESomX1MlM="; }; - goPackagePath = "github.com/exoscale/cli"; + vendorSha256 = null; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; + excludedPackages = [ "./completion" "./docs" ]; - # ensures only the cli binary is built and we don't clutter bin/ with submodules - subPackages = [ "." ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; # we need to rename the resulting binary but can't use buildFlags with -o here # because these are passed to "go install" which does not recognize -o postBuild = '' - mv go/bin/cli go/bin/exo + mv $GOPATH/bin/cli $GOPATH/bin/exo ''; meta = { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; - homepage = "https://github.com/exoscale/cli"; - license = lib.licenses.asl20; + homepage = "https://github.com/exoscale/cli"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dramaturg ]; mainProgram = "exo"; }; From 493c9e0d860ccd2c5dce3f4d60436a93d415a4a7 Mon Sep 17 00:00:00 2001 From: renesat Date: Mon, 2 May 2022 22:20:37 +0300 Subject: [PATCH 11/21] autorestic: 1.5.8 -> 1.7.1 --- pkgs/tools/backup/autorestic/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index d7b6af03164..45a359e0aad 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.5.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0eq2u3DCNgfxsiE4lycf+xGIoEC3sZgEMha9+40j+9s="; + sha256 = "sha256-UUK5C26wM8LKQ7TE6DWEfzq+uPXH09B2Nybkfuqk+1o="; }; - vendorSha256 = "sha256-qYXdRpQT7x+Y5h8PuKGjsANXLqjNlsPKO76GQhnufTU="; + vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; nativeBuildInputs = [ installShellFiles ]; @@ -27,6 +27,6 @@ buildGoModule rec { homepage = "https://github.com/cupcakearmy/autorestic"; license = licenses.asl20; maintainers = with maintainers; [ renesat ]; - platforms = platforms.linux ++ platforms.darwin; + mainProgram = "autorestic"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80bc32f334b..fbd4966780e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,7 +161,9 @@ with pkgs; autoconf = autoconf269; }; - autorestic = callPackage ../tools/backup/autorestic { }; + autorestic = callPackage ../tools/backup/autorestic { + buildGoModule = buildGo118Module; + }; autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; From e3f9f3a1b0d27301d97b1b4fb5a5d9157112da63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 01:29:05 +0000 Subject: [PATCH 12/21] brave: 1.38.109 -> 1.38.111 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ed9f16066b0..f6b2009655f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.38.109"; + version = "1.38.111"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-w/Wm8msW4etF6E1UDujLfixhxmKBcnB+uw/CMcj4jGI="; + sha256 = "sha256-sUTQktCQOVyXbw58u9ilFZaKg6D24Okpa+rUIO56ors="; }; dontConfigure = true; From 4c3c753c443e47f34e3d52acc5dc0014fe0c3e27 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 13/21] buildkit: 0.10.1 -> 0.10.3 https://github.com/moby/buildkit/releases/tag/v0.10.2 https://github.com/moby/buildkit/releases/tag/v0.10.3 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 88f8846a47b..b8cef88f71a 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-qMSXz4ZJ0po+Qi/K3Q/51MgHBO4tOa+DHw6Ok0yYc+k="; + sha256 = "sha256-hZINmKzLB0nFVVP8eXK2ghe4Emmuq55w0vDwLw8XuJk="; }; vendorSha256 = null; From c268cb0725f0cef8539419bc20dc956fb9ce4a30 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 18:51:49 -0300 Subject: [PATCH 14/21] lxde: refactor To be more in line with the other desktops. Indeed it is strange to look at all those lxde packages spread over all-packages.nix. --- .../default.nix} | 0 pkgs/desktops/lxde/default.nix | 23 +++++++++++++++ pkgs/top-level/all-packages.nix | 29 +++++++------------ 3 files changed, 34 insertions(+), 18 deletions(-) rename pkgs/desktops/lxde/core/{lxmenu-data.nix => lxmenu-data/default.nix} (100%) create mode 100644 pkgs/desktops/lxde/default.nix diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxmenu-data.nix rename to pkgs/desktops/lxde/core/lxmenu-data/default.nix diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix new file mode 100644 index 00000000000..702b4bbb67d --- /dev/null +++ b/pkgs/desktops/lxde/default.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + + lxappearance = callPackage ./core/lxappearance { }; + + lxappearance-gtk2 = callPackage ./core/lxappearance { + gtk2 = gtk2-x11; + withGtk3 = false; + }; + + lxmenu-data = callPackage ./core/lxmenu-data { }; + + lxpanel = callPackage ./core/lxpanel { + gtk2 = gtk2-x11; + }; + + lxrandr = callPackage ./core/lxrandr { }; + + lxsession = callPackage ./core/lxsession { }; + + lxtask = callPackage ./core/lxtask { }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8a7e821ba9..96f3e4a0722 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32493,24 +32493,17 @@ with pkgs; ### DESKTOPS/LXDE - lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; - - lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance { - gtk2 = gtk2-x11; - withGtk3 = false; - }; - - lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; - - lxpanel = callPackage ../desktops/lxde/core/lxpanel { - gtk2 = gtk2-x11; - }; - - lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; - - lxsession = callPackage ../desktops/lxde/core/lxsession { }; - - lxtask = callPackage ../desktops/lxde/core/lxtask { }; + lxde = recurseIntoAttrs (callPackage ../desktops/lxde { }); + # Backwards compatibility aliases + inherit (lxde) + lxappearance + lxappearance-gtk2 + lxmenu-data + lxpanel + lxrandr + lxsession + lxtask + ; lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs; From d51fa879756e4f79ae20e77b10a70360c6f8e340 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 20:51:41 -0300 Subject: [PATCH 15/21] lxde: bring gtk2-x11 to the scope --- pkgs/desktops/lxde/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix index 702b4bbb67d..8421bc5dac6 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -2,6 +2,8 @@ lib.makeScope pkgs.newScope (self: with self; { + inherit (pkgs) gtk2-x11; + lxappearance = callPackage ./core/lxappearance { }; lxappearance-gtk2 = callPackage ./core/lxappearance { From ec31b56db168022642cbc33315209debf7aea730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 May 2022 00:44:34 +0000 Subject: [PATCH 16/21] abcmidi: 2022.04.28 -> 2022.05.05 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index cd2661128a9..c50a49255c9 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.04.28"; + version = "2022.05.05"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-a/zFCxdy+GTh5daZO7QBHWeeJ1dead3Dn7dk02jBnc0="; + hash = "sha256-QGCws+S6Mfv0uQcfKg2DbRWS34UAeG17Z+YAyswVAFc="; }; meta = with lib; { From d707e510df39cdd8fe1d3e244371a3a9f23051d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 May 2022 01:50:26 +0000 Subject: [PATCH 17/21] python3Packages.pyrogram: 2.0.16 -> 2.0.17 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 6a2ce2af05e..0c34eb375bb 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.16"; + version = "2.0.17"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg="; + hash = "sha256-MzbZVG6/+YirgKsfrsSaT6jS0fTq/TBhlduZzgQKU+M="; }; propagatedBuildInputs = [ From e77d20ed558efc22e214bdd5c7f2bc1aea4ac9ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 02:17:13 +0000 Subject: [PATCH 18/21] flexget: 3.3.8 -> 3.3.9 --- pkgs/applications/networking/flexget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8421a077d00..d74378378b9 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.8"; + version = "3.3.9"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; - rev = "v${version}"; - hash = "sha256-ZGs5ixNcrkoZ4TRVuIUeNF1FNJwKpYElNv6oPhGiEmU="; + rev = "refs/tags/v${version}"; + hash = "sha256-29V22B1Nkgj/qc6uyAOSOZ1rrjjtf75I9Eycu8I5ysQ="; }; postPatch = '' From 08a7a6670e1e583f518e11ae13e6fe490ef8cf5c Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sat, 7 May 2022 20:51:49 -0600 Subject: [PATCH 19/21] bashblog: add hooks on install phase --- pkgs/tools/text/bashblog/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/tools/text/bashblog/default.nix index 2649b564044..3c8d90caf84 100644 --- a/pkgs/tools/text/bashblog/default.nix +++ b/pkgs/tools/text/bashblog/default.nix @@ -45,8 +45,12 @@ in stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin install -Dm755 bb.sh $out/bin/bashblog + + runHook postInstall ''; meta = with lib; { From 3aef23986c605532f6e971463514413d40ce2aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 04:19:32 +0000 Subject: [PATCH 20/21] python3Packages.requests-aws4auth: specify extras-require --- .../python-modules/requests-aws4auth/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index d2de7dff212..c38309f6d8d 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -24,14 +24,17 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - httpx requests six ]; + passthru.extras-require = { + httpx = [ httpx ]; + }; + checkInputs = [ pytestCheckHook - ]; + ] ++ passthru.extras-require.httpx; pythonImportsCheck = [ "requests_aws4auth" From 453590adec901a3f088b7c5090e6858255cc26e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 04:20:19 +0000 Subject: [PATCH 21/21] elasticsearch-curator: 5.8.1 -> 5.8.4 --- .../admin/elasticsearch-curator/default.nix | 90 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 60a7e0586f5..576df67ad5f 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -1,63 +1,68 @@ -{ lib, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python3 }: let -py = python.override { - packageOverrides = self: super: { - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "6.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; - }; - doCheck = false; - postPatch = ""; - }); + python = python3.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); + requests-aws4auth = super.requests-aws4auth.overridePythonAttrs (old: { + doCheck = false; # requires click>=8.0 + }); + }; }; -}; -in - -with py.pkgs; -buildPythonApplication rec { +in python.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "5.8.1"; + version = "5.8.4"; + + format = "setuptools"; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; rev = "v${version}"; - sha256 = "1shr9jslirjnbvma3p19djsnamxl7f3m9c8zrlclk57zv8rnwpkr"; + hash = "sha256-wSfd52jebUkgF5xhjcoUjI7j46eJF33pVb4Wrybq44g="; }; - # The test hangs so we disable it. - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "urllib3==1.26.4" "urllib3" + substituteInPlace setup.py \ + --replace "urllib3==1.26.4" "urllib3" \ + --replace "pyyaml==5.4.1" "pyyaml" + ''; - propagatedBuildInputs = [ - click - certifi - requests-aws4auth - pyopenssl - voluptuous - pyyaml + propagatedBuildInputs = with python.pkgs; [ elasticsearch + urllib3 + requests boto3 + requests-aws4auth + click + pyyaml + voluptuous + certifi + six ]; - checkInputs = [ - nosexcover - coverage - nose + checkInputs = with python.pkgs; [ mock - funcsigs + pytestCheckHook ]; - postPatch = '' - sed -i s/pyyaml==3.13/pyyaml/g setup.cfg setup.py - sed -i s/pyyaml==3.12/pyyaml/g setup.cfg setup.py - substituteInPlace setup.py \ - --replace "urllib3>=1.24.2,<1.25" "urllib3" - substituteInPlace setup.cfg \ - --replace "urllib3>=1.24.2,<1.25" "urllib3" - ''; + disabledTestPaths = [ + "test/integration" # requires running elasticsearch + ]; + + disabledTests = [ + # access network + "test_api_key_not_set" + "test_api_key_set" + ]; meta = with lib; { homepage = "https://github.com/elastic/curator"; @@ -76,8 +81,5 @@ buildPythonApplication rec { * Perform various actions on the items which remain in the actionable list. ''; maintainers = with maintainers; [ basvandijk ]; - - # https://github.com/elastic/curator/pull/1280 - #broken = versionAtLeast click.version "7.0"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be01edf485b..a401ddd5836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5585,9 +5585,7 @@ with pkgs; elasticsearch = elasticsearch7; }; - elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { - python = python3; - }; + elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; embree = callPackage ../development/libraries/embree { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { };