gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-03-14 12:01:32 +00:00
committed by GitHub
parent 6b67186fe9 514826ddf2
commit e196e68bee
22 changed files with 173 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vscode/vscode.nix
+6 -6
View File
@@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "00n7mykr8dyn9chiwsp0s8pk53c39by4wl0hyx1inb0zqxaszw25";
x86_64-darwin = "1q41x23jbpisbwcxgmx18g0bcdsj5g1w3pbj9m6mxlssvbc2xiw6";
aarch64-linux = "1kaj8g50m8imk34whf6sq41a2b1751mjqxvpwnprlx0i7xj2l832";
aarch64-darwin = "1h6plmyv3xkkbpwka5rrkc1bdrgj9d8jp0q6qyhch368x8mp781m";
armv7l-linux = "0q46nzhn8agsif9s50dbdbx6ds3ll39yp5lrp9n7y9a26m4cwjmv";
x86_64-linux = "0dqwjc606z8qizg9hcfjlpq92hmaxh3a09368ffz7irl5sgwp300";
x86_64-darwin = "00795gr9dmshz6sfgsp70fii6m76fqdmqskwkdwqwxddl0i07sw5";
aarch64-linux = "04ckk6l9ym1igaqk1zfyy4zx05yryi641lc0i1l38k3mbv1k3gvw";
aarch64-darwin = "16z96h8s9irgb17gy6ng3r6cbiwrxa7q7qazqamnmgvvahg08kvj";
armv7l-linux = "042ihy4bg39y4m2djkqcx099w9710ikprbw3z7gh1gqvj3qyxy6i";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.76.0";
version = "1.76.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
pkgs/applications/networking/cluster/k3s/1_26/default.nix
+4 -4
View File
@@ -46,10 +46,10 @@
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.26.1+k3s1"; # k3s git tag
k3sCommit = "f10af367c3c96863c081ada4018e94e085c9404d"; # k3s git commit at the above version
k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848";
k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994=";
k3sVersion = "1.26.2+k3s1"; # k3s git tag
k3sCommit = "ea094d1d497b26538b61b5cbc27c1a4a1f2f3f24"; # k3s git commit at the above version
k3sRepoSha256 = "13jrxr0imgkwl7bay4rrq9iv7ipak9hlmn82x9shr63hihlw7z9l";
k3sVendorSha256 = "sha256-4uIOjHStU/DZk6YBdfC0F4L9z+csekMTjENJKpMmgx0=";
# nix generated by update.sh
# Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32
pkgs/applications/networking/remote/waypipe/default.nix
+2 -2
View File
@@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "waypipe";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
sha256 = "sha256-ee3RKlcZQf8o8cQfz1ckiLDFNzdFJesBJKJTTrUmcpU=";
sha256 = "sha256-uf2+PSqgZ+RShuVYlR42xMV38tuYbGV+bW1tdXgiZYU=";
};
strictDeps = true;
pkgs/applications/version-management/commitizen/default.nix
+4 -1
View File
@@ -1,4 +1,5 @@
{ buildPythonApplication
, charset-normalizer
, colorama
, commitizen
, decli
@@ -41,10 +42,12 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"'
--replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' \
--replace 'argcomplete = ">=1.12.1,<2.1"' 'argcomplete = ">=1.12.1"'
'';
propagatedBuildInputs = [
charset-normalizer
termcolor
questionary
colorama
pkgs/development/python-modules/argcomplete/default.nix
+13 -14
View File
@@ -1,30 +1,29 @@
{ buildPythonPackage, fetchPypi, lib
, dicttoxml
, importlib-metadata
{ buildPythonPackage
, fetchPypi
, lib
, pexpect
, prettytable
, requests-toolbelt
}:
buildPythonPackage rec {
pname = "argcomplete";
version = "2.0.0";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20";
sha256 = "sha256-cuCDQIUtMlREWcDBmq0bSKosOpbejG5XQkVrT1OMpS8=";
};
doCheck = false; # meant to be ran with interactive interpreter
postPatch = ''
substituteInPlace setup.py \
--replace '"coverage",' "" \
--replace " + lint_require" ""
'';
# re-enable if we are able to make testing work
# nativeCheckInputs = [ bashInteractive coverage flake8 ];
# tries to build and install test packages which fails
doCheck = false;
propagatedBuildInputs = [
dicttoxml
importlib-metadata
pexpect
prettytable
requests-toolbelt
];
pythonImportsCheck = [ "argcomplete" ];
pkgs/development/python-modules/asyncssh/default.nix
+24 -9
View File
@@ -1,5 +1,5 @@
{ stdenv
, lib
{ lib
, stdenv
, bcrypt
, buildPythonPackage
, cryptography
@@ -31,23 +31,38 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
bcrypt
cryptography
fido2
gssapi
libnacl
libsodium
nettle
pyopenssl
python-pkcs11
typing-extensions
];
passthru.optional-dependencies = {
bcrypt = [
bcrypt
];
fido2 = [
fido2
];
gssapi = [
gssapi
];
libnacl = [
libnacl
];
pkcs11 = [
python-pkcs11
];
pyOpenSSL = [
pyopenssl
];
};
nativeCheckInputs = [
openssh
openssl
pytestCheckHook
];
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
patches = [
# Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
pkgs/development/python-modules/can/default.nix
+9
View File
@@ -10,6 +10,8 @@
, pytest-timeout
, pytestCheckHook
, pythonOlder
, setuptools
, stdenv
, typing-extensions
, wrapt
, uptime
@@ -37,6 +39,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
msgpack
packaging
setuptools
typing-extensions
wrapt
];
@@ -73,10 +76,16 @@ buildPythonPackage rec {
# pytest.approx is not supported in a boolean context (since pytest7)
"test_pack_unpack"
"test_receive"
] ++ lib.optionals stdenv.isDarwin [
# timing sensitive
"test_general"
"test_gap"
];
preCheck = ''
export PATH="$PATH:$out/bin";
# skips timing senstive tests
export CI=1
'';
pythonImportsCheck = [
pkgs/development/python-modules/dvc-http/default.nix
+53
View File
@@ -0,0 +1,53 @@
{ lib
, aiohttp-retry
, buildPythonPackage
, fetchFromGitHub
, dvc-objects
, fsspec
, pythonOlder
, pythonRelaxDepsHook
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dvc-http";
version = "2.30.2";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-IlgJEnS+rHSg5cw7SCc3vVtG1mJA5voGViya7nkpL2M=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
dvc-objects
fsspec
aiohttp-retry
];
# Currently it's not possible to run the tests
# ModuleNotFoundError: No module named 'dvc.testing'
doCheck = false;
pythonImportsCheck = [
"dvc_http"
];
meta = with lib; {
description = "HTTP plugin for dvc";
homepage = "https://github.com/iterative/dvc-http";
changelog = "https://github.com/iterative/dvc-http/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/msgspec/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "jcrist";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-TGCdsimcoY3441/nOXxHGqYM4q8uoWd78HtUts6EOJY=";
hash = "sha256-Sq0hV5ZftUCIR/6QOWvdfzg8UHYLZXo5ba5ydTnjqPg=";
};
# Requires libasan to be accessible
pkgs/development/python-modules/nextcord/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nextcord";
version = "2.4.0";
version = "2.4.1";
format = "setuptools";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "nextcord";
repo = "nextcord";
rev = "refs/tags/v${version}";
hash = "sha256-TePUsyQ4DCuvfRQD4KAUs94o3MJRmZmu6jMPv4lJtHE=";
hash = "sha256-9Zgdaw5JXr0xUhxuhBWyPwKN64NY76Z72KJ571Hko2w=";
};
patches = [
pkgs/development/python-modules/torch/default.nix
+7 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
cudaSupport ? false, cudaPackages, magma,
mklDnnSupport ? true, useSystemNccl ? true,
useSystemNccl ? true,
MPISupport ? false, mpi,
buildDocs ? false,
@@ -9,7 +9,7 @@
# Build inputs
numactl,
CoreServices, libobjc,
Accelerate, CoreServices, libobjc,
# Propagated build inputs
numpy, pyyaml, cffi, click, typing-extensions,
@@ -17,6 +17,10 @@
# Unit tests
hypothesis, psutil,
# Disable MKLDNN on aarch64-darwin, it negatively impacts performance,
# this is also what official pytorch build does
mklDnnSupport ? !(stdenv.isDarwin && stdenv.isAarch64),
# virtual pkg that consistently instantiates blas across nixpkgs
# See https://github.com/NixOS/nixpkgs/pull/83888
blas,
@@ -275,7 +279,7 @@ in buildPythonPackage rec {
++ lib.optionals rocmSupport [ openmp ]
++ lib.optionals (cudaSupport || rocmSupport) [ magma ]
++ lib.optionals stdenv.isLinux [ numactl ]
++ lib.optionals stdenv.isDarwin [ CoreServices libobjc ];
++ lib.optionals stdenv.isDarwin [ Accelerate CoreServices libobjc ];
propagatedBuildInputs = [
cffi
pkgs/development/tools/buildkit/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ buildGoModule rec {
description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
homepage = "https://github.com/moby/buildkit";
license = licenses.asl20;
maintainers = with maintainers; [ vdemeester marsam ];
maintainers = with maintainers; [ vdemeester marsam developer-guy ];
mainProgram = "buildctl";
};
}
pkgs/development/tools/ocaml/merlin/4.x.nix
+3 -3
View File
@@ -15,13 +15,13 @@
}:
let
merlinVersion = "4.7";
merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.8" else "4.7";
hashes = {
"4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
"4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
"4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs=";
"4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE=";
"4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68=";
"4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI=";
};
ocamlVersionShorthand = lib.substring 0 3
pkgs/development/tools/protoc-gen-go/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "protoc-gen-go";
version = "1.29.0";
version = "1.29.1";
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf-go";
rev = "v${version}";
sha256 = "sha256-su8upKXi7mvalk+Fa/sGGFizAXisHiBCc5OVIizujwI=";
sha256 = "sha256-xlRHhr25+gXlO6ggIQgijWYzIVZCpRVCnuLnSW1r15s=";
};
vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y=";
pkgs/development/tools/twilio-cli/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "twilio-cli";
version = "5.4.1";
version = "5.4.2";
src = fetchzip {
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
sha256 = "sha256-UEfnwYMiYE+DAENwf3cfSE20ctAxVjbko428rDNIMzI=";
sha256 = "sha256-Zrn+4/zeqJXkKOSsbpPR2bO+ilApn8JUVAgqWydv/Is=";
};
buildInputs = [ nodejs ];
pkgs/games/fheroes2/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
sha256 = "sha256-l7MFvcUOv1jA7moA8VYcaQO15eyK/06x6Jznz5jsNNg=";
sha256 = "sha256-Y1D9oLqO4al+1OXV9QhlzlZxSZtcQJtBQAzXqyhBFKI=";
};
buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];
pkgs/os-specific/linux/firmware/fwupd/default.nix
+3
View File
@@ -382,6 +382,9 @@ stdenv.mkDerivation (finalAttrs: {
# For updating.
inherit test-firmware;
# For downstream consumers that need the fwupd-efi this was built with.
inherit fwupd-efi;
tests =
let
listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]";
pkgs/tools/filesystems/garage/default.nix
+6 -10
View File
@@ -27,7 +27,7 @@ let
OPENSSL_NO_VENDOR = true;
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198
# on version changes for checking if changes are required here
buildFeatures = [
"kubernetes-discovery"
@@ -57,10 +57,6 @@ let
"sqlite"
]);
# Workaround until upstream fixes integration test race condition
# https://git.deuxfleurs.fr/Deuxfleurs/garage/issues/528
dontUseCargoParallelTests = true;
passthru = nixosTests.garage;
meta = {
@@ -87,13 +83,13 @@ in
garage_0_7 = garage_0_7_3;
garage_0_8_1 = generic {
version = "0.8.1";
sha256 = "sha256-lpNp/jw4YaczG3NM3pVWR0cZ8u/KBQCWvvfAswO4+Do=";
cargoSha256 = "sha256-TXHSAnttXfxoFLOP+vsd86O8sVoyrSkadij26cF4aXI=";
garage_0_8_2 = generic {
version = "0.8.2";
sha256 = "sha256-IlDWbNWI1yXvPPF3HIqQvo79M2FQCtoX1wRLJrDbd9k=";
cargoSha256 = "sha256-6l4tDBMcOvckTkEO05rman4hHlmVbBt1nCeX5/dETKk=";
};
garage_0_8 = garage_0_8_1;
garage_0_8 = garage_0_8_2;
garage = garage_0_8;
}
pkgs/tools/misc/rauc/default.nix
+22 -9
View File
@@ -1,7 +1,7 @@
{ autoreconfHook
, curl
{ curl
, dbus
, fetchFromGitHub
, fetchpatch
, glib
, json-glib
, lib
@@ -9,6 +9,11 @@
, openssl
, pkg-config
, stdenv
, meson
, ninja
, util-linux
, libnl
, systemd
}:
stdenv.mkDerivation rec {
@@ -22,21 +27,29 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VpHcJUTRZ5aJyfYypjVsYyRNrK0+9ci42mmlZQSkWAk=";
};
patches = [
(fetchpatch {
# Patch to install the man page when using meson, remove on package bump
url = "https://github.com/rauc/rauc/commit/756c677d031c435070a6900e6778d06961822261.patch";
hash = "sha256-QgIUagioRo61PeC0JyKjZtnauFiYP1Fz9wrxGEikBGI=";
})
];
passthru = {
updateScript = nix-update-script { };
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config autoreconfHook ];
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ curl dbus glib json-glib openssl ];
buildInputs = [ curl dbus glib json-glib openssl util-linux libnl systemd ];
configureFlags = [
"--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
"--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces"
"--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/system.d"
"--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
mesonFlags = [
"--buildtype=release"
(lib.mesonOption "systemdunitdir" "${placeholder "out"}/lib/systemd/system")
(lib.mesonOption "dbusinterfacesdir" "${placeholder "out"}/share/dbus-1/interfaces")
(lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
(lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
];
meta = with lib; {
pkgs/tools/system/acpica-tools/default.nix
+3 -2
View File
@@ -29,11 +29,12 @@ stdenv.mkDerivation rec {
"iasl"
];
env.NIX_CFLAGS_COMPILE = toString [
env.NIX_CFLAGS_COMPILE = toString ([
"-O3"
] ++ lib.optionals (stdenv.cc.isGNU) [
# Needed with GCC 12
"-Wno-dangling-pointer"
];
]);
enableParallelBuilding = true;
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -7659,7 +7659,7 @@ with pkgs;
})
garage
garage_0_7 garage_0_8
garage_0_7_3 garage_0_8_1;
garage_0_7_3 garage_0_8_2;
garmin-plugin = callPackage ../applications/misc/garmin-plugin { };
pkgs/top-level/python-packages.nix
+3 -1
View File
@@ -2941,6 +2941,8 @@ self: super: with self; {
dvc-data = callPackage ../development/python-modules/dvc-data { };
dvc-http = callPackage ../development/python-modules/dvc-http { };
dvc-objects = callPackage ../development/python-modules/dvc-objects { };
dvc-render = callPackage ../development/python-modules/dvc-render { };
@@ -11742,7 +11744,7 @@ self: super: with self; {
torch = callPackage ../development/python-modules/torch {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreServices;
inherit (pkgs.darwin) libobjc;
inherit (pkgs.llvmPackages_rocm) openmp;
};