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]
2024-02-25 06:01:03 +00:00
committed by GitHub
parent 9261fbbb67 0966640f5a
commit 25573f4a15
11 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/team-list.nix
-1
View File
@@ -342,7 +342,6 @@ with lib.maintainers; {
imincik
nh2
nialov
r-burns
sikmir
willcohen
];
pkgs/applications/emulators/bsnes/ares/default.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
version = "135";
version = "136";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${finalAttrs.version}";
hash = "sha256-SZhsMKjNxmT2eHsXAZcyMGoMhwWGgvXpDeZGGVn58Sc=";
hash = "sha256-Hks/MWusPiBVdb5L+53qtR6VmXG/P4rDzsvHxLeA8Do=";
};
patches = [
pkgs/by-name/lu/lubelogger/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "lubelogger";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-YxP8XmjYqxuTA2fIV1q7GBsrWPtLr02KkFl4UUNJ2p8=";
hash = "sha256-eH8BWTUTzmVTOnn5svSfk8hqf8CjIpQdxoknlkgjVDY=";
};
projectFile = "CarCareTracker.sln";
pkgs/development/haskell-modules/configuration-common.nix
+6 -6
View File
@@ -393,22 +393,22 @@ self: super: {
# Manually maintained
cachix-api = overrideCabal (drv: {
version = "1.7";
version = "1.7.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.7";
sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";
rev = "v1.7.1";
sha256 = "sha256-neN8zGZuGXnLVdQw468z67o96mn8o1p4WGqPINl+NjU=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
}) super.cachix-api;
cachix = (overrideCabal (drv: {
version = "1.7";
version = "1.7.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.7";
sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";
rev = "v1.7.1";
sha256 = "sha256-neN8zGZuGXnLVdQw468z67o96mn8o1p4WGqPINl+NjU=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix";
}) (lib.pipe
pkgs/development/libraries/icu/default.nix
+2 -15
View File
@@ -2,64 +2,53 @@
let
make-icu = (import ./make-icu.nix) {
inherit stdenv lib fetchurl fixDarwinDylibNames testers;
inherit stdenv lib buildPackages fetchurl fixDarwinDylibNames testers;
};
in
{
icu74 = make-icu {
version = "74.2";
hash = "sha256-aNsIIhKpbW9T411g9H04uWLp+dIHp0z6x4Apro/14Iw=";
nativeBuildRoot = buildPackages.icu74.override { buildRootOnly = true; };
};
icu73 = make-icu {
version = "73.2";
hash = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE=";
nativeBuildRoot = buildPackages.icu73.override { buildRootOnly = true; };
};
icu72 = make-icu {
version = "72.1";
hash = "sha256-otLTghcJKn7VZjXjRGf5L5drNw4gGCrTJe3qZoGnHWg=";
nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; };
};
icu71 = make-icu {
version = "71.1";
hash = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8=";
nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; };
};
icu70 = make-icu {
version = "70.1";
hash = "sha256-jSBUKMF78Tu1NTAGae0oszihV7HAGuZtMdDT4tR8P9U=";
nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; };
};
icu69 = make-icu {
version = "69.1";
hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U=";
nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; };
};
icu68 = make-icu {
version = "68.2";
hash = "sha256-x5GT3uOQeiGZuClqk7UsXLdDMsJvPRZyaUh2gNR51iU=";
nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; };
};
icu67 = make-icu {
version = "67.1";
hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw=";
nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; };
};
icu66 = make-icu {
version = "66.1";
hash = "sha256-UqPyIJq5VVnBzwoU8kM4AB84lhW/AOJYXvPbxD7PCi4=";
nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; };
};
icu64 = make-icu {
version = "64.2";
hash = "sha256-Yn1dhHjm2W/IyQ/tSFEjkHmlYaaoueSLCJLyToLTHWw=";
nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; };
};
icu63 = make-icu {
version = "63.1";
hash = "sha256-BcSQtpRU/OWGC36OKCEjFnSvChHX7y/r6poyUSmYy50=";
nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; };
patches = [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1499398
(fetchpatch {
@@ -72,12 +61,10 @@ in
icu60 = make-icu {
version = "60.2";
hash = "sha256-8HPqjzW5JtcLsz5ld1CKpkKosxaoA/Eb4grzhIEdtBg=";
nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; };
};
icu58 = make-icu {
version = "58.2";
hash = "sha256-KwpEEBU6myDeDiDH2LZgSacq7yRLU2g9DXUhNxaD2gw=";
nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
patches = [
(fetchurl {
url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
@@ -87,4 +74,4 @@ in
];
patchFlags = [ "-p4" ];
};
}
}
pkgs/development/libraries/icu/make-icu.nix
+10 -11
View File
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, fixDarwinDylibNames, testers }:
{ stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers }:
{ version, hash, patches ? [], patchFlags ? []
# Cross-compiled icu4c requires a build-root of a native compile
, buildRootOnly ? false, nativeBuildRoot
}:
{ version, hash, patches ? [], patchFlags ? [] }:
let
# Cross-compiled icu4c requires a build-root of a native compile
nativeBuildRoot = buildPackages."icu${lib.versions.major version}".buildRootOnly;
pname = "icu4c";
baseAttrs = {
@@ -99,10 +99,9 @@ let
'';
};
attrs = if buildRootOnly
then buildRootOnlyAttrs
else realAttrs;
mkWithAttrs = attrs: stdenv.mkDerivation (finalAttrs: attrs // {
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
passthru.buildRootOnly = mkWithAttrs buildRootOnlyAttrs;
});
in
stdenv.mkDerivation (finalAttrs: attrs // {
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
})
mkWithAttrs realAttrs
pkgs/development/libraries/physics/rivet/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rivet";
version = "3.1.9";
version = "3.1.10";
src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
hash = "sha256-9lMgRdph7rKtwgqavEFmtLLUGrLByltQDNYWuxuS57E=";
hash = "sha256-RYuODfHec46ZctJLJg6qCH3xLJnU/p3uU3fUfqakmRk=";
};
latex = texliveBasic.withPackages (ps: with ps; [
pkgs/development/python-modules/oslo-context/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "oslo.context";
version = "5.3.0";
version = "5.4.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-xRBxQcYotq5W1P62MiucSnAJL9ahgekfq+relKCeTjg=";
hash = "sha256-6WSRu91rUecqOoxUahKbhNI56OngtSEMi6fAoKVimRk=";
};
postPatch = ''
pkgs/development/python-modules/snakemake-interface-common/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "snakemake-interface-common";
version = "1.17.0";
version = "1.17.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-1dvanwYCQE5usgXPhYCZfUpj4MyaLImQ5RskQvS6nJs=";
hash = "sha256-23PGKSBX7KMt0Q7sWiLIPfCkxr2HtBas7flYeNHABWM=";
};
nativeBuildInputs = [
pkgs/games/libremines/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libremines";
version = "1.10.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "Bollos00";
repo = pname;
rev = "v${version}";
hash = "sha256-aqWzTvvRoke+Rakb6dNpDoD7haKHEKW3XARGLrH2WiY=";
hash = "sha256-LejDXjli+AEVGp23y+ez/NyJY/8w7uHcOij6RsDwIH4=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ];
pkgs/tools/backup/borgmatic/default.nix
+7 -3
View File
@@ -13,14 +13,14 @@
python3Packages.buildPythonApplication rec {
pname = "borgmatic";
version = "1.8.1";
version = "1.8.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XbihTQJtoiRRfwjMCP+XEPmbt7//zFPx1fIWOvn92Nc=";
sha256 = "sha256-dPWp8SH4//HJlCrF6YRaMb32idox1E0/Gd8qc/GmP4c=";
};
nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];
nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise;
# - test_borgmatic_version_matches_news_version
# The file NEWS not available on the pypi source, and this test is useless
@@ -40,6 +40,10 @@ python3Packages.buildPythonApplication rec {
setuptools
];
passthru.optional-dependencies = {
apprise = with python3Packages; [ apprise ];
};
postInstall = ''
installShellCompletion --cmd borgmatic \
--bash <($out/bin/borgmatic --bash-completion)