From daa77caf9bf660c52858772d8aa4cf9ab08ffe92 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 19 Jun 2022 17:18:01 -0400 Subject: [PATCH 01/16] cc-wrapper: disable response files for ccache The problem is that the ccache wrapper does not work with response files (it seems like the fd doesn't survive after exec in the makeWrapper wrapper). --- pkgs/build-support/cc-wrapper/default.nix | 4 ++-- pkgs/development/tools/misc/ccache/default.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 35d714f9b41e..b011322aa3dd 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -15,7 +15,7 @@ , propagateDoc ? cc != null && cc ? man , extraTools ? [], extraPackages ? [], extraBuildCommands ? "" , nixSupport ? {} -, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null +, isGNU ? false, isClang ? cc.isClang or false, isCcache ? cc.isCcache or false, gnugrep ? null , buildPackages ? {} , libcxx ? null }: @@ -178,7 +178,7 @@ stdenv.mkDerivation { local dst="$1" local wrapper="$2" export prog="$3" - export use_response_file_by_default=${if isClang then "1" else "0"} + export use_response_file_by_default=${if isClang && !isCcache then "1" else "0"} substituteAll "$wrapper" "$out/bin/$dst" chmod +x "$out/bin/$dst" } diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 98ae2d42ba40..22345023c366 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -76,6 +76,7 @@ let ccache = stdenv.mkDerivation rec { passthru = { isClang = unwrappedCC.isClang or false; isGNU = unwrappedCC.isGNU or false; + isCcache = true; }; inherit (unwrappedCC) lib; nativeBuildInputs = [ makeWrapper ]; From e9bba1da96d6f53e6e007a254d74e8ce655406e8 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 8 Apr 2023 12:32:54 -0700 Subject: [PATCH 02/16] goffice: fix cross goffice needs glib-genmarshal in its nativeBuildInputs. --- pkgs/development/libraries/goffice/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 21713000c644..36a9c79ea687 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,5 +1,8 @@ { fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem -, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome }: +, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome +, autoreconfHook +, gtk-doc +}: stdenv.mkDerivation rec { pname = "goffice"; @@ -12,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "FqIhGRhVpqbA0Gse+OSBzz9SBBplTsltNYFwRboama8="; }; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ + pkg-config intltool autoreconfHook gtk-doc + glib # for glib-genmarshal + ]; propagatedBuildInputs = [ glib gtk3 libxml2 cairo pango libgsf lasem From 98c3d190b2bc732a211fb417a73b3cad7a33c83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 13 Apr 2023 13:56:08 +0200 Subject: [PATCH 03/16] nixos/openssh: Drop deprecated locations The changelog entry should give a good indication why I don't think this is necessary anymore. --- nixos/doc/manual/release-notes/rl-2305.section.md | 4 ++++ nixos/modules/programs/ssh.nix | 7 +++---- nixos/modules/services/networking/ssh/sshd.nix | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 8c8a81519659..0b274e3bb5c1 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -123,6 +123,10 @@ In addition to numerous new and upgraded packages, this release has the followin - The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes` +- The `ssh` module does not read `/etc/ssh/ssh_known_hosts2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2). + +- The openssh module does not read `~/.ssh/authorized_keys2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2). + - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 1ec698820a8b..7c85d1e7c3d5 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -26,7 +26,7 @@ let + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) )) + "\n"; - knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" "/etc/ssh/ssh_known_hosts2" ] + knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" ] ++ map pkgs.copyPathToStore cfg.knownHostsFiles; in @@ -232,9 +232,8 @@ in description = lib.mdDoc '' Files containing SSH host keys to set as global known hosts. `/etc/ssh/ssh_known_hosts` (which is - generated by {option}`programs.ssh.knownHosts`) and - `/etc/ssh/ssh_known_hosts2` are always - included. + generated by {option}`programs.ssh.knownHosts`) is + always included. ''; example = literalExpression '' [ diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 5f225682b777..4ec89be82b70 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -536,7 +536,7 @@ in # https://github.com/NixOS/nixpkgs/pull/10155 # https://github.com/NixOS/nixpkgs/pull/41745 services.openssh.authorizedKeysFiles = - [ "%h/.ssh/authorized_keys" "%h/.ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ]; + [ "%h/.ssh/authorized_keys" "/etc/ssh/authorized_keys.d/%u" ]; services.openssh.extraConfig = mkOrder 0 '' From c01aef2947d6b408354d8b1cf2c2a45e52ee6a6e Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sat, 15 Apr 2023 00:35:32 +0200 Subject: [PATCH 04/16] _1password-gui: 8.10.0 -> 8.10.4, 8.10.1-19.BETA -> 8.10.5-10.BETA --- .../misc/1password-gui/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index ef9c234bb76f..e70f129b607c 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.0" else "8.10.1-19.BETA"; + version = if channel == "stable" then "8.10.4" else "8.10.5-10.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-mIplIW1XGb7EVlPIHgzL16zvVa/3ypfwTMtVSiSvYYE="; + sha256 = "sha256-zFB8bUl0FNmMvNN5AoDeYdUjasJblVxRAi50V2BF5OU="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-xjbqZ/+sw3jBzbqhzd/mP7CZOCLYYi6KpX8Ypy/8/Es="; + sha256 = "sha256-gALQ43mAJy3eX/0qmdBp0yfMLgAdqAqD93CbDydvJR8="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-06wOSKzxZ7xVAUyIa4Fv48Z6nbMsQ/o74mEyVkmgkJs="; + sha256 = "sha256-4kpf3U4G3Jx8g24kU4nXZbDA3o29hEpwACOE2zAadhA="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-zDu3PBj6kvDVpiFuoOuNlmyiSK4ZVuUWX3rBBwlwEvo="; + sha256 = "sha256-eTRI7reSZ24S8uwNFPk8BkwMexdoXD5tlL6Bd3zzIGI="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-F/dnA9mqtXXp5vx6OQ5aPrdeEBMg9g6nozzMMNAZWHk="; + sha256 = "sha256-GM93nW7kGeC2Mmq1ZtOK72RQc0QHvlWedDLEAmqtPt4="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-u8ktPt7W4teCJoXq1eEdKZCEsKxjhep/7DMHSMtuFBA="; + sha256 = "sha256-f0K35utZ/WPv08wRe/ZQPWC/IYiXsf/tBqhKjgeNBHc="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-dZ1Vv4oocDYlw2sibnokUyAKcZ2W7zKofTX2ELamilI="; + sha256 = "sha256-zWS1nmRNm2SjMKWRbCJp4DRCzvVsdATdf/EMlpvRz1k="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-JA2U/PfW2+qHPjqIGQL5gWIdqtd5G1lL3+hecYh2lcE="; + sha256 = "sha256-fQ98NJI5h0IBvrcsV8GBt9RBWDiyYq0NPtS5B5ikz8k="; }; }; }; From ce6971f2dd4977037dad445098d9e72e0d494d0b Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sat, 15 Apr 2023 00:36:07 +0200 Subject: [PATCH 05/16] _1password-gui: improve update-script to be more flexible --- pkgs/applications/misc/1password-gui/update.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh index aab589fd37ea..fc6d350f2330 100755 --- a/pkgs/applications/misc/1password-gui/update.sh +++ b/pkgs/applications/misc/1password-gui/update.sh @@ -27,6 +27,18 @@ print_hash() { echo "$CHANNEL ${ARCH}-${OS}: $CURRENT_HASH" } +if [[ -z "$STABLE_VER" && -n "$1" ]]; then + STABLE_VER="$1" +fi + +if [[ -z "$BETA_VER" && -n "$2" ]]; then + BETA_VER="$2" +fi + +if [[ "${BETA_VER: -4}" != "BETA" ]]; then + BETA_VER="$BETA_VER.BETA" +fi + if [[ -z "$STABLE_VER" ]]; then echo "No 'STABLE_VER' environment variable provided, skipping" else From 73bac9816428a9019f570b5571a179a5719aca4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Apr 2023 04:37:06 +0000 Subject: [PATCH 06/16] act: 0.2.43 -> 0.2.44 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index da9a7f4db6da..9b9e399caa1b 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.43"; + version = "0.2.44"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Le5jw1ezGNx4lurHucbJ+q9arXldnHjDlAO61w4p61U="; + hash = "sha256-Hy/s7IVkarz/RLTP2ojyrPHkzepKFTxqS7omEYHi570="; }; - vendorHash = "sha256-yQA84lBe85/NyG6GUa9gueLKw7Ei+3Hc3U9PmqGG8YA="; + vendorHash = "sha256-6Js3k0YZm8t52pT241d8pb71e2bXaF4FIWXZU51wvds="; doCheck = false; From cc129fb3f2d69802cb6175e0559c23bf1b87cf3d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Apr 2023 03:06:34 +0000 Subject: [PATCH 07/16] terraform-providers.aviatrix: 3.0.4 -> 3.0.5 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b5b4265b7db2..b1f93618fffc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -101,11 +101,11 @@ "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { - "hash": "sha256-gEIfDiI0ZVTVwijY+rc5nL8fKptSlUocx2lS8pT1Xjg=", + "hash": "sha256-DjdA4kvOtPO4x1MY+lJjX+KNuQTxSZQvisSfokQk5Sg=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.0.4", + "rev": "v3.0.5", "spdx": "MPL-2.0", "vendorHash": null }, From 17f9e6b098ee9d109a866e19dafdb9d223d60a00 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Apr 2023 03:13:11 +0000 Subject: [PATCH 08/16] terraform-providers.flexibleengine: 1.36.1 -> 1.37.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b1f93618fffc..8289e38e3096 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -390,11 +390,11 @@ "vendorHash": null }, "flexibleengine": { - "hash": "sha256-0wpyi397+5YAa3epZZII312rK1SnPU5k9a1/iVTbqmU=", + "hash": "sha256-TZR/zXgecHUbaD9Yb83HvBwWauDtHDsnEcSZYFmY5y4=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.36.1", + "rev": "v1.37.0", "spdx": "MPL-2.0", "vendorHash": "sha256-HcyUGKbgj322fU7keN/lBEn6UJhV3QXScBJHZHJkCII=" }, From 0ec24099fc6e7bc52fa496b7f8b085b847df1acc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Apr 2023 03:14:55 +0000 Subject: [PATCH 09/16] terraform-providers.alicloud: 1.202.0 -> 1.203.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8289e38e3096..8c0a964b05d9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -46,11 +46,11 @@ "vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg=" }, "alicloud": { - "hash": "sha256-ZFnVCrC2fK2i5idK2rWCOZQ3W4K3nDSG5ZkEZk2Zg9c=", + "hash": "sha256-6PStzU5YBhFDGtQOWUZ8Iyo9miRCTMgDsuJX0rNCYMQ=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.202.0", + "rev": "v1.203.0", "spdx": "MPL-2.0", "vendorHash": null }, From e0fc7cd7bc2f74fb71d510bb983b5ce9257d38d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Apr 2023 03:15:20 +0000 Subject: [PATCH 10/16] terraform-providers.hcloud: 1.38.1 -> 1.38.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8c0a964b05d9..f07bd3bc9bda 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -484,11 +484,11 @@ "vendorHash": null }, "hcloud": { - "hash": "sha256-yAUrrIhaJIdwKCsOcsouEev7GFLLJPoXAif1DXD46sU=", + "hash": "sha256-B6XL9izArnbkI7TWbuB/m/UgGK+YlrpaQEJ+etWQBJk=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.38.1", + "rev": "v1.38.2", "spdx": "MPL-2.0", "vendorHash": "sha256-gz96b+GOE7AgXzEL4odneYA01wZv4oXwz//Yyu9rg3E=" }, From 9fa47d9a8bc2e1d612fb1ec8a993e2df9245c548 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Apr 2023 03:17:36 +0000 Subject: [PATCH 11/16] terraform-providers.pagerduty: 2.14.0 -> 2.14.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f07bd3bc9bda..d6fa1177226f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -882,11 +882,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-roreCock+WDBNw/v3/esVVntF7cZmEnDW5sZ4GMmQbs=", + "hash": "sha256-jEpQ6TD+RsmuBGPGLotkTyM7ADBLOAu97oPVeMRsiQk=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.14.0", + "rev": "v2.14.1", "spdx": "MPL-2.0", "vendorHash": null }, From 44ccb54b8a6e960d92c28f40ed0722e63a0d4f7c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Apr 2023 03:21:38 +0000 Subject: [PATCH 12/16] terraform-providers.tencentcloud: 1.80.2 -> 1.80.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d6fa1177226f..f026711d5175 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1098,11 +1098,11 @@ "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY=" }, "tencentcloud": { - "hash": "sha256-Wapcnyf1jN75ZKZTFXMixRNianq1FWC8TMddXmFSmj8=", + "hash": "sha256-j1PffTicdXiit3D+dX9HzkBZFmf8Ch7LxNVU3XGi5uY=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.80.2", + "rev": "v1.80.3", "spdx": "MPL-2.0", "vendorHash": null }, From b931b65d87e5d8bbe58fecdec21f6d9a95747f2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Apr 2023 05:20:53 +0000 Subject: [PATCH 13/16] mmv-go: 0.1.4 -> 0.1.5 --- pkgs/tools/misc/mmv-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix index 3846210a192f..b01371ff50fa 100644 --- a/pkgs/tools/misc/mmv-go/default.nix +++ b/pkgs/tools/misc/mmv-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmv-go"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "itchyny"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-n7yW+0cabJGDgppt6Qcj7ID3sD85094NDOPk2o9xDwY="; + sha256 = "sha256-5pVjonlVhIzov8YXgXIqpV3Hy/2ikW4YXJfz68zdxVo="; }; - vendorSha256 = "sha256-3Xk8S2Em28r5R7894Ubo2OOlGhrKplV/gY4ftCjPvMo="; + vendorHash = "sha256-XK+Puic5Bbb7QTc3SHltUuRfTTK7FpCEudN1+tVv18w="; ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ]; From 534f790a75b8b4a2f02da41d62f8b897f172c35a Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 15 Apr 2023 00:14:15 +0200 Subject: [PATCH 14/16] kicad: 7.0.1 -> 7.0.2 --- .../science/electronics/kicad/versions.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index b102da24a3d4..bafdf1c3583b 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "7.0.1"; + version = "7.0.2"; src = { - rev = "3b83917a115be1ce2f33a73039f59f8784b5c2e7"; - sha256 = "021safxvyq9qzs08jy3jvpazmhvix4kyl05s9y9hwmyzdmdl2smn"; + rev = "6a45011f421d65a241e1df4a2dc720819922f343"; + sha256 = "0san7pjgvd8niwrki722qb6y46r71rlyspqp43pmkiz55dmz52zx"; }; }; libVersion = { - version = "7.0.1"; + version = "7.0.2"; libSources = { - symbols.rev = "adfe3c06b5750d81580ed44e669b578f49c205eb"; - symbols.sha256 = "14c5gci13m30xv0cmic5jxsmfx9lq3fnd8hyq3mmgkrw7443zy30"; - templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200"; - templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv"; - footprints.rev = "1cf5a1d979cffebd62464c1bb0d7b09c5ee3b8c3"; - footprints.sha256 = "0k0z40wmaq665hjxb6kp1yl3v7clxz49r6ki0chyphsxv1cnixmy"; - packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; - packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; + symbols.rev = "22ed11504c140fded542eeb104cdb02e0a65672e"; + symbols.sha256 = "0aah92rb8yx00z0xwx9z7xn5rrw4cc3z35gr7c0bnb49hiak01jc"; + templates.rev = "331068741c80fee8195646d3dee40f3b840495e7"; + templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; + footprints.rev = "e187e2dfa9bd04d91cad0d875049ab56780b6e32"; + footprints.sha256 = "1qrdznfd4a6kzwd4aaijkpyjy0xnrmi66isq9z52652a8s6ja48v"; + packages3d.rev = "6374ae3db8b43a4d779185b7017fcfe0e1f32590"; + packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31"; }; }; }; From cce076bd2437e95c06d3b56f4fa174a2e3c0fcbf Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 15 Apr 2023 00:56:13 +0200 Subject: [PATCH 15/16] kicad-unstable: 2023-03-29 -> 2023-04-14 workaround for upstream issue 14346 no longer needed --- .../science/electronics/kicad/base.nix | 3 --- .../science/electronics/kicad/versions.nix | 20 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index eb65b6881ae2..1b0bdc3ae49c 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -94,9 +94,6 @@ stdenv.mkDerivation rec { # should be resolved in the next release "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ] - ++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346 - "-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/${python.sitePackages}/" - ] ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF" ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index bafdf1c3583b..2c8161188819 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -25,23 +25,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2023-03-29"; + version = "2023-04-14"; src = { - rev = "d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95"; - sha256 = "0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn"; + rev = "4a3f77cd9dac9dc5921eb9beaa63d0d3c9c051e5"; + sha256 = "06dsiyvr7zn3cp13w0y63d1qmjlhzsqlvajkximg3pw5mmiljxrr"; }; }; libVersion = { - version = "2023-03-29"; + version = "2023-04-14"; libSources = { - symbols.rev = "36fc1c88921bf32ebf667e027dfe63cca649fd95"; - symbols.sha256 = "177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz"; + symbols.rev = "38d4e7e1ab6a9b5d9eee85f687e60467753b2135"; + symbols.sha256 = "0df6fx9b19v6sxrfyggbisw72y66kiwqi05k8mldsgiw6q55gbkc"; templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "dc4574eb65136d95a7775d09412d5159f8d7832c"; - footprints.sha256 = "1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc"; - packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; - packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; + footprints.rev = "4da055a2d572ff87e7ecea97cf358ed8c1d46dfc"; + footprints.sha256 = "1xb84284dmcb7mbvzlrxb4v4km3ih7gq856h8cglf9jn8wzlnvrk"; + packages3d.rev = "0f43a0962437feb53bd2083e9f39efffb5a5dd90"; + packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31"; }; }; }; From 4566cd69016a275d8aba3fdb6f6e6aec2d8f97f2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 15 Apr 2023 14:39:04 +0300 Subject: [PATCH 16/16] qt6.qtbase: add frameworks on x86_64-darwin --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index dfd51f26587b..d5892d9798d9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -184,6 +184,7 @@ stdenv.mkDerivation rec { libinput ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ AppKit + CoreBluetooth ] ++ lib.optional withGtk3 gtk3 ++ lib.optional developerBuild gdb