From 09fc9be172fc1fee14f8a6c319b67fef7bdc3e5b Mon Sep 17 00:00:00 2001 From: Matt Bryant Date: Tue, 21 Feb 2023 22:44:31 -0800 Subject: [PATCH 01/39] gdbgui: 0.15.0.1 -> 0.15.1.0 Fixes #214614 by switching from the Sept 2021 release to the Jun 2022 release (https://github.com/cs01/gdbgui/releases) --- pkgs/development/tools/misc/gdbgui/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index e953fa0ba40d..523cd85efb6a 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -2,8 +2,9 @@ , buildPythonApplication , fetchPypi , gdb -, flask-socketio +, eventlet , flask-compress +, flask-socketio , pygdbmi , pygments , }: @@ -11,26 +12,26 @@ buildPythonApplication rec { pname = "gdbgui"; - version = "0.15.0.1"; - + version = "0.15.1.0"; buildInputs = [ gdb ]; propagatedBuildInputs = [ - flask-socketio + eventlet flask-compress + flask-socketio pygdbmi pygments ]; src = fetchPypi { inherit pname version; - sha256 = "sha256-bwrleLn3GBx4Mie2kujtaUo+XCALM+hRLySIZERlBg0="; + sha256 = "sha256-YcD3om7N6yddm02It6/fjXDsVHG0Cs46fdGof0PMJXM="; }; postPatch = '' echo ${version} > gdbgui/VERSION.txt - # remove upper version bound - sed -ie 's!,.*<.*!!' requirements.in + # relax version requirements + sed -i 's/==.*$//' requirements.txt ''; postInstall = '' From f548a59a5f57fa0d02c8005674bc0b54c7a84683 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Mar 2023 04:20:00 +0000 Subject: [PATCH 02/39] binaryen: 111 -> 112 --- .../compilers/binaryen/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 3dbc61be4197..73f32af28e19 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,31 +1,18 @@ { lib, stdenv, cmake, python3, fetchFromGitHub, emscripten, - gtest, lit, nodejs, filecheck, fetchpatch + gtest, lit, nodejs, filecheck }: stdenv.mkDerivation rec { pname = "binaryen"; - version = "111"; + version = "112"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-wSwLs/YvrH7nswDSbtR6onOMArCdPE2zi6G7oA10U4Y="; + hash = "sha256-xVumVmiLMHJp3SItE8eL8OBPeq58HtOOiK9LL8SP4CQ="; }; - patches = [ - # https://github.com/WebAssembly/binaryen/pull/5378 - (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/a96fe1a8422140072db7ad7db421378b87898a0d.patch"; - sha256 = "sha256-Wred1IoRxcQBi0nLBWpiUSgt2ApGoGsq9GkoO3mSS6o="; - }) - # https://github.com/WebAssembly/binaryen/pull/5391 - (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/f92350d2949934c0e0ce4a27ec8b799ac2a85e45.patch"; - sha256 = "sha256-fBwdGSIPjF2WKNnD8I0/2hnQvqevdk3NS9fAxutkZG0="; - }) - ]; - nativeBuildInputs = [ cmake python3 ]; preConfigure = '' From 1d9d1e03b82d69c94b07ff6fb15f91ed23d0a4d4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 16 Mar 2023 01:48:58 +0100 Subject: [PATCH 03/39] dmidecode: 3.4 -> 3.5 --- pkgs/os-specific/linux/dmidecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index a8c263144208..f09dec758f74 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dmidecode"; - version = "3.4"; + version = "3.5"; src = fetchurl { url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; - sha256 = "sha256-Q8uoUdhGfJl5zNvqsZLrZjjH06aX66Xdt3naiDdUIhI="; + sha256 = "sha256-eddnNe6OJRluKnIpZM+Wg/WglYFQNTeISyVrATicwHM="; }; makeFlags = [ From efbbdc16e6defc1ac5243697bf9671fbe0720f80 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 15 Mar 2023 19:41:48 -0700 Subject: [PATCH 04/39] Revert "carnix,cratesIO: remove" in doc/languages-frameworks/rust.section.md This reverts the part of commit 82fe76d1cd0ff6607c4c6383fb9620f6615a84a0 that affected doc/languages-frameworks/rust.section.md --- doc/languages-frameworks/rust.section.md | 221 +++++++++++++++++++++++ 1 file changed, 221 insertions(+) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index b3f4405ee935..4f2ecc2cd4da 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -642,6 +642,227 @@ buildPythonPackage rec { } ``` +## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo} + +### Simple operation {#simple-operation} + +When run, `cargo build` produces a file called `Cargo.lock`, +containing pinned versions of all dependencies. Nixpkgs contains a +tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used +to turn a `Cargo.lock` into a Nix expression. + +That Nix expression calls `rustc` directly (hence bypassing Cargo), +and can be used to compile a crate and all its dependencies. Here is +an example for a minimal `hello` crate: + +```ShellSession +$ cargo new hello +$ cd hello +$ cargo build + Compiling hello v0.1.0 (file:///tmp/hello) + Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs +$ carnix -o hello.nix --src ./. Cargo.lock --standalone +$ nix-build hello.nix -A hello_0_1_0 +``` + +Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: + +```nix +# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone +{ stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; + # ... (content skipped) +in +rec { + hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "pe@pijul.org " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {}; + hello_0_1_0_features = f: updateFeatures f (rec { + hello_0_1_0.default = (f.hello_0_1_0.default or true); + }) [ ]; +} +``` + +In particular, note that the argument given as `--src` is copied +verbatim to the source. If we look at a more complicated +dependencies, for instance by adding a single line `libc="*"` to our +`Cargo.toml`, we first need to run `cargo build` to update the +`Cargo.lock`. Then, `carnix` needs to be run again, and produces the +following nix file: + +```nix +# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone +{ stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; + # ... (content skipped) +in +rec { + hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "pe@pijul.org " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + libc_0_2_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.36"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l"; + inherit dependencies buildDependencies features; + }; + hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ { + dependencies = mapFeatures features ([ libc_0_2_36 ]); + }; + hello_0_1_0_features = f: updateFeatures f (rec { + hello_0_1_0.default = (f.hello_0_1_0.default or true); + libc_0_2_36.default = true; + }) [ libc_0_2_36_features ]; + libc_0_2_36 = { features?(libc_0_2_36_features {}) }: libc_0_2_36_ { + features = mkFeatures (features.libc_0_2_36 or {}); + }; + libc_0_2_36_features = f: updateFeatures f (rec { + libc_0_2_36.default = (f.libc_0_2_36.default or true); + libc_0_2_36.use_std = + (f.libc_0_2_36.use_std or false) || + (f.libc_0_2_36.default or false) || + (libc_0_2_36.default or false); + }) []; +} +``` + +Here, the `libc` crate has no `src` attribute, so `buildRustCrate` +will fetch it from [crates.io](https://crates.io). A `sha256` +attribute is still needed for Nix purity. + +### Handling external dependencies {#handling-external-dependencies} + +Some crates require external libraries. For crates from +[crates.io](https://crates.io), such libraries can be specified in +`defaultCrateOverrides` package in nixpkgs itself. + +Starting from that file, one can add more overrides, to add features +or build inputs by overriding the hello crate in a separate file. + +```nix +with import {}; +((import ./hello.nix).hello {}).override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: { buildInputs = [ openssl ]; }; + }; +} +``` + +Here, `crateOverrides` is expected to be a attribute set, where the +key is the crate name without version number and the value a function. +The function gets all attributes passed to `buildRustCrate` as first +argument and returns a set that contains all attribute that should be +overwritten. + +For more complicated cases, such as when parts of the crate's +derivation depend on the crate's version, the `attrs` argument of +the override above can be read, as in the following example, which +patches the derivation: + +```nix +with import {}; +((import ./hello.nix).hello {}).override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { + postPatch = '' + substituteInPlace lib/zoneinfo.rs \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + }; + }; +} +``` + +Another situation is when we want to override a nested +dependency. This actually works in the exact same way, since the +`crateOverrides` parameter is forwarded to the crate's +dependencies. For instance, to override the build inputs for crate +`libc` in the example above, where `libc` is a dependency of the main +crate, we could do: + +```nix +with import {}; +((import hello.nix).hello {}).override { + crateOverrides = defaultCrateOverrides // { + libc = attrs: { buildInputs = []; }; + }; +} +``` + +### Options and phases configuration {#options-and-phases-configuration} + +Actually, the overrides introduced in the previous section are more +general. A number of other parameters can be overridden: + +- The version of `rustc` used to compile the crate: + + ```nix + (hello {}).override { rust = pkgs.rust; }; + ``` + +- Whether to build in release mode or debug mode (release mode by + default): + + ```nix + (hello {}).override { release = false; }; + ``` + +- Whether to print the commands sent to `rustc` when building + (equivalent to `--verbose` in cargo: + + ```nix + (hello {}).override { verbose = false; }; + ``` + +- Extra arguments to be passed to `rustc`: + + ```nix + (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; }; + ``` + +- Phases, just like in any other derivation, can be specified using + the following attributes: `preUnpack`, `postUnpack`, `prePatch`, + `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate, + this is run before calling the "build" script), `postConfigure` + (after the "build" script),`preBuild`, `postBuild`, `preInstall` and + `postInstall`. As an example, here is how to create a new module + before running the build script: + + ```nix + (hello {}).override { + preConfigure = '' + echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" + ''; + }; + ``` + +### Features {#features} + +One can also supply features switches. For example, if we want to +compile `diesel_cli` only with the `postgres` feature, and no default +features, we would write: + +```nix +(callPackage ./diesel.nix {}).diesel { + default = false; + postgres = true; +} +``` + +Where `diesel.nix` is the file generated by Carnix, as explained above. + ## Setting Up `nix-shell` {#setting-up-nix-shell} Oftentimes you want to develop code from within `nix-shell`. Unfortunately From 50f57ac692c736b75ee7958c57b4111bf62fee9c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 22 Aug 2022 14:29:50 -0700 Subject: [PATCH 05/39] doc/../rust.section.md: fix incorrect header depths The headings for the Rust section are structured incorrectly in two ways: 1. The section "Compiling non-Rust packages that include Rust code" is totally specific to `buildRustPackage`. It should be a child of the "Compiling Rust applications with Cargo" section. 1. The section "Setting up `nix-shell`" is totally specific to `buildRustCrate`. It should be a child of the "Compiling Rust crates using Nix instead of Cargo" section. - Rust - Compiling Rust applications with Cargo - ... - Compiling non-Rust packages that include Rust code - ... - Compiling Rust crates using Nix instead of Cargo - ... - Setting Up `nix-shell` - ... - Rust - Compiling Rust applications with Cargo - ... - Compiling non-Rust packages that include Rust code - ... - Compiling Rust crates using Nix instead of Cargo - ... - Setting Up `nix-shell` - ... --- doc/languages-frameworks/rust.section.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 4f2ecc2cd4da..1073a97888ea 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -411,13 +411,13 @@ rustPlatform.buildRustPackage rec { } ``` -## Compiling non-Rust packages that include Rust code {#compiling-non-rust-packages-that-include-rust-code} +### Compiling non-Rust packages that include Rust code {#compiling-non-rust-packages-that-include-rust-code} Several non-Rust packages incorporate Rust code for performance- or security-sensitive parts. `rustPlatform` exposes several functions and hooks that can be used to integrate Cargo in non-Rust packages. -### Vendoring of dependencies {#vendoring-of-dependencies} +#### Vendoring of dependencies {#vendoring-of-dependencies} Since network access is not allowed in sandboxed builds, Rust crate dependencies need to be retrieved using a fetcher. `rustPlatform` @@ -477,7 +477,7 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or `lib.fakeHash` as a stub hash. Building `cargoDeps` will then inform you of the correct hash. -### Hooks {#hooks} +#### Hooks {#hooks} `rustPlatform` provides the following hooks to automate Cargo builds: @@ -513,7 +513,7 @@ you of the correct hash. * `bindgenHook`: for crates which use `bindgen` as a build dependency, lets `bindgen` find `libclang` and `libclang` find the libraries in `buildInputs`. -### Examples {#examples} +#### Examples {#examples} #### Python package using `setuptools-rust` {#python-package-using-setuptools-rust} @@ -863,7 +863,7 @@ features, we would write: Where `diesel.nix` is the file generated by Carnix, as explained above. -## Setting Up `nix-shell` {#setting-up-nix-shell} +### Setting Up `nix-shell` {#setting-up-nix-shell} Oftentimes you want to develop code from within `nix-shell`. Unfortunately `buildRustCrate` does not support common `nix-shell` operations directly From 21a9621a443f237b2c214eac21d0d03216b46c5b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 17 Mar 2023 21:31:05 +0400 Subject: [PATCH 06/39] =?UTF-8?q?martin:=200.7.2=20=E2=86=92=200.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/geospatial/martin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index 6276ad90189d..0bbe63fe3ec8 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "martin"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; rev = "v${version}"; - hash = "sha256-F7CAP7PrG71EdAe2hb13L/fKSiFyNHYHHweqg2GiJeU="; + hash = "sha256-gaPq4sEt9MweY91PQJPiZT5DzZ9fQZnPNiFocGVjWTc="; }; - cargoHash = "sha256-/bIMQJ2+39PShVx/W/tOeD+EjPNLw4NianwJl9wkwmk="; + cargoHash = "sha256-LfpxPqbLZhq59CjBzTfP4ih+Mj1L/72rkosbp12+bds="; nativeBuildInputs = [ pkg-config ]; From 4716768513350cd9a7f4b93daf100285e16a5348 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:09:50 +0000 Subject: [PATCH 07/39] Update doc/languages-frameworks/rust.section.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- doc/languages-frameworks/rust.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 1073a97888ea..2b4b01718d70 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -648,7 +648,7 @@ buildPythonPackage rec { When run, `cargo build` produces a file called `Cargo.lock`, containing pinned versions of all dependencies. Nixpkgs contains a -tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used +tool called `crate2Nix` (`nix-shell -p crate2nix`), which can be used to turn a `Cargo.lock` into a Nix expression. That Nix expression calls `rustc` directly (hence bypassing Cargo), From 618d8e6a62455729200843a9f31a5bf1a465a739 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:10:15 +0000 Subject: [PATCH 08/39] Update doc/languages-frameworks/rust.section.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- doc/languages-frameworks/rust.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 2b4b01718d70..c2eba3f1481d 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -693,7 +693,7 @@ In particular, note that the argument given as `--src` is copied verbatim to the source. If we look at a more complicated dependencies, for instance by adding a single line `libc="*"` to our `Cargo.toml`, we first need to run `cargo build` to update the -`Cargo.lock`. Then, `carnix` needs to be run again, and produces the +`Cargo.lock`. Then, `crate2nix` needs to be run again, and produces the following nix file: ```nix From e369d78b70bbcca7018689cb1ec04d103ac91b5c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 17 Mar 2023 12:13:13 -0700 Subject: [PATCH 09/39] remove references to crate2nix other than a link to its docs --- doc/languages-frameworks/rust.section.md | 113 ++--------------------- 1 file changed, 6 insertions(+), 107 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index c2eba3f1481d..7ee2dea2daf2 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -648,99 +648,13 @@ buildPythonPackage rec { When run, `cargo build` produces a file called `Cargo.lock`, containing pinned versions of all dependencies. Nixpkgs contains a -tool called `crate2Nix` (`nix-shell -p crate2nix`), which can be used -to turn a `Cargo.lock` into a Nix expression. +tool called `crate2Nix` (`nix-shell -p crate2nix`), which can be +used to turn a `Cargo.lock` into a Nix expression. That Nix +expression calls `rustc` directly (hence bypassing Cargo), and can +be used to compile a crate and all its dependencies. -That Nix expression calls `rustc` directly (hence bypassing Cargo), -and can be used to compile a crate and all its dependencies. Here is -an example for a minimal `hello` crate: - -```ShellSession -$ cargo new hello -$ cd hello -$ cargo build - Compiling hello v0.1.0 (file:///tmp/hello) - Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs -$ carnix -o hello.nix --src ./. Cargo.lock --standalone -$ nix-build hello.nix -A hello_0_1_0 -``` - -Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: - -```nix -# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.buildPlatform.parsed.kernel.name; - # ... (content skipped) -in -rec { - hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; - hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hello"; - version = "0.1.0"; - authors = [ "pe@pijul.org " ]; - src = ./.; - inherit dependencies buildDependencies features; - }; - hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {}; - hello_0_1_0_features = f: updateFeatures f (rec { - hello_0_1_0.default = (f.hello_0_1_0.default or true); - }) [ ]; -} -``` - -In particular, note that the argument given as `--src` is copied -verbatim to the source. If we look at a more complicated -dependencies, for instance by adding a single line `libc="*"` to our -`Cargo.toml`, we first need to run `cargo build` to update the -`Cargo.lock`. Then, `crate2nix` needs to be run again, and produces the -following nix file: - -```nix -# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.buildPlatform.parsed.kernel.name; - # ... (content skipped) -in -rec { - hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; - hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hello"; - version = "0.1.0"; - authors = [ "pe@pijul.org " ]; - src = ./.; - inherit dependencies buildDependencies features; - }; - libc_0_2_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.36"; - authors = [ "The Rust Project Developers" ]; - sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l"; - inherit dependencies buildDependencies features; - }; - hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ { - dependencies = mapFeatures features ([ libc_0_2_36 ]); - }; - hello_0_1_0_features = f: updateFeatures f (rec { - hello_0_1_0.default = (f.hello_0_1_0.default or true); - libc_0_2_36.default = true; - }) [ libc_0_2_36_features ]; - libc_0_2_36 = { features?(libc_0_2_36_features {}) }: libc_0_2_36_ { - features = mkFeatures (features.libc_0_2_36 or {}); - }; - libc_0_2_36_features = f: updateFeatures f (rec { - libc_0_2_36.default = (f.libc_0_2_36.default or true); - libc_0_2_36.use_std = - (f.libc_0_2_36.use_std or false) || - (f.libc_0_2_36.default or false) || - (libc_0_2_36.default or false); - }) []; -} -``` - -Here, the `libc` crate has no `src` attribute, so `buildRustCrate` -will fetch it from [crates.io](https://crates.io). A `sha256` -attribute is still needed for Nix purity. +See [`crate2nix`'s documentation](https://github.com/kolloch/crate2nix#known-restrictions) +for instructions on how to use it. ### Handling external dependencies {#handling-external-dependencies} @@ -848,21 +762,6 @@ general. A number of other parameters can be overridden: }; ``` -### Features {#features} - -One can also supply features switches. For example, if we want to -compile `diesel_cli` only with the `postgres` feature, and no default -features, we would write: - -```nix -(callPackage ./diesel.nix {}).diesel { - default = false; - postgres = true; -} -``` - -Where `diesel.nix` is the file generated by Carnix, as explained above. - ### Setting Up `nix-shell` {#setting-up-nix-shell} Oftentimes you want to develop code from within `nix-shell`. Unfortunately From 741d9c276626842dfed92fa7aa605f3ff2a9ccc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 17 Mar 2023 21:19:10 +0100 Subject: [PATCH 10/39] python310Packages.adblock: Substitute bogus version The upstream sets 0.0.0 as the version in pyprojecy.toml with no indication, how the version gets set dynamically. --- pkgs/development/python-modules/adblock/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 7dfe54fddbc4..e4a0ede52d68 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" + ''; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; From aca46723005660f7f2bf8819280b1b058b586985 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 10:00:11 +0000 Subject: [PATCH 11/39] python310Packages.python-songpal: 0.15.1 -> 0.15.2 --- pkgs/development/python-modules/python-songpal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index c01819d67305..091bdb0b0335 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.15.1"; + version = "0.15.2"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rytilahti"; repo = "python-songpal"; rev = "refs/tags/release/${version}"; - hash = "sha256-FX5pDWjUhrhK5B7zEfvihN77pSNi2QltRu0xbkUdc/c="; + hash = "sha256-bAlMOxX4rx4URk+xvlte7l005i3H0VDaH67AWMdhTeY="; }; nativeBuildInputs = [ From 2d4c695eda68f21cb113678e1aff7db24ed096b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Mar 2023 11:15:15 +0100 Subject: [PATCH 12/39] python310Packages.adafruit-platformdetect: 3.41.0 -> 3.42.0 Changelog: https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/3.42.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 20853b133955..f92071b27a82 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.41.0"; + version = "3.42.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-NWdY1ykuF8mYxXPCwaVq6mEkQXHrUmhEy/BXDFYn2V0="; + hash = "sha256-nFpPJKQv7UNsza1PAcTsZNVp9nFVa/pHlvNRVM4UIUY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 7a6722eeb8dcc5486a609e9c0e4ed655dc116760 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Mar 2023 11:20:28 +0100 Subject: [PATCH 13/39] python310Packages.python-songpal: add changelog to meta --- pkgs/development/python-modules/python-songpal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index 091bdb0b0335..44deb68dc6d9 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interfacing with Sony's Songpal devices"; homepage = "https://github.com/rytilahti/python-songpal"; + changelog = "https://github.com/rytilahti/python-songpal/blob/release/${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ dotlambda ]; }; From bba33d60fc1d855c5b50a353b95ed39cdfeced51 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Tue, 14 Mar 2023 13:08:17 +0100 Subject: [PATCH 14/39] paperwork: Patch broken libreoffice path Due to the changes in #219166, no suitable path to libreoffice was found --- pkgs/applications/office/paperwork/paperwork-backend.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index b67dfe436fa2..c7ddfa09e234 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,5 +1,6 @@ { buildPythonPackage , lib +, fetchpatch , fetchFromGitLab , pyenchant , scikit-learn @@ -34,6 +35,10 @@ buildPythonPackage rec { patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch + (fetchpatch { + url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/0f5cf0fe7ef223000e02c28e4c7576f74a778fe6.patch"; + hash = "sha256-NIK3j2TdydfeK3/udS/Pc+tJa/pPkfAmSPPeaYuaCq4="; + }) ]; patchFlags = [ "-p2" ]; From eeacc13114cf1a4c7570fcedd7b79799b1c9c16c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Mar 2023 14:04:14 +0100 Subject: [PATCH 15/39] python310Packages.aesara: update format and disable failing tests --- .../python-modules/aesara/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 9e053547835e..1d6abad17b49 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -1,11 +1,13 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , cons , cython , etuples , fetchFromGitHub , filelock +, hatch-vcs +, hatchling , jax , jaxlib , logical-unification @@ -22,7 +24,7 @@ buildPythonPackage rec { pname = "aesara"; version = "2.8.12"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,6 +37,8 @@ buildPythonPackage rec { nativeBuildInputs = [ cython + hatch-vcs + hatchling ]; propagatedBuildInputs = [ @@ -57,7 +61,7 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace "--durations=50" "" ''; @@ -75,12 +79,20 @@ buildPythonPackage rec { "tests/tensor/" "tests/sandbox/" "tests/sparse/sandbox/" + # JAX is not available on all platform and often broken + "tests/link/jax/" + ]; + + disabledTests = [ + # Disable all benchmark tests + "test_scan_multiple_output" + "test_logsumexp_benchmark" ]; meta = with lib; { description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; homepage = "https://github.com/aesara-devs/aesara"; - changelog = "https://github.com/aesara-devs/aesara/releases"; + changelog = "https://github.com/aesara-devs/aesara/releases/tag/rel-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ Etjean ]; broken = (stdenv.isLinux && stdenv.isAarch64); From d99eb5e079fba0c29a1c63f8d0e21f02321dddf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 17 Mar 2023 16:14:35 +0000 Subject: [PATCH 16/39] cachix: 1.3.1 -> 1.3.3 It also uses GHC 9.4, since 9.2 is broken on arm/linux (segfaults). --- .../configuration-ghc-9.4.x.nix | 22 +++++++++++++++++++ .../haskell-modules/configuration-nix.nix | 14 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e063268f9680..e0cae8546585 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -194,6 +194,28 @@ in { hls-stylish-haskell-plugin = null; }; + # needed to build servant + http-api-data = super.http-api-data_0_5; + attoparsec-iso8601 = super.attoparsec-iso8601_1_1_0_0; + + # requires newer versions to work with GHC 9.4 + swagger2 = dontCheck super.swagger2; + servant = doJailbreak super.servant; + servant-server = doJailbreak super.servant-server; + servant-auth = doJailbreak super.servant-auth; + servant-auth-swagger = doJailbreak super.servant-auth-swagger; + servant-swagger = doJailbreak super.servant-swagger; + servant-client-core = doJailbreak super.servant-client-core; + servant-client = doJailbreak super.servant-client; + relude = doJailbreak super.relude; + + cborg = appendPatch (pkgs.fetchpatch { + name = "cborg-support-ghc-9.4.patch"; + url = "https://github.com/well-typed/cborg/pull/304.diff"; + sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8="; + relative = "cborg"; + }) super.cborg; + # https://github.com/tweag/ormolu/issues/941 ormolu = doDistribute self.ormolu_0_5_3_0; fourmolu = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0642f04e36a4..d39c86916641 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -879,17 +879,17 @@ self: super: builtins.intersectAttrs super { domaindriven-core = dontCheck super.domaindriven-core; cachix = overrideCabal (drv: { - version = "1.3.1"; + version = "1.3.3"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.3.1"; - sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU="; + rev = "v1.3.3"; + sha256 = "sha256-xhLCsAkz5c+XIqQ4eGY9bSp3zBgCDCaHXZ2HLk8vqmE="; }; buildDepends = [ self.conduit-concurrent-map ]; postUnpack = "sourceRoot=$sourceRoot/cachix"; postPatch = '' - sed -i 's/1.3/1.3.1/' cachix.cabal + sed -i 's/1.3.2/1.3.3/' cachix.cabal ''; }) (super.cachix.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; @@ -897,12 +897,12 @@ self: super: builtins.intersectAttrs super { hnix-store-core = super.hnix-store-core_0_6_1_0; }); cachix-api = overrideCabal (drv: { - version = "1.3.1"; + version = "1.3.3"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.3.1"; - sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU="; + rev = "v1.3.3"; + sha256 = "sha256-xhLCsAkz5c+XIqQ4eGY9bSp3zBgCDCaHXZ2HLk8vqmE="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2eb587a958c..3eef0c9b6281 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19371,7 +19371,7 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - cachix = (haskell.lib.compose.justStaticExecutables haskellPackages.cachix).overrideAttrs(o: { + cachix = (haskell.lib.compose.justStaticExecutables haskell.packages.ghc94.cachix).overrideAttrs(o: { passthru = o.passthru or {} // { tests = o.passthru.tests or {} // { inherit hci; From 75e178d56abae3aeff2349e05a20701771f0667f Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Fri, 17 Mar 2023 00:51:02 +0200 Subject: [PATCH 17/39] yt-dlp: add/propagate secretstorage The `--cookies-from-browser` option requires it to work. --- pkgs/tools/misc/yt-dlp/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 77e5e9c3ed25..181858a828fb 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -9,6 +9,7 @@ , pycryptodomex , websockets , mutagen +, secretstorage , atomicparsleySupport ? true , ffmpegSupport ? true , rtmpSupport ? true @@ -28,7 +29,14 @@ buildPythonPackage rec { sha256 = "sha256-Jl1dqXp2wV19mkCIpnt4rNXc9vjP2CV8UvWB/5lv9RU="; }; - propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; + propagatedBuildInputs = [ + brotli + certifi + mutagen + pycryptodomex + secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` + websockets + ]; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support From 45a7944007aa7a9a63a290683b35b65c21ca3036 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Mar 2023 14:35:29 +0100 Subject: [PATCH 18/39] python310Packages.aeppl: 0.1.2 -> 0.1.3 Changelog: https://github.com/aesara-devs/aeppl/releases/tag/v0.1.3 --- pkgs/development/python-modules/aeppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 7be777cef026..5940bc86a599 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.1.2"; + version = "0.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SxMuYKnV4VBv38CcAI7NCvHutSEB+coHnw5b1RPEpzY="; + hash = "sha256-IVABUFGOLHexiiQrtXWertddYqGfFEqqWG9+ca10p+U="; }; propagatedBuildInputs = [ From 208f77f2afdc97fac41cbf39c426ff81e2344f35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Mar 2023 17:42:52 +0100 Subject: [PATCH 19/39] python310Packages.adblock: add changelog to meta --- pkgs/development/python-modules/adblock/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index e4a0ede52d68..87f42fbd35b6 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -90,6 +90,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for Brave's adblocking library"; homepage = "https://github.com/ArniDagur/python-adblock/"; + changelog = "https://github.com/ArniDagur/python-adblock/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ dotlambda ]; license = with licenses; [ asl20 /* or */ mit ]; }; From d7fd0bc91419dc4b816c873cc66c8fa0dca35569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 18 Mar 2023 14:08:13 +0000 Subject: [PATCH 20/39] haskell: ghc94 packages should point to ghc944 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7eda3c5ddca2..5941959a815b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -475,7 +475,7 @@ in { ghc = bh.compiler.ghc944; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = ghc942; + ghc94 = ghc944; ghc961 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc961; ghc = bh.compiler.ghc961; From 611df4920baebb7e606a63fc9325f1a83ebf36ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 21:36:51 +0000 Subject: [PATCH 21/39] python310Packages.azure-storage-file-share: 12.11.0 -> 12.11.1 --- .../python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 2b2d22ec13c0..ffd578524ebf 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.11.0"; + version = "12.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-RlKL2q3O2gazyK7kCZLjgZZJ1K6vD0H2jpUV8epuhmQ="; + hash = "sha256-lyVbyZUDWyHZIuFPM47kY2LXlNjDXjF6soyhhIdayLA="; }; propagatedBuildInputs = [ From b26601892073c10593e2b6ebf3b65e7e034519e0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Mar 2023 19:04:08 -0400 Subject: [PATCH 22/39] sniffnet: 1.1.1 -> 1.1.2 Diff: https://github.com/gyulyvgc/sniffnet/compare/v1.1.1...v1.1.2 Changelog: https://github.com/gyulyvgc/sniffnet/blob/main/CHANGELOG.md --- pkgs/applications/networking/sniffnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index a5c0c73fac92..57e851331dca 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "gyulyvgc"; repo = "sniffnet"; rev = "v${version}"; - hash = "sha256-o971F3JxZUfTCaLRPYxCsU5UZ2VcvZftVEl/sZAQwpA="; + hash = "sha256-QEMd/vOi0DFCq7AJHhii7rnBAHS89XP3/b2UIewAgLc="; }; - cargoHash = "sha256-Otn5FvZZkzO0MHiopjU2/+redyusituDQb7DT5bdbPE="; + cargoHash = "sha256-VcmiM7prK5l8Ow8K9TGUR2xfx9648IoU6i40hOGAqGQ="; nativeBuildInputs = [ pkg-config ]; From 3756776f1d167451343da095025df0d167721be6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Mar 2023 01:45:52 +0000 Subject: [PATCH 23/39] babashka: 1.2.174 -> 1.3.176 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 04c605f29236..e8ed1a25224f 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -7,11 +7,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.2.174"; + version = "1.3.176"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-5ZvqbOU69ZZNIT5Mh7+Cg5s+gLhOnFMSIO4ZI9t6D/8="; + sha256 = "sha256-Kf7Yb7IrXiX5MGbpxvXSKqx3LEdHFV8+hgq43SAoe00="; }; graalvmDrv = graalvmCEPackages.graalvm19-ce; From 506984c87413b620596ebf7c037fe1628fcc6a51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Mar 2023 05:09:09 +0000 Subject: [PATCH 24/39] kodiPackages.youtube: 7.0.0 -> 7.0.1 --- pkgs/applications/video/kodi/addons/youtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 5957d8a2208d..8a9ccc5554f9 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.0"; + version = "7.0.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-azluf+CATsgjotTqBUAbqB3PvWuHpsS6weakKAbk9F8="; + sha256 = "sha256-Wdju7d2kFX0V1J1TB75qEVq0UWN2xYYFNlD8UTt1New="; }; propagatedBuildInputs = [ From 57accc032c86c800afafcb54192f5c23ecea7cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 19 Mar 2023 16:42:33 +1100 Subject: [PATCH 25/39] icon-library: fix darwin build Add the required framework. --- pkgs/applications/graphics/icon-library/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 4f16a0d6e2d8..d62c6853976e 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, wrapGAppsHook4 , cargo, desktop-file-utils, meson, ninja, pkg-config, rustc -, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita +, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita, darwin }: stdenv.mkDerivation rec { @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook4 ]; - buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ]; + buildInputs = [ + gdk-pixbuf glib gtk4 gtksourceview5 libadwaita + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; From 11ee54c22af3e440523a39eab78e980847010a3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Mar 2023 06:39:27 +0000 Subject: [PATCH 26/39] unciv: 4.5.8 -> 4.5.9 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 193bab3ded81..6aa2fe6312bb 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.5.8"; + version = "4.5.9"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-bVVu7imSej3ApSTpmrD3fzZCgOHyXvJQySd6d+FYILA="; + hash = "sha256-sDrVGQeyhMHurbmdqWBUDepJmdPYajiSrpqvts2view="; }; dontUnpack = true; From 4595e2f2a6d6cf35769ec169a6046853f4c22188 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Mar 2023 07:51:06 +0000 Subject: [PATCH 27/39] trivy: 0.38.2 -> 0.38.3 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 87c31cf736bb..ac97dac146d9 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.38.2"; + version = "0.38.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mQXXS3Hg7bnspdznvThRKaY7aoCB8UsBP6J1tVZKTj4="; + sha256 = "sha256-CSqueR++2vL4K8aexpbzawIhN0dJoSvS6Nzrn97hJe4="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorHash = "sha256-PTPhfgI7wheK1brr/YvDh1T01vCu7YoJX8UB+SGV3Zg="; + vendorHash = "sha256-ZB3QVMeLtR9bNUnGVqcADf3RHT99b1jiVvBuGYjtJds="; excludedPackages = "misc"; From fe21fe6bf27704db98d3315fd50bd2629976724d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Mar 2023 08:03:43 +0000 Subject: [PATCH 28/39] croc: 9.6.3 -> 9.6.4 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 1ff3a511f692..03faa44d1a27 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.3"; + version = "9.6.4"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nAziLnuLkkPl1/RskKEehvQBMG4sYTEv+uPOQemum9w="; + sha256 = "sha256-ksTKB/UInMHxZT7/B13jVK+w78gUF4KINv2HU1qRPgo="; }; - vendorSha256 = "sha256-yZ7S/6I5xdrfmyPkZsUUavXum8RqEVrlgrkJMQZc6IQ="; + vendorHash = "sha256-d6fsy0ROKX91YkFW2aC2A+pO7dmcmMkoz076z1XcZtE="; subPackages = [ "." ]; From 48b0aa71646b3600f37dfa258c9fe16d7bb6747f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 9 Mar 2023 20:54:00 +0100 Subject: [PATCH 29/39] nixos/sssd: create symlinks in /etc to fix sssctl Without this, sssctl fails to read its configuration. Update the NixOS test to ensure sssctl doesn't regress. --- nixos/modules/services/misc/sssd.nix | 5 +++++ nixos/tests/sssd.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index edd5750a4a47..7c7a3b464a83 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -77,6 +77,10 @@ in { }; config = mkMerge [ (mkIf cfg.enable { + # For `sssctl` to work. + environment.etc."sssd/sssd.conf".source = settingsFile; + environment.etc."sssd/conf.d".source = "${dataDir}/conf.d"; + systemd.services.sssd = { description = "System Security Services Daemon"; wantedBy = [ "multi-user.target" ]; @@ -101,6 +105,7 @@ in { EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; }; preStart = '' + mkdir -p "${dataDir}/conf.d" [ -f ${settingsFile} ] && rm -f ${settingsFile} old_umask=$(umask) umask 0177 diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix index 25527cb59a59..c8d356e074ad 100644 --- a/nixos/tests/sssd.nix +++ b/nixos/tests/sssd.nix @@ -13,5 +13,6 @@ import ./make-test-python.nix ({ pkgs, ... }: start_all() machine.wait_for_unit("multi-user.target") machine.wait_for_unit("sssd.service") + machine.succeed("sssctl config-check") ''; }) From 6c70dbc516b14a9979e1e57d9d0dad0ea8743a27 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 19 Mar 2023 11:01:12 +0200 Subject: [PATCH 30/39] loxodo: migrate to wxPython_4_2 --- pkgs/applications/misc/loxodo/default.nix | 4 +++- pkgs/applications/misc/loxodo/wxpython.patch | 25 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/loxodo/wxpython.patch diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index bcfd581edcf9..53ea7730cb12 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -11,7 +11,9 @@ python3.pkgs.buildPythonApplication { sha256 = "1cips4pvrqga8q1ibs23vjrf8dwan860x8jvjmc52h6qvvvv60yl"; }; - propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_0 ]; + patches = [ ./wxpython.patch ]; + + propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_2 ]; postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo diff --git a/pkgs/applications/misc/loxodo/wxpython.patch b/pkgs/applications/misc/loxodo/wxpython.patch new file mode 100644 index 000000000000..e22d3b5ad708 --- /dev/null +++ b/pkgs/applications/misc/loxodo/wxpython.patch @@ -0,0 +1,25 @@ +diff --git a/loxodo.py b/loxodo.py +index 68ad4c8..e96bc1a 100755 +--- a/loxodo.py ++++ b/loxodo.py +@@ -41,7 +41,7 @@ if len(sys.argv) > 1: + # In all other cases, use the "wx" frontend. + try: + import wx +- assert(wx.__version__.startswith('4.0.')) ++ assert(wx.__version__.startswith('4.')) + except AssertionError as e: + print('Found incompatible wxPython, the wxWidgets Python bindings: %s' % wx.__version__, file=sys.stderr) + print('Falling back to cmdline frontend.', file=sys.stderr) +diff --git a/src/frontends/wx/loxodo.py b/src/frontends/wx/loxodo.py +index bc3f509..e02c4bf 100644 +--- a/src/frontends/wx/loxodo.py ++++ b/src/frontends/wx/loxodo.py +@@ -25,6 +25,7 @@ from .loadframe import LoadFrame + + + def main(): ++ wx.SizerFlags.DisableConsistencyChecks() + app = wx.App(False) + setup_wx_locale() + mainframe = LoadFrame(None, -1, "") From f00e9c1737a523308c7b2f9a0afb10fee85e5a15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Mar 2023 10:07:50 +0100 Subject: [PATCH 31/39] python310Packages.lightwave2: 0.8.19 -> 0.8.21 --- pkgs/development/python-modules/lightwave2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index 964806911d94..07f23d4312ed 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.19"; + version = "0.8.21"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-S4nHJMaSX8qCYoUnMqb6AbObTR96Wg098FJAM+dQJTc="; + hash = "sha256-Zgsgt78ll/5NVSca4lnxXYkiw5FE2WgcO10o/IZaHgQ="; }; propagatedBuildInputs = [ From 89a0d57186bf54dc693c6a9fa8f2d7e6fc9394ed Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 18 Mar 2023 12:09:38 +0100 Subject: [PATCH 32/39] vscode-extensions.chris-hayes.chatgpt-reborn: init at 3.10.2 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cb2c36d59e2c..dfb3ad2b3ad6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -694,6 +694,23 @@ let }; }; + chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { + meta = { + changelog = "https://marketplace.visualstudio.com/items/chris-hayes.chatgpt-reborn/changelog"; + description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn"; + homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.drupol ]; + }; + mktplcRef = { + name = "chatgpt-reborn"; + publisher = "chris-hayes"; + version = "3.10.2"; + sha256 = "sha256-rVfHJxJYgwaiWuckHGcTMIoaFSs3RH4vIrp1I/48pCI="; + }; + }; + cweijan.vscode-database-client2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-database-client2"; From be2eb1eca736079b19ec9faa39f374574d8050c2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Mar 2023 15:19:28 +0000 Subject: [PATCH 33/39] libslirp: add debug info --- pkgs/development/libraries/libslirp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 06fb0d41b8bc..9ce3241e8fbb 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY="; }; + separateDebugInfo = true; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; From 5a019593dd7ccee991dee49c6204629e36bc92f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Mar 2023 11:04:32 +0100 Subject: [PATCH 34/39] python311Packages.faraday-agent-parameters-types: disable failing test --- .../faraday-agent-parameters-types/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 77533844171c..299e34d6db14 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - sha256 = "sha256-jQgE/eR8Gd9nMGijH9unhHCrLUn7DbWFkTauoz3O/sM="; + hash = "sha256-jQgE/eR8Gd9nMGijH9unhHCrLUn7DbWFkTauoz3O/sM="; }; propagatedBuildInputs = [ @@ -39,6 +39,11 @@ buildPythonPackage rec { "faraday_agent_parameters_types.utils" ]; + disabledTests = [ + # assert 'Version requested not valid' in "Invalid version: 'hola'" + "test_incorrect_version_requested" + ]; + meta = with lib; { description = "Collection of Faraday agent parameters types"; homepage = "https://github.com/infobyte/faraday_agent_parameters_types"; From 1283da924bcb995d5a2dfd853f3527fa6f82ac2e Mon Sep 17 00:00:00 2001 From: Zaechus Date: Sat, 18 Mar 2023 20:05:06 -0600 Subject: [PATCH 35/39] iir1: fix package name --- pkgs/applications/emulators/dosbox-staging/default.nix | 4 ++-- pkgs/development/libraries/{irr1 => iir1}/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/{irr1 => iir1}/default.nix (97%) diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index 233dffca405e..62331bd62191 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -9,7 +9,7 @@ , fluidsynth , glib , gtest -, irr1 +, iir1 , libGL , libGLU , libjack2 @@ -52,7 +52,7 @@ stdenv.mkDerivation (self: { alsa-lib fluidsynth glib - irr1 + iir1 libGL libGLU libjack2 diff --git a/pkgs/development/libraries/irr1/default.nix b/pkgs/development/libraries/iir1/default.nix similarity index 97% rename from pkgs/development/libraries/irr1/default.nix rename to pkgs/development/libraries/iir1/default.nix index 8740919ce3ae..d277e14f567a 100644 --- a/pkgs/development/libraries/irr1/default.nix +++ b/pkgs/development/libraries/iir1/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - pname = "irr1"; + pname = "iir1"; version = "1.9.4"; src = fetchFromGitHub { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a19cd349b419..892bd933dfb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20774,7 +20774,7 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; - irr1 = callPackage ../development/libraries/irr1 { }; + iir1 = callPackage ../development/libraries/iir1 { }; irrlicht = if !stdenv.isDarwin then callPackage ../development/libraries/irrlicht { } From bb4877725877a891343efcc4f53c049c31b6363f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Mar 2023 11:26:51 +0100 Subject: [PATCH 36/39] sniffnet: update changelog entry --- pkgs/applications/networking/sniffnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 57e851331dca..be02c13d6d6c 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "gyulyvgc"; repo = "sniffnet"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-QEMd/vOi0DFCq7AJHhii7rnBAHS89XP3/b2UIewAgLc="; }; @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cross-platform application to monitor your network traffic with ease"; homepage = "https://github.com/gyulyvgc/sniffnet"; - changelog = "https://github.com/gyulyvgc/sniffnet/blob/main/CHANGELOG.md"; + changelog = "https://github.com/gyulyvgc/sniffnet/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; From 73d2bec90f3344963b4d9677e95d8d5e322966e0 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 19 Mar 2023 13:16:49 +0200 Subject: [PATCH 37/39] tailscale: fix invalid version number --- pkgs/servers/tailscale/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index d9f649c4045d..e1c7399a49a4 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; - ldflags = [ "-X tailscale.com/version.Long=${version}" "-X tailscale.com/version.Short=${version}" ]; + ldflags = [ "-X tailscale.com/version.longStamp=${version}" "-X tailscale.com/version.shortStamp=${version}" ]; doCheck = false; From 9625629f5691f7707f38bf893c3490d43669a7c7 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 19 Mar 2023 13:18:16 +0200 Subject: [PATCH 38/39] tailscale: reduce closure size via ldflags --- pkgs/servers/tailscale/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e1c7399a49a4..60815d8fab9b 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -18,7 +18,12 @@ buildGoModule rec { subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; - ldflags = [ "-X tailscale.com/version.longStamp=${version}" "-X tailscale.com/version.shortStamp=${version}" ]; + ldflags = [ + "-w" + "-s" + "-X tailscale.com/version.longStamp=${version}" + "-X tailscale.com/version.shortStamp=${version}" + ]; doCheck = false; From e0766668c2a9ebe4e2b1d7e58f1932b6c46870ad Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 19 Mar 2023 13:59:55 +0200 Subject: [PATCH 39/39] printrun: 2.0.0rc5 -> 2.0.0 --- pkgs/applications/misc/printrun/default.nix | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 546c0544cffa..e436d0514a61 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -2,29 +2,33 @@ python3Packages.buildPythonApplication rec { pname = "printrun"; - version = "2.0.0rc5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "kliment"; repo = "Printrun"; - rev = "${pname}-${version}"; - sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; + rev = "printrun-${version}"; + hash = "sha256-ijJc0CVPiYW5VjTqhY1kO+Fy3dfuPoMn7KRhvcsdAZw="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "pyglet >= 1.1, < 2.0" "pyglet" \ + --replace "cairosvg >= 1.0.9, < 2.6.0" "cairosvg" + sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py + ''; + nativeBuildInputs = [ glib wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ - appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial + appdirs cython dbus-python numpy six wxPython_4_2 psutil pyglet pyopengl pyserial cffi cairosvg lxml ]; + # pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None" doCheck = false; setupPyBuildFlags = ["-i"]; - postPatch = '' - sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py - ''; - postInstall = '' for f in $out/share/applications/*.desktop; do sed -i -e "s|/usr/|$out/|g" "$f" @@ -40,7 +44,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; homepage = "https://github.com/kliment/Printrun"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; }