From 15926c606330029cea116d78c6ba94da87479acc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 00:06:18 +0000 Subject: [PATCH 01/13] _1password: 2.7.2 -> 2.7.3 --- pkgs/applications/misc/1password/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 1a450be6af63..e744388b8649 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.7.2"; + version = "2.7.3"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-lYY69zbJqE9KuP1Yihfz444GFazHgR9zHVDq9RzZdTA=" "zip"; - i686-linux = fetch "linux_386" "sha256-IgTusLxgeOS9u4G1M7JqqxJw2D3hy5L9wl77crgfHjM=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-OL/URp5eU3K1ObTlC4nXELa7NkrZDW5tFwhgVdrmPdQ=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-pL39V9AO2DjCcWlecteTMCcBBZVb3RXmJ8wk5gyFojg=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-FxApOWyExyfuRFQhxAVBWZGqQNmarBFBRB4jqsreWL0=" "zip"; + i686-linux = fetch "linux_386" "sha256-Ta6mdmcsKnNRMz9vwEadZ/xXVBran5BIJQngzNz3PUs=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-Lvxnp5KmkIj9jnaWg02a27eRYIx7WTNSLx+RJ04Vt+g=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-6qrNgb5ae+qqlNsNDLbKNeWj0o/SRs+2G/4DfK5Wnhg=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; From 6a20958e75b1364dffa88082da94ba401d44d1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 21 Oct 2022 17:01:26 +0200 Subject: [PATCH 02/13] fastly: 3.2.4 -> 4.3.0 --- pkgs/misc/fastly/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 64e39319b2f2..1c653327e717 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, installShellFiles, buildGoModule, go }: +{ lib, fetchurl, fetchFromGitHub, installShellFiles, buildGoModule, go }: buildGoModule rec { pname = "fastly"; - version = "3.2.4"; + version = "4.3.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8="; + sha256 = "sha256-TxN0DQ4OKfHn+u4ixpCgcyRRTs52IZRjgcbJuqajeVo="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -23,7 +23,7 @@ buildGoModule rec { subPackages = [ "cmd/fastly" ]; - vendorSha256 = "sha256-glztVmAAdkEccJEFIHGWjNzz/+MjExSX18GDX66sdxA="; + vendorSha256 = "sha256-7EtyQYPe+oJmQ7uECbjkBjLnM9T03g6gFwUwebKuccc="; nativeBuildInputs = [ installShellFiles ]; @@ -37,7 +37,13 @@ buildGoModule rec { "-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}" "-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}" ]; - preBuild = '' + preBuild = let + cliConfigToml = fetchurl { + url = "https://web.archive.org/web/20221104122906/https://developer.fastly.com/api/internal/cli-config"; + sha256 = "sha256-BHsUWrMp//X95gcB+WbD/nfyduZUkH8jHXk3CfOBAhg="; + }; + in '' + cp ${cliConfigToml} ./pkg/config/config.toml ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)" ''; From c9dbda414edb755886a1a4de104548747fae203b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 14:33:22 +0000 Subject: [PATCH 03/13] i3: 4.21 -> 4.21.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 9a6fc5959548..4ffa04d73bf5 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.21"; + version = "4.21.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-jcUgXg80Q9WGYeMHg1If2cbUJtHn82Z6sS8qwbLTIHg="; + sha256 = "sha256-7f14EoXGVKBdxtsnLOAwDEQo5vvYddmZZOV94ltBvB4="; }; nativeBuildInputs = [ From ee94fbdfe2faa1f1c7628b054856feb927668123 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 18:57:59 +0000 Subject: [PATCH 04/13] numix-icon-theme-square: 22.10.31 -> 22.11.05 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 0c3435908aa7..4d9b67aec388 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.10.31"; + version = "22.11.05"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-TtRIVut4VBkQnM0+DM44305+FG3l2tDSU+FfaR7OFZI="; + sha256 = "sha256-XHf9YzZ9VY63Jv7HXSL2NAfft1VYeMzcqd9+vz1CBhg="; }; nativeBuildInputs = [ gtk3 ]; From c0c7fb71354e5cef862961b387dc6906302b91ee Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 5 Nov 2022 18:29:17 -0400 Subject: [PATCH 05/13] ruff: 0.0.100 -> 0.0.102 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 5ff02a25d3d3..8ba76af4f1e2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.100"; + version = "0.0.102"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kFWYSaRKx63X6Nfxd1knkusiJRKVRTNdd1jOQXBCRFQ="; + sha256 = "sha256-vYN73RcVwu2gwa+09wPqeIvqAx/SHnpe5m6fuXrK1ts="; }; - cargoSha256 = "sha256-eew1ZTCm/C3qY/eZvWYkcLprgM/cRaTb6e2O66SNwk8="; + cargoSha256 = "sha256-6CBadq+VuUhUvzjgTo+qRy5RsoLotEWuR4+lyf9YFjU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 5d4e386d55ea66e573e4f4d93f1b2e4323c5e993 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 5 Nov 2022 18:37:39 -0400 Subject: [PATCH 06/13] ripdrag: 0.2.0 -> 0.2.1 --- pkgs/tools/misc/ripdrag/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index a995cf1e7567..d9eca0f1b649 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.2.0"; + version = "0.2.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-bXyJcSJfKHkcwTayEbX9sZZEBeP9qoH36QqBIDnmKQM="; + sha256 = "sha256-/TF9dWZQVEVM3lHp4ubxYkDW+ZDL9puT6mUT6Q3hUsw="; }; - cargoSha256 = "sha256-PqoIJ0mbpaE4UX+kz3pFiqmTS1Vp+jF2OT5+3K2A0MQ="; + cargoSha256 = "sha256-mIsT93XRU0mR5s5w3Sng2DTW2LyO9HT1w/1932vptIE="; nativeBuildInputs = [ pkg-config ]; From 6abb510b481b9530001186674ffa3f3736dd906d Mon Sep 17 00:00:00 2001 From: "*Kim Zick (rummik)" Date: Sat, 5 Nov 2022 19:01:15 -0400 Subject: [PATCH 07/13] just: 1.7.0 -> 1.8.0 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index c332cc61b43a..a03586c48166 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - hash = "sha256-W8ko9hzZmgF8XEqzbPtCJp5J38m0pAz5wTp3VRUmZOQ="; + hash = "sha256-mzVwdvMYpThSPGvM3hpuKzeHZW5HOwkEfONIN/aziXY="; }; - cargoSha256 = "sha256-rC+PcLQHjnaGSEELod6IF9NTCl0tnXvOOkHF0z77Lao="; + cargoSha256 = "sha256-dDaXmJ4wFJaE59qR5Bxvoz/Jrwt6hhWhJI8wLRXCLcU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 407b1ce09d0b0d169a3392299eb0e4031096f100 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 5 Nov 2022 16:12:04 -0300 Subject: [PATCH 08/13] weka: use openjdk11 Signed-off-by: lucasew --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9456fdfe6487..685107a4fe4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36054,7 +36054,7 @@ with pkgs; msieve = callPackage ../applications/science/math/msieve { }; - weka = callPackage ../applications/science/math/weka { }; + weka = callPackage ../applications/science/math/weka { jre = openjdk11; }; yad = callPackage ../tools/misc/yad { }; From 836f31e1040dedd6d895570b6030d12f53e6e58a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 6 Nov 2022 00:52:27 +0100 Subject: [PATCH 09/13] trezor-suite: 22.8.2 -> 22.10.3 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index b110bd4e33be..941b1e1f6d0f 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "22.8.2"; + version = "22.10.3"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-tzGkEDVXOJaTfRPO4UUfDpqaddjeJvVHpf81A9hhpUTRIgbAO4fcOrTgJcgWCBotDo8nHCWjw+n5BG5PEfQ19Q=="; - x86_64-linux = "sha512-qUM3HGYXbVbLRYXetLGbShPU5ochuptCUNn0G5RD3tQeipVZsgRkQCSfZ1Zb3HgoPUOna3u8Mp7Ipu1n8xi3vg=="; + aarch64-linux = "sha512-fI0N1V+6SEZ9eNf+G/w5RcY8oeA5MsVzJnpnWoMzkkHZh5jVHgNbcqVgSPbzvQ/WZNv1MX37KETcxmDwRx//yw=="; + x86_64-linux = "sha512-zN89Qw6fQh27EaN9ARNwqhiBaiNoMic6Aq2UPG0OSUtOjEOdkGJ2pbR8MgWVccSgRH8ZmAAXZ0snVKfZWHbCjA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 79efdd54d699827d0e3d80c160e450bca6785a01 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 6 Nov 2022 01:09:42 +0100 Subject: [PATCH 10/13] trezord: 2.0.31 -> 2.0.32 --- pkgs/servers/trezord/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 29cd2766bd8b..a6f3bba51c95 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -8,20 +8,27 @@ buildGoModule rec { pname = "trezord-go"; - version = "2.0.31"; + version = "2.0.32"; + commit = "9aa6576"; src = fetchFromGitHub { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b"; + fetchSubmodules = true; + sha256 = "sha256-T7YoHi2sA22nfNbgX2WB5NIFIwxBkxn0CsSXyQTxgJc="; }; - vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61"; + vendorSha256 = "sha256-wXgAmZEXdM4FcMCQbAs+ydXshCAMu7nl/yVv/3sqaXE="; propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ldflags = [ + "-s" "-w" + "-X main.githash=${commit}" + ]; + meta = with lib; { description = "Trezor Communication Daemon aka Trezor Bridge"; homepage = "https://trezor.io"; From 77de45c852cc6e2e2830588e73303c5fa98af783 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 6 Nov 2022 00:21:46 +0000 Subject: [PATCH 11/13] gcsfuse: 0.41.7 -> 0.41.8 --- pkgs/tools/filesystems/gcsfuse/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 3086a8c0a6ee..16d0ae0be8c8 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gcsfuse"; - version = "0.41.7"; + version = "0.41.8"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-hqT1X78g1Mg7xWHrVTwN41P+wgkrjfYrX2vHmwxZoCQ="; + sha256 = "sha256-9Y6phVYWI5xhqJf2LL9WbaG8vyfNcGUcnaHjKA4krjA="; }; vendorSha256 = null; @@ -17,6 +17,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; + preCheck = + let skippedTests = [ + "Test_Main" + "TestFlags" + ]; in + '' + # Disable flaky tests + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; + postInstall = '' ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse From 4b59590ac5326b82581e96f4eb1ff7417c932387 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 5 Nov 2022 21:57:23 -0300 Subject: [PATCH 12/13] Revert "lib,doc: remove obvious usages of toString on paths" --- doc/doc-support/lib-function-locations.nix | 2 +- lib/sources.nix | 10 +++++----- lib/trivial.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix index ac4da88052da..68edd2709854 100644 --- a/doc/doc-support/lib-function-locations.nix +++ b/doc/doc-support/lib-function-locations.nix @@ -38,7 +38,7 @@ let substr = builtins.substring prefixLen filenameLen filename; in substr; - removeNixpkgs = removeFilenamePrefix pkgs.path; + removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path); liblocations = builtins.filter diff --git a/lib/sources.nix b/lib/sources.nix index b7fb71bd0b0b..cec395c9bb18 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -140,7 +140,7 @@ let origSrc = if isFiltered then src.origSrc else src; in lib.cleanSourceWith { filter = (path: type: - let relPath = lib.removePrefix (origSrc + "/") (path); + let relPath = lib.removePrefix (toString origSrc + "/") (toString path); in lib.any (re: match re relPath != null) regexes); inherit src; }; @@ -175,12 +175,12 @@ let */ commitIdFromGitRepo = let readCommitFromFile = file: path: - let fileName = path + "/" + file; - packedRefsName = path + "/packed-refs"; + let fileName = toString path + "/" + file; + packedRefsName = toString path + "/packed-refs"; absolutePath = base: path: if lib.hasPrefix "/" path then path - else /. + "${base}/${path}"; + else toString (/. + "${base}/${path}"); in if pathIsRegularFile path # Resolve git worktrees. See gitrepository-layout(5) then @@ -226,7 +226,7 @@ let pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir); - canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext src); + canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src)); # -------------------------------------------------------------------------- # # Internal functions diff --git a/lib/trivial.nix b/lib/trivial.nix index 8f2023caaf8e..5d4fad8266bc 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -213,8 +213,8 @@ rec { # Default value to return if revision can not be determined default: let - revisionFile = ./.. + "/.git-revision"; - gitRepo = ./.. + "/.git"; + revisionFile = "${toString ./..}/.git-revision"; + gitRepo = "${toString ./..}/.git"; in if lib.pathIsGitRepo gitRepo then lib.commitIdFromGitRepo gitRepo else if lib.pathExists revisionFile then lib.fileContents revisionFile From adc7d07c0c8162ecb9fe0b075386d549680ef914 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 1 Nov 2022 19:59:40 +0800 Subject: [PATCH 13/13] oil: 0.12.6 -> 0.12.7 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 1b8f38ab1bd4..49d8517eeca0 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.12.6"; + version = "0.12.7"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-jlNmrpze02g4FL4EFlKoZC7X/YOr3xhJWnMTPga3Bas="; + hash = "sha256-WEbEcG4B+MqDVPXHjpp5lkJxT8AS+NivtJGfrnrcBys="; }; postPatch = ''