From ac827a6f855b58feb4f5b6ea073acf83b3348339 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 9 Nov 2023 00:35:58 -0800 Subject: [PATCH 001/112] nixos/samba: make securityType an enum The possible values were sourced from reading `man smb.conf`. --- nixos/modules/services/network-filesystems/samba.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 0b22302c0b6d..db7fbc17eb8e 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -160,7 +160,7 @@ in }; securityType = mkOption { - type = types.str; + type = types.enum [ "auto" "user" "domain" "ads" ]; default = "user"; description = lib.mdDoc "Samba security type"; }; From dcf427140d8a7dda674899dc01132c8a289bbf74 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Sat, 23 Dec 2023 14:31:30 +0100 Subject: [PATCH 002/112] ttfb: 1.7.0 -> 1.10.0 The new version doesn't need the openssl dependency anymore. --- pkgs/development/tools/ttfb/default.nix | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix index 550a8f1a8762..f024280c0870 100644 --- a/pkgs/development/tools/ttfb/default.nix +++ b/pkgs/development/tools/ttfb/default.nix @@ -1,40 +1,35 @@ { darwin , fetchCrate , lib -, openssl -, pkg-config , rustPlatform , stdenv }: rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.7.0"; + version = "1.10.0"; src = fetchCrate { inherit pname version; - hash = "sha256-GxjG8pyE2rY0h1dpAo+HRUbP31I5Pm4h1fAb6R7V+qU="; + hash = "sha256-94gBofb7H7+qU50+cp+rq14Vtbk2vuXFQksNITvICm4="; }; - cargoHash = "sha256-YdbVtVKt0bKb1R5IQxf9J/0ZA3ZHH+oZ8ryX6f4cGsY="; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoHash = "sha256-CUisxtUQXkStqSZikIoAN0GwpUjvQqon7KqI0beHL5U="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. buildFeatures = [ "bin" ]; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = { description = "CLI-Tool to measure the TTFB (time to first byte) of HTTP(S) requests"; longDescription = '' - This crate measures the times of DNS lookup, TCP connect, TLS handshake, and HTTP's TTFB - for a given IP or domain. + ttfb measure the TTFB (time to first byte) of HTTP(S) requests. This includes data + of intermediate steps, such as the relative and absolute timings of DNS lookup, TCP + connect, and TLS handshake. ''; homepage = "https://github.com/phip1611/ttfb"; changelog = "https://github.com/phip1611/ttfb/blob/v${version}/CHANGELOG.md"; From e7aa35317e436522d804ec309d39cf0130cb2130 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Dec 2023 06:04:57 +0000 Subject: [PATCH 003/112] apacheHttpdPackages.subversion: 1.14.2 -> 1.14.3 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index ecb5093f4be1..0c83d080716c 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -128,7 +128,7 @@ let in { subversion = common { - version = "1.14.2"; - sha256 = "sha256-yRMOjQt1copm8OcDj8dwUuZxgw14W1YWqtU7SBDTzCg="; + version = "1.14.3"; + sha256 = "sha256-lJ79RRoJQ19+hXNXTHHHtxsZTYRIkPpJzWHSJi6hpEA="; }; } From a9906762a0389f37faa37aa46886448924167d79 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 30 Dec 2023 18:05:31 +0100 Subject: [PATCH 004/112] xrdp: 0.9.23.1 -> 0.9.24 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.24 --- pkgs/applications/networking/remote/xrdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index bf3b8b64f1e7..d3ede5ee5b8b 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, applyPatches, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let - version = "0.9.23.1"; + version = "0.9.24"; patchedXrdpSrc = applyPatches { patches = [ ./dynamic_config.patch ]; name = "xrdp-patched-${version}"; @@ -10,7 +10,7 @@ let repo = "xrdp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fJKSEHB5X5QydKgRPjIMJzNaAy1EVJifHETSGmlJttQ="; + hash = "sha256-Kvj72l+jmoad6VgmCYW2KtQAbJMJ8AZjNIYJ5lUNzRM="; }; }; From 850d3c7b933ea6b4b86b480930024237225954e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 16:11:09 +0000 Subject: [PATCH 005/112] functionalplus: 0.2.20-p0 -> 0.2.22 --- pkgs/development/libraries/functionalplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index b456dd887344..af25030ab560 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.20-p0"; + version = "0.2.22"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-PKd3gx63VTxyq1q0v7WaKXVA0oICpZQfVsKsgUml9wk="; + sha256 = "sha256-y0IRmgG9lhWO4IR4G9/VP2a3B+ORTnF7MCf4FU5EuMk="; }; nativeBuildInputs = [ cmake ]; From afc2f0f7bcd067b75e9c849ab978a741f8a9038b Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 23 Dec 2023 18:48:49 +0100 Subject: [PATCH 006/112] postgresqlPackages.postgis: build minimal gdal version This change is reducing closure size from 1.5G to 544M. --- nixos/tests/postgis.nix | 1 + pkgs/servers/sql/postgresql/ext/postgis.nix | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 09c738b938ba..dacf4e576c07 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -24,6 +24,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { master.wait_for_unit("postgresql") master.sleep(10) # Hopefully this is long enough!! master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'") + master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_raster;'") master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'") ''; }) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index fe6319d44f20..65541730d296 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -5,7 +5,7 @@ , postgresql , geos , proj -, gdal +, gdalMinimal , json_c , pkg-config , file @@ -14,6 +14,10 @@ , pcre2 , nixosTests }: + +let + gdal = gdalMinimal; +in stdenv.mkDerivation rec { pname = "postgis"; version = "3.4.1"; From b057e48b2a90422e5e0054b90dbbef11529d024d Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 6 Jan 2024 13:31:41 +0100 Subject: [PATCH 007/112] mlx42: 2.3.2 -> 2.3.3 --- pkgs/by-name/ml/mlx42/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index ac3aaa2200eb..3387dec3378d 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -11,23 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlx42"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "codam-coding-college"; repo = "MLX42"; rev = "v${finalAttrs.version}"; - hash = "sha256-JCBV8NWibSugqXkbgP0v3gDfaaMNFYztWpBRfHJUG8E="; + hash = "sha256-igkTeOnqGYBISzmtDGlDx9cGJjoQ8fzXtVSR9hU4F5E="; }; - patches = [ - (fetchpatch { - name = "add-cmake-install.patch"; - url = "https://github.com/codam-coding-college/MLX42/commit/a51ca8e0ec3fb793fa96d710696dcee8a4fe57d6.patch"; - hash = "sha256-i+0yHZVvfTG19BGVrz7GuEuBw3B7lylCPEvx07il23M="; - }) - ]; - postPatch = '' patchShebangs ./tools '' @@ -46,10 +38,6 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir -p $out/lib/pkgconfig substituteAll ${./mlx42.pc} $out/lib/pkgconfig/mlx42.pc - - # This file was removed after 2.3.2, so the used patch doesn't copy this file - # This line can be removed after the next release - cp $src/include/MLX42/MLX42_Input.h $out/include/MLX42 ''; meta = { From 50d0eb6c9f5cf3020bae9deddd873f89dc779ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Jan 2024 15:34:22 +0100 Subject: [PATCH 008/112] nixos-rebuild: add lib to repl to make debugging even easier --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index f9bda1a64b62..198ffed666b6 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -546,6 +546,7 @@ if [ "$action" = repl ]; then - ${blue}config${reset} All option values - ${blue}options${reset} Option data and metadata - ${blue}pkgs${reset} Nixpkgs package set + - ${blue}lib${reset} Nixpkgs library functions - other module arguments - ${blue}flake${reset} Flake outputs, inputs and source info of $flake @@ -566,6 +567,7 @@ if [ "$action" = repl ]; then configuration._module.specialArgs // { inherit (configuration) config options; + inherit (configuration.pkgs) lib; inherit flake; }; in builtins.seq scope builtins.trace motd scope From 92a401fb19086b2ffdd55741c5c67be533173719 Mon Sep 17 00:00:00 2001 From: amesgen Date: Sat, 6 Jan 2024 18:47:31 +0100 Subject: [PATCH 009/112] cddl: 0.8.9 -> 0.10.3 --- pkgs/development/tools/cddl/Gemfile.lock | 32 ++++++--- pkgs/development/tools/cddl/default.nix | 29 +++++++- pkgs/development/tools/cddl/gemset.nix | 88 +++++++++++++++++++----- 3 files changed, 116 insertions(+), 33 deletions(-) diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock index 796a7743cac5..24afe0d41838 100644 --- a/pkgs/development/tools/cddl/Gemfile.lock +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -1,23 +1,33 @@ GEM remote: https://rubygems.org/ specs: - abnc (0.1.0) - cbor-diag (0.5.6) - json + abnc (0.1.1) + abnftt (0.2.4) + base32 (0.3.4) + cbor-canonical (0.1.2) + cbor-deterministic (0.1.3) + cbor-diag (0.8.7) + cbor-canonical + cbor-deterministic + cbor-packed + json_pure neatjson treetop (~> 1) - cddl (0.8.9) + cbor-packed (0.1.5) + cddl (0.10.3) abnc + abnftt + base32 (~> 0.3) cbor-diag colorize - json + json_pure regexp-examples - colorize (0.8.1) - json (2.2.0) - neatjson (0.9) + colorize (1.1.0) + json_pure (2.7.1) + neatjson (0.10.5) polyglot (0.3.5) - regexp-examples (1.5.0) - treetop (1.6.10) + regexp-examples (1.5.1) + treetop (1.6.12) polyglot (~> 0.3) PLATFORMS @@ -27,4 +37,4 @@ DEPENDENCIES cddl BUNDLED WITH - 2.1.4 + 2.3.25 diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix index 8fdae4b1c441..539574b51010 100644 --- a/pkgs/development/tools/cddl/default.nix +++ b/pkgs/development/tools/cddl/default.nix @@ -1,11 +1,34 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ lib +, bundlerApp +, bundlerUpdateScript +, makeBinaryWrapper +}: -bundlerApp { +bundlerApp rec { pname = "cddl"; - gemdir = ./.; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + + gemset = lib.recursiveUpdate (import ./gemset.nix) ({ + "cddl" = { + dontBuild = false; + # setting env vars is not supported by patchShebangs + postPatch = '' + sed -i 's\#!/usr/bin/env RUBY_THREAD_VM_STACK_SIZE=5000000\#!/usr/bin/env\' bin/cddl + ''; + }; + }); + exes = [ "cddl" ]; + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + wrapProgram $out/bin/cddl \ + --set RUBY_THREAD_VM_STACK_SIZE 5000000 + ''; + passthru.updateScript = bundlerUpdateScript "cddl"; meta = with lib; { diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix index c1f1c64495e3..1f19c3920bdf 100644 --- a/pkgs/development/tools/cddl/gemset.nix +++ b/pkgs/development/tools/cddl/gemset.nix @@ -4,62 +4,112 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig"; + sha256 = "0yj09gc9w208wsy0d45vzha4zfwxdpsqvkm9vms0chm4lxdwdg9x"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; + }; + abnftt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z7ibh0xv9mqk61rvvmz9fnfk6hffvnppqd8fx61vazjhisi9bcs"; + type = "gem"; + }; + version = "0.2.4"; + }; + base32 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjs0l3c5g9qxwp43kcnhc45slx29yjb6m6jxbb2x1krgjmi166b"; + type = "gem"; + }; + version = "0.3.4"; + }; + cbor-canonical = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fhj51s5d9b9spw096sb0p92bgilw9hrsay383563dh913j2jn11"; + type = "gem"; + }; + version = "0.1.2"; + }; + cbor-deterministic = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w1mg4mn1dhlxlbijxpzja8m8ggrjs0hzkzvnaazw9zm1ji6dpba"; + type = "gem"; + }; + version = "0.1.3"; }; cbor-diag = { - dependencies = ["json" "neatjson" "treetop"]; + dependencies = ["cbor-canonical" "cbor-deterministic" "cbor-packed" "json_pure" "neatjson" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pd0k4malg1l7w3ck5glh9w0hrsvknk8rp32vrir74yww1g6yplv"; + sha256 = "0rwd88xngbjamgydj9rg3wvgl53pfzhal2n702s9afa1yp8mjm51"; type = "gem"; }; - version = "0.5.6"; + version = "0.8.7"; + }; + cbor-packed = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dijyj7rivi39h34f32fx7k4xvngldf569i0372n1z6w01nv761l"; + type = "gem"; + }; + version = "0.1.5"; }; cddl = { - dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"]; + dependencies = ["abnc" "abnftt" "base32" "cbor-diag" "colorize" "json_pure" "regexp-examples"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16rmcrsxwx33pj25g1si0dhjdl2brfhy2vlpfwdb6qqkaikmzhpz"; + sha256 = "1qll1qvn3g75r742kr4da7240zdk2qj4vh325965rrjqp8brz23q"; type = "gem"; }; - version = "0.8.9"; + version = "0.10.3"; }; colorize = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + sha256 = "0dy8ryhcdzgmbvj7jpa1qq3bhhk1m7a2pz6ip0m6dxh30rzj7d9h"; type = "gem"; }; - version = "0.8.1"; + version = "1.1.0"; }; - json = { + json_pure = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "09w7f7xlcas9irlaavhz0rnh17cjvjmmqm07drgghx5gwjcrar31"; type = "gem"; }; - version = "2.2.0"; + version = "2.7.1"; }; neatjson = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fa2v7b6433j0iqh5iq9r71v7a5xabgjvqwsbl21vcsac7vf3ncw"; + sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s"; type = "gem"; }; - version = "0.9"; + version = "0.10.5"; }; polyglot = { groups = ["default"]; @@ -76,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s5d327i9dw5yjwv9vfss3qb7lwasjyc75wvh7vrdi5v4vm1y2k"; + sha256 = "0wfkwczjn62qq3z96dxk43m0gh6d5cajx9pxkanvk88d3yqnx29v"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; treetop = { dependencies = ["polyglot"]; @@ -87,9 +137,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.12"; }; } From f1c0d04d804e3c0243bce39d02b14ddf29f2ff0f Mon Sep 17 00:00:00 2001 From: amesgen Date: Sat, 6 Jan 2024 18:50:10 +0100 Subject: [PATCH 010/112] cddl: add amesgen as maintainer --- pkgs/development/tools/cddl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix index 539574b51010..f99e547435ce 100644 --- a/pkgs/development/tools/cddl/default.nix +++ b/pkgs/development/tools/cddl/default.nix @@ -35,7 +35,7 @@ bundlerApp rec { description = "A parser, generator, and validator for CDDL"; homepage = "https://rubygems.org/gems/cddl"; license = with licenses; mit; - maintainers = with maintainers; [ fdns nicknovitski ]; + maintainers = with maintainers; [ fdns nicknovitski amesgen ]; platforms = platforms.unix; }; } From a850790a260ddffb9c37fdfac2a2daae88ad0118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 02:40:54 +0000 Subject: [PATCH 011/112] retext: 8.0.0 -> 8.0.1 --- pkgs/applications/editors/retext/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index feb42d9a99a9..db85170f5be1 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "retext"; - version = "8.0.0"; + version = "8.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "retext-project"; repo = pname; - rev = version; - hash = "sha256-22yqNwIehgTfeElqhN5Jzye7LbcAiseTeoMgenpmsL0="; + rev = "refs/tags/${version}"; + hash = "sha256-7zNEmFf0FZCzaNq9EMfGCje66/v5T/QvI5DTftLhi7g="; }; toolbarIcons = fetchzip { From 1c015b3d100abb22f50dda78ca8d2552386d6b85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 02:54:21 +0000 Subject: [PATCH 012/112] rmview: 3.1.2 -> 3.1.3 --- pkgs/applications/misc/remarkable/rmview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index e3fd00d8cdc4..24627025ca9f 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rmview"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "bordaigorl"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-oCF37WQqNIXut2k+xr528twGxwPoH/sQ2leThagQJAU="; + sha256 = "sha256-V26zmu8cQkLs0IMR7eFO8x34McnT3xYyzlZfntApYkk="; }; nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; From 4f198178bfd527b81b03578db2b2eea8173b7226 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 07:44:01 +0000 Subject: [PATCH 013/112] runme: 2.0.7 -> 2.2.0 --- pkgs/development/tools/misc/runme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 6e6914fbf156..d0b3e5cfeadf 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "runme"; - version = "2.0.7"; + version = "2.2.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-ip2td0PEMga7Egd/YEGdpoUV4tnNI27BUDPYynpFhhc="; + hash = "sha256-6V7OxWJ0EYcbaHmls0P9iJD9tQ9N4GSPzBAKVdShvXg="; }; vendorHash = "sha256-PLDsea/o067ifiX0RKFC7gDpORLVEQ0DV6sdBzzQCTs="; From 3998af67d6c6c87a54a626961035ea834a271b77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 12:57:19 +0000 Subject: [PATCH 014/112] snyk: 1.1266.0 -> 1.1269.0 --- pkgs/development/tools/analysis/snyk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 10175b1cec6f..3d8a82b59b5b 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1266.0"; + version = "1.1269.0"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "v${version}"; - hash = "sha256-K+62BbiP4GVjxqadIllDBn8pH+cJkbEUVWJTMO7Mn3M="; + hash = "sha256-jFaWkit96mIBCIYVOYoa5qNOP+fzmzwoi5bFgpi8JHM="; }; - npmDepsHash = "sha256-9FLXsIFrNzH42v5y537GrS3C1X91LLh3qu4sPoprNK4="; + npmDepsHash = "sha256-GCWpNFDfvpZrMLy8S7q1V0bzngL0fe0gZeMx+MbHOKU="; postPatch = '' substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"' From 6199fe11a6b98144569b08f280bfdf75e011f1b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 23:40:06 +0000 Subject: [PATCH 015/112] hydrogen: 1.2.2 -> 1.2.3 --- pkgs/applications/audio/hydrogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 0bea741e19d8..1460a78d9a9b 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "hydrogen"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "hydrogen-music"; repo = pname; rev = version; - sha256 = "sha256-A9mLiPh7ZMWJ11PcVP07IxZ8WdV2HkkKLix77egbC0M="; + sha256 = "sha256-7dgckFscyms+HW3xrsr3+lMua/H82U2jLkm/OKw3YWE="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From f5b7da46a2c8d5785f29740f96c9ea7943f142ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 00:28:51 +0000 Subject: [PATCH 016/112] morewaita-icon-theme: 43.2 -> 45 --- pkgs/by-name/mo/morewaita-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 0225fab88b45..be19082d6d29 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "morewaita-icon-theme"; - version = "43.2"; + version = "45"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; rev = "v${version}"; - hash = "sha256-efeZEysuWdE1+ws3njFlhWjAjavRlMuIuSL2VT25lUk="; + hash = "sha256-UtwigqJjkin53Wg3PU14Rde6V42eKhmP26a3fDpbJ4Y="; }; nativeBuildInputs = [ From fb74449aeaefe38fd7e7bb64d79ca0a30a065ec7 Mon Sep 17 00:00:00 2001 From: octodi Date: Sat, 13 Jan 2024 20:59:20 +0530 Subject: [PATCH 017/112] passdetective: init at 1.0.7 --- pkgs/by-name/pa/passdetective/package.nix | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/pa/passdetective/package.nix diff --git a/pkgs/by-name/pa/passdetective/package.nix b/pkgs/by-name/pa/passdetective/package.nix new file mode 100644 index 000000000000..2e921beb8c7d --- /dev/null +++ b/pkgs/by-name/pa/passdetective/package.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "passdetective"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "aydinnyunus"; + repo = "PassDetective"; + rev = version; + hash = "sha256-ln+nKESCYNQwTB6njNQBNUGmF+NXqgzmM1sb/d6ZBcU="; + }; + + vendorHash = "sha256-4FF0aQiuVN382RBCYI7SpoB8U8MZoXTomuFEvcbcREg="; + + ldflags = [ + "-s" + "-w" + "-extldflags" + "-static" + "-X=main.build=${version}" + ]; + + meta = with lib; { + description = "Scans command history to detect mistakenly written passwords, API keys, and secrets"; + homepage = "https://github.com/aydinnyunus/PassDetective"; + changelog = "https://github.com/aydinnyunus/PassDetective/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ octodi ]; + mainProgram = "PassDetective"; + }; +} From 7530777b72ba12d9636a633fb782d32782493877 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:48:47 +0000 Subject: [PATCH 018/112] advanced-scene-switcher: remove `paveloom` from maintainers --- .../obs-studio/plugins/advanced-scene-switcher/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index aee37b4b06d1..7f910847da5e 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/WarmUpTill/SceneSwitcher"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From d255738da5e75aa6e6a05bc6364df55429c83ebd Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:49:21 +0000 Subject: [PATCH 019/112] anki: remove `paveloom` from maintainers --- pkgs/games/anki/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index ca6eaf15ac21..3cd623c4d6ef 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -292,7 +292,7 @@ python3.pkgs.buildPythonApplication { homepage = "https://apps.ankiweb.net"; license = licenses.agpl3Plus; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ euank oxij paveloom ]; + maintainers = with maintainers; [ euank oxij ]; # Reported to crash at launch on darwin (as of 2.1.65) broken = stdenv.isDarwin; }; From 3a29950a95440ba92603922103b673ae5eea949e Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:50:12 +0000 Subject: [PATCH 020/112] blueprint-compiler: remove `paveloom` from maintainers --- pkgs/development/compilers/blueprint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index f52b43f49a82..856fcaa5d5ab 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A markup language for GTK user interface files"; homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ benediktbroich paveloom ranfdev ]; + maintainers = with maintainers; [ benediktbroich ranfdev ]; platforms = platforms.unix; }; }) From 92b80d64883da5dd178a0f513eeb62a41dc4a713 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:51:00 +0000 Subject: [PATCH 021/112] codon: remove `paveloom` from maintainers --- pkgs/development/compilers/codon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/codon/default.nix b/pkgs/development/compilers/codon/default.nix index 70cd16327299..e9393956e473 100644 --- a/pkgs/development/compilers/codon/default.nix +++ b/pkgs/development/compilers/codon/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation { meta = { description = "A high-performance, zero-overhead, extensible Python compiler using LLVM"; homepage = "https://docs.exaloop.io/codon"; - maintainers = [ lib.maintainers.paveloom ]; + maintainers = [ ]; license = lib.licenses.bsl11; platforms = lib.platforms.all; }; From 76e3feb9f1814b229e079910df4dbbe2cac644bf Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:51:40 +0000 Subject: [PATCH 022/112] gut: remove `paveloom` from maintainers --- pkgs/applications/version-management/gut/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gut/default.nix b/pkgs/applications/version-management/gut/default.nix index 3d57ceb03a80..1254de70eb92 100644 --- a/pkgs/applications/version-management/gut/default.nix +++ b/pkgs/applications/version-management/gut/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { description = "An alternative git CLI"; homepage = "https://gut-cli.dev"; license = licenses.mit; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; mainProgram = "gut"; }; } From 8c2e8070f3ab3a15c5339038b614e30d7b57a7b8 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:52:19 +0000 Subject: [PATCH 023/112] identity: remove `paveloom` from maintainers --- pkgs/applications/graphics/identity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/identity/default.nix b/pkgs/applications/graphics/identity/default.nix index 55e13d7016fa..a17ecf7a6fb2 100644 --- a/pkgs/applications/graphics/identity/default.nix +++ b/pkgs/applications/graphics/identity/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/YaLTeR/identity"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From ffa9ae28418b95dd65411e1a2b8c56708c769368 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:52:59 +0000 Subject: [PATCH 024/112] libremidi: remove `paveloom` from maintainers --- pkgs/development/libraries/libremidi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/development/libraries/libremidi/default.nix index d88ebeea3fb5..753bcef433fd 100644 --- a/pkgs/development/libraries/libremidi/default.nix +++ b/pkgs/development/libraries/libremidi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A modern C++ MIDI real-time & file I/O library"; homepage = "https://github.com/jcelerier/libremidi"; - maintainers = [ lib.maintainers.paveloom ]; + maintainers = [ ]; license = lib.licenses.bsd2; platforms = lib.platforms.all; }; From 4828a8f149a3bf889ef2a9cf85d2d87d6fe3a375 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:53:38 +0000 Subject: [PATCH 025/112] mecab: remove `paveloom` from maintainers --- pkgs/tools/text/mecab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index 8d11343515d0..f1f9fc6503c8 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // { license = licenses.bsd3; platforms = platforms.unix; mainProgram = "mecab"; - maintainers = with maintainers; [ auntie paveloom ]; + maintainers = with maintainers; [ auntie ]; }; })) From e1fd2c62ba21e7ca5bbd0dc64af5957975000ce5 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:54:11 +0000 Subject: [PATCH 026/112] obs-teleport: remove `paveloom` from maintainers --- .../video/obs-studio/plugins/obs-teleport/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix index c7ee1d4f2598..3c0c662b7618 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { meta = { description = "An OBS Studio plugin for an open NDI-like replacement"; homepage = "https://github.com/fzwoch/obs-teleport"; - maintainers = [ lib.maintainers.paveloom ]; + maintainers = [ ]; license = lib.licenses.gpl2Plus; platforms = obs-studio.meta.platforms; }; From 24641d4209bebf2c75f30e05a51d5c576947ae2f Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:55:00 +0000 Subject: [PATCH 027/112] picard: remove `paveloom` from maintainers --- pkgs/applications/audio/picard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 4ae4ff6b6794..6edc668d9274 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -77,7 +77,7 @@ pythonPackages.buildPythonApplication rec { homepage = "https://picard.musicbrainz.org"; changelog = "https://picard.musicbrainz.org/changelog"; description = "The official MusicBrainz tagger"; - maintainers = with maintainers; [ ehmry paveloom ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2Plus; platforms = platforms.all; }; From 3a4ede4dc7bdca756244e7a660d81e1af0bbe328 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:55:46 +0000 Subject: [PATCH 028/112] python3Packages.darkdetect: remove `paveloom` from maintainers --- pkgs/development/python-modules/darkdetect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix index 534d9a0573ce..28e3c141a1ee 100644 --- a/pkgs/development/python-modules/darkdetect/default.nix +++ b/pkgs/development/python-modules/darkdetect/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Detect OS Dark Mode from Python"; homepage = "https://github.com/albertosottile/darkdetect"; license = licenses.bsd3; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From 0dd46625572f84e7cf7c44cabff249e661f1b665 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:56:32 +0000 Subject: [PATCH 029/112] python3Packages.mobi: remove `paveloom` from maintainers --- pkgs/development/python-modules/mobi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix index 262e724a7b53..fae5b97bb114 100644 --- a/pkgs/development/python-modules/mobi/default.nix +++ b/pkgs/development/python-modules/mobi/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Library for unpacking unencrypted mobi files"; homepage = "https://github.com/iscc/mobi"; license = licenses.gpl3Only; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From e55e13e98c22047f7bdc3c77a78d9a7b26fa1e0a Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:57:16 +0000 Subject: [PATCH 030/112] python3Packages.readmdict: remove `paveloom` from maintainers --- pkgs/development/python-modules/readmdict/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/readmdict/default.nix b/pkgs/development/python-modules/readmdict/default.nix index b7d61f8c8f57..d6ef1447a7b8 100644 --- a/pkgs/development/python-modules/readmdict/default.nix +++ b/pkgs/development/python-modules/readmdict/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Read mdx/mdd files (repacking of readmdict from mdict-analysis)"; homepage = "https://github.com/ffreemt/readmdict"; license = licenses.mit; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From 3d3b1a7684bb6b88cb75c1771446290154ea29e9 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:57:50 +0000 Subject: [PATCH 031/112] python3Packages.sentence-splitter: remove `paveloom` from maintainers --- pkgs/development/python-modules/sentence-splitter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sentence-splitter/default.nix b/pkgs/development/python-modules/sentence-splitter/default.nix index 7e7891433cd7..38ebc7fd6e2e 100644 --- a/pkgs/development/python-modules/sentence-splitter/default.nix +++ b/pkgs/development/python-modules/sentence-splitter/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Text to sentence splitter using heuristic algorithm by Philipp Koehn and Josh Schroeder"; homepage = "https://github.com/mediacloud/sentence-splitter"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From 1b058603b969fe4f9f2be74509b201b377d8cee9 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:58:31 +0000 Subject: [PATCH 032/112] python3Packages.simplemma: remove `paveloom` from maintainers --- pkgs/development/python-modules/simplemma/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index 4c70b8a8df19..60cb7438e9fb 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency"; homepage = "https://github.com/adbar/simplemma"; license = licenses.mit; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From cb570cf85eb30c9633fb8f2a0df68b032dfdf380 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:58:54 +0000 Subject: [PATCH 033/112] python3Packages.slpp: remove `paveloom` from maintainers --- pkgs/development/python-modules/slpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/slpp/default.nix b/pkgs/development/python-modules/slpp/default.nix index d52ac84dad7a..74dbfcc834cd 100644 --- a/pkgs/development/python-modules/slpp/default.nix +++ b/pkgs/development/python-modules/slpp/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Simple lua-python parser"; homepage = "https://github.com/SirAnthony/slpp"; license = licenses.mit; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From 105c74585102e5a232bf80b8bc918aee02323146 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 15:59:13 +0000 Subject: [PATCH 034/112] qbittorrent: remove `paveloom` from maintainers --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 37e27a884d5d..dcf3c64f66fd 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ Anton-Latukha kashw2 paveloom ]; + maintainers = with maintainers; [ Anton-Latukha kashw2 ]; }; } From 4b53474e6cbde27532fc5db9633e29f80690b0b0 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 16:00:09 +0000 Subject: [PATCH 035/112] quodlibet: remove `paveloom` from maintainers --- pkgs/applications/audio/quodlibet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 67a597b62388..f7baad9c53a0 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -171,6 +171,6 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://quodlibet.readthedocs.io/en/latest"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ coroa paveloom pbogdan ]; + maintainers = with maintainers; [ coroa pbogdan ]; }; } From 200c3208337d97b5044dac0e715c970f33609011 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 16:01:00 +0000 Subject: [PATCH 036/112] subtitleedit: remove `paveloom` from maintainers --- pkgs/applications/video/subtitleedit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix index 88018e5a5612..e08ac36db3f0 100644 --- a/pkgs/applications/video/subtitleedit/default.nix +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } From 9942154f3e6bcc8c696e4b1cfc0691c69c1c6689 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jan 2024 16:02:09 +0000 Subject: [PATCH 037/112] wireshark: remove `paveloom` from maintainers --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 53f4803c7c5b..deae24ec6547 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation rec { changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz paveloom ]; + maintainers = with maintainers; [ bjornfor fpletz ]; mainProgram = if withQt then "wireshark" else "tshark"; }; } From 66f7db11a1707f1520f53afc00a9716ca4314b57 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 13 Jan 2024 21:57:26 +0200 Subject: [PATCH 038/112] gnome-network-displays: remove apparently unneeded patch --- .../networking/gnome-network-displays/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index e7bfde8a5192..392f98c4fb6c 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -29,16 +29,6 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-2SBVQK4fJeK8Y2UrrL0g5vQIerDdGE1nhFc6ke4oIpI="; }; - patches = [ - # Undeclared dependency on gio-unix-2.0, see: - # https://github.com/NixOS/nixpkgs/issues/36468 and - # https://gitlab.gnome.org/GNOME/gnome-network-displays/-/merge_requests/147 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/ef3f3ff565acd8238da46de604a1e750d4f02f07.diff"; - sha256 = "1ljiwgqia6am4lansg70qnwkch9mp1fr6bga98s5fwyiaw6b6f4p"; - }) - ]; - nativeBuildInputs = [ meson ninja From 8e934650ce9ab7b0276fb1bbf4c72d85f2ab4d92 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 15 Jan 2024 00:28:07 +0100 Subject: [PATCH 039/112] nixos: Expose lib attribute on configuration for repl --- nixos/lib/eval-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index da099f86aa2c..8bab3752073f 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -110,6 +110,7 @@ let withExtraAttrs = configuration: configuration // { inherit extraArgs; inherit (configuration._module.args) pkgs; + inherit lib; extendModules = args: withExtraAttrs (configuration.extendModules args); }; in From 8be52599b7074027d7614eab8f4eb8d29b8f72ab Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 15 Jan 2024 00:28:36 +0100 Subject: [PATCH 040/112] nixos-rebuild: Prefer the module lib when available pkgs.lib and lib need not match, so prefer the one that the modules get. For example: ```nix nix-repl> :lf nixpkgs nix-repl> (lib.nixosSystem { modules = [ ({ lib, ... }: assert lib?nixosSystem; { nixpkgs.hostPlatform = "x86_64-linux"; }) ]; }).pkgs.lib?nixosSystem false ``` The code is backwards compatible, for the case where you evaluate a config whose nixpkgs doesn't have the preceding commit yet. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 198ffed666b6..78945a7e1a8c 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -567,7 +567,7 @@ if [ "$action" = repl ]; then configuration._module.specialArgs // { inherit (configuration) config options; - inherit (configuration.pkgs) lib; + lib = configuration.lib or configuration.pkgs.lib; inherit flake; }; in builtins.seq scope builtins.trace motd scope From 4d1d4646186c0314eb4e59faf12b4f35c609f765 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jan 2024 22:36:01 +0100 Subject: [PATCH 041/112] uchecker: init at 0.1.2 A simple tool to detect outdated shared libraries still linked to processes in memory https://github.com/cloudlinux/kcare-uchecker --- pkgs/by-name/uc/uchecker/package.nix | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/uc/uchecker/package.nix diff --git a/pkgs/by-name/uc/uchecker/package.nix b/pkgs/by-name/uc/uchecker/package.nix new file mode 100644 index 000000000000..a4746a1e0dfd --- /dev/null +++ b/pkgs/by-name/uc/uchecker/package.nix @@ -0,0 +1,49 @@ +{ lib +, python3 +, fetchFromGitHub +, fetchpatch +}: + +python3.pkgs.buildPythonApplication rec { + pname = "uchecker"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cloudlinux"; + repo = "kcare-uchecker"; + rev = "refs/tags/v${version}"; + hash = "sha256-SST143oi0O9PcJbw4nxHwHNY6HkIGi1WMBzveUYVhJs="; + }; + + patches = [ + # Switch to poetry-core, https://github.com/cloudlinux/kcare-uchecker/pull/52 + (fetchpatch { + name = "switch-poetry-core.patch"; + url = "https://github.com/cloudlinux/kcare-uchecker/commit/d7d5ab75efa6a355b3dd3190c1edbaba8110c885.patch"; + hash = "sha256-YPPw6M7MGN8nguAvAwjmz0VEYm0RD98ZkoVIq9SP3sA="; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + nativeCheckInputs = with python3.pkgs; [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "uchecker" + ]; + + meta = with lib; { + description = "A simple tool to detect outdated shared libraries"; + homepage = "https://github.com/cloudlinux/kcare-uchecker"; + changelog = "https://github.com/cloudlinux/kcare-uchecker/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "uchecker"; + }; +} From 0f12962c372f1e4313c5a7a2d0a811855b71be19 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 17 Jan 2024 20:22:12 +0100 Subject: [PATCH 042/112] screen-message: 0.26 -> 0.28 --- pkgs/tools/X11/screen-message/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index 3701684af8d8..c049c3841ea6 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, gtk3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "screen-message"; - version = "0.26"; + version = "0.28"; - src = fetchurl { - url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz"; - sha256 = "sha256-vBKnuXOEQZDACmlNP9wjJ3NbIdixIx7I72a6Nj6pjzc="; + src = fetchFromGitHub { + owner = "nomeata"; + repo = "screen-message"; + rev = version; + hash = "sha256-KHJL1N72Hc1B1m0olxoZxBHIpq/d/T3m2VdS5XC9+tk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 7bb10566056603b575b9253b8aa68f1068106d47 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 28 Dec 2023 01:25:02 -0700 Subject: [PATCH 043/112] louvain-community: init at unstable-2021-03-18 --- pkgs/by-name/lo/louvain-community/package.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/lo/louvain-community/package.nix diff --git a/pkgs/by-name/lo/louvain-community/package.nix b/pkgs/by-name/lo/louvain-community/package.nix new file mode 100644 index 000000000000..e9dfdf722efd --- /dev/null +++ b/pkgs/by-name/lo/louvain-community/package.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, cmake +, lib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "louvain-community"; + version = "unstable-2021-03-18"; + + src = fetchFromGitHub { + owner = "meelgroup"; + repo = "louvain-community"; + rev = "8cc5382d4844af127b1c1257373740d7e6b76f1e"; + hash = "sha256-0i3wrDdOyleOPv5iVO1YzPfTPnIdljLabCvl3SYEQOs="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Louvain Community Detection Library"; + homepage = "https://github.com/meelgroup/louvain-community"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ t4ccer ]; + platforms = platforms.unix; + }; +}) From 02f58ae811c0d7b4d887034629d9567d386fad15 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 28 Dec 2023 01:26:05 -0700 Subject: [PATCH 044/112] arjun-cnf: init at 2.5.2 --- .../by-name/ar/arjun-cnf/fix-red-clause.patch | 28 +++++++++++ pkgs/by-name/ar/arjun-cnf/package.nix | 48 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 pkgs/by-name/ar/arjun-cnf/fix-red-clause.patch create mode 100644 pkgs/by-name/ar/arjun-cnf/package.nix diff --git a/pkgs/by-name/ar/arjun-cnf/fix-red-clause.patch b/pkgs/by-name/ar/arjun-cnf/fix-red-clause.patch new file mode 100644 index 000000000000..a7f4d6755431 --- /dev/null +++ b/pkgs/by-name/ar/arjun-cnf/fix-red-clause.patch @@ -0,0 +1,28 @@ +diff --git a/src/arjun.cpp b/src/arjun.cpp +index d6ad786..119a267 100644 +--- a/src/arjun.cpp ++++ b/src/arjun.cpp +@@ -98,6 +98,11 @@ DLL_PUBLIC bool Arjun::add_clause(const vector& lits) + return arjdata->common.solver->add_clause(lits); + } + ++DLL_PUBLIC bool Arjun::add_red_clause(const vector& lits) ++{ ++ return arjdata->common.solver->add_red_clause(lits); ++} ++ + DLL_PUBLIC bool Arjun::add_xor_clause(const vector& vars, bool rhs) + { + assert(false && "Funnily enough this does NOT work. The XORs would generate a BVA variable, and that would then not be returned as part of the simplified CNF. We could calculate a smaller independent set, but that's all."); +diff --git a/src/arjun.h b/src/arjun.h +index a39070c..907472a 100644 +--- a/src/arjun.h ++++ b/src/arjun.h +@@ -61,6 +61,7 @@ namespace ArjunNS { + void new_var(); + bool add_xor_clause(const std::vector& vars, bool rhs); + bool add_clause(const std::vector& lits); ++ bool add_red_clause(const std::vector& lits); + bool add_bnn_clause( + const std::vector& lits, + signed cutoff, diff --git a/pkgs/by-name/ar/arjun-cnf/package.nix b/pkgs/by-name/ar/arjun-cnf/package.nix new file mode 100644 index 000000000000..48e18272fda5 --- /dev/null +++ b/pkgs/by-name/ar/arjun-cnf/package.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, cryptominisat +, boost +, louvain-community +, lib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "arjun-cnf"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "meelgroup"; + repo = "arjun"; + rev = finalAttrs.version; + hash = "sha256-5duc05s654HLjbf+dPgyMn6QUVvB0vLji3M4S2o/QYU="; + }; + + # Can be removed after next release + patches = [ + (fetchpatch { + url = "https://github.com/meelgroup/arjun/commit/34188760f1ab4b1b557c45ccaee8d2b9b6f0b901.patch"; + hash = "sha256-E/yk2ohHP2BAFg353r8EU01bZCqeEjvpJCrBsxPiOWM="; + }) + # Based on https://github.com/meelgroup/arjun/commit/99c4ed4ad820674632c5d9bbcc98c001f8cac98f + ./fix-red-clause.patch + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + boost + cryptominisat + louvain-community + ]; + + meta = with lib; { + description = "CNF minimizer and minimal independent set calculator"; + homepage = "https://github.com/meelgroup/arjun"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + platforms = platforms.linux; + mainProgram = "arjun"; + }; +}) From 708f1b7d3c3ef986c89e3238be6a00a7819d52f4 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 28 Dec 2023 01:26:21 -0700 Subject: [PATCH 045/112] approxmc: init at 4.1.23 --- pkgs/by-name/ap/approxmc/package.nix | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/ap/approxmc/package.nix diff --git a/pkgs/by-name/ap/approxmc/package.nix b/pkgs/by-name/ap/approxmc/package.nix new file mode 100644 index 000000000000..f9222f66d500 --- /dev/null +++ b/pkgs/by-name/ap/approxmc/package.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, cmake +, zlib +, gmp +, cryptominisat +, boost +, arjun-cnf +, louvain-community +, lib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "approxmc"; + version = "4.1.23"; + + src = fetchFromGitHub { + owner = "meelgroup"; + repo = "approxmc"; + rev = finalAttrs.version; + hash = "sha256-pE2m6Cc2u53H/5CM+2JuQxZOhjhHUZOi0kn23CJmALM="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + zlib + gmp + cryptominisat + boost + arjun-cnf + louvain-community + ]; + + meta = with lib; { + description = "Approximate Model Counter"; + homepage = "https://github.com/meelgroup/approxmc"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + platforms = platforms.linux; + mainProgram = "approxmc"; + }; +}) From f5bfe6957ac3c1a219a6ee9f34c27d0e0319293f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 08:21:02 +0100 Subject: [PATCH 046/112] aeacus: init at 2.1.1 Vulnerability remediation scoring system https://github.com/elysium-suite/aeacus --- pkgs/by-name/ae/aeacus/package.nix | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ae/aeacus/package.nix diff --git a/pkgs/by-name/ae/aeacus/package.nix b/pkgs/by-name/ae/aeacus/package.nix new file mode 100644 index 000000000000..d172e7c50177 --- /dev/null +++ b/pkgs/by-name/ae/aeacus/package.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "aeacus"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "elysium-suite"; + repo = "aeacus"; + rev = "refs/tags/v${version}"; + hash = "sha256-LMsfogcz3CoShQDqyshMshb+iz2r0k5I7NDLXevMakI="; + }; + + vendorHash = "sha256-WOXOM08UYECdGx+e54n4BgLP3cr+st3qKi8iQXebPvk="; + + ldflags = [ + "-s" + "-w" + ]; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Vulnerability remediation scoring system"; + homepage = "https://github.com/elysium-suite/aeacus"; + changelog = "https://github.com/elysium-suite/aeacus/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "aeacus"; + }; +} From 71154a6e3046f58517941f7144062adec27e2316 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 18 Jan 2024 17:21:00 +0100 Subject: [PATCH 047/112] nixos-rebuild: Test the repl subcommand --- .../linux/nixos-rebuild/default.nix | 4 +- .../linux/nixos-rebuild/test/repl.nix | 140 ++++++++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/nixos-rebuild/test/repl.nix diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 6c150b1b8cdb..1a8eb704eb43 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -1,4 +1,5 @@ -{ substituteAll +{ callPackage +, substituteAll , runtimeShell , coreutils , gnused @@ -36,6 +37,7 @@ substituteAll { # run some a simple installer tests to make sure nixos-rebuild still works for them passthru.tests = { install-bootloader = nixosTests.nixos-rebuild-install-bootloader; + repl = callPackage ./test/repl.nix {}; simple-installer = nixosTests.installer.simple; specialisations = nixosTests.nixos-rebuild-specialisations; }; diff --git a/pkgs/os-specific/linux/nixos-rebuild/test/repl.nix b/pkgs/os-specific/linux/nixos-rebuild/test/repl.nix new file mode 100644 index 000000000000..0a057f933255 --- /dev/null +++ b/pkgs/os-specific/linux/nixos-rebuild/test/repl.nix @@ -0,0 +1,140 @@ +{ lib, + expect, + nix, + nixos-rebuild, + path, + runCommand, + stdenv, + writeText, +}: +let + # Arguably not true, but it holds up for now. + escapeExpect = lib.strings.escapeNixString; + + expectSetup = '' + set timeout 180 + proc expect_simple { pattern } { + puts "Expecting: $pattern" + expect { + timeout { + puts "\nTimeout waiting for: $pattern\n" + exit 1 + } + $pattern + } + } + ''; +in +runCommand "test-nixos-rebuild-repl" { + nativeBuildInputs = [ + expect + nix + nixos-rebuild + ]; + nixpkgs = + if builtins.pathExists (path + "/.git") + then lib.cleanSource path + else path; +} '' + export HOME=$(mktemp -d) + export TEST_ROOT=$PWD/test-tmp + + # Prepare for running Nix in sandbox + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + export PAGER=cat + mkdir -p $TEST_ROOT $NIX_CONF_DIR + + echo General setup + ################## + + export NIX_PATH=nixpkgs=$nixpkgs:nixos-config=$HOME/configuration.nix + cat >> ~/configuration.nix < ~/hardware-configuration.nix + + + echo Test traditional NixOS configuration + ######################################### + + expect ${writeText "test-nixos-rebuild-repl-expect" '' + ${expectSetup} + spawn nixos-rebuild repl --fast + + expect "nix-repl> " + + send "config.networking.hostName\n" + expect "\"nixos\"" + ''} + + + echo Test flake based NixOS configuration + ######################################### + + # Switch to flake flavored environment + unset NIX_PATH + cat > $NIX_CONF_DIR/nix.conf < ~/hardware-configuration.nix + + cat >~/flake.nix <" + + send "config.networking.hostName\n" + expect_simple "itsme" + + expect_simple "nix-repl>" + send "lib.version\n" + expect_simple ${escapeExpect ( + # The version string is a bit different in the flake lib, so we expect a prefix and ignore the rest + # Furthermore, including the revision (suffix) would cause unnecessary rebuilds. + # Note that a length of 4 only matches e.g. "24. + lib.strings.substring 0 4 (lib.strings.escapeNixString lib.version))} + + # Make sure it's the right lib - should be the flake lib, not Nixpkgs lib. + expect_simple "nix-repl>" + send "lib?nixosSystem\n" + expect_simple "true" + expect_simple "nix-repl>" + send "lib?nixos\n" + expect_simple "true" + ''} + echo + + ######### + echo Done + touch $out +'' From d059ce52ceb58edf61dfd55aaa4cab0546aac916 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 18 Jan 2024 17:36:01 +0100 Subject: [PATCH 048/112] nixos-rebuild: Partially future-proof the repl test --- pkgs/os-specific/linux/nixos-rebuild/test/repl.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/test/repl.nix b/pkgs/os-specific/linux/nixos-rebuild/test/repl.nix index 0a057f933255..1161ff84664d 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/test/repl.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/test/repl.nix @@ -24,6 +24,12 @@ let } } ''; + + # In case we want/need to evaluate packages or the assertions or whatever, + # we want to have a linux system. + # TODO: make the non-flake test use thise. + linuxSystem = lib.replaceStrings ["darwin"] ["linux"] stdenv.hostPlatform.system; + in runCommand "test-nixos-rebuild-repl" { nativeBuildInputs = [ @@ -88,7 +94,7 @@ runCommand "test-nixos-rebuild-repl" { EOF # Make the config pure - echo '{ nixpkgs.hostPlatform = "${stdenv.hostPlatform.system}"; }' > ~/hardware-configuration.nix + echo '{ nixpkgs.hostPlatform = "${linuxSystem}"; }' > ~/hardware-configuration.nix cat >~/flake.nix < Date: Thu, 18 Jan 2024 17:22:26 +0000 Subject: [PATCH 049/112] graalvmCEPackages.graalpy: 23.1.1 -> 23.1.2 --- .../community-edition/graalpy/hashes.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix index c18e7bcba006..84bb1660f7b5 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.1"; + "version" = "23.1.2"; "hashes" = { "aarch64-linux" = { - sha256 = "1jv9icfh3w8gdch0h3l8mm6q96z3lv89s8zv788wvkkb87zv8w8m"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-linux-aarch64.tar.gz"; + sha256 = "0ypzhi22q2d1dfl3qf3yfsaqdsrj8sksc2spa79rdqdr690li4y9"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "108qdf0ss9l0x6k983v9yg6m5i7aqwfdxjqa5fx62xj027wi5pqk"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-linux-amd64.tar.gz"; + sha256 = "1n99hzf1sidacv4qr5j2b3dpwrc6qb71alwfkdxjqx6xv7g7nmr7"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "019s7vlr8a6x60g0yh36pdf2vvan1v2wmq8z4xrcgpl96zpwwn5h"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-macos-amd64.tar.gz"; + sha256 = "0g2xj5hiq8idacdm0jlg5lvvv98f38p6fjb839gfacsb25pmhkg7"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0qbanbivkj62cjg2ll4ia23c435i1cvwy7pq19dvj8s204mpl8l2"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-macos-aarch64.tar.gz"; + sha256 = "0qinxqkkm9bfnzr43p3yhs3alfnl4pppca6yahsk5bp8ngyzasfj"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-macos-aarch64.tar.gz"; }; }; } From 02a38bf0a3cd0622cd91880baf9a4f26a3464bfb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 21:50:52 +0100 Subject: [PATCH 050/112] python311Packages.withings-sync: 4.2.2 -> .4.2.4 Diff: jaroslawhartman/withings-sync@refs/tags/v4.2.2...v.4.2.4 Changelog: https://github.com/jaroslawhartman/withings-sync/releases/tag/v.4.2.4 --- pkgs/development/python-modules/withings-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 3f20703baaf3..bf6c2153c7e0 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "withings-sync"; - version = "4.2.2"; + version = "4.2.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaroslawhartman"; repo = "withings-sync"; - rev = "refs/tags/v${version}"; - hash = "sha256-p1coGTbMQ+zptFKVLW5qgSdoudo2AggGT8Xu+cSCCs4="; + rev = "refs/tags/v.${version}"; + hash = "sha256-nFYEtQob3x6APWDKCVP5p+qkKmgvXIcmegp/6ZRbDQA="; }; nativeBuildInputs = [ From 14bf402065c391492c495dbfe0cba7e4ff83e467 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 21:05:15 +0000 Subject: [PATCH 051/112] python311Packages.anywidget: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/anywidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 16bf2daaa4a4..ffa3666555c5 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hHoP7OWOp6MtINzNVKAm3T3Sj3baprTwp0wlPlx8/uw="; + hash = "sha256-p2J3cL5FX4mv19WPr/km9F71K1MleuPFlRd9X/mxL9E="; }; # We do not need the jupyterlab build dependency, because we do not need to From 2f134383ff099e9094a2dfe665e63f4643547b8b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 18 Jan 2024 22:39:45 +0100 Subject: [PATCH 052/112] vscode-extensions.github.copilot: 1.143.601 -> 1.151.659 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dd94ae1086c5..a115d832b93a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1580,8 +1580,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.143.601"; - sha256 = "sha256-Ge/q1fAfhI5EuJFLHZqZyuPahHSgES7G0ns9FbS9vzA="; + version = "1.151.659"; + sha256 = "sha256-6jz7Nb9SGON7AXL4KJwC4H03la9JqLCX+AyBEvxD4HA="; }; meta = { From e869ea85a2861254230bae5006c52525a6c586f7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 18 Jan 2024 22:40:23 +0100 Subject: [PATCH 053/112] vscode-extensions.github.copilot-chat: 0.11.2023111001 -> 0.11.2023120102 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a115d832b93a..939a184d777e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1597,8 +1597,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.11.2023111001"; - sha256 = "sha256-sBDvqqyq0R0ZyS81G61fI9Vd860RIjhNzCqY0bdz1mg="; + version = "0.11.2023120102"; + sha256 = "sha256-EUegM4sVP/vDikNr4LwnWzhDBSgfxYe6mxnrhSdXhIQ="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; From 40d3961452f99f69baff69795109463fe739dc79 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 18 Jan 2024 22:54:40 +0100 Subject: [PATCH 054/112] vscode-extensions.github.vscode-github-actions: 0.25.6 -> 0.26.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 939a184d777e..9c0b703404d6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1630,8 +1630,8 @@ let mktplcRef = { name = "vscode-github-actions"; publisher = "github"; - version = "0.25.6"; - sha256 = "sha256-HRj/AQI9E6HDkZ2ok/h/+c9HHq1wVXQPAt5mb/Ij+BI="; + version = "0.26.2"; + sha256 = "sha256-sEc6Fbn4XpK8vNK32R4fjnx/R+1xYOwcuhKlo7sPd5o="; }; meta = { description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories"; From dc0e32d82c5453e6b3d917acdc97faa498b7ade0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 18 Jan 2024 22:56:43 +0100 Subject: [PATCH 055/112] vscode-extensions.github.vscode-pull-request-github: 0.75.2023101209 -> 0.78.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9c0b703404d6..4fdd3298e81e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1651,8 +1651,8 @@ let # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they can require insider versions # of VS Code - version = "0.75.2023101209"; - sha256 = "1saz4brd5k1wyy7pz1h3jcl4kq35f78s2q8drjd7v2k97jhy8la1"; + version = "0.78.1"; + sha256 = "sha256-T9oW6o4ItZfR8E1qrcH3nhMvVB6ihi4kpiDz7YGHOcI="; }; meta = { license = lib.licenses.mit; }; }; From 53e9309c69f12fa64d99bf684bd339201ba1f04f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 18 Jan 2024 22:58:24 +0100 Subject: [PATCH 056/112] vscode-extensions.bmewburn.vscode-intelephense-client: 1.10.1 -> 1.10.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4fdd3298e81e..bd875aca80c2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -591,8 +591,8 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.10.1"; - sha256 = "sha256-VZQ3dpwj4RWZuyMba8DM7+JcIBSYB8zimZOkP5mJbms="; + version = "1.10.2"; + sha256 = "sha256-he/aPcsxfqYWI/RJ51d5V0reaTPTATci34xPm93qxGs="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; From 3b4bce89d14c20b69aab39981920d9c0833ddb97 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 18 Jan 2024 23:01:49 +0100 Subject: [PATCH 057/112] vscode-extensions.donjaymanne.githistory: cleanup --- .../editors/vscode/extensions/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bd875aca80c2..3da59fdb6de5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1101,6 +1101,12 @@ let }; donjayamanne.githistory = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "githistory"; + publisher = "donjayamanne"; + version = "0.6.20"; + sha256 = "sha256-nEdYS9/cMS4dcbFje23a47QBZr9eDK3dvtkFWqA+OHU="; + }; meta = { changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog"; description = "View git log, file history, compare branches or commits"; @@ -1109,12 +1115,6 @@ let license = lib.licenses.mit; maintainers = [ ]; }; - mktplcRef = { - name = "githistory"; - publisher = "donjayamanne"; - version = "0.6.20"; - sha256 = "sha256-nEdYS9/cMS4dcbFje23a47QBZr9eDK3dvtkFWqA+OHU="; - }; }; dotenv.dotenv-vscode = buildVscodeMarketplaceExtension { From 744bd465e000444e1c890a4bfefd485535439983 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 18 Jan 2024 23:04:49 +0100 Subject: [PATCH 058/112] vscode-extensions.mkhl.direnv: 0.15.2 -> 0.16.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3da59fdb6de5..16720b4de846 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2376,8 +2376,8 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.15.2"; - sha256 = "06lp4qgnksklgc6nvx1l9z38y7apbx0a6v886nd15aq9rq8my0ka"; + version = "0.16.0"; + sha256 = "sha256-u2AFjvhm3zio1ygW9yD9ZwbywLrEssd0O7/0AtfCvMo="; }; meta = { From 006000061a5b1322a568cfd2ad87c178e97137af Mon Sep 17 00:00:00 2001 From: Benjamin Manuel Date: Thu, 28 Dec 2023 20:24:39 -0600 Subject: [PATCH 059/112] kanata: add support for darwin platforms --- pkgs/tools/system/kanata/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 706382d3dd04..88d4b0552b79 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,4 +1,6 @@ -{ lib +{ stdenv +, lib +, darwin , rustPlatform , fetchFromGitHub , withCmd ? false @@ -17,8 +19,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IzgVF6SHJjOB48VehQ5taD5iWQXFKLcVBWTEl3ArkGQ="; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildFeatures = lib.optional withCmd "cmd"; + # Workaround for https://github.com/nixos/nixpkgs/issues/166205 + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + postInstall = '' install -Dm 444 assets/kanata-icon.svg $out/share/icons/hicolor/scalable/apps/kanata.svg ''; @@ -28,7 +37,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jtroo/kanata"; license = licenses.lgpl3Only; maintainers = with maintainers; [ linj ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "kanata"; }; } From 4d3aa5bc5f282980101149212245be955fc0654e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 23:37:03 +0000 Subject: [PATCH 060/112] wander: 1.0.0 -> 1.0.1 --- pkgs/tools/admin/wander/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix index c3b086806ca1..52747f7477fd 100644 --- a/pkgs/tools/admin/wander/default.nix +++ b/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zz9DqRrylCbUCSBl4wspb8BYfmCyQhMmmYwdsbTExbo="; + sha256 = "sha256-MriFrYE8d4m6RgeaErunyAfKna8xhtUAnHyIwsVvK/o="; }; vendorHash = "sha256-0S8tzP5yNUrH6fp+v7nbUPTMWzYXyGw+ZNcXkSN+tWY="; From 1562d11eba6a84366ccd48241570dd5f438f5c36 Mon Sep 17 00:00:00 2001 From: Benjamin Manuel Date: Thu, 18 Jan 2024 17:49:12 -0600 Subject: [PATCH 061/112] maintainers: add bmanuel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b90bbf7075b..4aa59f7c7820 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2553,6 +2553,12 @@ githubId = 52386117; name = "Blusk"; }; + bmanuel = { + name = "Benjamin Manuel"; + email = "ben@benmanuel.com"; + github = "bmanuel"; + githubId = 3662307; + }; bmilanov = { name = "Biser Milanov"; email = "bmilanov11+nixpkgs@gmail.com"; From a256aea2544de97328e7fba77bc62e88f294d536 Mon Sep 17 00:00:00 2001 From: Benjamin Manuel Date: Thu, 18 Jan 2024 17:50:22 -0600 Subject: [PATCH 062/112] kanata: add bmanuel as a maintainer --- pkgs/tools/system/kanata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 88d4b0552b79..eab7fb3d4b17 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A tool to improve keyboard comfort and usability with advanced customization"; homepage = "https://github.com/jtroo/kanata"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ linj ]; + maintainers = with maintainers; [ bmanuel linj ]; platforms = platforms.unix; mainProgram = "kanata"; }; From 62f30634db2146c23f9aff1c9b598524652bbeb7 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sun, 1 Oct 2023 15:24:11 -0700 Subject: [PATCH 063/112] nixos/systemd: don't require network-online.target for multi-user.target Previously we required network-online.target for multi-user.target. This has made a lot of people very angry and has been widely regarded as a bad move (or at least, very nonstandard): https://github.com/NixOS/nixpkgs/commit/15d761a525a025de0680b62e8ab79a9d183f313d#commitcomment-128564097 This was done because of fragile tests and services declaring dependencies on multi-user.target when they meant network-online.target. Let's rip off the bandaid and fix our tests. --- nixos/doc/manual/release-notes/rl-2405.section.md | 7 +++++++ nixos/modules/system/boot/systemd.nix | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 9e8ef49783ca..c53a1dcce320 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -112,6 +112,13 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively. Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts. +- `multi-user.target` no longer depends on `network-online.target`. + This will potentially break services that assumed this was the case in the past. + This was changed for consistency with other distributions as well as improved boot times. + + We have added a warning for services that are + `after = [ "network-online.target" ]` but do not depend on it (e.g. using `wants`). + - `networking.iproute2.enable` now does not set `environment.etc."iproute2/rt_tables".text`. Setting `environment.etc."iproute2/{CONFIG_FILE_NAME}".text` will override the whole configuration file instead of appending it to the upstream configuration file. diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 46c3f66f02dc..b02f615245d4 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -641,7 +641,6 @@ in systemd.services.systemd-udev-settle.restartIfChanged = false; # Causes long delays in nixos-rebuild systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; - systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.services.systemd-importd.environment = proxy_env; systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138 From 8169ded7a3b730495f9c63d7830aa6fa4b982ee3 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 2 Oct 2023 23:45:13 -0700 Subject: [PATCH 064/112] nixos/tests: fix qemu-vm-restrictnetwork under network-online dep fix --- nixos/tests/qemu-vm-restrictnetwork.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/qemu-vm-restrictnetwork.nix b/nixos/tests/qemu-vm-restrictnetwork.nix index 49a105ef1076..49aefcc099bd 100644 --- a/nixos/tests/qemu-vm-restrictnetwork.nix +++ b/nixos/tests/qemu-vm-restrictnetwork.nix @@ -21,6 +21,8 @@ import ./make-test-python.nix ({ else: start_all() + unrestricted.systemctl("start network-online.target") + restricted.systemctl("start network-online.target") unrestricted.wait_for_unit("network-online.target") restricted.wait_for_unit("network-online.target") From 9ed2e58b7051c8a2193e9db0a92526427c61f006 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 2 Oct 2023 23:49:07 -0700 Subject: [PATCH 065/112] nixos/tests: fix rss2email under network-online dep fix --- nixos/tests/rss2email.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/rss2email.nix b/nixos/tests/rss2email.nix index f32326feb50f..60b27b95fabe 100644 --- a/nixos/tests/rss2email.nix +++ b/nixos/tests/rss2email.nix @@ -55,6 +55,7 @@ import ./make-test-python.nix { testScript = '' start_all() + server.systemctl("start network-online.target") server.wait_for_unit("network-online.target") server.wait_for_unit("opensmtpd") server.wait_for_unit("dovecot2") From c125c234687dfecc225ee0560b0587287e934c1b Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 2 Oct 2023 23:49:26 -0700 Subject: [PATCH 066/112] nixos/tests: fix systemd-networkd-dhcpserver under network-online dep fix --- nixos/tests/systemd-networkd-dhcpserver.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/systemd-networkd-dhcpserver.nix b/nixos/tests/systemd-networkd-dhcpserver.nix index cf0ccb744211..665d8b5a0529 100644 --- a/nixos/tests/systemd-networkd-dhcpserver.nix +++ b/nixos/tests/systemd-networkd-dhcpserver.nix @@ -101,6 +101,9 @@ import ./make-test-python.nix ({pkgs, ...}: { }; testScript = { ... }: '' start_all() + + router.systemctl("start network-online.target") + client.systemctl("start network-online.target") router.wait_for_unit("systemd-networkd-wait-online.service") client.wait_for_unit("systemd-networkd-wait-online.service") client.wait_until_succeeds("ping -c 5 10.0.2.1") From 80edf319fedd0a067e8145312140a76caf95731a Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:22:01 -0700 Subject: [PATCH 067/112] nixos/paperless: fix network-online.target dependencies --- nixos/modules/services/misc/paperless.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 3c6832958f59..ca34a327dbdf 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -297,6 +297,7 @@ in wantedBy = [ "paperless-scheduler.service" ]; before = [ "paperless-scheduler.service" ]; after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; serviceConfig = defaultServiceConfig // { User = cfg.user; Type = "oneshot"; From c940ae656d842717c0aaecb90fee3b339e54dea0 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:26:02 -0700 Subject: [PATCH 068/112] nixos/tests: fix opensmtpd under network-online dep fix --- nixos/tests/opensmtpd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 17c1a569ba0d..d32f82ed33b8 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -104,6 +104,7 @@ import ./make-test-python.nix { testScript = '' start_all() + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") smtp1.wait_for_unit("opensmtpd") smtp2.wait_for_unit("opensmtpd") From d51e4a6443c0deb29510ad23f3e0f180aa9ba5d5 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:26:18 -0700 Subject: [PATCH 069/112] nixos/tests: fix uptermd under network-online dep fix --- nixos/tests/uptermd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/uptermd.nix b/nixos/tests/uptermd.nix index 429e3c9dd5ff..469aa5047c27 100644 --- a/nixos/tests/uptermd.nix +++ b/nixos/tests/uptermd.nix @@ -28,6 +28,7 @@ in start_all() server.wait_for_unit("uptermd.service") + server.systemctl("start network-online.target") server.wait_for_unit("network-online.target") # wait for upterm port to be reachable From 062be41387b9d571fdb96102a2e676944abefe0d Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:27:26 -0700 Subject: [PATCH 070/112] nixos/tests: fix zrepl under network-online dep fix --- nixos/tests/zrepl.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/zrepl.nix b/nixos/tests/zrepl.nix index b16c7eddc7ae..bdf11122c73f 100644 --- a/nixos/tests/zrepl.nix +++ b/nixos/tests/zrepl.nix @@ -42,6 +42,7 @@ import ./make-test-python.nix ( start_all() with subtest("Wait for zrepl and network ready"): + host.systemctl("start network-online.target") host.wait_for_unit("network-online.target") host.wait_for_unit("zrepl.service") From 367d101073db523e88cbad02135ce3fd2b847b17 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 3 Oct 2023 00:28:50 -0700 Subject: [PATCH 071/112] nixos/systemd: assert After=network-online.target -> Wants= This will catch broken services at the evaluation stage. --- nixos/modules/system/boot/systemd.nix | 45 ++++++++++++++++++--------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b02f615245d4..331ca5103ba6 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -451,20 +451,37 @@ in cfg.services ); - assertions = concatLists ( - mapAttrsToList - (name: service: - map (message: { - assertion = false; - inherit message; - }) (concatLists [ - (optional ((builtins.elem "network-interfaces.target" service.after) || (builtins.elem "network-interfaces.target" service.wants)) - "Service '${name}.service' is using the deprecated target network-interfaces.target, which no longer exists. Using network.target is recommended instead." - ) - ]) - ) - cfg.services - ); + assertions = let + mkOneAssert = typeStr: name: def: { + assertion = lib.elem "network-online.target" def.after -> lib.elem "network-online.target" (def.wants ++ def.requires ++ def.bindsTo); + message = "${name}.${typeStr} is ordered after 'network-online.target' but doesn't depend on it"; + }; + mkAsserts = typeStr: lib.mapAttrsToList (mkOneAssert typeStr); + mkMountAsserts = typeStr: map (m: mkOneAssert typeStr m.what m); + in mkMerge [ + (concatLists ( + mapAttrsToList + (name: service: + map (message: { + assertion = false; + inherit message; + }) (concatLists [ + (optional ((builtins.elem "network-interfaces.target" service.after) || (builtins.elem "network-interfaces.target" service.wants)) + "Service '${name}.service' is using the deprecated target network-interfaces.target, which no longer exists. Using network.target is recommended instead." + ) + ]) + ) + cfg.services + )) + (mkAsserts "target" cfg.targets) + (mkAsserts "service" cfg.services) + (mkAsserts "socket" cfg.sockets) + (mkAsserts "timer" cfg.timers) + (mkAsserts "path" cfg.paths) + (mkMountAsserts "mount" cfg.mounts) + (mkMountAsserts "automount" cfg.automounts) + (mkAsserts "slice" cfg.slices) + ]; system.build.units = cfg.units; From 9ce6ff06c76257ad7e04c122b08253d7c3e5ebd7 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:32:37 -0700 Subject: [PATCH 072/112] nixos/tests: fix kanidm under network-online dep fix --- nixos/tests/kanidm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 3f5bca397740..fa24d4a8a5e1 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -67,6 +67,7 @@ import ./make-test-python.nix ({ pkgs, ... }: '' start_all() server.wait_for_unit("kanidm.service") + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") with subtest("Test HTTP interface"): From e4168ef9ba69ecd60856550287ea1e1feac43c50 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:32:57 -0700 Subject: [PATCH 073/112] nixos/tests: fix rspamd under network-online dep fix --- nixos/tests/opensmtpd-rspamd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/opensmtpd-rspamd.nix b/nixos/tests/opensmtpd-rspamd.nix index 19969a7b47dd..e413a2050bd6 100644 --- a/nixos/tests/opensmtpd-rspamd.nix +++ b/nixos/tests/opensmtpd-rspamd.nix @@ -119,6 +119,7 @@ import ./make-test-python.nix { testScript = '' start_all() + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") smtp1.wait_for_unit("opensmtpd") smtp2.wait_for_unit("opensmtpd") From 99813e788b9eebf148f8e9b23a8fc86b53774b5d Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:34:56 -0700 Subject: [PATCH 074/112] nixos/tests: fix corerad under network-online dep fix --- nixos/tests/corerad.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/corerad.nix b/nixos/tests/corerad.nix index b6f5d7fc6f75..dd2bec794a1a 100644 --- a/nixos/tests/corerad.nix +++ b/nixos/tests/corerad.nix @@ -56,6 +56,8 @@ import ./make-test-python.nix ( with subtest("Wait for CoreRAD and network ready"): # Ensure networking is online and CoreRAD is ready. + router.systemctl("start network-online.target") + client.systemctl("start network-online.target") router.wait_for_unit("network-online.target") client.wait_for_unit("network-online.target") router.wait_for_unit("corerad.service") From 05dc4bd146052188e2d40399dd5b3aa247e29625 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:36:15 -0700 Subject: [PATCH 075/112] nixos/tests: fix ferm under network-online dep fix --- nixos/tests/ferm.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index be43877445eb..87c67ac62347 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -55,6 +55,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { '' start_all() + client.systemctl("start network-online.target") + server.systemctl("start network-online.target") client.wait_for_unit("network-online.target") server.wait_for_unit("network-online.target") server.wait_for_unit("ferm.service") From a80464eee4accc21304c1a0cfdcdb50a8749cd9f Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:38:37 -0700 Subject: [PATCH 076/112] nixos/tests: fix bittorrent under network-online dep fix --- nixos/tests/bittorrent.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 4a73fea6a09d..473b05d4c98e 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -115,6 +115,7 @@ in start_all() # Wait for network and miniupnpd. + router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") router.wait_for_unit("miniupnpd") @@ -129,6 +130,7 @@ in tracker.succeed("chmod 644 /tmp/test.torrent") # Start the tracker. !!! use a less crappy tracker + tracker.systemctl("start network-online.target") tracker.wait_for_unit("network-online.target") tracker.wait_for_unit("opentracker.service") tracker.wait_for_open_port(6969) @@ -140,6 +142,7 @@ in # Now we should be able to download from the client behind the NAT. tracker.wait_for_unit("httpd") + client1.systemctl("start network-online.target") client1.wait_for_unit("network-online.target") client1.succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent >&2 &") client1.wait_for_file("${download-dir}/test.tar.bz2") @@ -152,6 +155,7 @@ in # Now download from the second client. This can only succeed if # the first client created a NAT hole in the router. + client2.systemctl("start network-online.target") client2.wait_for_unit("network-online.target") client2.succeed( "transmission-remote --add http://${externalTrackerAddress}/test.torrent --no-portmap --no-dht >&2 &" From 7078a1b3567c13f28c12d7a07c020719bb5376b2 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:39:10 -0700 Subject: [PATCH 077/112] nixos/tests: fix systemd-networkd-ipv6-prefix-delegation under network-online dep fix --- nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 54f371e6c070..1e55341657bd 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -263,9 +263,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; }; }; - - # make the network-online target a requirement, we wait for it in our test script - systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; }; # This is the client behind the router. We should be receiving router @@ -278,9 +275,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { useNetworkd = true; useDHCP = false; }; - - # make the network-online target a requirement, we wait for it in our test script - systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; }; }; @@ -294,6 +288,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # Since we only care about IPv6 that should not involve waiting for legacy # IP leases. client.start() + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") # the static address on the router should not be reachable @@ -312,6 +307,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { isp.wait_for_unit("multi-user.target") # wait until the uplink interface has a good status + router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") router.wait_until_succeeds("ping -6 -c1 2001:DB8::1") From ce602cc0aa6ccf1f09d8ec30f480bd0d4b28561f Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:47:33 -0700 Subject: [PATCH 078/112] nixos/kea: also want network-online.target --- nixos/modules/services/networking/kea.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index 5ca705976c41..409fede0f595 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -325,6 +325,9 @@ in "network-online.target" "time-sync.target" ]; + wants = [ + "network-online.target" + ]; wantedBy = [ "multi-user.target" ]; @@ -372,6 +375,9 @@ in "network-online.target" "time-sync.target" ]; + wants = [ + "network-online.target" + ]; wantedBy = [ "multi-user.target" ]; From 81a3fa04cadaeec78299b0bb3c039fb38d13542a Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:48:07 -0700 Subject: [PATCH 079/112] nixos/buildbot: master also wants network-online.target --- .../modules/services/continuous-integration/buildbot/master.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 446d19b8fd5a..c86cb81e5df4 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -268,6 +268,7 @@ in { systemd.services.buildbot-master = { description = "Buildbot Continuous Integration Server."; after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; path = cfg.packages ++ cfg.pythonPackages python.pkgs; environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ package ])}/${python.sitePackages}"; From deb9370b88baaad1816bb69d97fe977265ad499a Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:48:36 -0700 Subject: [PATCH 080/112] nixos/tests: fix curl-impersonate under network-online dep fix --- nixos/tests/curl-impersonate.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/curl-impersonate.nix b/nixos/tests/curl-impersonate.nix index 7954e9e5584c..33b10da1dfd0 100644 --- a/nixos/tests/curl-impersonate.nix +++ b/nixos/tests/curl-impersonate.nix @@ -144,6 +144,8 @@ in { start_all() with subtest("Wait for network"): + web.systemctl("start network-online.target") + curl.systemctl("start network-online.target") web.wait_for_unit("network-online.target") curl.wait_for_unit("network-online.target") From cc63754f5677b318f2db9e0a2e70ca36b4931687 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:49:19 -0700 Subject: [PATCH 081/112] nixos/tests: fix networking under network-online dep fix --- nixos/tests/networking.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 768d0cfa2238..6bd89902eedb 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -130,6 +130,7 @@ let start_all() client.wait_for_unit("network.target") + router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") with subtest("Make sure DHCP server is not started"): @@ -222,6 +223,7 @@ let start_all() client.wait_for_unit("network.target") + router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") with subtest("Wait until we have an ip address on each interface"): @@ -849,6 +851,7 @@ let client.wait_for_unit("network.target") client_with_privacy.wait_for_unit("network.target") + router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") with subtest("Wait until we have an ip address"): From 9067ecf283d13646c8272d03a88e96031a9a92fd Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:53:37 -0700 Subject: [PATCH 082/112] nixos/tests: fix hostname under network-online dep fix [BROKEN] --- nixos/tests/hostname.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/hostname.nix b/nixos/tests/hostname.nix index 6122e2ffeb83..dffec956bc0b 100644 --- a/nixos/tests/hostname.nix +++ b/nixos/tests/hostname.nix @@ -34,6 +34,7 @@ let machine = ${hostName} + machine.systemctl("start network-online.target") machine.wait_for_unit("network-online.target") # Test if NixOS computes the correct FQDN (either a FQDN or an error/null): From 274466d1fc8e0d462fd1feaa95cd1580162b857d Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:54:15 -0700 Subject: [PATCH 083/112] nixos/tests: fix acme under network-online dep fix --- nixos/tests/acme.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index e5f2d4c7934a..272782dc2f62 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -522,6 +522,7 @@ in { 'curl --data \'{"host": "${caDomain}", "addresses": ["${nodes.acme.networking.primaryIPAddress}"]}\' http://${dnsServerIP nodes}:8055/add-a' ) + acme.systemctl("start network-online.target") acme.wait_for_unit("network-online.target") acme.wait_for_unit("pebble.service") From 9fe27a9567ab71284a4ea878f4fbe7320d8bd1ad Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:55:15 -0700 Subject: [PATCH 084/112] nixos/tests: fix buildbot under network-online dep fix --- nixos/tests/buildbot.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 2f6926313b7c..149d73bba09c 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -71,6 +71,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { gitrepo.wait_for_unit("multi-user.target") with subtest("Repo is accessible via git daemon"): + bbmaster.systemctl("start network-online.target") bbmaster.wait_for_unit("network-online.target") bbmaster.succeed("rm -rfv /tmp/fakerepo") bbmaster.succeed("git clone git://gitrepo/fakerepo /tmp/fakerepo") @@ -78,6 +79,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Master service and worker successfully connect"): bbmaster.wait_for_unit("buildbot-master.service") bbmaster.wait_until_succeeds("curl --fail -s --head http://bbmaster:8010") + bbworker.systemctl("start network-online.target") bbworker.wait_for_unit("network-online.target") bbworker.succeed("nc -z bbmaster 8010") bbworker.succeed("nc -z bbmaster 9989") From 58aa87fb71d77a61fee0dc458f94b7185c37d8de Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:56:08 -0700 Subject: [PATCH 085/112] nixos/tests: fix nfs/kerberos under network-online dep fix [BROKEN] --- nixos/tests/nfs/kerberos.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/nfs/kerberos.nix b/nixos/tests/nfs/kerberos.nix index 1bace4058be5..5944b53319a0 100644 --- a/nixos/tests/nfs/kerberos.nix +++ b/nixos/tests/nfs/kerberos.nix @@ -105,6 +105,7 @@ in server.wait_for_unit("rpc-gssd.service") server.wait_for_unit("rpc-svcgssd.service") + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") # add principals to client keytab From 83ba37ca2d566eb9c4748cd93e79d6838bb34147 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:57:07 -0700 Subject: [PATCH 086/112] nixos/tests: fix ulogd under network-online dep fix --- nixos/tests/ulogd/ulogd.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/ulogd/ulogd.py b/nixos/tests/ulogd/ulogd.py index d20daa4d733a..76a8d0c6e24a 100644 --- a/nixos/tests/ulogd/ulogd.py +++ b/nixos/tests/ulogd/ulogd.py @@ -1,5 +1,6 @@ start_all() machine.wait_for_unit("ulogd.service") +machine.systemctl("start network-online.target") machine.wait_for_unit("network-online.target") with subtest("Ulogd is running"): From f25957bb58b833cdeadd78269ef7e5e33d793310 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:58:13 -0700 Subject: [PATCH 087/112] nixos/tests: fix 3proxy under network-online dep fix --- nixos/tests/3proxy.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/3proxy.nix b/nixos/tests/3proxy.nix index 83d39de018a3..b80b4e166d48 100644 --- a/nixos/tests/3proxy.nix +++ b/nixos/tests/3proxy.nix @@ -134,6 +134,7 @@ testScript = '' start_all() + peer0.systemctl("start network-online.target") peer0.wait_for_unit("network-online.target") peer1.wait_for_unit("3proxy.service") From c11401bf4bf324a962190e3b13c0fc8154382322 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:59:34 -0700 Subject: [PATCH 088/112] nixos/tests: fix trafficserver under network-online dep fix --- nixos/tests/trafficserver.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/trafficserver.nix b/nixos/tests/trafficserver.nix index e4557c6c50e5..94d0e4dd926e 100644 --- a/nixos/tests/trafficserver.nix +++ b/nixos/tests/trafficserver.nix @@ -104,6 +104,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { ats.wait_for_open_port(80) httpbin.wait_for_unit("httpbin") httpbin.wait_for_open_port(80) + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") with subtest("Traffic Server is running"): From b4cfeeb20d9efbf9343ce88a57dbb78045ae2bbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 03:01:59 +0000 Subject: [PATCH 089/112] python311Packages.telegram-text: 0.1.2 -> 0.2.0 --- pkgs/development/python-modules/telegram-text/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/telegram-text/default.nix b/pkgs/development/python-modules/telegram-text/default.nix index b79cd78bf4b9..5ab09ea41c3d 100644 --- a/pkgs/development/python-modules/telegram-text/default.nix +++ b/pkgs/development/python-modules/telegram-text/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "telegram-text"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SKY-ALIN"; repo = "telegram-text"; - rev = "v${version}"; - hash = "sha256-p8SVQq7IvkVuOFE8VDugROLY5Wk0L2HmXyacTzFFSP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-eUy4kyCmM/5Ag/0s9hYW2IIg+OTX2L7EsoOYivhd0pU="; }; nativeBuildInputs = [ From fa63ccce212167d22d572f0f11a99f5f1685e875 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 06:46:42 +0100 Subject: [PATCH 090/112] python311Packages.bthome-ble: 3.4.1 -> 3.5.0 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/refs/tags/v3.4.1...v3.5.0 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v3.5.0/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 746c918120ec..faa8582b6b22 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-1Srimb+MfWiX5NdmDQHJsmn6LatWd8nmXaB4uXdHKWY="; + hash = "sha256-7/09RasnW4cTUbwf3N+9DxsGG9pCaqAODX2UNWvlxZg="; }; nativeBuildInputs = [ From 8f0e83be499f3bac67efac9575159b87b1200ec9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 07:50:42 +0100 Subject: [PATCH 091/112] python311Packages.msoffcrypto-tool: 5.2.0 -> 5.3.1 Diff: https://github.com/nolze/msoffcrypto-tool/compare/refs/tags/v5.2.0...v5.3.1 Changelog: https://github.com/nolze/msoffcrypto-tool/blob/v5.3.1/CHANGELOG.md --- pkgs/development/python-modules/msoffcrypto-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 4e28e2002452..4bc2e80642e6 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.2.0"; + version = "5.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nolze"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9qhTGf4IE8PtTfshnqu2fcctznA+2bWH4jz0dmKtoOo="; + hash = "sha256-aQtEJyG0JGe4eSIRI4OUjJZNDBni6FFyJXXkbeiotSY="; }; nativeBuildInputs = [ From f3e17f3b0c7515f9e5b20d0f9cc456e20fe0d047 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 19 Jan 2024 11:14:44 +0400 Subject: [PATCH 092/112] python311Packages.telegram-text: drop support for python 3.7 --- pkgs/development/python-modules/telegram-text/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/telegram-text/default.nix b/pkgs/development/python-modules/telegram-text/default.nix index 5ab09ea41c3d..ca37dde8fb86 100644 --- a/pkgs/development/python-modules/telegram-text/default.nix +++ b/pkgs/development/python-modules/telegram-text/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "telegram-text"; version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "SKY-ALIN"; From ab0e6f9c2cd1915cb0218f2e6fb2faa709cc77da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 07:23:03 +0000 Subject: [PATCH 093/112] crowdin-cli: 3.16.0 -> 3.16.1 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index c02021790ca0..2d7821156cad 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-/K9K82ioF/fczDY3kaNXUm0TdA9Y6xaUUYUIiRgWKvo="; + hash = "sha256-B68pCNQYly/0OQJkSjztP08bQGaGQeE+AAOiu5VbszY="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 3f074f7b9f8f8454d4058e362ef5b20e86641903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 07:47:13 +0000 Subject: [PATCH 094/112] kubernetes-helmPlugins.helm-diff: 3.8.1 -> 3.9.2 --- .../networking/cluster/helm/plugins/helm-diff.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index ec5a4eb4f35e..3ed94a3a621c 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.8.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x3tTHiuw0CtvsOCB7oPd9EB+B5T1m6Hn7O1CriYahuA="; + sha256 = "sha256-4EjvjvW8aal/ekGV0ePevPf30NarrWIh6id30n1r2dE="; }; - vendorHash = "sha256-2tiBFS3gvSbnyighSorg/ar058ZJmiQviaT13zOS8KA="; + vendorHash = "sha256-RPb5+tZkOsubOl0YlSXsybmlOtKVbJ97c+f/wiz/gmE="; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; From 426d5046b586fa63a5f78d5879bec32acea2f7d4 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 00:59:44 -0700 Subject: [PATCH 095/112] nixos/tests: fix babeld under network-online dep fix --- nixos/tests/babeld.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix index d4df6f86d089..e497aa5b64e1 100644 --- a/nixos/tests/babeld.nix +++ b/nixos/tests/babeld.nix @@ -120,10 +120,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { '' start_all() - client.wait_for_unit("network-online.target") - local_router.wait_for_unit("network-online.target") - remote_router.wait_for_unit("network-online.target") - local_router.wait_for_unit("babeld.service") remote_router.wait_for_unit("babeld.service") From 5714c8465a9ea0fb90b3ef8f0846c6ec01d3de5e Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 01:01:40 -0700 Subject: [PATCH 096/112] nixos/tests: fix lemmy under network-online dep fix --- nixos/tests/lemmy.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix index de2c4938fe23..e8d747f89a9e 100644 --- a/nixos/tests/lemmy.nix +++ b/nixos/tests/lemmy.nix @@ -59,6 +59,7 @@ in server.succeed("curl --fail localhost:${toString uiPort}") with subtest("Lemmy-UI responds through the caddy reverse proxy"): + server.systemctl("start network-online.target") server.wait_for_unit("network-online.target") server.wait_for_unit("caddy.service") server.wait_for_open_port(80) @@ -66,6 +67,7 @@ in assert "Lemmy" in body, f"String Lemmy not found in response for ${lemmyNodeName}: \n{body}" with subtest("the server is exposed externally"): + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") client.succeed("curl -v --fail ${lemmyNodeName}") From 42cda3b36b2d2b78de480e23132778bee6c7319b Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 01:01:59 -0700 Subject: [PATCH 097/112] nixos/tests: fix upnp under network-online dep fix --- nixos/tests/upnp.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix index 5e135267403b..93bc08f752ce 100644 --- a/nixos/tests/upnp.nix +++ b/nixos/tests/upnp.nix @@ -81,11 +81,13 @@ in start_all() # Wait for network and miniupnpd. + router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") # $router.wait_for_unit("nat") router.wait_for_unit("${if useNftables then "nftables" else "firewall"}.service") router.wait_for_unit("miniupnpd") + client1.systemctl("start network-online.target") client1.wait_for_unit("network-online.target") client1.succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP") From dbb2d3e220915443caf65e347f525f2a6e6604c9 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 01:02:18 -0700 Subject: [PATCH 098/112] nixos/tests: fix systemd-nspawm under network-online dep fix --- nixos/tests/systemd-nspawn.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/systemd-nspawn.nix b/nixos/tests/systemd-nspawn.nix index 1a4251ef069e..b86762233d18 100644 --- a/nixos/tests/systemd-nspawn.nix +++ b/nixos/tests/systemd-nspawn.nix @@ -38,6 +38,7 @@ in { start_all() server.wait_for_unit("nginx.service") + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") client.succeed("machinectl pull-raw --verify=signature http://server/testimage.raw") client.succeed( From 9b29e5eb7efc7327f2ba5cb44a98df4196fb8ce3 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 01:04:16 -0700 Subject: [PATCH 099/112] nixos/tests: fix owncast under network-online dep fix [BROKEN] --- nixos/tests/owncast.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/owncast.nix b/nixos/tests/owncast.nix index debb34f5009d..73aac4e70475 100644 --- a/nixos/tests/owncast.nix +++ b/nixos/tests/owncast.nix @@ -31,6 +31,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = '' start_all() + client.systemctl("start network-online.target") + server.systemctl("start network-online.target") client.wait_for_unit("network-online.target") server.wait_for_unit("network-online.target") server.wait_for_unit("owncast.service") From 174ffdcbc4f0512b26053ed18b53af1661d9cf27 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 01:04:57 -0700 Subject: [PATCH 100/112] nixos/tests: fix tayga under network-online dep fix --- nixos/tests/tayga.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/tayga.nix b/nixos/tests/tayga.nix index 44974f6efea8..4aade67d74d0 100644 --- a/nixos/tests/tayga.nix +++ b/nixos/tests/tayga.nix @@ -206,6 +206,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: testScript = '' # start client and server for machine in client, server: + machine.systemctl("start network-online.target") machine.wait_for_unit("network-online.target") machine.log(machine.execute("ip addr")[1]) machine.log(machine.execute("ip route")[1]) @@ -214,6 +215,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # test systemd-networkd and nixos-scripts based router for router in router_systemd, router_nixos: router.start() + router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") router.wait_for_unit("tayga.service") router.log(machine.execute("ip addr")[1]) From b8da5d6a3c690909ea3721cded8b8bd0e8476e18 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 22:08:33 -0700 Subject: [PATCH 101/112] nixos/tests: fix gitdaemon under network-online dep fix --- nixos/tests/gitdaemon.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix index bb07b6e97b7f..052fa902b450 100644 --- a/nixos/tests/gitdaemon.nix +++ b/nixos/tests/gitdaemon.nix @@ -59,6 +59,9 @@ in { with subtest("git daemon starts"): server.wait_for_unit("git-daemon.service") + + server.systemctl("start network-online.target") + client.systemctl("start network-online.target") server.wait_for_unit("network-online.target") client.wait_for_unit("network-online.target") From 6c5ab28fcee342254aa9c8704008e2f33dc0dde1 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 22:21:50 -0700 Subject: [PATCH 102/112] nixos: fix a bunch of services missing dep on network-online.target This was done by generating a truly hilarious configuration: rg 'services\.[^.]+\.enable\t' opts-tags | cut -f1 > allonconfig.nix The following were not tested due to other evaluation errors. They should probably be manually audited. services.amule services.castopod services.ceph services.chatgpt-retrieval-plugin services.clamsmtp services.clight services.dante services.dex services.discourse services.dwm-status services.engelsystem services.foundationdb services.frigate services.frp services.grocy services.guacamole-client services.hedgedoc services.home-assistant services.honk services.imaginary services.jitsi-meet services.kerberos_server services.limesurvey services.mastodon services.mediawiki services.mobilizon services.moodle services.mosquitto services.nextcloud services.nullmailer services.patroni services.pfix-srsd services.pgpkeyserver-lite services.postfixadmin services.roundcube services.schleuder services.self-deploy services.slskd services.spacecookie services.statsd services.step-ca services.sympa services.tsmBackup services.vdirsyncer services.vikunja services.yandex-disk services.zabbixWeb --- nixos/modules/services/audio/gmediarender.nix | 1 + nixos/modules/services/audio/jmusicbot.nix | 1 + nixos/modules/services/audio/spotifyd.nix | 1 + nixos/modules/services/audio/ympd.nix | 1 + nixos/modules/services/continuous-integration/hydra/default.nix | 1 + nixos/modules/services/databases/lldap.nix | 1 + nixos/modules/services/databases/openldap.nix | 1 + nixos/modules/services/desktops/geoclue2.nix | 2 ++ nixos/modules/services/home-automation/evcc.nix | 1 + nixos/modules/services/logging/journaldriver.nix | 1 + nixos/modules/services/matrix/synapse.nix | 2 ++ nixos/modules/services/misc/bcg.nix | 2 +- nixos/modules/services/misc/domoticz.nix | 1 + nixos/modules/services/misc/etesync-dav.nix | 1 + nixos/modules/services/misc/mediatomb.nix | 1 + nixos/modules/services/misc/metabase.nix | 1 + nixos/modules/services/monitoring/mackerel-agent.nix | 1 + nixos/modules/services/monitoring/teamviewer.nix | 1 + nixos/modules/services/monitoring/telegraf.nix | 1 + nixos/modules/services/network-filesystems/openafs/client.nix | 1 + nixos/modules/services/networking/ergo.nix | 1 + nixos/modules/services/networking/expressvpn.nix | 1 + nixos/modules/services/networking/headscale.nix | 1 + nixos/modules/services/networking/ivpn.nix | 2 +- nixos/modules/services/networking/mullvad-vpn.nix | 2 +- nixos/modules/services/networking/ocserv.nix | 1 + nixos/modules/services/networking/pleroma.nix | 1 + nixos/modules/services/networking/soju.nix | 1 + nixos/modules/services/networking/strongswan-swanctl/module.nix | 1 + nixos/modules/services/networking/strongswan.nix | 1 + nixos/modules/services/networking/syncplay.nix | 1 + nixos/modules/services/networking/wasabibackend.nix | 1 + nixos/modules/services/networking/znc/default.nix | 1 + nixos/modules/services/security/certmgr.nix | 1 + nixos/modules/services/security/oauth2_proxy.nix | 1 + nixos/modules/services/system/cachix-agent/default.nix | 1 + nixos/modules/services/system/cachix-watch-store.nix | 1 + nixos/modules/services/video/go2rtc/default.nix | 1 + nixos/modules/services/web-apps/akkoma.nix | 2 +- nixos/modules/services/web-apps/alps.nix | 1 + nixos/modules/services/web-apps/code-server.nix | 1 + nixos/modules/services/web-apps/healthchecks.nix | 1 + nixos/modules/services/web-apps/netbox.nix | 1 + nixos/modules/services/web-apps/openvscode-server.nix | 1 + nixos/modules/services/web-apps/peering-manager.nix | 1 + nixos/modules/services/web-servers/agate.nix | 1 + nixos/modules/services/web-servers/mighttpd2.nix | 1 + nixos/modules/services/web-servers/minio.nix | 1 + nixos/modules/services/web-servers/traefik.nix | 1 + nixos/modules/virtualisation/oci-containers.nix | 1 + 50 files changed, 52 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/audio/gmediarender.nix b/nixos/modules/services/audio/gmediarender.nix index 545f2b1a2b60..a4cb89098db7 100644 --- a/nixos/modules/services/audio/gmediarender.nix +++ b/nixos/modules/services/audio/gmediarender.nix @@ -64,6 +64,7 @@ in config = mkIf cfg.enable { systemd = { services.gmediarender = { + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; description = "gmediarender server daemon"; diff --git a/nixos/modules/services/audio/jmusicbot.nix b/nixos/modules/services/audio/jmusicbot.nix index fd1d4da19284..e7803677d0fd 100644 --- a/nixos/modules/services/audio/jmusicbot.nix +++ b/nixos/modules/services/audio/jmusicbot.nix @@ -26,6 +26,7 @@ in config = mkIf cfg.enable { systemd.services.jmusicbot = { wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; description = "Discord music bot that's easy to set up and run yourself!"; serviceConfig = mkMerge [{ diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix index 975be5a87cba..1194b6f200d7 100644 --- a/nixos/modules/services/audio/spotifyd.nix +++ b/nixos/modules/services/audio/spotifyd.nix @@ -50,6 +50,7 @@ in systemd.services.spotifyd = { wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" "sound.target" ]; description = "spotifyd, a Spotify playing daemon"; environment.SHELL = "/bin/sh"; diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix index b74cc3f9c0b4..6e8d22dab3c8 100644 --- a/nixos/modules/services/audio/ympd.nix +++ b/nixos/modules/services/audio/ympd.nix @@ -50,6 +50,7 @@ in { description = "Standalone MPD Web GUI written in C"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 46b03bba37be..54bbe69703f9 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -393,6 +393,7 @@ in systemd.services.hydra-evaluator = { wantedBy = [ "multi-user.target" ]; requires = [ "hydra-init.service" ]; + wants = [ "network-online.target" ]; after = [ "hydra-init.service" "network.target" "network-online.target" ]; path = with pkgs; [ hydra-package nettools jq ]; restartTriggers = [ hydraConf ]; diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix index d1574c98fe67..e821da8e58aa 100644 --- a/nixos/modules/services/databases/lldap.nix +++ b/nixos/modules/services/databases/lldap.nix @@ -104,6 +104,7 @@ in config = lib.mkIf cfg.enable { systemd.services.lldap = { description = "Lightweight LDAP server (lldap)"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index a7a0909f55e1..df36e37976a4 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -294,6 +294,7 @@ in { "man:slapd-mdb" ]; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { User = cfg.user; diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index b04f46c26a56..2a68bb0b55f3 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -200,6 +200,7 @@ in }; systemd.services.geoclue = { + wants = lib.optionals cfg.enableWifi [ "network-online.target" ]; after = lib.optionals cfg.enableWifi [ "network-online.target" ]; # restart geoclue service when the configuration changes restartTriggers = [ @@ -217,6 +218,7 @@ in # we can't be part of a system service, and the agent should # be okay with the main service coming and going wantedBy = [ "default.target" ]; + wants = lib.optionals cfg.enableWifi [ "network-online.target" ]; after = lib.optionals cfg.enableWifi [ "network-online.target" ]; unitConfig.ConditionUser = "!@system"; serviceConfig = { diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix index d0ce3fb4a1ce..f360f525b04b 100644 --- a/nixos/modules/services/home-automation/evcc.nix +++ b/nixos/modules/services/home-automation/evcc.nix @@ -41,6 +41,7 @@ in config = mkIf cfg.enable { systemd.services.evcc = { + wants = [ "network-online.target" ]; after = [ "network-online.target" "mosquitto.target" diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix index 59eedff90d60..4d21464018aa 100644 --- a/nixos/modules/services/logging/journaldriver.nix +++ b/nixos/modules/services/logging/journaldriver.nix @@ -84,6 +84,7 @@ in { systemd.services.journaldriver = { description = "Stackdriver Logging journal forwarder"; script = "${pkgs.journaldriver}/bin/journaldriver"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 50019d2a25cb..4c1c396eac05 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -1056,6 +1056,7 @@ in { systemd.targets.matrix-synapse = lib.mkIf hasWorkers { description = "Synapse Matrix parent target"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; wantedBy = [ "multi-user.target" ]; }; @@ -1071,6 +1072,7 @@ in { requires = optional hasLocalPostgresDB "postgresql.service"; } else { + wants = [ "network-online.target" ]; after = [ "network-online.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; requires = optional hasLocalPostgresDB "postgresql.service"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/misc/bcg.nix b/nixos/modules/services/misc/bcg.nix index 9da4a879cdd0..ad0b9c871342 100644 --- a/nixos/modules/services/misc/bcg.nix +++ b/nixos/modules/services/misc/bcg.nix @@ -154,7 +154,7 @@ in in { description = "BigClown Gateway"; wantedBy = [ "multi-user.target" ]; - wants = mkIf config.services.mosquitto.enable [ "mosquitto.service" ]; + wants = [ "network-online.target" ] ++ lib.optional config.services.mosquitto.enable "mosquitto.service"; after = [ "network-online.target" ]; preStart = '' umask 077 diff --git a/nixos/modules/services/misc/domoticz.nix b/nixos/modules/services/misc/domoticz.nix index fd9fcf0b78eb..315092f93351 100644 --- a/nixos/modules/services/misc/domoticz.nix +++ b/nixos/modules/services/misc/domoticz.nix @@ -35,6 +35,7 @@ in { systemd.services."domoticz" = { description = pkgDesc; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { DynamicUser = true; diff --git a/nixos/modules/services/misc/etesync-dav.nix b/nixos/modules/services/misc/etesync-dav.nix index 9d99d548d95b..ae2b5ad04343 100644 --- a/nixos/modules/services/misc/etesync-dav.nix +++ b/nixos/modules/services/misc/etesync-dav.nix @@ -59,6 +59,7 @@ in systemd.services.etesync-dav = { description = "etesync-dav - A CalDAV and CardDAV adapter for EteSync"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.etesync-dav ]; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index d421d74c53ad..03235e9a1265 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -357,6 +357,7 @@ in { description = "${cfg.serverName} media Server"; # Gerbera might fail if the network interface is not available on startup # https://github.com/gerbera/gerbera/issues/1324 + wants = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${binaryCommand} --port ${toString cfg.port} ${interfaceFlag} ${configFlag} --home ${cfg.dataDir}"; diff --git a/nixos/modules/services/misc/metabase.nix b/nixos/modules/services/misc/metabase.nix index 883fa0b95911..5fc18e27eaae 100644 --- a/nixos/modules/services/misc/metabase.nix +++ b/nixos/modules/services/misc/metabase.nix @@ -77,6 +77,7 @@ in { systemd.services.metabase = { description = "Metabase server"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; environment = { MB_PLUGINS_DIR = "${dataDir}/plugins"; diff --git a/nixos/modules/services/monitoring/mackerel-agent.nix b/nixos/modules/services/monitoring/mackerel-agent.nix index 62a7858500f2..5915634ed26f 100644 --- a/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/nixos/modules/services/monitoring/mackerel-agent.nix @@ -84,6 +84,7 @@ in { # upstream service file in https://git.io/JUt4Q systemd.services.mackerel-agent = { description = "mackerel.io agent"; + wants = [ "network-online.target" ]; after = [ "network-online.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; environment = { diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index 9b1278317943..7c45247aa6d5 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -30,6 +30,7 @@ in description = "TeamViewer remote control daemon"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" "network.target" "dbus.service" ]; requires = [ "dbus.service" ]; preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index ee28ee03adf3..3bab8aba7bd6 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -59,6 +59,7 @@ in { in { description = "Telegraf Agent"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; path = lib.optional (config.services.telegraf.extraConfig.inputs ? procstat) pkgs.procps; serviceConfig = { diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index bb0fee087e62..02c3482ec657 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -215,6 +215,7 @@ in systemd.services.afsd = { description = "AFS client"; wantedBy = [ "multi-user.target" ]; + wants = lib.optional (!cfg.startDisconnected) "network-online.target"; after = singleton (if cfg.startDisconnected then "network.target" else "network-online.target"); serviceConfig = { RemainAfterExit = true; }; restartIfChanged = false; diff --git a/nixos/modules/services/networking/ergo.nix b/nixos/modules/services/networking/ergo.nix index 033d4d9caf8a..1bee0f43f988 100644 --- a/nixos/modules/services/networking/ergo.nix +++ b/nixos/modules/services/networking/ergo.nix @@ -114,6 +114,7 @@ in { systemd.services.ergo = { description = "ergo server"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { User = cfg.user; diff --git a/nixos/modules/services/networking/expressvpn.nix b/nixos/modules/services/networking/expressvpn.nix index 30de6987d31f..05c24d8bccff 100644 --- a/nixos/modules/services/networking/expressvpn.nix +++ b/nixos/modules/services/networking/expressvpn.nix @@ -21,6 +21,7 @@ with lib; RestartSec = 5; }; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; }; }; diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index 4224a0578cc3..95b5fcf6ebde 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -460,6 +460,7 @@ in { systemd.services.headscale = { description = "headscale coordination server for Tailscale"; + wants = [ "network-online.target" ]; after = ["network-online.target"]; wantedBy = ["multi-user.target"]; restartTriggers = [configFile]; diff --git a/nixos/modules/services/networking/ivpn.nix b/nixos/modules/services/networking/ivpn.nix index 6df630c1f194..6c9ae599e670 100644 --- a/nixos/modules/services/networking/ivpn.nix +++ b/nixos/modules/services/networking/ivpn.nix @@ -27,7 +27,7 @@ with lib; systemd.services.ivpn-service = { description = "iVPN daemon"; wantedBy = [ "multi-user.target" ]; - wants = [ "network.target" ]; + wants = [ "network.target" "network-online.target" ]; after = [ "network-online.target" "NetworkManager.service" diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix index 446c71f40764..5da4ca1d1d80 100644 --- a/nixos/modules/services/networking/mullvad-vpn.nix +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -53,7 +53,7 @@ with lib; systemd.services.mullvad-daemon = { description = "Mullvad VPN daemon"; wantedBy = [ "multi-user.target" ]; - wants = [ "network.target" ]; + wants = [ "network.target" "network-online.target" ]; after = [ "network-online.target" "NetworkManager.service" diff --git a/nixos/modules/services/networking/ocserv.nix b/nixos/modules/services/networking/ocserv.nix index 9548fd92dbda..3c61d56b893e 100644 --- a/nixos/modules/services/networking/ocserv.nix +++ b/nixos/modules/services/networking/ocserv.nix @@ -85,6 +85,7 @@ in systemd.services.ocserv = { description = "OpenConnect SSL VPN server"; documentation = [ "man:ocserv(8)" ]; + wants = [ "network-online.target" ]; after = [ "dbus.service" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index db0a61b83469..8470f5e9cbc0 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -92,6 +92,7 @@ in { systemd.services.pleroma = { description = "Pleroma social network"; + wants = [ "network-online.target" ]; after = [ "network-online.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; diff --git a/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix index 7f0ac3e3b8e6..d69ec08ca13a 100644 --- a/nixos/modules/services/networking/soju.nix +++ b/nixos/modules/services/networking/soju.nix @@ -110,6 +110,7 @@ in systemd.services.soju = { description = "soju IRC bouncer"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { DynamicUser = true; diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index c8832ed4defb..a98850923955 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -55,6 +55,7 @@ in { systemd.services.strongswan-swanctl = { description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; path = with pkgs; [ kmod iproute2 iptables util-linux ]; environment = { diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index e58526814d1a..dcf04d2a1917 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -153,6 +153,7 @@ in description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ kmod iproute2 iptables util-linux ]; # XXX Linux + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; environment = { STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix index 0a66d93bf153..151259b6d4ad 100644 --- a/nixos/modules/services/networking/syncplay.nix +++ b/nixos/modules/services/networking/syncplay.nix @@ -107,6 +107,7 @@ in systemd.services.syncplay = { description = "Syncplay Service"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix index 938145b35ee8..e3a48afd2a2c 100644 --- a/nixos/modules/services/networking/wasabibackend.nix +++ b/nixos/modules/services/networking/wasabibackend.nix @@ -119,6 +119,7 @@ in { systemd.services.wasabibackend = { description = "wasabibackend server"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; environment = { DOTNET_PRINT_TELEMETRY_MESSAGE = "false"; diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index d3ba4a524197..e15233293cf2 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -243,6 +243,7 @@ in systemd.services.znc = { description = "ZNC Server"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { User = cfg.user; diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix index db80e943973d..02cb7afe87ba 100644 --- a/nixos/modules/services/security/certmgr.nix +++ b/nixos/modules/services/security/certmgr.nix @@ -182,6 +182,7 @@ in systemd.services.certmgr = { description = "certmgr"; path = mkIf (cfg.svcManager == "command") [ pkgs.bash ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; inherit preStart; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 78916c907279..d1dc37d549d2 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -572,6 +572,7 @@ in description = "OAuth2 Proxy"; path = [ cfg.package ]; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index 196d3291d555..f8020fe970f1 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -49,6 +49,7 @@ in { config = mkIf cfg.enable { systemd.services.cachix-agent = { description = "Cachix Deploy Agent"; + wants = [ "network-online.target" ]; after = ["network-online.target"]; path = [ config.nix.package ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix index 8aa5f0358fa9..d48af29465aa 100644 --- a/nixos/modules/services/system/cachix-watch-store.nix +++ b/nixos/modules/services/system/cachix-watch-store.nix @@ -61,6 +61,7 @@ in config = mkIf cfg.enable { systemd.services.cachix-watch-store-agent = { description = "Cachix watch store Agent"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; path = [ config.nix.package ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/video/go2rtc/default.nix b/nixos/modules/services/video/go2rtc/default.nix index 13851fa0306f..9dddbb60baa8 100644 --- a/nixos/modules/services/video/go2rtc/default.nix +++ b/nixos/modules/services/video/go2rtc/default.nix @@ -94,6 +94,7 @@ in config = lib.mkIf cfg.enable { systemd.services.go2rtc = { + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 8980556ab014..4cd9e2664378 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -974,7 +974,7 @@ in { # This service depends on network-online.target and is sequenced after # it because it requires access to the Internet to function properly. bindsTo = [ "akkoma-config.service" ]; - wants = [ "network-online.service" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; after = [ "akkoma-config.target" diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix index 05fb676102df..81c6b8ad30b5 100644 --- a/nixos/modules/services/web-apps/alps.nix +++ b/nixos/modules/services/web-apps/alps.nix @@ -94,6 +94,7 @@ in { description = "alps is a simple and extensible webmail."; documentation = [ "https://git.sr.ht/~migadu/alps" ]; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; serviceConfig = { diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix index 11601f6c3044..d087deb7848d 100644 --- a/nixos/modules/services/web-apps/code-server.nix +++ b/nixos/modules/services/web-apps/code-server.nix @@ -205,6 +205,7 @@ in { systemd.services.code-server = { description = "Code server"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; path = cfg.extraPackages; environment = { diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix index e5e425a29d54..1d439f162313 100644 --- a/nixos/modules/services/web-apps/healthchecks.nix +++ b/nixos/modules/services/web-apps/healthchecks.nix @@ -176,6 +176,7 @@ in systemd.targets.healthchecks = { description = "Target for all Healthchecks services"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; }; diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index 88d40b3abc52..72ec578146a7 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -267,6 +267,7 @@ in { systemd.targets.netbox = { description = "Target for all NetBox services"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" "redis-netbox.service" ]; }; diff --git a/nixos/modules/services/web-apps/openvscode-server.nix b/nixos/modules/services/web-apps/openvscode-server.nix index 76a19dccae16..81b9d1f3b4c8 100644 --- a/nixos/modules/services/web-apps/openvscode-server.nix +++ b/nixos/modules/services/web-apps/openvscode-server.nix @@ -159,6 +159,7 @@ in systemd.services.openvscode-server = { description = "OpenVSCode server"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; path = cfg.extraPackages; environment = cfg.extraEnvironment; diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index d6f6077268d4..0382ce717473 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -196,6 +196,7 @@ in { systemd.targets.peering-manager = { description = "Target for all Peering Manager services"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" "redis-peering-manager.service" ]; }; diff --git a/nixos/modules/services/web-servers/agate.nix b/nixos/modules/services/web-servers/agate.nix index dce425035ff7..e03174c87945 100644 --- a/nixos/modules/services/web-servers/agate.nix +++ b/nixos/modules/services/web-servers/agate.nix @@ -71,6 +71,7 @@ in systemd.services.agate = { description = "Agate"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; script = diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix index bdd6d8b62aa3..bb75dc4f2ff4 100644 --- a/nixos/modules/services/web-servers/mighttpd2.nix +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -101,6 +101,7 @@ in { ]; systemd.services.mighttpd2 = { description = "Mighttpd2 web server"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 6431db250476..be6946657e23 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -98,6 +98,7 @@ in services.minio = { description = "Minio Object Storage"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index cc2c680b3342..fc9eb504ebf8 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -144,6 +144,7 @@ in { systemd.services.traefik = { description = "Traefik web server"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; startLimitIntervalSec = 86400; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index a4a40346f093..07ed08ab2f84 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -267,6 +267,7 @@ let }; in { wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; + wants = lib.optional (container.imageFile == null) "network-online.target"; after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] # if imageFile is not set, the service needs the network to download the image from the registry ++ lib.optionals (container.imageFile == null) [ "network-online.target" ] From c80398e5d2325c31a4a884b407607b34aa752abc Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 22:52:00 -0700 Subject: [PATCH 103/112] nixos/ircd-hybrid: fix evaluation error --- nixos/modules/services/networking/ircd-hybrid/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index 554b0f7bb8b4..64a34cc52d25 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -125,7 +125,8 @@ in systemd.services.ircd-hybrid = { description = "IRCD Hybrid server"; - after = [ "started networking" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; script = "${ircdService}/bin/control start"; }; From 1b514b3e10319b2d596879467cb13efdc18d970f Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 9 Jan 2024 14:27:18 +0100 Subject: [PATCH 104/112] fix: rxe under network-online.target change [UNSURE IF CORRECT] --- nixos/modules/services/networking/rxe.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/rxe.nix b/nixos/modules/services/networking/rxe.nix index 7dbb4823b4bc..07437ed71195 100644 --- a/nixos/modules/services/networking/rxe.nix +++ b/nixos/modules/services/networking/rxe.nix @@ -33,7 +33,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "systemd-modules-load.service" "network-online.target" ]; - wants = [ "network-pre.target" ]; + wants = [ "network-pre.target" "network-online.target" ]; serviceConfig = { Type = "oneshot"; From fe474ed61a3436644828a9709e2db6ed006f92aa Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 3 Oct 2023 23:23:30 -0700 Subject: [PATCH 105/112] nixos: fix remaining services for network-online dep fix --- .../services/continuous-integration/gitea-actions-runner.nix | 1 + nixos/modules/services/home-automation/home-assistant.nix | 1 + nixos/modules/services/mail/roundcube.nix | 1 + nixos/modules/services/mail/sympa.nix | 2 +- nixos/modules/services/misc/amazon-ssm-agent.nix | 1 + nixos/modules/services/monitoring/prometheus/alertmanager.nix | 1 + nixos/modules/services/networking/bitcoind.nix | 1 + nixos/modules/services/networking/dante.nix | 1 + nixos/modules/services/networking/kea.nix | 1 + nixos/modules/services/networking/mosquitto.nix | 1 + nixos/modules/services/networking/nbd.nix | 1 + nixos/modules/services/networking/rosenpass.nix | 1 + nixos/modules/services/web-apps/c2fmzq-server.nix | 1 + nixos/modules/virtualisation/amazon-image.nix | 1 + 14 files changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix index 3f2be9464849..06f0da3451a6 100644 --- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix +++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix @@ -188,6 +188,7 @@ in nameValuePair "gitea-runner-${escapeSystemdPath name}" { inherit (instance) enable; description = "Gitea Actions Runner"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ] ++ optionals (wantsDocker) [ diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index bc470576b759..a01628968966 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -435,6 +435,7 @@ in { systemd.services.home-assistant = { description = "Home Assistant"; + wants = [ "network-online.target" ]; after = [ "network-online.target" diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index c883c143e523..3f1a695ab91a 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -250,6 +250,7 @@ in path = [ config.services.postgresql.package ]; }) { + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; script = let diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index 04ae46f66eea..13fc8656a2b5 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -435,7 +435,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; - wants = sympaSubServices; + wants = sympaSubServices ++ [ "network-online.target" ]; before = sympaSubServices; serviceConfig = sympaServiceConfig "sympa_msg"; diff --git a/nixos/modules/services/misc/amazon-ssm-agent.nix b/nixos/modules/services/misc/amazon-ssm-agent.nix index 20b836abe164..89a1c0766510 100644 --- a/nixos/modules/services/misc/amazon-ssm-agent.nix +++ b/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -41,6 +41,7 @@ in { # See https://github.com/aws/amazon-ssm-agent/blob/mainline/packaging/linux/amazon-ssm-agent.service systemd.services.amazon-ssm-agent = { inherit (cfg.package.meta) description; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index 4fd630015f35..bb426d8b7beb 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -174,6 +174,7 @@ in { systemd.services.alertmanager = { wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; preStart = '' ${lib.getBin pkgs.envsubst}/bin/envsubst -o "/tmp/alert-manager-substituted.yaml" \ diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index 4512e666ba5b..59722e31c62a 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -198,6 +198,7 @@ in ''; in { description = "Bitcoin daemon"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index 605f2d74f827..f0d1d6305c54 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -47,6 +47,7 @@ in systemd.services.dante = { description = "Dante SOCKS v4 and v5 compatible proxy server"; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index 409fede0f595..656ddd41fd12 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -419,6 +419,7 @@ in "https://kea.readthedocs.io/en/kea-${package.version}/arm/ddns.html" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" "time-sync.target" diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index f2b158b98942..ad9eefb42252 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -596,6 +596,7 @@ in systemd.services.mosquitto = { description = "Mosquitto MQTT Broker Daemon"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; serviceConfig = { Type = "notify"; diff --git a/nixos/modules/services/networking/nbd.nix b/nixos/modules/services/networking/nbd.nix index 454380aa3154..b4bf7ede8463 100644 --- a/nixos/modules/services/networking/nbd.nix +++ b/nixos/modules/services/networking/nbd.nix @@ -117,6 +117,7 @@ in boot.kernelModules = [ "nbd" ]; systemd.services.nbd-server = { + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; before = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/rosenpass.nix b/nixos/modules/services/networking/rosenpass.nix index d2a264b83d67..487cb6f60142 100644 --- a/nixos/modules/services/networking/rosenpass.nix +++ b/nixos/modules/services/networking/rosenpass.nix @@ -208,6 +208,7 @@ in in rec { wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network-online.target" ]; path = [ cfg.package pkgs.wireguard-tools ]; diff --git a/nixos/modules/services/web-apps/c2fmzq-server.nix b/nixos/modules/services/web-apps/c2fmzq-server.nix index 87938fe160e1..dee131182de1 100644 --- a/nixos/modules/services/web-apps/c2fmzq-server.nix +++ b/nixos/modules/services/web-apps/c2fmzq-server.nix @@ -80,6 +80,7 @@ in { description = "c2FmZQ-server"; documentation = [ "https://github.com/c2FmZQ/c2FmZQ/blob/main/README.md" ]; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; serviceConfig = { diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index aa44f2642697..f0d9b95f81f6 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -71,6 +71,7 @@ in systemd.services.fetch-ec2-metadata = { wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = ["network-online.target"]; path = [ pkgs.curl ]; script = builtins.readFile ./ec2-metadata-fetcher.sh; From a8a9424e4fc91dfc116e5f59df7e4c5f7dcb7dde Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sat, 13 Jan 2024 18:18:06 -0800 Subject: [PATCH 106/112] nixos/tests: fix adguardhome under network-online dep fix --- nixos/tests/adguardhome.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/adguardhome.nix b/nixos/tests/adguardhome.nix index a6f790b83f5f..80613ce82534 100644 --- a/nixos/tests/adguardhome.nix +++ b/nixos/tests/adguardhome.nix @@ -126,6 +126,7 @@ with subtest("Testing successful DHCP start"): dhcpConf.wait_for_unit("adguardhome.service") + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") # Test IP assignment via DHCP dhcpConf.wait_until_succeeds("ping -c 5 10.0.10.100") From 843b3e7aa982e4c24407aabf2537ef529561b465 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sat, 13 Jan 2024 18:18:20 -0800 Subject: [PATCH 107/112] nixos/tests: fix guix under network-online dep fix --- nixos/tests/guix/publish.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/guix/publish.nix b/nixos/tests/guix/publish.nix index a15e00b0fa98..eb56fc97478c 100644 --- a/nixos/tests/guix/publish.nix +++ b/nixos/tests/guix/publish.nix @@ -80,6 +80,7 @@ in { # Now it's the client turn to make use of it. substitute_server = "http://server.local:${toString publishPort}" + client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") response = client.succeed(f"curl {substitute_server}") assert "Guix Substitute Server" in response From e7451cacf995ffc11e4441605e435b4c63c8e5f8 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sat, 13 Jan 2024 18:18:34 -0800 Subject: [PATCH 108/112] nixos/tests: fix installer under network-online dep fix --- nixos/tests/installer.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 21d5e1470d8e..7576fae41f83 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -158,7 +158,9 @@ let start_all() ${optionalString clevisTest '' tang.wait_for_unit("sockets.target") + tang.systemctl("start network-online.target") tang.wait_for_unit("network-online.target") + machine.systemctl("start network-online.target") machine.wait_for_unit("network-online.target") ''} machine.wait_for_unit("multi-user.target") @@ -187,6 +189,7 @@ let ${optionalString clevisTest '' with subtest("Create the Clevis secret with Tang"): + machine.systemctl("start network-online.target") machine.wait_for_unit("network-online.target") machine.succeed('echo -n password | clevis encrypt sss \'{"t": 2, "pins": {"tpm2": {}, "tang": {"url": "http://192.168.1.2"}}}\' -y > /mnt/etc/nixos/clevis-secret.jwe')''} From 1323e3115da413467ac973018af640ee216cab82 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sat, 13 Jan 2024 18:18:42 -0800 Subject: [PATCH 109/112] nixos/tests: fix ssh-audit under network-online dep fix --- nixos/tests/ssh-audit.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/ssh-audit.nix b/nixos/tests/ssh-audit.nix index bd6255b8044d..25772aba3ea0 100644 --- a/nixos/tests/ssh-audit.nix +++ b/nixos/tests/ssh-audit.nix @@ -70,6 +70,7 @@ import ./make-test-python.nix ( ${serverName}.succeed("${pkgs.ssh-audit}/bin/ssh-audit 127.0.0.1") # Wait for client to be able to connect to the server + ${clientName}.systemctl("start network-online.target") ${clientName}.wait_for_unit("network-online.target") # Set up trusted private key From 49e703cde28bc7cbd3042d4709db9a21f9f84537 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 18 Jan 2024 16:21:28 +0100 Subject: [PATCH 110/112] Add Coqeal 2.0.1 and algebra-tactics 1.2.3 --- pkgs/development/coq-modules/coqeal/default.nix | 2 ++ .../coq-modules/mathcomp-algebra-tactics/default.nix | 2 ++ pkgs/development/coq-modules/mathcomp-finmap/default.nix | 4 +++- pkgs/development/coq-modules/multinomials/default.nix | 4 +++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 89e3411bc332..60926e712ad7 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -8,6 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "2.0.1"; } { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; } @@ -17,6 +18,7 @@ { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } ] null; + release."2.0.1".sha256 = "sha256-d/IQ4IdS2tpyPewcGobj2S6m2HU+iXQmlvR+ITNIcjI="; release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM"; release."1.1.3".sha256 = "sha256-xhqWpg86xbU1GbDtXXInNCTArjjPnWZctWiiasq1ScU="; release."1.1.1".sha256 = "sha256-ExAdC3WuArNxS+Sa1r4x5aT7ylbCvP/BZXfkdQNAvZ8="; diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index a665ea0db30a..6cf92542dae3 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -9,6 +9,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "1.2.3"; } { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } { cases = [ (range "8.16" "8.18") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } @@ -17,6 +18,7 @@ mkCoqDerivation { release."1.0.0".sha256 = "sha256-kszARPBizWbxSQ/Iqpf2vLbxYc6AjpUCLnSNlPcNfls="; release."1.1.1".sha256 = "sha256-5wItMeeTRoJlRBH3zBNc2VUZn6pkDde60YAvXTx+J3U="; release."1.2.2".sha256 = "sha256-EU9RJGV3BvnmsX+mGH+6+MDXiGHgDI7aP5sIYiMUXTs="; + release."1.2.3".sha256 = "sha256-6uc1VEfDv+fExEfBR2c0/Q/KjrkX0TbEMCLgeYcpkls="; propagatedBuildInputs = [ mathcomp-algebra coq-elpi mathcomp-zify ]; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 66b50ca66b83..c2f6ea02133c 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,7 +7,8 @@ mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "2.0.0"; } + { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "2.1.0"; } + { cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; } { cases = [ (range "8.13" "8.19") (range "1.12" "1.19") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } @@ -18,6 +19,7 @@ mkCoqDerivation { { cases = [ (range "8.6" "8.7") (range "1.6.1" "1.7") ]; out = "1.0.0"; } ] null; release = { + "2.1.0".sha256 = "sha256-gh0cnhdVDyo+D5zdtxLc10kGKQLQ3ITzHnMC45mCtpY="; "2.0.0".sha256 = "sha256-0Wr1ZUYVuZH74vawO4EZlZ+K3kq+s1xEz/BfzyKj+wk="; "1.5.2".sha256 = "sha256-0KmmSjc2AlUo6BKr9RZ4FjL9wlGISlTGU0X1Eu7l4sw="; "1.5.1".sha256 = "0ryfml4pf1dfya16d8ma80favasmrygvspvb923n06kfw9v986j7"; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 38cc0139b8e0..b7551ace4227 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,8 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.18") (isGe "2.1.0") ]; out = "2.1.0"; } + { cases = [ (range "8.17" "8.19") (isGe "2.1.0") ]; out = "2.2.0"; } + { cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; } { cases = [ (isGe "8.15") (range "1.15.0" "1.18.0") ]; out = "1.6.0"; } { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } @@ -21,6 +22,7 @@ { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "2.2.0".sha256 = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo="; "2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY="; "2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8="; "1.6.0".sha256 = "sha256-lEM+sjqajIOm1c3lspHqcSIARgMR9RHbTQH4veHLJfU="; From 8ef7c0b86ad76d531c97209d2f0b9e49a3450352 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 19 Jan 2024 09:02:13 +0100 Subject: [PATCH 111/112] manticoresearch: 6.2.0 -> 6.2.12 --- .../ma/manticoresearch/package.nix} | 26 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 19 insertions(+), 9 deletions(-) rename pkgs/{servers/search/manticoresearch/default.nix => by-name/ma/manticoresearch/package.nix} (78%) diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/by-name/ma/manticoresearch/package.nix similarity index 78% rename from pkgs/servers/search/manticoresearch/default.nix rename to pkgs/by-name/ma/manticoresearch/package.nix index d7fe93a214b1..cf9cf4e59655 100644 --- a/pkgs/servers/search/manticoresearch/default.nix +++ b/pkgs/by-name/ma/manticoresearch/package.nix @@ -54,13 +54,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "manticoresearch"; - version = "6.2.0"; + version = "6.2.12"; src = fetchFromGitHub { owner = "manticoresoftware"; repo = "manticoresearch"; - rev = finalAttrs.version; - hash = "sha256-KmBIQa5C71Y/1oa3XiPfmb941QDU2rWo7Bl5QlAo+yA="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-UD/r7rlJ5mR3wg4doKT/nTwTWzlulngUjOPNEjmykB8="; }; nativeBuildInputs = [ @@ -95,21 +95,33 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_MYSQL=1" "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" + "-DCONFDIR=${placeholder "out"}/etc" + "-DLOGDIR=/var/lib/manticoresearch/log" + "-DRUNDIR=/var/run/manticoresearch" ]; + postFixup = '' + mkdir -p $out/lib/systemd/system + cp ${finalAttrs.src}/dist/deb/manticore.service.in $out/lib/systemd/system/manticore.service + substituteInPlace $out/lib/systemd/system/manticore.service \ + --replace "@CMAKE_INSTALL_FULL_RUNSTATEDIR@" "/var/lib/manticore" \ + --replace "@CMAKE_INSTALL_FULL_BINDIR@" "$out/bin" \ + --replace "@CMAKE_INSTALL_FULL_SYSCONFDIR@" "$out/etc" + ''; + passthru.tests.version = testers.testVersion { inherit (finalAttrs) version; package = manticoresearch; command = "searchd --version"; }; - meta = { + meta = with lib; { description = "Easy to use open source fast database for search"; homepage = "https://manticoresearch.com"; changelog = "https://github.com/manticoresoftware/manticoresearch/releases/tag/${finalAttrs.version}"; - license = lib.licenses.gpl2; + license = licenses.gpl2; mainProgram = "searchd"; - maintainers = [ lib.maintainers.jdelStrother ]; - platforms = lib.platforms.all; + maintainers = [ maintainers.jdelStrother ]; + platforms = platforms.all; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 487409b9396e..2ee0abde9bc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23859,8 +23859,6 @@ with pkgs; }; }; - manticoresearch = callPackage ../servers/search/manticoresearch { }; - marisa = callPackage ../development/libraries/marisa { }; mathgl = callPackage ../development/libraries/mathgl { }; From 3fd2c02d5282ebf961086d5084fcf75781b801e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 02:33:28 +0000 Subject: [PATCH 112/112] python311Packages.pulp: 2.7.0 -> 2.8.0 --- pkgs/development/python-modules/pulp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 6ecd6d4ba8c0..ab55157ed207 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pulp"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "coin-or"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j0f6OiscJyTqPNyLp0qWRjCGLWuT3HdU1S/sxpnsiMo="; + hash = "sha256-lpbk1GeC8F/iLGV8G5RPHghnaM9eL82YekUYEt9+mvc="; }; postPatch = ''