From 9e1bb6323faf82f482ee8bc39609ff6de10af6d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 16:31:55 +0000 Subject: [PATCH 01/29] tuptime: 5.2.3 -> 5.2.4 --- pkgs/tools/system/tuptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index d92f65f78ae2..12027e463ad9 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "rfmoz"; repo = "tuptime"; rev = version; - sha256 = "sha256-kR+Pi7/nsRzmmvibp95wjj8/B/Q6FCDSn2A7vJ3sM94="; + sha256 = "sha256-pYGtgv9hPBG/URD2nOWg6qJYYLtlqLW+t5mCLpzKlEc="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 69addf43928b4c377613832043fb7dbec01c620f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Schl=C3=BCter?= Date: Thu, 15 Aug 2024 18:19:17 +0200 Subject: [PATCH 02/29] wasm-bindgen-cli: 0.2.92 -> 0.2.93 --- pkgs/development/tools/wasm-bindgen-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 6fce69be410a..3b0a6c1b53eb 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -8,9 +8,9 @@ , stdenv , curl , Security -, version ? "0.2.92" -, hash ? "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=" -, cargoHash ? "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=" +, version ? "0.2.93" +, hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=" +, cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=" }: rustPlatform.buildRustPackage rec { From 0091b8b7598477f968a7ee0bd58e0f7d791032e1 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 20 Aug 2024 17:16:13 -0400 Subject: [PATCH 03/29] svix-server: 1.28.0 -> 1.30.0 Diff: https://github.com/svix/svix-webhooks/compare/v1.28.0...v1.30.0 Changelog: https://github.com/svix/svix-webhooks/releases/tag/v1.30.0 --- pkgs/by-name/sv/svix-server/Cargo.lock | 46 +++++++++++++++++++++++-- pkgs/by-name/sv/svix-server/package.nix | 4 +-- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sv/svix-server/Cargo.lock b/pkgs/by-name/sv/svix-server/Cargo.lock index 10779d70aec4..4363c3ef350f 100644 --- a/pkgs/by-name/sv/svix-server/Cargo.lock +++ b/pkgs/by-name/sv/svix-server/Cargo.lock @@ -399,6 +399,17 @@ dependencies = [ "reactor-trait", ] +[[package]] +name = "async-socks5" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77f634add2445eb2c1f785642a67ca1073fedd71e73dc3ca69435ef9b9bdedc7" +dependencies = [ + "async-trait", + "thiserror", + "tokio", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -2122,6 +2133,21 @@ dependencies = [ "tower-service", ] +[[package]] +name = "hyper-socks2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4" +dependencies = [ + "async-socks5", + "futures", + "http 0.2.12", + "hyper 0.14.28", + "hyper-tls 0.5.0", + "thiserror", + "tokio", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -2134,6 +2160,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.28", + "native-tls", + "tokio", + "tokio-native-tls", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -3676,7 +3715,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-tls", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", @@ -4753,7 +4792,7 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "hyper-rustls 0.26.0", - "hyper-tls", + "hyper-tls 0.6.0", "hyper-util", "serde", "serde_derive", @@ -4791,7 +4830,7 @@ dependencies = [ [[package]] name = "svix-server" -version = "1.28.0" +version = "1.30.0" dependencies = [ "aide", "anyhow", @@ -4818,6 +4857,7 @@ dependencies = [ "http 0.2.12", "hyper 0.14.28", "hyper-openssl", + "hyper-socks2", "indexmap 1.9.3", "ipnet", "jsonschema", diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 22ba5720f0a9..16eaf01be24d 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "svix-server"; - version = "1.28.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "svix"; repo = "svix-webhooks"; rev = "v${version}"; - hash = "sha256-6GKb3tSO4yr2tMH7V5oOPSsWK4OLX0/Zqd2N+ZrIvls="; + hash = "sha256-W5oLN0rMG2c8h05sIEOf4h95SQrFrs/7vLpsHH91sIA="; }; sourceRoot = "${src.name}/server"; From 420875f69ad52e857860e053d885d2253c43f7ef Mon Sep 17 00:00:00 2001 From: Robert Medeiros Date: Wed, 21 Aug 2024 20:22:28 -0400 Subject: [PATCH 04/29] iroh: 0.21.0 -> 0.23.0 --- pkgs/applications/networking/iroh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index c976b7f82628..1ba9611bf94a 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.21.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-g/x5lVVrm1NrJbqmhza/wryEwuXHh1tDBf+x6vL+2n0="; + hash = "sha256-kXKA0gDmxruoHLTB9zJ36ydqqwaeyQm/Icqgv6API0k="; }; - cargoHash = "sha256-Sp2yMF/M3SuNB1DDQ79Lau5IxtSM1NPLJi9TnHWqnuc="; + cargoHash = "sha256-XUokfLMXIYfiN4A2/aYYhq0N7H2vsZL1uvKg498M3yA="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From aa0e6bba5ea3238db1605b48e7038bf24e8e4b50 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sun, 18 Aug 2024 17:48:40 -0300 Subject: [PATCH 05/29] lime3ds: 2116 -> 2117.1 --- pkgs/by-name/li/lime3ds/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index 671b34b146dc..62c70f5b69f6 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -40,19 +40,13 @@ , useDiscordRichPresence ? false , rapidjson }: let inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath; - - compat-list = fetchurl { - name = "lime3ds-compat-list"; - url = "https://raw.githubusercontent.com/Lime3DS/compatibility-list/fa9d49d22e698df2f238e53f2b34acda08b947f6/compatibility_list.json"; - hash = "sha256-dNZuU8uFXJ5gw/rmtF6bAjtrvVBXP8aUNXVdBY1dT34="; - }; in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2116"; + version = "2117.1"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-ff4An+ZdxlY4H90Yep4lpKROOMEkDijb3dVFIgSPvWQ="; + hash = "sha256-v6AHzbuk5n55nTDO0UndtmdhovfY4kngC5TJaNIV5S4="; }; nativeBuildInputs = [ @@ -104,10 +98,6 @@ in stdenv.mkDerivation (finalAttrs: { mkdir externals/dynarmic/src/dynarmic/ir/var ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty - # Prep compatibilitylist - rm ./dist/compatibility_list/compatibility_list.json - ln -s ${compat-list} ./dist/compatibility_list/compatibility_list.json - # We already know the submodules are present substituteInPlace CMakeLists.txt \ --replace-fail "check_submodules_present()" "" @@ -140,8 +130,6 @@ in stdenv.mkDerivation (finalAttrs: { (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) (cmakeBool "DISABLE_SYSTEM_VMA" true) (cmakeBool "DISABLE_SYSTEM_XBYAK" true) - (cmakeBool "CITRA_ENABLE_COMPATIBILITY_REPORTING" true) - (cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) (cmakeBool "ENABLE_CUBEB" enableCubeb) (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) From 768be845b82f1c235c43f623370be79194ce40a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 02:24:05 +0000 Subject: [PATCH 06/29] pscale: 0.207.0 -> 0.208.0 --- pkgs/development/tools/pscale/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 3a4ed97102d5..4075b1ad9d3c 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pscale"; - version = "0.207.0"; + version = "0.208.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-T01Vo8W21Gu2e7W87LFM/7NGsqHgWt+L4mXmPAEyB70="; + sha256 = "sha256-q7rVTazlUmCOCv6W92uAg9/Jgkdxnl2eSxU3NSBsFZQ="; }; vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40="; @@ -35,6 +35,8 @@ buildGoModule rec { --zsh <($out/bin/pscale completion zsh) ''; + __darwinAllowLocalNetworking = true; + passthru.tests.version = testers.testVersion { package = pscale; }; From c875b3c124081ae5bc5fc47dbcba5741948b8d03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 17:29:00 +0000 Subject: [PATCH 07/29] nnn: 4.9 -> 5.0 --- pkgs/applications/file-managers/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index fe1cf6778027..6ad01c156338 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -26,13 +26,13 @@ assert withEmojis -> (!withIcons && !withNerdIcons); stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "4.9"; + version = "5.0"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${finalAttrs.version}"; - hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU="; + hash = "sha256-HShHSjqD0zeE1/St1Y2dUeHfac6HQnPFfjmFvSuEXUA="; }; patches = [ From 20c22219114aba95f1a12b3c82a3942372112905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 11:16:15 +0000 Subject: [PATCH 08/29] check-jsonschema: 0.28.5 -> 0.29.2 --- pkgs/development/tools/check-jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index fa2d4920a26b..25125b41b6b5 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.28.5"; + version = "0.29.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = "refs/tags/${version}"; - hash = "sha256-O2w9P/5og0cI7Ol+d5YVwLuvCjiskrRLL3V/jsYB4k4="; + hash = "sha256-Z/v/a0zENH8K1NHCZViLBbc8gma5rTMBm8hatHhu878="; }; propagatedBuildInputs = [ From c1e5430534c40579c2b4d29a5a5b453040a7cb2e Mon Sep 17 00:00:00 2001 From: Colton Donnelly Date: Wed, 28 Aug 2024 15:01:07 -0400 Subject: [PATCH 09/29] taplo: 0.9.0 -> 0.9.3 --- pkgs/development/tools/taplo/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/development/tools/taplo/default.nix index 6041f913b48b..77774a0d9a72 100644 --- a/pkgs/development/tools/taplo/default.nix +++ b/pkgs/development/tools/taplo/default.nix @@ -4,21 +4,21 @@ , pkg-config , openssl , stdenv -, Security +, darwin , withLsp ? true }: rustPlatform.buildRustPackage rec { pname = "taplo"; - version = "0.9.0"; + version = "0.9.3"; src = fetchCrate { inherit version; pname = "taplo-cli"; - hash = "sha256-vvb00a6rppx9kKx+pzObT/hW/IsG6RyYFEDp9M5gvqc="; + hash = "sha256-dNGQbaIfFmgXh2AOcaE74BTz7/jaiBgU7Y1pkg1rV7U="; }; - cargoHash = "sha256-oT7U9htu7J22MqLZb+YXohlB1CVGxHGQvHJu18PeLf8="; + cargoHash = "sha256-iucjewjRCunKxKCqeZwf7bdEo7+aN9hfWPwUAJhaSq0="; nativeBuildInputs = [ pkg-config @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; buildFeatures = lib.optional withLsp "lsp"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d3e8e80c3f5..4ed9f44250e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19022,9 +19022,7 @@ with pkgs; szyszka = callPackage ../tools/misc/szyszka { }; - taplo = callPackage ../development/tools/taplo { - inherit (darwin.apple_sdk.frameworks) Security; - }; + taplo = callPackage ../development/tools/taplo { }; taoup = callPackage ../tools/misc/taoup { }; From e7f9526d960a65e528f41adaf9ad47fbf11208ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 01:44:31 +0000 Subject: [PATCH 10/29] circt: 1.81.1 -> 1.83.0 --- 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 e8be6989a771..c4fefa265bc7 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.81.1"; + version = "1.83.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-MDmCsDXc4ohqz+btqbWhhq0PoTNqE6MfVpzrjIoS4rU="; + hash = "sha256-shXGr+Cgs6uEO1eIeWytaOmMbq1fjTshud/AH5A1gZs="; fetchSubmodules = true; }; From f561cf57987c0337a32ee6d6bac6e6fa09edeed0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 28 Aug 2024 22:47:21 -0400 Subject: [PATCH 11/29] micro: add pbsds to maintainers --- pkgs/by-name/mi/micro/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix index 04755a16aaf9..e7c25d77bc40 100644 --- a/pkgs/by-name/mi/micro/package.nix +++ b/pkgs/by-name/mi/micro/package.nix @@ -93,6 +93,7 @@ let meta = { homepage = "https://micro-editor.github.io"; + changelog = "https://github.com/zyedidia/micro/releases/"; description = "Modern and intuitive terminal-based text editor"; longDescription = '' micro is a terminal-based text editor that aims to be easy to use and @@ -106,7 +107,10 @@ let ''; license = lib.licenses.mit; mainProgram = "micro"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ + AndersonTorres + pbsds + ]; }; }; in From 80540dd8b7e17c5123a0d3c77847b84b955e5db9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 10:47:19 +0000 Subject: [PATCH 12/29] aws-iam-authenticator: 0.6.25 -> 0.6.26 --- pkgs/tools/security/aws-iam-authenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 9449e8834c6c..9570229940ed 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.25"; + version = "0.6.26"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-B90Bb6DZTGnE0piOf368BGOphlvqXIO+ckPShfJIX18="; + hash = "sha256-c7JhUDnANW4QihsfCioYiCe19JfqhTYP+pZgUSV6lHQ="; }; vendorHash = "sha256-xCNuFO+J0NXq8CPZXB0R2RmLLH27Vh/GMrBKk+mGk04="; From 8cd58c7e149bc85af98d1697426a2ac5019ece29 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 29 Aug 2024 20:38:30 +1200 Subject: [PATCH 13/29] python3Packages.mkPythonMetaPackage: init This function exists create a meta package containing [metadata files](https://packaging.python.org/en/latest/specifications/recording-installed-packages/) to satisfy a dependency on a package, without it actually having been installed into the environment. --- doc/languages-frameworks/python.section.md | 13 +++++ .../interpreters/python/meta-package.nix | 58 +++++++++++++++++++ .../python/python-packages-base.nix | 3 + 3 files changed, 74 insertions(+) create mode 100644 pkgs/development/interpreters/python/meta-package.nix diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 8992d36fb25b..ce83102acd84 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -361,6 +361,19 @@ modifications. Do pay attention to passing in the right Python version! +#### `mkPythonMetaPackage` function {#mkpythonmetapackage-function} + +This will create a meta package containing [metadata files](https://packaging.python.org/en/latest/specifications/recording-installed-packages/) to satisfy a dependency on a package, without it actually having been installed into the environment. +In nixpkgs this is used to package Python packages with split binary/source distributions such as [psycopg2](https://pypi.org/project/psycopg2/)/[psycopg2-binary](https://pypi.org/project/psycopg2-binary/). + +```nix +mkPythonMetaPackage { + pname = "pscycopg2-binary"; + inherit (psycopg2) optional-dependencies version meta; + dependencies = [ psycopg2 ]; +} +``` + #### `python.buildEnv` function {#python.buildenv-function} Python environments can be created using the low-level `pkgs.buildEnv` function. diff --git a/pkgs/development/interpreters/python/meta-package.nix b/pkgs/development/interpreters/python/meta-package.nix new file mode 100644 index 000000000000..2e25dff85fe0 --- /dev/null +++ b/pkgs/development/interpreters/python/meta-package.nix @@ -0,0 +1,58 @@ +{ + buildPythonPackage, + lib, + hatchling, +}: +{ + pname, + version, + dependencies ? [ ], + optional-dependencies ? { }, + passthru ? { }, + meta ? { }, +}: + +# Create a "fake" meta package to satisfy a dependency on a package, but don't actually build it. +# This is useful for packages that have a split binary/source dichotomy like psycopg2/psycopg2-binary, +# where we want to use the former, but some projects declare a dependency on the latter. + +buildPythonPackage { + inherit + pname + version + dependencies + optional-dependencies + meta + passthru + ; + + pyproject = true; + + # Make a minimal pyproject.toml that can be built + unpackPhase = '' + cat > pyproject.toml << EOF + [project] + name = "${pname}" + version = "${version}" + dependencies = ${builtins.toJSON (map lib.getName dependencies)} + + [project.optional-dependencies] + ${lib.optionalString (optional-dependencies != { }) ( + (lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + group: deps: group + " = " + builtins.toJSON (map lib.getName deps) + ) optional-dependencies + )) + )} + + [tool.hatch.build.targets.wheel] + bypass-selection = true + + [build-system] + requires = ["hatchling"] + build-backend = "hatchling.build" + EOF + ''; + + build-system = [ hatchling ]; +} diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index a807b6e6e33c..edd0937098b6 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -61,6 +61,8 @@ let removePythonPrefix = lib.removePrefix namePrefix; + mkPythonMetaPackage = callPackage ./meta-package.nix { }; + # Convert derivation to a Python module. toPythonModule = drv: drv.overrideAttrs( oldAttrs: { @@ -97,6 +99,7 @@ in { inherit buildPythonPackage buildPythonApplication; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; + inherit mkPythonMetaPackage; python = toPythonModule python; From dd8ed47b9974c3d5a212a0eb0ec60d564d8c8cb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 12:29:22 +0000 Subject: [PATCH 14/29] cfspeedtest: 1.2.5 -> 1.2.6 --- pkgs/tools/networking/cfspeedtest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix index b8417182dc7f..61bdad229863 100644 --- a/pkgs/tools/networking/cfspeedtest/default.nix +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cfspeedtest"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "code-inflation"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rJTECX6JgIoOFpUWK4jYF6duGfhFn6SCNsHzotq5Fhg="; + hash = "sha256-K/rotb4rgYKOF1Gvgb8uPfHCAyYqwcvyU26ZlKGxHcs="; }; - cargoHash = "sha256-XVXHVkwkVYaETN4NAcZkoSQJJK3FxuD4uk7hll47pLM="; + cargoHash = "sha256-clIMlnLXL4ciD1H0LNSLH/ooKIfoZy9D/RDvoSHfG+I="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; From 9e248a24a38fe80e35d293cd903371fb1e061725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 13:13:16 +0000 Subject: [PATCH 15/29] python312Packages.bthome-ble: 3.10.0 -> 3.11.0 --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 5e038521dff2..8f48d2c0364d 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.10.0"; + version = "3.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-oGhj1LsglD5d0i5ltpRZ1GvxsntTEoX6NzdrkHpml7E="; + hash = "sha256-TlZyNGfHNKN+6tCKepLS+fbgfq3a1uzeCXl25khl6d8="; }; postPatch = '' From 1713c6df7eb3fb9ab7cdbb3f12ee028bfbc0e289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 13:18:22 +0000 Subject: [PATCH 16/29] kool: 3.2.0 -> 3.3.0 --- pkgs/development/tools/misc/kool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix index dd5a79f17ee4..7c96ee3ee242 100644 --- a/pkgs/development/tools/misc/kool/default.nix +++ b/pkgs/development/tools/misc/kool/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kool"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "kool-dev"; repo = "kool"; rev = version; - hash = "sha256-oMPzDU5MNIgxg7E2lgvgXEfO4W+VrFlLThOC9OEqhWo="; + hash = "sha256-AbE0MT55LQgDY/WZRs+kCfreLYtSyzmXkYIQmJC4Hbo="; }; - vendorHash = "sha256-PmS96KVhe9TDmtYBx2hROLCbGMQ0OY3MN405dUmxPzk="; + vendorHash = "sha256-wzTsd2ITwnPFc85bXoZLLb9wKvHYOgnb1FGiFXLkkiE="; ldflags = [ "-s" From 139d4fbc919474c6690f95d618ca636ab0c88f8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 15:04:58 +0000 Subject: [PATCH 17/29] python312Packages.powerline: 2.8.3 -> 2.8.4 --- pkgs/development/python-modules/powerline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 6578c6f43559..6e1f724a35dd 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -14,7 +14,7 @@ # TODO: bzr support is missing because nixpkgs switched to `breezy` buildPythonPackage rec { - version = "2.8.3"; + version = "2.8.4"; pname = "powerline"; format = "setuptools"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UIx9/IZg6Wv596wHzQb0CO6zwmQXUaFEPKBojo2LXmA="; + hash = "sha256-snJrfUvP11lBIy6F0WtqJt9fiYm5jxMwm9u3u5XFO84="; }; propagatedBuildInputs = [ From d26984e79e030a9ccc0167c3b6a114ceafca6b54 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 17:28:42 +0200 Subject: [PATCH 18/29] udocker: 1.3.16 -> 1.3.17 Diff: https://github.com/indigo-dc/udocker/compare/refs/tags/1.3.16...1.3.17 Changelog: https://github.com/indigo-dc/udocker/releases/tag/1.3.17 --- pkgs/tools/virtualization/udocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 21fc0d1f838f..8f0afedfd9cb 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "udocker"; - version = "1.3.16"; + version = "1.3.17"; src = fetchFromGitHub { owner = "indigo-dc"; repo = "udocker"; rev = "refs/tags/${version}"; - hash = "sha256-PUbNFvKaF41egGMypdkmVFCt1bWmTCWR5iQNOt/L4+Y="; + hash = "sha256-P49fkLvdCm/Eco+nD3SGM04PRQatBzq9CHlayueQetk="; }; # crun patchelf proot runc fakechroot From 4c3b0517fb39f9a8bcd3cf18dfcc3a554f841ae2 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Thu, 29 Aug 2024 17:36:22 +0200 Subject: [PATCH 19/29] forgejo: 8.0.1 -> 8.0.2 https://codeberg.org/forgejo/forgejo/milestone/7728 --- pkgs/by-name/fo/forgejo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index f06c4eaf739a..8beb4a67c764 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "8.0.1"; - hash = "sha256-0D2ntZVK4k5AwAMg4XnLyabnxAoHx9JjBoFAdkfrdAY="; + version = "8.0.2"; + hash = "sha256-rjwZjwt0F9AhXgQ8CzOfsZ3acyBvzsDc/2LHRWieDzg="; npmDepsHash = "sha256-6AMaZadgcTvOBsIXJjZQB6Q1rkdn+R82pclXdVvtdWY="; - vendorHash = "sha256-tNb0tCf+gjUmUqrjkzt7Wqqz21hW9WRh8CEdX8rv8Do="; + vendorHash = "sha256-4l4kscwesW/cR8mZjE3G9HcVm0d1ukxbtBY6RXYRi8k="; lts = false; nixUpdateExtraArgs = [ "--override-filename" From 4d4d4aba6399f1190d6a338b0228cba63bc2f9de Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Thu, 29 Aug 2024 18:13:37 +0200 Subject: [PATCH 20/29] forgejo-lts: 7.0.7 -> 7.0.8 https://codeberg.org/forgejo/forgejo/milestone/7729 --- pkgs/by-name/fo/forgejo/lts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 4030b6158718..7693d27f5502 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "7.0.7"; - hash = "sha256-Xk5ElAfTjbz77Jv5VMbSW7q8qJ5vhNd3daNilNzDsY4="; + version = "7.0.8"; + hash = "sha256-m6yToQQFM+4g8xhs572O4n4r06xeS3DozYHtAKwMjUg="; npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU="; vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw="; lts = true; From fc2cad888814a5483d9e71b03eead29bc82973ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Thu, 29 Aug 2024 18:53:01 +0200 Subject: [PATCH 21/29] anytype: 0.42.4 -> 0.42.5 --- pkgs/by-name/an/anytype/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index ea4619b2ba4e..619ca4adefd5 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -2,11 +2,11 @@ let pname = "anytype"; - version = "0.42.4"; + version = "0.42.5"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-SFLjjr+L7eTqaZ2teug7mzXhIU+eVebBqrE4q5aasLk="; + hash = "sha256-43g/CdmmQTSxk7OTZMPIiWIYJjCG2zJNM9kaAq1jOqE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { From 60e2cdd7828937e82268cf616e688c5919ce912b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 18:48:26 +0000 Subject: [PATCH 22/29] python312Packages.playwrightcapture: 1.25.13 -> 1.25.14 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 33e95475b887..4ca77cb5cabe 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.13"; + version = "1.25.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-O482RKJejgg3eJe4M9U0ExuDFwFz9Fbpxvrn6re58h8="; + hash = "sha256-1MTU/teBs2HisW0L0o5RyAAi8wlkrVFwc/K70O4YfKg="; }; pythonRelaxDeps = [ From 3971dc46d8fc502e23107966ef3a71953107b010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Aug 2024 13:11:40 -0700 Subject: [PATCH 23/29] python312Packages.safety: 3.2.6 -> 3.2.7 Diff: https://github.com/pyupio/safety/compare/refs/tags/3.2.6...3.2.7 Changelog: https://github.com/pyupio/safety/blob/3.2.7/CHANGELOG.md --- pkgs/development/python-modules/safety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index db1e2ed0d590..8bef717dabf5 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.6"; + version = "3.2.7"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pyupio"; repo = "safety"; rev = "refs/tags/${version}"; - hash = "sha256-pC9ruEGT3v5C5EpxIN+uZX+6sVYG4+MpXU0gt9yb+IE="; + hash = "sha256-JWbiw9qgfDo0UMAcqIhk1Y5tW0aSaZtbVdpdaY2z+3w="; }; postPatch = '' From db974ec9b48a2f71f76db8ad8c107ab4802bad6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 20:24:27 +0000 Subject: [PATCH 24/29] wstunnel: 10.0.1 -> 10.1.0 --- pkgs/by-name/ws/wstunnel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index 9e918039c14a..46b9723e9559 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -8,7 +8,7 @@ }: let - version = "10.0.1"; + version = "10.1.0"; in rustPlatform.buildRustPackage { @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-lahuuVc+fbuWMXaWvt8C6j26Mo/1o5PkBfVH+lemdv4="; + hash = "sha256-nOks9OMA0z7e1nYnKxkSmEj5GXP00385E+jr67lzS5c="; }; - cargoHash = "sha256-gNx01LHIcAbedO2X/OwwnQWd9d0Qc6ahe84IRUyptcY="; + cargoHash = "sha256-QJ5Fb1M5CLDd2bZPy2p9zqh2A9KIoHp7PA1fxX2RDjI="; nativeBuildInputs = [ versionCheckHook ]; From d3e7844bbc92f9ca715431397586d30dd2201293 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 27 Aug 2024 15:53:19 +1200 Subject: [PATCH 25/29] python3Packages.psycopg2-binary: init at 2.9.9 Pscycopg2-binary is normally used in Python development to avoid having to build psycopg2 from source. In nixpkgs we always want ot build from source whenever possible, but it can still be useful to provide a psycopg2-binary package. This "fake" package exists to satisfy a dependency on psycopg2-binary, but still use the build from psycopg2. cc @misuzu https://github.com/nix-community/pyproject.nix/issues/143 --- doc/languages-frameworks/python.section.md | 5 ++++- .../python-modules/psycopg2-binary/default.nix | 13 +++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/psycopg2-binary/default.nix diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index ce83102acd84..833ff45c746e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -369,8 +369,11 @@ In nixpkgs this is used to package Python packages with split binary/source dist ```nix mkPythonMetaPackage { pname = "pscycopg2-binary"; - inherit (psycopg2) optional-dependencies version meta; + inherit (psycopg2) optional-dependencies version; dependencies = [ psycopg2 ]; + meta = { + inherit (psycopg2.meta) description homepage; + }; } ``` diff --git a/pkgs/development/python-modules/psycopg2-binary/default.nix b/pkgs/development/python-modules/psycopg2-binary/default.nix new file mode 100644 index 000000000000..bf6afbfa845c --- /dev/null +++ b/pkgs/development/python-modules/psycopg2-binary/default.nix @@ -0,0 +1,13 @@ +{ + mkPythonMetaPackage, + psycopg2, +}: +mkPythonMetaPackage { + pname = "pscycopg2-binary"; + inherit (psycopg2) version; + dependencies = [ psycopg2 ]; + optional-dependencies = psycopg2.optional-dependencies or { }; + meta = { + inherit (psycopg2.meta) description homepage; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ca278ddb429..5292ba1d907e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10952,6 +10952,8 @@ self: super: with self; { psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { }; + psycopg2-binary = callPackage ../development/python-modules/psycopg2-binary { }; + psygnal = callPackage ../development/python-modules/psygnal { }; ptable = callPackage ../development/python-modules/ptable { }; From a4aabf88668a363631452188ee3c658df4e7be38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 02:17:48 +0000 Subject: [PATCH 26/29] neocmakelsp: 0.8.1 -> 0.8.2 --- .../tools/language-servers/neocmakelsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index f58a1595f4a5..42968130d1a4 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-SDSqYfnHI6nFJrLUDApYR1nfGdcPdPihrb54gNIRkLU="; + hash = "sha256-t9cFECz4olFQ3VOuZzqHRMuvC8df1qaF7etb9ThJiok="; }; - cargoHash = "sha256-Rlu2m+pbaU+EunQ7pthYPSRZo1yVF/+L114WxCv3l9c="; + cargoHash = "sha256-m+eO2y6TNRYc9Nau5ma9qcZcj7xUdxjo34eBmuXANkU="; meta = with lib; { description = "CMake lsp based on tower-lsp and treesitter"; From 115819deb5b1e1ac7c33df7a0bd3a4b1c99d77c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 03:07:42 +0000 Subject: [PATCH 27/29] python312Packages.libpysal: 4.12.0 -> 4.12.1 --- pkgs/development/python-modules/libpysal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libpysal/default.nix b/pkgs/development/python-modules/libpysal/default.nix index bc6120a1c693..c81bab3c1512 100644 --- a/pkgs/development/python-modules/libpysal/default.nix +++ b/pkgs/development/python-modules/libpysal/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "libpysal"; - version = "4.12.0"; + version = "4.12.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pysal"; repo = "libpysal"; rev = "refs/tags/v${version}"; - hash = "sha256-m7jcTi51ngAXXWYJGkjMVA3KwAxL2aJysdjiS1pWEIQ="; + hash = "sha256-snhCEKeGKKj/bTDYi6ZVv5F4b/2rz/JHIFG2IoINQ+Q="; }; build-system = [ setuptools-scm ]; From 93ff3f6b7676ff3c8792cfa2c52eefbf3e18bb96 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 30 Aug 2024 15:22:20 +1200 Subject: [PATCH 28/29] python3Packages.psycopg2-binary: Fix pname spelling --- doc/languages-frameworks/python.section.md | 2 +- pkgs/development/python-modules/psycopg2-binary/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 833ff45c746e..8d37b9c7b39b 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -368,7 +368,7 @@ In nixpkgs this is used to package Python packages with split binary/source dist ```nix mkPythonMetaPackage { - pname = "pscycopg2-binary"; + pname = "psycopg2-binary"; inherit (psycopg2) optional-dependencies version; dependencies = [ psycopg2 ]; meta = { diff --git a/pkgs/development/python-modules/psycopg2-binary/default.nix b/pkgs/development/python-modules/psycopg2-binary/default.nix index bf6afbfa845c..f0691a2c601b 100644 --- a/pkgs/development/python-modules/psycopg2-binary/default.nix +++ b/pkgs/development/python-modules/psycopg2-binary/default.nix @@ -3,7 +3,7 @@ psycopg2, }: mkPythonMetaPackage { - pname = "pscycopg2-binary"; + pname = "psycopg2-binary"; inherit (psycopg2) version; dependencies = [ psycopg2 ]; optional-dependencies = psycopg2.optional-dependencies or { }; From 49d33d4a6b15330b492a194edc4b67fb20a15fa1 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 30 Aug 2024 08:53:39 +0300 Subject: [PATCH 29/29] [staging-next] nixos/fontconfig: hack to put everyone's fonts back --- nixos/modules/config/fonts/fontconfig.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 9a9ac08eefeb..a44b1fecd29a 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -180,8 +180,14 @@ let mkdir -p $dst # fonts.conf - ln -s ${pkg.out}/etc/fonts/fonts.conf \ + cp ${pkg.out}/etc/fonts/fonts.conf \ $dst/../fonts.conf + + # horrible sed hack to add the line that was accidentally removed + # from the default config in #324516 + # FIXME: fix that, revert this + sed "5i /etc/fonts/conf.d" -i $dst/../fonts.conf + # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged mkdir -p $out/etc/fonts/2.11 ln -s /etc/fonts/fonts.conf \