From 1b2cc0d457bafc74ad0d24f8d29134f8220b4f77 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Fri, 15 Dec 2023 01:07:34 -0500 Subject: [PATCH 01/57] maptool: 1.13.2 -> 1.14.3 --- pkgs/games/maptool/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/maptool/default.nix b/pkgs/games/maptool/default.nix index d5fcbc47529b..ed505b32eda3 100644 --- a/pkgs/games/maptool/default.nix +++ b/pkgs/games/maptool/default.nix @@ -12,11 +12,11 @@ }: let pname = "maptool"; - version = "1.13.2"; + version = "1.14.3"; repoBase = "https://github.com/RPTools/maptool"; src = fetchurl { url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst"; - hash = "sha256-Ntmro+t4qpP5BXW20t97ki0wt2NKaK5yQarsxDEKbb0="; + hash = "sha256-KjP6zugQw9r1hvdxqOgTrt4hYMYg+lgjkgkj3tfb38s="; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8acf7e4753f0..3a3c807db1ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37993,8 +37993,8 @@ with pkgs; # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging # at launch in a class initialization deadlock. MapTool ships Temurin with # their pre-built releases so we might as well use it too. - jre = temurin-bin-17; - openjfx = openjfx17; + jre = temurin-bin-21; + openjfx = openjfx21; }; mari0 = callPackage ../games/mari0 { }; From ccd64be2901c8b37dd1b86fc2577163116070d48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 21:03:29 +0000 Subject: [PATCH 02/57] python310Packages.google-cloud-resource-manager: 1.10.4 -> 1.11.0 --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 50f605f5fc99..b1841c53259b 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.10.4"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-RWsl3do9TNJ0iKcnNrvDrwTXE64v42VcAbZqM50o1nk="; + hash = "sha256-pkumu1lWNOzSRyuLAyLo8BKnYyd1Zlmi3enzktf6GvI="; }; propagatedBuildInputs = [ From 9113d55c9e4ea82e9ee0276c68a7982f073ac319 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Dec 2023 21:29:52 +0000 Subject: [PATCH 03/57] python310Packages.google-cloud-secret-manager: 2.16.4 -> 2.17.0 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 5bb5940f55a4..ca52ac48d875 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.16.4"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nx3HL5FFrzI+ioE8jlA4DmrEvWpdvNQtzzFi2PN+UIA="; + hash = "sha256-glTilgwGqNyRrqw8iUr7oIk6Z0WC8ODs/CL4lOYXPC8="; }; propagatedBuildInputs = [ From 05aa6e455aa47779a4589621cfdf6c9edab6b48e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 02:25:28 +0000 Subject: [PATCH 04/57] python310Packages.yappi: 1.4.0 -> 1.6.0 --- pkgs/development/python-modules/yappi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index cb12c4f63f37..1e20c1ba2eab 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.4.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sumerc"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AogBnqhLcwsyTHLP+Uxc+EOgYzhdwX5rbi9RMCuC2IU="; + hash = "sha256-zA4apOGyrbjBOxUKBARiKmmM9rSVFVGWsDpOaItOoLU="; }; patches = [ From a6edc678200d0320b770e9273ccd32b5859e5c24 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 27 Dec 2023 13:49:20 +0100 Subject: [PATCH 05/57] convoy: remove --- pkgs/tools/filesystems/convoy/default.nix | 26 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/tools/filesystems/convoy/default.nix diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix deleted file mode 100644 index 774568fdde17..000000000000 --- a/pkgs/tools/filesystems/convoy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub, lvm2 }: - -buildGoPackage rec { - pname = "convoy"; - version = "0.5.2"; - - goPackagePath = "github.com/rancher/convoy"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "rancher"; - repo = "convoy"; - sha256 = "09nygrxd5hril4xcfsvgjg74xxhhimznqq4sdk0f360c5ra0dbhj"; - }; - - buildInputs = [lvm2]; - - meta = with lib; { - homepage = "https://github.com/rancher/convoy"; - description = "A Docker volume plugin, managing persistent container volumes"; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0b2c369d43f7..a8e750206d04 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -162,6 +162,7 @@ mapAliases ({ compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 concurrencykit = libck; # Added 2021-03 connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 + convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cvs_fast_export = cvs-fast-export; # Added 2021-06-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ba31c6d6db2..7d7c697687a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7292,8 +7292,6 @@ with pkgs; convmv = callPackage ../tools/misc/convmv { }; - convoy = callPackage ../tools/filesystems/convoy { }; - cpcfs = callPackage ../tools/filesystems/cpcfs { }; coreutils = callPackage ../tools/misc/coreutils { }; From 2a0f9cffe9a2965f0f5a712a85c5ee33d287f4bd Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Tue, 2 Jan 2024 21:18:54 +0100 Subject: [PATCH 06/57] libewf-legacy: init at 20140814 --- .../libraries/libewf-legacy/default.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/libewf-legacy/default.nix diff --git a/pkgs/development/libraries/libewf-legacy/default.nix b/pkgs/development/libraries/libewf-legacy/default.nix new file mode 100644 index 000000000000..dd167b909f1b --- /dev/null +++ b/pkgs/development/libraries/libewf-legacy/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchurl +, fetchpatch +, stdenv +, zlib +, openssl +, libuuid +, pkg-config +, bzip2 +}: + +stdenv.mkDerivation rec { + version = "20140814"; + pname = "libewf-ewf"; + + src = fetchurl { + url = "https://github.com/libyal/libewf-legacy/releases/download/${version}/libewf-${version}.tar.gz"; + hash = "sha256-OM3QXwnaIDeo66UNjzmu6to53SxgCMn/rE9VTPlX5BQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib openssl libuuid ] + ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + + meta = { + description = "Legacy library for support of the Expert Witness Compression Format"; + homepage = "https://sourceforge.net/projects/libewf/"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.unix; + }; +} From 575db93887dc3fed90284dc2783ad35514995e93 Mon Sep 17 00:00:00 2001 From: Eric Lesiuta Date: Tue, 2 Jan 2024 16:36:11 -0500 Subject: [PATCH 07/57] picosnitch: 1.0.1 -> 1.0.3 --- pkgs/tools/networking/picosnitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/tools/networking/picosnitch/default.nix index ddd07d28f292..6007d3ec227f 100644 --- a/pkgs/tools/networking/picosnitch/default.nix +++ b/pkgs/tools/networking/picosnitch/default.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "picosnitch"; - version = "1.0.1"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "5d427eb46de448e4109f68ed435dd38426df8200aea5bb668639aabe1f0b4580"; + sha256 = "78285e91b5c4d8e07529a34a7c3fe606acb6f950ee3cc78bb6c346bc2195b68a"; }; propagatedBuildInputs = with python3.pkgs; [ From ff55b5d7e194f0cbd4c7200202934ffd4069e420 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Tue, 9 Jan 2024 21:44:01 +0100 Subject: [PATCH 08/57] Update pkgs/development/libraries/libewf-legacy/default.nix Co-authored-by: Sandro --- pkgs/development/libraries/libewf-legacy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libewf-legacy/default.nix b/pkgs/development/libraries/libewf-legacy/default.nix index dd167b909f1b..4cfbceb0089c 100644 --- a/pkgs/development/libraries/libewf-legacy/default.nix +++ b/pkgs/development/libraries/libewf-legacy/default.nix @@ -10,8 +10,8 @@ }: stdenv.mkDerivation rec { - version = "20140814"; pname = "libewf-ewf"; + version = "20140814"; src = fetchurl { url = "https://github.com/libyal/libewf-legacy/releases/download/${version}/libewf-${version}.tar.gz"; From a786eee28474f306e9b0eb883f5631c187c7be0c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 27 Dec 2023 14:17:09 +0100 Subject: [PATCH 09/57] docker-machine-xhyve: remove --- .../cluster/docker-machine/xhyve.nix | 41 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/docker-machine/xhyve.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix deleted file mode 100644 index 4e75d66bee07..000000000000 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkg-config, cctools, Hypervisor, vmnet }: - -buildGoPackage rec { - pname = "docker-machine-xhyve"; - version = "0.4.0"; - - goPackagePath = "github.com/zchee/docker-machine-driver-xhyve"; - - # https://github.com/machine-drivers/docker-machine-driver-xhyve/pull/225 - patches = fetchpatch { - url = "https://github.com/machine-drivers/docker-machine-driver-xhyve/commit/546256494bf2ccc33e4125bf45f504b0e3027d5a.patch"; - sha256 = "1i8wxqccqkxvqrbsyd0g9s0kdskd8xi2jv0c1bji9aj4rq0a8cgz"; - }; - - preBuild = '' - make -C go/src/${goPackagePath} CC=${stdenv.cc}/bin/cc LIBTOOL=${cctools}/bin/libtool GIT_CMD=: lib9p - export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p - export CGO_LDFLAGS=$(pwd)/go/src/${goPackagePath}/vendor/build/lib9p/lib9p.a - ''; - tags = [ "lib9p" ]; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "machine-drivers"; - repo = "docker-machine-driver-xhyve"; - sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ Hypervisor vmnet ]; - - meta = with lib; { - homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve"; - description = "Xhyve driver for docker-machine"; - license = licenses.bsd3; - maintainers = with maintainers; [ periklis ]; - platforms = platforms.darwin; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ce168d038e60..509b2edbb1bc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -207,6 +207,7 @@ mapAliases ({ devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dnnl = oneDNN; # Added 2020-04-22 + docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdfb60fec1fa..404f29ed654e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31118,10 +31118,6 @@ with pkgs; docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; - docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { - inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; - inherit (darwin) cctools; - }; docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; From 936d081c365ee30f1ed05a0645dae95d93719a97 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 27 Dec 2023 14:18:53 +0100 Subject: [PATCH 10/57] docker-machine-kvm: remove --- .../cluster/docker-machine/kvm-deps.nix | 21 -------------- .../networking/cluster/docker-machine/kvm.nix | 28 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix delete mode 100644 pkgs/applications/networking/cluster/docker-machine/kvm.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix deleted file mode 100644 index e321b2c1b0ac..000000000000 --- a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/docker/machine"; - fetch = { - type = "git"; - url = "https://github.com/docker/machine"; - rev = "457c02d06a155827c1c4af9b5ab38c0b6b4e48ea"; - sha256 = "0hx5bhjc7q9ml6h6d2a5csqg6vqwjj68599q0cccw3pcfrb34gmd"; - }; - } - { - goPackagePath = "github.com/libvirt/libvirt-go"; - fetch = { - type = "git"; - url = "https://github.com/libvirt/libvirt-go"; - rev = "e9642325d747c353ca7b76b4893d5dbdc81c296f"; - sha256 = "1822b2kbwyxb2gigbiashcs7v4fsyw7k3sdlqh43ga0l6058fmhl"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix deleted file mode 100644 index 4940f6331d44..000000000000 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ /dev/null @@ -1,28 +0,0 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: - -buildGoPackage rec { - pname = "docker-machine-kvm"; - version = "0.10.0"; - - goPackagePath = "github.com/dhiltgen/docker-machine-kvm"; - goDeps = ./kvm-deps.nix; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "dhiltgen"; - repo = "docker-machine-kvm"; - sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libvirt ]; - - meta = with lib; { - homepage = "https://github.com/dhiltgen/docker-machine-kvm"; - description = "KVM driver for docker-machine"; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 509b2edbb1bc..bedba7c257ca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -207,6 +207,7 @@ mapAliases ({ devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dnnl = oneDNN; # Added 2020-04-22 + docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = dolphin-emu; # Added 2021-11-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 404f29ed654e..ddacec1e3bc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31116,7 +31116,6 @@ with pkgs; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; - docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; From 0f5e83d4bb3257a19a28d3d3a3679ddfc2445af6 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 27 Dec 2023 14:23:21 +0100 Subject: [PATCH 11/57] docker-machine: remove --- .../cluster/docker-machine/default.nix | 33 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/docker-machine/default.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix deleted file mode 100644 index 7fd163f6968a..000000000000 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: - -buildGoPackage rec { - pname = "machine"; - version = "0.16.2"; - - goPackagePath = "github.com/docker/machine"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "docker"; - repo = "machine"; - sha256 = "sha256-Mo2OGpem3p6hCNJ46+RH3BfC7kmKB4yk4Vzo38K88UM="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - pushd go/src/${goPackagePath}/contrib/completion - installShellCompletion --bash bash/* - installShellCompletion --zsh zsh/* - popd - ''; - - meta = with lib; { - homepage = "https://docs.docker.com/machine/"; - description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts"; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bedba7c257ca..b1c88d8e0994 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -207,6 +207,7 @@ mapAliases ({ devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dnnl = oneDNN; # Added 2020-04-22 + docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddacec1e3bc8..baa76d2f3df8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31113,8 +31113,6 @@ with pkgs; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; - - docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; From ea74836d9a54861661f635431fee7f2c5a02243e Mon Sep 17 00:00:00 2001 From: Gustavo Coutinho de Souza Date: Sun, 14 Jan 2024 22:51:05 -0300 Subject: [PATCH 12/57] haredo: wrap program with a shell The program relies on the presence of a shell, specifically `sh`, on its PATH[1]. Also set `enableParallelChecking` to true, which can speed up the build proccess significantly, specially when using emulated native compilation through `binfmt`. [1]: https://git.sr.ht/~autumnull/haredo/tree/34136cfca3500935643f8c39eca3748047f3a829/item/src/haredo.ha#L282 --- pkgs/by-name/ha/haredo/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/haredo/package.nix b/pkgs/by-name/ha/haredo/package.nix index 277250170e5d..e31ae96c7832 100644 --- a/pkgs/by-name/ha/haredo/package.nix +++ b/pkgs/by-name/ha/haredo/package.nix @@ -4,6 +4,8 @@ , hare , scdoc , nix-update-script +, makeWrapper +, bash }: stdenv.mkDerivation (finalAttrs: { pname = "haredo"; @@ -20,9 +22,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hare + makeWrapper scdoc ]; + enableParallelChecking = true; + + doCheck = true; + + dontConfigure = true; + preBuild = '' HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)" export HARECACHE @@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck - ./bin/haredo test + ./bin/haredo ''${enableParallelChecking:+-j$NIX_BUILD_CORES} test runHook postCheck ''; @@ -53,8 +62,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - dontConfigure = true; - doCheck = true; + postFixup = '' + wrapProgram $out/bin/haredo \ + --prefix PATH : "${lib.makeBinPath [bash]}" + ''; setupHook = ./setup-hook.sh; From 2fbe2ecb99900d01d6ae71004a6e14d36799ef4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jan 2024 08:47:42 +0000 Subject: [PATCH 13/57] python311Packages.pyqtwebengine: 5.15.4 -> 5.15.6 --- pkgs/development/python-modules/pyqtwebengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 9dc076a5e8d1..4ad16f6ea0a6 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -10,14 +10,14 @@ let inherit (darwin) autoSignDarwinBinariesHook; in buildPythonPackage (rec { pname = "PyQtWebEngine"; - version = "5.15.4"; + version = "5.15.6"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f"; + sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; }; postPatch = '' From 0ccfce78678126ec8d7d97742bc340cc3637d5ed Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Fri, 19 Jan 2024 14:07:46 +0800 Subject: [PATCH 14/57] inetutils: set priority lower than util-linux The `logger` binary from `util-linux` should be the priority. This has been the default for many linux distributions. To instead prioritize this package, set a _lower_ `meta.priority`, or use e.g. lib.setPrio 5 inetutils --- pkgs/tools/networking/inetutils/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 9b1723a4d122..47533f13cb37 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -7,6 +7,7 @@ , help2man , apparmorRulesFromClosure , libxcrypt +, util-linux }: stdenv.mkDerivation rec { @@ -93,5 +94,15 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + + /** + The `logger` binary from `util-linux` is preferred over `inetutils`. + To instead prioritize this package, set a _lower_ `meta.priority`, or + use e.g. `lib.setPrio 5 inetutils`. + + Note that the default `meta.priority` is defined in `buildEnv` and is + currently 5. + */ + priority = (util-linux.meta.priority or 5) + 1; }; } From d0d38247f01c2d0d6f4d8ab46401ead9a658de37 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 20 Jan 2024 15:09:55 +0100 Subject: [PATCH 15/57] python3.pkgs.opentelemetry-api: 1.21.0 -> 1.22.0 ChangeLog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.22.0 --- pkgs/development/python-modules/opentelemetry-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 72957901af41..5b59d43e7816 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.21.0"; + version = "1.22.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta @@ -22,7 +22,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-igG0oHRa6M4d7pMp7fgBo13x5XADZeYgFAL8WzDXsyw="; + hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok="; }; sourceRoot = "${src.name}/opentelemetry-api"; From c913a0bc0da401762630277afe845ff2cf8289a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 20 Jan 2024 15:10:49 +0100 Subject: [PATCH 16/57] python3.pkgs.opentelemetry-instrumentation: 1.16.0 -> 0.43b0 This may seem like a downgrade, but actually it isn't: the library tags releases as 0.Xb0 with the title "1.22.0 / 0.43b0". Until 1.16 two tags were pushed, for 1.16 and 0.X. This isn't the case anymore, so 0.43b0 is far newer than 1.16. This has practical implications already since `opentelemetry-instrumentation-wsgi` doesn't build at all: Checking runtime dependencies for opentelemetry_instrumentation_wsgi-0.37b0-py3-none-any.whl - opentelemetry-semantic-conventions==0.37b0 not satisfied by version 0.42b0 Originally, this package was published via 0.X, but this was changed in 74303025237e4df97ba3597b089c1f1c596b9a71 which was a downgrade already. This looks like a bug in the automatic python updater and should be be skipped (or 1.x releases should be ignored). ChangeLogs: * https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.38b0 * https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.39b0 * https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.40b0 * https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.41b0 * https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.42b0 * https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.43b0 --- .../python-modules/opentelemetry-instrumentation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 4ee758ea564d..f5e76507d3ab 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "1.16.0"; + version = "0.43b0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-6tGQjPBej2zv5yJN0S46le3kyD7q3TELYyDmyxlp5Wo="; + hash = "sha256-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; From c91c1276ba311ae16407c153ca3808ecd6fa931c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 20 Jan 2024 15:19:34 +0100 Subject: [PATCH 17/57] python3.pkgs.opentelemetry-util-http: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The two tests fail because apparently they weren't really executed before 🤷 See also https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1940 --- .../python-modules/opentelemetry-util-http/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index 85e28f2a6d49..e14338ffcbce 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -33,6 +33,12 @@ buildPythonPackage { pytestCheckHook ]; + # https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1940 + disabledTests = [ + "test_nonstandard_method" + "test_nonstandard_method_allowed" + ]; + pythonImportsCheck = [ "opentelemetry.util.http" ]; meta = opentelemetry-instrumentation.meta // { From f88ea9b9191df85e9f32ba57a5a497bdca191190 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 20 Jan 2024 15:21:41 +0100 Subject: [PATCH 18/57] python3.pkgs.opentelemetry-instrumentation-flask: init at 0.43b0 --- .../default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix new file mode 100644 index 000000000000..71860dd8fd74 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, flask +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-wsgi +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-flask"; + disabled = pythonOlder "3.7"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask"; + + format = "pyproject"; + + nativeBuildInputs = [ hatchling ]; + + propagatedBuildInputs = [ + flask + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-wsgi + opentelemetry-semantic-conventions + opentelemetry-util-http + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.flask" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-flask"; + description = "Flask Middleware for OpenTelemetry based on the WSGI middleware"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 314fd3f8ff8f..0908531c2883 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8760,6 +8760,8 @@ self: super: with self; { opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { }; + opentelemetry-instrumentation-flask = callPackage ../development/python-modules/opentelemetry-instrumentation-flask { }; + opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { }; opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { }; From 19eb915fb8d6581d7161131b46da4472049ff8f9 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Sun, 21 Jan 2024 16:46:20 +0800 Subject: [PATCH 19/57] linux_xanmod: 6.1.72 -> 6.1.74 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index bf163701f331..47dcc63a7f45 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.72"; - hash = "sha256-S8Ilrce7xQb549NPIBRIMMIng4xY77Hbq58rE5LOow8="; + version = "6.1.74"; + hash = "sha256-PqCojvh7JwTcavtQHB8l/WxCTg94ndOy9KGVXsmGO/Y="; variant = "lts"; }; From f571fc09f10adb6dfc45ff2c67996538979c8c81 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Sun, 21 Jan 2024 17:08:45 +0800 Subject: [PATCH 20/57] linux_xanmod_latest: 6.6.10 -> 6.6.13 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 47dcc63a7f45..5b51de103320 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.6.10"; - hash = "sha256-5BymQhVWMHg4zlQIPxf40JQI9iSWQqTZfbDd6+G3RsQ="; + version = "6.6.13"; + hash = "sha256-RTfa9eIGYDqnffFnOFNaghKoGcHVy4rGYQkYumcw6Tk="; variant = "main"; }; From babc062694905d1b9892ab5e5c0a6e3d22b32fe7 Mon Sep 17 00:00:00 2001 From: 3JlOy_PYCCKUI <3jl0y_pycckui@riseup.net> Date: Sun, 21 Jan 2024 00:49:11 +0300 Subject: [PATCH 21/57] anilibria-winmaclinux: 1.2.12 -> 1.2.14 --- .../video/anilibria-winmaclinux/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 93c8e8ec5ce8..ee6c34965200 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , qmake +, pkg-config , qtbase , qtquickcontrols2 , qtwebsockets @@ -15,29 +16,27 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.12"; + version = "1.2.14"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; - rev = version; - sha256 = "sha256-J9MBnHrVnDaJ8Ykf/n8OkWKbK/JfMxorH9E+mKe3T8k="; + rev = "d941607f078c72fca104ee1e7916cc0ddcc0acf5"; + sha256 = "sha256-G4KlYAjOT1UV29vcX7Q8dMTj0BX0rsJcLtK2MQag5nU="; }; sourceRoot = "source/src"; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ]; patches = [ ./0001-fix-installation-paths.patch ./0002-disable-version-check.patch - ./0003-build-with-vlc.patch ]; preConfigure = '' substituteInPlace AniLibria.pro \ - --replace "\$\$PREFIX" '${placeholder "out"}' \ - --replace '@VLC_PATH@' '${libvlc}/include' + --replace "\$\$PREFIX" '${placeholder "out"}' ''; qtWrapperArgs = [ @@ -52,6 +51,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake + pkg-config wrapQtAppsHook copyDesktopItems ]; From 25385b749817c2504d89a9969835b6eb7239fb2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 05:05:33 +0000 Subject: [PATCH 22/57] mitmproxy: 10.2.1 -> 10.2.2 --- pkgs/development/python-modules/mitmproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 283208e3500e..62fe35f10390 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.2.1"; + version = "10.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-BO7oQ4TVuZ4dCtROq2M24V6HVo0jzyBdQfb67dYA07U="; + hash = "sha256-oxhpaFW++on3eRXm0anXZDRo6g/X5IflTcZkFF8Kcps="; }; nativeBuildInputs = [ From 0fa1f3cea57ae75a9ef3bcd863b2c6a3209b688b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 09:34:22 +0000 Subject: [PATCH 23/57] python311Packages.python-openstackclient: 6.3.0 -> 6.4.0 --- .../python-modules/python-openstackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 670fdaad51c8..5efec4e8d712 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.3.0"; + version = "6.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-m6C9+NAwh+WFtAqNzEKc673V/ewkwdYKECv58zEyDfE="; + hash = "sha256-DGq0AWjqUf7WiBmqJR+CU96aYdrMlt0bZHOfGJ/CGD8="; }; nativeBuildInputs = [ From 8963af6fbc63de73827c04ca9cc298f464527ebd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 10:59:42 +0000 Subject: [PATCH 24/57] starlark-rust: 0.10.0 -> 0.11.0 --- pkgs/development/interpreters/starlark-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/starlark-rust/default.nix b/pkgs/development/interpreters/starlark-rust/default.nix index bd30fb4f85ae..fdffaa549aa8 100644 --- a/pkgs/development/interpreters/starlark-rust/default.nix +++ b/pkgs/development/interpreters/starlark-rust/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "starlark-rust"; - version = "0.10.0"; + version = "0.11.0"; src = fetchCrate { pname = "starlark_bin"; inherit version; - hash = "sha256-7AoNRTLyTYsUass9bMJMBUN+GrfUzEGM9cED5VsRESs="; + hash = "sha256-/dy9uzXLZipKzFaslOmlzeEsOD89pprwFTopYpsmHGM="; }; - cargoHash = "sha256-Q00JJRiubrxnI0nFQqUTbxTTB70XV93HJycjdlvV+74="; + cargoHash = "sha256-Ict1Lh+JPZ5dmC+ul0phcQug9nYeaILLCtaHQOI6qBk="; meta = with lib; { description = "A Rust implementation of the Starlark language"; From 8685f06aa7cac4d49fe5c60e7e48b4cde5ee4122 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 22 Jan 2024 13:19:58 +0100 Subject: [PATCH 25/57] bear: remove myself as maintainer --- pkgs/development/tools/build-managers/bear/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 880184880db1..6deca5aacf10 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rizsotto/Bear"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ babariviere qyliss ]; + maintainers = with maintainers; [ babariviere ]; }; } From 5ec31b61f81cf25a798f4bd1b63d0d6b809e0353 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 22 Jan 2024 13:20:16 +0100 Subject: [PATCH 26/57] alpine-make-vm-image: remove myself as maintainer --- pkgs/tools/virtualization/alpine-make-vm-image/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix index 7d5b4933502c..0dd69313586b 100644 --- a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix +++ b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/alpinelinux/alpine-make-vm-image"; description = "Make customized Alpine Linux disk image for virtual machines"; - maintainers = with maintainers; [ qyliss ]; license = licenses.mit; platforms = platforms.unix; mainProgram = "alpine-make-vm-image"; From 940fb2a3e02be09e9fabe24f76fc61a2068b5c13 Mon Sep 17 00:00:00 2001 From: bryango Date: Mon, 22 Jan 2024 21:53:06 +0800 Subject: [PATCH 27/57] inetutils: release-note on `meta.priority` --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 84ece231efea..b6f5e2b80d4d 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -63,6 +63,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857) +- `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`. + - `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`. - The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. From 9b0be1e3a3f7a0151c38967a5998cc4601928323 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 22 Jan 2024 14:54:30 +0100 Subject: [PATCH 28/57] dolibarr: remove myself from maintainers It's a tiring piece of software. --- nixos/tests/dolibarr.nix | 2 +- pkgs/servers/web-apps/dolibarr/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/dolibarr.nix b/nixos/tests/dolibarr.nix index 4fdee9e9698f..95557d317fab 100644 --- a/nixos/tests/dolibarr.nix +++ b/nixos/tests/dolibarr.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "dolibarr"; - meta.maintainers = [ lib.maintainers.raitobezarius ]; + meta.maintainers = [ ]; nodes.machine = { ... }: diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index 3f96b78391bd..f689aff626bf 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "A enterprise resource planning (ERP) and customer relationship manager (CRM) server"; homepage = "https://dolibarr.org/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.raitobezarius ]; + maintainers = [ ]; }; } From 5413027f9c8a395259f7e9e26d82025a8e0ebca1 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 22 Jan 2024 16:42:00 +0100 Subject: [PATCH 29/57] kubo: 0.25.0 -> 0.26.0 https://github.com/ipfs/kubo/releases/tag/v0.26.0 --- pkgs/by-name/ku/kubo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index ae20f84e8170..e9a81a90b234 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.25.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.26.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version @@ -15,7 +15,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-+Mk3rDdtjhETmdaOOSXEFdLTJ0nX9G3qUxctsu5vrSc="; + hash = "sha256-qvn5VqEPLkehFWamtPGRuDLJ06bd5bn1qZRp05jP2AY="; }; # tarball contains multiple files/directories From 8b6b18c5a03ddae3ab61edeab064eea2cdf8c844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 16:35:23 +0000 Subject: [PATCH 30/57] python311Packages.langchain: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/langchain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index d39942c769ac..18936f7a9ca5 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -61,7 +61,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-izaSah1S0INsskdzE9b7Iw4yWBsNmN5fBI6BQgaHgE4="; + hash = "sha256-cQz4u6FeVZLNbix4pyc6ulfj+nb/tARMJniusy7Q46A="; }; sourceRoot = "${src.name}/libs/langchain"; From 23af0776c53934d2a149aa61a900d473e8565a67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jan 2024 16:47:21 +0000 Subject: [PATCH 31/57] python311Packages.clarifai-grpc: 10.0.3 -> 10.0.4 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index dc0ad33f60ee..511605a8ad99 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.0.3"; + version = "10.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-mIiUwqagFlZXkm/diQlCXMBDAbnWNG4BNMHVedo5u/M="; + hash = "sha256-jhM+UfyaliVmUH6e3ArZvZokB8lDKS/fx8376cZwlQM="; }; nativeBuildInputs = [ From ebc874c2faa78669cc1d849414fab4a50efe597f Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 17 Jan 2024 10:13:10 -0800 Subject: [PATCH 32/57] python311Packages.openai: 1.7.1 -> 1.9.0 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.7.1...v1.9.0 Changelog: https://github.com/openai/openai-python/releases/tag/v1.9.0 --- .../python-modules/openai/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index f2b0ea86006f..f0f279701103 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pythonRelaxDepsHook , hatchling # propagated , httpx @@ -11,6 +10,7 @@ , anyio , distro , sniffio +, cached-property , tqdm # optional , numpy @@ -26,38 +26,32 @@ buildPythonPackage rec { pname = "openai"; - version = "1.7.1"; + version = "1.9.0"; pyproject = true; - disabled = pythonOlder "3.7.1"; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-NXZ+7gDA3gMGSrmgceHxcR45LrXdazXbYuhcoUsNXew="; + hash = "sha256-+3tCttKWbWt3Nsf5E6NWYt0yLRV0kfj7Qz6PhaOmBsY="; }; nativeBuildInputs = [ hatchling - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - # https://github.com/openai/openai-python/issues/921 - "anyio" ]; propagatedBuildInputs = [ httpx pydantic + typing-extensions anyio distro sniffio tqdm ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions + cached-property ]; passthru.optional-dependencies = { @@ -80,15 +74,13 @@ buildPythonPackage rec { dirty-equals ]; - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" + disabledTests = [ + # makes network requests + "test_streaming_response" ]; - OPENAI_API_KEY = "sk-foo"; - disabledTestPaths = [ # makes network requests - "tests/test_client.py" "tests/api_resources" ]; From 9ac4f145cce83593efe26525772f2bd30d9f123b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 23 Jan 2024 00:49:30 +0100 Subject: [PATCH 33/57] python310Packages.google-cloud-resource-manager: update homepage and changelog --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index b1841c53259b..b5316b3ff2f4 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Resource Manager API client library"; - homepage = "https://github.com/googleapis/python-resource-manager"; - changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 8a9b4203e4107f6f63ababc2345eeb51cd2d3418 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 23 Jan 2024 00:50:59 +0100 Subject: [PATCH 34/57] python310Packages.google-cloud-resource-manager: drop support for python 3.6 --- .../python-modules/google-cloud-resource-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index b5316b3ff2f4..bc969f601b61 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "1.11.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 4cb8e95da6fa8b13973fad3e843e8c5641ba5e9d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 23 Jan 2024 00:52:55 +0100 Subject: [PATCH 35/57] python310Packages.google-cloud-secret-manager: update homepage and changelog --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index ca52ac48d875..06dc4c7272e3 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -42,8 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Secret Manager API API client library"; - homepage = "https://github.com/googleapis/python-secret-manager"; - changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-secret-manager"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-secret-manager-v${version}/packages/google-cloud-secret-manager/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ siriobalmelli ]; }; From 6f10ebbc017d80d3946d14964f0533eb5483f096 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 02:21:10 +0000 Subject: [PATCH 36/57] minio: 2023-12-23T07-19-11Z -> 2024-01-18T22-51-28Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 53fe4a2fc4c2..ce71d96a3924 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-12-23T07-19-11Z"; + version = "2024-01-18T22-51-28Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-1tgJraaF40GSBAnczzf0tdJMH8AXORmhpnEpVxe5yjc="; + sha256 = "sha256-O0MvwX8fD6QKaFTSfat9eVV+gY9ZaWIvxOpevwZaODw="; }; - vendorHash = "sha256-TGdMKzpMRAEE1TpEU6IJKu3A6A1uC2BtifDxCfH9Fd0="; + vendorHash = "sha256-zB5yaWY0MhksqhrJfmfkpwlZio0p291t9ETESgADBjg="; doCheck = false; From da72e00f5750e55e42f0d53e18e831ddd50c5f02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 03:29:46 +0000 Subject: [PATCH 37/57] php81Extensions.blackfire: 1.92.6 -> 1.92.8 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 15c634357217..ca4bf4106dc1 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.6"; + version = "1.92.8"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-ygBgs6tGZyim69tCol+tTXV5Lt/JLuatmKAo9aomM1s="; - "8.2" = "sha256-TrT7H2Tbu4ZrfeCUjpqlTMw9DAxS62aLvzTbpAdsZOc="; - "8.3" = "sha256-AH/kYlpVjCwXxNa90Qe5XpzAdSyNn9jdeyYTLlXxfLI="; + "8.1" = "sha256-zN39X2hd++Z5cj9JN3Athiq9j12i7/Q5QCnohw8PVDk="; + "8.2" = "sha256-ZgzegspY+aXQDLfRvDBDm+FtY4VzM/OWJG0ZSr4OAag="; + "8.3" = "sha256-o0ARDtcn5m6z+Ll+QT1JOR1jH2wJNNz1URV9BePViTU="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-c1i6eq7l4LeUpuZCsYzS1N++IU4j0WydCxPokSJf6dI="; - "8.2" = "sha256-gWhyUQ3QP13klusSv7KWdHatnjy/4k17VvHJUCtqF1g="; - "8.3" = "sha256-kI3sVcI/bDVRMcjzPzlai1D2HvmBTXwQ3DF5zcp2GJk="; + "8.1" = "sha256-8Qr1H9lgf8FxBLPTbxueSqi1S5y3HC3kzRQupfQkTew="; + "8.2" = "sha256-exrpoA74Ikr3YWcUIB8ZTCkKnJ7YeK4yZ6oDfpcQ3Sg="; + "8.3" = "sha256-7JirGgtQj8+mtyhEJOiM480bQ+98tv59r4LbMX6/X9Q="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-1QPKTNOsJTrx+Q0MigiMBDCC7X3YlSDB33gy8DU9KBg="; - "8.2" = "sha256-e3YUAOLWSmsiHczb44oRiOIafMSBWQaJY+m4OSUMzV8="; - "8.3" = "sha256-h0/ZEy6IkIpAfeL0Al7a+FpPeX2KMSd7zD1i1ew5rUk="; + "8.1" = "sha256-ubNi2WxOuZ10OZhVzroIjfpBxg1gC1s9Nddj+U4fx5M="; + "8.2" = "sha256-iUTCgJxmMtuNiT6+TqCqgKIVXF0THQgycxLiDUYdaeo="; + "8.3" = "sha256-EwVe/hlengd+87w9xpA+pWGu8iXQh5Ldr4tZVgGps2M="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-gLCPTTCfoBgp3GgKzVisfGlxQsYa+4x2WDwvhwcf1R8="; - "8.2" = "sha256-OtWUwkeLGfxkxjGSDMyv61UVoSwFo1puGjmwYOB51nI="; - "8.3" = "sha256-M3lz0TnTuJVgD32RS3ffcZsKVJdyx75AjSKFkkODiSE="; + "8.1" = "sha256-bSPOUxQpTIsC2pZ95kLvrWJVVUb1bf51ety26miyxy8="; + "8.2" = "sha256-lncGFHCENSoVMGvKgsE5yBhThsfZ2xdIVDoVgECDV+w="; + "8.3" = "sha256-6hVAlaN48OLrGEsoqBo+JdNV+NxWpmLwAdv9ymaWkHY="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-dVau4kieQsj4m97Sepw1jMRtf1VCUnvZEJjVsO+hFWs="; - "8.2" = "sha256-HRBVr4JTiZDRzIt6JfITD5N824Ivcag6DUyEhsc23co="; - "8.3" = "sha256-nRRG42/Yhsupln4j7nWlKvfQ067fwQ17un1yXplPf14="; + "8.1" = "sha256-aRLxX2FULffZHUNYyrpypLN+XINC+NTaRMIulh61M1o="; + "8.2" = "sha256-Ma9EgcoM4x3iK8ygcEte/Wtip+/Z4Prs2CvITxGoaLM="; + "8.3" = "sha256-6vPcc5ogaQs7Z/o4jMR0VX2r5Mq1vpxdf0hvMrQGxZE="; }; }; }; From 27ec1c9b87f5906fcf94c1e7b2c50ca6c0fc8de5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 03:31:30 +0000 Subject: [PATCH 38/57] graalvm-ce: 21.0.1 -> 21.0.2 --- .../community-edition/graalvm-ce/hashes.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index e9454dca7250..45028f3d544b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "21.0.1"; + "version" = "21.0.2"; "hashes" = { "aarch64-linux" = { - sha256 = "0vb1bdbn4lqig4jihynacbyrj551m1pcmj6qh86kdwx0kn9400yy"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-aarch64_bin.tar.gz"; + sha256 = "0yndazvc4kyr9widfn8ql5vd57m4m5inqz2wcpsarw38rs8ycjx3"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "1gvkxqmbsh7pklh9bkhndh08nnjcmgq0xpzc96dgacqnlr4fx0sj"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz"; + sha256 = "0j5ffszcaqv3fq159hyb611jm8w1q4n1cywmbd7vi69smad0cj5h"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "0sks663ldc0m3rhc882mzn44kipzbjw7325dhkpwy874p47j9zns"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-x64_bin.tar.gz"; + sha256 = "1qfrn1068idnkzd6mdpw1x17sqrj59rz9avphj8225sxlhzsk2ks"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0i7zzq1czgc4lk1z278zp4cml4kdryafhrma5rqaja75933jpi2h"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-aarch64_bin.tar.gz"; + sha256 = "1dssa3nhix7bqygdkkfp0b9myjg5f91dlgm8mf6r7qf7mj9klpji"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-aarch64_bin.tar.gz"; }; }; } From 62b620412c18921bdbd038c8ffef7f7732fa8f1b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 22 Jan 2024 20:18:56 -0800 Subject: [PATCH 39/57] .github/CODEOWNERS: drop amjoseph-nixpkgs I enjoyed doing major overhaul work on these parts of the codebase, but I can't continue maintaining them. --- .github/CODEOWNERS | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index cdc3581238bc..3ef3d178fe5d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -20,7 +20,7 @@ # Libraries /lib @infinisil -/lib/systems @alyssais @ericson2314 @amjoseph-nixpkgs +/lib/systems @alyssais @ericson2314 /lib/generators.nix @infinisil @Profpatsch /lib/cli.nix @infinisil @Profpatsch /lib/debug.nix @infinisil @Profpatsch @@ -41,10 +41,10 @@ /pkgs/top-level/stage.nix @Ericson2314 /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 -/pkgs/stdenv/generic @Ericson2314 @amjoseph-nixpkgs +/pkgs/stdenv/generic @Ericson2314 /pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde -/pkgs/stdenv/cross @Ericson2314 @amjoseph-nixpkgs -/pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs +/pkgs/stdenv/cross @Ericson2314 +/pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus @@ -157,7 +157,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius /doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda # C compilers -/pkgs/development/compilers/gcc @amjoseph-nixpkgs +/pkgs/development/compilers/gcc /pkgs/development/compilers/llvm @RaitoBezarius /pkgs/development/compilers/emscripten @raitobezarius /doc/languages-frameworks/emscripten.section.md @raitobezarius @@ -340,9 +340,6 @@ nixos/tests/zfs.nix @raitobezarius /pkgs/development/compilers/zig @figsoda /doc/hooks/zig.section.md @figsoda -# Linux Kernel -pkgs/os-specific/linux/kernel/manual-config.nix @amjoseph-nixpkgs - # Buildbot nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq nixos/tests/buildbot.nix @Mic92 @zowoq From 4b0c410a7e8be4ebebf754d12491c27289238b01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 06:34:15 +0000 Subject: [PATCH 40/57] qpwgraph: 0.6.1 -> 0.6.2 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index bab3d8c9b4ee..de419c8fa48c 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-oB8/q0igSZoaDzKzgmGAECU0qJwO67t9qWw+fB2vfxg="; + sha256 = "sha256-GlXUQz7tj7dfxVikvu0idzhQaq7raFC9jxJ2zFeHBQU="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From d7168269c8b5db2b4f0f0477bfb32b5ac3e4f05a Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Tue, 23 Jan 2024 07:39:53 +0100 Subject: [PATCH 41/57] iotop: add meta.mainProgram --- pkgs/os-specific/linux/iotop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 0376ff1a55ec..41647a2378e4 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { description = "A tool to find out the processes doing the most IO"; homepage = "http://guichaz.free.fr/iotop"; license = licenses.gpl2; + mainProgram = "iotop"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; From 01d79facea7d4ac9061c20092112237e589dd901 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 07:15:41 +0000 Subject: [PATCH 42/57] sccache: 0.7.5 -> 0.7.6 --- pkgs/development/tools/misc/sccache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index cd258f003cb7..5d19c21ee221 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.7.5"; + version = "0.7.6"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-rql5Nj/w7cNaO6UKK96vYYE2E19RIiCHYHTnbW+U4n8="; + sha256 = "sha256-dIUwooXphjXpFMZXpwQMSvXRvVt/y6J5X7oCrBBSvBM="; }; - cargoHash = "sha256-VdI39DgQrUZhoawMqBC6ngTvldW+QbDjMjxjjbH9G1A="; + cargoHash = "sha256-GDODIAyTIZUHw2tUEQfNnnPH2S9pFHIjYEZLpM5E52A="; nativeBuildInputs = [ pkg-config From b557c429cae0160fb1c60a56e3cd08f01e03d2cb Mon Sep 17 00:00:00 2001 From: Thomas BESSOU Date: Sun, 21 Jan 2024 20:46:33 +0100 Subject: [PATCH 43/57] streamlink-twitch-gui-bin: add meta.mainProgram So that `nix run` works --- pkgs/applications/video/streamlink-twitch-gui/bin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 89a441159de0..ac74ed748f41 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; + mainProgram = "streamlink-twitch-gui"; maintainers = with maintainers; [ rileyinman ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; From a0b6f17c095b3d490ef62b27f9a08a21925ab52e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 05:37:14 +0000 Subject: [PATCH 44/57] rabbitmq-server: 3.12.11 -> 3.12.12 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 9466351a3a83..eaf32020ef48 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.11"; + version = "3.12.12"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-WGlSYRUrKhtku9+MXjNu1Gm+Ddox2iQ8rwZKUh1QPsM="; + hash = "sha256-lR/qwEoEH8v6oTTz6oAMlk2Tl2QSCEWV9rnU+gXX2KY="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; From eb4d2a35c2711f0171691abc6898fd880c19cd3c Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Tue, 23 Jan 2024 10:43:38 +0100 Subject: [PATCH 45/57] ddnet: 17.4.2 -> 18.0.1 https://github.com/ddnet/ddnet/compare/17.4.2...18.0.1 https://ddnet.org/downloads/#18.0 --- pkgs/games/ddnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index d94b7ae62b85..796074a0d50c 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -35,19 +35,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.4.2"; + version = "18.0.1"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-cu6EmCaT8nMCcXUwvZdWog/4bvHQo9+DZHDHRvun2E4="; + hash = "sha256-CgmFljI9/S544Hm9J4CEqvNgepPM02JgJZJ5HX1d3wU="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-O4ORWuTlmEMsTpMEhnauNfXOKWfg8hB32rZKRe8Nmp4="; + hash = "sha256-oGZOgSPMnrzwEyUvXqdfquCWCFslPfD9C0vT8mILI+s="; }; nativeBuildInputs = [ From 8aa8e1766ee0f039dd49e094cf84a0a670289bcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 08:26:52 +0000 Subject: [PATCH 46/57] cargo-deb: 2.0.0 -> 2.0.4 --- pkgs/development/tools/rust/cargo-deb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 257819f4ad3b..e493cca002c7 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.0.0"; + version = "2.0.4"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-DgKGnIA2ovBLja+r+nYZ97UPaWO7a7RXeXa10guZBTc="; + hash = "sha256-vIWgkaAprbsdfPUZvyfxJm7wZxExKcV9jkz/A/G6tAo="; }; - cargoHash = "sha256-Sv9i8f0ywMNvjA2yvCX+2ZhFuNCovEGiaMxkg/IV36g="; + cargoHash = "sha256-EMbqIpFWbUvZaszsYSJaOEl+vm3mrmub7mdfeJPEX7Y="; nativeBuildInputs = [ makeWrapper From 0dce022fbf9073508714e91b28fce1762d7ba9da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 07:11:26 +0000 Subject: [PATCH 47/57] cargo-license: 0.5.1 -> 0.6.0 --- pkgs/development/tools/rust/cargo-license/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix index 085286a7eb0b..c6bb649866b8 100644 --- a/pkgs/development/tools/rust/cargo-license/default.nix +++ b/pkgs/development/tools/rust/cargo-license/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-license"; - version = "0.5.1"; + version = "0.6.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-M/QGM8jPLrDIoF1TVYDoVcHni1qaRCyZwHlYgia24Ro="; + sha256 = "sha256-hBlyRk23gRfKdYuVnrFoDE883S32X9DFvTIsR2zfJck="; }; - cargoSha256 = "sha256-2m+ornrQQzijyF30uQ6xpEiid6r6I1wTa8nn6Q0wNKo="; + cargoHash = "sha256-4P2kR+Jxki62IdUKpMNL7hzBQWci2tKWrQXV5rkMXkw="; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; From 63d379b04bcc365dc7e9bcb8938871e2df86ce5f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 23 Jan 2024 10:23:34 +0000 Subject: [PATCH 48/57] weechat-unwrapped: 4.2.0 -> 4.2.1 Changes: https://weechat.org/files/releasenotes/ReleaseNotes-devel.html#v4.2.1 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 108c6848ed27..6eecadf97d32 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-Mvam8hP7Y025MeKrjwGtuam1Dnf6ocUsoRbvoyBXWko="; + hash = "sha256-JT3fCG9shFAxot0pSxVShR1rBMwIovnaSu37Pi+Rvc0="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 From b43bb235efeab5324c5e486882ef46749188eee2 Mon Sep 17 00:00:00 2001 From: embr Date: Tue, 12 Sep 2023 13:34:11 +0200 Subject: [PATCH 49/57] syncterm: Cherry-pick upstream fixes for `pthread_yield` errors This non-standard function has been deprecated since glibc 2.34 (August 2021), and calls to it were breaking the build. This has since been fixed in the upstream Synchronet tree, from which SyncTERM releases are cut, but this was last done in 2020. Big thanks to @aexoxea, who not only dug into this, but adapted the upstream patches to the SyncTERM tree and posted almost this exact diff in #174749 - where it completely slipped my mind until now, sorry! Fixes #174749 --- .../0001-use-sched-yield-53264f2b.patch | 38 +++++++++++++++++++ .../terminal-emulators/syncterm/default.nix | 18 +++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch diff --git a/pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch b/pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch new file mode 100644 index 000000000000..d4e6eb130cad --- /dev/null +++ b/pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch @@ -0,0 +1,38 @@ +diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile +index fdf54565834a6a418f7267f4f8bf2269b80eab41..804dd76feb1a2d3b0278686f5326f7c2302e5fde 100644 +--- a/3rdp/build/GNUmakefile ++++ b/3rdp/build/GNUmakefile +@@ -67,7 +67,7 @@ + $(CRYPT_IDIR): | $(3RDPODIR) + $(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR) + +-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch | $(CRYPT_SRC) $(CRYPT_IDIR) ++$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch $(3RDP_ROOT)/build/cl-linux-yield.patch | $(CRYPT_SRC) $(CRYPT_IDIR) + @echo Creating $@ ... + $(QUIET)-rm -rf $(CRYPT_SRC)/* + $(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC) +@@ -112,6 +112,7 @@ + $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch + $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch + $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch ++ $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-linux-yield.patch + ifeq ($(CC),mingw32-gcc) + $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories + $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts +diff --git a/3rdp/build/cl-linux-yield.patch b/3rdp/build/cl-linux-yield.patch +new file mode 100644 +index 0000000000000000000000000000000000000000..8cdfc8eafd3fd85f39bf0f8b519f25a31078fee4 +--- /dev/null ++++ b/3rdp/build/cl-linux-yield.patch +@@ -0,0 +1,11 @@ ++--- old/thread.h 2021-10-19 12:34:08.766649958 -0700 +++++ kernel/thread.h 2021-10-19 12:34:43.794072316 -0700 ++@@ -3005,7 +3005,7 @@ ++ #endif /* Slowaris 5.7 / 7.x or newer */ ++ #elif defined( _AIX ) || defined( __Android__ ) || defined( __CYGWIN__ ) || \ ++ ( defined( __hpux ) && ( OSVERSION >= 11 ) ) || \ ++- defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ ) +++ defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ ) || defined(__linux__) ++ #define THREAD_YIELD() sched_yield() ++ #elif defined( __XMK__ ) ++ /* The XMK underlying scheduling object is the process context, for which diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix index 59e0b3a735e0..05e521b24a32 100644 --- a/pkgs/applications/terminal-emulators/syncterm/default.nix +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }: stdenv.mkDerivation rec { pname = "syncterm"; @@ -8,7 +8,18 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/${pname}-${version}-src.tgz"; sha256 = "19m76bisipp1h3bc8mbq83b851rx3lbysxb0azpbr5nbqr2f8xyi"; }; - sourceRoot = "${pname}-${version}/src/syncterm"; + + patches = [ + # Cherry-picks from the upstream Synchronet tree, removing calls to `pthread_yield`. + # See upstream issue: https://gitlab.synchro.net/main/sbbs/-/issues/299 + (fetchpatch { + url = "https://gitlab.synchro.net/main/sbbs/-/commit/851627df99f48d8eaad33d3a98ef309b4371f359.patch"; + hash = "sha256-DbFAeJnrwFyfEpZgZFN8etqX6vQ3ca2TJwaqp0aHeo4="; + }) + ./0001-use-sched-yield-53264f2b.patch + ]; + # We can't use sourceRoot, as the cherry-picked patches apply to files outside of it. + postPatch = ''cd src/syncterm''; CFLAGS = [ "-DHAS_INTTYPES_H" @@ -32,8 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' - # broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - broken = true; # sendmsg.c:(.text+0x1099): undefined reference to `pthread_yield' + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://syncterm.bbsdev.net/"; description = "BBS terminal emulator"; maintainers = with maintainers; [ embr ]; From ce95061d7d35115b96e4bc50ae4db46500c840ea Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 10 Jan 2024 00:13:53 +0100 Subject: [PATCH 50/57] prusa-slicer: openvdb overrideAttrs -> override --- pkgs/applications/misc/prusa-slicer/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index dc5b2c68c632..ab13a68d60e5 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,8 +1,5 @@ { stdenv , lib -, openexr -, jemalloc -, c-blosc , binutils , fetchFromGitHub , cmake @@ -63,9 +60,7 @@ let hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; }; }); - openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { - buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ]; - }); + openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_8; }; wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; in stdenv.mkDerivation (finalAttrs: { From d1145ea84f737322654638e0cfcca5284ee9fdff Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 6 Jan 2024 01:41:52 +0100 Subject: [PATCH 51/57] openvdb: remove openexr and ilmbase dependencies Neither openexr nor ilmbase dependencies were actually being picked up (checked with nix why-depends). Instead, openvdb defaults to building its own vendored Half library since 8.1.0: https://github.com/AcademySoftwareFoundation/openvdb/commit/5c9f0f9685805d883c187d9f04a8e8cff00e90e2 Also, starting from 11.0.0, OpenEXR 2 will no longer be supported. Someone else can look into fixing this properly to use system libraries. --- pkgs/development/libraries/openvdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 214149edad94..d822c691417d 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, jemalloc, c-blosc, tbb, zlib }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec nativeBuildInputs = [ cmake ]; - buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; + buildInputs = [ boost tbb jemalloc c-blosc zlib ]; cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ]; From b597c38884d483995710c61164ae42a42bda55c1 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 10 Jan 2024 00:32:18 +0100 Subject: [PATCH 52/57] openimageio: build with openexr 3 ilmbase is replaced by Imath (propagated from openexr_3) See the following upstream change from 2020 on OpenEXR 3.x support: https://github.com/AcademySoftwareFoundation/OpenImageIO/commit/6313484e35765df1adf8f40c217cebc4c9d9d954#diff-40f1f520160b8fecd67891ee24b54add91856f733ece4bae0c3896adb00452af --- pkgs/development/libraries/openimageio/default.nix | 2 -- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index f2e98e0d34b6..7d2e78794d8a 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -3,7 +3,6 @@ , boost , cmake , giflib -, ilmbase , libjpeg , libpng , libtiff @@ -41,7 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost giflib - ilmbase libjpeg libpng libtiff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26e1b14c9684..1831316eb724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34385,7 +34385,9 @@ with pkgs; openfx = callPackage ../development/libraries/openfx { }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { }; + openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { + openexr = openexr_3; + }; openjump = callPackage ../applications/misc/openjump { }; From f164a1277206aeb31b6c6b870c798071d57bc38f Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 6 Jan 2024 02:03:07 +0100 Subject: [PATCH 53/57] alembic: build with openexr 3 --- pkgs/development/libraries/alembic/default.nix | 10 ++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index afd0ad458bf7..6f73c47f49d1 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe, ilmbase }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -20,13 +20,7 @@ stdenv.mkDerivation rec nativeBuildInputs = [ cmake ]; - # NOTE: Alembic also support imath instead of ilmbase, but some users of Alembic (e.g. Blender) - # are incompatible with the imath version of Alembic - buildInputs = [ openexr hdf5-threadsafe ilmbase ]; - - # Downstream packages trying to use Alembic via CMake need ilmbase as well - # For some reason this won't be picked up correctly otherwise - propagatedBuildInputs = [ ilmbase ]; + buildInputs = [ openexr hdf5-threadsafe ]; # These flags along with the postPatch step ensure that all artifacts end up # in the correct output without needing to move anything diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1831316eb724..f7857b0f587b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30350,7 +30350,9 @@ with pkgs; akira-unstable = callPackage ../applications/graphics/akira { }; - alembic = callPackage ../development/libraries/alembic { }; + alembic = callPackage ../development/libraries/alembic { + openexr = openexr_3; + }; alfaview = callPackage ../applications/networking/instant-messengers/alfaview { }; From 46f1dbf40d5ea3e840a9c03c13cc0cde1e78125c Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 6 Jan 2024 02:01:19 +0100 Subject: [PATCH 54/57] blender: build with openexr 3 --- pkgs/applications/misc/blender/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e803c7eae840..996e982bdc59 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew -, ilmbase, libepoxy, libXi, libX11, libXext, libXrender +, libepoxy, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals waylandSupport [ pkg-config ]; buildInputs = - [ boost ffmpeg gettext glew ilmbase + [ boost ffmpeg gettext glew freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc alembic @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: rec { "-DOPTIX_ROOT_DIR=${optix}" ]; - env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7857b0f587b..5105333e58f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30659,6 +30659,7 @@ with pkgs; blender = callPackage ../applications/misc/blender { # LLVM 11 crashes when compiling GHOST_SystemCocoa.mm stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv; + openexr = openexr_3; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; From 720fc988c6f4b29fb35186b34af18925769973e9 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 10 Jan 2024 03:01:02 +0100 Subject: [PATCH 55/57] osl: build with openexr 3 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5105333e58f0..0465b1f328d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11750,6 +11750,7 @@ with pkgs; then (overrideLibcxx llvmPackages_15.stdenv).cc else clang_15; llvm = llvm_15; + openexr = openexr_3; }; osqp = callPackage ../development/libraries/science/math/osqp { }; From 192e7f9887ff18c592b1b5eb8faf1b5991ecbff0 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 10 Jan 2024 03:07:01 +0100 Subject: [PATCH 56/57] python3.pkgs.openusd: build with openexr 3 --- pkgs/development/python-modules/openusd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 70ae6eb5e08b..f97a9f425ecd 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -23,7 +23,7 @@ , ptex , embree , alembic -, openexr +, imath , flex , bison , qt6 @@ -94,7 +94,7 @@ buildPythonPackage rec { ptex embree alembic.dev - openexr + imath flex bison boost From 3022ccf1883a14bf0b50d8c04c986b7ee7f142ab Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 23 Jan 2024 12:48:21 +0100 Subject: [PATCH 57/57] bankstown-lv2: init at 1.1.0 (#281307) --- pkgs/by-name/ba/bankstown-lv2/package.nix | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/ba/bankstown-lv2/package.nix diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix new file mode 100644 index 000000000000..2ee7b4486e01 --- /dev/null +++ b/pkgs/by-name/ba/bankstown-lv2/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "bankstown-lv2"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "chadmed"; + repo = "bankstown"; + rev = version; + hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg="; + }; + + cargoSha256 = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc="; + + installPhase = '' + export LIBDIR=$out/lib + mkdir -p $LIBDIR + + make + make install + ''; + + meta = with lib; { + homepage = "https://github.com/chadmed/bankstown"; + description = "Halfway-decent three-stage psychoacoustic bass approximation"; + license = licenses.mit; + maintainers = with maintainers; [ yuka ]; + platforms = platforms.linux; + }; +}