From 39dc5d0d768ec5cb51636b449f08fefd96c70745 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 20 May 2024 13:45:26 -0400 Subject: [PATCH 01/28] faiss: 1.7.4 -> 1.8.0 --- pkgs/development/libraries/science/math/faiss/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 25d6542f8da1..4e75dfb812c2 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -27,7 +27,7 @@ let pname = "faiss"; - version = "1.7.4"; + version = "1.8.0"; inherit (cudaPackages) cudaFlags backendStdenv; inherit (cudaFlags) cudaCapabilities dropDot; @@ -57,7 +57,7 @@ stdenv.mkDerivation { owner = "facebookresearch"; repo = pname; rev = "v${version}"; - hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M="; + hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I="; }; buildInputs = [ @@ -75,6 +75,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optionals pythonSupport [ pythonPackages.numpy + pythonPackages.packaging ]; nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ From ce56358d224003b4c31cbc0f6302a3decaa27dc4 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 21 Jun 2024 20:32:57 -0700 Subject: [PATCH 02/28] switch-to-configuration-ng: update dependencies --- .../sw/switch-to-configuration-ng/Cargo.lock | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock index d66a2c6e7527..9b70ccfe23b3 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock +++ b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock @@ -22,9 +22,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "atty" @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -202,9 +202,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -229,9 +229,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "nix" @@ -290,9 +290,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -308,9 +308,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -320,9 +320,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -331,9 +331,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rust-ini" @@ -348,18 +348,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -389,9 +389,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -476,9 +476,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "vec_map" From 6a6b710fbf9ab575619725d37205fa19caf5c6d4 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 21 Jun 2024 20:33:28 -0700 Subject: [PATCH 03/28] switch-to-configuration-ng: fix error messages In order to have the format strings include the proper content, we must use `with_context()`. --- pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs index a35b55065c07..12b68c25a9bb 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -1854,7 +1854,7 @@ won't take effect until you reboot the system. // A unit in auto-restart substate is a failure *if* it previously failed to start let unit_object_path = systemd .get_unit(&unit) - .context("Failed to get unit info for {unit}")?; + .with_context(|| format!("Failed to get unit info for {unit}"))?; let exec_main_status: i32 = dbus_conn .with_proxy( "org.freedesktop.systemd1", @@ -1862,7 +1862,7 @@ won't take effect until you reboot the system. Duration::from_millis(5000), ) .get("org.freedesktop.systemd1.Service", "ExecMainStatus") - .context("Failed to get ExecMainStatus for {unit}")?; + .with_context(|| format!("Failed to get ExecMainStatus for {unit}"))?; if exec_main_status != 0 { failed_units.push(unit); From 3d1ecbd9c8a509f9faac2919e93890f1774ccba8 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 21 Jun 2024 20:34:27 -0700 Subject: [PATCH 04/28] switch-to-configuration-ng: fix running on WSL The switch-to-configuration-ng program is able to be called in two different contexts, (1) when being called as root by as the entrypoint to NixOS switching (often from nixos-rebuild), and (2) when performing user activation. On WSL, calling the child process for the latter context appears to not work without also setting the GID of the child. Setting the GID for the child process is likely the right thing to do regardless of the host system being WSL. --- .../sw/switch-to-configuration-ng/src/main.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs index 12b68c25a9bb..057604b03178 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -1656,7 +1656,16 @@ won't take effect until you reboot the system. die(); } Ok(users) => { - for (uid, name, _) in users { + for (uid, name, user_dbus_path) in users { + let gid: u32 = dbus_conn + .with_proxy( + "org.freedesktop.login1", + &user_dbus_path, + Duration::from_millis(5000), + ) + .get("org.freedesktop.login1.User", "GID") + .with_context(|| format!("Failed to get GID for {name}"))?; + eprintln!("reloading user units for {}...", name); let myself = Path::new("/proc/self/exe") .canonicalize() @@ -1664,10 +1673,12 @@ won't take effect until you reboot the system. std::process::Command::new(&myself) .uid(uid) + .gid(gid) .env("XDG_RUNTIME_DIR", format!("/run/user/{}", uid)) .env("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE", &myself) .spawn() - .map(|mut child| _ = child.wait()) + .with_context(|| format!("Failed to spawn user activation for {name}"))? + .wait() .with_context(|| format!("Failed to run user activation for {name}"))?; } } From 543efca465ee63602491b5e05f15e5e8e18bea80 Mon Sep 17 00:00:00 2001 From: someplaceguy Date: Sun, 30 Jun 2024 01:54:40 +0000 Subject: [PATCH 05/28] glfw: add missing substitutions in glfw3 This fixes the same issue that #276228 addressed, but in the regular edition instead. --- pkgs/development/libraries/glfw/3.x.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 67d5a0095148..b10a39282de8 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -2,7 +2,7 @@ , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames , extra-cmake-modules, wayland -, wayland-scanner, wayland-protocols, libxkbcommon +, wayland-scanner, wayland-protocols, libxkbcommon, libdecor }: stdenv.mkDerivation rec { @@ -50,7 +50,11 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/wl_init.c \ - --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" + --replace-fail "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" \ + --replace-fail "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" \ + --replace-fail "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" \ + --replace-fail "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" \ + --replace-fail "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" ''; # glfw may dlopen libwayland-client.so: From 712f28eff93605fcb2a5343b167ff6e12a5e9e19 Mon Sep 17 00:00:00 2001 From: Krisztian Szabo Date: Tue, 23 Jul 2024 23:03:44 +0200 Subject: [PATCH 06/28] schemamap: init at 0.3.0 --- pkgs/by-name/sc/schemamap/package.nix | 51 +++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/sc/schemamap/package.nix diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix new file mode 100644 index 000000000000..95908de6e1c6 --- /dev/null +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + darwin, +}: + +let + version = "0.3.0"; +in +rustPlatform.buildRustPackage rec { + pname = "schemamap"; + inherit version; + + src = fetchFromGitHub { + owner = "schemamap"; + repo = "schemamap"; + rev = "v${version}"; + hash = "sha256-49i2zyOy/yngSgvKd66RsOhF6OlYfgDnEtPEbmhEcIo="; + }; + + sourceRoot = "${src.name}/rust"; + + cargoHash = "sha256-ILgvS96D6yF4Teaa5on6jHZlVoxRLSk8A523PzH1b5Y="; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk; + [ + frameworks.Security + frameworks.CoreFoundation + frameworks.CoreServices + frameworks.SystemConfiguration + ] + ); + + nativeBuildInputs = [ pkg-config ]; + + meta = { + changelog = "https://github.com/schemamap/schemamap/releases/tag/v${version}"; + description = "Instant batch data import for Postgres"; + homepage = "https://schemamap.io"; + license = lib.licenses.mit; + mainProgram = "schemamap"; + maintainers = with lib.maintainers; [ thenonameguy ]; + }; +} From 2dc9b3890dd738e1b3795a86f5154cae57f92ec3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 02:42:27 +0000 Subject: [PATCH 07/28] mdbook-i18n-helpers: 0.3.4 -> 0.3.5 --- pkgs/tools/text/mdbook-i18n-helpers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/tools/text/mdbook-i18n-helpers/default.nix index f9343e163798..83d81f1f6389 100644 --- a/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-i18n-helpers"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "google"; repo = "mdbook-i18n-helpers"; # TODO fix once upstream uses semver for tags again rev = "refs/tags/mdbook-i18n-helpers-${version}"; - hash = "sha256-nIavOBWPyCmCLwPcDbjjG1sa71HObGnhms9sSCAR2iA="; + hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU="; }; - cargoHash = "sha256-bBUgsZHvJPwsdM3DjhaoAvIkPXQ6gzPOdfcE5rAnMQk="; + cargoHash = "sha256-sPRylKXTSkVkhDvpAvHuYIr9TSi1ustIs1HTwEIbk/w="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; From 9c5c7e04e384e2bdf2c8351b311e7a4d5fe94a12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 04:21:47 +0000 Subject: [PATCH 08/28] blackfire: 2.28.7 -> 2.28.9 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 4460d3dd8b20..d67b81dd4fbb 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.7"; + version = "2.28.9"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "XovtaEOUy67KyfYsF0KmzDNef7Jt01gkWrAq+xPS3uQ="; + sha256 = "IP5B0vlB8W6yKunHcwsUhMuQ0c2+UZf8TDk0Rviygaw="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "C4LutO/wGjFOIOsulCoAmeHSkLCPgNGVd5vRclwoP9g="; + sha256 = "PJhwQ65odKWHPa5CH6b7eiYmzbbg5Rh4nJjkwxlCOsU="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "FBuwu1EYjDTMSW/slt94kxsXzSqhqPdUspM5XYNzHsw="; + sha256 = "5GrsVTDYVjVHqTs3OKJOMpYdZGqDwjB9T90Yv3c59/4="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "g7fsG6sWdRmXvL1S9vI3yNHDKSWOdzLrp7Ydpw1jNss="; + sha256 = "1yK3b6BXjWeqKDfgtlzD5/3FrSUqvCLrhFSAg7os3Ao="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "Ht3K297MExglKmtws/RvhQHFPhf1bTkIoNRvT/yJ+CM="; + sha256 = "HyI4R7DZJAmMd7MfJX/i3nswoHizgRkalyH137cfChU="; }; }; From 4f653b6880d0acbb37f7dee45d28ffa6106662b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 12:32:13 +0000 Subject: [PATCH 09/28] python312Packages.azure-monitor-query: 1.3.0 -> 1.4.0 --- .../python-modules/azure-monitor-query/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-monitor-query/default.nix b/pkgs/development/python-modules/azure-monitor-query/default.nix index 775bb82180e3..f4d0870e8180 100644 --- a/pkgs/development/python-modules/azure-monitor-query/default.nix +++ b/pkgs/development/python-modules/azure-monitor-query/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-monitor-query"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-629Un2FJr0SExRq/m7tmEjn1eBRfi+9lSFWXbu9CL+Y="; + hash = "sha256-aZxvPFlC8J2pjO8nP/u3QDkE7EP5PA1j8Qo2e0R54Ak="; }; nativeBuildInputs = [ setuptools ]; From f5982558222602a0653c147bce8e2aac55248a87 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 24 Jul 2024 10:06:02 -0300 Subject: [PATCH 10/28] etcd_3_5: 3.5.14 -> 3.5.15 Release: https://github.com/etcd-io/etcd/releases/tag/v3.5.15 --- pkgs/servers/etcd/3.5/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index 00cade7d5242..b293d5f45ade 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests, k3s }: let - version = "3.5.14"; - etcdSrcHash = "sha256-BbrOWAVrUj3LxFGvm1ycnFHglskaZesL0XILLnN8TIE="; - etcdServerVendorHash = "sha256-LNVRwPaaqpk7PKcgzwNrtBx+Dy9JJS88RT71RBDJ0ug="; - etcdUtlVendorHash = "sha256-fFERNwaWwdukTtACuihlMZZYpdo0cnZnnFb5xmug2vI="; - etcdCtlVendorHash = "sha256-cQMWb0PGYUPLlYvILrD2vxcDhcpYdAts9ARTeAh1Wew="; + version = "3.5.15"; + etcdSrcHash = "sha256-AY6ug9WU4cFP5sHWrigEPYsF7B386DGtlc689dnrbUw="; + etcdServerVendorHash = "sha256-aIvZYc0ouJtEv4nf9IA8kZkmCP9KXuqhv9zEpzEwRF8="; + etcdUtlVendorHash = "sha256-omBRlu3pOmUHEyhxFvUEaGragTl1y5YXn7iLMlQ95CA="; + etcdCtlVendorHash = "sha256-mr2TLEgAM4hMtnN2t8oGIQwI1+8vRQH8VjPDwymfkTY="; src = fetchFromGitHub { owner = "etcd-io"; From a7a3e07bee70e5cd2a534c9d13bcd863119371cc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 25 Jul 2024 18:36:39 +0800 Subject: [PATCH 11/28] pantheon.xdg-desktop-portal-pantheon: 7.1.1 -> 7.2.0 https://github.com/elementary/portals/compare/7.1.1...7.2.0 --- .../services/xdg-desktop-portal-pantheon/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index b01db234fdd6..f863d509204d 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -9,6 +9,7 @@ , wrapGAppsHook4 , glib , granite7 +, gsettings-desktop-schemas , gtk4 , systemd , xorg @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "7.1.1"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-JZ2VYsNAjNGCzKOEhHCZx2uNLHFs+ktjFmROLHdFjX4="; + sha256 = "sha256-0pXb4GPUThHfe0mCqoYuQzMgRCeejsEI3fK7PxjrtJM="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib granite7 + gsettings-desktop-schemas gtk4 systemd xorg.libX11 From 872a51a6e71686c352c27c706abb16cc7d072f6b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 25 Jul 2024 18:37:06 +0800 Subject: [PATCH 12/28] pantheon.elementary-code: 7.2.0 -> 7.3.0 https://github.com/elementary/code/compare/7.2.0...7.3.0 --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index d9837b83676e..cd451d7178fe 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-6lvn8c+JfbtZQf5dtViosVqtt/RWL6B/MvksXqmCfFs="; + sha256 = "sha256-AizJPWRrCJvck+TFy/BVbzI6k62+tGkVux01Nl0XReg="; }; nativeBuildInputs = [ From bd76dc9e6b85e0e36d5fdf8e06ea36b7d5d0e03b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 25 Jul 2024 20:42:25 +0800 Subject: [PATCH 13/28] pantheon.elementary-bluetooth-daemon: init at 1.0.0 We will ship this in Pantheon module by default when new wingpanel-indicator-bluetooth release happens. --- pkgs/desktops/pantheon/default.nix | 2 + .../elementary-bluetooth-daemon/default.nix | 51 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 26d3f16a523a..e0f08e6e2031 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -123,6 +123,8 @@ lib.makeScope pkgs.newScope (self: with self; { contractor = callPackage ./services/contractor { }; + elementary-bluetooth-daemon = callPackage ./services/elementary-bluetooth-daemon { }; + elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { }; elementary-notifications = callPackage ./services/elementary-notifications { }; diff --git a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix new file mode 100644 index 000000000000..3cf021affcd2 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix @@ -0,0 +1,51 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook3, + granite, + gtk3, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "elementary-bluetooth-daemon"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "bluetooth-daemon"; + rev = finalAttrs.version; + hash = "sha256-09udSmd51l7zPe83RBg+AihpwsELclEF+Jn+5DKdJUI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + granite + gtk3 + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Send and receive files via bluetooth"; + homepage = "https://github.com/elementary/bluetooth-daemon"; + license = lib.licenses.gpl3Plus; + maintainers = lib.teams.pantheon.members; + platforms = lib.platforms.linux; + mainProgram = "io.elementary.bluetooth"; + }; +}) From 3072c8eada1c86a7a227db68e6cf24d244e9f26f Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Fri, 26 Jul 2024 04:09:43 +0800 Subject: [PATCH 14/28] circt: 1.77 -> 1.78.1 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 54702bbc744e..aaf560ba4e85 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.77.0"; + version = "1.78.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-eiXyGwvObrhyhj7Nj9wIafmcaRYjZt0Qy4D3D+fEsGs="; + hash = "sha256-MV70tU9orK46IXM46HUuxgAuSP4JerXdKpOyPiMfsUE="; fetchSubmodules = true; }; From 1e95e956596c4347dee49be5a248cd6a4876c910 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 22:54:33 +0200 Subject: [PATCH 15/28] python312Packages.spark-parser: drop nose dependency --- .../python-modules/spark-parser/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spark-parser/default.nix b/pkgs/development/python-modules/spark-parser/default.nix index 3543cc0abadb..f82b7df76342 100644 --- a/pkgs/development/python-modules/spark-parser/default.nix +++ b/pkgs/development/python-modules/spark-parser/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - nose, + unittestCheckHook, click, }: @@ -17,9 +17,15 @@ buildPythonPackage rec { sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; }; - buildInputs = [ nose ]; propagatedBuildInputs = [ click ]; + nativeCheckInputs = [ unittestCheckHook ]; + unittestFlagsArray = [ + "-s" + "test" + "-v" + ]; + meta = with lib; { description = "Early-Algorithm Context-free grammar Parser"; mainProgram = "spark-parser-coverage"; From 261ccc198feb63f525cc91342c3dfe32b581a7d8 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 23:36:02 +0200 Subject: [PATCH 16/28] python3Packages.simplebayes: drop nose dependency --- pkgs/development/python-modules/simplebayes/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index ea3fdd268e4c..bfa761b59e44 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + unittestCheckHook, mock, isPy3k, }: @@ -22,16 +22,14 @@ buildPythonPackage { }; nativeCheckInputs = [ - nose mock + unittestCheckHook ]; postPatch = lib.optionalString isPy3k '' sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py ''; - checkPhase = "nosetests tests/test.py"; - meta = with lib; { description = "Memory-based naive bayesian text classifier"; homepage = "https://github.com/hickeroar/simplebayes"; From a59cac9dfb9c60c408a6303118629deb77500b38 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 25 Jul 2024 23:43:42 +0200 Subject: [PATCH 17/28] freeradius: fetchurl -> fetchFromGitHub Verified the hash matches the result from `fetchzip` --- pkgs/servers/freeradius/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 1227bf59f3af..5be808d6b483 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoreconfHook , bsd-finger , perl , talloc -, linkOpenssl? true, openssl +, linkOpenssl ? true, openssl , withCap ? true, libcap , withCollectd ? false, collectd , withJson ? false, json_c @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { pname = "freeradius"; version = "3.2.5"; - src = fetchurl { - url = "https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${lib.replaceStrings [ "." ] [ "_" ] version}/freeradius-server-${version}.tar.gz"; - hash = "sha256-HnX1/Blh2YVNHLPGkhYS++K57bjuUIpafL1p8edgcRU="; + src = fetchFromGitHub { + owner = "FreeRADIUS"; + repo = "freeradius-server"; + rev = "refs/tags/release_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-1n447BpTqmkg5tyXe9yPzjfDoh7wMLZhwouUEzkwxKM="; }; nativeBuildInputs = [ autoreconfHook ]; From 543cd40eccf7121a9c87e7e697b6760f100f486b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 02:18:51 +0200 Subject: [PATCH 18/28] treewide: remove trailing space in description Done using `grep -rP 'description\s+=\s+"[^"]+[ ]";' | cut -d ':' -f 1 | xargs -i nvim {}` and sorting the opened files by hand, avoiding generated packages list --- nixos/modules/services/databases/surrealdb.nix | 2 +- nixos/modules/services/monitoring/nagios.nix | 2 +- nixos/modules/services/networking/antennas.nix | 2 +- pkgs/applications/blockchains/solana-validator/default.nix | 2 +- pkgs/applications/misc/pw-viz/default.nix | 2 +- pkgs/applications/misc/swaynag-battery/default.nix | 2 +- pkgs/applications/misc/taskwarrior-tui/default.nix | 2 +- pkgs/applications/networking/cluster/ktunnel/default.nix | 2 +- pkgs/applications/networking/cluster/pv-migrate/default.nix | 2 +- pkgs/applications/networking/tmpmail/default.nix | 2 +- pkgs/applications/science/medicine/xmedcon/default.nix | 2 +- pkgs/applications/system/booster/default.nix | 2 +- pkgs/applications/video/jftui/default.nix | 2 +- pkgs/applications/video/obs-studio/plugins/input-overlay.nix | 2 +- pkgs/by-name/in/ingress2gateway/package.nix | 2 +- pkgs/by-name/li/libisoburn/package.nix | 2 +- pkgs/by-name/oc/ocis-bin/package.nix | 2 +- pkgs/by-name/pr/prox/package.nix | 2 +- pkgs/by-name/pu/pupdate/package.nix | 2 +- pkgs/by-name/vi/vidmerger/package.nix | 2 +- pkgs/by-name/x5/x509-limbo/package.nix | 2 +- pkgs/development/coq-modules/fourcolor/default.nix | 2 +- pkgs/development/libraries/aws-c-cal/default.nix | 2 +- pkgs/development/libraries/flatcc/default.nix | 2 +- pkgs/development/libraries/hfst-ospell/default.nix | 2 +- pkgs/development/libraries/java/jffi/default.nix | 2 +- pkgs/development/libraries/multipart-parser-c/default.nix | 2 +- pkgs/development/libraries/pkger/default.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/default.nix | 2 +- pkgs/development/ocaml-modules/metadata/default.nix | 2 +- pkgs/development/ocaml-modules/msgpck/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-print-intf/default.nix | 2 +- pkgs/development/ocaml-modules/ssl/default.nix | 2 +- pkgs/development/python-modules/barectf/default.nix | 2 +- pkgs/development/python-modules/co2signal/default.nix | 2 +- pkgs/development/python-modules/colorspacious/default.nix | 2 +- pkgs/development/python-modules/cxxfilt/default.nix | 2 +- .../python-modules/djangorestframework-recursive/default.nix | 2 +- pkgs/development/python-modules/jsonslicer/default.nix | 2 +- pkgs/development/python-modules/plumbum/default.nix | 2 +- pkgs/development/python-modules/premailer/default.nix | 2 +- pkgs/development/python-modules/pylyrics/default.nix | 2 +- pkgs/development/python-modules/pyproject-hooks/default.nix | 2 +- pkgs/development/python-modules/pyprusalink/default.nix | 2 +- pkgs/development/python-modules/pyqt5-stubs/default.nix | 2 +- pkgs/development/python-modules/sampledata/default.nix | 2 +- pkgs/development/python-modules/sane/default.nix | 2 +- pkgs/development/python-modules/scour/default.nix | 2 +- pkgs/development/python-modules/types-appdirs/default.nix | 2 +- pkgs/development/rocm-modules/5/clr/test-opencl-example.nix | 2 +- pkgs/development/rocm-modules/6/clr/test-opencl-example.nix | 2 +- pkgs/development/tools/continuous-integration/agola/default.nix | 2 +- pkgs/development/tools/database/indradb/default.nix | 2 +- pkgs/development/tools/faas-cli/default.nix | 2 +- pkgs/development/tools/gptcommit/default.nix | 2 +- pkgs/development/tools/img/default.nix | 2 +- pkgs/development/tools/language-servers/fortls/default.nix | 2 +- pkgs/development/tools/rust/cargo-hf2/default.nix | 2 +- pkgs/development/tools/rust/cargo-mobile2/default.nix | 2 +- pkgs/development/tools/statik/default.nix | 2 +- pkgs/development/web/insomnia/default.nix | 2 +- pkgs/games/raylib-games/default.nix | 2 +- pkgs/os-specific/linux/reap/default.nix | 2 +- .../custom-components/samsungtv-smart/default.nix | 2 +- pkgs/servers/http/apache-modules/mod_spkac/default.nix | 2 +- pkgs/servers/http/nginx/modules.nix | 2 +- pkgs/servers/monitoring/prometheus/atlas-exporter.nix | 2 +- pkgs/servers/roapi/http.nix | 2 +- pkgs/servers/search/lnx/default.nix | 2 +- .../web-apps/discourse/plugins/discourse-checklist/default.nix | 2 +- pkgs/servers/web-apps/healthchecks/default.nix | 2 +- pkgs/shells/zsh/zsh-bd/default.nix | 2 +- pkgs/tools/cd-dvd/sacd/default.nix | 2 +- pkgs/tools/misc/crudini/default.nix | 2 +- pkgs/tools/misc/iam-policy-json-to-terraform/default.nix | 2 +- pkgs/tools/misc/opencorsairlink/default.nix | 2 +- pkgs/tools/misc/pcb2gcode/default.nix | 2 +- pkgs/tools/misc/precice-config-visualizer/default.nix | 2 +- pkgs/tools/misc/timetagger_cli/default.nix | 2 +- pkgs/tools/misc/vix/default.nix | 2 +- pkgs/tools/networking/netmask/default.nix | 2 +- pkgs/tools/wayland/aw-watcher-window-wayland/default.nix | 2 +- 82 files changed, 82 insertions(+), 82 deletions(-) diff --git a/nixos/modules/services/databases/surrealdb.nix b/nixos/modules/services/databases/surrealdb.nix index 08a6cca043ca..2118312d5a1b 100644 --- a/nixos/modules/services/databases/surrealdb.nix +++ b/nixos/modules/services/databases/surrealdb.nix @@ -58,7 +58,7 @@ in { environment.systemPackages = [ cfg.package ] ; systemd.services.surrealdb = { - description = "A scalable, distributed, collaborative, document-graph database, for the realtime web "; + description = "A scalable, distributed, collaborative, document-graph database, for the realtime web"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 27fc0a1ff3b9..b6eced134bcc 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -175,7 +175,7 @@ in config = mkIf cfg.enable { users.users.nagios = { - description = "Nagios user "; + description = "Nagios user"; uid = config.ids.uids.nagios; home = nagiosState; group = "nagios"; diff --git a/nixos/modules/services/networking/antennas.nix b/nixos/modules/services/networking/antennas.nix index a37df953fc92..e98b81588044 100644 --- a/nixos/modules/services/networking/antennas.nix +++ b/nixos/modules/services/networking/antennas.nix @@ -38,7 +38,7 @@ in config = mkIf cfg.enable { systemd.services.antennas = { - description = "Antennas HDHomeRun emulator for Tvheadend. "; + description = "Antennas HDHomeRun emulator for Tvheadend."; wantedBy = [ "multi-user.target" ]; # Config diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 35dc9b31e16e..0d664374efa0 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -96,7 +96,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. "; + description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces."; homepage = "https://solana.com"; license = licenses.asl20; maintainers = with maintainers; [ adjacentresearch ]; diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index 0242164be79c..04dcf343e541 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { - description = "Simple and elegant pipewire graph editor "; + description = "Simple and elegant pipewire graph editor"; homepage = "https://github.com/ax9d/pw-viz"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix index 8dc99ca012e9..ee39266d9958 100644 --- a/pkgs/applications/misc/swaynag-battery/default.nix +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/m00qek/swaynag-battery"; - description = "Shows a message when your battery is discharging "; + description = "Shows a message when your battery is discharging"; maintainers = with maintainers; [ ]; license = licenses.mit; mainProgram = "swaynag-battery"; diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 88a8e99f26a0..f313d3d1f0ff 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Terminal user interface for taskwarrior "; + description = "Terminal user interface for taskwarrior"; homepage = "https://github.com/kdheepak/taskwarrior-tui"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/applications/networking/cluster/ktunnel/default.nix index 8641209e3417..79510ae103ce 100644 --- a/pkgs/applications/networking/cluster/ktunnel/default.nix +++ b/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -31,7 +31,7 @@ buildGoModule { ''; meta = with lib; { - description = "Cli that exposes your local resources to kubernetes "; + description = "Cli that exposes your local resources to kubernetes"; mainProgram = "ktunnel"; homepage = "https://github.com/omrikiei/ktunnel"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix index 0d7b6db8a706..ebb00206586d 100644 --- a/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "CLI tool to easily migrate Kubernetes persistent volumes "; + description = "CLI tool to easily migrate Kubernetes persistent volumes"; mainProgram = "pv-migrate"; homepage = "https://github.com/utkuozdemir/pv-migrate"; changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}"; diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index b55db4e64af2..55a42eebebd2 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sdushantha/tmpmail"; - description = "Temporary email right from your terminal written in POSIX sh "; + description = "Temporary email right from your terminal written in POSIX sh"; license = licenses.mit; maintainers = [ maintainers.lom ]; mainProgram = "tmpmail"; diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index 1f0686cc0dad..b4170dfa228a 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; meta = with lib; { - description = "Open source toolkit for medical image conversion "; + description = "Open source toolkit for medical image conversion"; homepage = "https://xmedcon.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ arianvp flokli ]; diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix index e7c646faf0ac..c211a53bdc56 100644 --- a/pkgs/applications/system/booster/default.nix +++ b/pkgs/applications/system/booster/default.nix @@ -49,7 +49,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Fast and secure initramfs generator "; + description = "Fast and secure initramfs generator"; homepage = "https://github.com/anatol/booster"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index efd8d6ed6e2a..e30ba77dd873 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Jellyfin Terminal User Interface "; + description = "Jellyfin Terminal User Interface"; homepage = "https://github.com/Aanok/jftui"; license = licenses.unlicense; maintainers = [ maintainers.nyanloutre ]; diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index bd47a3e94436..9a2069a27133 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - description = "Show keyboard, gamepad and mouse input on stream "; + description = "Show keyboard, gamepad and mouse input on stream"; homepage = "https://github.com/univrsal/input-overlay"; maintainers = with maintainers; [ glittershark ]; license = licenses.gpl2; diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix index 90e5a465921c..da3550ac8df6 100644 --- a/pkgs/by-name/in/ingress2gateway/package.nix +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; meta = with lib; { - description = "Convert Ingress resources to Gateway API resources "; + description = "Convert Ingress resources to Gateway API resources"; homepage = "https://github.com/kubernetes-sigs/ingress2gateway"; license = licenses.asl20; maintainers = with maintainers; [ arikgrahl ]; diff --git a/pkgs/by-name/li/libisoburn/package.nix b/pkgs/by-name/li/libisoburn/package.nix index cc870b72a8a8..7fc8c6aff60f 100644 --- a/pkgs/by-name/li/libisoburn/package.nix +++ b/pkgs/by-name/li/libisoburn/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://libburnia-project.org/"; - description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; + description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD"; changelog = "https://dev.lovelyhq.com/libburnia/libisoburn/src/tag/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl2Plus; mainProgram = "osirrox"; diff --git a/pkgs/by-name/oc/ocis-bin/package.nix b/pkgs/by-name/oc/ocis-bin/package.nix index 572c78ba10f1..a0b8a62ed462 100644 --- a/pkgs/by-name/oc/ocis-bin/package.nix +++ b/pkgs/by-name/oc/ocis-bin/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.py; meta = with lib; { - description = "ownCloud Infinite Scale Stack "; + description = "ownCloud Infinite Scale Stack"; homepage = "https://owncloud.dev/ocis/"; changelog = "https://github.com/owncloud/ocis/releases/tag/v${finalAttrs.version}"; # oCIS is licensed under non-free EULA which can be found here : diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix index ef7b588ea51f..7a92dc2ab56d 100644 --- a/pkgs/by-name/pr/prox/package.nix +++ b/pkgs/by-name/pr/prox/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/fgrosse/prox"; - description = "Process runner for Procfile-based applications "; + description = "Process runner for Procfile-based applications"; mainProgram = "prox"; license = licenses.bsd2; maintainers = with maintainers; [ lucperkins ]; diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index a45b77d2e965..2ae572ce85fa 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -55,7 +55,7 @@ buildDotnetModule rec { meta = with lib; { homepage = "https://github.com/mattpannella/pupdate"; - description = "Pupdate - A thing for updating your Analogue Pocket "; + description = "Pupdate - A thing for updating your Analogue Pocket"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ p-rintz ]; diff --git a/pkgs/by-name/vi/vidmerger/package.nix b/pkgs/by-name/vi/vidmerger/package.nix index 7cdfaf2944d8..cf0412b42929 100644 --- a/pkgs/by-name/vi/vidmerger/package.nix +++ b/pkgs/by-name/vi/vidmerger/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "Merge video & audio files via CLI "; + description = "Merge video & audio files via CLI"; homepage = "https://github.com/TGotwig/vidmerger"; license = with licenses; [ mit commons-clause ]; maintainers = with maintainers; [ ByteSudoer ]; diff --git a/pkgs/by-name/x5/x509-limbo/package.nix b/pkgs/by-name/x5/x509-limbo/package.nix index 239f1c85e300..76b588463bce 100644 --- a/pkgs/by-name/x5/x509-limbo/package.nix +++ b/pkgs/by-name/x5/x509-limbo/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonPackage { meta = with lib; { homepage = "https://x509-limbo.com/"; - description = "Suite of testvectors for X.509 certificate path validation and tools for building them "; + description = "Suite of testvectors for X.509 certificate path validation and tools for building them"; mainProgram = "limbo"; license = licenses.asl20; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 94994fb85735..4bf4ae771a0e 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -24,7 +24,7 @@ mkCoqDerivation { propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = with lib; { - description = "Formal proof of the Four Color Theorem "; + description = "Formal proof of the Four Color Theorem"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; platforms = platforms.unix; diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 908b4545e0e1..caf0ce60cdb2 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "AWS Crypto Abstraction Layer "; + description = "AWS Crypto Abstraction Layer"; homepage = "https://github.com/awslabs/aws-c-cal"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 4d74627ee3c9..ff78f863a40f 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "FlatBuffers Compiler and Library in C for C "; + description = "FlatBuffers Compiler and Library in C for C"; mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/development/libraries/hfst-ospell/default.nix index f0a0bc6bef48..823bcbbe8c08 100644 --- a/pkgs/development/libraries/hfst-ospell/default.nix +++ b/pkgs/development/libraries/hfst-ospell/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/hfst/hfst-ospell/"; - description = "HFST spell checker library and command line tool "; + description = "HFST spell checker library and command line tool"; license = licenses.asl20; maintainers = with maintainers; [ lurkki ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index 46f270163549..dddcfd1fa303 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { broken = stdenv.isDarwin; - description = "Java Foreign Function Interface "; + description = "Java Foreign Function Interface"; homepage = "https://github.com/jnr/jffi"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 89665f2efc9a..ef4834b8c005 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Http multipart parser implemented in C "; + description = "Http multipart parser implemented in C"; homepage = "https://github.com/iafonov/multipart-parser-c"; license = [ lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index f2047c82f051..37895fbeed65 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + description = "Embed static files in Go binaries (replacement for gobuffalo/packr)"; mainProgram = "pkger"; homepage = "https://github.com/markbates/pkger"; changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index d579c22de134..b30da4c5aaa0 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { doCheck = true; meta = macaddr.meta // { - description = "Library for manipulation of IP (and MAC) address representations "; + description = "Library for manipulation of IP (and MAC) address representations"; maintainers = with lib.maintainers; [ alexfmpe ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix index 9a8414de75d4..4fc86d119470 100644 --- a/pkgs/development/ocaml-modules/metadata/default.nix +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/savonet/ocaml-metadata"; - description = "Library to read metadata from files in various formats. "; + description = "Library to read metadata from files in various formats."; license = licenses.gpl3Plus; maintainers = with maintainers; [ dandellion ]; }; diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix index 2871e774f3fe..a766f2491366 100644 --- a/pkgs/development/ocaml-modules/msgpck/default.nix +++ b/pkgs/development/ocaml-modules/msgpck/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = true; meta = { - description = "Fast MessagePack (http://msgpack.org) library "; + description = "Fast MessagePack (http://msgpack.org) library"; license = lib.licenses.isc; homepage = "https://github.com/vbmithr/ocaml-msgpck"; maintainers = [ lib.maintainers.ulrikstrid ]; diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix index 5180b58601af..21add50c6061 100644 --- a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { buildInputs = [ dune-build-info bos ]; meta = with lib; { - description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form "; + description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form"; homepage = "https://github.com/${author}/${pname}"; license = lib.licenses.isc; maintainers = [ lib.maintainers.nerdypepper ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 329dd01f02ea..5d7e3fe2c35f 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -34,7 +34,7 @@ buildDunePackage rec { meta = { homepage = "http://savonet.rastageeks.org/"; - description = "OCaml bindings for libssl "; + description = "OCaml bindings for libssl"; license = "LGPL+link exception"; maintainers = with lib.maintainers; [ anmonteiro dandellion maggesi ]; }; diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index 532228c31e4f..968570904067 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook ]; meta = with lib; { - description = "Generator of ANSI C tracers which output CTF data streams "; + description = "Generator of ANSI C tracers which output CTF data streams"; mainProgram = "barectf"; homepage = "https://github.com/efficios/barectf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/co2signal/default.nix b/pkgs/development/python-modules/co2signal/default.nix index 726e5736a0ea..6db0885e582f 100644 --- a/pkgs/development/python-modules/co2signal/default.nix +++ b/pkgs/development/python-modules/co2signal/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "CO2Signal" ]; meta = with lib; { - description = "Package to access the CO2 Signal API "; + description = "Package to access the CO2 Signal API"; homepage = "https://github.com/danielsjf/CO2Signal"; license = licenses.gpl3Only; maintainers = with maintainers; [ plabadens ]; diff --git a/pkgs/development/python-modules/colorspacious/default.nix b/pkgs/development/python-modules/colorspacious/default.nix index 6e0762a814e0..53ca726357d4 100644 --- a/pkgs/development/python-modules/colorspacious/default.nix +++ b/pkgs/development/python-modules/colorspacious/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/njsmith/colorspacious"; - description = "Powerful, accurate, and easy-to-use Python library for doing colorspace conversions "; + description = "Powerful, accurate, and easy-to-use Python library for doing colorspace conversions"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 2d09a5006d4c..e82f5c6e880e 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cxxfilt" ]; meta = with lib; { - description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle "; + description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle"; homepage = "https://github.com/afq984/python-cxxfilt"; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/pkgs/development/python-modules/djangorestframework-recursive/default.nix index 909a1d167d29..cc75d77a4839 100644 --- a/pkgs/development/python-modules/djangorestframework-recursive/default.nix +++ b/pkgs/development/python-modules/djangorestframework-recursive/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "rest_framework_recursive" ]; meta = with lib; { - description = " Recursive Serialization for Django REST framework "; + description = " Recursive Serialization for Django REST framework"; homepage = "https://github.com/heywbj/django-rest-framework-recursive"; license = licenses.isc; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/jsonslicer/default.nix b/pkgs/development/python-modules/jsonslicer/default.nix index 4cc5e559aca8..da6f546f2c42 100644 --- a/pkgs/development/python-modules/jsonslicer/default.nix +++ b/pkgs/development/python-modules/jsonslicer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ yajl ]; meta = with lib; { - description = "Stream JSON parser for Python "; + description = "Stream JSON parser for Python"; homepage = "https://github.com/AMDmi3/jsonslicer"; license = licenses.mit; maintainers = with maintainers; [ jopejoe1 ]; diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index b1722a47a516..a6a77dd5cbfd 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}"; - description = " Plumbum: Shell Combinators "; + description = " Plumbum: Shell Combinators"; homepage = " https://github.com/tomerfiliba/plumbum "; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 69e4a00c5955..dd6eec493338 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; meta = { - description = "Turns CSS blocks into style attributes "; + description = "Turns CSS blocks into style attributes"; homepage = "https://github.com/peterbe/premailer"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pylyrics/default.nix b/pkgs/development/python-modules/pylyrics/default.nix index 00b9776380bb..29949d8c088a 100644 --- a/pkgs/development/python-modules/pylyrics/default.nix +++ b/pkgs/development/python-modules/pylyrics/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs "; + description = "Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs"; homepage = "https://github.com/geekpradd/PyLyrics"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix index cc47f9d2a840..28db88a18cf8 100644 --- a/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyproject_hooks" ]; meta = with lib; { - description = "Low-level library for calling build-backends in `pyproject.toml`-based project "; + description = "Low-level library for calling build-backends in `pyproject.toml`-based project"; homepage = "https://github.com/pypa/pyproject-hooks"; changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix index 88c7eb338ed7..61b482ee5846 100644 --- a/pkgs/development/python-modules/pyprusalink/default.nix +++ b/pkgs/development/python-modules/pyprusalink/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyprusalink" ]; meta = with lib; { - description = "Library to communicate with PrusaLink "; + description = "Library to communicate with PrusaLink"; homepage = "https://github.com/home-assistant-libs/pyprusalink"; changelog = "https://github.com/home-assistant-libs/pyprusalink/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix index 008313ebb7fd..a891942d1d45 100644 --- a/pkgs/development/python-modules/pyqt5-stubs/default.nix +++ b/pkgs/development/python-modules/pyqt5-stubs/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Stubs for PyQt5 "; + description = "Stubs for PyQt5"; homepage = "https://github.com/python-qt-tools/PyQt5-stubs"; license = licenses.gpl3; maintainers = with maintainers; [ _999eagle ]; diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix index d2f547f32ca2..4583375eea00 100644 --- a/pkgs/development/python-modules/sampledata/default.nix +++ b/pkgs/development/python-modules/sampledata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { format = "setuptools"; meta = { - description = "Sample Data generator for Python "; + description = "Sample Data generator for Python"; homepage = "https://github.com/jespino/sampledata"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix index f5fb012436bf..1b82f6039878 100644 --- a/pkgs/development/python-modules/sane/default.nix +++ b/pkgs/development/python-modules/sane/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-pillow/Sane"; - description = "Python interface to the SANE scanner and frame grabber "; + description = "Python interface to the SANE scanner and frame grabber"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 645ded228605..815a267c0391 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "SVG Optimizer / Cleaner "; + description = "SVG Optimizer / Cleaner"; mainProgram = "scour"; homepage = "https://github.com/scour-project/scour"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/types-appdirs/default.nix b/pkgs/development/python-modules/types-appdirs/default.nix index 9c48d6996f8d..7185845566cb 100644 --- a/pkgs/development/python-modules/types-appdirs/default.nix +++ b/pkgs/development/python-modules/types-appdirs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = { - description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs. "; + description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs."; homepage = "https://pypi.org/project/types-appdirs"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix index 65e2e93782e9..0b612cde3f80 100644 --- a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; meta = with lib; { - description = "Samples from the AMD APP SDK (with OpenCRun support) "; + description = "Samples from the AMD APP SDK (with OpenCRun support)"; homepage = "https://github.com/OpenCL/AMD_APP_samples"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix index 940a670ff579..d2797d1a5016 100644 --- a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; meta = with lib; { - description = "Samples from the AMD APP SDK (with OpenCRun support) "; + description = "Samples from the AMD APP SDK (with OpenCRun support)"; homepage = "https://github.com/OpenCL/AMD_APP_samples"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/development/tools/continuous-integration/agola/default.nix index f13f6ec2164c..e5f59a784910 100644 --- a/pkgs/development/tools/continuous-integration/agola/default.nix +++ b/pkgs/development/tools/continuous-integration/agola/default.nix @@ -34,7 +34,7 @@ buildGoModule { doCheck = false; meta = with lib; { - description = "Agola: CI/CD Redefined "; + description = "Agola: CI/CD Redefined"; homepage = "https://agola.io"; maintainers = with maintainers; [ happysalada ]; license = licenses.mit; diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index 0df697b8df9d..d003754bc44e 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -14,7 +14,7 @@ let }; meta = with lib; { - description = "Graph database written in rust "; + description = "Graph database written in rust"; homepage = "https://github.com/indradb/indradb"; license = licenses.mpl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 66f45af3a5ba..6e8a7cf79774 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -57,7 +57,7 @@ buildGoModule rec { }; meta = with lib; { - description = "Official CLI for OpenFaaS "; + description = "Official CLI for OpenFaaS"; mainProgram = "faas-cli"; homepage = "https://github.com/openfaas/faas-cli"; license = licenses.mit; diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 5da71c7bc1c9..f1bd3376e160 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { }; meta = with lib; { - description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3. "; + description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3."; mainProgram = "gptcommit"; homepage = "https://github.com/zurawiki/gptcommit"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/tools/img/default.nix b/pkgs/development/tools/img/default.nix index 0dab6b28dc74..f7c751cf0ea3 100644 --- a/pkgs/development/tools/img/default.nix +++ b/pkgs/development/tools/img/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder. "; + description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder."; mainProgram = "img"; license = licenses.mit; homepage = "https://github.com/genuinetools/img"; diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix index f7fef6676102..5faa408ecff2 100644 --- a/pkgs/development/tools/language-servers/fortls/default.nix +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { checkPhase = "$out/bin/fortls --help 1>/dev/null"; meta = with lib; { - description = "Fortran Language Server "; + description = "Fortran Language Server"; mainProgram = "fortls"; homepage = "https://github.com/fortran-lang/fortls"; license = [ licenses.mit ]; diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index a4e04277d5e7..41dd6ae904b0 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { - description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders "; + description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; mainProgram = "cargo-hf2"; homepage = "https://lib.rs/crates/cargo-hf2"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index 9b5d535ec50a..ddaed69abe7c 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage { ''; meta = with lib; { - description = "Rust on mobile made easy! "; + description = "Rust on mobile made easy!"; homepage = "https://tauri.app/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 8b4386860e0a..5dec08d0d6e6 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/rakyll/statik"; - description = "Embed files into a Go executable "; + description = "Embed files into a Go executable"; mainProgram = "statik"; license = licenses.asl20; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 0ebe273949d8..9317dbe8f4e9 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -21,7 +21,7 @@ let meta = with lib; { homepage = "https://insomnia.rest"; - description = " The open-source, cross-platform API client for GraphQL, REST, WebSockets, SSE and gRPC. With Cloud, Local and Git storage. "; + description = " The open-source, cross-platform API client for GraphQL, REST, WebSockets, SSE and gRPC. With Cloud, Local and Git storage."; mainProgram = "insomnia"; changelog = "https://github.com/Kong/insomnia/releases/tag/core@${version}"; license = licenses.asl20; diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/games/raylib-games/default.nix index 802093b8682c..7a0d80a4c5e6 100644 --- a/pkgs/games/raylib-games/default.nix +++ b/pkgs/games/raylib-games/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Collection of games made with raylib "; + description = "Collection of games made with raylib"; homepage = "https://www.raylib.com/games.html"; license = licenses.zlib; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/os-specific/linux/reap/default.nix b/pkgs/os-specific/linux/reap/default.nix index 79bfe2936276..f8ba9fa6b0ec 100644 --- a/pkgs/os-specific/linux/reap/default.nix +++ b/pkgs/os-specific/linux/reap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/leahneukirchen/reap"; - description = "run process until all its spawned processes are dead "; + description = "run process until all its spawned processes are dead"; mainProgram = "reap"; license = with licenses; [ publicDomain ]; platforms = platforms.linux; diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix index f4af035e51fe..fea99dce2ef6 100644 --- a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix +++ b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix @@ -29,7 +29,7 @@ buildHomeAssistantComponent rec { meta = with lib; { changelog = "https://github.com/ollo69/ha-samsungtv-smart/releases/tag/v${version}"; - description = "Home Assistant Samsung TV Integration "; + description = "Home Assistant Samsung TV Integration"; homepage = "https://github.com/ollo69/ha-samsungtv-smart"; maintainers = with maintainers; [ mindstorms6 ]; license = licenses.asl20; diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index 639045d18aff..140d598a66f6 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "RedWax CA service module for handling the Netscape keygen requests. "; + description = "RedWax CA service module for handling the Netscape keygen requests."; homepage = "https://redwax.eu"; changelog = "https://source.redwax.eu/projects/RS/repos/mod_spkac/browse/ChangeLog"; license = licenses.asl20; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f06b5b9426f2..591e0852241e 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -600,7 +600,7 @@ let self = { inputs = [ pam ]; meta = with lib; { - description = "Use PAM for simple http authentication "; + description = "Use PAM for simple http authentication"; homepage = "https://github.com/sto/ngx_http_auth_pam_module"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix index c46959598149..755f1d64e15c 100644 --- a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-tR+OHxj/97AixuAp0Kx9xQsKPAxpvF6hDha5BgMBha0="; meta = with lib; { - description = "Prometheus exporter for RIPE Atlas measurement results "; + description = "Prometheus exporter for RIPE Atlas measurement results"; mainProgram = "atlas_exporter"; homepage = "https://github.com/czerwonk/atlas_exporter"; license = licenses.lgpl3; diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix index 7edc3dd89b2a..885293d6be96 100644 --- a/pkgs/servers/roapi/http.nix +++ b/pkgs/servers/roapi/http.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Create full-fledged APIs for static datasets without writing a single line of code. "; + description = "Create full-fledged APIs for static datasets without writing a single line of code."; homepage = "https://roapi.github.io/docs/"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix index 34b9f9c7c5ba..447602b0463f 100644 --- a/pkgs/servers/search/lnx/default.nix +++ b/pkgs/servers/search/lnx/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { }; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; meta = with lib; { - description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. "; + description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants."; mainProgram = "lnx"; homepage = "https://lnx.rs/"; license = licenses.mit; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index 1c252397d48e..a44c9771cd01 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -12,6 +12,6 @@ mkDiscoursePlugin { homepage = "https://github.com/discourse/discourse-checklist"; maintainers = with maintainers; [ ryantm ]; license = licenses.gpl2Only; - description = "Simple checklist rendering plugin for discourse "; + description = "Simple checklist rendering plugin for discourse"; }; } diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index ce1f17dc0a74..ee7d2122917d 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -92,7 +92,7 @@ py.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/healthchecks/healthchecks"; - description = "Cron monitoring tool written in Python & Django "; + description = "Cron monitoring tool written in Python & Django"; license = licenses.bsd3; maintainers = with maintainers; [ phaer ]; }; diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index ebfa55ecd229..b0704065901b 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Jump back to a specific directory, without doing `cd ../../..` "; + description = "Jump back to a specific directory, without doing `cd ../../..`"; homepage = "https://github.com/Tarrasch/zsh-bd"; license = lib.licenses.free; diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index c24a5e7c15c7..67c70ebc76a0 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. "; + description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams."; longDescription = '' Super Audio CD decoder. Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index ec3cad6e8747..041a0095fb1c 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "Utility for manipulating ini files "; + description = "Utility for manipulating ini files"; homepage = "https://www.pixelbeat.org/programs/crudini/"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix index a015f3dabfac..1c83bb6e3d99 100644 --- a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix +++ b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-1WTc7peTJI3IvHJqznqRz29uQ2NG0CZpAAzlyYymZCQ="; meta = with lib; { - description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document "; + description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document"; homepage = "https://github.com/flosell/iam-policy-json-to-terraform"; changelog = "https://github.com/flosell/iam-policy-json-to-terraform/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 4d455977d6d9..c7e92770b7d6 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "Linux and Mac OS support for the CorsairLink Devices "; + description = "Linux and Mac OS support for the CorsairLink Devices"; homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix index 2db24a46bfe0..1ba4a8aea5e4 100644 --- a/pkgs/tools/misc/pcb2gcode/default.nix +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Command-line tool for isolation, routing and drilling of PCBs "; + description = "Command-line tool for isolation, routing and drilling of PCBs"; longDescription = '' pcb2gcode is a command-line software for the isolation, routing and drilling of PCBs. It takes Gerber files as input and it outputs gcode files, suitable for the milling of PCBs. diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/tools/misc/precice-config-visualizer/default.nix index 9b6d40a0c733..743d107ee534 100644 --- a/pkgs/tools/misc/precice-config-visualizer/default.nix +++ b/pkgs/tools/misc/precice-config-visualizer/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/precice/config-visualizer"; - description = "Small python tool for visualizing the preCICE xml configuration "; + description = "Small python tool for visualizing the preCICE xml configuration"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; mainProgram = "precice-config-visualizer"; diff --git a/pkgs/tools/misc/timetagger_cli/default.nix b/pkgs/tools/misc/timetagger_cli/default.nix index f6204e2d8fe1..cea0a53c79de 100644 --- a/pkgs/tools/misc/timetagger_cli/default.nix +++ b/pkgs/tools/misc/timetagger_cli/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Track your time from the command-line "; + description = "Track your time from the command-line"; homepage = "https://github.com/almarklein/timetagger_cli"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/tools/misc/vix/default.nix b/pkgs/tools/misc/vix/default.nix index 9e759536d74c..262958c9c2fd 100644 --- a/pkgs/tools/misc/vix/default.nix +++ b/pkgs/tools/misc/vix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ SDL ]; meta = with lib; { - description = "Visual Interface heXadecimal dump "; + description = "Visual Interface heXadecimal dump"; homepage = "http://actinid.org/vix/"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index 4f55df3cc279..5939c752dbde 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/tlby/netmask"; - description = "IP address formatting tool "; + description = "IP address formatting tool"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.jensbin ]; diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix b/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix index 5c51ff25d1ef..5235832f78e3 100644 --- a/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix +++ b/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "WIP window and afk watcher for wayland "; + description = "WIP window and afk watcher for wayland"; homepage = "https://github.com/ActivityWatch/aw-watcher-window-wayland"; license = licenses.mpl20; maintainers = with maintainers; [ esau79p ]; From 61fe0c041677ee92f2200a7733f3dc9a1a927ce3 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 21:36:46 +0200 Subject: [PATCH 19/28] pkgs/by-name: remove unused arguments --- pkgs/by-name/_2/_2ship2harkinian/package.nix | 1 - pkgs/by-name/af/affine/package.nix | 2 -- pkgs/by-name/al/alephone-eternal/package.nix | 2 +- pkgs/by-name/al/alephone-evil/package.nix | 2 +- pkgs/by-name/al/alephone-red/package.nix | 2 +- pkgs/by-name/am/am2rlauncher/package.nix | 1 - pkgs/by-name/ap/apvlv/package.nix | 1 - pkgs/by-name/at/atf/package.nix | 1 - pkgs/by-name/au/authentik/ldap.nix | 2 +- pkgs/by-name/au/authentik/radius.nix | 2 +- pkgs/by-name/bl/blanket/package.nix | 1 - pkgs/by-name/bt/bt-migrate/package.nix | 1 - pkgs/by-name/ce/celeste64/package.nix | 1 - pkgs/by-name/cl/clojure-lsp/package.nix | 2 -- pkgs/by-name/co/cosmic-edit/package.nix | 1 - pkgs/by-name/co/cosmic-store/package.nix | 2 +- pkgs/by-name/co/cosmic-term/package.nix | 1 - pkgs/by-name/cu/cue/tests/001-all-good.nix | 3 +-- pkgs/by-name/de/deltachat-repl/package.nix | 3 +-- .../de/deltachat-rpc-server/package.nix | 3 +-- pkgs/by-name/dp/dpp/package.nix | 1 - .../du/duckstation/shaderc-patched.nix | 20 +++++++++++++++++++ pkgs/by-name/ed/edido/package.nix | 3 +-- pkgs/by-name/ei/eintopf/frontend.nix | 4 +--- .../el/elvish/tests/expect-version.nix | 3 +-- pkgs/by-name/et/ethercat/package.nix | 1 - pkgs/by-name/ex/exe2hex/package.nix | 1 - pkgs/by-name/ey/eyewitness/package.nix | 1 - pkgs/by-name/fi/fira-math/package.nix | 2 +- pkgs/by-name/fo/fooyin/package.nix | 2 -- pkgs/by-name/fo/forgejo/package.nix | 1 - pkgs/by-name/gf/gfal2/package.nix | 1 - pkgs/by-name/gh/ghdl/test-simple.nix | 2 +- pkgs/by-name/gh/ghex/package.nix | 1 - pkgs/by-name/gi/git-get/package.nix | 2 +- pkgs/by-name/gi/git-instafix/package.nix | 1 - pkgs/by-name/go/goldwarden/package.nix | 1 - pkgs/by-name/gp/gprename/package.nix | 3 --- pkgs/by-name/ha/handheld-daemon/package.nix | 1 - .../ha/haunt/tests/001-test-version.nix | 3 +-- pkgs/by-name/he/hextazy/package.nix | 1 - pkgs/by-name/ht/htb-toolkit/package.nix | 2 -- .../io/ios-webkit-debug-proxy/package.nix | 1 - pkgs/by-name/it/itools/package.nix | 1 - pkgs/by-name/jn/jnr-posix/package.nix | 2 -- pkgs/by-name/la/lager/package.nix | 1 - pkgs/by-name/ld/ldc/package.nix | 2 -- pkgs/by-name/li/libcircle/package.nix | 1 - pkgs/by-name/li/libgnome-keyring/package.nix | 3 +-- pkgs/by-name/li/libitl/package.nix | 1 - pkgs/by-name/lm/lmstudio/darwin.nix | 1 - pkgs/by-name/lm/lmstudio/linux.nix | 3 +-- .../fastdeploy-ppocr.nix | 1 - pkgs/by-name/ma/mautrix-meta/package.nix | 1 - pkgs/by-name/me/media-downloader/package.nix | 1 - pkgs/by-name/mf/mfcj880dwlpr/package.nix | 2 +- pkgs/by-name/mo/mo/package.nix | 1 - pkgs/by-name/mo/mousai/package.nix | 1 - pkgs/by-name/ni/nix-web/package.nix | 1 - pkgs/by-name/ni/nixfmt-rfc-style/package.nix | 1 - pkgs/by-name/nu/nuv/package.nix | 1 - .../nvidia-docker.nix | 2 +- pkgs/by-name/oo/oo7/package.nix | 1 - pkgs/by-name/op/openapi-tui/package.nix | 1 - pkgs/by-name/op/openasar/package.nix | 1 - pkgs/by-name/pa/paralus-cli/package.nix | 2 -- .../pa/parinfer-rust-emacs/package.nix | 1 - pkgs/by-name/pa/parsedmarc/package.nix | 3 +-- pkgs/by-name/pd/pdf4qt/package.nix | 1 - .../by-name/pe/perl-debug-adapter/package.nix | 1 - pkgs/by-name/pg/pghero/package.nix | 1 - pkgs/by-name/pi/picocrypt/package.nix | 1 - .../pr/prometheus-deluge-exporter/package.nix | 1 - pkgs/by-name/pu/pupdate/package.nix | 3 +-- pkgs/by-name/pw/pw3270/package.nix | 2 -- pkgs/by-name/ra/ratchet/tests.nix | 1 - pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix | 3 +-- pkgs/by-name/re/realvnc-vnc-viewer/linux.nix | 3 +-- pkgs/by-name/rm/rmg/package.nix | 1 - pkgs/by-name/rs/rspamd-trainer/package.nix | 1 - pkgs/by-name/sa/salmon/package.nix | 2 -- pkgs/by-name/sa/sanjuuni/package.nix | 1 - pkgs/by-name/sd/SDL2_image_2_0/package.nix | 6 +----- pkgs/by-name/sd/SDL2_image_2_6/package.nix | 6 +----- pkgs/by-name/sk/skypilot/package.nix | 2 -- pkgs/by-name/sm/smile/package.nix | 1 - pkgs/by-name/sn/snekim/package.nix | 2 +- .../by-name/sn/snippetexpandergui/package.nix | 1 - .../sp/spectral-language-server/package.nix | 2 -- .../by-name/sp/spigot/tests/approximation.nix | 3 +-- pkgs/by-name/ss/ssh-openpgp-auth/generic.nix | 1 - pkgs/by-name/st/stackit-cli/package.nix | 1 - pkgs/by-name/st/stalwart-mail/package.nix | 1 - pkgs/by-name/sw/swayfx/package.nix | 1 - pkgs/by-name/sw/swt/package.nix | 1 - pkgs/by-name/sy/symphony/package.nix | 1 - pkgs/by-name/ta/taskwarrior3/package.nix | 1 - pkgs/by-name/ti/tic-80/package.nix | 4 ---- pkgs/by-name/tr/transmission_3/package.nix | 1 - .../tu/tuxclocker-nvidia-plugin/package.nix | 3 +-- .../by-name/tu/tuxclocker-plugins/package.nix | 4 +--- pkgs/by-name/ub/ubuntu-classic/package.nix | 1 - pkgs/by-name/uc/ucg/tests/simple.nix | 3 +-- pkgs/by-name/va/vaults/package.nix | 1 - pkgs/by-name/vi/vieb/package.nix | 2 +- pkgs/by-name/wa/waf/hook.nix | 4 +--- .../wi/windowmaker/dockapps/default.nix | 2 +- pkgs/by-name/wl/wldash/package.nix | 1 - pkgs/by-name/x5/x509-limbo/package.nix | 1 - pkgs/by-name/ye/yeswiki/package.nix | 1 - pkgs/by-name/yu/yunfaavatar/package.nix | 1 - .../package.nix | 2 +- pkgs/by-name/zu/zug/package.nix | 1 - 113 files changed, 55 insertions(+), 157 deletions(-) create mode 100644 pkgs/by-name/du/duckstation/shaderc-patched.nix diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index c0c9ee4a7fa8..38212172c085 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -9,7 +9,6 @@ copyDesktopItems, makeDesktopItem, python3, - boost, SDL2, pkg-config, libpulseaudio, diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 19ebf5131e5f..229d32bc1df8 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -1,12 +1,10 @@ { lib -, writeText , fetchurl , stdenvNoCC , copyDesktopItems , makeDesktopItem , makeWrapper , unzip -, bash , electron , commandLineArgs ? "" }: diff --git a/pkgs/by-name/al/alephone-eternal/package.nix b/pkgs/by-name/al/alephone-eternal/package.nix index c21284150618..186352db7ec1 100644 --- a/pkgs/by-name/al/alephone-eternal/package.nix +++ b/pkgs/by-name/al/alephone-eternal/package.nix @@ -1,4 +1,4 @@ -{ alephone, fetchurl, unrar }: +{ alephone, fetchurl }: alephone.makeWrapper rec { pname = "marathon-eternal"; diff --git a/pkgs/by-name/al/alephone-evil/package.nix b/pkgs/by-name/al/alephone-evil/package.nix index cf12f471a179..d6b59557133b 100644 --- a/pkgs/by-name/al/alephone-evil/package.nix +++ b/pkgs/by-name/al/alephone-evil/package.nix @@ -1,4 +1,4 @@ -{ alephone, fetchurl, unrar }: +{ alephone, fetchurl }: alephone.makeWrapper rec { pname = "marathon-evil"; diff --git a/pkgs/by-name/al/alephone-red/package.nix b/pkgs/by-name/al/alephone-red/package.nix index f24c9010cd63..a2f6a0279017 100644 --- a/pkgs/by-name/al/alephone-red/package.nix +++ b/pkgs/by-name/al/alephone-red/package.nix @@ -1,4 +1,4 @@ -{ alephone, fetchurl, unrar }: +{ alephone, fetchurl }: alephone.makeWrapper rec { pname = "marathon-red"; diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index 0698100d5bdd..2b47d0fbaafd 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -11,7 +11,6 @@ , openssl , xdelta , file -, busybox , openjdk , patchelf , fetchFromGitHub diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 77ad5a034daa..0e5b60fd4a85 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -15,7 +15,6 @@ libxml2, libxshmfence, man, - nix-update-script, pcre, pkg-config, poppler, diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix index a9810826dc89..e77eb5244d6c 100644 --- a/pkgs/by-name/at/atf/package.nix +++ b/pkgs/by-name/at/atf/package.nix @@ -5,7 +5,6 @@ fetchpatch, autoreconfHook, kyua, - pkg-config, gitUpdater, }: diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index d2e40497ce9b..1e1a5abf8754 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-ldap-outpost"; diff --git a/pkgs/by-name/au/authentik/radius.nix b/pkgs/by-name/au/authentik/radius.nix index 957fd3702b77..04efa139efea 100644 --- a/pkgs/by-name/au/authentik/radius.nix +++ b/pkgs/by-name/au/authentik/radius.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-radius-outpost"; diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix index 6171cf0f88c7..72cb5c8faa65 100644 --- a/pkgs/by-name/bl/blanket/package.nix +++ b/pkgs/by-name/bl/blanket/package.nix @@ -7,7 +7,6 @@ wrapGAppsHook4, blueprint-compiler, desktop-file-utils, - appstream-glib, python3Packages, glib, gtk4, diff --git a/pkgs/by-name/bt/bt-migrate/package.nix b/pkgs/by-name/bt/bt-migrate/package.nix index 289e15960c0f..26701d1dc4f2 100644 --- a/pkgs/by-name/bt/bt-migrate/package.nix +++ b/pkgs/by-name/bt/bt-migrate/package.nix @@ -7,7 +7,6 @@ , fmt , jsoncons , pugixml -, sqlite , sqlite_orm , stdenv }: diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix index bcd6356015fe..7d497ec35166 100644 --- a/pkgs/by-name/ce/celeste64/package.nix +++ b/pkgs/by-name/ce/celeste64/package.nix @@ -7,7 +7,6 @@ copyDesktopItems, SDL2, libGL, - mesa, systemd, libpulseaudio, libselinux, diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index fc5ca91fb740..bc482b5dac7d 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -1,10 +1,8 @@ { lib, buildGraalvmNativeImage, - babashka, fetchurl, fetchFromGitHub, - clojure, writeScript, testers, clojure-lsp, diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 2fc1f95082d9..9ff8810dc517 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - cmake, makeBinaryWrapper, cosmic-icons, just, diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index fb4eb787cb70..61aa2aa4d9e7 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, appstream, makeBinaryWrapper , cosmic-icons, glib, just, pkg-config, libglvnd, libxkbcommon, libinput -, fontconfig, flatpak, freetype, openssl, mesa, wayland, xorg, vulkan-loader +, fontconfig, flatpak, freetype, openssl, wayland, xorg, vulkan-loader , vulkan-validation-layers, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index b2bcf3ebccbc..4d210eb6c232 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -8,7 +8,6 @@ , libinput , libxkbcommon , makeBinaryWrapper -, mesa , pkg-config , rustPlatform , stdenv diff --git a/pkgs/by-name/cu/cue/tests/001-all-good.nix b/pkgs/by-name/cu/cue/tests/001-all-good.nix index d9919cd7fee4..f7fc46eebea6 100644 --- a/pkgs/by-name/cu/cue/tests/001-all-good.nix +++ b/pkgs/by-name/cu/cue/tests/001-all-good.nix @@ -1,5 +1,4 @@ -{ lib -, cue +{ cue , runCommand }: diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix index 3de470c08524..fe97f891caa7 100644 --- a/pkgs/by-name/de/deltachat-repl/package.nix +++ b/pkgs/by-name/de/deltachat-repl/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix index 6c57548cf9e8..b7d0dbef2374 100644 --- a/pkgs/by-name/de/deltachat-rpc-server/package.nix +++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/dp/dpp/package.nix b/pkgs/by-name/dp/dpp/package.nix index 6079585e5d29..7e639cc021d0 100644 --- a/pkgs/by-name/dp/dpp/package.nix +++ b/pkgs/by-name/dp/dpp/package.nix @@ -6,7 +6,6 @@ , zlib , libsodium , pkg-config -, autoPatchelfHook , lib }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix new file mode 100644 index 000000000000..3211925699e1 --- /dev/null +++ b/pkgs/by-name/du/duckstation/shaderc-patched.nix @@ -0,0 +1,20 @@ +{ + fetchpatch, + duckstation, + shaderc, +}: + +shaderc.overrideAttrs (old: { + pname = "shaderc-patched-for-duckstation"; + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; + hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; + excludes = [ + "CHANGES" + "CMakeLists.txt" + "libshaderc/CMakeLists.txt" + ]; + }) + ]; +}) diff --git a/pkgs/by-name/ed/edido/package.nix b/pkgs/by-name/ed/edido/package.nix index 2d1f69e6a740..2572a0dc2af8 100644 --- a/pkgs/by-name/ed/edido/package.nix +++ b/pkgs/by-name/ed/edido/package.nix @@ -1,5 +1,4 @@ -{ lib -, writeShellApplication +{ writeShellApplication , bc , diffutils , findutils diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index 0a7bdd15dee9..f16198b30484 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -1,9 +1,7 @@ -{ lib -, stdenv +{ stdenv , fetchYarnDeps , fixup-yarn-lock , yarn -, fetchFromGitea , src , version , nodejs diff --git a/pkgs/by-name/el/elvish/tests/expect-version.nix b/pkgs/by-name/el/elvish/tests/expect-version.nix index 406f2131199d..b7935ceea671 100644 --- a/pkgs/by-name/el/elvish/tests/expect-version.nix +++ b/pkgs/by-name/el/elvish/tests/expect-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , elvish , substituteAll }: diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index 3d7ae6d0854d..f8e128bf436a 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -1,5 +1,4 @@ { autoreconfHook -, cmake , lib , pkg-config , stdenv diff --git a/pkgs/by-name/ex/exe2hex/package.nix b/pkgs/by-name/ex/exe2hex/package.nix index 4213a6905d8f..485e0104cba2 100644 --- a/pkgs/by-name/ex/exe2hex/package.nix +++ b/pkgs/by-name/ex/exe2hex/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python3Packages , expect diff --git a/pkgs/by-name/ey/eyewitness/package.nix b/pkgs/by-name/ey/eyewitness/package.nix index 7cda284f6be8..cc13cb0e13a9 100644 --- a/pkgs/by-name/ey/eyewitness/package.nix +++ b/pkgs/by-name/ey/eyewitness/package.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , python3Packages -, cmake , xvfb-run , firefox-esr , geckodriver diff --git a/pkgs/by-name/fi/fira-math/package.nix b/pkgs/by-name/fi/fira-math/package.nix index 56bcb916d2d4..58b72f6b740e 100644 --- a/pkgs/by-name/fi/fira-math/package.nix +++ b/pkgs/by-name/fi/fira-math/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fira-math, python3, stdenvNoCC }: +{ lib, fetchFromGitHub, python3, stdenvNoCC }: let pname = "fira-math"; diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index 8c03c4f5fe7c..f61506f28d6a 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -7,10 +7,8 @@ , ffmpeg , kdePackages , kdsingleapplication -, openssl , pipewire , taglib -, zlib }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index c98957268aa0..03a7b974d4ce 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -2,7 +2,6 @@ , brotli , buildGoModule , forgejo -, fetchpatch , git , gzip , lib diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index bde7e06b30c2..e46b8807473f 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, callPackage , fetchFromGitHub # Native build inputs , cmake diff --git a/pkgs/by-name/gh/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix index ae265cfba82c..bf034441be25 100644 --- a/pkgs/by-name/gh/ghdl/test-simple.nix +++ b/pkgs/by-name/gh/ghdl/test-simple.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: +{ stdenv, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: let ghdl = if backend == "llvm" then ghdl-llvm else if backend == "gcc" then ghdl-gcc else ghdl-mcode; diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 0f3aefaa56be..95c4448025ef 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -10,7 +10,6 @@ , appstream-glib , gettext , itstool -, libxml2 , gtk4 , libadwaita , glib diff --git a/pkgs/by-name/gi/git-get/package.nix b/pkgs/by-name/gi/git-get/package.nix index 01d3a183cf40..8e6bea06ab7f 100644 --- a/pkgs/by-name/gi/git-get/package.nix +++ b/pkgs/by-name/gi/git-get/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, git, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: let config-module = "git-get/pkg/cfg"; in diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index 02bdb77977ee..d05e9fab8726 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -1,7 +1,6 @@ { git , lib , libgit2 -, makeWrapper , rustPlatform , stdenv , fetchFromGitHub diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix index 264ea5268542..e6938d3be694 100644 --- a/pkgs/by-name/go/goldwarden/package.nix +++ b/pkgs/by-name/go/goldwarden/package.nix @@ -2,7 +2,6 @@ , blueprint-compiler , buildGoModule , fetchFromGitHub -, fetchpatch , gobject-introspection , gtk4 , libadwaita diff --git a/pkgs/by-name/gp/gprename/package.nix b/pkgs/by-name/gp/gprename/package.nix index 18591b735385..6ae3b792ccfd 100644 --- a/pkgs/by-name/gp/gprename/package.nix +++ b/pkgs/by-name/gp/gprename/package.nix @@ -5,10 +5,7 @@ makeWrapper, moreutils, perlPackages, - gettext, - glib, gtk3, - gobject-introspection, pango, harfbuzz, gdk-pixbuf, diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index a872057ff53d..a25f42e5ade6 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -1,5 +1,4 @@ { - config, fetchFromGitHub, hidapi, kmod, diff --git a/pkgs/by-name/ha/haunt/tests/001-test-version.nix b/pkgs/by-name/ha/haunt/tests/001-test-version.nix index 726a7ac95713..026d580c1965 100644 --- a/pkgs/by-name/ha/haunt/tests/001-test-version.nix +++ b/pkgs/by-name/ha/haunt/tests/001-test-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , haunt }: diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index a8f4b2ba55b9..52440b774bf1 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, }: diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 9cffed873290..dbbe025bf661 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -8,9 +8,7 @@ , coreutils , gnome-keyring , libsecret -, bash , openvpn -, nerdfonts , gzip , killall }: diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 13ecbb058c06..8ec3a3252907 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoconf, automake, diff --git a/pkgs/by-name/it/itools/package.nix b/pkgs/by-name/it/itools/package.nix index 85cede0eb900..853efdaa6683 100644 --- a/pkgs/by-name/it/itools/package.nix +++ b/pkgs/by-name/it/itools/package.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , autoreconfHook -, pkgs , pkg-config , perl , libitl diff --git a/pkgs/by-name/jn/jnr-posix/package.nix b/pkgs/by-name/jn/jnr-posix/package.nix index 7cc3f67e083a..8ae46e7f5dc8 100644 --- a/pkgs/by-name/jn/jnr-posix/package.nix +++ b/pkgs/by-name/jn/jnr-posix/package.nix @@ -1,9 +1,7 @@ { stdenv , lib , fetchFromGitHub -, dpkg , jdk -, makeWrapper , maven , which }: diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 1786e0cc503d..83144cca3bdf 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, pkg-config , boost , immer , zug diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index f92d62430911..9a016cf0e616 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -6,12 +6,10 @@ , llvm_17 , curl , tzdata -, libconfig , lit , gdb , unzip , darwin -, bash , callPackage , makeWrapper , runCommand diff --git a/pkgs/by-name/li/libcircle/package.nix b/pkgs/by-name/li/libcircle/package.nix index d176bbacc89f..1ff33ac1ac21 100644 --- a/pkgs/by-name/li/libcircle/package.nix +++ b/pkgs/by-name/li/libcircle/package.nix @@ -4,7 +4,6 @@ , autoreconfHook , pkg-config , mpi -, lwgrp }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/li/libgnome-keyring/package.nix b/pkgs/by-name/li/libgnome-keyring/package.nix index e845970a6ad7..bc4a26a0079b 100644 --- a/pkgs/by-name/li/libgnome-keyring/package.nix +++ b/pkgs/by-name/li/libgnome-keyring/package.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome -, testers +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, testers }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/li/libitl/package.nix b/pkgs/by-name/li/libitl/package.nix index e1d3a21e7291..8bec704064c5 100644 --- a/pkgs/by-name/li/libitl/package.nix +++ b/pkgs/by-name/li/libitl/package.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, fetchpatch }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index dae243747292..2a96f05bebe6 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , undmg -, lib , meta , pname , version diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index d5647e72caaa..f4ed1b048000 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -1,5 +1,4 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , version , pname diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 77b7e00b0618..98ab599b9ddc 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -1,7 +1,6 @@ { stdenv, config, - pkgs, lib, fetchFromGitHub, cmake, diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 8a82adf188fd..17639dc432e3 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -1,5 +1,4 @@ { buildGoModule -, config , fetchFromGitHub , lib , nixosTests diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 2db54695b3b8..5d77bbd63478 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -13,7 +13,6 @@ libsForQt5, python3, stdenv, - yt-dlp, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/mf/mfcj880dwlpr/package.nix b/pkgs/by-name/mf/mfcj880dwlpr/package.nix index 8b69c85c7240..cbfcd2b54b9c 100644 --- a/pkgs/by-name/mf/mfcj880dwlpr/package.nix +++ b/pkgs/by-name/mf/mfcj880dwlpr/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell -, ghostscript, a2ps, bash }: +, ghostscript, a2ps }: # Why: # The executable "brprintconf_mfcj880dw" binary is looking for "/opt/brother/Printers/%s/inf/br%sfunc" and "/opt/brother/Printers/%s/inf/br%src". diff --git a/pkgs/by-name/mo/mo/package.nix b/pkgs/by-name/mo/mo/package.nix index 5de0716fde5d..4ce066920b99 100644 --- a/pkgs/by-name/mo/mo/package.nix +++ b/pkgs/by-name/mo/mo/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, runtimeShell }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index 48535143a509..b67ef0d86452 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -7,7 +7,6 @@ , desktop-file-utils , glib , glib-networking -, gobject-introspection , gst_all_1 , gtk4 , libadwaita diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 4f73413d2888..ad97b1356b3e 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -7,7 +7,6 @@ , nixVersions , nixPackage ? nixVersions.nix_2_18 , darwin -, nukeReferences }: let diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix index bf1c093051d5..a11e2d29ff69 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix @@ -4,7 +4,6 @@ lib, runCommand, nixfmt-rfc-style, - fetchpatch, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix index 7e434984786a..386828568104 100644 --- a/pkgs/by-name/nu/nuv/package.nix +++ b/pkgs/by-name/nu/nuv/package.nix @@ -2,7 +2,6 @@ , symlinkJoin , callPackage , fetchFromGitHub -, fetchurl , buildGoModule , makeWrapper , breakpointHook diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix index 07dfc3fdb6dc..f2ff4bafaf77 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, callPackage }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nvidia-docker"; version = "2.5.0"; diff --git a/pkgs/by-name/oo/oo7/package.nix b/pkgs/by-name/oo/oo7/package.nix index a126a27fd107..4fcd76aedd5f 100644 --- a/pkgs/by-name/oo/oo7/package.nix +++ b/pkgs/by-name/oo/oo7/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - nix-update-script, oo7, openssl, pkg-config, diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix index fdbc0b6cb1d3..09c7eae81bf4 100644 --- a/pkgs/by-name/op/openapi-tui/package.nix +++ b/pkgs/by-name/op/openapi-tui/package.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, pkg-config }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 5c1ddb9a9f76..0d034ea1b8d1 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, unstableGitUpdater, nodejs, - bash, asar, unzip, }: diff --git a/pkgs/by-name/pa/paralus-cli/package.nix b/pkgs/by-name/pa/paralus-cli/package.nix index 81ef70de32f7..e838acf69cf0 100644 --- a/pkgs/by-name/pa/paralus-cli/package.nix +++ b/pkgs/by-name/pa/paralus-cli/package.nix @@ -1,8 +1,6 @@ { lib , fetchFromGitHub , buildGoModule -, paralus-cli -, testers }: buildGoModule rec { diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix index 8bed804d3d66..2c9d7a48f045 100644 --- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix +++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, lib, - llvmPackages, rustPlatform, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix index fab1e01e8ba4..6c08dced6326 100644 --- a/pkgs/by-name/pa/parsedmarc/package.nix +++ b/pkgs/by-name/pa/parsedmarc/package.nix @@ -1,5 +1,4 @@ -{ lib -, python3 +{ python3 , fetchFromGitHub }: diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index ff9aa46666cf..d11d346724d2 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, substituteAll , lcms , cmake , pkg-config diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix index eb9dd371a9b9..85deced748f6 100644 --- a/pkgs/by-name/pe/perl-debug-adapter/package.nix +++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix @@ -1,7 +1,6 @@ { lib , buildNpmPackage , fetchFromGitHub -, makeWrapper , perl # Needed if you want to use it for a perl script with dependencies. , extraPerlPackages ? [] diff --git a/pkgs/by-name/pg/pghero/package.nix b/pkgs/by-name/pg/pghero/package.nix index 0f74a39add63..34c9d9466da5 100644 --- a/pkgs/by-name/pg/pghero/package.nix +++ b/pkgs/by-name/pg/pghero/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, ruby , bundlerEnv , buildPackages , fetchFromGitHub diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index 964746933186..2cad57457117 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, stdenv, - darwin, copyDesktopItems, makeDesktopItem, diff --git a/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix index 3b98cf5e3d76..4adcaf0a747d 100644 --- a/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-deluge-exporter/package.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, nixosTests }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index a45b77d2e965..ff5e48b37ecf 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -1,5 +1,4 @@ -{ pkgs -, stdenv +{ stdenv , lib , fetchFromGitHub , buildDotnetModule diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix index 657a21806950..953674cd3ec5 100644 --- a/pkgs/by-name/pw/pw3270/package.nix +++ b/pkgs/by-name/pw/pw3270/package.nix @@ -5,7 +5,6 @@ , pkg-config , automake , autoconf -, m4 , libtool , gtk3 , libv3270 @@ -13,7 +12,6 @@ , openssl , gettext , desktop-file-utils -, glib , wrapGAppsHook3 }: diff --git a/pkgs/by-name/ra/ratchet/tests.nix b/pkgs/by-name/ra/ratchet/tests.nix index 7585c06d9172..75ae285d734e 100644 --- a/pkgs/by-name/ra/ratchet/tests.nix +++ b/pkgs/by-name/ra/ratchet/tests.nix @@ -1,5 +1,4 @@ { - lib, runCommand, ratchet, }: let diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix index 7b2f6523f13b..6f1f113665e9 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenvNoCC +{ stdenvNoCC , fetchurl , undmg , pname diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix index 30d2b60c2042..3d13bfdf9dc4 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , autoPatchelfHook , rpmextract diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 6b04798900ad..4dd9ac30d648 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gitUpdater , boost , cmake diff --git a/pkgs/by-name/rs/rspamd-trainer/package.nix b/pkgs/by-name/rs/rspamd-trainer/package.nix index 3ed3c7aaea08..56e6f9e9ce8e 100644 --- a/pkgs/by-name/rs/rspamd-trainer/package.nix +++ b/pkgs/by-name/rs/rspamd-trainer/package.nix @@ -2,7 +2,6 @@ , python3 , python3Packages , fetchFromGitLab -, makeWrapper , fetchpatch , rspamd }: diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix index cf74c0677fe7..09a2fec4c257 100644 --- a/pkgs/by-name/sa/salmon/package.nix +++ b/pkgs/by-name/sa/salmon/package.nix @@ -1,7 +1,5 @@ { lib , stdenv -, autoreconfHook -, bash , boost , bzip2 , cereal_1_3_2 diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index e43efa771b57..d448f5e07132 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, ffmpeg, poco, diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix index c52a60637766..98de34a2530a 100644 --- a/pkgs/by-name/sd/SDL2_image_2_0/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_0/package.nix @@ -1,9 +1,5 @@ # Dependency of pygame, toppler -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.0.5"; diff --git a/pkgs/by-name/sd/SDL2_image_2_6/package.nix b/pkgs/by-name/sd/SDL2_image_2_6/package.nix index ef57e146098e..edd912311b82 100644 --- a/pkgs/by-name/sd/SDL2_image_2_6/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_6/package.nix @@ -1,10 +1,6 @@ # Dependency for hedgewars: # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.6.3"; diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix index 0a951a8cd96d..fe832ae33417 100644 --- a/pkgs/by-name/sk/skypilot/package.nix +++ b/pkgs/by-name/sk/skypilot/package.nix @@ -1,7 +1,5 @@ { lib, - pkgs, - stdenv, fetchFromGitHub, python3Packages, }: diff --git a/pkgs/by-name/sm/smile/package.nix b/pkgs/by-name/sm/smile/package.nix index b6e177690659..787e456845f6 100644 --- a/pkgs/by-name/sm/smile/package.nix +++ b/pkgs/by-name/sm/smile/package.nix @@ -4,7 +4,6 @@ , desktop-file-utils , glib , gobject-introspection -, gtk4 , meson , ninja , wrapGAppsHook4 diff --git a/pkgs/by-name/sn/snekim/package.nix b/pkgs/by-name/sn/snekim/package.nix index cf7d2b718f83..8c8841b9dbd7 100644 --- a/pkgs/by-name/sn/snekim/package.nix +++ b/pkgs/by-name/sn/snekim/package.nix @@ -1,4 +1,4 @@ -{ lib, buildNimPackage, fetchFromGitea, raylib }: +{ lib, buildNimPackage, fetchFromGitea }: buildNimPackage (finalAttrs: { pname = "snekim"; diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 7a7606e3d36b..8434f8672305 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -7,7 +7,6 @@ , xorg , gtk3 , webkitgtk -, gsettings-desktop-schemas , snippetexpanderd , snippetexpanderx }: diff --git a/pkgs/by-name/sp/spectral-language-server/package.nix b/pkgs/by-name/sp/spectral-language-server/package.nix index 9c895e171f7a..3a6ac22184ef 100644 --- a/pkgs/by-name/sp/spectral-language-server/package.nix +++ b/pkgs/by-name/sp/spectral-language-server/package.nix @@ -3,8 +3,6 @@ , stdenv , fetchYarnDeps , yarnConfigHook -, yarnBuildHook -, nodejs , fetchFromGitHub , typescript , jq diff --git a/pkgs/by-name/sp/spigot/tests/approximation.nix b/pkgs/by-name/sp/spigot/tests/approximation.nix index ffb329e6a317..fbf4875e1e61 100644 --- a/pkgs/by-name/sp/spigot/tests/approximation.nix +++ b/pkgs/by-name/sp/spigot/tests/approximation.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , spigot }: diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 5fadd5798ae8..47edd91a4f3c 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -7,7 +7,6 @@ , just , rust-script , installShellFiles -, bzip2 , nettle , openssl , sqlite diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index bd937c558c73..ee53cc4932d7 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -6,7 +6,6 @@ , less , xdg-utils , testers -, runCommand , stackit-cli }: diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 871305321b1e..2309acd9a9fc 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -14,7 +14,6 @@ nix-update-script, nixosTests, rocksdb_8_11, - callPackage, }: let diff --git a/pkgs/by-name/sw/swayfx/package.nix b/pkgs/by-name/sw/swayfx/package.nix index 9583f9b7a710..d9fe039a2a53 100644 --- a/pkgs/by-name/sw/swayfx/package.nix +++ b/pkgs/by-name/sw/swayfx/package.nix @@ -1,5 +1,4 @@ { - lib, swayfx-unwrapped, sway, # Used by the NixOS module: diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index c67424f4fc06..49f2d4ce0f88 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -1,7 +1,6 @@ { atk, fetchzip, - glib, gtk2, jdk, lib, diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix index cb75fae961b1..3e420421b0f5 100644 --- a/pkgs/by-name/sy/symphony/package.nix +++ b/pkgs/by-name/sy/symphony/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, cmake , coin-utils , coinmp , gfortran diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 17a14daf2adf..79c82c0ea509 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -8,7 +8,6 @@ fetchFromGitHub, cmake, libuuid, - gnutls, python3, xdg-utils, installShellFiles, diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index 0e82c4eb44d5..28839ec7716a 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -3,16 +3,13 @@ , cmake , pkg-config , python3 -, ruby , rake -, git , curl , fetchFromGitHub , libGL , libGLU , alsa-lib , libX11 -, xorgproto , libICE , libXi , libXScrnSaver @@ -30,7 +27,6 @@ , libdecor , pipewire , libpulseaudio -, libiconv # Whether to build TIC-80's "Pro" version, which is an incentive to support the project financially, # that enables some additional features. It is, however, fully open source. , withPro ? false diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix index 32f9b92079a7..21dfed11c543 100644 --- a/pkgs/by-name/tr/transmission_3/package.nix +++ b/pkgs/by-name/tr/transmission_3/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchurl , cmake , pkg-config , openssl diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix index b783953acd93..a3bbf153aaa3 100644 --- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , boost , libX11 , libXext diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix index 12deedd5c56f..2da3202e2332 100644 --- a/pkgs/by-name/tu/tuxclocker-plugins/package.nix +++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix @@ -1,7 +1,5 @@ -{ lib -, stdenv +{ stdenv , boost -, cmake , gettext , libdrm , meson diff --git a/pkgs/by-name/ub/ubuntu-classic/package.nix b/pkgs/by-name/ub/ubuntu-classic/package.nix index 23dabae70e22..edb10821d771 100644 --- a/pkgs/by-name/ub/ubuntu-classic/package.nix +++ b/pkgs/by-name/ub/ubuntu-classic/package.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchgit, gitUpdater, - rename, }: stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/uc/ucg/tests/simple.nix b/pkgs/by-name/uc/ucg/tests/simple.nix index 09910d0829da..033f408ce1b7 100644 --- a/pkgs/by-name/uc/ucg/tests/simple.nix +++ b/pkgs/by-name/uc/ucg/tests/simple.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , ucg }: diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index 6e0f1078819b..d2cb90dc51d8 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -17,7 +17,6 @@ , wayland , gocryptfs , cryfs -, cmake }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index 707a0a0f5cbb..6927cb3e24af 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -1,4 +1,4 @@ -{ stdenv, buildNpmPackage, fetchFromGitHub, electron, makeWrapper, python3, makeDesktopItem, nix-update-script, lib }: +{ stdenv, buildNpmPackage, fetchFromGitHub, electron, makeWrapper, python3, makeDesktopItem, lib }: buildNpmPackage rec { pname = "vieb"; diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index f97a4ed22146..37757aec1888 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -1,6 +1,4 @@ -{ lib -, pkgs -, makeSetupHook +{ makeSetupHook , waf }: diff --git a/pkgs/by-name/wi/windowmaker/dockapps/default.nix b/pkgs/by-name/wi/windowmaker/dockapps/default.nix index 84cfe01bddf3..d927fd951fdf 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/default.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ lib, pkgs }: lib.makeScope pkgs.newScope (self: { diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix index ab45f201e8e6..50dcbeea35d8 100644 --- a/pkgs/by-name/wl/wldash/package.nix +++ b/pkgs/by-name/wl/wldash/package.nix @@ -4,7 +4,6 @@ dbus, fetchFromGitHub, fontconfig, - libffi, libpulseaudio, libxkbcommon, pkg-config, diff --git a/pkgs/by-name/x5/x509-limbo/package.nix b/pkgs/by-name/x5/x509-limbo/package.nix index 239f1c85e300..071a43657b33 100644 --- a/pkgs/by-name/x5/x509-limbo/package.nix +++ b/pkgs/by-name/x5/x509-limbo/package.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , python3 -, x509-limbo }: python3.pkgs.buildPythonPackage { diff --git a/pkgs/by-name/ye/yeswiki/package.nix b/pkgs/by-name/ye/yeswiki/package.nix index 64ccd4353525..0e0562eaf52a 100644 --- a/pkgs/by-name/ye/yeswiki/package.nix +++ b/pkgs/by-name/ye/yeswiki/package.nix @@ -1,5 +1,4 @@ { - lib, stdenv, fetchurl, unzip, diff --git a/pkgs/by-name/yu/yunfaavatar/package.nix b/pkgs/by-name/yu/yunfaavatar/package.nix index 369f89d7c888..410893df44d1 100644 --- a/pkgs/by-name/yu/yunfaavatar/package.nix +++ b/pkgs/by-name/yu/yunfaavatar/package.nix @@ -2,7 +2,6 @@ lib, stdenvNoCC, fetchFromGitHub, - bash, imagemagick, makeWrapper, }: diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix index f8bf2cfc6cf7..da499f9f7157 100644 --- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix +++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchurl, pkg-config }: +{ lib, buildGoModule, fetchurl }: buildGoModule rec { pname = "zabbix-agent2-plugin-postgresql"; diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix index f3356dd51ae6..0c03178b3504 100644 --- a/pkgs/by-name/zu/zug/package.nix +++ b/pkgs/by-name/zu/zug/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, pkgs , fetchFromGitHub , cmake , boost From c2f0f66a64c5fa14cbd12e3d08c525617348d583 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 26 Jul 2024 10:08:50 +0200 Subject: [PATCH 20/28] python312Packages.inflect: add missing dependency + cleaning Co-authored-by: Pol Dellaiera --- .../python-modules/inflect/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 36e0d96f9782..50d7deb1660b 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -3,10 +3,17 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - more-itertools, + + # build-system + setuptools, setuptools-scm, - pytestCheckHook, + + # dependencies + more-itertools, typeguard, + + # checks + pytestCheckHook, }: buildPythonPackage rec { @@ -23,7 +30,10 @@ buildPythonPackage rec { hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ more-itertools @@ -39,11 +49,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "inflect" ]; - meta = with lib; { + meta = { description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles"; homepage = "https://github.com/jaraco/inflect"; changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; - license = licenses.mit; - maintainers = teams.tts.members; + license = lib.licenses.mit; + maintainers = lib.teams.tts.members; }; } From 6dd44107ac5a1a40cd5b02c809294f83ce6dbd20 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 17 Jul 2024 05:26:36 +0200 Subject: [PATCH 21/28] treewide: remove unused lib (and other) arguments --- .../modules/define-_module-args-custom.nix | 2 +- .../modules/define-enable-with-custom-arg.nix | 2 +- lib/tests/modules/disable-declare-enable.nix | 2 +- .../disable-define-enable-string-path.nix | 2 +- lib/tests/modules/disable-define-enable.nix | 2 +- lib/tests/modules/disable-enable-modules.nix | 2 +- .../modules/doRename-condition-enable.nix | 2 +- .../modules/doRename-condition-migrated.nix | 2 +- .../modules/doRename-condition-no-enable.nix | 2 +- lib/tests/modules/import-from-store.nix | 2 +- lib/tests/modules/merge-typeless-option.nix | 2 +- .../scripts/lxd/lxd-container-image-inner.nix | 2 +- .../lxd/lxd-virtual-machine-image-inner.nix | 2 +- nixos/modules/profiles/docker-container.nix | 2 +- nixos/modules/profiles/qemu-guest.nix | 2 +- nixos/modules/security/apparmor/profiles.nix | 2 +- nixos/tests/common/acme/client/default.nix | 2 +- nixos/tests/installed-tests/ostree.nix | 2 +- .../applications/backup/timeshift/default.nix | 1 - .../blockchains/sparrow/fhsenv.nix | 3 +-- .../editors/neovim/tests/default.nix | 2 +- pkgs/applications/gis/qgis/default.nix | 3 +-- pkgs/applications/gis/qgis/ltr.nix | 3 +-- pkgs/applications/misc/blender/wrapper.nix | 1 - .../networking/cluster/tubekit/wrapper.nix | 3 +-- .../mailreaders/mailspring/darwin.nix | 3 +-- .../science/logic/msat/default.nix | 2 +- .../science/math/wolfram-engine/notebook.nix | 2 +- .../losslesscut-bin/build-from-appimage.nix | 5 +---- .../window-managers/taffybar/default.nix | 2 +- pkgs/build-support/fetchtorrent/tests.nix | 2 +- .../trivial-builders/test/concat-test.nix | 2 +- pkgs/by-name/au/authentik/ldap.nix | 2 +- pkgs/by-name/au/authentik/radius.nix | 2 +- pkgs/by-name/cu/cue/tests/001-all-good.nix | 3 +-- pkgs/by-name/de/deltachat-repl/package.nix | 3 +-- .../de/deltachat-rpc-server/package.nix | 3 +-- .../du/duckstation/shaderc-patched.nix | 20 +++++++++++++++++++ pkgs/by-name/ei/eintopf/frontend.nix | 4 +--- .../el/elvish/tests/expect-version.nix | 3 +-- pkgs/by-name/gh/ghdl/test-simple.nix | 2 +- .../ha/haunt/tests/001-test-version.nix | 3 +-- pkgs/by-name/lm/lmstudio/darwin.nix | 1 - pkgs/by-name/lm/lmstudio/linux.nix | 3 +-- pkgs/by-name/pa/parsedmarc/package.nix | 3 +-- pkgs/by-name/ra/ratchet/tests.nix | 1 - pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix | 3 +-- pkgs/by-name/re/realvnc-vnc-viewer/linux.nix | 3 +-- pkgs/by-name/sd/SDL2_image_2_0/package.nix | 6 +----- pkgs/by-name/sd/SDL2_image_2_6/package.nix | 6 +----- .../by-name/sp/spigot/tests/approximation.nix | 3 +-- pkgs/by-name/sw/swayfx/package.nix | 1 - .../tu/tuxclocker-nvidia-plugin/package.nix | 3 +-- .../by-name/tu/tuxclocker-plugins/package.nix | 4 +--- pkgs/by-name/uc/ucg/tests/simple.nix | 3 +-- pkgs/by-name/wa/waf/hook.nix | 4 +--- pkgs/by-name/ye/yeswiki/package.nix | 1 - pkgs/data/fonts/baekmuk-ttf/default.nix | 2 +- pkgs/data/fonts/bakoma-ttf/default.nix | 2 +- pkgs/data/fonts/lmodern/default.nix | 2 +- pkgs/data/fonts/mph-2b-damase/default.nix | 2 +- .../plasma-5/plasma-mobile/default.nix | 1 - .../compilers/gambit/bootstrap.nix | 2 +- pkgs/development/compilers/zig/0.10/hook.nix | 6 +----- pkgs/development/compilers/zig/0.11/hook.nix | 6 +----- pkgs/development/compilers/zig/0.12/hook.nix | 6 +----- pkgs/development/compilers/zig/0.13/hook.nix | 6 +----- pkgs/development/compilers/zig/0.9/hook.nix | 6 +----- .../coq-modules/coq-hammer/default.nix | 2 +- .../embedded/teensy-cmake-macros/hook.nix | 3 +-- .../interpreters/lua-5/wrap-lua.nix | 3 +-- .../interpreters/octave/wrap-octave.nix | 3 +-- .../python/cpython/docs/2.7-html.nix | 2 +- .../python/cpython/docs/2.7-pdf-a4.nix | 2 +- .../python/cpython/docs/2.7-pdf-letter.nix | 2 +- .../python/cpython/docs/2.7-text.nix | 2 +- .../python/cpython/docs/3.10-html.nix | 2 +- .../python/cpython/docs/3.10-pdf-a4.nix | 2 +- .../python/cpython/docs/3.10-pdf-letter.nix | 2 +- .../python/cpython/docs/3.10-texinfo.nix | 2 +- .../python/cpython/docs/3.10-text.nix | 2 +- .../python/cpython/docs/template-info.nix | 2 +- .../python/cpython/docs/template.nix | 2 +- .../python/tests/test_cpython_gdb/default.nix | 2 +- .../libraries/kde-frameworks/kitemviews.nix | 2 +- .../libraries/libde265/test-corpus-decode.nix | 3 +-- .../libraries/qt-5/modules/qtdeclarative.nix | 3 +-- pkgs/development/libraries/tk/8.6.nix | 3 +-- .../bootstrap/build/default.nix | 1 - .../bootstrap/flit-core/default.nix | 1 - .../bootstrap/installer/default.nix | 1 - .../python-modules/deltachat/default.nix | 1 - .../python-modules/edlib/default.nix | 1 - .../python-modules/eduvpn-common/default.nix | 2 -- .../python-modules/horizon-eda/default.nix | 2 -- .../python-modules/linien-common/tests.nix | 1 - .../python-modules/llama-index/default.nix | 1 - .../default.nix | 1 - .../default.nix | 1 - .../default.nix | 1 - .../opentelemetry-exporter-otlp/default.nix | 1 - .../default.nix | 1 - .../default.nix | 1 - .../default.nix | 1 - .../default.nix | 1 - .../default.nix | 1 - .../default.nix | 1 - .../opentelemetry-proto/default.nix | 1 - .../opentelemetry-sdk/default.nix | 1 - .../opentelemetry-test-utils/default.nix | 1 - .../opentelemetry-util-http/default.nix | 1 - .../python-modules/python-olm/default.nix | 1 - .../python-modules/simpleitk/default.nix | 1 - .../widgetsnbextension/default.nix | 1 - .../python-modules/xgboost/default.nix | 1 - .../python-modules/zxing-cpp/default.nix | 1 - .../development/r-modules/wrapper-rstudio.nix | 3 +-- .../tools/ocaml/js_of_ocaml/toplevel.nix | 2 +- pkgs/development/tools/ocaml/merlin/lib.nix | 2 +- .../tools/ocaml/opam/installer.nix | 2 +- .../tools/rust/rust-analyzer/wrapper.nix | 2 +- pkgs/games/mnemosyne/default.nix | 3 +-- pkgs/games/opentyrian/default.nix | 3 +-- .../shticker-book-unwritten/unwrapped.nix | 2 +- pkgs/os-specific/bsd/freebsd/default.nix | 1 - pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix | 1 - pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix | 1 - pkgs/os-specific/bsd/netbsd/pkgs/make.nix | 6 +----- .../bsd/openbsd/pkgs/include/package.nix | 1 - pkgs/os-specific/linux/nftables/python.nix | 3 +-- .../test/backwards-compatibility/default.nix | 2 +- pkgs/servers/apache-airflow/default.nix | 3 +-- pkgs/servers/mlflow-server/default.nix | 2 +- pkgs/servers/monitoring/loki/promtail.nix | 2 +- .../servers/nosql/apache-jena/fuseki-test.nix | 2 +- pkgs/servers/nosql/mongodb/6.0.nix | 2 +- pkgs/test/dhall/buildDhallUrl/default.nix | 2 +- pkgs/test/vim/default.nix | 5 +---- pkgs/tools/audio/beets/builtin-plugins.nix | 2 -- pkgs/tools/networking/xrootd/test-runner.nix | 5 +---- 141 files changed, 120 insertions(+), 218 deletions(-) create mode 100644 pkgs/by-name/du/duckstation/shaderc-patched.nix diff --git a/lib/tests/modules/define-_module-args-custom.nix b/lib/tests/modules/define-_module-args-custom.nix index e565fd215a57..8e53e84c042b 100644 --- a/lib/tests/modules/define-_module-args-custom.nix +++ b/lib/tests/modules/define-_module-args-custom.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { config = { diff --git a/lib/tests/modules/define-enable-with-custom-arg.nix b/lib/tests/modules/define-enable-with-custom-arg.nix index 7da74671d148..9794bf8edf9e 100644 --- a/lib/tests/modules/define-enable-with-custom-arg.nix +++ b/lib/tests/modules/define-enable-with-custom-arg.nix @@ -1,4 +1,4 @@ -{ lib, custom, ... }: +{ custom, ... }: { config = { diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix index a373ee7e550e..19d2e13c786a 100644 --- a/lib/tests/modules/disable-declare-enable.nix +++ b/lib/tests/modules/disable-declare-enable.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ ./declare-enable.nix ]; diff --git a/lib/tests/modules/disable-define-enable-string-path.nix b/lib/tests/modules/disable-define-enable-string-path.nix index 6429a6d6354a..5354a72bba41 100644 --- a/lib/tests/modules/disable-define-enable-string-path.nix +++ b/lib/tests/modules/disable-define-enable-string-path.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ (toString ./define-enable.nix) ]; diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix index 0d84a7c3cb6c..67fefa733586 100644 --- a/lib/tests/modules/disable-define-enable.nix +++ b/lib/tests/modules/disable-define-enable.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ ./define-enable.nix ]; diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix index c325f4e07431..af4d7e60b984 100644 --- a/lib/tests/modules/disable-enable-modules.nix +++ b/lib/tests/modules/disable-enable-modules.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ "define-enable.nix" "declare-enable.nix" ]; diff --git a/lib/tests/modules/doRename-condition-enable.nix b/lib/tests/modules/doRename-condition-enable.nix index e6eabfa6f89a..9e0db126b575 100644 --- a/lib/tests/modules/doRename-condition-enable.nix +++ b/lib/tests/modules/doRename-condition-enable.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { config = { services.foo.enable = true; diff --git a/lib/tests/modules/doRename-condition-migrated.nix b/lib/tests/modules/doRename-condition-migrated.nix index 8d21610e8ec6..fd20ee87f23a 100644 --- a/lib/tests/modules/doRename-condition-migrated.nix +++ b/lib/tests/modules/doRename-condition-migrated.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { config = { services.foos."".bar = "baz"; diff --git a/lib/tests/modules/doRename-condition-no-enable.nix b/lib/tests/modules/doRename-condition-no-enable.nix index 66ec004d3147..9b0427cff047 100644 --- a/lib/tests/modules/doRename-condition-no-enable.nix +++ b/lib/tests/modules/doRename-condition-no-enable.nix @@ -1,4 +1,4 @@ -{ config, lib, options, ... }: +{ config, options, ... }: { config = { result = diff --git a/lib/tests/modules/import-from-store.nix b/lib/tests/modules/import-from-store.nix index f5af22432ce1..c45ccbed76b6 100644 --- a/lib/tests/modules/import-from-store.nix +++ b/lib/tests/modules/import-from-store.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { imports = [ diff --git a/lib/tests/modules/merge-typeless-option.nix b/lib/tests/modules/merge-typeless-option.nix index 627d90b15db2..fcd72634c166 100644 --- a/lib/tests/modules/merge-typeless-option.nix +++ b/lib/tests/modules/merge-typeless-option.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: let typeless = diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index 4698971de8ff..5468488fafed 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix index d1264fa04304..5931a561b31c 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 5365e49711dc..199156edfdc6 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let inherit (pkgs) writeScript; diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index a7015c8bcc61..3dbbbbea182e 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ config, lib, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; diff --git a/nixos/modules/security/apparmor/profiles.nix b/nixos/modules/security/apparmor/profiles.nix index 0bf90a008655..46af0f15f761 100644 --- a/nixos/modules/security/apparmor/profiles.nix +++ b/nixos/modules/security/apparmor/profiles.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let apparmor = config.security.apparmor; in { config.security.apparmor.packages = [ pkgs.apparmor-profiles ]; diff --git a/nixos/tests/common/acme/client/default.nix b/nixos/tests/common/acme/client/default.nix index 503e610d1ac9..f9b08b519dbe 100644 --- a/nixos/tests/common/acme/client/default.nix +++ b/nixos/tests/common/acme/client/default.nix @@ -1,4 +1,4 @@ -{ lib, nodes, pkgs, ... }: +{ nodes, ... }: let caCert = nodes.acme.test-support.acme.caCert; caDomain = nodes.acme.test-support.acme.caDomain; diff --git a/nixos/tests/installed-tests/ostree.nix b/nixos/tests/installed-tests/ostree.nix index 90e09ad4ddf4..b90870204225 100644 --- a/nixos/tests/installed-tests/ostree.nix +++ b/nixos/tests/installed-tests/ostree.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, makeInstalledTest, ... }: +{ pkgs, makeInstalledTest, ... }: makeInstalledTest { tested = pkgs.ostree; diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 0a6a9bf38865..85a3295fb064 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,6 +1,5 @@ { callPackage , timeshift-unwrapped -, lib , rsync , coreutils , mount diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix index 26bf9da0b85d..671da04b6921 100644 --- a/pkgs/applications/blockchains/sparrow/fhsenv.nix +++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix @@ -1,5 +1,4 @@ -{ lib -, buildFHSEnv +{ buildFHSEnv , sparrow-unwrapped }: diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index c2e6b565de28..9152d93c1544 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,6 +1,6 @@ # run tests by building `neovim.tests` { vimUtils, writeText, neovim, vimPlugins -, lib, neovimUtils, wrapNeovimUnstable +, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab , runCommandLocal diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 8b19c70c3b4d..e5e744b37467 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index b551fe0a1e44..bcf99a5f4e4f 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 7450827a8fa9..8b5e8916a138 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -1,5 +1,4 @@ { stdenv -, lib , blender , makeWrapper , extraModules ? [] diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/applications/networking/cluster/tubekit/wrapper.nix index 7cba11c97a3a..d12f69adbfb9 100644 --- a/pkgs/applications/networking/cluster/tubekit/wrapper.nix +++ b/pkgs/applications/networking/cluster/tubekit/wrapper.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , makeWrapper , tubekit-unwrapped , pname ? "tubekit" diff --git a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix index cccc46a4f5eb..e0166e361fe9 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , pname , version diff --git a/pkgs/applications/science/logic/msat/default.nix b/pkgs/applications/science/logic/msat/default.nix index 299fe95224eb..3c27493baff8 100644 --- a/pkgs/applications/science/logic/msat/default.nix +++ b/pkgs/applications/science/logic/msat/default.nix @@ -1,4 +1,4 @@ -{ lib, ocamlPackages }: +{ ocamlPackages }: with ocamlPackages; buildDunePackage { pname = "msat-bin"; diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/applications/science/math/wolfram-engine/notebook.nix index 85570eeca7fb..07cd0afa3099 100644 --- a/pkgs/applications/science/math/wolfram-engine/notebook.nix +++ b/pkgs/applications/science/math/wolfram-engine/notebook.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: +{ stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: let wolfram-jupyter = jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }; diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index 14e4cf215e7b..b6aa8009dcd0 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -1,9 +1,6 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , makeWrapper -, gtk3 -, gsettings-desktop-schemas , pname , version , hash diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 062fc2a3771d..16f6d38b222c 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: +{ stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index e8cc3f33878b..05c91111ab68 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -1,4 +1,4 @@ -{ testers, fetchtorrent, lib, ... }: +{ testers, fetchtorrent, ... }: let wired-cd.meta.license = [ diff --git a/pkgs/build-support/trivial-builders/test/concat-test.nix b/pkgs/build-support/trivial-builders/test/concat-test.nix index 5ce435619069..7d023503c002 100644 --- a/pkgs/build-support/trivial-builders/test/concat-test.nix +++ b/pkgs/build-support/trivial-builders/test/concat-test.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, pkgs, runCommand, concatText, writeText, hello, emptyFile }: +{ runCommand, concatText, writeText, hello, emptyFile }: let stri = writeText "pathToTest"; txt1 = stri "abc"; diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index d2e40497ce9b..1e1a5abf8754 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-ldap-outpost"; diff --git a/pkgs/by-name/au/authentik/radius.nix b/pkgs/by-name/au/authentik/radius.nix index 957fd3702b77..04efa139efea 100644 --- a/pkgs/by-name/au/authentik/radius.nix +++ b/pkgs/by-name/au/authentik/radius.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-radius-outpost"; diff --git a/pkgs/by-name/cu/cue/tests/001-all-good.nix b/pkgs/by-name/cu/cue/tests/001-all-good.nix index d9919cd7fee4..f7fc46eebea6 100644 --- a/pkgs/by-name/cu/cue/tests/001-all-good.nix +++ b/pkgs/by-name/cu/cue/tests/001-all-good.nix @@ -1,5 +1,4 @@ -{ lib -, cue +{ cue , runCommand }: diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix index 3de470c08524..fe97f891caa7 100644 --- a/pkgs/by-name/de/deltachat-repl/package.nix +++ b/pkgs/by-name/de/deltachat-repl/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix index 6c57548cf9e8..b7d0dbef2374 100644 --- a/pkgs/by-name/de/deltachat-rpc-server/package.nix +++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix new file mode 100644 index 000000000000..3211925699e1 --- /dev/null +++ b/pkgs/by-name/du/duckstation/shaderc-patched.nix @@ -0,0 +1,20 @@ +{ + fetchpatch, + duckstation, + shaderc, +}: + +shaderc.overrideAttrs (old: { + pname = "shaderc-patched-for-duckstation"; + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; + hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; + excludes = [ + "CHANGES" + "CMakeLists.txt" + "libshaderc/CMakeLists.txt" + ]; + }) + ]; +}) diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index 0a7bdd15dee9..f16198b30484 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -1,9 +1,7 @@ -{ lib -, stdenv +{ stdenv , fetchYarnDeps , fixup-yarn-lock , yarn -, fetchFromGitea , src , version , nodejs diff --git a/pkgs/by-name/el/elvish/tests/expect-version.nix b/pkgs/by-name/el/elvish/tests/expect-version.nix index 406f2131199d..b7935ceea671 100644 --- a/pkgs/by-name/el/elvish/tests/expect-version.nix +++ b/pkgs/by-name/el/elvish/tests/expect-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , elvish , substituteAll }: diff --git a/pkgs/by-name/gh/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix index ae265cfba82c..bf034441be25 100644 --- a/pkgs/by-name/gh/ghdl/test-simple.nix +++ b/pkgs/by-name/gh/ghdl/test-simple.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: +{ stdenv, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: let ghdl = if backend == "llvm" then ghdl-llvm else if backend == "gcc" then ghdl-gcc else ghdl-mcode; diff --git a/pkgs/by-name/ha/haunt/tests/001-test-version.nix b/pkgs/by-name/ha/haunt/tests/001-test-version.nix index 726a7ac95713..026d580c1965 100644 --- a/pkgs/by-name/ha/haunt/tests/001-test-version.nix +++ b/pkgs/by-name/ha/haunt/tests/001-test-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , haunt }: diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index dae243747292..2a96f05bebe6 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , undmg -, lib , meta , pname , version diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index d5647e72caaa..f4ed1b048000 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -1,5 +1,4 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , version , pname diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix index fab1e01e8ba4..6c08dced6326 100644 --- a/pkgs/by-name/pa/parsedmarc/package.nix +++ b/pkgs/by-name/pa/parsedmarc/package.nix @@ -1,5 +1,4 @@ -{ lib -, python3 +{ python3 , fetchFromGitHub }: diff --git a/pkgs/by-name/ra/ratchet/tests.nix b/pkgs/by-name/ra/ratchet/tests.nix index 7585c06d9172..75ae285d734e 100644 --- a/pkgs/by-name/ra/ratchet/tests.nix +++ b/pkgs/by-name/ra/ratchet/tests.nix @@ -1,5 +1,4 @@ { - lib, runCommand, ratchet, }: let diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix index 7b2f6523f13b..6f1f113665e9 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenvNoCC +{ stdenvNoCC , fetchurl , undmg , pname diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix index 30d2b60c2042..3d13bfdf9dc4 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , autoPatchelfHook , rpmextract diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix index c52a60637766..98de34a2530a 100644 --- a/pkgs/by-name/sd/SDL2_image_2_0/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_0/package.nix @@ -1,9 +1,5 @@ # Dependency of pygame, toppler -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.0.5"; diff --git a/pkgs/by-name/sd/SDL2_image_2_6/package.nix b/pkgs/by-name/sd/SDL2_image_2_6/package.nix index ef57e146098e..edd912311b82 100644 --- a/pkgs/by-name/sd/SDL2_image_2_6/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_6/package.nix @@ -1,10 +1,6 @@ # Dependency for hedgewars: # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.6.3"; diff --git a/pkgs/by-name/sp/spigot/tests/approximation.nix b/pkgs/by-name/sp/spigot/tests/approximation.nix index ffb329e6a317..fbf4875e1e61 100644 --- a/pkgs/by-name/sp/spigot/tests/approximation.nix +++ b/pkgs/by-name/sp/spigot/tests/approximation.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , spigot }: diff --git a/pkgs/by-name/sw/swayfx/package.nix b/pkgs/by-name/sw/swayfx/package.nix index 9583f9b7a710..d9fe039a2a53 100644 --- a/pkgs/by-name/sw/swayfx/package.nix +++ b/pkgs/by-name/sw/swayfx/package.nix @@ -1,5 +1,4 @@ { - lib, swayfx-unwrapped, sway, # Used by the NixOS module: diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix index b783953acd93..a3bbf153aaa3 100644 --- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , boost , libX11 , libXext diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix index 12deedd5c56f..2da3202e2332 100644 --- a/pkgs/by-name/tu/tuxclocker-plugins/package.nix +++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix @@ -1,7 +1,5 @@ -{ lib -, stdenv +{ stdenv , boost -, cmake , gettext , libdrm , meson diff --git a/pkgs/by-name/uc/ucg/tests/simple.nix b/pkgs/by-name/uc/ucg/tests/simple.nix index 09910d0829da..033f408ce1b7 100644 --- a/pkgs/by-name/uc/ucg/tests/simple.nix +++ b/pkgs/by-name/uc/ucg/tests/simple.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , ucg }: diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index f97a4ed22146..37757aec1888 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -1,6 +1,4 @@ -{ lib -, pkgs -, makeSetupHook +{ makeSetupHook , waf }: diff --git a/pkgs/by-name/ye/yeswiki/package.nix b/pkgs/by-name/ye/yeswiki/package.nix index 64ccd4353525..0e0562eaf52a 100644 --- a/pkgs/by-name/ye/yeswiki/package.nix +++ b/pkgs/by-name/ye/yeswiki/package.nix @@ -1,5 +1,4 @@ { - lib, stdenv, fetchurl, unzip, diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 3777f69fa567..497b9bb9cb03 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "baekmuk-ttf"; diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 1d305674e6aa..fa3e0e40f773 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "bakoma-ttf"; diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 85aa7060ea05..f567e5ed7557 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "lmodern"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index d5623d907bee..bc66982256ff 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchzip }: +{ stdenvNoCC, fetchzip }: stdenvNoCC.mkDerivation rec { pname = "mph-2b-damase"; diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index a37a8cfe12b8..7409cf2d54db 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , libdbusmenu diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 753938e95aa3..708640c8719c 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,7 +1,7 @@ # This derivation is a reduced-functionality variant of Gambit stable, # used to compile the full version of Gambit stable *and* unstable. -{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +{ gccStdenv, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: # As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better gccStdenv.mkDerivation { diff --git a/pkgs/development/compilers/zig/0.10/hook.nix b/pkgs/development/compilers/zig/0.10/hook.nix index 1d3439b1af62..aec36a2c0a82 100644 --- a/pkgs/development/compilers/zig/0.10/hook.nix +++ b/pkgs/development/compilers/zig/0.10/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.11/hook.nix b/pkgs/development/compilers/zig/0.11/hook.nix index fb0e1aa564d1..399b3889a226 100644 --- a/pkgs/development/compilers/zig/0.11/hook.nix +++ b/pkgs/development/compilers/zig/0.11/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.12/hook.nix b/pkgs/development/compilers/zig/0.12/hook.nix index 8d3e6206d155..1f920af318be 100644 --- a/pkgs/development/compilers/zig/0.12/hook.nix +++ b/pkgs/development/compilers/zig/0.12/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.13/hook.nix b/pkgs/development/compilers/zig/0.13/hook.nix index 2d379f1b7caf..1618702ecaec 100644 --- a/pkgs/development/compilers/zig/0.13/hook.nix +++ b/pkgs/development/compilers/zig/0.13/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.9/hook.nix b/pkgs/development/compilers/zig/0.9/hook.nix index 1d3439b1af62..aec36a2c0a82 100644 --- a/pkgs/development/compilers/zig/0.9/hook.nix +++ b/pkgs/development/compilers/zig/0.9/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/coq-modules/coq-hammer/default.nix b/pkgs/development/coq-modules/coq-hammer/default.nix index f332f0e3a82e..33785178228f 100644 --- a/pkgs/development/coq-modules/coq-hammer/default.nix +++ b/pkgs/development/coq-modules/coq-hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: +{ mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: mkCoqDerivation { inherit version; diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/development/embedded/teensy-cmake-macros/hook.nix index b0abdbdc681e..55f9aec729f5 100644 --- a/pkgs/development/embedded/teensy-cmake-macros/hook.nix +++ b/pkgs/development/embedded/teensy-cmake-macros/hook.nix @@ -1,5 +1,4 @@ -{ lib -, makeSetupHook +{ makeSetupHook , teensy-cmake-macros }: diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index c5e7c806cd17..1b9409ff948e 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -1,5 +1,4 @@ -{ lib -, lua +{ lua , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix index 1959ba6c4925..18a532226efe 100644 --- a/pkgs/development/interpreters/octave/wrap-octave.nix +++ b/pkgs/development/interpreters/octave/wrap-octave.nix @@ -1,5 +1,4 @@ -{ lib -, octave +{ octave , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index a15bca1e013e..ab712cb734ea 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 54b28992d472..0ae044db37c9 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 84cf35f385a1..85593000d421 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 5d25344e4bdc..24a22dd14675 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix index 6efe8d571a77..0cbe633c63b1 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix index 1cbbf179a2e2..bb98fdffb005 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix index 6b24450855b2..8bd6298fe151 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix index 694ed0e9ad94..35664e17cd68 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-texinfo"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix index 4ada4e2b704d..eec0bf140961 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template-info.nix b/pkgs/development/interpreters/python/cpython/docs/template-info.nix index 4f5d4b3e37ab..f1551e1f61ef 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template-info.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template-info.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index fff6e0bedb18..adf64ddd6224 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix index 0254d843a4cf..3d3bf549d91c 100644 --- a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix +++ b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix @@ -1,4 +1,4 @@ -{ interpreter, lib, gdb, writeText, runCommand }: +{ interpreter, gdb, writeText, runCommand }: let crashme-py = writeText "crashme.py" '' diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index ef350835f05d..20ae20f9e99e 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qttools }: diff --git a/pkgs/development/libraries/libde265/test-corpus-decode.nix b/pkgs/development/libraries/libde265/test-corpus-decode.nix index 763c93e6a993..9c184362d10b 100644 --- a/pkgs/development/libraries/libde265/test-corpus-decode.nix +++ b/pkgs/development/libraries/libde265/test-corpus-decode.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , libde265 }: diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index fe548129b3fb..39a6b84bf238 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,5 +1,4 @@ -{ lib -, qtModule, python3, qtbase, qtsvg }: +{ qtModule, python3, qtbase, qtsvg }: qtModule { pname = "qtdeclarative"; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 75e58dcff799..c8f4efa7f7ac 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,5 +1,4 @@ -{ lib -, callPackage +{ callPackage , fetchurl , tcl , ... diff --git a/pkgs/development/python-modules/bootstrap/build/default.nix b/pkgs/development/python-modules/bootstrap/build/default.nix index 2101ee06c6bb..0d693e2dde58 100644 --- a/pkgs/development/python-modules/bootstrap/build/default.nix +++ b/pkgs/development/python-modules/bootstrap/build/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, build, diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index d348b1f877c8..bdd4a0f535ff 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/bootstrap/installer/default.nix b/pkgs/development/python-modules/bootstrap/installer/default.nix index 454ec2a239a1..9f396bb6275a 100644 --- a/pkgs/development/python-modules/bootstrap/installer/default.nix +++ b/pkgs/development/python-modules/bootstrap/installer/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 2ea42160a892..964921eda9f4 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, pkg-config, diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 64f9f96db407..5a16cd6e023f 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, edlib, diff --git a/pkgs/development/python-modules/eduvpn-common/default.nix b/pkgs/development/python-modules/eduvpn-common/default.nix index 8c17edcf2df6..9d2bfda4ee8d 100644 --- a/pkgs/development/python-modules/eduvpn-common/default.nix +++ b/pkgs/development/python-modules/eduvpn-common/default.nix @@ -1,7 +1,5 @@ { - lib, buildPythonPackage, - callPackage, libeduvpn-common, selenium, setuptools, diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix index dc0a91b6d757..2741dbc3675a 100644 --- a/pkgs/development/python-modules/horizon-eda/default.nix +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -1,7 +1,5 @@ { - lib, buildPythonPackage, - callPackage, horizon-eda, mesa, pycairo, diff --git a/pkgs/development/python-modules/linien-common/tests.nix b/pkgs/development/python-modules/linien-common/tests.nix index b070abf40e0d..40a69986187c 100644 --- a/pkgs/development/python-modules/linien-common/tests.nix +++ b/pkgs/development/python-modules/linien-common/tests.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, linien-common, linien-client, diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 97cfb265396d..e8bc753eb273 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, poetry-core, llama-index-agent-openai, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 0dc9b6a42382..cd23b6b9d1f0 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 5df83c4ad433..2e55477ffc0a 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 2bab0a3bb80c..0599140c562b 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 710674a0b9bb..3bf2f7b04c2c 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index ef0d80d4b65c..36b4b4cb5449 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index 0da97f5a2316..04c5debd2f5c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 9d745e0261d3..a177ae42af16 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 30b2fd0e35fc..5a85e42a04d3 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, django, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix index 178c39fffb34..310d85e53f0e 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fastapi, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index eaca2e81e161..e640ec959754 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index a2036ddfb77b..8fcaf2a3b516 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 29f69f428b88..cfa6e6249512 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, flaky, diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index b6af8dea4f4f..24ee1af9e91a 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ee1d76c04a99..e1bcc59c2e8e 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index 7af0f8fd7c63..642af55ed786 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, isPy3k, olm, diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index e69f39820c47..f241cd0a2968 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index c0a6665a41ce..6cf9a308b820 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fetchPypi, jupyter-packaging, diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 320b1d1d6ab1..bf2c8908d286 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix index 511a939cf6fb..42372a283f39 100644 --- a/pkgs/development/python-modules/zxing-cpp/default.nix +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, cmake, setuptools-scm, diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index b20b61d6c58d..2b65bb3d82da 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , R , rstudio , makeWrapper diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix index 814aab16cb00..90c14554b509 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }: +{ buildDunePackage, js_of_ocaml-compiler, ppxlib }: buildDunePackage { pname = "js_of_ocaml-toplevel"; diff --git a/pkgs/development/tools/ocaml/merlin/lib.nix b/pkgs/development/tools/ocaml/merlin/lib.nix index 27c8035a5e3b..4a9bc320cdc2 100644 --- a/pkgs/development/tools/ocaml/merlin/lib.nix +++ b/pkgs/development/tools/ocaml/merlin/lib.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, merlin, csexp }: +{ buildDunePackage, merlin, csexp }: buildDunePackage { pname = "merlin-lib"; diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix index a56621267df3..a96fd9d5f5ea 100644 --- a/pkgs/development/tools/ocaml/opam/installer.nix +++ b/pkgs/development/tools/ocaml/opam/installer.nix @@ -1,4 +1,4 @@ -{ lib, unzip, opam, ocamlPackages }: +{ unzip, opam, ocamlPackages }: ocamlPackages.buildDunePackage { pname = "opam-installer"; diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix index 6fa5207de6eb..af0a2953edee 100644 --- a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix +++ b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped +{ rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped , pname ? "rust-analyzer" , version ? rust-analyzer-unwrapped.version # Use name from `RUST_SRC_PATH` diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 371ac99b4f66..cd8142574d8d 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,4 @@ -{ lib -, python +{ python , fetchurl , anki }: diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 1f0e9ae18a64..3068f5a004e2 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , fetchzip , SDL2 diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix index d87a7f45a956..71b4477f493f 100644 --- a/pkgs/games/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl }: +{ rustPlatform, fetchCrate, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "shticker-book-unwritten"; diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index cfe6080b020a..2d599a7c56e7 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,5 +1,4 @@ { - lib, makeScopeWithSplicing', generateSplicesForMkScope, callPackage, diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index b7600185ae07..450cdfde0eaa 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib }: +{ mkDerivation }: mkDerivation { path = "lib/libutil"; extraPaths = [ "lib/libc/gen" ]; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix index 04a45ff980cb..8ccf12f846b3 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, bsdSetupHook, freebsdSetupHook, diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix index cb9951cb8cf1..934d4d862458 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, libterminfo, libcurses, diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index 6652d5454387..4cbb488dc3c6 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,8 +1,4 @@ -{ - lib, - mkDerivation, - make-rules, -}: +{ mkDerivation, make-rules }: mkDerivation { path = "usr.bin/make"; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix index 481e302065fc..019f428713ff 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, makeMinimal, bsdSetupHook, diff --git a/pkgs/os-specific/linux/nftables/python.nix b/pkgs/os-specific/linux/nftables/python.nix index 7980b8ff6de6..bb9ebd621fcd 100644 --- a/pkgs/os-specific/linux/nftables/python.nix +++ b/pkgs/os-specific/linux/nftables/python.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , setuptools , nftables }: diff --git a/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix b/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix index 5f0b3d12a2d0..8b9196b16428 100644 --- a/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix +++ b/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix @@ -1,4 +1,4 @@ -{ lib, formats, stdenvNoCC, writeText, ... }: +{ formats, stdenvNoCC, ... }: let hocon = formats.hocon { }; diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/servers/apache-airflow/default.nix index 5021f66390ba..1055f79806d4 100644 --- a/pkgs/servers/apache-airflow/default.nix +++ b/pkgs/servers/apache-airflow/default.nix @@ -1,5 +1,4 @@ -{ lib -, fetchFromGitHub +{ fetchFromGitHub , fetchPypi , python3 }: diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix index a043d22aa978..6916b3b65547 100644 --- a/pkgs/servers/mlflow-server/default.nix +++ b/pkgs/servers/mlflow-server/default.nix @@ -1,4 +1,4 @@ -{lib, python3, writeText}: +{ python3, writeText}: let py = python3.pkgs; diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/servers/monitoring/loki/promtail.nix index e8539ee60a32..15bf192e2351 100644 --- a/pkgs/servers/monitoring/loki/promtail.nix +++ b/pkgs/servers/monitoring/loki/promtail.nix @@ -1,4 +1,4 @@ -{ lib, grafana-loki }: +{ grafana-loki }: grafana-loki.overrideAttrs (o: { pname = "promtail"; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-test.nix b/pkgs/servers/nosql/apache-jena/fuseki-test.nix index bbf98a838259..dd8a82d8494f 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-test.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-test.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, apache-jena-fuseki, curl }: +{ runCommand, apache-jena-fuseki, curl }: runCommand "fuseki-test-${apache-jena-fuseki.name}" { nativeBuildInputs = [ curl apache-jena-fuseki ]; } '' export FUSEKI_BASE="$PWD/fuseki-base" diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 537fe93e01c5..4e1df2d7a297 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchpatch +{ stdenv, callPackage, fetchpatch , sasl, boost, Security, CoreFoundation, cctools , avxSupport ? stdenv.hostPlatform.avxSupport }: diff --git a/pkgs/test/dhall/buildDhallUrl/default.nix b/pkgs/test/dhall/buildDhallUrl/default.nix index a75101a303d6..f266cde11a51 100644 --- a/pkgs/test/dhall/buildDhallUrl/default.nix +++ b/pkgs/test/dhall/buildDhallUrl/default.nix @@ -1,4 +1,4 @@ -{ dhallPackages, lib }: +{ dhallPackages }: # This file tests that dhallPackages.buildDhallUrl is able to successfully # build a Nix Dhall package for a given remote Dhall import. diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 75633adbd1a5..5a3bf376fb88 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,7 +1,4 @@ -{ vimUtils, vim-full, writeText, vimPlugins -, lib -, pkgs -}: +{ vimUtils, vim-full, vimPlugins, pkgs }: let inherit (vimUtils) buildVimPlugin; diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index 61b5969701ca..ebb58191a3ca 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -3,11 +3,9 @@ , flac , imagemagick , keyfinder-cli -, lib , mp3gain , mp3val , python3Packages -, version , ... }: { absubmit = { diff --git a/pkgs/tools/networking/xrootd/test-runner.nix b/pkgs/tools/networking/xrootd/test-runner.nix index 5bcf1ae86759..b878febc7bff 100644 --- a/pkgs/tools/networking/xrootd/test-runner.nix +++ b/pkgs/tools/networking/xrootd/test-runner.nix @@ -1,7 +1,4 @@ -{ lib -, runCommand -, xrootd -}: +{ runCommand, xrootd }: # These tests are specified in the test procedure of the upstream CD: # https://github.com/xrootd/xrootd/blob/master/.github/workflows/build.yml#L90-L98 From 2ee703dccb871ba075c67505016157f9fe057e19 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 22:35:33 +0200 Subject: [PATCH 22/28] pkgs/applications: remove unused arguments --- .../accessibility/squeekboard/default.nix | 1 - pkgs/applications/audio/famistudio/default.nix | 1 - pkgs/applications/audio/faust/faust2lv2.nix | 1 - pkgs/applications/audio/in-formant/default.nix | 1 - .../audio/open-music-kontrollers/generic.nix | 2 +- pkgs/applications/audio/pipecontrol/default.nix | 1 - pkgs/applications/audio/viper4linux/default.nix | 1 - pkgs/applications/backup/timeshift/default.nix | 1 - .../blockchains/bitcoin-knots/default.nix | 1 - pkgs/applications/blockchains/electrs/default.nix | 1 - .../blockchains/gridcoin-research/default.nix | 1 - .../applications/blockchains/lighthouse/default.nix | 4 +--- pkgs/applications/blockchains/lnd/default.nix | 1 - pkgs/applications/blockchains/nearcore/default.nix | 2 +- pkgs/applications/blockchains/snarkos/default.nix | 1 - pkgs/applications/blockchains/sparrow/fhsenv.nix | 3 +-- .../blockchains/terra-station/default.nix | 2 -- .../manual-packages/consult-gh/default.nix | 1 - .../manual-packages/tree-sitter-langs/default.nix | 1 - .../jupyter-kernels/xeus-cling/xeus-cling.nix | 3 --- .../applications/editors/micro/test-with-expect.nix | 2 +- pkgs/applications/editors/nano/test-with-expect.nix | 2 +- pkgs/applications/editors/neovim/tests/default.nix | 2 +- pkgs/applications/editors/quartus-prime/default.nix | 2 +- pkgs/applications/editors/rstudio/default.nix | 1 - pkgs/applications/editors/thonny/default.nix | 2 +- pkgs/applications/editors/typora/default.nix | 2 -- pkgs/applications/editors/vim/full.nix | 1 - .../rescript-editor-analysis.nix | 1 - .../extensions/ms-vscode.cpptools/default.nix | 2 -- .../extensions/vadimcn.vscode-lldb/default.nix | 1 - .../file-managers/portfolio-filemanager/default.nix | 1 - pkgs/applications/file-managers/ranger/default.nix | 2 +- pkgs/applications/gis/qgis/default.nix | 3 +-- pkgs/applications/gis/qgis/ltr.nix | 3 +-- pkgs/applications/graphics/epick/default.nix | 1 - pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/lazpaint/default.nix | 2 +- pkgs/applications/graphics/ocrfeeder/default.nix | 1 - .../graphics/pick-colour-picker/default.nix | 1 - pkgs/applications/graphics/pixinsight/default.nix | 1 - pkgs/applications/graphics/pizarra/default.nix | 2 -- pkgs/applications/graphics/qscreenshot/default.nix | 1 - .../graphics/sane/backends/brscan5/default.nix | 2 +- pkgs/applications/graphics/seamly2d/default.nix | 4 ++-- pkgs/applications/graphics/trimage/default.nix | 1 - pkgs/applications/graphics/vengi-tools/default.nix | 1 - pkgs/applications/kde/kdevelop/kdevelop.nix | 2 +- pkgs/applications/kde/palapeli.nix | 1 - pkgs/applications/maui/mauikit.nix | 1 - .../misc/auto-multiple-choice/default.nix | 1 - pkgs/applications/misc/bemenu/default.nix | 2 +- pkgs/applications/misc/blender/wrapper.nix | 1 - pkgs/applications/misc/cardpeek/default.nix | 1 - pkgs/applications/misc/cask-server/default.nix | 1 - pkgs/applications/misc/clipmenu/default.nix | 1 - pkgs/applications/misc/conduktor/default.nix | 2 +- pkgs/applications/misc/gollum/default.nix | 2 +- pkgs/applications/misc/hollywood/default.nix | 7 ------- .../misc/holochain-launcher/default.nix | 1 - pkgs/applications/misc/huggle/default.nix | 1 - pkgs/applications/misc/makehuman/default.nix | 1 - pkgs/applications/misc/nix-tour/default.nix | 1 - pkgs/applications/misc/opencpn/default.nix | 1 - pkgs/applications/misc/pagefind/default.nix | 1 - pkgs/applications/misc/q4wine/default.nix | 2 +- pkgs/applications/misc/raider/default.nix | 2 -- .../misc/remarkable/restream/default.nix | 1 - pkgs/applications/misc/remontoire/default.nix | 1 - pkgs/applications/misc/schemes/default.nix | 1 - pkgs/applications/misc/snapmaker-luban/default.nix | 2 +- .../misc/sway-launcher-desktop/default.nix | 2 +- pkgs/applications/misc/yambar/default.nix | 1 - .../networking/browsers/ladybird/default.nix | 1 - pkgs/applications/networking/calls/default.nix | 2 -- .../networking/cluster/tubekit/wrapper.nix | 3 +-- .../networking/cluster/waagent/default.nix | 4 +--- .../networking/feedreaders/russ/default.nix | 1 - .../networking/ids/zeek/broker/default.nix | 2 -- .../instant-messengers/bitlbee-discord/default.nix | 2 +- .../instant-messengers/bitlbee-mastodon/default.nix | 2 +- .../instant-messengers/element/element-web.nix | 2 -- .../instant-messengers/feishu/default.nix | 1 - .../instant-messengers/gomuks/default.nix | 1 - .../telegram/kotatogram-desktop/default.nix | 1 - pkgs/applications/networking/irc/irssi/default.nix | 1 - pkgs/applications/networking/jxplorer/default.nix | 2 +- .../networking/mailreaders/alot/default.nix | 1 - .../networking/mailreaders/mailspring/darwin.nix | 3 +-- pkgs/applications/networking/mullvad/openvpn.nix | 1 - pkgs/applications/networking/netmaker/default.nix | 1 - .../networking/p2p/retroshare/default.nix | 2 +- pkgs/applications/networking/p2p/xd/default.nix | 2 +- .../networking/remote/citrix-workspace/generic.nix | 2 +- pkgs/applications/networking/scaleft/default.nix | 2 +- .../networking/seafile-client/default.nix | 1 - pkgs/applications/networking/wg-bond/default.nix | 2 +- .../office/banana-accounting/default.nix | 1 - pkgs/applications/office/cutemarked-ng/default.nix | 1 - pkgs/applications/office/kitsas/default.nix | 2 +- .../office/libreoffice/darwin/default.nix | 1 - pkgs/applications/office/libreoffice/wrapper.nix | 1 - pkgs/applications/office/timetrap/default.nix | 1 - pkgs/applications/office/zk/default.nix | 2 +- pkgs/applications/radio/digiham/default.nix | 2 +- pkgs/applications/radio/flamp/default.nix | 1 - pkgs/applications/radio/qdmr/default.nix | 1 - .../science/biology/jbrowse/default.nix | 2 +- .../science/biology/mrbayes/default.nix | 2 +- pkgs/applications/science/biology/nest/default.nix | 1 - .../science/chemistry/nwchem/default.nix | 2 -- .../science/chemistry/quantum-espresso/default.nix | 1 - .../computer-architecture/accelergy/default.nix | 2 +- .../science/electronics/openroad/default.nix | 1 - .../science/electronics/verilator/default.nix | 3 --- .../science/electronics/xyce/default.nix | 2 -- pkgs/applications/science/logic/msat/default.nix | 2 +- .../science/math/wolfram-engine/default.nix | 2 -- .../science/math/wolfram-engine/notebook.nix | 2 +- pkgs/applications/science/misc/bada-bib/default.nix | 1 - .../science/misc/root/tests/test-thisroot.nix | 1 - .../science/physics/elmerfem/default.nix | 1 - .../terminal-emulators/rxvt-unicode/wrapper.nix | 3 +-- .../terminal-emulators/xterm/default.nix | 2 +- .../version-management/git-backdate/default.nix | 2 +- .../version-management/git-machete/default.nix | 2 -- .../version-management/git-open/default.nix | 2 +- .../version-management/gita/default.nix | 2 -- .../version-management/gitolite/default.nix | 2 +- pkgs/applications/version-management/p4/default.nix | 1 - .../version-management/sapling/default.nix | 1 - pkgs/applications/video/clapper/default.nix | 3 +-- pkgs/applications/video/deface/default.nix | 1 - pkgs/applications/video/epgstation/default.nix | 1 - pkgs/applications/video/kaffeine/default.nix | 1 - .../video/kodi/addons/sendtokodi/default.nix | 2 +- .../video/kodi/addons/websocket/default.nix | 2 +- pkgs/applications/video/kodi/unwrapped.nix | 4 ++-- pkgs/applications/video/mpv/wrapper.nix | 1 - pkgs/applications/video/rtabmap/default.nix | 2 -- pkgs/applications/video/stremio/default.nix | 1 - pkgs/applications/video/vdr/markad/default.nix | 13 ------------- pkgs/applications/virtualization/umoci/default.nix | 1 - .../virtualbox/guest-additions/builder.nix | 6 +++--- .../virtualbox/guest-additions/default.nix | 5 ++--- pkgs/applications/window-managers/dwl/default.nix | 1 - .../window-managers/maui-shell/default.nix | 2 -- .../window-managers/taffybar/default.nix | 2 +- 148 files changed, 59 insertions(+), 202 deletions(-) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 37468e477597..05d8af554a05 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, gnome , gnome-desktop , glib , gtk3 diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index b858edf29bca..4e13d1aa0a5f 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -9,7 +9,6 @@ , libglvnd , libogg , libvorbis -, makeWrapper , openal , portaudio , rtmidi diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index b7e9ffb488c4..b863ad25ebdb 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -2,7 +2,6 @@ , faust , lv2 , qtbase -, which }: faust.wrapWithBuildEnv { diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index 3dd4a3006b2b..357560b178bb 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -13,7 +13,6 @@ , pkg-config , autoPatchelfHook , soxr -, freetype , libsamplerate , armadillo , tomlplusplus diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix index b76a52ca3d28..5c48f08dcd7c 100644 --- a/pkgs/applications/audio/open-music-kontrollers/generic.nix +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, sord, libX11, libXext, glew, lv2lint , pname, version, sha256, description , url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz" , additionalBuildInputs ? [] diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 1586be58e3cf..4bed5cb25037 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -4,7 +4,6 @@ , pipewire , cmake , extra-cmake-modules -, gnumake , wrapQtAppsHook , qtbase , qttools diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/applications/audio/viper4linux/default.nix index 289c6fbf233f..134e535a7834 100644 --- a/pkgs/applications/audio/viper4linux/default.nix +++ b/pkgs/applications/audio/viper4linux/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pkg-config , gst_all_1 , libviperfx , makeWrapper diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 0a6a9bf38865..85a3295fb064 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,6 +1,5 @@ { callPackage , timeshift-unwrapped -, lib , rsync , coreutils , mount diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index ef5eab342a36..c6838e0a0f65 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -19,7 +19,6 @@ , qtbase ? null , qttools ? null , python3 -, nixosTests , withGui , withWallet ? true }: diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d77694b450f2..f89b34097794 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, llvmPackages , rocksdb_7_10 , Security }: diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix index 473803ece6d3..d5e06622ae0d 100644 --- a/pkgs/applications/blockchains/gridcoin-research/default.nix +++ b/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub , stdenv -, makeDesktopItem , lib , openssl , boost diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index b3f13ac48b8d..2fbccd581eda 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -1,5 +1,4 @@ -{ clang -, cmake +{ cmake , CoreFoundation , fetchFromGitHub , fetchurl @@ -18,7 +17,6 @@ , stdenv , SystemConfiguration , testers -, unzip }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 52bb90511c3a..87bc32bd1af5 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub , lib -, go , tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] }: diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index ec8d4360a6ff..46fbc289bde3 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -1,6 +1,6 @@ { rustPlatform, lib, fetchFromGitHub , zlib, openssl -, pkg-config, protobuf, llvmPackages +, pkg-config, protobuf }: rustPlatform.buildRustPackage rec { pname = "nearcore"; diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 8e6fb1b38893..e4dc85f3c4d5 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -6,7 +6,6 @@ , curl , pkg-config , openssl -, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "snarkos"; diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix index 26bf9da0b85d..671da04b6921 100644 --- a/pkgs/applications/blockchains/sparrow/fhsenv.nix +++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix @@ -1,5 +1,4 @@ -{ lib -, buildFHSEnv +{ buildFHSEnv , sparrow-unwrapped }: diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index 2ae6ca12b605..fef54f6844fa 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchurl , dpkg -, util-linux -, bash , makeWrapper , electron , asar diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix index 9914285d70f2..52dfd2ea095c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix @@ -8,7 +8,6 @@ markdown-mode, melpaBuild, unstableGitUpdater, - writeText, }: melpaBuild { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index d9e2b850588c..5f04332db117 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, writeText , melpaStablePackages , runCommand , tree-sitter-grammars diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index 48873326bfcf..ec1def846977 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -1,10 +1,7 @@ { lib -, callPackage , clangStdenv , cmake , fetchFromGitHub -, gcc -, git , llvmPackages_13 # Libraries , argparse diff --git a/pkgs/applications/editors/micro/test-with-expect.nix b/pkgs/applications/editors/micro/test-with-expect.nix index d3e1d60e0874..8192f88487eb 100644 --- a/pkgs/applications/editors/micro/test-with-expect.nix +++ b/pkgs/applications/editors/micro/test-with-expect.nix @@ -1,4 +1,4 @@ -{ micro, expect, runCommand, writeScript, runtimeShell }: +{ micro, expect, runCommand, writeScript }: let expect-script = writeScript "expect-script" '' #!${expect}/bin/expect -f diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/applications/editors/nano/test-with-expect.nix index bd48eba4324b..60cd30204542 100644 --- a/pkgs/applications/editors/nano/test-with-expect.nix +++ b/pkgs/applications/editors/nano/test-with-expect.nix @@ -1,4 +1,4 @@ -{ nano, expect, runCommand, writeScriptBin, runtimeShell }: +{ nano, expect, runCommand, writeScriptBin }: let expect-script = writeScriptBin "expect-script" '' #!${expect}/bin/expect -f diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index c2e6b565de28..9152d93c1544 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,6 +1,6 @@ # run tests by building `neovim.tests` { vimUtils, writeText, neovim, vimPlugins -, lib, neovimUtils, wrapNeovimUnstable +, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab , runCommandLocal diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index dfe977876231..b50d505e2dbb 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,4 +1,4 @@ -{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell +{ lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell , runCommand, unstick, quartus-prime-lite , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 983d661fef52..0521d3dce56a 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchurl -, fetchpatch , fetchFromGitHub , makeDesktopItem , copyDesktopItems diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index fa29fae66713..d2aabf5a92f8 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, tk, makeDesktopItem, copyDesktopItems }: +{ lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }: with python3.pkgs; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 30600de859b5..43c655750db5 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -5,14 +5,12 @@ , glib , nss , nspr -, at-spi2-atk , cups , dbus , libdrm , gtk3 , pango , cairo -, xorg , libxkbcommon , mesa , expat diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 0f3652a8a7de..663dc5b688c7 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -5,7 +5,6 @@ , vimPlugins , makeWrapper , wrapGAppsHook3 -, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 9a00fb31cd41..7b2452a814bf 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - bash, ocaml, ocamlPackages, dune_3, diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 13684518a302..c1f5ad3615e1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -1,8 +1,6 @@ { lib, vscode-utils, - writeScript, - runtimeShell, jq, clang-tools, gdbUseFixed ? true, diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 6f14d1e91821..0d55381e6597 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, stdenv, fetchFromGitHub, diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 8375e18634b0..6b19d9564f68 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -4,7 +4,6 @@ , appstream-glib , desktop-file-utils , gettext -, glib , gobject-introspection , gtk3 , gtk4 diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index ee2df2a60f69..48d161e22d5d 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, imagemagick, testers +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, imagemagick , imagePreviewSupport ? true , sixelPreviewSupport ? true , neoVimSupport ? true diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 8b19c70c3b4d..e5e744b37467 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index b551fe0a1e44..bcf99a5f4e4f 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index dee31abdd29d..f33eee5c97c7 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -8,7 +8,6 @@ , freetype , libGL , xorg -, darwin , AppKit }: diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fe4904ee254a..0a63d82b1b2d 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -2,7 +2,7 @@ # If you just want a subset of plug-ins, you can specify them explicitly: # `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. -{ config, lib, pkgs }: +{ lib, pkgs }: let inherit (pkgs) stdenv fetchurl fetchpatch fetchpatch2 pkg-config intltool glib fetchFromGitHub fetchFromGitLab; diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 1f6a9460a6a4..7fcfebe11d72 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib -, atk, gtk2, libX11, gdk-pixbuf, busybox, python3 +, atk, gtk2, libX11, gdk-pixbuf, python3 , makeWrapper }: diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index a3778f7053b4..05d157c2d9b4 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -10,7 +10,6 @@ , goocanvas2 , gtkspell3 , isocodes -, gnome , python3 , tesseract4 , extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index 98980ed7fd46..b255db336256 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -7,7 +7,6 @@ , gtk3 , gobject-introspection , wrapGAppsHook3 -, python }: buildPythonPackage rec { diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 945b6acf27bd..c034e23d4a78 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -3,7 +3,6 @@ , requireFile , wrapQtAppsHook , autoPatchelfHook -, makeWrapper , unixtools , fakeroot , mailcap diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index 5d06423b9fa4..2167eb3a9caf 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -1,9 +1,7 @@ { lib , fetchFromGitLab , rustPlatform -, cargo , pkg-config -, binutils-unwrapped , gtk3-x11 , atk , glib diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 761bd69d3520..d8ed2a14e925 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchgit -, dos2unix , qtbase , qttools , qtx11extras diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index c15599ec66bb..9749ae5b658f 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: +{ stdenv, lib, fetchurl, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix index bd8316b953f0..7c161d0345df 100644 --- a/pkgs/applications/graphics/seamly2d/default.nix +++ b/pkgs/applications/graphics/seamly2d/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub, - addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run, - fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git + addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run, + fontconfig, freetype, xorg, qmake, python3, qttools, git }: let qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]); diff --git a/pkgs/applications/graphics/trimage/default.nix b/pkgs/applications/graphics/trimage/default.nix index 4a0bf082c10a..6f38e22de14f 100644 --- a/pkgs/applications/graphics/trimage/default.nix +++ b/pkgs/applications/graphics/trimage/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, substituteAll , python3 , installShellFiles diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 21a038994904..41c51787d7e4 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, writeText , cmake , pkg-config diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index c5e3fcf6b2f8..3c7be8d6172a 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules -, qtquickcontrols, qttools, kde-cli-tools, qtbase +, qtquickcontrols, qttools, kde-cli-tools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix index 37a387af0a3d..1db865942fd2 100644 --- a/pkgs/applications/kde/palapeli.nix +++ b/pkgs/applications/kde/palapeli.nix @@ -2,7 +2,6 @@ , mkDerivation , extra-cmake-modules , shared-mime-info -, kconfig , kdoctools , kio , ktextwidgets diff --git a/pkgs/applications/maui/mauikit.nix b/pkgs/applications/maui/mauikit.nix index fcba0fbdf547..71d148685e7e 100644 --- a/pkgs/applications/maui/mauikit.nix +++ b/pkgs/applications/maui/mauikit.nix @@ -7,7 +7,6 @@ , ki18n , knotifications , mauiman -, qtbase , qtquickcontrols2 , qtx11extras }: diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 33a4edbdbe57..96fd8e8c5f49 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -21,7 +21,6 @@ , perl , pkg-config , poppler -, auto-multiple-choice }: stdenv.mkDerivation (finalAttrs: rec { pname = "auto-multiple-choice"; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 3e53137ab5e1..1ddf73deb98f 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc +, pango, fribidi, harfbuzz, pkg-config, scdoc , ncursesSupport ? true, ncurses , waylandSupport ? true, wayland, wayland-protocols, wayland-scanner , x11Support ? true, xorg diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 7450827a8fa9..8b5e8916a138 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -1,5 +1,4 @@ { stdenv -, lib , blender , makeWrapper , extraModules ? [] diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 0b7630b53f09..833ad9202b9f 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -10,7 +10,6 @@ , curl , readline , PCSC -, xcbuild }: let version = "0.8.4"; diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index 462696348839..2cb52a2b2cc8 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , mkDerivation , fetchFromGitHub , cmake diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index c47dd972ccfd..b12dc7f04c36 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -4,7 +4,6 @@ , makeWrapper , clipnotify , coreutils -, dmenu , gawk , util-linux , xdotool diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 6eb0e832bc95..574bd3bf922e 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, jdk11, unzip, makeWrapper, makeDesktopItem, copyDesktopItems }: +{ stdenv, lib, fetchurl, fetchzip, jdk11, makeWrapper, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "conduktor"; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index cb39fbd3964e..962523619361 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils, nixosTests }: +{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, nixosTests }: bundlerApp rec { pname = "gollum"; diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix index 1b655e5afacc..96e88500ae20 100644 --- a/pkgs/applications/misc/hollywood/default.nix +++ b/pkgs/applications/misc/hollywood/default.nix @@ -19,13 +19,6 @@ , findutils , ccze , ncurses -, python3 -, wget -, libcaca -, newsboat -, rsstail -, w3m -, ticker , tmux }: diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 23b12f032bd9..b438f6c6d5df 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , autoPatchelfHook -, pkg-config , dpkg , openssl , webkitgtk diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 37d43a90d05d..381804c2b8de 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -5,7 +5,6 @@ , ncurses , which , cmake -, unzip , wrapQtAppsHook , qtwebengine , yaml-cpp diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix index 70cb33643ee6..005a97c1e5c9 100644 --- a/pkgs/applications/misc/makehuman/default.nix +++ b/pkgs/applications/misc/makehuman/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , python3 , qtbase -, qttools , git-lfs , wrapQtAppsHook }: diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index bff2a40e5370..bde9e099a727 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , electron -, runtimeShell , makeWrapper , copyDesktopItems , makeDesktopItem diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 84aff125aac2..380a88e6f2e0 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -41,7 +41,6 @@ , rapidjson , sqlite , tinyxml -, udev , util-linux , wxGTK32 , xorg diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 2da4e5eb7eb1..7ee28983d2f5 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , rustPlatform , fetchFromGitHub , fetchNpmDeps diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix index f56e4455becd..a06dbc8f47fc 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/applications/misc/q4wine/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, mkDerivation, cmake, sqlite , qtbase, qtsvg, qttools, wrapQtAppsHook , icoutils # build and runtime deps. -, wget, fuseiso, wine, sudo, which # runtime deps. +, wget, fuseiso, wine, which # runtime deps. }: mkDerivation rec { diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/applications/misc/raider/default.nix index 6b15176a686e..a0c0430a4e48 100644 --- a/pkgs/applications/misc/raider/default.nix +++ b/pkgs/applications/misc/raider/default.nix @@ -2,8 +2,6 @@ , blueprint-compiler , desktop-file-utils , fetchFromGitHub -, gettext -, glib , gtk4 , lib , libadwaita diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix index c9a60d4ce2e8..b5e808339f99 100644 --- a/pkgs/applications/misc/remarkable/restream/default.nix +++ b/pkgs/applications/misc/remarkable/restream/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , openssh , netcat -, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix index 05eb16abaf21..95e3fecef272 100644 --- a/pkgs/applications/misc/remontoire/default.nix +++ b/pkgs/applications/misc/remontoire/default.nix @@ -7,7 +7,6 @@ , gtk3 , json-glib , libgee -, librsvg , meson , ninja , pkg-config diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/applications/misc/schemes/default.nix index bead03c4c7c8..acf3cd8cf102 100644 --- a/pkgs/applications/misc/schemes/default.nix +++ b/pkgs/applications/misc/schemes/default.nix @@ -7,7 +7,6 @@ , gtk4 , gtksourceview5 , libadwaita -, libgee , libpanel , meson , ninja diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index dc5fe5993f4f..eaa2fe15a743 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups -, gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa +, gtk3, nss, glib, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, pango , gcc-unwrapped, udev diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index 09dafdbac154..7dd660dddb16 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fzf, gawk, fetchFromGitHub, makeWrapper }: +{ stdenv, lib, fzf, gawk, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "sway-launcher-desktop"; diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 378db968c9bb..776f5fdab249 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -7,7 +7,6 @@ , flex , json_c , libmpdclient -, libxcb , libyaml , meson , ninja diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 4f8443c9397f..e6067f1da4aa 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -7,7 +7,6 @@ , tzdata , unicode-emoji , unicode-character-database -, darwin , cmake , ninja , pkg-config diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 34a26d5cf946..c0a23c652876 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -18,7 +18,6 @@ , desktop-file-utils , appstream-glib , libpeas -, libgdata , dbus , vala , wrapGAppsHook3 @@ -27,7 +26,6 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , docutils -, gobject-introspection , gst_all_1 , sofia_sip }: diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/applications/networking/cluster/tubekit/wrapper.nix index 7cba11c97a3a..d12f69adbfb9 100644 --- a/pkgs/applications/networking/cluster/tubekit/wrapper.nix +++ b/pkgs/applications/networking/cluster/tubekit/wrapper.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , makeWrapper , tubekit-unwrapped , pname ? "tubekit" diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix index 294440d820e1..39e8958d1242 100644 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -1,9 +1,7 @@ -{ bash -, coreutils +{ coreutils , fetchFromGitHub , lib , python39 -, substituteAll }: let diff --git a/pkgs/applications/networking/feedreaders/russ/default.nix b/pkgs/applications/networking/feedreaders/russ/default.nix index aa0154227c1e..832f888dcfaa 100644 --- a/pkgs/applications/networking/feedreaders/russ/default.nix +++ b/pkgs/applications/networking/feedreaders/russ/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , rustPlatform -, xorg , darwin }: diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix index 1e9b6f3f0c08..4c0b673c098a 100644 --- a/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -1,9 +1,7 @@ { stdenv , lib -, callPackage , fetchFromGitHub , cmake -, pkg-config , python3 , caf , openssl diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 6badb7cda760..a763ed6e81e0 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "bitlbee-discord"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 3e09a6aa25b8..0e014ea9a790 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 3c880c073164..ab264860bfe9 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,9 +1,7 @@ { lib , stdenv -, runCommand , fetchFromGitHub , fetchYarnDeps -, writeText , jq , yarn , fixup-yarn-lock diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index d43320558b2a..e5e7f897ecb2 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -55,7 +55,6 @@ , stdenv , systemd , wayland -, wrapGAppsHook3 , xdg-utils , writeScript diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 5ee85ef79d0e..64b971b2353b 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, substituteAll , buildGoModule , fetchFromGitHub , makeDesktopItem diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 43f4d7adbd54..4f382dc28e75 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -30,7 +30,6 @@ , glibmm_2_68 , jemalloc , rnnoise -, abseil-cpp , microsoft-gsl , boost , fmt diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 940242b6668d..6e035b2bdbc2 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -5,7 +5,6 @@ , libgcrypt , libintl , libotr -, libtool , meson , ncurses , ninja diff --git a/pkgs/applications/networking/jxplorer/default.nix b/pkgs/applications/networking/jxplorer/default.nix index c31c27bdd5db..e7bd11e5f1d0 100644 --- a/pkgs/applications/networking/jxplorer/default.nix +++ b/pkgs/applications/networking/jxplorer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, ant, jdk8, copyDesktopItems, makeWrapper }: +{ lib, stdenv, fetchurl, makeDesktopItem, jdk8, copyDesktopItems, makeWrapper }: stdenv.mkDerivation rec { pname = "jxplorer"; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 878ecbf4ee5d..9fb1732c788b 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -4,7 +4,6 @@ , file , gnupg , gawk -, notmuch , procps , withManpage ? false }: diff --git a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix index cccc46a4f5eb..e0166e361fe9 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , pname , version diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix index ad3317280169..0dcfeaabf677 100644 --- a/pkgs/applications/networking/mullvad/openvpn.nix +++ b/pkgs/applications/networking/mullvad/openvpn.nix @@ -3,7 +3,6 @@ , openvpn , fetchpatch , fetchurl -, iproute2 , libnl , autoreconfHook , pkg-config diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index cba1b1d45367..37fc5bdb25aa 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -1,6 +1,5 @@ { buildGoModule , fetchFromGitHub -, installShellFiles , lib , libglvnd , pkg-config diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index e98afce389d9..bbfc978eef5b 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch2 +{ lib, mkDerivation, fetchFromGitHub, fetchpatch2 , qmake, cmake, pkg-config, miniupnpc, bzip2 , speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver , qtbase, qtx11extras, qtmultimedia, libgnome-keyring diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index b513d35f2ab1..2974fe393579 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -1,4 +1,4 @@ -{ pkgs, buildGoModule, fetchFromGitHub, lib, perl }: +{ buildGoModule, fetchFromGitHub, lib, perl }: buildGoModule rec { pname = "XD"; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index aa96c72e400d..231defdc34c5 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -2,7 +2,7 @@ , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 -, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, e2fsprogs, symlinkJoin +, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime , libinput, libcap, libjson, libsecret, libcanberra-gtk3 diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 8a500c5e162f..942cad0d42fe 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, rpmextract, patchelf, bash, testers, scaleft }: +{ lib, stdenv, fetchurl, rpmextract, patchelf, testers, scaleft }: stdenv.mkDerivation rec { pname = "scaleft"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 0a133bb49e5e..fbb80a34c44c 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pkg-config , cmake -, qtbase , qttools , libuuid , seafile-shared diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/applications/networking/wg-bond/default.nix index f3dec5e6ab07..4b4ca8fd6b0b 100644 --- a/pkgs/applications/networking/wg-bond/default.nix +++ b/pkgs/applications/networking/wg-bond/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, rustPlatform, fetchFromGitLab, wireguard-tools, makeWrapper }: +{ lib, rustPlatform, fetchFromGitLab, wireguard-tools, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "wg-bond"; version = "0.2.0"; diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix index a0213e05f60c..8afc96eaf88c 100644 --- a/pkgs/applications/office/banana-accounting/default.nix +++ b/pkgs/applications/office/banana-accounting/default.nix @@ -1,6 +1,5 @@ { autoPatchelfHook , cairo -, config , e2fsprogs , fetchurl , gmp diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix index cd564199b016..2c55edb037aa 100644 --- a/pkgs/applications/office/cutemarked-ng/default.nix +++ b/pkgs/applications/office/cutemarked-ng/default.nix @@ -4,7 +4,6 @@ , qmake , pkg-config , qttools -, qtbase , qtwebengine , wrapQtAppsHook , qmarkdowntextedit diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index 28064da7fe4c..f8f32ecec6ed 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "kitsas"; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index 9043d575fa06..f415b9164959 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -3,7 +3,6 @@ , fetchurl , undmg , writeScript -, callPackage }: let diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 4f86406e5159..d2e62f8e5c74 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -5,7 +5,6 @@ , makeWrapper , xorg # for lndir , runCommand -, substituteAll # For Emulating wrapGAppsHook3 , gsettings-desktop-schemas , hicolor-icon-theme diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 4ec8101db0e5..1bdc84663835 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, pkgs , bundlerEnv , bundlerApp , bundlerUpdateScript diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index a274ca210daf..e491e9b95fcb 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, icu }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "zk"; diff --git a/pkgs/applications/radio/digiham/default.nix b/pkgs/applications/radio/digiham/default.nix index 652c6c63cf59..c5f08e1b778a 100644 --- a/pkgs/applications/radio/digiham/default.nix +++ b/pkgs/applications/radio/digiham/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, cmake, pkg-config, protobuf, icu, csdr, codecserver +, cmake, protobuf, icu, csdr, codecserver }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/radio/flamp/default.nix b/pkgs/applications/radio/flamp/default.nix index fc44826258be..b0a70b40898f 100644 --- a/pkgs/applications/radio/flamp/default.nix +++ b/pkgs/applications/radio/flamp/default.nix @@ -4,7 +4,6 @@ , autoreconfHook , pkg-config , fltk13 -, libsndfile , gettext }: diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 6217a169ef25..4096b648ec1e 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, installShellFiles, - writeText, cmake, libxslt, docbook_xsl_ns, diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 90d71df72147..f2cbf1edf094 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook3 }: +{ lib, fetchurl, appimageTools }: let pname = "jbrowse"; diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 54f5b9bbb370..ddc7bff44563 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, readline }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mrbayes"; diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 807af7ce488a..0b2dcbf9af3c 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -13,7 +13,6 @@ , boost , python3 , readline -, autoPatchelfHook , withPython ? false , withMpi ? false }: diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 61266a9f0285..af63e2a77568 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, pkgs , fetchFromGitHub , fetchurl , mpiCheckPhaseHook @@ -14,7 +13,6 @@ , lapack , python3 , tcsh -, bash , automake , autoconf , libtool diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 2c565cb5db9f..2156c1d26969 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , git , cmake -, gnum4 , gfortran , pkg-config , fftw diff --git a/pkgs/applications/science/computer-architecture/accelergy/default.nix b/pkgs/applications/science/computer-architecture/accelergy/default.nix index 9eb6f341b714..42609ada09a3 100644 --- a/pkgs/applications/science/computer-architecture/accelergy/default.nix +++ b/pkgs/applications/science/computer-architecture/accelergy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, pkgs }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "accelergy"; diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 16659892a6ee..0c929fe47c18 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -15,7 +15,6 @@ , clp # for or-tools , eigen , glpk -, gtest , lcov , lemon-graph , libjpeg diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index c467bdfc547b..1bed87615756 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -8,11 +8,8 @@ python3, autoconf, which, - cmake, - ccache, help2man, makeWrapper, - glibcLocales, systemc, git, numactl, diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 93c155038a22..85cdafb66057 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -17,14 +17,12 @@ , withMPI ? false # for doc , texliveMedium -, pandoc , enableDocs ? true # for tests , bash , bc , openssh # required by MPI , perl -, perlPackages , python3 , enableTests ? true }: diff --git a/pkgs/applications/science/logic/msat/default.nix b/pkgs/applications/science/logic/msat/default.nix index 299fe95224eb..3c27493baff8 100644 --- a/pkgs/applications/science/logic/msat/default.nix +++ b/pkgs/applications/science/logic/msat/default.nix @@ -1,4 +1,4 @@ -{ lib, ocamlPackages }: +{ ocamlPackages }: with ocamlPackages; buildDunePackage { pname = "msat-bin"; diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 685bc1bff3b1..4ce49e6cad4c 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -2,8 +2,6 @@ , stdenv , autoPatchelfHook , requireFile -, callPackage -, makeWrapper , alsa-lib , dbus , fontconfig diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/applications/science/math/wolfram-engine/notebook.nix index 85570eeca7fb..07cd0afa3099 100644 --- a/pkgs/applications/science/math/wolfram-engine/notebook.nix +++ b/pkgs/applications/science/math/wolfram-engine/notebook.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: +{ stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: let wolfram-jupyter = jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 83abd40030ee..fba372632909 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -7,7 +7,6 @@ , gdk-pixbuf , gettext , glib -, gnome , gobject-introspection , gtk4 , gtksourceview5 diff --git a/pkgs/applications/science/misc/root/tests/test-thisroot.nix b/pkgs/applications/science/misc/root/tests/test-thisroot.nix index 3540dde8c913..3610e23acbff 100644 --- a/pkgs/applications/science/misc/root/tests/test-thisroot.nix +++ b/pkgs/applications/science/misc/root/tests/test-thisroot.nix @@ -3,7 +3,6 @@ , root , bash , fish -, ksh , tcsh , zsh }: runCommand "test-thisroot" diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 4b19bc4b17b4..309e81fad746 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, git , gfortran , mpi , blas diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 639c7b5dda50..2e2cb076c697 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -1,5 +1,4 @@ -{ callPackage -, symlinkJoin +{ symlinkJoin , makeWrapper , lib , rxvt-unicode-unwrapped diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 5650910cd8a6..9595da4f4d75 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, xorg, ncurses, freetype, fontconfig , pkg-config, makeWrapper, nixosTests, gitUpdater -, nix, gnused, coreutils, enableDecLocator ? true }: +, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; diff --git a/pkgs/applications/version-management/git-backdate/default.nix b/pkgs/applications/version-management/git-backdate/default.nix index c63b2e6f3429..0d7d5810b9a8 100644 --- a/pkgs/applications/version-management/git-backdate/default.nix +++ b/pkgs/applications/version-management/git-backdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, git, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "git-backdate"; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 4df30e050968..6fb9f3b72a51 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -6,8 +6,6 @@ , installShellFiles , git , nix-update-script -, testers -, git-machete }: buildPythonApplication rec { diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/applications/version-management/git-open/default.nix index 29975c5b68d0..1b4153f2ad1d 100644 --- a/pkgs/applications/version-management/git-open/default.nix +++ b/pkgs/applications/version-management/git-open/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, installShellFiles, makeWrapper, pandoc }: +{ lib, stdenv, xdg-utils, gnugrep, fetchFromGitHub, installShellFiles, makeWrapper, pandoc }: stdenv.mkDerivation rec { pname = "git-open"; diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix index 41fe453647de..9bb602d2a5cd 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/applications/version-management/gita/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, git -, pytest , pyyaml , setuptools , installShellFiles diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 6e7a627f9cba..df0c75976032 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, coreutils, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }: +{ stdenv, coreutils, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, nixosTests }: stdenv.mkDerivation rec { pname = "gitolite"; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 7fb7f3c8f3ac..06e4624c8ee0 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -6,7 +6,6 @@ , linkFarm , jam , openssl -, xcbuild , CoreServices , Foundation , Security diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index f06f72f6e9e0..714cd4e67e2c 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -3,7 +3,6 @@ , python3Packages , fetchFromGitHub , fetchurl -, sd , cargo , curl , pkg-config diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 12a66c90e8d5..dfdcacc3b318 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -1,5 +1,4 @@ -{ config -, lib +{ lib , stdenv , fetchFromGitHub , gobject-introspection diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/applications/video/deface/default.nix index 0b0a2d085981..054bb04aee72 100644 --- a/pkgs/applications/video/deface/default.nix +++ b/pkgs/applications/video/deface/default.nix @@ -2,7 +2,6 @@ , stdenv , python3 , fetchFromGitHub -, makeWrapper , pkgs }: diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index c5d12c8403c1..63c1e050e7de 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -6,7 +6,6 @@ , makeWrapper , bash , nodejs -, gzip , python3 }: diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix index 40701d2cbf85..c2866e280f12 100644 --- a/pkgs/applications/video/kaffeine/default.nix +++ b/pkgs/applications/video/kaffeine/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, kio , cmake , extra-cmake-modules , libvlc diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix index f801be10f35f..792f585673dd 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix +++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, kodi, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, kodi, inputstreamhelper }: buildKodiAddon rec { pname = "sendtokodi"; diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index 40667e71392b..544f86a8bbbd 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six }: buildKodiAddon rec { pname = "websocket"; diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index b3fd8d87881a..4c6b158b323a 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip, fetchpatch +{ stdenv, lib, fetchFromGitHub, fetchzip , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, swig, jre_headless +, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, jre_headless , gtest, ncurses, spdlog , libxml2, systemd , alsa-lib, libGLU, libGL, ffmpeg, fontconfig, freetype, ftgl diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 533ede74f874..b68f2d50c5c4 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -8,7 +8,6 @@ , writeTextDir , yt-dlp # the unwrapped mpv derivation -, mpv }: let diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index a720e672c783..b2eb371625cb 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -11,11 +11,9 @@ , qtbase , g2o , ceres-solver -, libpointmatcher , octomap , freenect , libdc1394 -, librealsense , libGL , libGLU , vtkWithQt5 diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 1abb8f87bb29..1cef55fa9ecd 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -6,7 +6,6 @@ , mpv , nodejs , qmake -, qtwebchannel , qtwebengine , wrapQtAppsHook }: diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index efc08eaf06d1..c86a8ff29643 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -2,20 +2,7 @@ , stdenv , vdr , fetchFromGitHub -, graphicsmagick -, pcre -, xorgserver , ffmpeg -, libiconv -, boost -, libgcrypt -, perl -, util-linux -, groff -, libva -, xorg -, ncurses -, callPackage }: stdenv.mkDerivation rec { pname = "vdr-markad"; diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 5dc9ae5028e8..acf03a96c747 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -3,7 +3,6 @@ , buildGoModule , go-md2man , installShellFiles -, bash }: buildGoModule rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 05b39e5fee00..11ae56d0a353 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,7 +1,7 @@ -{ config, stdenv, kernel, fetchurl, lib, pam, libxslt -, libX11, libXext, libXcursor, libXmu +{ stdenv, kernel, fetchurl, lib, pam, libxslt +, libXext, libXcursor, libXmu , glib, libXrandr, dbus, xz -, pkg-config, which, zlib, xorg +, pkg-config, which, xorg , yasm, patchelf, makeself , linuxHeaders, openssl}: diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ac867ce9ce72..4e0b8728f29b 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,6 +1,5 @@ -{ config, stdenv, kernel, callPackage, lib, dbus -, libX11, libXext, libXcursor, libXmu, xorg -, which, zlib, patchelf, makeWrapper +{ stdenv, kernel, callPackage, lib, dbus +, xorg, zlib, patchelf, makeWrapper }: with lib; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 68815952b17f..65ea637d6de1 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -8,7 +8,6 @@ , libxkbcommon , pixman , pkg-config -, substituteAll , wayland-scanner , wayland , wayland-protocols diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix index 0ac02b0957fa..5a30b46e907e 100644 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -1,11 +1,9 @@ { lib -, pkgs , mkDerivation , fetchFromGitHub , qtquickcontrols2 , cmake , extra-cmake-modules -, kio , krunner , prison , knotifyconfig diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 062fc2a3771d..16f6d38b222c 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: +{ stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ From 1a5b97dc8280cf9648e63d97cb5a6cef0496baaf Mon Sep 17 00:00:00 2001 From: Jan Kremer Date: Sun, 21 Jul 2024 12:53:40 +0200 Subject: [PATCH 23/28] prettier-plugin-go-template: fix package declaration --- pkgs/by-name/pr/prettier-plugin-go-template/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix index 162c343e7ef5..79161f56c481 100644 --- a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix +++ b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix @@ -17,8 +17,6 @@ buildNpmPackage rec { npmDepsHash = "sha256-PpJnVZFRxpUHux2jIBDtyBS4qNo6IJY4kwTAq6stEVQ="; - dontNpmBuild = true; - meta = { description = "Fixes prettier formatting for go templates"; mainProgram = "prettier-plugin-go-template"; From 6f3ba8d714178ae7bdd5be3280dcfda913f8d13d Mon Sep 17 00:00:00 2001 From: Dennis Stengele Date: Fri, 26 Jul 2024 15:20:56 +0200 Subject: [PATCH 24/28] nixos/zeronsd: init module and package (#253610) * zeronsd: init at 0.5.2 * nixos/zeronsd: init at 0.5.2 This is the module for the new zeronsd package. --- maintainers/maintainer-list.nix | 7 ++ .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/zeronsd.nix | 117 ++++++++++++++++++ pkgs/by-name/ze/zeronsd/package.nix | 39 ++++++ 5 files changed, 166 insertions(+) create mode 100644 nixos/modules/services/networking/zeronsd.nix create mode 100644 pkgs/by-name/ze/zeronsd/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f9b93e2b2dde..864367a22444 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5447,6 +5447,13 @@ githubId = 1931963; name = "David Sferruzza"; }; + dstengele = { + name = "Dennis Stengele"; + email = "dennis@stengele.me"; + matrix = "@dstengele:pango.place"; + github = "dstengele"; + githubId = 1706418; + }; dsuetin = { name = "Danil Suetin"; email = "suetin085+nixpkgs@protonmail.com"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index ac585131ea85..ae7de8274b51 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -42,6 +42,8 @@ - [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable). +- [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks). + - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable). - [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 090236780abf..f97a6b47512c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1258,6 +1258,7 @@ ./services/networking/zerobin.nix ./services/networking/zeronet.nix ./services/networking/zerotierone.nix + ./services/networking/zeronsd.nix ./services/networking/znc/default.nix ./services/printing/cupsd.nix ./services/printing/ipp-usb.nix diff --git a/nixos/modules/services/networking/zeronsd.nix b/nixos/modules/services/networking/zeronsd.nix new file mode 100644 index 000000000000..23f1a5fa7e4f --- /dev/null +++ b/nixos/modules/services/networking/zeronsd.nix @@ -0,0 +1,117 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.zeronsd; + settingsFormat = pkgs.formats.json { }; +in +{ + options.services.zeronsd.servedNetworks = lib.mkOption { + default = { }; + example = { + "a8a2c3c10c1a68de".settings.token = "/var/lib/zeronsd/apitoken"; + }; + description = "ZeroTier Networks to start zeronsd instances for."; + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + package = lib.mkPackageOption pkgs "zeronsd" { }; + + settings = lib.mkOption { + description = "Settings for zeronsd"; + default = { }; + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + domain = lib.mkOption { + default = "home.arpa"; + type = lib.types.singleLineStr; + description = "Domain under which ZeroTier records will be available."; + }; + + token = lib.mkOption { + type = lib.types.path; + description = "Path to a file containing the API Token for ZeroTier Central."; + }; + + log_level = lib.mkOption { + default = "warn"; + type = lib.types.enum [ + "off" + "error" + "warn" + "info" + "debug" + "trace" + ]; + description = "Log Level."; + }; + + wildcard = lib.mkOption { + default = false; + type = lib.types.bool; + description = "Whether to serve a wildcard record for ZeroTier Nodes."; + }; + }; + }; + }; + }; + } + ); + }; + + config = lib.mkIf (cfg.servedNetworks != { }) { + assertions = [ + { + assertion = config.services.zerotierone.enable; + message = "zeronsd needs a configured zerotier-one"; + } + ]; + + systemd.services = lib.mapAttrs' (netname: netcfg: { + name = "zeronsd-${netname}"; + value = { + description = "ZeroTier DNS server for Network ${netname}"; + + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "zerotierone.service" + ]; + wants = [ "network-online.target" ]; + + serviceConfig = + let + configFile = pkgs.writeText "zeronsd.json" (builtins.toJSON netcfg.settings); + in + { + ExecStart = "${netcfg.package}/bin/zeronsd start --config ${configFile} --config-type json ${netname}"; + Restart = "on-failure"; + RestartSec = 2; + TimeoutStopSec = 5; + User = "zeronsd"; + Group = "zeronsd"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + }; + }; + }) cfg.servedNetworks; + + systemd.tmpfiles.rules = [ + "a+ /var/lib/zerotier-one - - - - u:zeronsd:x" + "a+ /var/lib/zerotier-one/authtoken.secret - - - - mask::r,u:zeronsd:r" + ]; + + users.users.zeronsd = { + group = "zeronsd"; + description = "Service user for running zeronsd"; + isSystemUser = true; + }; + + users.groups.zeronsd = { }; + }; +} diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix new file mode 100644 index 000000000000..71eeb50e6163 --- /dev/null +++ b/pkgs/by-name/ze/zeronsd/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + rustfmt, +}: + +rustPlatform.buildRustPackage rec { + pname = "zeronsd"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "zerotier"; + repo = "zeronsd"; + rev = "v${version}"; + hash = "sha256-TL0bgzQgge6j1SpZCdxv/s4pBMSg4/3U5QisjkVE6BE="; + }; + + cargoHash = "sha256-WGap0j90obpJHiMNokCWg0Q3xIAqwvmiESg9NVnFMKE="; + + strictDeps = true; + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + RUSTFMT = "${rustfmt}/bin/rustfmt"; + + # Integration tests try to access the ZeroTier API which requires an API token. + # https://github.com/zerotier/zeronsd/blob/v0.5.2/tests/service/network.rs#L10 + doCheck = false; + + meta = with lib; { + description = "A DNS server for ZeroTier users"; + homepage = "https://github.com/zerotier/zeronsd"; + license = licenses.bsd3; + maintainers = [ maintainers.dstengele ]; + }; +} From c9b408ea5d6277213462690eee46ae1ab1b03a92 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Fri, 26 Jul 2024 15:31:48 +0200 Subject: [PATCH 25/28] luaPackages.rustaceanvim: 4.25.1 -> 5.0.0 (#330157) * luaPackages.rustaceanvim: 4.25.1 -> 5.0.0 * luaPackages.rustaceanvim: enable checks * vimPlugins.rustaceanvim: move to overrides --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ------------ pkgs/applications/editors/vim/plugins/overrides.nix | 2 ++ .../editors/vim/plugins/vim-plugin-names | 1 - pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- pkgs/development/lua-modules/overrides.nix | 10 ++++++++++ 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 014eaa74e2fe..114952110ef7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9833,18 +9833,6 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; - rustaceanvim = buildNeovimPlugin { - pname = "rustaceanvim"; - version = "2024-07-10"; - src = fetchFromGitHub { - owner = "mrcjkb"; - repo = "rustaceanvim"; - rev = "047f9c9d8cd2861745eb9de6c1570ee0875aa795"; - sha256 = "0q06rkg8dfzxvlwp7svp8sjkk0f2x5vvjkv6grdmm302s43jj7rk"; - }; - meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; - }; - sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3355db3b54f2..b4826109a7dd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1380,6 +1380,8 @@ dependencies = with self; [ nvim-lspconfig ]; }; + rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; }; + sg-nvim = super.sg-nvim.overrideAttrs (old: let sg-nvim-rust = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a0d1f21cd230..6e9e858c56d1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -827,7 +827,6 @@ https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, -https://github.com/mrcjkb/rustaceanvim/,HEAD, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1be8b965da14..b19c2f826eab 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2973,14 +2973,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "4.25.1-1"; + version = "5.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-4.25.1-1.rockspec"; - sha256 = "1lrjybnicbyl9rh0qcp846s6b57gryca0fw719c8h8pasb9kf1m0"; + url = "mirror://luarocks/rustaceanvim-5.0.0-1.rockspec"; + sha256 = "0rabhsya9qx4lybd47b6s95yh6y7nnngpfpqxf2h8pf492790yxc"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/4.25.1.zip"; - sha256 = "1rym8n7595inb9zdrmw7jwp5iy5r28b7mfjs4k2mvmlby9fxcmz0"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/5.0.0.zip"; + sha256 = "07a0r6lhwxsk3asrnwmj39j51kqaz33qi3kv9788nms3mpvplxc1"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 99fe9217c960..1c9352ae1b2a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -745,6 +745,16 @@ in }; })) {}; + rustaceanvim = prev.rustaceanvim.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); sqlite = prev.sqlite.overrideAttrs (drv: { From ad9a6e0d22778f06e4caeabd22011199b9bb7f2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Jul 2024 16:27:37 +0200 Subject: [PATCH 26/28] Revert "faiss: 1.7.4 -> 1.8.0" (#330183) As indicated by nixpkgs-review, ofBorg and the prior discussion, faissCuda still does not build. --- pkgs/development/libraries/science/math/faiss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 6dd0bb96e866..9b7b4d268197 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -26,7 +26,7 @@ let pname = "faiss"; - version = "1.8.0"; + version = "1.7.4"; inherit (cudaPackages) flags backendStdenv; @@ -51,7 +51,7 @@ stdenv.mkDerivation { owner = "facebookresearch"; repo = pname; rev = "v${version}"; - hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I="; + hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M="; }; patches = [ From 369f63c0f4e1ff0a87d82d41456f8e83f0d296d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Jul 2024 17:54:29 +0200 Subject: [PATCH 27/28] python{311,312}Packages: restore recurseIntoAttrs for package sets Fixes: 0213840c ("pythonPackages: move __attrsFailEvaluation to allo...") --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84cae899cd6d..2a64931c538f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17193,8 +17193,8 @@ with pkgs; python27Packages = python27.pkgs; python39Packages = python39.pkgs; python310Packages = python310.pkgs; - python311Packages = python311.pkgs; - python312Packages = python312.pkgs; + python311Packages = recurseIntoAttrs python311.pkgs; + python312Packages = recurseIntoAttrs python312.pkgs; python313Packages = python313.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; From 852453aae1e7d25257b4b817b9a82ea3f600705b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Jul 2024 18:01:21 +0200 Subject: [PATCH 28/28] coqPackages: restor recurseIntoAttrs Fixes: 0213840 ("pythonPackages: move __attrsFailEvaluation to allo...") --- pkgs/top-level/coq-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index b5fdb99b5334..ef32cb685255 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -219,6 +219,6 @@ in rec { coqPackages_8_19 = mkCoqPackages coq_8_19; coqPackages_8_20 = mkCoqPackages coq_8_20; - coqPackages = coqPackages_8_19; + coqPackages = recurseIntoAttrs coqPackages_8_19; coq = coqPackages.coq; }