From 6c1c885da26bf74d045ed8c59aba40ea97637d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 3 Jun 2022 14:05:37 +0200 Subject: [PATCH 01/24] prefer-remote-fetch: don't overwrite fetcher's which set preferLocalBuild explicitly --- pkgs/build-support/prefer-remote-fetch/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/pkgs/build-support/prefer-remote-fetch/default.nix index 2e55e370742..a1f2d0c56cf 100644 --- a/pkgs/build-support/prefer-remote-fetch/default.nix +++ b/pkgs/build-support/prefer-remote-fetch/default.nix @@ -11,9 +11,9 @@ # $ echo 'self: super: super.prefer-remote-fetch self super' > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix # self: super: { - fetchurl = args: super.fetchurl (args // { preferLocalBuild = false; }); - fetchgit = args: super.fetchgit (args // { preferLocalBuild = false; }); - fetchhg = args: super.fetchhg (args // { preferLocalBuild = false; }); - fetchsvn = args: super.fetchsvn (args // { preferLocalBuild = false; }); - fetchipfs = args: super.fetchipfs (args // { preferLocalBuild = false; }); + fetchurl = args: super.fetchurl ({ preferLocalBuild = false; } // args); + fetchgit = args: super.fetchgit ({ preferLocalBuild = false; } // args); + fetchhg = args: super.fetchhg ({ preferLocalBuild = false; } // args); + fetchsvn = args: super.fetchsvn ({ preferLocalBuild = false; } // args); + fetchipfs = args: super.fetchipfs ({ preferLocalBuild = false; } // args); } From 1661ce8227f568dbb97c0ee86c755b911e1ac96e Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Tue, 7 Jun 2022 09:06:22 -0600 Subject: [PATCH 02/24] vscode-extensions.njpwerner.autodocstring: init at 6.0.1 --- .../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 ad934c70544..c368cf13e23 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1703,6 +1703,23 @@ let }; }; + njpwerner.autodocstring = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "autodocstring"; + publisher = "njpwerner"; + version = "0.6.1"; + sha256 = "sha256-NI0cbjsZPW8n6qRTRKoqznSDhLZRUguP7Sa/d0feeoc="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/njpwerner.autodocstring/changelog"; + description = "Generates python docstrings automatically"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=njpwerner.autodocstring"; + homepage = "https://github.com/NilsJPWerner/autoDocstring"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + octref.vetur = buildVscodeMarketplaceExtension { mktplcRef = { name = "vetur"; From 6449d45e25661722127fd19819992201c15b79ee Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 11 Jun 2022 15:48:52 +0200 Subject: [PATCH 03/24] Delete unused release-notes.xml --- doc/release-notes.xml | 650 ------------------------------------------ 1 file changed, 650 deletions(-) delete mode 100644 doc/release-notes.xml diff --git a/doc/release-notes.xml b/doc/release-notes.xml deleted file mode 100644 index a15f5466729..00000000000 --- a/doc/release-notes.xml +++ /dev/null @@ -1,650 +0,0 @@ - -
- Nixpkgs Release Notes -
- Release 0.14 (June 4, 2012) - - - In preparation for the switch from Subversion to Git, this release is mainly the prevent the Nixpkgs version number from going backwards. (This would happen because prerelease version numbers produced for the Git repository are lower than those for the Subversion repository.) - - - - Since the last release, there have been thousands of changes and new packages by numerous contributors. For details, see the commit logs. - -
-
- Release 0.13 (February 5, 2010) - - - As always, there are many changes. Some of the most important updates are: - - - - Glibc 2.9. - - - - - GCC 4.3.3. - - - - - Linux 2.6.32. - - - - - X.org 7.5. - - - - - KDE 4.3.4. - - - - -
-
- Release 0.12 (April 24, 2009) - - - There are way too many additions to Nixpkgs since the last release to list here: for example, the number of packages on Linux has increased from 1002 to 2159. However, some specific improvements are worth listing: - - - - Nixpkgs now has a manual. In particular, it describes the standard build environment in detail. - - - - - Major new packages: - - - - KDE 4. - - - - - TeXLive. - - - - - VirtualBox. - - - - … and many others. - - - - - Important updates: - - - - Glibc 2.7. - - - - - GCC 4.2.4. - - - - - Linux 2.6.25 — 2.6.28. - - - - - Firefox 3. - - - - - X.org 7.3. - - - - - - - - Support for building derivations in a virtual machine, including RPM and Debian builds in automatically generated VM images. See pkgs/build-support/vm/default.nix for details. - - - - - Improved support for building Haskell packages. - - - - - - - The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In addition, several people contributed patches on the nix-dev mailing list. - -
-
- Release 0.11 (September 11, 2007) - - - This release has the following improvements: - - - - The standard build environment (stdenv) is now pure on the x86_64-linux and powerpc-linux platforms, just as on i686-linux. (Purity means that building and using the standard environment has no dependencies outside of the Nix store. For instance, it doesn’t require an external C compiler such as /usr/bin/gcc.) Also, the statically linked binaries used in the bootstrap process are now automatically reproducible, making it easy to update the bootstrap tools and to add support for other Linux platforms. See pkgs/stdenv/linux/make-bootstrap-tools.nix for details. - - - - - Hook variables in the generic builder are now executed using the eval shell command. This has a major advantage: you can write hooks directly in Nix expressions. For instance, rather than writing a builder like this: - -source $stdenv/setup - -postInstall=postInstall -postInstall() { - ln -sf gzip $out/bin/gunzip - ln -sf gzip $out/bin/zcat -} - -genericBuild - (the gzip builder), you can just add this attribute to the derivation: - -postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat"; - and so a separate build script becomes unnecessary. This should allow us to get rid of most builders in Nixpkgs. - - - - - It is now possible to have the generic builder pass arguments to configure and make that contain whitespace. Previously, for example, you could say in a builder, - -configureFlags="CFLAGS=-O0" - but not - -configureFlags="CFLAGS=-O0 -g" - since the -g would be interpreted as a separate argument to configure. Now you can say - -configureFlagsArray=("CFLAGS=-O0 -g") - or similarly - -configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar") - which does the right thing. Idem for makeFlags, installFlags, checkFlags and distFlags. - - - Unfortunately you can't pass arrays to Bash through the environment, so you can't put the array above in a Nix expression, e.g., - -configureFlagsArray = ["CFLAGS=-O0 -g"]; - since it would just be flattened to a since string. However, you can use the inline hooks described above: - -preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")"; - - - - - The function fetchurl now has support for two different kinds of mirroring of files. First, it has support for content-addressable mirrors. For example, given the fetchurl call - -fetchurl { - url = "http://releases.mozilla.org/.../firefox-2.0.0.6-source.tar.bz2"; - sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"; -} - fetchurl will first try to download this file from . If that file doesn’t exist, it will try the original URL. In general, the “content-addressed” location is mirror/hash-type/hash. There is currently only one content-addressable mirror (), but more can be specified in the hashedMirrors attribute in pkgs/build-support/fetchurl/mirrors.nix, or by setting the NIX_HASHED_MIRRORS environment variable to a whitespace-separated list of URLs. - - - Second, fetchurl has support for widely-mirrored distribution sites such as SourceForge or the Linux kernel archives. Given a URL of the form mirror://site/path, it will try to download path from a configurable list of mirrors for site. (This idea was borrowed from Gentoo Linux.) Example: - -fetchurl { - url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2; - sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1"; -} - Currently site can be sourceforge, gnu and kernel. The list of mirrors is defined in pkgs/build-support/fetchurl/mirrors.nix. You can override the list of mirrors for a particular site by setting the environment variable NIX_MIRRORS_site, e.g. - -export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/ - - - - - Important updates: - - - - Glibc 2.5. - - - - - GCC 4.1.2. - - - - - Gnome 2.16.3. - - - - - X11R7.2. - - - - - Linux 2.6.21.7 and 2.6.22.6. - - - - - Emacs 22.1. - - - - - - - - Major new packages: - - - - KDE 3.5.6 Base. - - - - - Wine 0.9.43. - - - - - OpenOffice 2.2.1. - - - - - Many Linux system packages to support NixOS. - - - - - - - - - - The following people contributed to this release: Andres Löh, Arie Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov. - -
-
- Release 0.10 (October 12, 2006) - - - - This release of Nixpkgs requires Nix 0.10 or higher. - - - - - This release has the following improvements: - - - - - - pkgs/system/all-packages-generic.nix is gone, we now just have pkgs/top-level/all-packages.nix that contains all available packages. This should cause much less confusion with users. all-packages.nix is a function that by default returns packages for the current platform, but you can override this by specifying a different system argument. - - - - - Certain packages in Nixpkgs are now user-configurable through a configuration file, i.e., without having to edit the Nix expressions in Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is built without the RealPlayer plugin (for legal reasons). Previously, you could easily enable RealPlayer support by editing the call to the Firefox function in all-packages.nix, but such changes are not respected when Firefox is subsequently updated through the Nixpkgs channel. - - - The Nixpkgs configuration file (found in ~/.nixpkgs/config.nix or through the NIXPKGS_CONFIG environment variable) is an attribute set that contains configuration options that all-packages.nix reads and uses for certain packages. For instance, the following configuration file: - -{ - firefox = { - enableRealPlayer = true; - }; -} - persistently enables RealPlayer support in the Firefox build. - - - (Actually, firefox.enableRealPlayer is the only configuration option currently available, but more are sure to be added.) - - - - - Support for new platforms: - - - - i686-cygwin, i.e., Windows (using Cygwin). The standard environment on i686-cygwin by default builds binaries for the Cygwin environment (i.e., it uses Cygwin tools and produces executables that use the Cygwin library). However, there is also a standard environment that produces binaries that use MinGW. You can use it by calling all-package.nix with the stdenvType argument set to "i686-mingw". - - - - - i686-darwin, i.e., Mac OS X on Intel CPUs. - - - - - powerpc-linux. - - - - - x86_64-linux, i.e., Linux on 64-bit AMD/Intel CPUs. Unlike i686-linux, this platform doesn’t have a pure stdenv yet. - - - - - - - - The default compiler is now GCC 4.1.1. - - - - - X11 updated to X.org’s X11R7.1. - - - - - Notable new packages: - - - - Opera. - - - - - Microsoft Visual C++ 2005 Express Edition and the Windows SDK. - - - - In total there are now around 809 packages in Nixpkgs. - - - - - It is now much easier to override the default C compiler and other tools in stdenv for specific packages. all-packages.nix provides two utility functions for this purpose: overrideGCC and overrideInStdenv. Both take a stdenv and return an augmented stdenv; the formed changes the C compiler, and the latter adds additional packages to the front of stdenv’s initial PATH, allowing tools to be overridden. - - - For instance, the package strategoxt doesn’t build with the GNU Make in stdenv (version 3.81), so we call it with an augmented stdenv that uses GNU Make 3.80: - -strategoxt = (import ../development/compilers/strategoxt) { - inherit fetchurl pkgconfig sdf aterm; - stdenv = overrideInStdenv stdenv [gnumake380]; -}; - -gnumake380 = ...; - Likewise, there are many packages that don’t compile with the default GCC (4.1.1), but that’s easily fixed: - -exult = import ../games/exult { - inherit fetchurl SDL SDL_mixer zlib libpng unzip; - stdenv = overrideGCC stdenv gcc34; -}; - - - - - It has also become much easier to experiment with changes to the stdenv setup script (which notably contains the generic builder). Since edits to pkgs/stdenv/generic/setup.sh trigger a rebuild of everything, this was formerly quite painful. But now stdenv contains a function to “regenerate” stdenv with a different setup script, allowing the use of a different setup script for specific packages: - -pkg = import ... { - stdenv = stdenv.regenerate ./my-setup.sh; - ... -} - - - - - Packages can now have a human-readable description field. Package descriptions are shown by nix-env -qa --description. In addition, they’re shown on the Nixpkgs release page. A description can be added to a package as follows: - -stdenv.mkDerivation { - name = "exult-1.2"; - ... - meta = { - description = "A reimplementation of the Ultima VII game engine"; - }; -} - The meta attribute is not passed to the builder, so changes to the description do not trigger a rebuild. Additional meta attributes may be defined in the future (such as the URL of the package’s homepage, the license, etc.). - - - - - - The following people contributed to this release: Andres Löh, Armijn Hemel, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek. - -
-
- Release 0.9 (January 31, 2006) - - - There have been zillions of changes since the last release of Nixpkgs. Many packages have been added or updated. The following are some of the more notable changes: - - - - - - Distribution files have been moved to . - - - - - The C library on Linux, Glibc, has been updated to version 2.3.6. - - - - - The default compiler is now GCC 3.4.5. GCC 4.0.2 is also available. - - - - - The old, unofficial Xlibs has been replaced by the official modularised X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs though not all have been tested. It is now possible to build a working X server (previously we only had X client libraries). We use a fully Nixified X server on NixOS. - - - - - The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix components such as /lib/ld-linux.so.2. This means that Java applications such as Eclipse and Azureus can run on NixOS. - - - - - Hardware-accelerated OpenGL support, used by games like Quake 3 (which is now built from source). - - - - - Improved support for FreeBSD on x86. - - - - - Improved Haskell support; e.g., the GHC build is now pure. - - - - - Some support for cross-compilation: cross-compiling builds of GCC and Binutils, and cross-compiled builds of the C library uClibc. - - - - - Notable new packages: - - - - teTeX, including support for building LaTeX documents using Nix (with automatic dependency determination). - - - - - Ruby. - - - - - System-level packages to support NixOS, e.g. Grub, GNU parted and so on. - - - - - ecj, the Eclipse Compiler for Java, so we finally have a freely distributable compiler that supports Java 5.0. - - - - - php. - - - - - The GIMP. - - - - - Inkscape. - - - - - GAIM. - - - - - kdelibs. This allows us to add KDE-based packages (such as kcachegrind). - - - - - - - - - The following people contributed to this release: Andres Löh, Armijn Hemel, Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin Bravenboer, Rob Vermaas and Roy van den Broek. - -
-
- Release 0.8 (April 11, 2005) - - - This release is mostly to remain synchronised with the changed hashing scheme in Nix 0.8. - - - - Notable updates: - - - - Adobe Reader 7.0 - - - - - Various security updates (zlib 1.2.2, etc.) - - - - -
-
- Release 0.7 (March 14, 2005) - - - - - The bootstrap process for the standard build environment on Linux (stdenv-linux) has been improved. It is no longer dependent in its initial bootstrap stages on the system Glibc, GCC, and other tools. Rather, Nixpkgs contains a statically linked bash and curl, and uses that to download other statically linked tools. These are then used to build a Glibc and dynamically linked versions of all other tools. - - - This change also makes the bootstrap process faster. For instance, GCC is built only once instead of three times. - - - (Contributed by Armijn Hemel.) - - - - - Tarballs used by Nixpkgs are now obtained from the same server that hosts Nixpkgs (). This reduces the risk of packages being unbuildable due to moved or deleted files on various servers. - - - - - There now is a generic mechanism for building Perl modules. See the various Perl modules defined in pkgs/system/all-packages-generic.nix. - - - - - Notable new packages: - - - - Qt 3 - - - - - MySQL - - - - - MythTV - - - - - Mono - - - - - MonoDevelop (alpha) - - - - - Xine - - - - - - - - Notable updates: - - - - GCC 3.4.3 - - - - - Glibc 2.3.4 - - - - - GTK 2.6 - - - - - - -
-
From 9a10ab2b3cac87b483e28fb28c0eec85ae9a0eab Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 14 Jun 2022 11:43:23 +0200 Subject: [PATCH 04/24] blender: 3.1.0 -> 3.2.0 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 4aceeeb9e35..1fcb3da8ae8 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1d0476bzcz86lwdnyjn7hyzkmhfiqh47ls5h09jlbm7v7k9x69hw"; + hash = "sha256-k78LL1urcQWxnF1lSoSi3CH3Ylhzo2Bk2Yvq5zbTYEo="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From 41cc697fddda60ec1e7a2de08db1661c00f75cc6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 15 Jun 2022 00:10:23 +0100 Subject: [PATCH 05/24] sx: migrate to resholve.mkDerivation --- pkgs/tools/X11/sx/default.nix | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/tools/X11/sx/default.nix index c03d4443fcf..1b04bb8876d 100644 --- a/pkgs/tools/X11/sx/default.nix +++ b/pkgs/tools/X11/sx/default.nix @@ -1,6 +1,13 @@ -{ coreutils, fetchFromGitHub, lib, makeWrapper, stdenv, util-linux, xauth, xorgserver }: +{ lib +, bash +, coreutils +, fetchFromGitHub +, resholve +, xauth +, xorgserver +}: -stdenv.mkDerivation rec { +resholve.mkDerivation rec { pname = "sx"; version = "2.1.7"; @@ -11,20 +18,28 @@ stdenv.mkDerivation rec { sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl"; }; - nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=$(out)" ]; - postInstall = '' - wrapProgram $out/bin/sx \ - --prefix PATH : ${lib.makeBinPath [ coreutils util-linux xorgserver xauth ]} - ''; + solutions = { + sx = { + scripts = [ "bin/sx" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + coreutils + xauth + xorgserver + ]; + execer = [ + "cannot:${xorgserver}/bin/Xorg" + ]; + }; + }; meta = with lib; { description = "Simple alternative to both xinit and startx for starting a Xorg server"; homepage = "https://github.com/earnestly/sx"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda thiagokokada ]; }; } From 00fc0c5abaf9532105a9c22e5fa803ce157c9538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jun 2022 16:17:31 +0000 Subject: [PATCH 06/24] python310Packages.google-cloud-firestore: 2.5.2 -> 2.5.3 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 24085cf5ff2..de0f9c32adf 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.5.2"; + version = "2.5.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ltFXT+cU/YGPqu28WcStV6bJarbiIGbjsHLI+9UZU80="; + sha256 = "sha256-ISPjpV2fjZSMbkJa6YzFGdrwyEC8MauLwS6pohMtFoY="; }; propagatedBuildInputs = [ From 9cbc088f3533c5b6e347d488a38dd11963e67ac0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jun 2022 09:49:17 +0000 Subject: [PATCH 07/24] python310Packages.pyenvisalink: 4.4 -> 4.5 --- pkgs/development/python-modules/pyenvisalink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix index 2bcbc753a9a..8e59cec643a 100644 --- a/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyenvisalink"; - version = "4.4"; + version = "4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YUYiCid+XAlfytkyz4Td5CG1zBOrsLx4/nuRubRE14w="; + sha256 = "sha256-WS1DCnuVmFAKsFVOb6HeKoNn2ZWHoLupg2VOZkzVsBU="; }; propagatedBuildInputs = [ From 20972d657edef0cab6f1ef2d6e99d88fd93bed16 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 16 Jun 2022 10:35:54 +0300 Subject: [PATCH 08/24] xxHash: add pkg-config file fix, clean up a bit --- pkgs/development/libraries/xxHash/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 336dd5b3257..d5a8df6f437 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, fetchurl +, fetchpatch }: stdenv.mkDerivation rec { @@ -16,13 +16,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA="; }; + # CMake build fixes patches = [ # Merged in https://github.com/Cyan4973/xxHash/pull/649 # Should be present in next release - (fetchurl { - name = "cmakeinstallfix.patch"; + (fetchpatch { + name = "cmake-install-fix"; url = "https://github.com/Cyan4973/xxHash/commit/636f966ecc713c84ddd3b7ccfde2bfb2cc7492a0.patch"; - hash = "sha256-fj+5V5mDhFgWGvrG1E4fEekL4eh7as0ouVvY4wnIHjs="; + sha256 = "sha256-B1PZ/0BXlOrSiPvgCPLvI/sjQvnR0n5PQHOO38LOij0="; + }) + + # Submitted at https://github.com/Cyan4973/xxHash/pull/723 + (fetchpatch { + name = "cmake-pkgconfig-fix"; + url = "https://github.com/Cyan4973/xxHash/commit/5db353bbd05ee5eb1f90afc08d10da9416154e55.patch"; + sha256 = "sha256-dElgSu9DVo2hY6TTVHLTtt0zkXmQV3nc9i/KbrDkK8s="; }) ]; From 772d80a00e2b30c1b667a956cd0ac3feb273552a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Jun 2022 06:09:31 -0700 Subject: [PATCH 09/24] oh-my-zsh: 2022-06-12 -> 2022-06-15 (#177850) --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 3b41ba902a5..2b2126f2d29 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-06-12"; + version = "2022-06-15"; pname = "oh-my-zsh"; - rev = "50550c70eaa36e79fdf380bdc4ddad4a1ad581a0"; + rev = "8168ec0174e7e3212be20ecc74810155772abff1"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "lZ63wtvrF5DMXXGE6GC6T4oEpN0G47Pvhas5IZ+vzAA="; + sha256 = "KbxVZ/sHwZEm8EzCR8ZOJdhiYnRyMLuUetBRxuj5izU="; }; strictDeps = true; From 01e4d1a67f6062a6c59046dbc4461659ccff8031 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 16 Jun 2022 09:10:37 -0400 Subject: [PATCH 10/24] texlive.combined.basic-scheme: fix $PATH of wrapped scripts (#177826) Fix missing sed, grep and coreutils in $PATH. Closes: #150620 --- pkgs/tools/typesetting/tex/texlive/combine.nix | 2 +- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 8686502a134..c18b7a011a8 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -180,7 +180,7 @@ in (buildEnv { echo -n "Wrapping '$link'" rm "$link" makeWrapper "$target" "$link" \ - --prefix PATH : "$out/bin:${perl}/bin" \ + --prefix PATH : "${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:$out/bin:${perl}/bin" \ --prefix PERL5LIB : "$PERL5LIB" \ --set-default TEXMFCNF "$TEXMFCNF" diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 0cdf0f39767..27db30593e8 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz -, makeWrapper, python3, ruby, perl +, makeWrapper, python3, ruby, perl, gnused, gnugrep, coreutils , useFixedHashes ? true , recurseIntoAttrs }: @@ -23,7 +23,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv lib makeWrapper writeText - stdenv python3 ruby perl; + stdenv python3 ruby perl gnused gnugrep coreutils; ghostscript = ghostscriptX; # could be without X, probably, but we use X above }; From b0b2bad54154436d67d1ad909b9bbc10e78e8dc0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 11 Jun 2022 14:49:31 +0200 Subject: [PATCH 11/24] pdns-recursor: 4.6.2 -> 4.7.0 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index d244b2920ba..fedec6213f0 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.6.2"; + version = "4.7.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-2mSYUHOf3XuvLfZFrMl3UszTkJc7VrjiUXHqew0lrSA="; + sha256 = "1329ycxavhkx963q0c6rqyzlg0689v5rrmjlydiw6px324djm1z4"; }; nativeBuildInputs = [ pkg-config ]; From f9763428b4d7fe379a5d6b5fa81ca84cec392291 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 16 Jun 2022 16:27:38 +0300 Subject: [PATCH 12/24] flam3: enable on darwin --- pkgs/tools/graphics/flam3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index 01e3693259a..4eb0bc67c3f 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 76a936228ac9ac60d727c80c90079eacc04f6124 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 16 Jun 2022 10:25:24 -0400 Subject: [PATCH 13/24] linuxPackages.system76-io: Fix building on newer kernels. See https://github.com/pop-os/system76-io-dkms/issues/7 --- pkgs/os-specific/linux/system76-io/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index fb697430f61..ab8c422d2da 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel, fetchpatch }: let version = "1.0.1"; sha256 = "0qkgkkjy1isv6ws6hrcal75dxjz98rpnvqbm7agdcc6yv0c17wwh"; @@ -15,6 +15,19 @@ stdenv.mkDerivation { inherit sha256; }; + patches = [ + (fetchpatch { + name = "Fix_GCC_declaration-after-statement_error.patch"; + url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/5.patch"; + sha256 = "sha256-G8SM5tdNbeLuwigmo1HKLN9o16WPpowLXxfM7Xi4aRI="; + }) + (fetchpatch { + name = "Fix_GCC_unused-function_error.patch"; + url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/6.patch"; + sha256 = "sha256-vCXEzszmXa+wmI84oR8WduN4WnLTZA3M4GX+Jc4p/5o="; + }) + ]; + hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; From e6ef6b680f118cf3140a7ab8544b7f2ce69133e1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 16 Jun 2022 16:42:32 +0300 Subject: [PATCH 14/24] qosmic: enable on darwin --- pkgs/applications/graphics/qosmic/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix index 96823441b6e..9e2248f896d 100644 --- a/pkgs/applications/graphics/qosmic/default.nix +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation +{ stdenv , fetchFromGitHub , fetchpatch , qmake @@ -13,7 +13,7 @@ , lib }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qosmic"; version = "1.6.0"; @@ -42,6 +42,13 @@ mkDerivation rec { }) ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace qosmic.pro \ + --replace "/share" "/Applications/qosmic.app/Contents/Resources" \ + --replace "/qosmic/scripts" "/scripts" \ + --replace "install_icons install_desktop" "" + ''; + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; buildInputs = [ @@ -55,16 +62,19 @@ mkDerivation rec { qmakeFlags = [ # Use pkg-config to correctly locate library paths - "-config" "link_pkgconfig" + "CONFIG+=link_pkgconfig" ]; + preInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv qosmic.app $out/Applications + ''; + meta = with lib; { description = "A cosmic recursive flame fractal editor"; homepage = "https://github.com/bitsed/qosmic"; license = licenses.gpl3Plus; maintainers = [ maintainers.raboof ]; - # It might be possible to make it work on OSX, - # but this has not been tested. - platforms = platforms.linux; + platforms = platforms.unix; }; } From 97067007a985bfcb3509f0e93486df0f1b0062ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jun 2022 05:23:56 +0000 Subject: [PATCH 15/24] libnma: 1.8.38 -> 1.8.40 --- pkgs/tools/networking/networkmanager/libnma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index a14ba1663d3..4993068d2a5 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.8.38"; + version = "1.8.40"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Xtk+rhhFb/WopPQIF4we4ZjcjTpGxl+QdbEBkW5k6LQ="; + sha256 = "hwp1+NRkHtDZD4Nq6m/1ESJL3pf/1W1git4um1rLKyI="; }; patches = [ From 22e7607da591bec58a0edb3d710569e4796cbf97 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 16 Jun 2022 17:57:04 +0200 Subject: [PATCH 16/24] golangci-lint-langserver: init at 0.0.6 (#177692) * golangci-lint-langserver: init at 0.0.6 * Update pkgs/development/tools/golangci-lint-langserver/default.nix Co-authored-by: Anderson Torres Co-authored-by: Anderson Torres --- .../golangci-lint-langserver/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/golangci-lint-langserver/default.nix diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/development/tools/golangci-lint-langserver/default.nix new file mode 100644 index 00000000000..0da4498bd9b --- /dev/null +++ b/pkgs/development/tools/golangci-lint-langserver/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "golangci-lint-langserver"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "nametake"; + repo = "golangci-lint-langserver"; + rev = "v${version}"; + sha256 = "0x3qr2ckyk6rcn2rfm2sallzdprzxjh590gh3bfvqn7nb1mfw367"; + }; + + vendorSha256 = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Language server for golangci-lint"; + homepage = "https://github.com/nametake/golangci-lint-langserver"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f605f09da9..a13e76d8267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23614,6 +23614,8 @@ with pkgs; buildGoModule = buildGo118Module; }; + golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { }; + gocyclo = callPackage ../development/tools/gocyclo { }; godef = callPackage ../development/tools/godef { }; From 1c92c7f1e8d2af09bca5eac9b2822ca2bca2079a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jun 2022 01:04:19 +0000 Subject: [PATCH 17/24] cambalache: 0.8.2 -> 0.10.1 --- pkgs/development/tools/cambalache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index 5845ed033c3..1f06744fa71 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.8.2"; + version = "0.10.1"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jpu"; repo = pname; rev = version; - sha256 = "sha256-1+IoBoaNHwvN8W+KRyV5cTFkFG+pTHJBehQ2VosCEfs="; + sha256 = "sha256-UgPyG1xDt624W+qTb88d0WvOza6YvVAO/YXeUV51Rro="; }; nativeBuildInputs = [ From 55c9d73fb202809491ca0612dcb0e83548339475 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 14 Jun 2022 21:42:37 -0700 Subject: [PATCH 18/24] glances: 3.2.5 -> 3.2.6.4 --- pkgs/applications/system/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index b7e4cad122d..dae9d5cd519 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.5"; + version = "3.2.6.4"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "sha256-kTnUP7WvmEw4VazjLrGb0FhSdz+/OadzgwDXs1SA02o="; + sha256 = "sha256-i88bz6AwfDbqC+7yvr7uDofAqBwQmnfoKbt3iJz4Ft8="; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): From 7230a2d399e9fdfa171c31c6e984824393ec32b1 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 14 Jun 2022 12:51:47 -0400 Subject: [PATCH 19/24] arcanist: 20220425 -> 20220517 The patch will make its way upstream eventually, but the phabricator maintainer is currently rejecting all contributions, so for the moment we'll have to just fix it locally. --- pkgs/development/tools/misc/arcanist/default.nix | 11 +++++++---- .../misc/arcanist/shellcomplete-strlen-null.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 16c056bc3ff..178bb9b3d05 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -25,16 +25,19 @@ let makeArcWrapper = toolset: '' in stdenv.mkDerivation { pname = "arcanist"; - version = "20220425"; + version = "20220517"; src = fetchFromGitHub { owner = "phacility"; repo = "arcanist"; - rev = "da206314cf59f71334b187283e18823bddc16ddd"; - sha256 = "sha256-6VVUjFMwPQvk22Ni1YUSgks4ZM0j1JP+71VnYKD8onM="; + rev = "85c953ebe4a6fef332158fd757d97c5a58682d3a"; + sha256 = "0x847fw74mzrbhzpgc4iqgvs6dsf4svwfa707dsbxi78fn2lxbl7"; }; - patches = [ ./dont-require-python3-in-path.patch ]; + patches = [ + ./dont-require-python3-in-path.patch + ./shellcomplete-strlen-null.patch + ]; buildInputs = [ php python3 ]; diff --git a/pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch b/pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch new file mode 100644 index 00000000000..6911ce074e0 --- /dev/null +++ b/pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch @@ -0,0 +1,13 @@ +diff --git a/src/toolset/workflow/ArcanistShellCompleteWorkflow.php b/src/toolset/workflow/ArcanistShellCompleteWorkflow.php +index 9c2fcf9a..307231c8 100644 +--- a/src/toolset/workflow/ArcanistShellCompleteWorkflow.php ++++ b/src/toolset/workflow/ArcanistShellCompleteWorkflow.php +@@ -92,7 +92,7 @@ EOTEXT + $argv = $this->getArgument('argv'); + + $is_generate = $this->getArgument('generate'); +- $is_shell = (bool)strlen($this->getArgument('shell')); ++ $is_shell = phutil_nonempty_string($this->getArgument('shell')); + $is_current = $this->getArgument('current'); + + if ($argv) { From c6bedda7751cae2f6724ca09b175e16944af9f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Jun 2022 19:13:35 +0000 Subject: [PATCH 20/24] hypnotix: 2.6 -> 2.7 https://github.com/linuxmint/hypnotix/blob/2.7/debian/changelog --- pkgs/applications/video/hypnotix/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index 12932280906..582060920ea 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-9HWr8zjUuhj/GZdrt1WwpwYNLEl34S9IJ7ikGZBSw3s="; + hash = "sha256-Mfj10CPYAI2QObgjbkhEPJ2nx6hsR5BHpmNofmdSz1k="; }; patches = [ @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "IPTV streaming application"; homepage = "https://github.com/linuxmint/hypnotix"; + changelog = "https://github.com/linuxmint/hypnotix/blob/${src.rev}/debian/changelog"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.linux; From ccc38178bae74acba1174669863b3d951f1a07d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jun 2022 13:15:25 +0000 Subject: [PATCH 21/24] python310Packages.compreffor: 0.5.1.post1 -> 0.5.2 --- pkgs/development/python-modules/compreffor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 94277390258..18364505377 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.1.post1"; + version = "0.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "Zqia+yP4Dp5VNGeMwv+j04aNm9oVmZ2juehbfEzDfOQ="; + sha256 = "sha256-rsC0HJCl3IGqEqUqfCwRRNwzjtfGDlxcCkeOU3On22Q="; }; nativeBuildInputs = [ From 03f60a8ed0baf763de6203f72f6699efac895618 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sat, 11 Jun 2022 23:27:12 -0700 Subject: [PATCH 22/24] spire: 1.2.3 -> 1.3.1 Signed-off-by: Frederick F. Kautz IV --- pkgs/tools/security/spire/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index fcb74d421eb..4664e058367 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo118Module, fetchFromGitHub }: -buildGoModule rec { +buildGo118Module rec { pname = "spire"; - version = "1.2.3"; + version = "1.3.1"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k2kg1Wz0pPV9di2T1A1QvPxLqS5uZBvklNfBW72dQa0="; + sha256 = "sha256-8LDdHChCTSpepwTMg2hUvQ6ZDoqaZt9QeKrBgfIOLx8="; }; - vendorSha256 = "sha256-J2D5hD0+0VY0sWi6O/McLIvK775aQiDqA+h24oYgRxY="; + vendorSha256 = "sha256-QgPDhUu5uCkmC6L5UKtnz/wt/M1rERxc5nXmVVPtRKY="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; From f756efc1440707ea6a1535dabbb7f90ec79a7be9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Jun 2022 19:03:08 +0200 Subject: [PATCH 23/24] cambalache: Fix Adwaita & Handy support 0.10 introduced support for widgets from these libraries, which require their typelibs. https://blogs.gnome.org/xjuan/2022/06/15/cambalache-0-10-0-is-out/ --- pkgs/development/tools/cambalache/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index 1f06744fa71..29f2310a1c2 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -12,6 +12,8 @@ , glib , gtk3 , gtk4 +, libadwaita +, libhandy , webkitgtk , nix-update-script }: @@ -50,6 +52,9 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtk4 webkitgtk + # For extra widgets support. + libadwaita + libhandy ]; # Not compatible with gobject-introspection setup hooks. From 0ab94d8f77cef10388ef848c719985dac087fd9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jun 2022 04:25:38 +0000 Subject: [PATCH 24/24] gnome.gnome-todo: unstable-2022-05-23 -> unstable-2022-06-12 --- pkgs/desktops/gnome/apps/gnome-todo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index e9331c08993..582a0772a68 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "unstable-2022-05-23"; + version = "unstable-2022-06-12"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-todo"; - rev = "ac1d540de63e2540b4eb8a642054862b5793b40a"; - sha256 = "7fJOXQpapQ8RqJq5tJEWjOxnY9qExz5SbYMWFDREQlY="; + rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5"; + sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ="; }; patches = [