commit a9864a3f5a0e89c07e108d6b661dcc7ec9b23600 · pyrox.dev/nixpkgs

+1 -1

doc/doc-support/lib-function-locations.nix

···

       38
       38
        
             substr = builtins.substring prefixLen filenameLen filename;

     

       39
       39
        
             in substr;

     

       40
       40
        
       

     

       41
       41
       -
         removeNixpkgs = removeFilenamePrefix pkgs.path;

     

       41
       41
       +
         removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path);

     

       42
       42
        
       

     

       43
       43
        
         liblocations =

     

       44
       44
        
           builtins.filter

+5 -5

lib/sources.nix

···

       140
       140
        
             origSrc = if isFiltered then src.origSrc else src;

     

       141
       141
        
           in lib.cleanSourceWith {

     

       142
       142
        
             filter = (path: type:

     

       143
       143
       -
               let relPath = lib.removePrefix (origSrc + "/") (path);

     

       143
       143
       +
               let relPath = lib.removePrefix (toString origSrc + "/") (toString path);

     

       144
       144
        
               in lib.any (re: match re relPath != null) regexes);

     

       145
       145
        
             inherit src;

     

       146
       146
        
           };

     
···

       175
       175
        
         */

     

       176
       176
        
         commitIdFromGitRepo =

     

       177
       177
        
           let readCommitFromFile = file: path:

     

       178
       178
       -
               let fileName       = path + "/" + file;

     

       179
       179
       -
                   packedRefsName = path + "/packed-refs";

     

       178
       178
       +
               let fileName       = toString path + "/" + file;

     

       179
       179
       +
                   packedRefsName = toString path + "/packed-refs";

     

       180
       180
        
                   absolutePath   = base: path:

     

       181
       181
        
                     if lib.hasPrefix "/" path

     

       182
       182
        
                     then path

     

       183
       183
       -
                     else /. + "${base}/${path}";

     

       183
       183
       +
                     else toString (/. + "${base}/${path}");

     

       184
       184
        
               in if pathIsRegularFile path

     

       185
       185
        
                  # Resolve git worktrees. See gitrepository-layout(5)

     

       186
       186
        
                  then

     
···

       226
       226
        
       

     

       227
       227
        
         pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir);

     

       228
       228
        
       

     

       229
       229
       -
         canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext src);

     

       229
       229
       +
         canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src));

     

       230
       230
        
       

     

       231
       231
        
         # -------------------------------------------------------------------------- #

     

       232
       232
        
         # Internal functions

+2 -2

lib/trivial.nix

···

       213
       213
        
           # Default value to return if revision can not be determined

     

       214
       214
        
           default:

     

       215
       215
        
           let

     

       216
       216
       -
             revisionFile = ./.. + "/.git-revision";

     

       217
       217
       -
             gitRepo      = ./.. + "/.git";

     

       216
       216
       +
             revisionFile = "${toString ./..}/.git-revision";

     

       217
       217
       +
             gitRepo      = "${toString ./..}/.git";

     

       218
       218
        
           in if lib.pathIsGitRepo gitRepo

     

       219
       219
        
              then lib.commitIdFromGitRepo gitRepo

     

       220
       220
        
              else if lib.pathExists revisionFile then lib.fileContents revisionFile

+3 -3

pkgs/applications/blockchains/trezor-suite/default.nix

···

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
        
         pname = "trezor-suite";

     

       11
       11
       -
         version = "22.8.2";

     

       11
       11
       +
         version = "22.10.3";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
        
       

     

       14
       14
        
         suffix = {

     
···

       19
       19
        
         src = fetchurl {

     

       20
       20
        
           url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";

     

       21
       21
        
           sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'

     

       22
       22
       -
             aarch64-linux = "sha512-tzGkEDVXOJaTfRPO4UUfDpqaddjeJvVHpf81A9hhpUTRIgbAO4fcOrTgJcgWCBotDo8nHCWjw+n5BG5PEfQ19Q==";

     

       23
       23
       -
             x86_64-linux  = "sha512-qUM3HGYXbVbLRYXetLGbShPU5ochuptCUNn0G5RD3tQeipVZsgRkQCSfZ1Zb3HgoPUOna3u8Mp7Ipu1n8xi3vg==";

     

       22
       22
       +
             aarch64-linux = "sha512-fI0N1V+6SEZ9eNf+G/w5RcY8oeA5MsVzJnpnWoMzkkHZh5jVHgNbcqVgSPbzvQ/WZNv1MX37KETcxmDwRx//yw==";

     

       23
       23
       +
             x86_64-linux  = "sha512-zN89Qw6fQh27EaN9ARNwqhiBaiNoMic6Aq2UPG0OSUtOjEOdkGJ2pbR8MgWVccSgRH8ZmAAXZ0snVKfZWHbCjA==";

     

       24
       24
        
           }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       25
       25
        
         };

     

       26
       26

+5 -5

pkgs/applications/misc/1password/default.nix

···

       12
       12
        
           if extension == "zip" then fetchzip args else fetchurl args;

     

       13
       13
        
       

     

       14
       14
        
         pname = "1password-cli";

     

       15
       15
       -
         version = "2.7.2";

     

       15
       15
       +
         version = "2.7.3";

     

       16
       16
        
         sources = rec {

     

       17
       17
       -
           aarch64-linux = fetch "linux_arm64" "sha256-lYY69zbJqE9KuP1Yihfz444GFazHgR9zHVDq9RzZdTA=" "zip";

     

       18
       18
       -
           i686-linux = fetch "linux_386" "sha256-IgTusLxgeOS9u4G1M7JqqxJw2D3hy5L9wl77crgfHjM=" "zip";

     

       19
       19
       -
           x86_64-linux = fetch "linux_amd64" "sha256-OL/URp5eU3K1ObTlC4nXELa7NkrZDW5tFwhgVdrmPdQ=" "zip";

     

       20
       20
       -
           aarch64-darwin = fetch "apple_universal" "sha256-pL39V9AO2DjCcWlecteTMCcBBZVb3RXmJ8wk5gyFojg=" "pkg";

     

       17
       17
       +
           aarch64-linux = fetch "linux_arm64" "sha256-FxApOWyExyfuRFQhxAVBWZGqQNmarBFBRB4jqsreWL0=" "zip";

     

       18
       18
       +
           i686-linux = fetch "linux_386" "sha256-Ta6mdmcsKnNRMz9vwEadZ/xXVBran5BIJQngzNz3PUs=" "zip";

     

       19
       19
       +
           x86_64-linux = fetch "linux_amd64" "sha256-Lvxnp5KmkIj9jnaWg02a27eRYIx7WTNSLx+RJ04Vt+g=" "zip";

     

       20
       20
       +
           aarch64-darwin = fetch "apple_universal" "sha256-6qrNgb5ae+qqlNsNDLbKNeWj0o/SRs+2G/4DfK5Wnhg=" "pkg";

     

       21
       21
        
           x86_64-darwin = aarch64-darwin;

     

       22
       22
        
         };

     

       23
       23
        
         platforms = builtins.attrNames sources;

+2 -2

pkgs/applications/window-managers/i3/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "i3";

     

       10
       10
       -
         version = "4.21";

     

       10
       10
       +
         version = "4.21.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";

     

       14
       14
       -
           sha256 = "sha256-jcUgXg80Q9WGYeMHg1If2cbUJtHn82Z6sS8qwbLTIHg=";

     

       14
       14
       +
           sha256 = "sha256-7f14EoXGVKBdxtsnLOAwDEQo5vvYddmZZOV94ltBvB4=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [

+2 -2

pkgs/data/icons/numix-icon-theme-square/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "numix-icon-theme-square";

     

       5
       5
       -
         version = "22.10.31";

     

       5
       5
       +
         version = "22.11.05";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "numixproject";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-TtRIVut4VBkQnM0+DM44305+FG3l2tDSU+FfaR7OFZI=";

     

       11
       11
       +
           sha256 = "sha256-XHf9YzZ9VY63Jv7HXSL2NAfft1VYeMzcqd9+vz1CBhg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 ];

+3 -3

pkgs/development/tools/just/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "just";

     

       13
       13
       -
         version = "1.7.0";

     

       13
       13
       +
         version = "1.8.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "casey";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           hash = "sha256-W8ko9hzZmgF8XEqzbPtCJp5J38m0pAz5wTp3VRUmZOQ=";

     

       19
       19
       +
           hash = "sha256-mzVwdvMYpThSPGvM3hpuKzeHZW5HOwkEfONIN/aziXY=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoSha256 = "sha256-rC+PcLQHjnaGSEELod6IF9NTCl0tnXvOOkHF0z77Lao=";

     

       22
       22
       +
         cargoSha256 = "sha256-dDaXmJ4wFJaE59qR5Bxvoz/Jrwt6hhWhJI8wLRXCLcU=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ installShellFiles ];

     

       25
       25
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

+3 -3

pkgs/development/tools/ruff/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "ruff";

     

       11
       11
       -
         version = "0.0.100";

     

       11
       11
       +
         version = "0.0.102";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "charliermarsh";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "sha256-kFWYSaRKx63X6Nfxd1knkusiJRKVRTNdd1jOQXBCRFQ=";

     

       17
       17
       +
           sha256 = "sha256-vYN73RcVwu2gwa+09wPqeIvqAx/SHnpe5m6fuXrK1ts=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-eew1ZTCm/C3qY/eZvWYkcLprgM/cRaTb6e2O66SNwk8=";

     

       20
       20
       +
         cargoSha256 = "sha256-6CBadq+VuUhUvzjgTo+qRy5RsoLotEWuR4+lyf9YFjU=";

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       23
       23
        
           CoreServices

+11 -5

pkgs/misc/fastly/default.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, installShellFiles, buildGoModule, go }:

     

       1
       1
       +
       { lib, fetchurl, fetchFromGitHub, installShellFiles, buildGoModule, go }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "fastly";

     

       5
       5
       -
         version = "3.2.4";

     

       5
       5
       +
         version = "4.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "fastly";

     

       9
       9
        
           repo = "cli";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8=";

     

       11
       11
       +
           sha256 = "sha256-TxN0DQ4OKfHn+u4ixpCgcyRRTs52IZRjgcbJuqajeVo=";

     

       12
       12
        
           # The git commit is part of the `fastly version` original output;

     

       13
       13
        
           # leave that output the same in nixpkgs. Use the `.git` directory

     

       14
       14
        
           # to retrieve the commit SHA, and remove the directory afterwards,

     
···

       23
       23
        
       

     

       24
       24
        
         subPackages = [ "cmd/fastly" ];

     

       25
       25
        
       

     

       26
       26
       -
         vendorSha256 = "sha256-glztVmAAdkEccJEFIHGWjNzz/+MjExSX18GDX66sdxA=";

     

       26
       26
       +
         vendorSha256 = "sha256-7EtyQYPe+oJmQ7uECbjkBjLnM9T03g6gFwUwebKuccc=";

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ installShellFiles ];

     

       29
       29
        
       

     
···

       37
       37
        
           "-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"

     

       38
       38
        
           "-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"

     

       39
       39
        
         ];

     

       40
       40
       -
         preBuild = ''

     

       40
       40
       +
         preBuild = let

     

       41
       41
       +
           cliConfigToml = fetchurl {

     

       42
       42
       +
             url = "https://web.archive.org/web/20221104122906/https://developer.fastly.com/api/internal/cli-config";

     

       43
       43
       +
             sha256 = "sha256-BHsUWrMp//X95gcB+WbD/nfyduZUkH8jHXk3CfOBAhg=";

     

       44
       44
       +
           };

     

       45
       45
       +
         in ''

     

       46
       46
       +
           cp ${cliConfigToml} ./pkg/config/config.toml

     

       41
       47
        
           ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"

     

       42
       48
        
         '';

     

       43
       49

+10 -3

pkgs/servers/trezord/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "trezord-go";

     

       11
       11
       -
         version = "2.0.31";

     

       11
       11
       +
         version = "2.0.32";

     

       12
       12
       +
         commit = "9aa6576";

     

       12
       13
        
       

     

       13
       14
        
         src = fetchFromGitHub {

     

       14
       15
        
           owner = "trezor";

     

       15
       16
        
           repo = "trezord-go";

     

       16
       17
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "130nhk1pnr3xx9qkcij81mm3jxrl5zvvdqhvrgvrikqg3zlb6v5b";

     

       18
       18
       +
           fetchSubmodules = true;

     

       19
       19
       +
           sha256 = "sha256-T7YoHi2sA22nfNbgX2WB5NIFIwxBkxn0CsSXyQTxgJc=";

     

       18
       20
        
         };

     

       19
       21
        
       

     

       20
       20
       -
         vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61";

     

       22
       22
       +
         vendorSha256 = "sha256-wXgAmZEXdM4FcMCQbAs+ydXshCAMu7nl/yVv/3sqaXE=";

     

       21
       23
        
       

     

       22
       24
        
         propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ]

     

       23
       25
        
           ++ lib.optionals stdenv.isDarwin [ AppKit ];

     

       26
       26
       +
       

     

       27
       27
       +
         ldflags = [

     

       28
       28
       +
           "-s" "-w"

     

       29
       29
       +
           "-X main.githash=${commit}"

     

       30
       30
       +
         ];

     

       24
       31
        
       

     

       25
       32
        
         meta = with lib; {

     

       26
       33
        
           description = "Trezor Communication Daemon aka Trezor Bridge";

+2 -2

pkgs/shells/oil/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "oil";

     

       5
       5
       -
         version = "0.12.6";

     

       5
       5
       +
         version = "0.12.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.oilshell.org/download/oil-${version}.tar.xz";

     

       9
       9
       -
           hash = "sha256-jlNmrpze02g4FL4EFlKoZC7X/YOr3xhJWnMTPga3Bas=";

     

       9
       9
       +
           hash = "sha256-WEbEcG4B+MqDVPXHjpp5lkJxT8AS+NivtJGfrnrcBys=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         postPatch = ''

+12 -2

pkgs/tools/filesystems/gcsfuse/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "gcsfuse";

     

       5
       5
       -
         version = "0.41.7";

     

       5
       5
       +
         version = "0.41.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "googlecloudplatform";

     

       9
       9
        
           repo = "gcsfuse";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-hqT1X78g1Mg7xWHrVTwN41P+wgkrjfYrX2vHmwxZoCQ=";

     

       11
       11
       +
           sha256 = "sha256-9Y6phVYWI5xhqJf2LL9WbaG8vyfNcGUcnaHjKA4krjA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

     
···

       16
       16
        
         subPackages = [ "." "tools/mount_gcsfuse" ];

     

       17
       17
        
       

     

       18
       18
        
         ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ];

     

       19
       19
       +
       

     

       20
       20
       +
         preCheck =

     

       21
       21
       +
           let skippedTests = [

     

       22
       22
       +
             "Test_Main"

     

       23
       23
       +
             "TestFlags"

     

       24
       24
       +
           ]; in

     

       25
       25
       +
           ''

     

       26
       26
       +
             # Disable flaky tests

     

       27
       27
       +
             buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")

     

       28
       28
       +
           '';

     

       19
       29
        
       

     

       20
       30
        
         postInstall = ''

     

       21
       31
        
           ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse

+3 -3

pkgs/tools/misc/ripdrag/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "ripdrag";

     

       5
       5
       -
         version = "0.2.0";

     

       5
       5
       +
         version = "0.2.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "sha256-bXyJcSJfKHkcwTayEbX9sZZEBeP9qoH36QqBIDnmKQM=";

     

       9
       9
       +
           sha256 = "sha256-/TF9dWZQVEVM3lHp4ubxYkDW+ZDL9puT6mUT6Q3hUsw=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoSha256 = "sha256-PqoIJ0mbpaE4UX+kz3pFiqmTS1Vp+jF2OT5+3K2A0MQ=";

     

       12
       12
       +
         cargoSha256 = "sha256-mIsT93XRU0mR5s5w3Sng2DTW2LyO9HT1w/1932vptIE=";

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkg-config ];

     

       15
       15

+1 -1

pkgs/top-level/all-packages.nix

···

       36060
       36060
        
       

     

       36061
       36061
        
         msieve = callPackage ../applications/science/math/msieve { };

     

       36062
       36062
        
       

     

       36063
       36063
       -
         weka = callPackage ../applications/science/math/weka { };

     

       36063
       36063
       +
         weka = callPackage ../applications/science/math/weka { jre = openjdk11; };

     

       36064
       36064
        
       

     

       36065
       36065
        
         yad = callPackage ../tools/misc/yad { };

     

       36066
       36066