From f18befaaf4cdb84e20da306ea853e497f4fe4bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 4 May 2022 20:17:14 +0200 Subject: [PATCH 01/28] nixos/doc/installation: fix alignment of created partitions $ parted /dev/nvme1n1 -- mkpart primary linux-swap -8GiB 100% Warning: The resulting partition is not properly aligned for best performance: 3108850352s % 2048s != 0s Ignore/Cancel? Information: You may need to update /etc/fstab. When using GB than parted seems to round up itself. --- .../from_md/installation/installing.chapter.xml | 12 ++++++------ nixos/doc/manual/installation/installing.chapter.md | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index aee0b30a7076..fb8d3a4c5eb1 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -177,17 +177,17 @@ OK the boot partition. -# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary 512MB -8GB Next, add a swap partition. The size - required will vary according to needs, here a 8GiB one is + required will vary according to needs, here a 8GB one is created. -# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart primary linux-swap -8GB 100% @@ -204,7 +204,7 @@ OK reserved 512MiB at the start of the disk. -# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- mkpart ESP fat32 1MB 512MB # parted /dev/sda -- set 3 esp on @@ -242,7 +242,7 @@ OK live. -# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary 1MB -8GB @@ -252,7 +252,7 @@ OK created. -# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart primary linux-swap -8GB 100% diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 8a46d68ae3ba..5991a6cb26a1 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -133,14 +133,14 @@ update /etc/fstab. which will be used by the boot partition. ```ShellSession - # parted /dev/sda -- mkpart primary 512MiB -8GiB + # parted /dev/sda -- mkpart primary 512MB -8GB ``` 3. Next, add a *swap* partition. The size required will vary according - to needs, here a 8GiB one is created. + to needs, here a 8GB one is created. ```ShellSession - # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% + # parted /dev/sda -- mkpart primary linux-swap -8GB 100% ``` ::: {.note} @@ -153,7 +153,7 @@ update /etc/fstab. reserved 512MiB at the start of the disk. ```ShellSession - # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB + # parted /dev/sda -- mkpart ESP fat32 1MB 512MB # parted /dev/sda -- set 3 esp on ``` @@ -180,14 +180,14 @@ update /etc/fstab. end part, where the swap will live. ```ShellSession - # parted /dev/sda -- mkpart primary 1MiB -8GiB + # parted /dev/sda -- mkpart primary 1MB -8GB ``` 3. Finally, add a *swap* partition. The size required will vary according to needs, here a 8GiB one is created. ```ShellSession - # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% + # parted /dev/sda -- mkpart primary linux-swap -8GB 100% ``` ::: {.note} From 2856eb20469aec5de5aec8fa464f82a07888d92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Jul 2022 13:06:22 +0200 Subject: [PATCH 02/28] vault: fix assertions when raft backend is used --- nixos/modules/services/security/vault.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 4942a05fe73b..156314134de4 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -104,9 +104,9 @@ in storagePath = mkOption { type = types.nullOr types.path; - default = if cfg.storageBackend == "file" then "/var/lib/vault" else null; + default = if cfg.storageBackend == "file" || cfg.storageBackend == "raft" then "/var/lib/vault" else null; defaultText = literalExpression '' - if config.${opt.storageBackend} == "file" + if config.${opt.storageBackend} == "file" || cfg.storageBackend == "raft" then "/var/lib/vault" else null ''; @@ -172,11 +172,16 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null); + { + assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null); message = ''The "inmem" storage expects no services.vault.storagePath nor services.vault.storageConfig''; } - { assertion = (cfg.storageBackend == "file" -> (cfg.storagePath != null && cfg.storageConfig == null)) && (cfg.storagePath != null -> cfg.storageBackend == "file"); - message = ''You must set services.vault.storagePath only when using the "file" backend''; + { + assertion = ( + (cfg.storageBackend == "file" -> (cfg.storagePath != null && cfg.storageConfig == null)) && + (cfg.storagePath != null -> (cfg.storageBackend == "file" || cfg.storageBackend == "raft")) + ); + message = ''You must set services.vault.storagePath only when using the "file" or "raft" backend''; } ]; From 6b9494f949e2b71464463c723468068d2a1c6dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Jul 2022 21:33:33 +0200 Subject: [PATCH 03/28] snappymail: init at 2.17.0 --- pkgs/servers/snappymail/default.nix | 37 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/servers/snappymail/default.nix diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix new file mode 100644 index 000000000000..d26497d0e75c --- /dev/null +++ b/pkgs/servers/snappymail/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchurl, writeText +, dataPath ? "/var/lib/snappymail" }: +stdenv.mkDerivation rec { + pname = "snappymail"; + version = "2.17.0"; + + src = fetchurl { + url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; + sha256 = "sha256-Z8By/X4IheOyCT7F4KArBN+CFUTcSn0VZchcYhAJsCU="; + }; + + sourceRoot = "snappymail"; + + includeScript = writeText "include.php" '' + Date: Sat, 13 Aug 2022 11:05:37 +0800 Subject: [PATCH 04/28] mpvScripts.thumbnail: switch to maintained fork, unstable-2020-01-16 -> 0.4.9 --- pkgs/applications/video/mpv/scripts/thumbnail.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index 4bee220f4c98..5de9f5b0c6b2 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -1,13 +1,13 @@ -{ fetchFromGitHub, lib, python3, stdenvNoCC }: +{ lib, stdenvNoCC, fetchFromGitHub, python3 }: stdenvNoCC.mkDerivation rec { pname = "mpv_thumbnail_script"; - version = "unstable-2020-01-16"; + version = "0.4.9"; src = fetchFromGitHub { - owner = "theamm"; + owner = "marzzzello"; repo = pname; - rev = "682becf5b5115c2a206b4f0bdee413d4be8b5bef"; + rev = version; sha256 = "0dgfrb8ypc5vlq35kzn423fm6l6348ivl85vb6j3ccc9a51xprw3"; }; @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A lua script to show preview thumbnails in mpv's OSC seekbar"; - homepage = "https://github.com/theamm/mpv_thumbnail_script"; + homepage = "https://github.com/marzzzello/mpv_thumbnail_script"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ figsoda ]; From 6dc3ef5e1a99bdb9a1bb0f5136b67fadab92c122 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 1 Aug 2022 22:24:53 +0200 Subject: [PATCH 05/28] php8*: disable PCRE2 JIT SEAlloc to avoid crashes Using PHP with PCRE2 built with the JIT SEAlloc is known to be problematic [0] and it may crashes apps using pcntl to process a workload in parallel like Psalm or PHPCS. Another solution would be to disable `pcre.jit` but this is likely to have a noticeable performance impact. PCRE2 JIT SEAlloc was enabled in order to make possible to use `MemoryDenyWriteExecute=true` in the NixOS Gitea module [1]. Doing something similar for a PHP module is likely to involve more steps as you will also need to disable PHP's JIT. Not building PCRE2 with the JIT SEAlloc is however not really blocking for someone wanting to build an hardened PHP module as they likely will disable `pcre.jit` and make sure `opcache.jit` is disabled. It should also be noted that OpenSUSE did try to enable PCRE2 JIT SEAlloc by default in the past but recently reverted the change [2]. [0] https://bugs.php.net/bug.php?id=78630 [1] https://github.com/NixOS/nixpkgs/commit/c990bd600791a4c7070aa377a93adcdc319c6cdb [2] https://bugzilla.opensuse.org/show_bug.cgi?id=1182864 --- pkgs/development/libraries/pcre2/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index ea0ca3e4030c..226b92ccfdd3 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, withJitSealloc ? true }: stdenv.mkDerivation rec { @@ -17,9 +18,9 @@ stdenv.mkDerivation rec { "--enable-pcre2-32" # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51 "--enable-jit=auto" - # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea - "--enable-jit-sealloc" - ]; + ] + # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea + ++ lib.optional withJitSealloc "--enable-jit-sealloc"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d5e966accc3..103b844de083 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14815,6 +14815,9 @@ with pkgs; # Import PHP81 interpreter, extensions and packages php81 = callPackage ../development/interpreters/php/8.1.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + }; }; php81Extensions = recurseIntoAttrs php81.extensions; php81Packages = recurseIntoAttrs php81.packages; @@ -14822,6 +14825,9 @@ with pkgs; # Import PHP80 interpreter, extensions and packages php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + }; }; php80Extensions = recurseIntoAttrs php80.extensions; php80Packages = recurseIntoAttrs php80.packages; From 32733dc51e67cd750a7d90188cb8b89a6f8cbbb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 10:44:49 +0000 Subject: [PATCH 06/28] google-guest-agent: 20220104.00 -> 20220713.00 --- pkgs/tools/virtualization/google-guest-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index a4ebd2db8f54..fb1b56fa4ee5 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "guest-agent"; - version = "20220104.00"; + version = "20220713.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-BC2qpnGJU/D0z8jlmAEwvmFwBk1n0ZvqPBB6Zon9N/U="; + sha256 = "sha256-6N6ikAIpqbtNgD6TTASbMzCJcBc7D3ziE4YvQmTb1Go="; }; - vendorSha256 = "sha256-YcWKSiN715Z9lmNAQx+sHEgxWnhFhenCNXBS7gdMV4M="; + vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI="; patches = [ ./disable-etc-mutation.patch ]; From 8a40257c734bbeb3199c89d9e3c43ccd99703e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 14 Aug 2022 14:14:54 +0200 Subject: [PATCH 07/28] gcl_2_6_13_pre: 2.6.13pre50 -> 2.6.13pre124 (fix build) --- pkgs/development/compilers/gcl/2.6.13-pre.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 50efbe5d3c54..f967deb9a2ce 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which -, texinfo, libX11, xorgproto, libXi, gmp, readline, strace +, texinfo, libX11, xorgproto, libXi, gmp, readline , libXext, libXt, libXaw, libXmu } : assert stdenv ? cc ; @@ -7,34 +7,32 @@ assert stdenv.cc.isGNU ; assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gcl"; - version = "2.6.13pre50"; + version = "2.6.13pre124"; src = fetchgit { - sha256 = "0vpxb6z5g9fjavrgx8gz8fsjvskfz64f63qibh5s00fvvndlwi88"; + sha256 = "sha256-e4cUQlNSfdz+B3urlZ82pf7fTc6aoloUyDDorAUi5kc="; url = "https://git.savannah.gnu.org/r/gcl.git"; - rev = "refs/tags/Version_2_6_13pre50"; + rev = "refs/tags/Version_${builtins.replaceStrings ["."] ["_"] version}"; }; postPatch = '' sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp - '' - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902475 - + '' - substituteInPlace h/elf64_i386_reloc.h \ - --replace 'case R_X86_64_PC32:' 'case R_X86_64_PC32: case R_X86_64_PLT32:' ''; sourceRoot = "gcl/gcl"; + # breaks when compiling in parallel + enableParallelBuilding = false; + patches = []; buildInputs = [ mpfr m4 binutils emacs gmp libX11 xorgproto libXi libXext libXt libXaw libXmu - zlib which texinfo readline strace + zlib which texinfo readline ]; configureFlags = [ From 7aeffe56b0ebb903dfd2711dc47f4f581238d9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Sun, 14 Aug 2022 18:47:13 +0200 Subject: [PATCH 08/28] backblaze-b2: 3.2.0 -> 3.5.0 --- .../tools/backblaze-b2/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 6df8edd02c96..d6b94391e6cb 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -2,17 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.2.0"; + version = "3.5.0"; src = python3Packages.fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-dE4eLTNU6O0DscwN8+m1UaG46dbI0DiWzeJK49GUvKA="; + sha256 = "sha256-vyqExulsV0wDijLotPO3RAOk9o4ne0Vq74KJKhSBrvo="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace 'docutils==0.16' 'docutils' + --replace 'tabulate==0.8.10' 'tabulate' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' ''; @@ -27,18 +27,27 @@ python3Packages.buildPythonApplication rec { setuptools docutils rst2ansi + tabulate ]; checkInputs = with python3Packages; [ + backoff pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ # require network "test_files_headers" - "test_copy_file_by_id" "test_integration" - "test_get_account_info" + ]; + + disabledTestPaths = [ + # requires network + "test/integration/test_b2_command_line.py" ]; postInstall = '' From 387f876b2d1db0beba775fa6ac917aaeda4edd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Sun, 14 Aug 2022 18:48:25 +0200 Subject: [PATCH 09/28] backblaze-b2: add tomhoule to maintainers --- pkgs/development/tools/backblaze-b2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index d6b94391e6cb..f8065c4f7b70 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -63,6 +63,6 @@ python3Packages.buildPythonApplication rec { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; license = licenses.mit; - maintainers = with maintainers; [ hrdinka kevincox ]; + maintainers = with maintainers; [ hrdinka kevincox tomhoule ]; }; } From 53149fe1311fcd9aa2470b3376e39435875797cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 10:12:25 +0000 Subject: [PATCH 10/28] python310Packages.Wand: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/Wand/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 7182222db5a2..86aad7708ad9 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.9"; + version = "0.6.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QCdOiCmo21P9vjKPWAV6Wrfi664Hx3uJ8V44B2mLtbw="; + sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc="; }; postPatch = '' From 52dad0c5bda1caae1a3fc03bba020635cbac390e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 10:27:26 +0000 Subject: [PATCH 11/28] esbuild: 0.15.2 -> 0.15.3 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index e815e2157ec1..c86b4e2dcc67 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-VYW3XQvwxeUnfNMXFcqB6xhh45YgTv4Iu6ce6MEclpw="; + sha256 = "sha256-UjvVaBeKrZ9T/pFQVdIYFHCsmAO+332Q8Gz0bPEfzgw="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From c3860d32dcb8cc5dbe589f04b2c801a1d12db489 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 10:37:58 +0000 Subject: [PATCH 12/28] folly: 2022.08.08.00 -> 2022.08.15.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index e11d00fb1967..69e690011b8a 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.08.08.00"; + version = "2022.08.15.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-shgqM7hUz0uHOtaXSSdnsQW0eUvCUAo3mtq0EISeQgU="; + sha256 = "sha256-GJYjilN2nwKEpuWj2NJQ25hT9lI2pdkWzgfLBph5mmU="; }; nativeBuildInputs = [ From 67272ce26850f3137ea2b0115844287d48502726 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 15 Aug 2022 13:36:58 +0200 Subject: [PATCH 13/28] xprintidle: 0.2.4 -> 0.2.5 --- pkgs/tools/X11/xprintidle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix index 8835d718333b..400306db6efd 100644 --- a/pkgs/tools/X11/xprintidle/default.nix +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "xprintidle"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "g0hl1n"; repo = "xprintidle"; rev = version; - sha256 = "sha256-CgjHTvwQKR/TPQyEWKxN5j97Sh2iec0BQPhC96sfyoI="; + sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ="; }; nativeBuildInputs = [ From ea677891fd18d793cd76280e85c4753637a00245 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 12:07:08 +0000 Subject: [PATCH 14/28] nali: 0.5.0 -> 0.5.3 --- pkgs/applications/networking/nali/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 94a791002909..8cd9faf0c82a 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.5.0"; + version = "0.5.3"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-rK+UKECwG+2WcltV4zhODSFZ1EGkmLTBggLgKGMCAGI="; + sha256 = "sha256-mKZQe+VuhXm5N2SAOfHUlPK6wJPa8Cd+wgDjqSGbR7I="; }; - vendorSha256 = "sha256-pIJsCBevCVMg6NXc96f6hAbFK5VKwjFwCe34A+54NW8="; + vendorSha256 = "sha256-iNgYU/OgdbKscIA9dIVKqV5tiyLaC3Q4D3W1QsW7CWg="; subPackages = [ "." ]; meta = with lib; { From e2329a8786bfb2ff8318325278980ac71b7f8b69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 19:09:46 +0200 Subject: [PATCH 15/28] python310Packages.bleak-retry-connector: 1.7.2 -> 1.8.0 --- .../python-modules/bleak-retry-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 540bdd3aa4ec..248ca673fab4 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "1.7.2"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-qRUS+JJWd2MPXa5Bs2WzZIHk6VcPe75yBoArFGk2yHQ="; + hash = "sha256-wtzZ94nHfVtX8YakMLGxhqvn95v93qL2Qz9OeBRB520="; }; nativeBuildInputs = [ From e2dd5729e03c178f0f3713bd0ce6054b0050af07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 17:10:18 +0000 Subject: [PATCH 16/28] python310Packages.google-cloud-access-context-manager: 0.1.13 -> 0.1.14 --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 620ba52ab430..0f75cccfac75 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.13"; + version = "0.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AnWAJyvLU4vurVv9uJvi2fkl0Sk1nCK5iNxSplxflHs="; + hash = "sha256-GFS9VvdXHxP1KvJzQkgjmYXO3qpMXl8yICGZEr18O8M="; }; propagatedBuildInputs = [ From 928eb9fc0b1ffee6d1a2facc8b97467aec66c473 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Mon, 15 Aug 2022 21:14:44 +0200 Subject: [PATCH 17/28] starship: 1.10.0 -> 1.10.1 --- pkgs/tools/misc/starship/default.nix | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 7875f01f1f07..608b495a8fa5 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -4,10 +4,8 @@ , rustPlatform , installShellFiles , libiconv -, libgit2 , cmake , fetchpatch -, pkg-config , nixosTests , Security , Foundation @@ -16,19 +14,18 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mumlnY9KGKdS3x4U84J4I8m5uMJI7SZR52aT6DPi/MM="; + sha256 = "sha256-ujv2lqhzsug9Qpco+4doMGH+0yG5cZZzLmSLr0MBmZk="; }; - nativeBuildInputs = [ installShellFiles cmake ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles cmake ]; - buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; buildNoDefaultFeatures = true; # the "notify" feature is currently broken on darwin @@ -41,15 +38,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoPatches = [ - # Bump chrono dependency to fix panic when no timezone - (fetchpatch { - url = "https://github.com/starship/starship/commit/e652e8643310c3b41ce19ad05b8168abc29bb683.patch"; - sha256 = "sha256-iGYLJuptPMc45E7o+GXjIx7y2PxuO1mGM7xSopDBve0="; - }) - ]; - - cargoSha256 = "sha256-w7UCExSkgEY52D98SSe2EkuiwtjM6t0/uTiafrtEBaU="; + cargoSha256 = "sha256-iZvjU/GzC/ssXcd+UeV57IA0hKT45cQ09VBB4BNYw50="; preCheck = '' HOME=$TMPDIR From 3ec310d5201fb231b1626787e203165441f0705d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 16 Aug 2022 02:26:46 +0300 Subject: [PATCH 18/28] micro: fix syntax highlighting Fix #186861 --- pkgs/applications/editors/micro/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 9fc80181533c..081b038e2307 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -24,6 +24,10 @@ buildGoModule rec { "-X ${t}/util.CommitHash=${src.rev}" ]; + preBuild = '' + go generate ./runtime + ''; + postInstall = '' installManPage assets/packaging/micro.1 install -Dt $out/share/applications assets/packaging/micro.desktop From a92aae643e5b822d9b3e2dbde70f1f9cad2ade68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 02:18:49 +0000 Subject: [PATCH 19/28] netdata: 1.36.0 -> 1.36.1 --- pkgs/tools/system/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 751725eec6b5..96ca146358d2 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -19,14 +19,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.36.0"; + version = "1.36.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-ir8NO150PgDEaWjTvXuSZMIK3qwZrGyPuGHxLIBfCfU="; + sha256 = "sha256-Msbzfcxq9hqerA9eXuMle+pAhDAAWWE/v0DKXgnhEnM="; fetchSubmodules = true; }; From 3e26073b69e3efb06254521a8d501dcca16156d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 03:49:25 +0000 Subject: [PATCH 20/28] refinery-cli: 0.8.5 -> 0.8.6 --- pkgs/development/tools/refinery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/refinery-cli/default.nix b/pkgs/development/tools/refinery-cli/default.nix index 11219f6eec54..7ba4811433dd 100644 --- a/pkgs/development/tools/refinery-cli/default.nix +++ b/pkgs/development/tools/refinery-cli/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "refinery-cli"; - version = "0.8.5"; + version = "0.8.6"; src = fetchCrate { pname = "refinery_cli"; inherit version; - sha256 = "sha256-I9YjMsl70eiws4ea0P9oqOsNzN+gfO5Jwr7VlFCltq8="; + sha256 = "sha256-vT/iM+o9ZrotiBz6mq9IVVJAkK97QUlOiZp6tg3O8pI="; }; - cargoSha256 = "sha256-Ehofdr6UNtOwRT0QVFaXDrWFRPqdF9eA8eL/hRwIJUM="; + cargoSha256 = "sha256-DMQr0Qtr2c3BHWqTb+IW2cV1fwWIFMY5koR2GPceYHQ="; nativeBuildInputs = [ pkg-config ]; From 8da0cb8c1c012f68efc46f35edbc418a8864c337 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 03:54:56 +0000 Subject: [PATCH 21/28] rustcat: 2.0.0 -> 3.0.0 --- pkgs/tools/networking/rustcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/rustcat/default.nix b/pkgs/tools/networking/rustcat/default.nix index 118725c67933..4a71aea6df5c 100644 --- a/pkgs/tools/networking/rustcat/default.nix +++ b/pkgs/tools/networking/rustcat/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustcat"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "robiot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aoeinz1XVJ+MNt8ndV/HnKLdwa7rXwxIZucCkZCnNaM="; + sha256 = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io="; }; - cargoSha256 = "sha256-cQxBM8m0sy9WKvKqyY/sNE3p4l2v9zdx80mReQEAoc8="; + cargoSha256 = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg="; buildInputs = lib.optional stdenv.isDarwin Security; From 7afc6dc7bed1e97ef803989bd847a97c3e0f25cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 31 Jul 2022 14:12:47 +0200 Subject: [PATCH 22/28] pymanopt: fix build --- .../python-modules/pymanopt/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index a9107da6fb5e..55d56b1f62d3 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -3,8 +3,11 @@ , buildPythonPackage , numpy , scipy +, pytorch , autograd , nose2 +, matplotlib +, tensorflow }: buildPythonPackage rec { @@ -18,12 +21,18 @@ buildPythonPackage rec { sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ="; }; - propagatedBuildInputs = [ numpy scipy ]; - checkInputs = [ nose2 autograd ]; + propagatedBuildInputs = [ numpy scipy pytorch ]; + checkInputs = [ nose2 autograd matplotlib tensorflow ]; checkPhase = '' - # nose2 doesn't properly support excludes - rm tests/test_{problem,tensorflow,theano}.py + # FIXME: Some numpy regression? + # Traceback (most recent call last): + # File "/build/source/tests/manifolds/test_hyperbolic.py", line 270, in test_second_order_function_approximation + # self.run_hessian_approximation_test() + # File "/build/source/tests/manifolds/_manifold_tests.py", line 29, in run_hessian_approximation_test + # assert np.allclose(np.linalg.norm(error), 0) or (2.95 <= slope <= 3.05) + # AssertionError + rm tests/manifolds/test_hyperbolic.py nose2 tests -v ''; From 1142380b3f20ab82558f2e5a6279749906adbe8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Aug 2022 06:02:47 +0200 Subject: [PATCH 23/28] python3.pkgs.pymanopt: add pre and post check --- pkgs/development/python-modules/pymanopt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index 55d56b1f62d3..f04357596852 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { checkInputs = [ nose2 autograd matplotlib tensorflow ]; checkPhase = '' + runHook preCheck # FIXME: Some numpy regression? # Traceback (most recent call last): # File "/build/source/tests/manifolds/test_hyperbolic.py", line 270, in test_second_order_function_approximation @@ -35,6 +36,7 @@ buildPythonPackage rec { rm tests/manifolds/test_hyperbolic.py nose2 tests -v + runHook postCheck ''; pythonImportsCheck = [ "pymanopt" ]; From a948fb27371e50da1036df679cbebf5b23a66f2a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 15 Aug 2022 21:08:24 -0700 Subject: [PATCH 24/28] universal-ctags: 5.9.20220710.0 -> 5.9.20220814.0 --- pkgs/development/tools/misc/universal-ctags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 08e3e5456209..f91b5e8b967a 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "5.9.20220710.0"; + version = "5.9.20220814.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "sha256-/7g1AGLbl49s8hbwy3IGwshKAGKRJrdbECau2acMtjE="; + sha256 = "sha256-U1PjmBb99v7N+Dd7n2r1Xx09yflf0OxRlb4f1Sg0UvI="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 2c3f6055fbaec233ff46447cff526e4443aace02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 4 Jul 2022 12:46:37 +0200 Subject: [PATCH 25/28] syncoid: handle syncing dataset without a parent --- nixos/modules/services/backup/syncoid.nix | 34 ++++++++++++----------- nixos/tests/sanoid.nix | 6 ++++ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 779c71a6ba94..1e445f4bebed 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -16,11 +16,11 @@ let lib.concatMapStrings (s: if lib.isList s then "-" else s) (builtins.split "[^a-zA-Z0-9_.\\-]+" name); - # Function to build "zfs allow" commands for the filesystems we've - # delegated permissions to. It also checks if the target dataset - # exists before delegating permissions, if it doesn't exist we - # delegate it to the parent dataset. This should solve the case of - # provisoning new datasets. + # Function to build "zfs allow" commands for the filesystems we've delegated + # permissions to. It also checks if the target dataset exists before + # delegating permissions, if it doesn't exist we delegate it to the parent + # dataset (if it exists). This should solve the case of provisoning new + # datasets. buildAllowCommand = permissions: dataset: ( "-+${pkgs.writeShellScript "zfs-allow-${dataset}" '' # Here we explicitly use the booted system to guarantee the stable API needed by ZFS @@ -38,15 +38,17 @@ let (concatStringsSep "," permissions) dataset ]} - else - ${lib.escapeShellArgs [ - "/run/booted-system/sw/bin/zfs" - "allow" - cfg.user - (concatStringsSep "," permissions) - # Remove the last part of the path - (builtins.dirOf dataset) - ]} + ${lib.optionalString ((builtins.dirOf dataset) != ".") '' + else + ${lib.escapeShellArgs [ + "/run/booted-system/sw/bin/zfs" + "allow" + cfg.user + (concatStringsSep "," permissions) + # Remove the last part of the path + (builtins.dirOf dataset) + ]} + ''} fi ''}" ); @@ -67,14 +69,14 @@ let (concatStringsSep "," permissions) dataset ]} - ${lib.escapeShellArgs [ + ${lib.optionalString ((builtins.dirOf dataset) != ".") (lib.escapeShellArgs [ "/run/booted-system/sw/bin/zfs" "unallow" cfg.user (concatStringsSep "," permissions) # Remove the last part of the path (builtins.dirOf dataset) - ]} + ])} ''}" ); in diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 3bdbe0a8d8db..97833c37e6ef 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -48,6 +48,9 @@ in { }; # Take snapshot and sync "pool/syncoid".target = "root@target:pool/syncoid"; + + # Test pool without parent (regression test for https://github.com/NixOS/nixpkgs/pull/180111) + "pool".target = "root@target:pool/full-pool"; }; }; }; @@ -105,6 +108,9 @@ in { source.systemctl("start --wait syncoid-pool-syncoid.service") target.succeed("cat /mnt/pool/syncoid/test.txt") + source.systemctl("start --wait syncoid-pool.service") + target.succeed("[[ -d /mnt/pool/full-pool/syncoid ]]") + assert len(source.succeed("zfs allow pool")) == 0, "Pool shouldn't have delegated permissions set after syncing snapshots" assert len(source.succeed("zfs allow pool/sanoid")) == 0, "Sanoid dataset shouldn't have delegated permissions set after syncing snapshots" assert len(source.succeed("zfs allow pool/syncoid")) == 0, "Syncoid dataset shouldn't have delegated permissions set after syncing snapshots" From a4f6ea89947e087d570b81bbce66f3107cd29b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Jul 2022 14:55:12 +0200 Subject: [PATCH 26/28] qt6.qtwebengine: fix build --- pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 17ebd1b2027b..20cfab55d032 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -3,6 +3,7 @@ , qtwebchannel , qtpositioning , qtwebsockets +, buildPackages , bison , coreutils , flex @@ -105,6 +106,9 @@ qtModule rec { patchShebangs . ) + substituteInPlace cmake/Functions.cmake \ + --replace "/bin/bash" "${buildPackages.bash}/bin/bash" + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc From 2ede2cbc2109b98e2bd5428f6687986de2adcc93 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 14 Aug 2022 10:47:08 +0800 Subject: [PATCH 27/28] epick: fix build --- pkgs/applications/graphics/epick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index 6e98f0fe2529..668999f68dfa 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { owner = "vv9k"; repo = pname; rev = version; - sha256 = "sha256-JSKenJEM+FUk/2BtAstIhJ26kFBRDvvFAlBsb0ltUsY="; + sha256 = "sha256-BrJkG1OYpkAfBYUfLn/CNDBc0n1tW5OLnpobkPABQow="; }; cargoSha256 = "sha256-hFay+XL2oqA7SC+I3wlrzhUmUitO2vbeqfoArU9Jsp4="; From 3e96a3f6b9460eade50777eba679adab6e09c79b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 14 Aug 2022 04:33:37 +0200 Subject: [PATCH 28/28] didyoumean: 1.1.0 -> 1.1.3 --- pkgs/tools/misc/didyoumean/default.nix | 36 +++++++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index 3839d117afd0..ecc9404d71c2 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -2,32 +2,54 @@ , stdenv , rustPlatform , fetchFromGitHub +, installShellFiles +, pkg-config , libxcb -# Darwin dependencies +, openssl + # Darwin dependencies , AppKit }: rustPlatform.buildRustPackage rec { pname = "didyoumean"; - version = "1.1.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "hisbaan"; repo = "didyoumean"; rev = "v${version}"; - sha256 = "sha256-t2bmvz05vWIxQhC474q/9uky1kAQoFN8Z+qflw5Vj68="; + sha256 = "sha256-hHl9PGNDFN7Dad2JOlAy99dz0pC9OmphwYMJHBBwx7Y="; }; - cargoSha256 = "sha256-4DbziI9enib4pm9/P4WEu15glIxtejaV2GCqbzuxxyw="; + cargoSha256 = "sha256-rjkj9MO6fXVOk3fA87olGt/iIaJ8Zv/cy/Cqy/pg6yI="; - buildInputs = lib.optional stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optionals stdenv.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + libxcb + openssl + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; + + postInstall = '' + installManPage man/dym.1 + installShellCompletion completions/dym.{bash,fish} + installShellCompletion --zsh completions/_dym + ''; + + # Clipboard doesn't exist in test environment + doCheck = false; meta = with lib; { description = "A CLI spelling corrector for when you're unsure"; homepage = "https://github.com/hisbaan/didyoumean"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ evanjs ]; + maintainers = with maintainers; [ evanjs wegank ]; mainProgram = "dym"; }; }