ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 23:27:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-06 06:01:30 +00:00 committed by GitHub
commit a9864a3f5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 65 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/doc-support/lib-function-locations.nix
View File

@ -38,7 +38,7 @@ let
substr = builtins.substring prefixLen filenameLen filename; substr = builtins.substring prefixLen filenameLen filename;
in substr; in substr;
removeNixpkgs = removeFilenamePrefix pkgs.path; removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path);
liblocations = liblocations =
builtins.filter builtins.filter

10
lib/sources.nix
View File

@ -140,7 +140,7 @@ let
origSrc = if isFiltered then src.origSrc else src; origSrc = if isFiltered then src.origSrc else src;
in lib.cleanSourceWith { in lib.cleanSourceWith {
filter = (path: type: 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); in lib.any (re: match re relPath != null) regexes);
inherit src; inherit src;
}; };
@ -175,12 +175,12 @@ let
*/ */
commitIdFromGitRepo = commitIdFromGitRepo =
let readCommitFromFile = file: path: let readCommitFromFile = file: path:
let fileName = path + "/" + file; let fileName = toString path + "/" + file;
packedRefsName = path + "/packed-refs"; packedRefsName = toString path + "/packed-refs";
absolutePath = base: path: absolutePath = base: path:
if lib.hasPrefix "/" path if lib.hasPrefix "/" path
then path then path
else /. + "${base}/${path}"; else toString (/. + "${base}/${path}");
in if pathIsRegularFile path in if pathIsRegularFile path
# Resolve git worktrees. See gitrepository-layout(5) # Resolve git worktrees. See gitrepository-layout(5)
then then
@ -226,7 +226,7 @@ let
pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir); pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir);
canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext src); canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src));
# -------------------------------------------------------------------------- # # -------------------------------------------------------------------------- #
# Internal functions # Internal functions

4
lib/trivial.nix
View File

@ -213,8 +213,8 @@ rec {
# Default value to return if revision can not be determined # Default value to return if revision can not be determined
default: default:
let let
revisionFile = ./.. + "/.git-revision"; revisionFile = "${toString ./..}/.git-revision";
gitRepo = ./.. + "/.git"; gitRepo = "${toString ./..}/.git";
in if lib.pathIsGitRepo gitRepo in if lib.pathIsGitRepo gitRepo
then lib.commitIdFromGitRepo gitRepo then lib.commitIdFromGitRepo gitRepo
else if lib.pathExists revisionFile then lib.fileContents revisionFile else if lib.pathExists revisionFile then lib.fileContents revisionFile

6
pkgs/applications/blockchains/trezor-suite/default.nix
View File

@ -8,7 +8,7 @@
let let
pname = "trezor-suite"; pname = "trezor-suite";
version = "22.8.2"; version = "22.10.3";
name = "${pname}-${version}"; name = "${pname}-${version}";
suffix = { suffix = {
@ -19,8 +19,8 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; 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/: /-/' 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=="; aarch64-linux = "sha512-fI0N1V+6SEZ9eNf+G/w5RcY8oeA5MsVzJnpnWoMzkkHZh5jVHgNbcqVgSPbzvQ/WZNv1MX37KETcxmDwRx//yw==";
x86_64-linux = "sha512-qUM3HGYXbVbLRYXetLGbShPU5ochuptCUNn0G5RD3tQeipVZsgRkQCSfZ1Zb3HgoPUOna3u8Mp7Ipu1n8xi3vg=="; x86_64-linux = "sha512-zN89Qw6fQh27EaN9ARNwqhiBaiNoMic6Aq2UPG0OSUtOjEOdkGJ2pbR8MgWVccSgRH8ZmAAXZ0snVKfZWHbCjA==";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
}; };

10
pkgs/applications/misc/1password/default.nix
View File

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args; if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli"; pname = "1password-cli";
version = "2.7.2"; version = "2.7.3";
sources = rec { sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-lYY69zbJqE9KuP1Yihfz444GFazHgR9zHVDq9RzZdTA=" "zip"; aarch64-linux = fetch "linux_arm64" "sha256-FxApOWyExyfuRFQhxAVBWZGqQNmarBFBRB4jqsreWL0=" "zip";
i686-linux = fetch "linux_386" "sha256-IgTusLxgeOS9u4G1M7JqqxJw2D3hy5L9wl77crgfHjM=" "zip"; i686-linux = fetch "linux_386" "sha256-Ta6mdmcsKnNRMz9vwEadZ/xXVBran5BIJQngzNz3PUs=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-OL/URp5eU3K1ObTlC4nXELa7NkrZDW5tFwhgVdrmPdQ=" "zip"; x86_64-linux = fetch "linux_amd64" "sha256-Lvxnp5KmkIj9jnaWg02a27eRYIx7WTNSLx+RJ04Vt+g=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-pL39V9AO2DjCcWlecteTMCcBBZVb3RXmJ8wk5gyFojg=" "pkg"; aarch64-darwin = fetch "apple_universal" "sha256-6qrNgb5ae+qqlNsNDLbKNeWj0o/SRs+2G/4DfK5Wnhg=" "pkg";
x86_64-darwin = aarch64-darwin; x86_64-darwin = aarch64-darwin;
}; };
platforms = builtins.attrNames sources; platforms = builtins.attrNames sources;

4
pkgs/applications/window-managers/i3/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "i3"; pname = "i3";
version = "4.21"; version = "4.21.1";
src = fetchurl { src = fetchurl {
url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
sha256 = "sha256-jcUgXg80Q9WGYeMHg1If2cbUJtHn82Z6sS8qwbLTIHg="; sha256 = "sha256-7f14EoXGVKBdxtsnLOAwDEQo5vvYddmZZOV94ltBvB4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square"; pname = "numix-icon-theme-square";
version = "22.10.31"; version = "22.11.05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "numixproject"; owner = "numixproject";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-TtRIVut4VBkQnM0+DM44305+FG3l2tDSU+FfaR7OFZI="; sha256 = "sha256-XHf9YzZ9VY63Jv7HXSL2NAfft1VYeMzcqd9+vz1CBhg=";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];

6
pkgs/development/tools/just/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "just"; pname = "just";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "casey"; owner = "casey";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-W8ko9hzZmgF8XEqzbPtCJp5J38m0pAz5wTp3VRUmZOQ="; hash = "sha256-mzVwdvMYpThSPGvM3hpuKzeHZW5HOwkEfONIN/aziXY=";
}; };
cargoSha256 = "sha256-rC+PcLQHjnaGSEELod6IF9NTCl0tnXvOOkHF0z77Lao="; cargoSha256 = "sha256-dDaXmJ4wFJaE59qR5Bxvoz/Jrwt6hhWhJI8wLRXCLcU=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

6
pkgs/development/tools/ruff/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruff"; pname = "ruff";
version = "0.0.100"; version = "0.0.102";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charliermarsh"; owner = "charliermarsh";
repo = pname; repo = pname;
rev = "v${version}"; 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 [ buildInputs = lib.optionals stdenv.isDarwin [
CoreServices CoreServices

16
pkgs/misc/fastly/default.nix
View File

@ -1,14 +1,14 @@
{ lib, fetchFromGitHub, installShellFiles, buildGoModule, go }: { lib, fetchurl, fetchFromGitHub, installShellFiles, buildGoModule, go }:
buildGoModule rec { buildGoModule rec {
pname = "fastly"; pname = "fastly";
version = "3.2.4"; version = "4.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fastly"; owner = "fastly";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8="; sha256 = "sha256-TxN0DQ4OKfHn+u4ixpCgcyRRTs52IZRjgcbJuqajeVo=";
# The git commit is part of the `fastly version` original output; # The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory # leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards, # to retrieve the commit SHA, and remove the directory afterwards,
@ -23,7 +23,7 @@ buildGoModule rec {
subPackages = [ "cmd/fastly" ]; subPackages = [ "cmd/fastly" ];
vendorSha256 = "sha256-glztVmAAdkEccJEFIHGWjNzz/+MjExSX18GDX66sdxA="; vendorSha256 = "sha256-7EtyQYPe+oJmQ7uECbjkBjLnM9T03g6gFwUwebKuccc=";
nativeBuildInputs = [ installShellFiles ]; 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.GoHostOS=${go.GOHOSTOS}"
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}" "-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)" ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
''; '';

13
pkgs/servers/trezord/default.nix
View File

@ -8,20 +8,27 @@
buildGoModule rec { buildGoModule rec {
pname = "trezord-go"; pname = "trezord-go";
version = "2.0.31"; version = "2.0.32";
commit = "9aa6576";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trezor"; owner = "trezor";
repo = "trezord-go"; repo = "trezord-go";
rev = "v${version}"; 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 ] propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ]
++ lib.optionals stdenv.isDarwin [ AppKit ]; ++ lib.optionals stdenv.isDarwin [ AppKit ];
ldflags = [
"-s" "-w"
"-X main.githash=${commit}"
];
meta = with lib; { meta = with lib; {
description = "Trezor Communication Daemon aka Trezor Bridge"; description = "Trezor Communication Daemon aka Trezor Bridge";
homepage = "https://trezor.io"; homepage = "https://trezor.io";

4
pkgs/shells/oil/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oil"; pname = "oil";
version = "0.12.6"; version = "0.12.7";
src = fetchurl { src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
hash = "sha256-jlNmrpze02g4FL4EFlKoZC7X/YOr3xhJWnMTPga3Bas="; hash = "sha256-WEbEcG4B+MqDVPXHjpp5lkJxT8AS+NivtJGfrnrcBys=";
}; };
postPatch = '' postPatch = ''

14
pkgs/tools/filesystems/gcsfuse/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gcsfuse"; pname = "gcsfuse";
version = "0.41.7"; version = "0.41.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "googlecloudplatform"; owner = "googlecloudplatform";
repo = "gcsfuse"; repo = "gcsfuse";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hqT1X78g1Mg7xWHrVTwN41P+wgkrjfYrX2vHmwxZoCQ="; sha256 = "sha256-9Y6phVYWI5xhqJf2LL9WbaG8vyfNcGUcnaHjKA4krjA=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -17,6 +17,16 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ];
preCheck =
let skippedTests = [
"Test_Main"
"TestFlags"
]; in
''
# Disable flaky tests
buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
'';
postInstall = '' postInstall = ''
ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse
ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse

6
pkgs/tools/misc/ripdrag/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ripdrag"; pname = "ripdrag";
version = "0.2.0"; version = "0.2.1";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-bXyJcSJfKHkcwTayEbX9sZZEBeP9qoH36QqBIDnmKQM="; sha256 = "sha256-/TF9dWZQVEVM3lHp4ubxYkDW+ZDL9puT6mUT6Q3hUsw=";
}; };
cargoSha256 = "sha256-PqoIJ0mbpaE4UX+kz3pFiqmTS1Vp+jF2OT5+3K2A0MQ="; cargoSha256 = "sha256-mIsT93XRU0mR5s5w3Sng2DTW2LyO9HT1w/1932vptIE=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

2
pkgs/top-level/all-packages.nix
View File

@ -36060,7 +36060,7 @@ with pkgs;
msieve = callPackage ../applications/science/math/msieve { }; 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 { }; yad = callPackage ../tools/misc/yad { };