diff --git a/nixos/modules/virtualisation/docker-rootless.nix b/nixos/modules/virtualisation/docker-rootless.nix index d371f67ecdc8..b814fa1c4358 100644 --- a/nixos/modules/virtualisation/docker-rootless.nix +++ b/nixos/modules/virtualisation/docker-rootless.nix @@ -51,7 +51,6 @@ in default = pkgs.docker; defaultText = literalExpression "pkgs.docker"; type = types.package; - example = literalExpression "pkgs.docker-edge"; description = '' Docker package to be used in the module. ''; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index a69cbe55c784..c6eca4d6ed58 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -155,7 +155,6 @@ in default = pkgs.docker; defaultText = literalExpression "pkgs.docker"; type = types.package; - example = literalExpression "pkgs.docker-edge"; description = '' Docker package to be used in the module. ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f534888592ff..5ef2a8a82804 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -137,7 +137,6 @@ let doas = handleTest ./doas.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; docker-rootless = handleTestOn ["x86_64-linux"] ./docker-rootless.nix {}; - docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; docker-registry = handleTest ./docker-registry.nix {}; docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {}; docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {}; diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix deleted file mode 100644 index c6a1a0830189..000000000000 --- a/nixos/tests/docker-edge.nix +++ /dev/null @@ -1,49 +0,0 @@ -# This test runs docker and checks if simple container starts - -import ./make-test-python.nix ({ pkgs, ...} : { - name = "docker"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus offline ]; - }; - - nodes = { - docker = - { pkgs, ... }: - { - virtualisation.docker.enable = true; - virtualisation.docker.package = pkgs.docker-edge; - - users.users = { - noprivs = { - isNormalUser = true; - description = "Can't access the docker daemon"; - password = "foobar"; - }; - - hasprivs = { - isNormalUser = true; - description = "Can access the docker daemon"; - password = "foobar"; - extraGroups = [ "docker" ]; - }; - }; - }; - }; - - testScript = '' - start_all() - - docker.wait_for_unit("sockets.target") - docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg") - docker.succeed( - "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" - ) - docker.succeed("docker ps | grep sleeping") - docker.succeed("sudo -u hasprivs docker ps") - docker.fail("sudo -u noprivs docker ps") - docker.succeed("docker stop sleeping") - - # Must match version 4 times to ensure client and server git commits and versions are correct - docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "4" ]') - ''; -}) diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 10c199d94b69..1cdea4629bbc 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libsndfile portaudio ]; + # Workaround build failure on -fno-common toolchains: + # ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint'; + # src/net/../../src/gnauralnet.h:233: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + postInstall = '' mkdir -p $out/share/applications substitute \ diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch deleted file mode 100644 index 3a6296baaa64..000000000000 --- a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001 -From: Sam Parkinson -Date: Thu, 26 Oct 2017 14:50:13 +1100 -Subject: [PATCH] Remove post-install script that hardcodes paths - ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 25f3e1a..18b43bd 100644 ---- a/meson.build -+++ b/meson.build -@@ -21,4 +21,5 @@ subdir('src') - # subdir('tests') - # TODO: unit tests - --meson.add_install_script('meson_post_install.sh') -+# This does not work for nixos; it hard-codes paths -+# meson.add_install_script('meson_post_install.sh') --- -2.14.2 - diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix deleted file mode 100644 index 9e2187f4a8fd..000000000000 --- a/pkgs/applications/audio/gradio/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, python3 -, gsettings-desktop-schemas -, desktop-file-utils -, glib -, gtk3 -, intltool -, libsoup -, json-glib -, wrapGAppsHook -, meson -, ninja -, vala -, sqlite -, gst_all_1 -, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] -}: -let - version = "7.3"; - -in stdenv.mkDerivation { - pname = "gradio"; - inherit version; - - src = fetchFromGitHub { - owner = "haecker-felix"; - repo = "gradio"; - rev = "v${version}"; - sha256 = "00982dynl36lpsrx3mkd2a479zsrc8jvwfb8i7pi6w7fzzd8n8bl"; - }; - - nativeBuildInputs = [ - pkg-config - - meson - ninja - vala - - python3 - ]; - buildInputs = [ - sqlite - - glib - intltool - libsoup - json-glib - - gtk3 - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - - wrapGAppsHook - desktop-file-utils - gsettings-desktop-schemas - ] ++ gst_plugins; - - postInstall = '' - glib-compile-schemas "$out"/share/glib-2.0/schemas - ''; - - patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; - - meta = with lib; { - homepage = "https://github.com/haecker-felix/gradio"; - description = "A GTK3 app for finding and listening to internet radio stations"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.samdroid-apps ]; - }; -} diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix index 64f311c4a8a6..aeceb0dc6f84 100644 --- a/pkgs/applications/emulators/uae/default.nix +++ b/pkgs/applications/emulators/uae/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 alsa-lib SDL ]; hardeningDisable = [ "format" ]; + # Workaround build failure on -fno-common toolchains: + # ld: bsdsocket.o:(.bss+0x0): multiple definition of + # `socketbases'; main.o:(.bss+0x2792c0): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; LDFLAGS = [ "-lm" ]; meta = { diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 637c4add65d6..08f91765de0e 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.2.2"; + version = "2.2.3"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-V3qcQQwc2ykVTVgUJuNnVQ9iSPD0tv4C2hSILLxuE70="; + hash = "sha256-ykJd1ZjAqT8OtJsZiSjbDdkN5fFlQcWtTO88x3zAfU8="; }; nativeBuildInputs = [ @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Python GTK application to view and clean metadata in files, using mat2"; homepage = "https://gitlab.com/rmnvgr/metadata-cleaner"; + changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ gpl3Plus cc-by-sa-40 ]; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index c11ad8d1e981..48b1b2d57e05 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nix-update-script , fetchpatch -, vala +, vala_0_54 , meson , ninja , pkg-config @@ -44,6 +44,12 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/tootle/0002-Use-reason_phrase-instead-of-get_phrase.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5"; sha256 = "sha256-rm5NFLeAL2ilXpioywgCR9ppoq+MD0MLyVaBmdzVkqU="; }) + # Application: make app_entries private + # https://github.com/bleakgrey/tootle/pull/346 + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/tootle/0003-make-app-entries-private.patch?id=c973e68e3cba855f1601ef010afa9a14578b9499"; + sha256 = "sha256-zwU0nxf/haBZl4tOYDmMzwug+HC6lLDT8/12Wt62+S4="; + }) ]; nativeBuildInputs = [ @@ -51,7 +57,11 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with Vala 0.56.1: + # ../src/Widgets/Status.vala:8.43-8.56: error: construct + # properties not supported for specified property type + # public API.NotificationType? kind { get; construct set; } + vala_0_54 wrapGAppsHook ]; @@ -68,11 +78,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Fix build with vala 0.56 - # https://github.com/bleakgrey/tootle/pull/346 - substituteInPlace src/Application.vala \ - --replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries" - chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 81bc49e0d6a6..aed8232a8465 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "104.0.5083.0", - "sha256": "02viibc6n77lrlr1vfdyjknzcknnpvp58s4y1g6cbwy4pvajisd9", - "sha256bin64": "0g2kzabbg5g3kb0a6scjxslywrkrgpynws7i4lbw0j2gay40zqar", + "version": "104.0.5098.0", + "sha256": "1h5szy6jp2n55m0fs2czdlldgkgyrqsnkfhhpwxzl8fyanlpw1hj", + "sha256bin64": "1w97mkdz3ab9wxw7fj5fpm8cjazdpb0s715c85hd3h0wrvwm1g8p", "deps": { "gn": { - "version": "2022-05-17", + "version": "2022-05-31", "url": "https://gn.googlesource.com/gn", - "rev": "c547ca1497e3ff0dcbc0b2cb036b3d40380cbeeb", - "sha256": "0wk721sqz5s7bnrk1ar7c07ykxpdvwq01qi4na84m4b76nyzakwy" + "rev": "37baefb026b199605affa7bcb24810d1724ce373", + "sha256": "166ciclcp77vn7k4k8nvb7xn1clddbrk35am4hqiayfya57yal3c" } } }, diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index deb95b695d2b..10b781a7dad4 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -37,15 +37,7 @@ stdenv.mkDerivation rec { patches = [ ./fixup-addonmanager-lib-path.patch ]; postPatch = '' - # go env breaks the sandbox - substituteInPlace "hack/lib/golang.sh" \ - --replace 'echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"' 'echo "${go.GOOS}/${go.GOARCH}"' - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - # hack/update-munge-docs.sh only performs some tests on the documentation. - # They broke building k8s; disabled for now. - echo "true" > "hack/update-munge-docs.sh" - patchShebangs ./hack ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 520d689c81d8..24b5bc6b0ac0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -12,10 +12,10 @@ "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.8.0", - "sha256": "06wjvjsh8qgncrbdhziqjd4pgp550q21p0xm4igdx80gd7541hr1", - "vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc", - "version": "2.8.0" + "rev": "v2.9.0", + "sha256": "sha256-ptWoKXuV6jcDu2v1oOcW11VjXOgf/jUG1kpFGcNLHtw=", + "vendorSha256": "sha256-sU8g+mjn14H9f3LwomcNJ7ho8LpYjCEevv4++6KPzow=", + "version": "2.9.0" }, "age": { "owner": "clementblaise", @@ -39,20 +39,20 @@ "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v2.0.0", - "sha256": "sha256-LcqP4gO1dhNaLkpaZIRxmC8B7DUTLC1fPZutohBqKSQ=", - "vendorSha256": "sha256-Vu5vyCEkZNf8TXryDalI5RKM/hjWeEkXbnYLhGwc2y8=", - "version": "2.0.0" + "rev": "v2.1.0", + "sha256": "sha256-BxdoHSylItn8AmZJf+mUJ7joSTyFumdnSBtLKXWZbBw=", + "vendorSha256": "sha256-0euOl3ttt1dDURIti0UsXKqfZiSVYE2nxkFlQ3gLlsM=", + "version": "2.1.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.169.0", - "sha256": "sha256-rtQN1l6OMEN/fudg67BFmk/OpwMVxxDM36zks3WvyUM=", - "vendorSha256": "sha256-bSJDPNkO8MQT1/coyHSCWNQ8zudrX+2KNwsASGeKh8s=", - "version": "1.169.0" + "rev": "v1.170.0", + "sha256": "sha256-qONJK3/Vr+v6sVphyDLBJDdbeuLUxdZSImvntvQ4Fbc=", + "vendorSha256": "sha256-RbhpyldFMQYb/bsGtnFLHxHGgIcPPSTJlEzuQySfxEA=", + "version": "1.170.0" }, "ansible": { "owner": "nbering", @@ -76,10 +76,10 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.30.2", - "sha256": "sha256-6+81QomUnKEbaqGHSRabLSb7O6lrrG+Fp9N8y8ZtS8A=", - "vendorSha256": "sha256-4o+/iB853zXcEYgPKVZ8CVHdIOEZW+/OX+LDBHSNjUk=", - "version": "0.30.2" + "rev": "v0.30.3", + "sha256": "sha256-mtf5gsY7ZVkok6zUTRFgdlRRUnTSeej36aAABfo7NyA=", + "vendorSha256": "sha256-ZN7P9PD8MqThtc6x/Lm4Yeb7ciPVWpFP4zDo0gQHYTo=", + "version": "0.30.3" }, "avi": { "owner": "vmware", @@ -103,10 +103,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.16.0", - "sha256": "sha256-PHm2MR1JDH3RnMqX3FjbjVFNTPD8CX2K7eemJ9ZMiJU=", - "vendorSha256": "sha256-UBOvQexfbSUh/9XKCvOYoMVH+QYLiwcdlZ8mcjy2AKU=", - "version": "4.16.0" + "rev": "v4.17.1", + "sha256": "sha256-2AabKctIYtb20K5APY54syI7BhaE8WSBRg3BAvtBV+w=", + "vendorSha256": "sha256-qfVUJ3NqDRzISk2UTVPD9Xe/GIZASzSqP5P1sJJHvOo=", + "version": "4.17.1" }, "azuread": { "owner": "hashicorp", @@ -121,10 +121,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.8.0", - "sha256": "sha256-PqupNzZlcgqld25dFN0GHNM7YJ8zSuZ04cz40dUMv/0=", + "rev": "v3.9.0", + "sha256": "sha256-bhBq3fZ3xTvfyvfzpveDqNkbwP4lc78TfR1JOa8HYrc=", "vendorSha256": null, - "version": "3.8.0" + "version": "3.9.0" }, "azurestack": { "owner": "hashicorp", @@ -149,10 +149,10 @@ "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.12.5", - "sha256": "sha256-SR2LYwxeGR9UJLj8+13+UtgXynLquttDGvIIQqxvbcY=", + "rev": "v1.12.6", + "sha256": "sha256-0/CwWrS6tTl2ZzkzYezgyU/Avi+TwJ+nm2GsxgXH/lo=", "vendorSha256": "sha256-pA2dAC8AasWLTlC+SddS4kWT16FqcyBrtdVMV9k/FtE=", - "version": "1.12.5" + "version": "1.12.6" }, "bigip": { "owner": "F5Networks", @@ -231,10 +231,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.15.0", - "sha256": "sha256-y1UbirPJG9Behsr/VdILoVHIM2z9pF6iyEwXgDKbDaw=", - "vendorSha256": "sha256-R8B5fmjRBB2q12tzWbzOzzSOC0mNJNV1JiVjddDa11c=", - "version": "3.15.0" + "rev": "v3.16.0", + "sha256": "sha256-9MLk+M/M3U6hpAoaV6BUUZRSnTd9083nqI5tPATePw0=", + "vendorSha256": "sha256-Q9Gcq5xczrREMtFArpRpINZ4/N5pu4GdZwD4gGYTUVE=", + "version": "3.16.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -304,10 +304,10 @@ "owner": "awakesecurity", "provider-source-address": "registry.terraform.io/awakesecurity/dhall", "repo": "terraform-provider-dhall", - "rev": "v0.0.2", - "sha256": "1fw83ic5wwhl5yk1asy8p4cxsdwclw639j7ki1xgpi284h6gmh5a", - "vendorSha256": "1wqbblqpb1lpbsn4k9yh43g19iw13q825l5i9wvy4w0w4nzz70p4", - "version": "0.0.2" + "rev": "v0.0.3", + "sha256": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", + "vendorSha256": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=", + "version": "0.0.3" }, "digitalocean": { "owner": "digitalocean", @@ -367,10 +367,10 @@ "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.1", - "sha256": "sha256-WdGwLQe4jInZiMxJ7BasfwVBsei0V02D6vAA4dLLoAI=", - "vendorSha256": "sha256-gBC5+6bGJzfb0yLKlolfrZNuhpPacqX3p1HjIB4i3IU=", - "version": "2.0.1" + "rev": "v2.0.2", + "sha256": "sha256-hbdPapnnkv8nhD63UquS5DwfETkjNKwpkdmo9LgpvM0=", + "vendorSha256": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", + "version": "2.0.2" }, "exoscale": { "owner": "exoscale", @@ -449,20 +449,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.22.0", - "sha256": "sha256-L85rh/UNXBO64VBJUNePMrAgTAKJMghH9LeQgYNhuqg=", - "vendorSha256": "sha256-wc+B0PPgq+m/Kxkaappf8jiLhm3ch8yP+KqGzzlmwFI=", - "version": "4.22.0" + "rev": "v4.23.0", + "sha256": "sha256-DXMiLwK3YyTe2R+PayUg5K+n1N/HOkkdoUoBxdKH7Xk=", + "vendorSha256": "sha256-rXANGmnJZ9CJzaC3rZSWZJm993AJNUmzbtqPjQX6qUE=", + "version": "4.23.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.22.0", - "sha256": "sha256-D21cdG3dPNOJjGS+x4Yb2cwsmzrwnkg0ByQGRjuMZcI=", - "vendorSha256": "sha256-wc+B0PPgq+m/Kxkaappf8jiLhm3ch8yP+KqGzzlmwFI=", - "version": "4.22.0" + "rev": "v4.23.0", + "sha256": "sha256-oqbjH80gDZNFxKjER988TOw9SisaCRULTL9el6aMP44=", + "vendorSha256": "sha256-rXANGmnJZ9CJzaC3rZSWZJm993AJNUmzbtqPjQX6qUE=", + "version": "4.23.0" }, "googleworkspace": { "owner": "hashicorp", @@ -540,10 +540,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.36.0", - "sha256": "sha256-bf/w6BxXOL/Fup8NmYi86tGK3HIYGaYWUSAZ0yUazb8=", + "rev": "v1.37.0", + "sha256": "sha256-QLeqYLyskWzIW1oG7sO1vYLPeTRCX96dJ6FTSk317kU=", "vendorSha256": null, - "version": "1.36.0" + "version": "1.37.0" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -838,10 +838,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.77.0", - "sha256": "sha256-FUCqNugAdJtTv7HtPH8ji56423iyWYPnDVGtOgJWatg=", + "rev": "v4.78.0", + "sha256": "sha256-LIqvRsE2m3j0cgqJyyXVcxlEHpCl8UTYucCbHmG7dTo=", "vendorSha256": null, - "version": "4.77.0" + "version": "4.78.0" }, "okta": { "owner": "okta", @@ -883,10 +883,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.4", - "sha256": "sha256-ZsrCmg/7Flef8tU7ZTI+MnorJbafnY63mf1/anxwMaQ=", + "rev": "v1.29.5", + "sha256": "sha256-/76lJWy5x2XKl0RtBNKH8thHf1vyups4TVWHI/Coxd0=", "vendorSha256": "sha256-jxtkF3VXrsfF/Dpp7mDz+3XYootoxQX3YSp9bX7j6Cg=", - "version": "1.29.4" + "version": "1.29.5" }, "opsgenie": { "owner": "opsgenie", @@ -910,10 +910,10 @@ "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.4.2", - "sha256": "sha256-xCmfykHQvQ/O+8ZGe2s5Ic4n9aZvlQ34bpnVbJDCn98=", + "rev": "v2.5.0", + "sha256": "sha256-ylGqFN4y6MgCII+iOpUE0R93DLRu+Gbipk5I7LlB9dQ=", "vendorSha256": null, - "version": "2.4.2" + "version": "2.5.0" }, "panos": { "owner": "PaloAltoNetworks", @@ -1072,10 +1072,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.75.0", - "sha256": "sha256-4MQVttAyt6o0fFKOLFnMlBS6iN51LdaM5ajEnpDmQXE=", - "vendorSha256": "sha256-oTtu/h7Fu+UtjQeOmxnHQr39dUIpsFST8zkejyuN3ig=", - "version": "1.75.0" + "rev": "v1.76.0", + "sha256": "sha256-+/OZw/wpeRHoK5XuwiI2qfbZSheoGd4PRy4TkdtV7yY=", + "vendorSha256": "sha256-JaWR7TiU5J7HGWExENqo5lHysCzg4Q6XvpCYfekuAg8=", + "version": "1.76.0" }, "stackpath": { "owner": "stackpath", @@ -1108,10 +1108,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.72.5", - "sha256": "sha256-4ZnhE2Woy+CquDsqJvJMUib48eRJ9OWTrO/14NkI6iM=", + "rev": "v1.72.8", + "sha256": "sha256-yV2nS8FzhUpCVZR1StHhOb4zqJ8jxc+NRw/bnmDzfX8=", "vendorSha256": null, - "version": "1.72.5" + "version": "1.72.8" }, "tfe": { "owner": "hashicorp", @@ -1181,10 +1181,10 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.24", - "sha256": "sha256-/pM6PuvFsmRpBz5pqOy6mVlkbq+9IRlHug/DdoKjt4U=", - "vendorSha256": "sha256-4/Djmg6cONkJg1wH7M4Y2mZccbwyUXEvZ2bdBYEnV9w=", - "version": "0.17.24" + "rev": "0.17.25", + "sha256": "sha256-RH0GBE4uYnjva8ehf+kCnxDk7F012SUQ+iWePkwG62I=", + "vendorSha256": "sha256-tKbl234qJ/Y3tSFMOV45KtINGIvsV4XwBgVToNunyAc=", + "version": "0.17.25" }, "vault": { "owner": "hashicorp", @@ -1253,10 +1253,10 @@ "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.11.1", - "sha256": "sha256-EAkFlmQFPq9pSQ591GkX7um8tcBEGIJuiLuL5d9A8Ag=", + "rev": "v2.11.2", + "sha256": "sha256-cxNSsxAnCw7rZNljR87dN+vYvnwniN3j6VKeswIOv/g=", "vendorSha256": null, - "version": "2.11.1" + "version": "2.11.2" }, "wavefront": { "owner": "vmware", @@ -1271,9 +1271,9 @@ "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.74.0", - "sha256": "sha256-TeApvGYWBlCzxE7/t6cbb47L1oGUfx2B/cEW8UQieoU=", - "vendorSha256": "sha256-n1qcrvBKftKYm7nlTCeAOU/Q40xMpVlyKUKxR7wgPu4=", - "version": "0.74.0" + "rev": "v0.75.0", + "sha256": "sha256-j/OKAj5KrOecdpoyc8x+9D57mWkGYuIlHgGPGJxn+oc=", + "vendorSha256": "sha256-E6keFmYkxAMSNWqPF9ghFKX1GjwalVx3RyYpUqdk/xE=", + "version": "0.75.0" } } diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index efe13868524b..71de7d90ca7e 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -53,7 +53,7 @@ let mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion \ --unset PYTHONPATH \ - --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \ + --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose_1 ]} \ ; ''; }; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1c52ea273ac5..98af8ebf7fb5 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -17,7 +17,12 @@ buildGoModule rec { doCheck = false; installPhase = '' + runHook preInstall install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose + + mkdir -p $out/bin + ln -s $out/libexec/docker/cli-plugins/docker-compose $out/bin/docker-compose + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker/compose_1.nix similarity index 100% rename from pkgs/applications/virtualization/docker-compose/default.nix rename to pkgs/applications/virtualization/docker/compose_1.nix diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 68f1ff45d144..ea73e6a7096f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -13,7 +13,7 @@ rec { , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 + , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs , nixosTests @@ -136,7 +136,7 @@ rec { }); plugins = optionals buildxSupport [ docker-buildx ] - ++ optionals composeSupport [ docker-compose_2 ]; + ++ optionals composeSupport [ docker-compose ]; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage ((optionalAttrs (!clientOnly) { diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index adb3b5dc0f31..b598d846f9e2 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-t0GC6FVFcbVbmZ74XNSPCRRUsSr1Z8rRw6Rf++qk4I0="; + hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc="; }; postPatch = '' diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index f7bef8af2e4a..0ea75e2a2529 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.1"; + version = "1.1.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-iCMCQyhCUhp1f20+Qost9nnmfIUFE0iLKMKT/PfwOd4="; + hash = "sha256-OyjuUWfKE8GoGFCmaCS7YAf5GAS0VwMPht7cvFtkA/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index c69345193c77..e0ca78df79a4 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib ncurses ]; + # Workaround build failure on -fno-common toolchains: + # ld: libestools.a(editline.o):(.bss+0x28): multiple definition of + # `editline_history_file'; libestools.a(siodeditline.o):(.data.rel.local+0x8): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 884629da0ffe..dd0a4662ce7c 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -60,6 +60,9 @@ buildPythonPackage rec { # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785 "test_bpo_2142_workaround" "test_skip_magic_trailing_comma" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # exceeds max open files on hydra builders + "test_blackd_supported_version" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 5f4997259136..a47aa3d513a1 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.0.0a10"; + version = "2.0.0b2"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = version; - hash = "sha256-p99WJ4y2iJQTI3wHbh+jwJyLnE3aBXnHxrehDYYek/4="; + hash = "sha256-yp24eOmwdi5X2Y20jqq88CDFvmc6P5omOsSWFr2MWGI="; }; patches = [ diff --git a/pkgs/development/python-modules/nextcord/paths.patch b/pkgs/development/python-modules/nextcord/paths.patch index 389637a18878..8e6b58897f55 100644 --- a/pkgs/development/python-modules/nextcord/paths.patch +++ b/pkgs/development/python-modules/nextcord/paths.patch @@ -1,26 +1,71 @@ diff --git a/nextcord/opus.py b/nextcord/opus.py -index 97d437a3..755e1a5c 100644 +index 52e4ddbd..d8b8090b 100644 --- a/nextcord/opus.py +++ b/nextcord/opus.py -@@ -213,7 +213,7 @@ def _load_default() -> bool: - _filename = os.path.join(_basedir, 'bin', f'libopus-0.{_target}.dll') +@@ -255,7 +255,7 @@ def _load_default() -> bool: + _filename = os.path.join(_basedir, "bin", f"libopus-0.{_target}.dll") _lib = libopus_loader(_filename) else: -- _lib = libopus_loader(ctypes.util.find_library('opus')) -+ _lib = libopus_loader('@libopus@') - except Exception: - _lib = None +- opus = ctypes.util.find_library("opus") ++ opus = ctypes.util.find_library("@opus@") + if opus is None: + _lib = None diff --git a/nextcord/player.py b/nextcord/player.py -index bedefc5a..34de0459 100644 +index 5d0674cc..fd1c20ef 100644 --- a/nextcord/player.py +++ b/nextcord/player.py -@@ -140,7 +140,7 @@ class FFmpegAudio(AudioSource): - .. versionadded:: 1.3 - """ +@@ -148,7 +148,7 @@ class FFmpegAudio(AudioSource): + self, + source: Union[str, io.BufferedIOBase], + *, +- executable: str = "ffmpeg", ++ executable: str = "@ffmpeg@", + args: Any, + **subprocess_kwargs: Any, + ): +@@ -275,7 +275,7 @@ class FFmpegPCMAudio(FFmpegAudio): + self, + source: Union[str, io.BufferedIOBase], + *, +- executable: str = "ffmpeg", ++ executable: str = "@ffmpeg@", + pipe: bool = False, + stderr: Optional[IO[str]] = None, + before_options: Optional[str] = None, +@@ -378,7 +378,7 @@ class FFmpegOpusAudio(FFmpegAudio): + *, + bitrate: int = 128, + codec: Optional[str] = None, +- executable: str = "ffmpeg", ++ executable: str = "@ffmpeg@", + pipe=False, + stderr=None, + before_options=None, +@@ -532,7 +532,7 @@ class FFmpegOpusAudio(FFmpegAudio): + """ -- def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = 'ffmpeg', args: Any, **subprocess_kwargs: Any): -+ def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = '@ffmpeg@', args: Any, **subprocess_kwargs: Any): - piping = subprocess_kwargs.get('stdin') == subprocess.PIPE - if piping and isinstance(source, str): - raise TypeError("parameter conflict: 'source' parameter cannot be a string when piping to stdin") + method = method or "native" +- executable = executable or "ffmpeg" ++ executable = executable or "@ffmpeg@" + probefunc = fallback = None + + if isinstance(method, str): +@@ -577,7 +577,7 @@ class FFmpegOpusAudio(FFmpegAudio): + + @staticmethod + def _probe_codec_native( +- source, executable: str = "ffmpeg" ++ source, executable: str = "@ffmpeg@" + ) -> Tuple[Optional[str], Optional[int]]: + exe = executable[:2] + "probe" if executable in ("ffmpeg", "avconv") else executable + args = [ +@@ -606,7 +606,7 @@ class FFmpegOpusAudio(FFmpegAudio): + + @staticmethod + def _probe_codec_fallback( +- source, executable: str = "ffmpeg" ++ source, executable: str = "@ffmpeg@" + ) -> Tuple[Optional[str], Optional[int]]: + args = [executable, "-hide_banner", "-i", source] + proc = subprocess.Popen( diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index dd840c3389ca..49603322a8fc 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, requests, dparse, click, setuptools, pytestCheckHook }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, click +, requests +, packaging +, dparse +, pytestCheckHook +}: buildPythonPackage rec { pname = "safety"; version = "1.10.3"; + diabled = pythonOlder "3.5"; + + format = "setuptools"; + src = fetchPypi { inherit pname version; sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU="; }; - propagatedBuildInputs = [ requests dparse click setuptools ]; + propagatedBuildInputs = [ + setuptools + click + requests + packaging + dparse + ]; + + checkInputs = [ + pytestCheckHook + ]; # Disable tests depending on online services - checkInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; disabledTests = [ "test_check_live" "test_check_live_cached" @@ -24,10 +46,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = - "Safety checks your installed dependencies for known security vulnerabilities"; + description = "Checks installed dependencies for known vulnerabilities"; homepage = "https://github.com/pyupio/safety"; license = licenses.mit; - maintainers = with maintainers; [ thomasdesr ]; + maintainers = with maintainers; [ thomasdesr dotlambda ]; }; } diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index ce4ae1a8874d..5d46ea9e0445 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , aiohttp , python-dateutil @@ -10,14 +11,16 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.3"; + version = "2.5.4"; + + disabled = pythonOlder "3.7"; format = "setuptools"; src = fetchPypi { pname = "twitchAPI"; inherit version; - sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704"; + hash = "sha256-uNXET3V3r3f6c72IF3DEdXfQlrgkn2w5f4ksKBOsihg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index c7d8ebcd8a35..9e3f9fc3e534 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-pTQigt8sG+4AzDc3Fav/Qn27CNH0lIHuQ3QMA5uMdqI="; + hash = "sha256-psSbz5ZcgLDkS/9Q/PLe4Ufj7GOR8Sv1rLhA2Hs3zsw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 270d63ed2a76..5fa4b183c241 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,10 +1,11 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "easyjson"; version = "0.7.7"; - goPackagePath = "github.com/mailru/easyjson"; - goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; @@ -12,10 +13,13 @@ buildGoPackage rec { rev = "v${version}"; sha256 = "0clifkvvy8f45rv3cdyv58dglzagyvfcqb63wl6rij30c5j2pzc1"; }; + vendorSha256 = "sha256-L8u7QQPE2SnskcRrSIwQ4KhsX9xncqDWXJ75ytjxLJ4="; + + subPackages = [ "easyjson" ]; meta = with lib; { homepage = "https://github.com/mailru/easyjson"; - description = "Fast JSON serializer for golang"; + description = "Fast JSON serializer for Go"; license = licenses.mit; maintainers = with maintainers; [ Madouura ]; }; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 4290d1501ebf..e28c6094b37d 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -1,26 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "goa"; - version = "1.4.1"; - - goPackagePath = "github.com/goadesign/goa"; - subPackages = [ "goagen" ]; + version = "3.7.6"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "0qcd4ii6arlpsivfdhcwidvnd8zbxxvf574jyxyvm1aazl8sqxj7"; + sha256 = "sha256-AxMt9XnpUvAwWtjh391ep+MFysF5I/HUeHS8Kq8/fvU="; }; + vendorSha256 = "sha256-eTMqvl7h12GbzEmO5Lo4hdFrbqti3zl9edTz+zS0Xu8="; - goDeps = ./deps.nix; + subPackages = [ "cmd/goa" ]; meta = with lib; { - description = "A framework for building microservices in Go using a unique design-first approach"; + description = "Design-based APIs and microservices in Go"; homepage = "https://goa.design"; license = licenses.mit; - maintainers = [ maintainers.rushmorem ]; - mainProgram = "goagen"; + maintainers = with maintainers; [ rushmorem ]; }; } diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 1eba2511b987..bea79c2007db 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -31,7 +31,14 @@ stdenv.mkDerivation rec { "-DLIBDIR=lib" ]; - NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; + NIX_CFLAGS_COMPILE = [ + "-I${harfbuzz.dev}/include/harfbuzz" + + # Workaround build failure on -fno-common toolchains: + # ld: ryos_talk.c.o:(.bss+0x0): multiple definition of `RyosWriteCheckWait'; + # ryos_custom_lights.c.o:(.bss+0x0): first defined here + "-fcommon" + ]; meta = { description = "Tools to configure ROCCAT devices"; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 9bfe0e942eeb..09a2d8bf638d 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "trinity"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8.patch"; + sha256 = "0dbhyc98x11cmac6rj692zymnfqfqcbawlrkg1lhgfagzjxxwshg"; + }) + ]; + postPatch = '' patchShebangs configure patchShebangs scripts diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index bd04efc92dac..bce54c747d71 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -13,11 +13,12 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.0"; + version = "1.2.1"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-45pVR5Au9FYQGqTHefpms0W9pw0WeI6L0Y5Fj5Ovf2c="; + sha256 = "sha256-n5zi0ZI8szoUfubQgXfYYJdFZ3IbEUL8pnkUoC5kxjM="; }; postPatch = '' @@ -125,6 +126,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://www.borgbackup.org"; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage + mainProgram = "borg"; maintainers = with maintainers; [ flokli dotlambda globin ]; }; } diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/tools/misc/lilo/default.nix index bba9db383907..f72cdc422be0 100644 --- a/pkgs/tools/misc/lilo/default.nix +++ b/pkgs/tools/misc/lilo/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE="; }; nativeBuildInputs = [ dev86 sharutils ]; + + # Workaround build failure on -fno-common toolchains: + # ld: identify.o:(.bss+0x0): multiple definition of `identify'; + # common.o:(.bss+0x160): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "DESTDIR=${placeholder "out"}" "SBIN_DIR=/bin" diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/tools/networking/voms/default.nix new file mode 100644 index 000000000000..06639a5ef129 --- /dev/null +++ b/pkgs/tools/networking/voms/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub + # Native build inputs +, autoreconfHook +, bison +, flex +, pkg-config + # Build inputs +, expat +, gsoap +, openssl +, zlib +}: + +stdenv.mkDerivation rec{ + pname = "voms-unstable"; + version = "2021-05-04"; + + src = fetchFromGitHub { + owner = "italiangrid"; + repo = "voms"; + rev = "61563152fce3a4e6860dd8ab8ab6e72b7908d8b8"; + sha256 = "LNR0G4XrgxqjQmjyaKoZJLNoxtAGiTM93FG3jIU1u+Y="; + }; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + ]; + + buildInputs = [ + expat + gsoap + openssl + zlib + ]; + + outputs = [ "bin" "out" "dev" "man" ]; + + preAutoreconf = '' + mkdir -p aux src/autogen + ''; + + postAutoreconf = '' + # FHS patching + substituteInPlace configure \ + --replace "/usr/bin/soapcpp2" "${gsoap}/bin/soapcpp2" + + # Tell gcc about the location of zlib + # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=voms + export GSOAP_SSL_PP_CFLAGS="$(pkg-config --cflags gsoapssl++ zlib)" + export GSOAP_SSL_PP_LIBS="$(pkg-config --libs gsoapssl++ zlib)" + ''; + + configureFlags = [ + "--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h" + ]; + + meta = with lib; { + description = "The VOMS native service and APIs"; + homepage = "https://italiangrid.github.io/voms/"; + changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog"; + license = licenses.asl20; + platforms = platforms.linux; # gsoap is currently Linux-only in Nixpkgs + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index a4c90f95e90d..0dc5c7a5eb04 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -4,15 +4,16 @@ , fetchFromGitHub , cmake , cppunit +, pkg-config , curl , fuse , libkrb5 , libuuid , libxml2 , openssl -, pkg-config , readline , systemd +, voms , zlib , enableTests ? true }: @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ fuse systemd + voms ] ++ lib.optionals enableTests [ cppunit diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index c431980125a6..bc4a920051a8 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,6 +1,6 @@ -{ lib, python3, glibcLocales, docker-compose }: +{ lib, python3, glibcLocales, docker-compose_1 }: let - docker_compose = changeVersion (with localPython.pkgs; docker-compose.override { + docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override { inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko; }).overridePythonAttrs "1.25.5" "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a1620d99d222..0d36c07f132a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -340,6 +340,8 @@ mapAliases ({ docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30 docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 + docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05 + docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dotnet-netcore = dotnet-runtime; # Added 2021-10-07 @@ -533,6 +535,7 @@ mapAliases ({ graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 + gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daa30701e59c..2ce6d217dd35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -496,8 +496,6 @@ with pkgs; nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { }; - docker-compose = python3Packages.callPackage ../applications/virtualization/docker-compose {}; - docker-ls = callPackage ../tools/misc/docker-ls { }; docker-slim = callPackage ../applications/virtualization/docker-slim { }; @@ -1216,6 +1214,8 @@ with pkgs; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; + voms = callPackage ../tools/networking/voms { }; + vopono = callPackage ../tools/networking/vopono { }; winbox = callPackage ../tools/admin/winbox { @@ -25846,7 +25846,6 @@ with pkgs; docker_20_10; docker = docker_20_10; - docker-edge = docker_20_10; docker-client = docker.override { clientOnly = true; }; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -25869,7 +25868,8 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; + docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; + docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix {}; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -26469,8 +26469,6 @@ with pkgs; rhythmbox = callPackage ../applications/audio/rhythmbox { }; - gradio = callPackage ../applications/audio/gradio { }; - puddletag = libsForQt5.callPackage ../applications/audio/puddletag { }; w_scan = callPackage ../applications/video/w_scan { }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index e038973e0858..e9cb8681f653 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -139,7 +139,7 @@ in { config = { warnings = lib.optionals config.warnUndeclaredOptions ( - lib.mapAttrsToList (k: v: "undeclared Nixpkgs option set: config.${k}") config._undeclared + lib.mapAttrsToList (k: v: "undeclared Nixpkgs option set: config.${k}") config._undeclared or {} ); }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 582d1c055690..707dd648496e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -948,6 +948,19 @@ let }; }; + ArrayRefElem = buildPerlPackage { + pname = "Array-RefElem"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id//G/GA/GAAS/Array-RefElem-1.00.tar.gz"; + sha256 = "sha256-U7iAo67AQ+TjcM4SaCtHVt5F3XQtq1cpT+IaFUU87+M="; + }; + meta = { + description = "Set up array elements as aliases"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AsyncPing = buildPerlPackage { pname = "AsyncPing"; version = "2016.1207"; @@ -11390,6 +11403,21 @@ let doCheck = !stdenv.isDarwin; # openpty fails in the sandbox }; + IPCConcurrencyLimit = buildPerlPackage { + pname = "IPC-ConcurrencyLimit"; + version = "0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTK/IPC-ConcurrencyLimit-0.17.tar.gz"; + sha256 = "sha256-Lk11vlLpD8YFg31ajp+yacCofdPTYfMBLA/5Sl+9z+8="; + }; + buildInputs = [ ExtUtilsMakeMaker ]; + propagatedBuildInputs = [ FilePath IO ]; + meta = { + description = "Lock-based limits on cooperative multi-processing"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IPCountry = buildPerlPackage { pname = "IP-Country"; version = "2.28";