From c38ad034ac5a5252f0a9e770eea5957ae44286e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 23:15:21 +0000 Subject: [PATCH 01/26] grafana-dash-n-grab: 0.5.2 -> 0.6.0 --- pkgs/servers/monitoring/grafana-dash-n-grab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index 089d2f4e4db1..49e85ba7dac9 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-EG1hLyoy75nvA1ZmSHSPVEzMwhq6d0PxmVUpQysjsRg="; + sha256 = "sha256-47zKZnq7ADIAti4fjGj6ctoM5Qo6UzAX1aLf87TknkQ="; }; - vendorHash = "sha256-w0w6ac8sNxsVBEYps6ZhM7F4PFcIWKah0cnk/NBtA8M="; + vendorHash = "sha256-XJSi+p++1QFfGk57trfIgyv0nWUm38H0n/qbJgV8lEM="; ldflags = [ "-s" From e20ff76306fac43c024832d41bbaca2e11730e46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 13:00:23 +0000 Subject: [PATCH 02/26] xmrig: 6.21.1 -> 6.21.2 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index b0f8562c1728..db7bdd4fc727 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.1"; + version = "6.21.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-xMfNWqr43Gxu+ET8oP9l97+tBsL/b6DNuFU4j9wy0UA="; + hash = "sha256-0ej2+g+B9K50JIs0wi1SfLBsaYTsk+0/cImLLZLNtmc="; }; patches = [ From 559d9a8aebfc1b30bef4b22b41ba76c0e77e1487 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Mar 2024 10:25:15 +0000 Subject: [PATCH 03/26] touchosc: 1.2.9.200 -> 1.3.0.202 --- pkgs/applications/audio/touchosc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 99d0fba6fa95..bcd078eeb9f1 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.9.200"; + version = "1.3.0.202"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-JrpwD4xD4t9e3qmBCl6hfHv/InnRBRsYIsNNrxwQojo="; - armv7l-linux = "sha256-8e50jznyHUJt9aL5K/emp0T8VSLdXMuBl6KCMot8kIY="; - x86_64-linux = "sha256-lQi1HFW53LdS6Q86s0exp0WmTMTz4g48yZC73DaM2lo="; + aarch64-linux = "sha256-qsjZ/oo2V6mknrMktuTP188hp57oiPxO/iwp3G57JXU="; + armv7l-linux = "sha256-33SnAYumfnZlxKms3fANt9wRJghaQHUstZbKqTxBF3Q="; + x86_64-linux = "sha256-4SE2iw45sLyapYLCd31xT/aZMTmetsjmgfWFf0FrluI="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From f2c7e9127028ac44f8eba4610d10ca352314ec6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Apr 2024 08:39:26 +0000 Subject: [PATCH 04/26] netpbm: 11.5.3 -> 11.6.0 --- pkgs/tools/graphics/netpbm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 99aeb576939e..e7cc5a6cfae5 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.5.3"; + version = "11.6.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4867"; - sha256 = "JCJW6BBdxoYWMpZoJp6ovHNqyuU4a1FIvjLB2poDGGM="; + rev = "4897"; + sha256 = "2aTDM0aVfav2mnOLXj0HuTdbsY7EUH8ieBrXgaFU7FU="; }; nativeBuildInputs = [ From 06889285307698e469490bcbb83dca34672ddcc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 01:58:03 +0000 Subject: [PATCH 05/26] altair: 6.3.1 -> 6.4.0 --- pkgs/development/tools/altair-graphql-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index d959c4eba3e6..3be3625cd696 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-ebRwdivDxjcM3dD+RLW09otT/wovz1JjgXai2TsuSOE="; + sha256 = "sha256-eUUPfMwCMrMHk2RcLfpI8VuolgI/7geY6/6QrWjkIXg="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 79d9d4f3a0ed59ec6d7d7580df6dd45698129f7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 08:06:45 +0000 Subject: [PATCH 06/26] re-flex: 4.1.2 -> 4.2.0 --- pkgs/development/tools/parsing/re-flex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 524a900ec422..3a69cb18803c 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "4.1.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - hash = "sha256-w1aH04VGe9nPvwGdbTEsAcIPb7oC739LZjTI/1Ck7bU="; + hash = "sha256-+/Q3lcdV4tEArYmuQN5iL6r5TS0J/zoLQ85bNazpSf8="; }; outputs = [ "out" "bin" "dev" ]; From 0f6cb1cb5a4b1e84f17dc92eedd79ed10f2604d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 13:37:19 +0000 Subject: [PATCH 07/26] passky-desktop: 8.1.1 -> 8.1.2 --- pkgs/applications/misc/passky-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/applications/misc/passky-desktop/default.nix index ec45bc3efaea..26f5debecacd 100644 --- a/pkgs/applications/misc/passky-desktop/default.nix +++ b/pkgs/applications/misc/passky-desktop/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "passky-desktop"; - version = "8.1.1"; + version = "8.1.2"; src = fetchFromGitHub { owner = "Rabbit-Company"; repo = "Passky-Desktop"; rev = "refs/tags/v${version}"; - sha256 = "1ma8s1bngjdzclcc4m5pcmavk38sidaskmz7dgfnv84y35si18dr"; + sha256 = "sha256-QQ0+qIkDPNCHeWmcF6FkbDrrt/r3fIkNi0dv6XlV1rc="; }; nativeBuildInputs = [ From 0e5bdd5af9e3446530ad570289f7ca7c5a4f4b20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Apr 2024 11:25:37 +0000 Subject: [PATCH 08/26] reaper: 7.11 -> 7.13 --- pkgs/applications/audio/reaper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index ba84f8c2aba4..387fc659aa65 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.11"; + version = "7.13"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-8GWfrr+kKF3Ei6Fed9Oei461veRXXbTICvyNJNLBbYM=" else { - x86_64-linux = "sha256-lpgGXHWWhhs1jLllq5C3UhOLgLyMTE6qWFiGkBcuWlo="; - aarch64-linux = "sha256-0iTdrZYjKzPyNLMIM4othtAMox/65HBEy1VickOZFnA="; + hash = if stdenv.isDarwin then "sha256-g9t1vCPKTw68w6/b401OAdMNth4UlT9Obht6oPArqKY=" else { + x86_64-linux = "sha256-Zj+3LXNoHD6+v0dDn8mKqN14Y9Tk2+fZ4W343VjZoLw="; + aarch64-linux = "sha256-kbonwYlEd13AIzy1DNbsFwy+rRrQpOTrup3NZpJOmUA="; }.${stdenv.hostPlatform.system}; }; From a58d45a160ea9115be1bf19282ffb24c57708ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 5 Apr 2024 10:26:04 +1100 Subject: [PATCH 09/26] tangerine: init at 2024-04-05 --- pkgs/by-name/ta/tangerine/package.nix | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ta/tangerine/package.nix diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix new file mode 100644 index 000000000000..1521536c4c37 --- /dev/null +++ b/pkgs/by-name/ta/tangerine/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, ncurses +, SDL2 +}: + +stdenv.mkDerivation { + pname = "tangerine"; + version = "unstable-2024-04-05"; + + src = fetchFromGitHub { + owner = "Aeva"; + repo = "tangerine"; + rev = "a628e95d181d396246214df5194ac6b18698d811"; + hash = "sha256-vn4/eH5o0UhTNfN2UB4r0eKNn90PbH3UPfarHsnQPIk="; + }; + + patches = [ + (fetchpatch { + name = "no-install-during-build.patch"; + url = "https://github.com/Aeva/tangerine/pull/12/commits/2d7d1ae1e21e8fe52df2c4a33e947b2ff6b07812.patch"; + hash = "sha256-zLAx5FOvtUsUZM/nUCFW8Z1Xe3+oV95Nv1s3GaNcV/c="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses SDL2 ]; + + meta = with lib; { + description = "A system for creating 3D models procedurally from a set of Signed Distance Function (SDF) primitive shapes and combining operators"; + homepage = "https://github.com/Aeva/tangerine"; + license = licenses.asl20; + maintainers = [ maintainers.viraptor ]; + broken = stdenv.isDarwin; # third_party/naive-surface-nets doesn't find std::execution + }; +} + From 10b276743696096e6d241edeecad80f4c837e75b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 12:25:23 +0000 Subject: [PATCH 10/26] chiaki4deck: 1.6.5 -> 1.6.6 --- pkgs/games/chiaki4deck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix index 4c2aeb172e1f..83af55da1d01 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki4deck/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "chiaki4deck"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "streetpea"; repo = pname; rev = "v${version}"; - hash = "sha256-ogNfls7RPvzIVat0zlBlCWHWt22YfzGawjfgu5y9Gyk="; + hash = "sha256-hai7fIyeNcAURfeQtAIqOLb9j8erPNoy3zHK4rgLjc0="; fetchSubmodules = true; }; From 8ec55befcfc1bc969e56fc829eb51c3a0fea8d46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 13:15:06 +0000 Subject: [PATCH 11/26] moar: 1.23.9 -> 1.23.10 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 85eefe9f36eb..d8972a89912e 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.9"; + version = "1.23.10"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-qpbsNHIWiYTa5kt0GTybnWiSnUdPYIeFYsWXinYjtQA="; + hash = "sha256-ue/ZcIIJJAxUMhsEA3FtrkE5mgtiY626b+GmX62Q8dM="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; From 2a7d4668b25a5e3f0545e6950662b05a49bd9211 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 13:24:22 +0000 Subject: [PATCH 12/26] oksh: 7.4 -> 7.5 --- pkgs/shells/oksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index 4c309ad30614..0be401c0a1f2 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oksh"; - version = "7.4"; + version = "7.5"; src = fetchFromGitHub { owner = "ibara"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-QkWUTqFoEA+XZv0EAHnDtkm9xI+NlQcNqicCvCtXJYc="; + sha256 = "sha256-r75jjH1E7/36b0ebjsZK7rAuOHEyaIta5Bi8nB4zVjo="; }; strictDeps = true; From c4128f9b05be98c044b63168e445a7fca5cb01c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 14:35:21 +0000 Subject: [PATCH 13/26] seqkit: 2.8.0 -> 2.8.1 --- pkgs/applications/science/biology/seqkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix index 1c572ba56354..5c46e25f5d6d 100644 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "seqkit"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-JsrmRUbSNCFJ58tIblKq+VRXCD1mBeCAcosDGiVb5Gs="; + sha256 = "sha256-LtPf99spy2ByTnSMJ5k1mWkh+Nct3Fg4Y9mXARxuXlA="; }; vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0="; From 54e5f321c3948140cf8b68dbb1ccd39ba95804ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 15:37:12 +0000 Subject: [PATCH 14/26] sickgear: 3.30.16 -> 3.30.17 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 2f1949ad6430..30a93d81c6ba 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.16"; + version = "3.30.17"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-9DeHA7wBHz4gjqtRF3uaHKG9EEnjQmmEPvpqKaffJyg="; + hash = "sha256-ITEKF/YPoozAaCH/8s7Jwlj2YUc+CLqIjtpDZ3b2J5w="; }; patches = [ From adfc606560fee49e97a06e0666aa961108898680 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Apr 2024 20:41:47 +0200 Subject: [PATCH 15/26] wily: fix build on darwin --- pkgs/applications/editors/wily/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index 74d0bc156758..0e883a51210a 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXt ]; - configureFlags = [ "--prefix=$(out)" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-int" + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-function-pointer-types" + ]); preInstall = '' mkdir -p $out/bin From 0a3f1eb3ef5808e6df825d75ff4546e88ea4e267 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 19:57:39 +0000 Subject: [PATCH 16/26] cargo-show-asm: 0.2.30 -> 0.2.31 --- pkgs/development/tools/rust/cargo-show-asm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 61bc24903c49..1e313595358f 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.30"; + version = "0.2.31"; src = fetchCrate { inherit pname version; - hash = "sha256-Xb7+3HSAa8mSNHufcVwshdS9XuofvFnAgaSvT6ZFj0I="; + hash = "sha256-TjkEzqGFqhVKMmZEcwAoDnHOZWi7+wha228loJjLxgQ="; }; - cargoHash = "sha256-SUL5SPpnx6TqoyEguEdCvkNizbZbFjcacn+xe4P1rFk="; + cargoHash = "sha256-oUfBpx/hElXMw58Dj09JeG2FKy+biFt+4pb4pYNidxc="; nativeBuildInputs = [ installShellFiles From bf4350735d79fa2fa8e21fb2ceac0081a903a889 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Sun, 7 Apr 2024 22:44:37 +0200 Subject: [PATCH 17/26] whitesur-icon-theme: 2023-01-08 -> 2024-04-08 --- pkgs/data/icons/whitesur-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index a6514b3fe0d4..e9ca757add20 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-07-03"; + version = "2024.04.08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-lq6d3BForrvzEJYeEMQZplvn/p6dPjggTToAU9UcPoM="; + hash = "sha256-Baf0BowyR4P7MDx+LmH6MHlANl+9lXlCaQispN4/i9o="; }; nativeBuildInputs = [ gtk3 jdupes ]; From 55ae0a712751779e832db7bbc1e095f6b7a6cfab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 20:57:10 +0000 Subject: [PATCH 18/26] c-blosc2: 2.13.2 -> 2.14.3 --- pkgs/development/libraries/c-blosc/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix index a431b7f59a85..7c186b3a2e93 100644 --- a/pkgs/development/libraries/c-blosc/2.nix +++ b/pkgs/development/libraries/c-blosc/2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc2"; - version = "2.13.2"; + version = "2.14.3"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc2"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-RNIvg6p/+brW7oboTDH0bbRfIQDaZwtZbbWFbftfWTk="; + sha256 = "sha256-0rizBygyNW9Sr7qnQZoN/Wv2ZIAYuJTQ5tkW6iwIw7Y="; }; # https://github.com/NixOS/nixpkgs/issues/144170 From 559c9ddd9bae08c5959562a90d59ced874c65490 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 21:22:59 +0000 Subject: [PATCH 19/26] python311Packages.linien-common: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/linien-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index f0fd4b920707..88da8560db46 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "linien-common"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "linien-org"; repo = "linien"; rev = "refs/tags/v${version}"; - hash = "sha256-ZgAp1SEiHijyjK74VZyRLYY3Hzfc3BQ6cnoO3hZzvbE="; + hash = "sha256-V6oo0a4cNlvn4pIwzchvCTOu7qtUGS+Pc0qpbEsvGZo="; }; sourceRoot = "${src.name}/linien-common"; From d6ce558617c63a27eeccea2cd18e1137ebd071ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 12:18:41 +0000 Subject: [PATCH 20/26] openjk: 0-unstable-2024-03-05 -> 0-unstable-2024-03-25 --- pkgs/games/openjk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 07ef12b00365..6e887c383511 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -31,14 +31,14 @@ let categories = [ "Game" ]; }; in stdenv.mkDerivation { - pname = "OpenJK"; - version = "0-unstable-2024-03-05"; + pname = "openjk"; + version = "0-unstable-2024-03-25"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "62124e18ef09b293ea66a1f673b827d83e073928"; - sha256 = "sha256-2LgxRWoAfxNE6YDyrpNmDH9APhi2XH4ufNCNMd91llU="; + rev = "d2afcfefb5eb07d6f3787b48b947482160f27a1d"; + hash = "sha256-dUXrFlzeLfah0xMXKeXHCXnmeTjRAy0/+aDCtPNw8a8="; }; dontAddPrefix = true; From c3160517fc6381f86776795e95c97b8ef7b5d2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 8 Apr 2024 02:43:32 +0200 Subject: [PATCH 21/26] megasync: 4.9.0.0 -> 4.9.1.0 (#302394) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * megasync: 4.9.0.0 -> 4.9.1.0 and removed freeimage dependency Resolves: #290949 Signed-off-by: Michal Minář * removed orphaned patch Signed-off-by: Michal Minář --------- Signed-off-by: Michal Minář --- pkgs/applications/misc/megasync/default.nix | 15 ++++++--------- pkgs/applications/misc/megasync/ffmpeg_44.patch | 14 -------------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/misc/megasync/ffmpeg_44.patch diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 79800a6c46ee..cb97ca672308 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -8,7 +8,6 @@ , doxygen , fetchFromGitHub , ffmpeg -, freeimage , libmediainfo , libraw , libsodium @@ -28,13 +27,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.9.0.0"; + version = "4.9.1.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM="; + sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY="; fetchSubmodules = true; }; @@ -54,7 +53,6 @@ mkDerivation rec { cryptopp curl ffmpeg - freeimage libmediainfo libraw libsodium @@ -72,7 +70,6 @@ mkDerivation rec { ./noinstall-distro-version.patch # megasync target is not part of the install rule thanks to a commented block ./install-megasync.patch - ./ffmpeg_44.patch ]; postPatch = '' @@ -98,7 +95,7 @@ mkDerivation rec { "--with-cryptopp" "--with-curl" "--with-ffmpeg" - "--with-freeimage" + "--without-freeimage" "--without-readline" "--without-termcap" "--with-sodium" @@ -111,10 +108,10 @@ mkDerivation rec { ''; preBuild = '' - qmake CONFIG+="release" MEGA.pro + qmake CONFIG+="nofreeimage release" MEGA.pro pushd MEGASync lrelease MEGASync.pro - DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release + DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+="nofreeimage release" popd ''; @@ -124,6 +121,6 @@ mkDerivation rec { homepage = "https://mega.nz/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ maintainers.michojel ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/megasync/ffmpeg_44.patch b/pkgs/applications/misc/megasync/ffmpeg_44.patch deleted file mode 100644 index 901635e43f3e..000000000000 --- a/pkgs/applications/misc/megasync/ffmpeg_44.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp -=================================================================== ---- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp -+++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp -@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg( - - // Force seeking to key frames - formatContext->seek2any = false; -- videoStream->skip_to_keyframe = true; -+ // no longer exposed in ffmpeg 4.4; the line above should be sufficient -+ //videoStream->skip_to_keyframe = true; - if (decoder->capabilities & CAP_TRUNCATED) - { - codecContext->flags |= CAP_TRUNCATED; From 266c8809684a9244d9fec71b66f7d0c92758056a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Apr 2024 08:02:44 +0000 Subject: [PATCH 22/26] spire: 1.9.2 -> 1.9.3 --- pkgs/tools/security/spire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 49d0b296fd52..4655f5c2aa01 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.9.2"; + version = "1.9.3"; outputs = [ "out" "agent" "server" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gbi6nM9tjH/bYOFwpBrjH/rFEtSs9ihxM3jDAt+5HTU="; + sha256 = "sha256-5Wisxo5RvDMmTgwPprpqVOPVTETCuUGWKuTu035swoY="; }; vendorHash = "sha256-XYM6r/+31apm9Ygq3eMX5DRf8p7/jwkBNaE2OvooRwM="; From b0dab7cc34ef4d8a1b2de36178da801090bcb271 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 18:21:22 +0000 Subject: [PATCH 23/26] python311Packages.xmlschema: 3.0.2 -> 3.2.1 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 5869ad70fcea..a8add7b16ff8 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.0.2"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-jYFhoNx4Oxm7c0LsSQ0xw9fY/yxfQU5JoP5RteHzeYM="; + hash = "sha256-jhof4C/jbMcvBRTLFdeFq2+ZucoDhbdcLE9IWvgzN0Y="; }; nativeBuildInputs = [ From 18a5476aa7779b916e588e99fb438c631a464d77 Mon Sep 17 00:00:00 2001 From: abysssol Date: Sun, 7 Apr 2024 20:17:15 -0400 Subject: [PATCH 24/26] nixos/ollama: add options to override `HOME` and `OLLAMA_MODELS` --- nixos/modules/services/misc/ollama.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index 7a5661510e25..30c2b26d8322 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -15,6 +15,22 @@ in services.ollama = { enable = lib.mkEnableOption "ollama server for local large language models"; package = lib.mkPackageOption pkgs "ollama" { }; + home = lib.mkOption { + type = types.str; + default = "%S/ollama"; + example = "/home/foo"; + description = '' + The home directory that the ollama service is started in. + ''; + }; + models = lib.mkOption { + type = types.str; + default = "%S/ollama/models"; + example = "/path/to/ollama/models"; + description = '' + The directory that the ollama service will read models from and download new models to. + ''; + }; listenAddress = lib.mkOption { type = types.str; default = "127.0.0.1:11434"; @@ -58,8 +74,8 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; environment = cfg.environmentVariables // { - HOME = "%S/ollama"; - OLLAMA_MODELS = "%S/ollama/models"; + HOME = cfg.home; + OLLAMA_MODELS = cfg.models; OLLAMA_HOST = cfg.listenAddress; }; serviceConfig = { From 0fd66d6c59419584a4606f72e8dc4a0c0a15cfac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 03:07:16 +0000 Subject: [PATCH 25/26] simdutf: 5.2.0 -> 5.2.3 --- pkgs/by-name/si/simdutf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 70e3d29a48ca..90513eea9c9b 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.2.0"; + version = "5.2.3"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-4yo962iiwSPW1JeQq5mLse5DJUub7AWqMDA+AdpsRBo="; + hash = "sha256-aGuztJLHfC/GZuvZSieWOOYN5VyvxYCZKGX1nQQDvxo="; }; # Fix build on darwin From f601f6b835ff67b95fd34b02163cf4df3b2f86ce Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Mon, 8 Apr 2024 16:39:53 +1200 Subject: [PATCH 26/26] heroic: 2.14.0 -> 2.14.1 --- pkgs/games/heroic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index c48c4aa452c5..cf85c5ddc5ee 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,13 +17,13 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-EARNmvzOOE/AAQKqiXZhhCf2A/j9Cn2BRV9Yc0ezKfE="; + hash = "sha256-AnyltqNP+XyVzgCobM3g6DIXntD3spKecYtCRx+8oic="; }; offlineCache = fetchYarnDeps {