From 3d05e6fe7c24a4bcae5a5b327e85a9a0a3b284e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 09:50:52 +0000 Subject: [PATCH 01/11] mpb: 1.11.1 -> 1.12.0 --- pkgs/by-name/mp/mpb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix index 0a2a79e61f27..4d09844c386e 100644 --- a/pkgs/by-name/mp/mpb/package.nix +++ b/pkgs/by-name/mp/mpb/package.nix @@ -19,13 +19,13 @@ assert !lapack.isILP64; stdenv.mkDerivation rec { pname = "mpb"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "NanoComp"; repo = "mpb"; tag = "v${version}"; - hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k="; + hash = "sha256-naxVKD7pxefb/ht5Pa4e/T9eDzlZ0raNYPSvKNaZUn8="; }; nativeBuildInputs = [ From 551247ead5058669f7007f21f6e57cdf0ee30ff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 04:24:40 +0000 Subject: [PATCH 02/11] lidarr: 2.9.6.4552 -> 2.10.3.4602 --- pkgs/servers/lidarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 0cd87d208c20..09f2fd414c53 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -26,15 +26,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-fgOe0xZMepec+DDi/6Kq1j5EVuw45Igvrvucdnklj1w="; - arm64-linux_hash = "sha256-Jhjwpwgo1vRluWTzpn0gd17uII3rw6OPV/+SW8TMolQ="; - x64-osx_hash = "sha256-htSMl+Y22YE2SnUOsx+2ZfRvWCeF4K9b+wVfDoxK4+M="; + x64-linux_hash = "sha256-PwHIUbXxk9VOKd+I7EcrTEYlikfw2NUdO6IQdiQWhWs="; + arm64-linux_hash = "sha256-uu7iVexyss29Q7mZ280KeDLZWp6wwCh+TJj9XeZc/lQ="; + x64-osx_hash = "sha256-POjIY2iPoYOQQci6AV/7X8t7GGbxVqROjlMzwERH/3c="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.9.6.4552"; + version = "2.10.3.4602"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; From 8136ba02df57ceda4209c4b5e990c11b0faee706 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 22:14:52 +0000 Subject: [PATCH 03/11] laravel: 5.14.1 -> 5.14.2 --- pkgs/by-name/la/laravel/composer.lock | 86 +++++++++++++-------------- pkgs/by-name/la/laravel/package.nix | 6 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index ed290491877c..aa9d0843fabc 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -168,16 +168,16 @@ }, { "name": "illuminate/collections", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "0094b162fa505126c1391222f27fd98734d24525" + "reference": "f1d8ae882c014673b1f7bedab6435989553776e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/0094b162fa505126c1391222f27fd98734d24525", - "reference": "0094b162fa505126c1391222f27fd98734d24525", + "url": "https://api.github.com/repos/illuminate/collections/zipball/f1d8ae882c014673b1f7bedab6435989553776e3", + "reference": "f1d8ae882c014673b1f7bedab6435989553776e3", "shasum": "" }, "require": { @@ -220,20 +220,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-16T23:50:18+00:00" + "time": "2025-04-03T17:58:47+00:00" }, { "name": "illuminate/conditionable", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d" + "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/a2b3c66f3ca532e12e694bd5c9254adc303b922d", - "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/251ef166c6ee46cc8a141403253f83fe7ee50507", + "reference": "251ef166c6ee46cc8a141403253f83fe7ee50507", "shasum": "" }, "require": { @@ -266,20 +266,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-02-19T19:08:33+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/contracts", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6" + "reference": "bbaec083da240396f2186f4c3a9952da207f28a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/88962e0a73fb837e048ebdbbc67afd2f6b30e8e6", - "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/bbaec083da240396f2186f4c3a9952da207f28a0", + "reference": "bbaec083da240396f2186f4c3a9952da207f28a0", "shasum": "" }, "require": { @@ -314,20 +314,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-16T23:56:53+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/filesystem", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857" + "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/e59cfec3c16d71be2da85cf9385ddd82f0c15857", - "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/4fa2995bad173c1a0067b285bb7fef47a4b441c6", + "reference": "4fa2995bad173c1a0067b285bb7fef47a4b441c6", "shasum": "" }, "require": { @@ -381,11 +381,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-12T14:22:47+00:00" + "time": "2025-03-19T20:10:05+00:00" }, { "name": "illuminate/macroable", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -431,16 +431,16 @@ }, { "name": "illuminate/support", - "version": "v12.3.0", + "version": "v12.7.2", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57" + "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/bcba98dcdbc758261b3b872a9b9dc789aed1eb57", - "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57", + "url": "https://api.github.com/repos/illuminate/support/zipball/1d5d07534bb2d9f16e655c2cb99607517ad43e8f", + "reference": "1d5d07534bb2d9f16e655c2cb99607517ad43e8f", "shasum": "" }, "require": { @@ -504,7 +504,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-03-13T14:51:35+00:00" + "time": "2025-04-02T19:35:42+00:00" }, { "name": "laravel/prompts", @@ -567,16 +567,16 @@ }, { "name": "nesbot/carbon", - "version": "3.8.6", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd" + "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd", - "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6d16a8a015166fe54e22c042e0805c5363aef50d", + "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d", "shasum": "" }, "require": { @@ -669,7 +669,7 @@ "type": "tidelift" } ], - "time": "2025-02-20T17:33:38+00:00" + "time": "2025-03-27T12:57:33+00:00" }, { "name": "psr/clock", @@ -899,16 +899,16 @@ }, { "name": "symfony/console", - "version": "v7.2.1", + "version": "v7.2.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3" + "reference": "e51498ea18570c062e7df29d05a7003585b19b88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3", + "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88", + "reference": "e51498ea18570c062e7df29d05a7003585b19b88", "shasum": "" }, "require": { @@ -972,7 +972,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.2.1" + "source": "https://github.com/symfony/console/tree/v7.2.5" }, "funding": [ { @@ -988,7 +988,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T03:49:26+00:00" + "time": "2025-03-12T08:11:12+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1517,16 +1517,16 @@ }, { "name": "symfony/process", - "version": "v7.2.4", + "version": "v7.2.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf" + "reference": "87b7c93e57df9d8e39a093d32587702380ff045d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", + "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d", + "reference": "87b7c93e57df9d8e39a093d32587702380ff045d", "shasum": "" }, "require": { @@ -1558,7 +1558,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.2.4" + "source": "https://github.com/symfony/process/tree/v7.2.5" }, "funding": [ { @@ -1574,7 +1574,7 @@ "type": "tidelift" } ], - "time": "2025-02-05T08:33:46+00:00" + "time": "2025-03-13T12:21:46+00:00" }, { "name": "symfony/service-contracts", diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index 1608936e9aa1..4e673700be57 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -7,19 +7,19 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.14.1"; + version = "5.14.2"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; tag = "v${finalAttrs.version}"; - hash = "sha256-3DgiOybYN9G8BONK7kmyO21B5WqeY7DcHunWcT6h124="; + hash = "sha256-A/uyYi2CAlj8ozX65frCM32kNM2kZ/FpV1ZHr6UXWWY="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-6oPbR6cpsdr2aJWjJvLWVD1NfuZF38sUMJEdBAjl/aA="; + vendorHash = "sha256-yj0AfN+jCDMtuAQ69yEyI+dGTHgeRNGj86YnvKVKkqQ="; # Adding npm (nodejs) and php composer to path postInstall = '' From c86da4e491344598c9bbc802907164b07be61109 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Mon, 7 Apr 2025 13:06:42 +0100 Subject: [PATCH 04/11] nexusmods-app: 0.8.3 -> 0.9.2 https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.9.1 https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.9.2 --- doc/release-notes/rl-2505.section.md | 2 +- pkgs/by-name/ne/nexusmods-app/deps.json | 4 ++-- pkgs/by-name/ne/nexusmods-app/package.nix | 10 ++-------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 6a6a797269c6..324fa6c8be14 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -328,7 +328,7 @@ ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded} -- `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.3. +- `nexusmods-app` has been upgraded from version 0.6.3 to 0.9.2. - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present. diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index a9b2f5a7fbf1..0728dca5649b 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -1606,8 +1606,8 @@ }, { "pname": "NexusMods.Archives.Nx", - "version": "0.6.3", - "hash": "sha256-E4bOexmmPqMJoXs2gDAhgierGAFyc2JVrP3HBn3KAXs=" + "version": "0.6.4", + "hash": "sha256-jDOCZ6VWPqcKE6gqqAdkyLL3G2g6pbG78mpMRhgYx2o=" }, { "pname": "NexusMods.Hashing.xxHash3", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 7b39ae86eca2..6e492636a9c8 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -24,12 +24,12 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.8.3"; + version = "0.9.2"; src = fetchgit { url = "https://github.com/Nexus-Mods/NexusMods.App.git"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-b6Tpwy0DepbT80+Jil8celeiNN3W+5prt57NjgLD+u0="; + hash = "sha256-Xb/i25l0jLn87OeouD0+CRv11d8aOn7Sr69z3TkS6I4="; fetchSubmodules = true; fetchLFS = true; }; @@ -65,12 +65,6 @@ buildDotnetModule (finalAttrs: { postPatch = '' # for some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png - - # Bump StrawberryShake so we can drop .NET 8 - # See https://github.com/Nexus-Mods/NexusMods.App/pull/2830 - substituteInPlace Directory.Packages.props \ - --replace-fail 'Include="StrawberryShake.Server" Version="14.1.0"' \ - 'Include="StrawberryShake.Server" Version="15.0.3"' ''; makeWrapperArgs = [ From 5b2b4870d9103a72e0ccbe624b46b3d956a3dc98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 18:34:28 +0000 Subject: [PATCH 05/11] thunderbird-128-unwrapped: 128.8.1esr -> 128.9.1esr --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5ec027401bf8..08de8ea78c46 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -99,8 +99,8 @@ rec { thunderbird-128 = common { applicationName = "Thunderbird ESR"; - version = "128.8.1esr"; - sha512 = "f1ef0a665f2cef49b427cbfb4a3548df0cccf4470c03367cdb3d2729d4f6bbf25056c378ffa9e1184b6687332998d12ff9ba251b97b7ca859d9d43be9d7414ba"; + version = "128.9.1esr"; + sha512 = "bc53ad210c6942fd4a5d31e693d6f376c009873397ea4e3c36d9de33d9dc1af5a3ff9e6ca9039dd8849ea8b56daa220f08b7bef4e2ea1b86e98dfe3b9b58dc0d"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; From 71967c47e54c56557c0ee7bec7fe554c018e37c4 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Wed, 25 Sep 2024 01:51:22 -0400 Subject: [PATCH 06/11] nixos/syncoid: allow interval to be list of strings The syncoid module generates systemd services with a `startAt` config based on its `interval` value. However, it is currently not possible to completely disable this timer, or set multiple `startAt` values. By accepting the same types that `systemd.services..startAt` accepts, we can disable generating a timer unit or set multiple `startAt` timers. --- nixos/modules/services/backup/syncoid.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 0d379f6c915d..8b4c59155f4d 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -106,14 +106,17 @@ in package = lib.mkPackageOption pkgs "sanoid" { }; interval = lib.mkOption { - type = lib.types.str; + type = with lib.types; either str (listOf str); default = "hourly"; example = "*-*-* *:15:00"; description = '' Run syncoid at this interval. The default is to run hourly. - The format is described in - {manpage}`systemd.time(7)`. + Must be in the format described in {manpage}`systemd.time(7)`. This is + equivalent to adding a corresponding timer unit with + {option}`OnCalendar` set to the value given here. + + Set to an empty list to avoid starting syncoid automatically. ''; }; From 94778672f7f272b57c6e0e9ec1edd869b9773e5f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 7 Apr 2025 23:53:29 +0200 Subject: [PATCH 07/11] lidarr: add aarch64-darwin support --- pkgs/servers/lidarr/default.nix | 3 +++ pkgs/servers/lidarr/update.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 09f2fd414c53..9d2ca1603f78 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -22,6 +22,7 @@ let x86_64-linux = "x64"; aarch64-linux = "arm64"; x86_64-darwin = "x64"; + aarch64-darwin = "arm64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = @@ -29,6 +30,7 @@ let x64-linux_hash = "sha256-PwHIUbXxk9VOKd+I7EcrTEYlikfw2NUdO6IQdiQWhWs="; arm64-linux_hash = "sha256-uu7iVexyss29Q7mZ280KeDLZWp6wwCh+TJj9XeZc/lQ="; x64-osx_hash = "sha256-POjIY2iPoYOQQci6AV/7X8t7GGbxVqROjlMzwERH/3c="; + arm64-osx_hash = "sha256-JSdiyA0opa4dy5/RTSn/QvnKJ9VCWJcGhTkH5YIi5lg="; } ."${arch}-${os}_hash"; in @@ -79,6 +81,7 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" "x86_64-darwin" + "aarch64-darwin" ]; }; } diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/servers/lidarr/update.sh index 0da098f89bed..e87f6888a8dd 100755 --- a/pkgs/servers/lidarr/update.sh +++ b/pkgs/servers/lidarr/update.sh @@ -40,3 +40,4 @@ updateVersion $latestVersion updateHash $latestVersion x64 linux updateHash $latestVersion arm64 linux updateHash $latestVersion x64 osx +updateHash $latestVersion arm64 osx From 1a8255357129df965e8deab79af0c854f43966fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 02:08:04 +0000 Subject: [PATCH 08/11] mieru: 3.13.0 -> 3.13.1 --- pkgs/by-name/mi/mieru/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index eff21c563892..393045e5ff2b 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA="; + hash = "sha256-jZvF0vagzQRhw2vPhY61/ayki/gneG66e2MPBaqwlyk="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; From b15d72589b678447c25177f744a5e217f0097390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Merino=20Risue=C3=B1o?= Date: Wed, 12 Mar 2025 12:56:14 +0100 Subject: [PATCH 09/11] source-meta-json-schema: init at 7.0.3 --- .../so/source-meta-json-schema/package.nix | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/so/source-meta-json-schema/package.nix diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix new file mode 100644 index 000000000000..0c9b70eaf960 --- /dev/null +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -0,0 +1,37 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: +let + version = "7.0.3"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "source-meta-json-schema"; + inherit version; + + src = fetchFromGitHub { + owner = "sourcemeta"; + repo = "jsonschema"; + rev = "v${version}"; + hash = "sha256-x/bRLeH76zqcHxYodVrJYtb8CO35D3ZWYxHvvZ3Jg9A="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + homepage = "https://github.com/sourcemeta/jsonschema"; + description = "The CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines "; + changelog = "https://github.com/sourcemeta/jsonschema/releases"; + license = with lib.licenses; [ + agpl3Plus + ]; + maintainers = with lib.maintainers; [ + amerino + ]; + platforms = lib.platforms.all; + }; +}) From 719b4583863e605c863b77915134a0ce3bd061d0 Mon Sep 17 00:00:00 2001 From: Dilip Date: Thu, 20 Feb 2025 10:57:41 +0530 Subject: [PATCH 10/11] layan-cursors: init at 2021-08-01 --- pkgs/by-name/la/layan-cursors/package.nix | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/la/layan-cursors/package.nix diff --git a/pkgs/by-name/la/layan-cursors/package.nix b/pkgs/by-name/la/layan-cursors/package.nix new file mode 100644 index 000000000000..c74853a85914 --- /dev/null +++ b/pkgs/by-name/la/layan-cursors/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "layan-cursors"; + version = "2021-08-01"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "Layan-cursors"; + tag = finalAttrs.version; + hash = "sha256-Izc5Q3IuM0ryTIdL+GjhRT7JKbznyxS2Fc4pY5dksq4="; + }; + + installPhase = '' + runHook preInstall + + install -dm 0755 $out/share/icons + cp -R dist $out/share/icons/layan-cursors + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cursor theme inspired by layan gtk theme and based on capitaine-cursors"; + changelog = "https://github.com/vinceliuice/Layan-cursors/releases/tag/${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/vinceliuice/Layan-cursors/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ idlip ]; + }; + +}) From 4b3ade95dd974e3ccf8d7ed704e3d032a27b761d Mon Sep 17 00:00:00 2001 From: Cosima Neidahl Date: Tue, 8 Apr 2025 13:57:37 +0200 Subject: [PATCH 11/11] lomiri.lomiri-ui-extras: 0.6.3 -> 0.7.0 (#394901) --- .../lomiri/qml/lomiri-ui-extras/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix index 800163372b0a..81093351ea6a 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-ui-extras"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-ui-extras"; - rev = finalAttrs.version; - hash = "sha256-SF/UF84K9kNtLHO9FDuIFdQId0NfbmRiRZiPrOKvE9o="; + tag = finalAttrs.version; + hash = "sha256-fN9rZC8J8xyAStvBNTpLqAcssaiQQpu6INwMLlnkvfw="; }; postPatch = '' substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" ''; strictDeps = true; @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" ( lib.concatStringsSep ";" [ # Exclude tests @@ -103,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Lomiri UI Extra Components"; longDescription = '' A collection of UI components that for various reasons can't be included in @@ -112,8 +113,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras"; changelog = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; }; })