From 98893be5b8fcfa0c377092aa23521543532515c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 20:45:03 +0000 Subject: [PATCH 01/10] ares: 135 -> 136 --- pkgs/applications/emulators/bsnes/ares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 25d2126ac34c..b3d362cd11aa 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -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 = [ From 31deaa7d3d478061a22ee16b080965ac10b1a6bf Mon Sep 17 00:00:00 2001 From: imlonghao Date: Sun, 29 Oct 2023 09:24:40 +0800 Subject: [PATCH 02/10] borgmatic: 1.8.1 -> 1.8.8 --- pkgs/tools/backup/borgmatic/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 24d4e98ed1fa..2b3b9e92f90c 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -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) From 5dbc79c15828c90448d6ba56c8dbcb8b82bf315e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 22:06:22 +0000 Subject: [PATCH 03/10] python311Packages.oslo-context: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/oslo-context/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index 902c244c488b..b9f831ce00e5 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -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 = '' From 6a0c4fbe04238867c3a6593da3b34294d07f37da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 22:12:59 +0000 Subject: [PATCH 04/10] lubelogger: 1.2.1 -> 1.2.2 --- pkgs/by-name/lu/lubelogger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 33c6214f4e72..386cddb9a7bd 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -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"; From e4796838fd9ecd518b1c70c72e9f82acb55f0442 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 18:33:59 +0000 Subject: [PATCH 05/10] python312Packages.snakemake-interface-common: 1.17.0 -> 1.17.1 --- .../python-modules/snakemake-interface-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index 740fd99013df..6ac47e4afede 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -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 = [ From 72804e76d45807664475678555447415ccb20702 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 04:03:28 +0000 Subject: [PATCH 06/10] rivet: 3.1.9 -> 3.1.10 --- pkgs/development/libraries/physics/rivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 76a4d71b38e4..a59b34147a9f 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -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; [ From dfdf0cea5cbc4781db6584bd79459cf880caa683 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 22 Feb 2024 22:58:34 +0000 Subject: [PATCH 07/10] icu: fix cross compilation --- pkgs/development/libraries/icu/default.nix | 17 ++--------------- pkgs/development/libraries/icu/make-icu.nix | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 7b0d295a98ea..bf595108baaf 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -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" ]; }; - } +} diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 5bae46714f2a..836a7e3c73a6 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -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 From c6da730ebbe59fbd95d725b09c73213220bbc604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 25 Feb 2024 01:29:19 +0000 Subject: [PATCH 08/10] cachix: 1.7 -> 1.7.1 --- .../haskell-modules/configuration-common.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 482abb918e02..711bb3ac2d23 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 From cfff6d56c8f3e8a05788ddfb527f3e3dd0cc8df6 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 24 Feb 2024 17:30:19 -0800 Subject: [PATCH 09/10] maintainers/teams: remove r-burns from geospatial --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c83b936cd81e..d43d6e975a81 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -342,7 +342,6 @@ with lib.maintainers; { imincik nh2 nialov - r-burns sikmir willcohen ]; From c7e95762f69fddd95f66d36dea468405df7c2adb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 03:07:44 +0000 Subject: [PATCH 10/10] libremines: 1.10.0 -> 2.0.0 --- pkgs/games/libremines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix index fb7f6ae96873..fddc2ba92001 100644 --- a/pkgs/games/libremines/default.nix +++ b/pkgs/games/libremines/default.nix @@ -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 ];