colin/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-11-04 06:01:18 +00:00 committed by GitHub
commit 10d3ba75f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 941 additions and 2373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/examples.nix
View File

@ -115,6 +115,7 @@ rec {
};
gnu64 = { config = "x86_64-unknown-linux-gnu"; };
gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix
gnu32 = { config = "i686-unknown-linux-gnu"; };
musl64 = { config = "x86_64-unknown-linux-musl"; };

1
maintainers/team-list.nix
View File

@ -440,6 +440,7 @@ with lib.maintainers; {
members = [
GaetanLepage
natsukium
thomasjm
];
scope = "Maintain Jupyter and related packages.";
shortName = "Jupyter";

4
pkgs/applications/misc/keepass/default.nix
View File

@ -4,11 +4,11 @@ let
inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;
in buildDotnetPackage rec {
pname = "keepass";
version = "2.54";
version = "2.55";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg=";
hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc=";
};
sourceRoot = ".";

6
pkgs/applications/networking/cluster/pv-migrate/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "pv-migrate";
version = "1.3.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "utkuozdemir";
repo = pname;
rev = "v${version}";
sha256 = "sha256-J4GsXLff9OQNiLv3AvBLtmz383E2JPEB3VEN3nzE5R8=";
sha256 = "sha256-xbg32ckxAUQkkN/yumHz4v1U4FvUcmx5ftd3+4zc3/c=";
};
subPackages = [ "cmd/pv-migrate" ];
vendorHash = "sha256-PzmNCBTw9AfDUBh/tWlukH5EGJffEBCBT1gJTMIZRO0=";
vendorHash = "sha256-AqR9Gy8sAX4wrKGPnQUj33juBOfhUn0BR8OyJPiDrO0=";
ldflags = [
"-s"

6
pkgs/applications/networking/protonmail-bridge/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protonmail-bridge";
version = "3.5.1";
version = "3.6.1";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-bridge";
rev = "v${version}";
hash = "sha256-nYr9M9jRtKDZdtCWirpLAKA/tgz07N6/EI6JV4NzjXM=";
hash = "sha256-1Dkw30WW7bCf89I+HUAvkfmlBbl+TcOVmAfBIFnTExE=";
};
vendorHash = "sha256-I7vDmSLccJSov5RlTtzrQTc+uCprMxwOrHkroL9oZXE=";
vendorHash = "sha256-1mBcYVmVLTFVyYU9QuJz1JoR0wAIREC0cCQZbHMdgZU=";
nativeBuildInputs = [ pkg-config ];

12
pkgs/by-name/nu/numbat/package.nix
View File

@ -1,27 +1,33 @@
{ lib
, stdenv
, testers
, fetchFromGitHub
, rustPlatform
, darwin
, numbat
}:
rustPlatform.buildRustPackage rec {
pname = "numbat";
version = "1.6.3";
version = "1.7.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "numbat";
rev = "v${version}";
hash = "sha256-r6uPe2NL+6r/fKjf0C/5DLdB5YP3SIo8g8EsDxKP/3g=";
hash = "sha256-KX/V1cVZoPtkP/ehnvcTeaQavHlHP6NJ7g+FbOaYKC4=";
};
cargoHash = "sha256-MPqJjCfIwgK8QigWQYfWAYlg9RNMzF4x+0SprS0raKY=";
cargoHash = "sha256-skCvIMz50GqveyawVHicpEqMknvZuYNvp1u+gW4wG8A=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
passthru.tests.version = testers.testVersion {
package = numbat;
};
meta = with lib; {
description = "High precision scientific calculator with full support for physical units";
longDescription = ''

11
pkgs/by-name/tu/tuxmux/package.nix
View File

@ -2,26 +2,25 @@
, stdenv
, fetchFromGitHub
, rustPlatform
, openssl
, libiconv
, pkg-config
, installShellFiles
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "tuxmux";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "edeneast";
repo = pname;
rev = "v${version}";
hash = "sha256-QySDC/aEU9Fo0UbRUNvgBQLfESYzENGfS8Tl/ycn1YY=";
hash = "sha256-BZ1Vo1NIpzUBGyvd/UbxLaFbrLzoaP8kn/8GoAYBmlo=";
};
cargoHash = "sha256-MlLTaN+KMeF0A1hh0oujLYWqjwrbmoNzoRoXjeCUf7I=";
cargoHash = "sha256-HIYQPHLMhQtpCIkl5EzjJGHXzBtw7mY85l5bqapw3rg=";
buildInputs = [ openssl ] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]);
buildInputs = [ libiconv ];
nativeBuildInputs = [ pkg-config installShellFiles ];
postInstall = ''

4
pkgs/development/compilers/gcc/common/libgcc.nix
View File

@ -36,7 +36,7 @@ lib.optionals (lib.versionAtLeast version "11.0")
(let
targetPlatformSlash =
if hostPlatform.config == targetPlatform.config
if hostPlatform == targetPlatform
then ""
else "${targetPlatform.config}/";
@ -83,7 +83,7 @@ in
lib.optionalString (!langC) ''
rm -f $out/lib/libgcc_s.so*
''
+ lib.optionalString (hostPlatform.config != targetPlatform.config) ''
+ lib.optionalString (hostPlatform != targetPlatform) ''
mkdir -p $lib/lib/
ln -s ${targetPlatformSlash}lib $lib/lib
''

4
pkgs/development/python-modules/lxmf/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "lxmf";
version = "0.3.7";
version = "0.3.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "lxmf";
rev = "refs/tags/${version}";
hash = "sha256-iiGxAIHZcq3VaSSmGrB16IutJf8JEAeFkvZsEuIbR3g=";
hash = "sha256-tse2Hgu50KfxWLBkzyV4VpDj2YHgxIc5izgvwJAJ/7k=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/nomadnet/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "nomadnet";
version = "0.4.1";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "NomadNet";
rev = "refs/tags/${version}";
hash = "sha256-+UWHYhPX54Jc9gnrb2Az5Nc3/kt42/wa+zhUnCWdVU4=";
hash = "sha256-jqevKKOQrVpeCe305VKYnF6ODD5JEdt7du+deSZXreA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pypitoken/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pypitoken";
version = "7.0.0";
version = "7.0.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ewjoachim";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-CjSENkk1VlzrCngwFoJuq31Iai60qTJXBGMoV5QkSsE=";
hash = "sha256-1SUR6reZywgFpSdD49E5PjEDNrlvsHH4TK6SkXStUws=";
};
postPatch = ''

4
pkgs/development/python-modules/pyschlage/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyschlage";
version = "2023.10.0";
version = "2023.11.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "dknowles2";
repo = "pyschlage";
rev = "refs/tags/${version}";
hash = "sha256-9RXk3wDDX0sGNsci8EClfj17VCYwtUiMyNJj1FLLJKk=";
hash = "sha256-18kVXGpklfvCGOy2jBOG9BAAzE0ZVQ3LONjiwo9YnjU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/rns/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.6.3";
version = "0.6.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-3pcQsSUBHlgHKuZt5kb4ozvIujP6dsaYMab/+fri4a4=";
hash = "sha256-Ro8glYHzekuk85DQgRwvrmhbez37EEIiLSMrN5AziB8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/timm/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "timm";
version = "0.9.8";
version = "0.9.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "pytorch-image-models";
rev = "refs/tags/v${version}";
hash = "sha256-NB4uj9gB6QGxhnQMoYXN16T8v/o8IZuRMnN7pDXmaj4=";
hash = "sha256-mJzKDRc7husSpunlu12gnx9WErI6oEcEyCtrpkKbPBs=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/xknxproject/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknxproject";
version = "3.4.0";
version = "3.4.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = "xknxproject";
rev = "refs/tags/${version}";
hash = "sha256-YHHiA0AKyqOYQHeNJqInxjjn4L64z9Y2mf6otMZVscA=";
hash = "sha256-J257Y8Y0mVtlFHiHju5lxPyV0yx3IAYH8ikbmZlI3fY=";
};
nativeBuildInputs = [

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

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/v${version}";
hash = "sha256-AHnEvDzuQd6W+n9wXhMt6TJwoH1rZEY5UXbhFGwl8+g=";
hash = "sha256-vdhyzFUimc9gBsLpk7WKwQQ0YtGJg3us+6JCFnXSMrI=";
};
cargoHash = "sha256-E4alnDonG45JBAKdLI2eaI+fXW2xOo21HI2UtBEVTx0=";
cargoHash = "sha256-3p6X+EV4xQ+eh2ezPh5+cJxvoGErx0q2n5pESVf11Eg=";
nativeBuildInputs = [
installShellFiles

6
pkgs/development/web/pnpm-lock-export/default.nix
View File

@ -6,11 +6,11 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "adamcstephens";
repo = "pnpm-lock-export";
rev = "cc03755d6718a9c0d268d0f375907328ac15dc92";
hash = "sha256-9OlFgmdKjvz4pB36Wm/fUAQDsD8zs32OSA3m2IAgrH8=";
rev = "a7ede6d96f9d273b6b495718b85ed40f432c34ba";
hash = "sha256-RQGyUQOyFZW7UbIPRRlZu8FKcZN2kO0DcPfB8uLFFg4=";
};
npmDepsHash = "sha256-nqkH7vFD78YvYr9Klguk2o7qHr5wr3ZjaywUKRRRjJo=";
npmDepsHash = "sha256-1VTXzlafuI+dU4k1JyZPVI5/5h0gt/eggPPXKYxKsbs=";
postPatch = ''
cp ${./package-lock.json} package-lock.json

3186
pkgs/development/web/pnpm-lock-export/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/misc/tmux-plugins/default.nix
View File

@ -580,12 +580,12 @@ in rec {
tilish = mkTmuxPlugin {
pluginName = "tilish";
version = "2020-08-12";
version = "unstable-2023-09-20";
src = fetchFromGitHub {
owner = "jabirali";
repo = "tmux-tilish";
rev = "73d2404cdc0ef6bd7fbc8982edae0b0e2a4dd860";
sha256 = "1x58h3bg9d69j40fh8rcjpxvg0i6j04pj8p3jk57l3cghxis5j05";
rev = "22f7920837d827dc6cb31143ea916afa677c24c1";
sha256 = "wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo=";
};
meta = with lib; {

4
pkgs/servers/metabase/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.47.3";
version = "0.47.6";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
hash = "sha256-oIGIrEa2iHvvseP3sAcwiUK7ky43scfyaSO7S3G7bEo=";
hash = "sha256-LWF8O6v1x1iX5eJCugQ1noLeUJsVthZ7cGuyW3w6XGg=";
};
nativeBuildInputs = [ makeWrapper ];

9
pkgs/test/cross/default.nix
View File

@ -13,7 +13,7 @@ let
compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let
pkgName = (pkgFun hostPkgs).name;
args' = lib.concatStringsSep " " args;
in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" {
in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.stdenv.hostPlatform.config}" {
nativeBuildInputs = [ pkgs.dos2unix ];
} ''
# Just in case we are using wine, get rid of that annoying extra
@ -59,12 +59,12 @@ let
crossSystem = crossSystemFun system;
};
emulator = crossPkgs.hostPlatform.emulator pkgs;
emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs;
# Apply some transformation on windows to get dlls in the right
# place. Unfortunately mingw doesn’t seem to be able to do linking
# properly.
platformFun = pkg: if crossPkgs.hostPlatform.isWindows then
platformFun = pkg: if crossPkgs.stdenv.hostPlatform.isWindows then
pkgs.buildEnv {
name = "${pkg.name}-winlinks";
paths = [pkg] ++ pkg.buildInputs;
@ -92,7 +92,7 @@ let
};
pkg-config = {platformFun, crossPkgs, emulator}: crossPkgs.runCommand
"test-pkg-config-${crossPkgs.hostPlatform.config}"
"test-pkg-config-${crossPkgs.stdenv.hostPlatform.config}"
{
depsBuildBuild = [ crossPkgs.pkgsBuildBuild.pkg-config ];
nativeBuildInputs = [ crossPkgs.pkgsBuildHost.pkg-config crossPkgs.buildPackages.zlib ];
@ -134,6 +134,7 @@ let
pkgs.pkgsMusl.stdenv
pkgs.pkgsLLVM.stdenv
pkgs.pkgsStatic.bash
#pkgs.pkgsCross.gnu64_simplekernel.bash # https://github.com/NixOS/nixpkgs/issues/264989
pkgs.pkgsCross.arm-embedded.stdenv
pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel
pkgs.pkgsCross.raspberryPi.stdenv # for armv6l

2
pkgs/test/default.nix
View File

@ -9,6 +9,8 @@ with pkgs;
pkgSets = lib.pipe pkgNames [
(filter (lib.hasPrefix "llvmPackages"))
(filter (n: n != "rocmPackages.llvm"))
# Is a throw alias.
(filter (n: n != "llvmPackages_rocm"))
(filter (n: n != "llvmPackages_latest"))
(filter (n: n != "llvmPackages_git"))
];

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

@ -5,14 +5,14 @@
buildGoModule rec {
pname = "trillian";
version = "1.5.2";
vendorHash = "sha256-DlqezeMZsOaCoqvGMiU+fHMq+p3tZ+XBulB/G3BJESM=";
version = "1.5.3";
vendorHash = "sha256-DsdkTYRQQjTCArD3bo1al8enFzjfT7DVfmjK5KUqPDI=";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-m+22UK37IBCo48AgzINxKvudhEwvStz6fLWjE49saIg=";
sha256 = "sha256-fXqoe59JU5efAo5ByJ4027oqHakNCTvAtAq48MJZ9ZE=";
};
subPackages = [

6
pkgs/tools/networking/kail/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "kail";
version = "0.16.1";
version = "0.17.0";
ldflags = [
"-s"
@ -14,10 +14,10 @@ buildGoModule rec {
owner = "boz";
repo = "kail";
rev = "v${version}";
sha256 = "sha256-x9m0NoZjCf/lBWcSGFbjlJIukL6KIYt56Q1hADS8N9I=";
sha256 = "sha256-i53pW2YcmHDrRPhRI3iUD+YvGCReNgEeSltv4ZNIObo=";
};
vendorHash = "sha256-W+/vIq7qC+6apk+1GOWvmcwyyjFRkndq8X5m/lRYOu4=";
vendorHash = "sha256-haF136u6CmbWGuOlCpnGf9lBEeN92PYM6KBvWVOZ8Ws=";
meta = with lib; {
description = "Kubernetes log viewer";

4
pkgs/tools/security/hcxdumptool/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxdumptool";
version = "6.3.1";
version = "6.3.2";
src = fetchFromGitHub {
owner = "ZerBea";
repo = "hcxdumptool";
rev = version;
sha256 = "sha256-FWBr0uDpefu2MCWQZrMfPJ/MUJcmk9fWMzhtTDmC0L0=";
sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg=";
};
buildInputs = [ openssl ];

6
pkgs/tools/security/nuclei/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-vttAIkQzZKkqKer/rnX9irNev3i7y8kfTqO4LH1xANo=";
hash = "sha256-yqpSkKebhX3kszL4mSbKUd9JR7rJizLdrk7tHlh6zlc=";
};
vendorHash = "sha256-cEp/bMOWoAfpFoi9zVcSoYyPwL9hVnoOzRzCPacrSiM=";
vendorHash = "sha256-pekirk3nYXDLzoy4iBJblYvN9fkViyMUsRFC0Dx1r9M=";
subPackages = [
"cmd/nuclei/"