From b0fce27ce22c1c2b5c1198feee92bec708fa3a1d Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Wed, 28 Apr 2021 13:34:16 +0200 Subject: [PATCH 01/28] docs: expand explanation of patchShebangs hook - clarify motivation and mechanism - explain usage - add interlinks - add links to sources to enable research based on https://discourse.nixos.org/t/what-is-the-patchshebangs-command-in-nix-build-expressions/12656 --- doc/stdenv/stdenv.chapter.md | 42 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 40f295b178bb..a73b70a34ac9 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -77,7 +77,7 @@ where the builder can do anything it wants, but typically starts with source $stdenv/setup ``` -to let `stdenv` set up the environment (e.g., process the `buildInputs`). If you want, you can still use `stdenv`’s generic builder: +to let `stdenv` set up the environment (e.g. by resetting `PATH` and populating it from `buildInputs`). If you want, you can still use `stdenv`’s generic builder: ```bash source $stdenv/setup @@ -644,12 +644,12 @@ Hook executed at the end of the install phase. ### The fixup phase {#ssec-fixup-phase} -The fixup phase performs some (Nix-specific) post-processing actions on the files installed under `$out` by the install phase. The default `fixupPhase` does the following: +The fixup phase performs (Nix-specific) post-processing actions on the files installed under `$out` by the install phase. The default `fixupPhase` does the following: - It moves the `man/`, `doc/` and `info/` subdirectories of `$out` to `share/`. - It strips libraries and executables of debug information. - On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` in order to prevent unnecessary runtime dependencies. -- It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`. +- It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`. See [](#patch-shebangs.sh) for details. #### Variables controlling the fixup phase {#variables-controlling-the-fixup-phase} @@ -695,7 +695,7 @@ If set, the `patchelf` command is not used to remove unnecessary `RPATH` entries ##### `dontPatchShebangs` {#var-stdenv-dontPatchShebangs} -If set, scripts starting with `#!` do not have their interpreter paths rewritten to paths in the Nix store. +If set, scripts starting with `#!` do not have their interpreter paths rewritten to paths in the Nix store. See [](#patch-shebangs.sh) on how patching shebangs works. ##### `dontPruneLibtoolFiles` {#var-stdenv-dontPruneLibtoolFiles} @@ -929,7 +929,7 @@ addEnvHooks "$hostOffset" myBashFunction The *existence* of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there’s little benefit from mandating it be stable for any period of time. -First, let’s cover some setup hooks that are part of Nixpkgs default stdenv. This means that they are run for every package built using `stdenv.mkDerivation`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. +First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation` or when using a custom builder that has `source $stdenv/setup`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa. ### `move-docs.sh` {#move-docs.sh} @@ -945,7 +945,35 @@ This runs the strip command on installed binaries and libraries. This removes un ### `patch-shebangs.sh` {#patch-shebangs.sh} -This setup hook patches installed scripts to use the full path to the shebang interpreter. A shebang interpreter is the first commented line of a script telling the operating system which program will run the script (e.g `#!/bin/bash`). In Nix, we want an exact path to that interpreter to be used. This often replaces `/bin/sh` with a path in the Nix store. +This setup hook patches installed scripts to use Nix store paths to their shebang interpreter as found in the build environment's `PATH`. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system what interpreter to use to execute the script's contents. + +::: note +The [generic builder](https://github.com/NixOS/nixpkgs/blob/6ba632c2a442082f353bf2d7028fda11a888d099/pkgs/stdenv/generic/builder.sh) populates `PATH` from inputs of the derivation. +::: + +`#!/bin/sh` will be rewritten to `#!/nix/store/-some-bash/bin/sh`. +`#!/usr/bin/env` gets special treatment: `#!/usr/bin/env python` is rewritten to `/nix/store//bin/python`. Interpreters that are already in the store are left untouched. + +::: note +A script file must be marked as executable, otherwise it will not be +considered. [Trivial Builders](#chap-trivial-builders) do this automatically where appropriate. +::: + +This mechanism ensures that the interpreter for a given script is always found and is exactly the one specified by the build. + +It can be disabled by setting [`dontPatchShebangs`](#var-stdenv-dontPatchShebangs): + +```nix +stdenv.mkDerivation { + # ... + dontPatchShebangs = true; + # ... +} +``` + +The file [`patch-shebangs.sh`](https://github.com/NixOS/nixpkgs/blob/ca156a66b75999153d746f57a11a19222fd5cdfb/pkgs/build-support/setup-hooks/patch-shebangs.sh) defines the [`patchShebangs`](https://github.com/NixOS/nixpkgs/blob/ca156a66b75999153d746f57a11a19222fd5cdfb/pkgs/build-support/setup-hooks/patch-shebangs.sh#L24) function. It is used to implement [`patchShebangsAuto`](https://github.com/NixOS/nixpkgs/blob/ca156a66b75999153d746f57a11a19222fd5cdfb/pkgs/build-support/setup-hooks/patch-shebangs.sh#L107), the [setup hook](#ssec-setup-hooks) that is registered to run during the [fixup phase](#ssec-fixup-phase) by default. + +If you need to run `patchShebangs` at build time, it must be called explicitly within [one of the build phases](#sec-stdenv-phases). ### `audit-tmpdir.sh` {#audit-tmpdir.sh} @@ -1262,7 +1290,7 @@ If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`. [^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation. [^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`. -[^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. +[^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like [setup hooks](#ssec-setup-hooks) also are run as if it were a propagated dependency. [^footnote-stdenv-find-inputs-location]: The `findInputs` function, currently residing in `pkgs/stdenv/generic/setup.sh`, implements the propagation logic. [^footnote-stdenv-sys-lib-search-path]: It clears the `sys_lib_*search_path` variables in the Libtool script to prevent Libtool from using libraries in `/usr/lib` and such. [^footnote-stdenv-build-time-guessing-impurity]: Eventually these will be passed building natively as well, to improve determinism: build-time guessing, as is done today, is a risk of impurity. From e3883d2ce0e23f07d0ffe90da37d08e65f1e534e Mon Sep 17 00:00:00 2001 From: fricklerhandwerk <6599296+fricklerhandwerk@users.noreply.github.com> Date: Fri, 13 Aug 2021 17:14:21 +0200 Subject: [PATCH 02/28] docs: clarify note on existing store paths --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a73b70a34ac9..23503235a105 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -952,7 +952,7 @@ The [generic builder](https://github.com/NixOS/nixpkgs/blob/6ba632c2a442082f353b ::: `#!/bin/sh` will be rewritten to `#!/nix/store/-some-bash/bin/sh`. -`#!/usr/bin/env` gets special treatment: `#!/usr/bin/env python` is rewritten to `/nix/store//bin/python`. Interpreters that are already in the store are left untouched. +`#!/usr/bin/env` gets special treatment: `#!/usr/bin/env python` is rewritten to `/nix/store//bin/python`. Interpreter paths that point to a valid Nix store location are not changed. ::: note A script file must be marked as executable, otherwise it will not be From b4d9d682c8cdfdfc8919f3140578971dcb64bd25 Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Mon, 21 Mar 2022 11:34:55 +0100 Subject: [PATCH 03/28] docs: clean up and update links to source code --- doc/stdenv/stdenv.chapter.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 23503235a105..3ac58cc7c043 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -948,9 +948,11 @@ This runs the strip command on installed binaries and libraries. This removes un This setup hook patches installed scripts to use Nix store paths to their shebang interpreter as found in the build environment's `PATH`. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system what interpreter to use to execute the script's contents. ::: note -The [generic builder](https://github.com/NixOS/nixpkgs/blob/6ba632c2a442082f353bf2d7028fda11a888d099/pkgs/stdenv/generic/builder.sh) populates `PATH` from inputs of the derivation. +The [generic builder][generic-builder] populates `PATH` from inputs of the derivation. ::: +[generic-builder]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/stdenv/generic/builder.sh + `#!/bin/sh` will be rewritten to `#!/nix/store/-some-bash/bin/sh`. `#!/usr/bin/env` gets special treatment: `#!/usr/bin/env python` is rewritten to `/nix/store//bin/python`. Interpreter paths that point to a valid Nix store location are not changed. @@ -971,10 +973,14 @@ stdenv.mkDerivation { } ``` -The file [`patch-shebangs.sh`](https://github.com/NixOS/nixpkgs/blob/ca156a66b75999153d746f57a11a19222fd5cdfb/pkgs/build-support/setup-hooks/patch-shebangs.sh) defines the [`patchShebangs`](https://github.com/NixOS/nixpkgs/blob/ca156a66b75999153d746f57a11a19222fd5cdfb/pkgs/build-support/setup-hooks/patch-shebangs.sh#L24) function. It is used to implement [`patchShebangsAuto`](https://github.com/NixOS/nixpkgs/blob/ca156a66b75999153d746f57a11a19222fd5cdfb/pkgs/build-support/setup-hooks/patch-shebangs.sh#L107), the [setup hook](#ssec-setup-hooks) that is registered to run during the [fixup phase](#ssec-fixup-phase) by default. +The file [`patch-shebangs.sh`][patch-shebangs.sh] defines the [`patchShebangs`][patchShebangs] function. It is used to implement [`patchShebangsAuto`][patchShebangsAuto], the [setup hook](#ssec-setup-hooks) that is registered to run during the [fixup phase](#ssec-fixup-phase) by default. If you need to run `patchShebangs` at build time, it must be called explicitly within [one of the build phases](#sec-stdenv-phases). +[patch-shebangs.sh]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh +[patchShebangs]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L24-L105 +[patchShebangsAuto]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/build-support/setup-hooks/patch-shebangs.sh#L107-L119 + ### `audit-tmpdir.sh` {#audit-tmpdir.sh} This verifies that no references are left from the install binaries to the directory used to build those binaries. This ensures that the binaries do not need things outside the Nix store. This is currently supported in Linux only. From 9a2ed653704baabceb6c5a74603d1814583426be Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 20 Apr 2022 21:21:31 +0200 Subject: [PATCH 04/28] fix wording, remove too much specificity Co-authored-by: Robert Hensing --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 3ac58cc7c043..a713bfab03b8 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -945,7 +945,7 @@ This runs the strip command on installed binaries and libraries. This removes un ### `patch-shebangs.sh` {#patch-shebangs.sh} -This setup hook patches installed scripts to use Nix store paths to their shebang interpreter as found in the build environment's `PATH`. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system what interpreter to use to execute the script's contents. +This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system what interpreter to use to execute the script's contents. ::: note The [generic builder][generic-builder] populates `PATH` from inputs of the derivation. From 311d322febdc3e931b0a22b018121ad055dca0ce Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 20 Apr 2022 21:49:58 +0200 Subject: [PATCH 05/28] docs: sync `patchShebangs` comments with manual this is not an actual sync, but rather the manual taking the leading role. right now it does not make sense to actually change `patch-shebangs.sh` as that would cause a rebuild of the entire universe. we should figure out how to keep them aligned with minimal effort both in terms of maintenance as well as navigation for readers. --- doc/stdenv/stdenv.chapter.md | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a713bfab03b8..3539dd2b1846 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -945,7 +945,7 @@ This runs the strip command on installed binaries and libraries. This removes un ### `patch-shebangs.sh` {#patch-shebangs.sh} -This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system what interpreter to use to execute the script's contents. +This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system which interpreter to use to execute the script's contents. ::: note The [generic builder][generic-builder] populates `PATH` from inputs of the derivation. @@ -953,8 +953,37 @@ The [generic builder][generic-builder] populates `PATH` from inputs of the deriv [generic-builder]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/stdenv/generic/builder.sh +#### Invocation + +Multiple paths can be specified. + +``` +patchShebangs [--build | --host] PATH... +``` + +#### Flags + +`--build` +: Look up commands available at build time + +`--host` +: Look up commands available at run time + +#### Examples + +```sh +patchShebangs --host /nix/store/-hello-1.0/bin +``` + +```sh +patchShebangs --build configure +``` + `#!/bin/sh` will be rewritten to `#!/nix/store/-some-bash/bin/sh`. -`#!/usr/bin/env` gets special treatment: `#!/usr/bin/env python` is rewritten to `/nix/store//bin/python`. Interpreter paths that point to a valid Nix store location are not changed. + +`#!/usr/bin/env` gets special treatment: `#!/usr/bin/env python` is rewritten to `/nix/store//bin/python`. + +Interpreter paths that point to a valid Nix store location are not changed. ::: note A script file must be marked as executable, otherwise it will not be From f70073d72d44717d18200595873a09f7f7ccfb98 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 8 Jun 2022 11:43:32 +0200 Subject: [PATCH 06/28] remove specifics on where build inputs come from in `PATH` Co-authored-by: Robert Hensing --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 3539dd2b1846..e860c39a6e0a 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -77,7 +77,7 @@ where the builder can do anything it wants, but typically starts with source $stdenv/setup ``` -to let `stdenv` set up the environment (e.g. by resetting `PATH` and populating it from `buildInputs`). If you want, you can still use `stdenv`’s generic builder: +to let `stdenv` set up the environment (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can still use `stdenv`’s generic builder: ```bash source $stdenv/setup From e132e6be3c7ea5d05dd8e817b6165c3b11eb7e7b Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Thu, 9 Jun 2022 13:43:21 +0200 Subject: [PATCH 07/28] fix heading level --- doc/stdenv/stdenv.chapter.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index e860c39a6e0a..dbe0a589e4a4 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -961,7 +961,7 @@ Multiple paths can be specified. patchShebangs [--build | --host] PATH... ``` -#### Flags +##### Flags `--build` : Look up commands available at build time @@ -969,7 +969,7 @@ patchShebangs [--build | --host] PATH... `--host` : Look up commands available at run time -#### Examples +##### Examples ```sh patchShebangs --host /nix/store/-hello-1.0/bin From c3ea8c4dd909d081ff6aae007f1872b367dacc14 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Fri, 10 Jun 2022 11:43:11 +0200 Subject: [PATCH 08/28] do not mention trivial builders --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index dbe0a589e4a4..7ca9ee3ff76d 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -987,7 +987,7 @@ Interpreter paths that point to a valid Nix store location are not changed. ::: note A script file must be marked as executable, otherwise it will not be -considered. [Trivial Builders](#chap-trivial-builders) do this automatically where appropriate. +considered. ::: This mechanism ensures that the interpreter for a given script is always found and is exactly the one specified by the build. From d47874da481548b0355052b9ce2ac5400cafd367 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Sat, 18 Jun 2022 18:18:13 -0700 Subject: [PATCH 09/28] exodus: 22.2.25 -> 22.6.17 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index d13278b7deec..c0d470b39720 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.2.25"; + version = "22.6.17"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-YbApI9rIk1653Hp3hsXJrxBMpaGn6Wv3WhZiQWAfPQM="; + sha256 = "1gllmrmc1gylw54yrgy1ggpn3kvkyxf7ydjvd5n5kvd8d9xh78ng"; }; sourceRoot = "."; From ef9afda3891d3f9cdf862a876edc1340b427ce94 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Tue, 5 Jul 2022 14:37:35 +0200 Subject: [PATCH 10/28] codeowners: add fricklerhandwerk to documentation --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 557542772cf7..d7b11dd6093e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -48,6 +48,7 @@ /pkgs/build-support/writers @lassulus @Profpatsch # Nixpkgs documentation +/doc @fricklerhandwerk /maintainers/scripts/db-to-md.sh @jtojnar @ryantm /maintainers/scripts/doc @jtojnar @ryantm /doc/build-aux/pandoc-filters @jtojnar From a3eca010b04d93a531002154c005a638af8c65ed Mon Sep 17 00:00:00 2001 From: schnusch Date: Wed, 6 Jul 2022 20:39:04 +0200 Subject: [PATCH 11/28] remote-touchpad: 1.2.0 -> 1.2.1 --- pkgs/tools/inputmethods/remote-touchpad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 4df476eb5cd8..c07cff71def6 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GjXcQyv55yJSAFeNNB+YeCVWav7vMGo/d1FCPoujYjA="; + sha256 = "sha256-A7/NLopJkIXwS5rAsf7J6tDL10kNOKCoyAj0tCTW6jQ="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-WG8OjtfVemtmHkrMg4O0oofsjtFKmIvcmCn9AYAGIrc="; + vendorSha256 = "sha256-UbDbUjC8R6LcYUPVWZID5dtu5tCV4NB268K6qTXYmZY="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; From e7575622c0846dcba2fb77892aac6af3119c35e6 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Fri, 8 Jul 2022 17:00:10 +0800 Subject: [PATCH 12/28] wkhtmltopdf: unbreak on darwin Unbreak wkhtmltopdf on darwin by changing dylib paths. Fixes issue #11861. --- pkgs/tools/graphics/wkhtmltopdf/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 093ab9ad5c43..7f1e40a695e4 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,8 +1,8 @@ -{ mkDerivation, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns -, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, lib, fetchFromGitHub, qtwebkit, qtsvg, qtxmlpatterns +, fontconfig, freetype, libpng, zlib, libjpeg, wrapQtAppsHook , openssl, libX11, libXext, libXrender }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "0.12.6"; pname = "wkhtmltopdf"; @@ -13,6 +13,10 @@ mkDerivation rec { sha256 = "0m2zy986kzcpg0g3bvvm815ap9n5ann5f6bdy7pfj6jv482bm5mg"; }; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + buildInputs = [ fontconfig freetype libpng zlib libjpeg openssl libX11 libXext libXrender @@ -25,6 +29,12 @@ mkDerivation rec { done ''; + # rewrite library path + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libwkhtmltox.0.dylib $out/lib/libwkhtmltox.0.dylib $out/bin/wkhtmltopdf + install_name_tool -change libwkhtmltox.0.dylib $out/lib/libwkhtmltox.0.dylib $out/bin/wkhtmltoimage + ''; + configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; enableParallelBuilding = true; @@ -42,6 +52,6 @@ mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ jb55 ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } From 3593e17c89e761e7570de44a7aec03038ddca476 Mon Sep 17 00:00:00 2001 From: Elliott Slaughter Date: Fri, 8 Jul 2022 16:22:45 -0700 Subject: [PATCH 13/28] terra: 1.0.0-beta5 -> 1.0.4 --- pkgs/development/compilers/terra/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 56f5cea5f919..2d853795cf9c 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -2,14 +2,14 @@ , symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false }: let - luajitRev = "9143e86498436892cb4316550be4d45b68a61224"; + luajitRev = "6053b04815ecbc8eec1e361ceb64e68fb8fac1b3"; luajitBase = "LuaJIT-${luajitRev}"; luajitArchive = "${luajitBase}.tar.gz"; luajitSrc = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; rev = luajitRev; - sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b"; + sha256 = "1caxm1js877mky8hci1km3ycz2hbwpm6xbyjha72gfc7lr6pc429"; }; llvmMerged = symlinkJoin { @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "terra"; - version = "1.0.0-beta5"; + version = "1.0.4"; src = fetchFromGitHub { owner = "terralang"; repo = "terra"; - rev = "bcc5a81649cb91aaaff33790b39c87feb5f7a4c2"; - sha256 = "0jb147vbvix3zvrq6ln321jdxjgr6z68pdrirjp4zqmx78yqlcx3"; + rev = "release-${version}"; + sha256 = "07715qsc316h0mmsjifr1ja5fbp216ji70hpq665r0v5ikiqjfsv"; }; nativeBuildInputs = [ cmake ]; From bc0bf248d365e37c6ed93f7e88975bc48c13fd73 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 9 Jul 2022 23:58:27 +0300 Subject: [PATCH 14/28] albert: 0.17.2 -> 0.17.3 --- pkgs/applications/misc/albert/default.nix | 82 ++++++++++++++++------- 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index c862872a7938..1239d22f1f3e 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,45 +1,75 @@ -{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, - qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3, - qtcharts }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, muparser +, python3 +, qtbase +, qtcharts +, qtdeclarative +, qtgraphicaleffects +, qtsvg +, qtx11extras +, wrapQtAppsHook +, nix-update-script +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "albert"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { - owner = "albertlauncher"; - repo = "albert"; - rev = "v${version}"; - sha256 = "0lpp8rqx5b6rwdpcdldfdlw5327harr378wnfbc6rp3ajmlb4p7w"; + owner = "albertlauncher"; + repo = "albert"; + rev = "v${version}"; + sha256 = "sha256-UIG6yLkIcdf5IszhNPwkBcSfZe4/CyI5shK/QPOmpPE="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; - buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ]; - - # We don't have virtualbox sdk so disable plugin - cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ]; + buildInputs = [ + muparser + python3 + qtbase + qtcharts + qtdeclarative + qtgraphicaleffects + qtsvg + qtx11extras + ]; postPatch = '' - sed -i "/QStringList dirs = {/a \"$out/libs\"," \ - src/app/main.cpp + find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; + + sed -i src/app/main.cpp \ + -e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath()," ''; - preBuild = '' - mkdir -p "$out/" - ln -s "$PWD/lib" "$out/lib" + postFixup = '' + for i in $out/{bin/.albert-wrapped,lib/albert/plugins/*.so}; do + patchelf $i --add-rpath $out/lib/albert + done ''; - postBuild = '' - rm "$out/lib" - ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; meta = with lib; { - homepage = "https://albertlauncher.github.io/"; - description = "Desktop agnostic launcher"; - license = licenses.gpl3Plus; + description = "A fast and flexible keyboard launcher"; + longDescription = '' + Albert is a desktop agnostic launcher. Its goals are usability and beauty, + performance and extensibility. It is written in C++ and based on the Qt + framework. + ''; + homepage = "https://albertlauncher.github.io"; + changelog = "https://github.com/albertlauncher/albert/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes synthetica ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 6b0546c40b215b8b0b5363a8cfbeb8bccfa62414 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Tue, 12 Jul 2022 14:27:23 +0200 Subject: [PATCH 15/28] qownnotes: 22.6.1 -> 22.7.1 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7df8a607f4df..7c6159bf741b 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.6.1"; + version = "22.7.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "c5b2075d42298d28f901ad2df8eb65f5a61aa59727fae9eeb1f92dac1b63d8ba"; + sha256 = "9431a3315a533799525217e5ba03757b3c39e8259bf307c81330304f043b8b77"; }; nativeBuildInputs = [ qmake qttools ]; From 5f2c50c7df5e5c8eef6c323e719aa9b4f94b2c63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Jul 2022 21:11:54 +0000 Subject: [PATCH 16/28] python310Packages.google-cloud-iot: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 77dd863f2b52..33da23b93ff4 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y71v505bwXEV1u28WFAHs12Qx0tKY7BDjFCc+oBgZcw="; + sha256 = "sha256-XfF4+F4+LmRyxn8Zs3gI2RegFb3Y+uoAinEqcLeWCGM="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From 5646dd4747382efa56a3d84328da1eb956e23a06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Jul 2022 21:17:12 +0000 Subject: [PATCH 17/28] python310Packages.google-cloud-logging: 3.1.2 -> 3.2.0 --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 8dd27b463d98..658c145bddad 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.1.2"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PtAKi9IHb+56HcBTiA/LPJcxhIB+JA+MPAkp3XSOr38="; + hash = "sha256-DHFg4s1saEVhTk+IDqrmLaIM4nwjmBj72osp16YnruY="; }; propagatedBuildInputs = [ From 5f87d1e5bdf6be1986e822a57e89a72d77f1fac3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Jul 2022 21:23:31 +0000 Subject: [PATCH 18/28] python310Packages.google-cloud-runtimeconfig: 0.33.1 -> 0.33.2 --- .../python-modules/google-cloud-runtimeconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 0ff3e076f2e9..3b435ac5adac 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.33.1"; + version = "0.33.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SKinB6fiBh+oe+lb2IGMD6248DDOrG7g3kiFpMGX4BU="; + sha256 = "sha256-MPmyvm2FSrUzb1y5i4xl5Cqea6sxixLoZ7V1hxNi7hw="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; From 479478822b57a4c892e56c3e81bc8abc719a5ba1 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Wed, 13 Jul 2022 00:33:08 -0300 Subject: [PATCH 19/28] velero: added v prefix to version to fix client/server version validation --- pkgs/applications/networking/cluster/velero/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 5685b0b65072..f5672820601d 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" From f88533ec37fca4cce90fe6ddf50f5b817b089ce8 Mon Sep 17 00:00:00 2001 From: Tae Selene Sandoval Murgan Date: Wed, 13 Jul 2022 08:56:58 +0200 Subject: [PATCH 20/28] neovim-remote: disable tests on Darwin The only enabled test started to fail with write errors. Setting HOME=$TMPDIR works, but then it fails the same way than the disabled ones --- pkgs/applications/editors/neovim/neovim-remote.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index ef3b1590c109..b18811dd0980 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -33,6 +33,8 @@ with python3.pkgs; buildPythonApplication rec { "test_escape_double_quotes_in_filenames" ]; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "A tool that helps controlling nvim processes from a terminal"; homepage = "https://github.com/mhinz/neovim-remote/"; From f60f16550174e9772b5285795face7397dca1139 Mon Sep 17 00:00:00 2001 From: illustris Date: Sun, 8 May 2022 22:54:20 +0530 Subject: [PATCH 21/28] nixos/proxmox-image: use qemu 6.2 for building VMA --- .../modules/virtualisation/proxmox-image.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index c537d5aed447..e07d1d1eb3fc 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -127,16 +127,26 @@ with lib; name = "proxmox-${cfg.filenameSuffix}"; postVM = let # Build qemu with PVE's patch that adds support for the VMA format - vma = pkgs.qemu_kvm.overrideAttrs ( super: { + vma = pkgs.qemu_kvm.overrideAttrs ( super: rec { + + # proxmox's VMA patch doesn't work with qemu 7.0 yet + version = "6.2.0"; + src = pkgs.fetchurl { + url= "https://download.qemu.org/qemu-${version}.tar.xz"; + hash = "sha256-aOFdjkWsVjJuC5pK+otJo9/oq6NIgiHQmMhGmLymW0U="; + }; + patches = let - rev = "cc707c362ea5c8d832aac270d1ffa7ac66a8908f"; - path = "debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch"; + rev = "b37b17c286da3d32945fbee8ee4fd97a418a50db"; + path = "debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch"; vma-patch = pkgs.fetchpatch { - url = "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;hb=${rev};f=${path}"; - sha256 = "1z467xnmfmry3pjy7p34psd5xdil9x0apnbvfz8qbj0bf9fgc8zf"; + url = "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;h=${rev};f=${path}"; + hash = "sha256-siuDWDUnM9Zq0/L2Faww3ELAOUHhVIHu5RAQn6L4Atc="; }; - in super.patches ++ [ vma-patch ]; + in [ vma-patch ]; + buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; + }); in '' From 26c66bc7c8cec6008427d10a2e97b2862f4a3475 Mon Sep 17 00:00:00 2001 From: illustris Date: Sun, 8 May 2022 23:28:05 +0530 Subject: [PATCH 22/28] nixos/release: add proxmox LXC and VMA --- nixos/release.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/release.nix b/nixos/release.nix index f533aebf34c1..f70b02c4292b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -221,6 +221,29 @@ in rec { ); + # KVM image for proxmox in VMA format + proxmoxImage = forMatchingSystems [ "x86_64-linux" ] (system: + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = [ + ./modules/virtualisation/proxmox-image.nix + ]; + }).config.system.build.VMA) + ); + + # LXC tarball for proxmox + proxmoxLXC = forMatchingSystems [ "x86_64-linux" ] (system: + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = [ + ./modules/virtualisation/proxmox-lxc.nix + ]; + }).config.system.build.tarball) + ); # A disk image that can be imported to Amazon EC2 and registered as an AMI amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: From b7b86c4f548d8c127902406c7c51d6922c2cff81 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 13 Jul 2022 10:19:23 +0100 Subject: [PATCH 23/28] add stable anchor Co-authored-by: Jan Tojnar --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 7ca9ee3ff76d..4597f9d16278 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -953,7 +953,7 @@ The [generic builder][generic-builder] populates `PATH` from inputs of the deriv [generic-builder]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/pkgs/stdenv/generic/builder.sh -#### Invocation +#### Invocation {#patch-shebangs.sh-invocation} Multiple paths can be specified. From ac37f4873a64054c81c8a32ac662ab58b3a661cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Jul 2022 05:00:46 +0000 Subject: [PATCH 24/28] gnome-console: 42.beta -> 42.0 --- .../applications/terminal-emulators/gnome-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 9b4b460550ff..be3808327b57 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "42.beta"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Lq/shyAhDcwB5HqpihvGx2+xwVU2Xax7/NerFwR36DQ="; + sha256 = "Fae8i72047ZZ//DFK2GdxilxkPhnRp2D4wOvSzibuaM="; }; buildInputs = [ From 5a635bdff99a65fb067d18a398b20b4450831689 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 12 Jul 2022 20:14:10 +0000 Subject: [PATCH 25/28] =?UTF-8?q?d-spy:=201.2.0=20=E2=86=92=201.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/d-spy/-/compare/1.2.0...1.2.1 --- pkgs/development/tools/misc/d-spy/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix index a1fbecd5b263..a4a49172c234 100644 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ b/pkgs/development/tools/misc/d-spy/default.nix @@ -1,9 +1,9 @@ { stdenv , lib , desktop-file-utils -, fetchpatch , fetchurl , glib +, gettext , gtk4 , libadwaita , meson @@ -15,30 +15,23 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/dspy/${lib.versions.majorMinor version}/dspy-${version}.tar.xz"; - sha256 = "XKL0z00w0va9m1OfuVq5YJyE1jzeynBxb50jc+O99tQ="; + sha256 = "TjnA1to687eJASJd0VEjOFe+Ihtfs62CwdsVhyNrZlI="; }; - patches = [ - # Remove pointless dependencies - # https://gitlab.gnome.org/GNOME/d-spy/-/merge_requests/6 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/d-spy/-/commit/5a0ec8d53d006e95e93c6d6e32a381eb248b12a1.patch"; - sha256 = "jalfdAXcH8GZ50qb2peG+2841cGan4EhwN88z5Ewf+k="; - }) - ]; - nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils wrapGAppsHook4 + gettext + glib ]; buildInputs = [ From 2f038ea7376e09eab2a72fc128c059f62dca8e1d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 12 Jul 2022 20:14:27 +0000 Subject: [PATCH 26/28] =?UTF-8?q?gjs:=201.72.0=20=E2=86=92=201.72.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.72.0...1.72.1 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 4ceea50d16bf..9d621e584860 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.72.0"; + version = "1.72.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PvDK9xbjkg3WH3dI9tVuR2zA/Bg1GtBUjn3xoKub3K0="; + sha256 = "sha256-F8Cx7D8JZnH/i/q6bku/FBmMcBPGBL/Wd6mFjaB5wKs="; }; patches = [ From 96ac2fd32e34f472ce61f84e391190d573dec6d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 12 Jul 2022 20:15:48 +0000 Subject: [PATCH 27/28] =?UTF-8?q?gnome-desktop:=2042.2=20=E2=86=92=2042.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/42.2...42.3 --- pkgs/development/libraries/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 32f491c97cec..c806636ff8dc 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.2"; + version = "42.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9CsU6sjRRWwr/B+8l+9q/knI3W9XeW6P1f6zkzHtVb0="; + sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk="; }; patches = [ From b27f418b91310893703608305e8697e990f332d1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 12 Jul 2022 20:16:48 +0000 Subject: [PATCH 28/28] =?UTF-8?q?librest=5F1=5F0:=200.9.0=20=E2=86=92=200.?= =?UTF-8?q?9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librest/-/compare/0.9.0...0.9.1 --- pkgs/development/libraries/librest/1.0.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix index d51f9e31b178..30482a510274 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/development/libraries/librest/1.0.nix @@ -7,20 +7,21 @@ , gi-docgen , glib , json-glib -, libsoup +, libsoup_3 +, libxml2 , gobject-introspection , gnome }: stdenv.mkDerivation rec { pname = "rest"; - version = "0.9.0"; + version = "0.9.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hbK8k0ESgTlTm1PuU/BTMxC8ljkv1kWGOgQEELgevmY="; + sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM="; }; nativeBuildInputs = [ @@ -34,7 +35,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib json-glib - libsoup + libsoup_3 + libxml2 ]; mesonFlags = [