From 6f5ce31ff8f7d98aab228841a6a7ce5160c0567e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Dec 2022 19:28:41 +0000 Subject: [PATCH 01/19] clojure-lsp: 2022.11.03-00.14.57 -> 2022.12.09-15.51.10 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 5d6d4c1583c4834..c77cf7833dd7b0d 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.11.03-00.14.57"; + version = "2022.12.09-15.51.10"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-NtvW0KT6d0k2oN//7xaTnBIoLKkc7zQFj3VdoFdgBWI="; + sha256 = "sha256-hWDTxYtL0c9zkJDle9/XNPMwDDCltfAnz/Os83xL3iM="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "49e0a848dc32216a60f48eca68ff476cb69b999f6a79fb7310bf9fb2ffcaf4b6"; + sha256 = "df8e000a69fc2aaa85312952f27a9b79625928d825acfe1da69cb67d220ada33"; }; extraNativeImageBuildArgs = [ From 5ad20ca731e21b35428dc6fb7c78f4aa64838d6a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 6 Jan 2023 15:00:55 +0100 Subject: [PATCH 02/19] nextpnr: 0.4 -> 0.5 https://github.com/YosysHQ/nextpnr/releases/tag/nextpnr-0.5 --- pkgs/development/compilers/nextpnr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index bbecfff831f92a0..260c3fb9a4c1b5c 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "0.4"; + version = "0.5"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; rev = "${pname}-${version}"; - hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY="; + hash = "sha256-3/a6nVr2v9kK/FFmxZq9LQLAoE/yNRcTGojiFPGRkHU="; name = "nextpnr"; }) (fetchFromGitHub { From 317f537c961d00cece1d351404187f0a17195ef7 Mon Sep 17 00:00:00 2001 From: Dave Aitken Date: Fri, 13 Jan 2023 10:51:35 +0000 Subject: [PATCH 03/19] tcpflow: broaden platforms --- pkgs/tools/networking/tcpflow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index cc923c0daf65fe7..bf483959331c5db 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3; maintainers = with maintainers; [ raskin obadz ]; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "aarch64-darwin" ]; }; } From de8a327954d866959503a0a79f592051baa911f4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 14 Jan 2023 18:18:26 +0000 Subject: [PATCH 04/19] wireshark: 4.0.1 -> 4.0.2 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 08f9bc0b8af2b73..fbb8842393f5245 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -11,7 +11,7 @@ assert withQt -> qt5 != null; with lib; let - version = "4.0.1"; + version = "4.0.2"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-s7AC+Z0Tu/R/ntO+frNyywwkVL0PrqKadWgZzgGf/cI="; + sha256 = "sha256-81kVaZ8vmyjdshEgLUDsiYTlg008kRSDFEpJhLpEQR0="; }; cmakeFlags = [ From d0852f2fdfcbfbc628ccbddbe85e4f08ed8c3d80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 20:34:50 +0000 Subject: [PATCH 05/19] cp2k: 2022.2 -> 2023.1 --- pkgs/applications/science/chemistry/cp2k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 01fbfb1ccf9c0c6..81849f675af3183 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "2022.2"; + version = "2023.1"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - hash = "sha256-zDIsgPcLnA0ATJEN1vQClpkToqvIyW7KuXhyGiXJXDw="; + hash = "sha256-SG5Gz0cDiSfbSZ8m4K+eARMLU4iMk/xK3esN5yt05RE="; fetchSubmodules = true; }; From de3e6bd4e9659d573c9d186c4c0d57e8aff19d8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 08:20:56 +0000 Subject: [PATCH 06/19] linux-router-without-wifi: 0.6.6 -> 0.6.7 --- pkgs/tools/networking/linux-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/linux-router/default.nix b/pkgs/tools/networking/linux-router/default.nix index 1f274d640dc779c..30348a11a91a993 100644 --- a/pkgs/tools/networking/linux-router/default.nix +++ b/pkgs/tools/networking/linux-router/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "linux-router"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "garywill"; repo = "linux-router"; rev = "${version}"; - sha256 = "sha256-QBxlqKNaCUMVkm8rVTZ5z6tTN9WxgDQxeNkbgCe9KEg="; + sha256 = "sha256-Ote/arHCU6qiTXdK2RXv9848aeW6rcBsrb6nfxIzQLs="; }; nativeBuildInputs = [ makeWrapper ]; From 1c9d9ef3a8e7d66c63fe921e1d68fda5ca8b73a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Jan 2023 09:52:57 +0100 Subject: [PATCH 07/19] linux-router-without-wifi: add changelog to meta --- .../tools/networking/linux-router/default.nix | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/linux-router/default.nix b/pkgs/tools/networking/linux-router/default.nix index 30348a11a91a993..acf02a2cc211ee9 100644 --- a/pkgs/tools/networking/linux-router/default.nix +++ b/pkgs/tools/networking/linux-router/default.nix @@ -1,8 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper # --- Runtime Dependencies --- -, bash, procps, iproute2, dnsmasq, iptables -, coreutils, flock, gawk, getopt, gnugrep, gnused, which +, bash +, procps +, iproute2 +, dnsmasq +, iptables +, coreutils +, flock +, gawk +, getopt +, gnugrep +, gnused +, which # `nmcli` is not required for create_ap. # Use NetworkManager by default because it is very likely already present , useNetworkManager ? true @@ -10,7 +23,8 @@ # --- WiFi Hotspot Dependencies --- , useWifiDependencies ? true -, hostapd, iw +, hostapd +, iw # You only need this if 'iw' can not recognize your adapter. , useWirelessTools ? true , wirelesstools # for iwconfig @@ -31,11 +45,13 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "garywill"; repo = "linux-router"; - rev = "${version}"; - sha256 = "sha256-Ote/arHCU6qiTXdK2RXv9848aeW6rcBsrb6nfxIzQLs="; + rev = "refs/tags/${version}"; + hash = "sha256-Ote/arHCU6qiTXdK2RXv9848aeW6rcBsrb6nfxIzQLs="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; dontBuild = true; @@ -74,7 +90,8 @@ stdenv.mkDerivation rec { - DNS proxy - Compatible with NetworkManager (automatically set interface as unmanaged) ''; - license = licenses.lgpl21; + changelog = "https://github.com/garywill/linux-router/releases/tag/${version}"; + license = licenses.lgpl21Only; maintainers = with maintainers; [ x3ro ]; platforms = platforms.linux; }; From 393e23cef04488dee788bd0999d1325565f27bdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 16:57:36 +0000 Subject: [PATCH 08/19] python310Packages.google-cloud-securitycenter: 1.17.0 -> 1.18.0 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 504c86e49926d64..737cd8a37adb6a2 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.17.0"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-wkq0/LEgEQokKzREpOkprKZUK/paP8CgS51anLTy5Dk="; + hash = "sha256-gtzSB70x7oN6EiTP1U5P1dV4a4eWZNGtRFInYz7AyCA="; }; propagatedBuildInputs = [ From 23d63549dfbda8def7c0609a6c6bc5c74560a60f Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sat, 1 Oct 2022 11:50:41 +0200 Subject: [PATCH 09/19] chia-dev-tools: init at 1.1.4 --- .../blockchains/chia-dev-tools/default.nix | 63 +++++++++++++++++++ .../chia-dev-tools/fix-paths.patch | 13 ++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 78 insertions(+) create mode 100644 pkgs/applications/blockchains/chia-dev-tools/default.nix create mode 100644 pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix new file mode 100644 index 000000000000000..1b40e6ddb041fad --- /dev/null +++ b/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, substituteAll +, python3Packages +, chia +, +}: +python3Packages.buildPythonApplication rec { + pname = "chia-dev-tools"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lE7FTSDqVS6AstcxZSMdQwgygMvcvh1fqYVTTSSNZpA="; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit chia; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + ''; + + nativeBuildInputs = [ + python3Packages.setuptools-scm + ]; + + # give a hint to setuptools-scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + + propagatedBuildInputs = with python3Packages; [ + (toPythonModule chia) + pytimeparse + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + pytest-asyncio + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + postCheck = "unset HOME"; + + disabledTests = [ + "test_spendbundles" + ]; + + meta = with lib; { + homepage = "https://www.chia.net/"; + description = "Utility for developing in the Chia ecosystem: Chialisp functions, object inspection, RPC client and more"; + license = with licenses; [ asl20 ]; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch b/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch new file mode 100644 index 000000000000000..9fb8fefe197afc6 --- /dev/null +++ b/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/cdv/cmds/sim_utils.py b/cdv/cmds/sim_utils.py +index e59ba8f..20912ff 100644 +--- a/cdv/cmds/sim_utils.py ++++ b/cdv/cmds/sim_utils.py +@@ -67,7 +67,7 @@ async def start_async(root_path: Path, group: Any, restart: bool) -> None: + + from chia.cmds.start_funcs import async_start + +- sys.argv[0] = str(Path(sys.executable).parent / "chia") # this gives the correct path to the chia executable ++ sys.argv[0] = "@chia@/bin/chia" # this gives the correct path to the chia executable + if root_path.exists(): + config = load_config(root_path, "config.yaml") + await async_start(root_path, config, group, restart) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38d9f438a963b0f..0f7042741cedec2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34017,6 +34017,8 @@ with pkgs; chia = callPackage ../applications/blockchains/chia { }; + chia-dev-tools = callPackage ../applications/blockchains/chia-dev-tools { }; + chia-plotter = callPackage ../applications/blockchains/chia-plotter { }; clboss = callPackage ../applications/blockchains/clboss { }; From f59b2fbc630f6c3c930ab3b963858c368b56bf08 Mon Sep 17 00:00:00 2001 From: Dave Aitken Date: Mon, 16 Jan 2023 09:44:55 +0000 Subject: [PATCH 10/19] tcpflow: broaden platforms to unix Co-authored-by: Mario Rodas --- pkgs/tools/networking/tcpflow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index bf483959331c5db..46fda22959438bf 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3; maintainers = with maintainers; [ raskin obadz ]; - platforms = platforms.linux ++ [ "aarch64-darwin" ]; + platforms = platforms.unix; }; } From 5e2eff698439e5f28961ca29683ba1a8de0af8be Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 16 Jan 2023 11:20:00 +0100 Subject: [PATCH 11/19] toybox: fix Libsystem inconsistency properly As @wegank pointed out, the problem was that buildPackages.stdenv.cc was in depsBuildBuild and that includes the regular stdenv's Libsystem. Only do that when cross-compiling. --- pkgs/tools/misc/toybox/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 212452001b8cdf8..800cdbad0972bed 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, which, - buildPackages, libxcrypt, libiconv, Libsystem, + buildPackages, libxcrypt, libiconv, enableStatic ? stdenv.hostPlatform.isStatic, enableMinimal ? false, extraConfig ? "" @@ -17,12 +17,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-T3qE9xlcEoZOcY52XfYPpN34zzQl6mfcRnyuldnIvCk="; }; - depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross + depsBuildBuild = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; # needed for cross buildInputs = [ libxcrypt - ] ++lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libiconv - Libsystem # This shouldn't be necessary, see https://github.com/NixOS/nixpkgs/issues/210923 ] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98a181e7d1e0497..8c14b1b1396eea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12452,9 +12452,7 @@ with pkgs; toxvpn = callPackage ../tools/networking/toxvpn { }; - toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { - inherit (darwin.apple_sdk_11_0) Libsystem; - }; + toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { }; trackma = callPackage ../tools/misc/trackma { }; From e583172fcb0ba144bad69ff47db18a5282c7cd86 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 15 Jan 2023 16:44:38 +0100 Subject: [PATCH 12/19] toybox: small refactor --- pkgs/tools/misc/toybox/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 800cdbad0972bed..508f0f4cee51979 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -6,6 +6,10 @@ extraConfig ? "" }: +let + inherit (lib) optionals; +in + stdenv.mkDerivation rec { pname = "toybox"; version = "0.8.8"; @@ -17,12 +21,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-T3qE9xlcEoZOcY52XfYPpN34zzQl6mfcRnyuldnIvCk="; }; - depsBuildBuild = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; # needed for cross + depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; buildInputs = [ libxcrypt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ libiconv - ] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [ + ] ++ optionals (enableStatic && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; @@ -51,7 +55,7 @@ stdenv.mkDerivation rec { make oldconfig ''; - makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static"; + makeFlags = [ "PREFIX=$(out)/bin" ] ++ optionals enableStatic [ "LDFLAGS=--static" ]; installTargets = [ "install_flat" ]; From 4dbc2fe873f24222304a620764bcc2e7bb56f3ff Mon Sep 17 00:00:00 2001 From: maifel-maifel <112440927+maifel-maifel@users.noreply.github.com> Date: Mon, 16 Jan 2023 13:12:12 +0100 Subject: [PATCH 13/19] nixos/syncthing: point out pitfalls with extraOptions (#210208) Co-authored-by: digital --- .../modules/services/networking/syncthing.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index adbb25ccb9b6da0..3d41fe4013ea94d 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -384,6 +384,29 @@ in { description = mdDoc '' Extra configuration options for Syncthing. See . + Note that this attribute set does not exactly match the documented + xml format. Instead, this is the format of the json rest api. There + are slight differences. For example, this xml: + ```xml + + default + 1 + + ``` + corresponds to the json: + ```json + { + options: { + listenAddresses = [ + "default" + ]; + minHomeDiskFree = { + unit = "%"; + value = 1; + }; + }; + } + ``` ''; example = { options.localAnnounceEnabled = false; From 1a44669ef43a42b5caf7ec07c64463e3e92cb919 Mon Sep 17 00:00:00 2001 From: Kou Yong Kang Date: Mon, 16 Jan 2023 22:20:37 +0800 Subject: [PATCH 14/19] zotero: 6.0.18 -> 6.0.20 (#210142) --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index c638a4b2713bce0..2dc24570b721035 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.18"; + version = "6.0.20"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0="; + sha256 = "sha256-HsAvodqio3GJ9TK1pt4WwlEZEAo52ocH0r7cf9IQe9w="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 22a8cf0c28d536294d55049923575ce94bb39359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 16 Jan 2023 15:50:30 +0100 Subject: [PATCH 15/19] nixos/lxc-container: fix compatibility with systemd-nspawn --- nixos/modules/virtualisation/lxc-container.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 416a2f905487201..96b749102241da0 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -150,6 +150,12 @@ in source = config.system.build.toplevel + "/init"; target = "/sbin/init"; } + # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn. + # Nixos will setup the same symlink after start. + { + source = config.system.build.toplevel + "/etc/os-release"; + target = "/etc/os-release"; + } ]; extraCommands = "mkdir -p proc sys dev"; From 2bb560b3672cea2fb9eef9f0d4c063cadcf9b368 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 12 Jan 2023 10:46:04 -0500 Subject: [PATCH 16/19] gmrender-resurrect: Add gmediarender service This creates a systemd unit that will start and supervise the gmediarender daemon. --- .../from_md/release-notes/rl-2305.section.xml | 7 ++ .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/gmediarender.nix | 116 ++++++++++++++++++ 4 files changed, 126 insertions(+) create mode 100644 nixos/modules/services/audio/gmediarender.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index c48907b87026afc..b4ff52767f63508 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -68,6 +68,13 @@ programs.fzf. + + + gmediarender, + a simple, headless UPnP/DLNA renderer. Available as + services.gmediarender. + + stevenblack-blocklist, diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 07f6d729b645e1b..803e9eb6e43469b 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -26,6 +26,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). +- [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). + - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0d98752e201c8ba..dce6e878540d575 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -295,6 +295,7 @@ ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix ./services/audio/botamusique.nix + ./services/audio/gmediarender.nix ./services/audio/hqplayerd.nix ./services/audio/icecast.nix ./services/audio/jack.nix diff --git a/nixos/modules/services/audio/gmediarender.nix b/nixos/modules/services/audio/gmediarender.nix new file mode 100644 index 000000000000000..2f23232d19cf231 --- /dev/null +++ b/nixos/modules/services/audio/gmediarender.nix @@ -0,0 +1,116 @@ +{ pkgs, lib, config, utils, ... }: + +with lib; + +let + cfg = config.services.gmediarender; +in +{ + options.services.gmediarender = { + enable = mkEnableOption (mdDoc "the gmediarender DLNA renderer"); + + audioDevice = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + The audio device to use. + ''; + }; + + audioSink = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + The audio sink to use. + ''; + }; + + friendlyName = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + A "friendly name" for identifying the endpoint. + ''; + }; + + initialVolume = mkOption { + type = types.nullOr types.int; + default = 0; + description = mdDoc '' + A default volume attenuation (in dB) for the endpoint. + ''; + }; + + package = mkPackageOptionMD pkgs "gmediarender" { + default = "gmrender-resurrect"; + }; + + port = mkOption { + type = types.nullOr types.port; + default = null; + description = mdDoc "Port that will be used to accept client connections."; + }; + + uuid = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc '' + A UUID for uniquely identifying the endpoint. If you have + multiple renderers on your network, you MUST set this. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd = { + services.gmediarender = { + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "gmediarender server daemon"; + environment = { + XDG_CACHE_HOME = "%t/gmediarender"; + }; + serviceConfig = { + DynamicUser = true; + User = "gmediarender"; + Group = "gmediarender"; + SupplementaryGroups = [ "audio" ]; + ExecStart = + "${cfg.package}/bin/gmediarender " + + optionalString (cfg.audioDevice != null) ("--gstout-audiodevice=${utils.escapeSystemdExecArg cfg.audioDevice} ") + + optionalString (cfg.audioSink != null) ("--gstout-audiosink=${utils.escapeSystemdExecArg cfg.audioSink} ") + + optionalString (cfg.friendlyName != null) ("--friendly-name=${utils.escapeSystemdExecArg cfg.friendlyName} ") + + optionalString (cfg.initialVolume != 0) ("--initial-volume=${toString cfg.initialVolume} ") + + optionalString (cfg.port != null) ("--port=${toString cfg.port} ") + + optionalString (cfg.uuid != null) ("--uuid=${utils.escapeSystemdExecArg cfg.uuid} "); + Restart = "always"; + RuntimeDirectory = "gmediarender"; + + # Security options: + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + # PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + UMask = 066; + }; + }; + }; + }; +} From 2de90e2e841f15ed1ee7556a36d2fbb6dae540d4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 13 Jan 2023 01:24:22 +0100 Subject: [PATCH 17/19] umurmur: fix build with openssl_3 --- pkgs/applications/networking/umurmur/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 3398d4bd51cdbf4..9af0fb7b73ca2c0 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl protobufc libconfig ]; + # https://github.com/umurmur/umurmur/issues/176 + postPatch = '' + sed -i '/CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);/d' src/ssli_openssl.c + ''; + configureFlags = [ "--with-ssl=openssl" "--enable-shmapi" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73848e45ee7cc93..e10f379e887cffd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33060,9 +33060,7 @@ with pkgs; uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; - umurmur = callPackage ../applications/networking/umurmur { - openssl = openssl_1_1; - }; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = callPackage ../tools/virtualization/udocker { }; From 7c1096ab995f8a75b794b1f4ac841ea6caa7a120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 11 Jan 2023 17:28:46 +0100 Subject: [PATCH 18/19] rsync: fix build with musl The rsync build tries to use IFUNC for SIMD optimizations on x86_64, which has to be disabled for musl. --- pkgs/applications/networking/sync/rsync/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 52ff6a5c108ac3b..d1a304f44001fb5 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { # disable the included zlib explicitly as it otherwise still compiles and # links them even. "--with-included-zlib=no" + ] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [ + # fix `multiversioning needs 'ifunc' which is not supported on this target` error + "--disable-roll-simd" ]; enableParallelBuilding = true; From f46ee73ba6851e458dedc78e3f0fe2c6eb099697 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 10 Jan 2023 19:11:21 -0500 Subject: [PATCH 19/19] dracut: init at 059 --- pkgs/os-specific/linux/dracut/default.nix | 128 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 130 insertions(+) create mode 100644 pkgs/os-specific/linux/dracut/default.nix diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix new file mode 100644 index 000000000000000..2b483e2c7c76831 --- /dev/null +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -0,0 +1,128 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +, makeBinaryWrapper +, pkg-config +, asciidoc +, libxslt +, docbook_xsl +, bash +, kmod +, binutils +, busybox +, bzip2 +, coreutils +, cpio +, findutils +, glibc +, gnugrep +, gnused +, gnutar +, gzip +, kbd +, lvm2 +, lz4 +, lzop +, procps +, rng-tools +, squashfsTools +, systemd +, util-linux +, xz +, zstd +}: + +stdenv.mkDerivation rec { + pname = "dracut"; + version = "059"; + + src = fetchFromGitHub { + owner = "dracutdevs"; + repo = "dracut"; + rev = version; + hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM="; + }; + + strictDeps = true; + + buildInputs = [ + bash + kmod + ]; + + nativeBuildInputs = [ + makeBinaryWrapper + pkg-config + asciidoc + libxslt + docbook_xsl + ]; + + postPatch = '' + substituteInPlace dracut.sh \ + --replace 'dracutbasedir="$dracutsysrootdir"/usr/lib/dracut' 'dracutbasedir="$dracutsysrootdir"'"$out/lib/dracut" + substituteInPlace lsinitrd.sh \ + --replace 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut" + + echo 'DRACUT_VERSION=${version}' >dracut-version.sh + ''; + + preConfigure = '' + patchShebangs ./configure + ''; + + postFixup = '' + wrapProgram $out/bin/dracut --prefix PATH : ${lib.makeBinPath [ + coreutils + util-linux + ]} --prefix DRACUT_PATH : ${lib.makeBinPath [ + bash + binutils + coreutils + findutils + glibc + gnugrep + gnused + gnutar + kbd + lvm2 + procps + rng-tools + squashfsTools + systemd + util-linux + busybox + ]} + wrapProgram $out/bin/dracut-catimages --set PATH ${lib.makeBinPath [ + coreutils + cpio + findutils + gzip + ]} + wrapProgram $out/bin/lsinitrd --set PATH ${lib.makeBinPath [ + binutils + bzip2 + coreutils + cpio + gnused + gzip + lz4 + lzop + squashfsTools + util-linux + xz + zstd + ]} + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + homepage = "https://dracut.wiki.kernel.org"; + description = "An event driven initramfs infrastructure"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e10f379e887cffd..71618a9504e1b24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28530,6 +28530,8 @@ with pkgs; dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; + dracut = callPackage ../os-specific/linux/dracut { }; + dragonflydb = callPackage ../servers/nosql/dragonflydb { }; dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };