From edfd40fecda8baffd86721da899a48ecf8a48f3a Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 7 Jul 2025 15:36:45 +0800 Subject: [PATCH 1/7] inko: use finalAttrs --- pkgs/by-name/in/inko/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 9e6110919dd9..3f4ce544f627 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "inko"; version = "0.18.1"; src = fetchFromGitHub { owner = "inko-lang"; repo = "inko"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY="; }; @@ -72,4 +72,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; mainProgram = "inko"; }; -} +}) From 1a95e72bce24df8f2f4414c55b66e26b133540d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Jul 2025 14:34:53 +0000 Subject: [PATCH 2/7] cables: 0.6.0 -> 0.7.0 --- pkgs/by-name/ca/cables/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 5f84e677c7b7..f1a68d13863b 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.6.0"; + version = "0.7.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-EvlKcSYLC9gIzXHJSHrxPY984AdKCL7psj2F2vdfaZY="; + sha256 = "sha256-8PYHX23E91rUEfzU6fthSTVOnnHeoRjbcNFbuOyeBS8="; }; appimageContents = appimageTools.extract { From 13cddab9f3719e51509c2b1c3433bbd9537fc4ee Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 12 Jul 2025 12:07:50 -0500 Subject: [PATCH 3/7] haruna: migrate to by-name haruna: fix rebuild on linux --- .../ha/haruna/package.nix} | 56 +++++++------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 21 insertions(+), 37 deletions(-) rename pkgs/{applications/video/haruna/default.nix => by-name/ha/haruna/package.nix} (62%) diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/by-name/ha/haruna/package.nix similarity index 62% rename from pkgs/applications/video/haruna/default.nix rename to pkgs/by-name/ha/haruna/package.nix index 4d4fbee44a14..220d54c80a8c 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/by-name/ha/haruna/package.nix @@ -2,25 +2,11 @@ lib, stdenv, fetchFromGitLab, - breeze-icons, - breeze, cmake, - extra-cmake-modules, ffmpeg-headless, - kconfig, - kcoreaddons, - kfilemetadata, - ki18n, - kiconthemes, - kio, - kirigami, - kxmlgui, - kdoctools, - mpvqt, + kdePackages, pkg-config, - wrapQtAppsHook, - qqc2-desktop-style, - qtbase, + qt6, yt-dlp, }: @@ -42,36 +28,36 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - breeze-icons - breeze - qqc2-desktop-style + kdePackages.breeze-icons + kdePackages.breeze + kdePackages.qqc2-desktop-style yt-dlp ffmpeg-headless - kconfig - kcoreaddons - kfilemetadata - ki18n - kiconthemes - kio - kirigami - kxmlgui - kdoctools - mpvqt - qtbase + kdePackages.kconfig + kdePackages.kcoreaddons + kdePackages.kfilemetadata + kdePackages.ki18n + kdePackages.kiconthemes + kdePackages.kio + kdePackages.kirigami + kdePackages.kxmlgui + kdePackages.kdoctools + kdePackages.mpvqt + qt6.qtbase ]; nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; - meta = with lib; { + meta = { homepage = "https://invent.kde.org/multimedia/haruna"; description = "Open source video player built with Qt/QML and libmpv"; - license = with licenses; [ + license = with lib.licenses; [ bsd3 cc-by-40 cc-by-sa-40 @@ -80,7 +66,7 @@ stdenv.mkDerivation rec { gpl3Plus wtfpl ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jojosch kashw2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec37fae6958d..3ff765bfc843 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12121,8 +12121,6 @@ with pkgs; }; }; - haruna = kdePackages.callPackage ../applications/video/haruna { }; - input-leap = qt6Packages.callPackage ../applications/misc/input-leap { avahi = avahi.override { withLibdnssdCompat = true; }; }; From 756117b09fa08e61c7bf6fe63b9321788c60745d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 15 Jul 2025 09:10:17 -0500 Subject: [PATCH 4/7] tela-circle-icon-themes: migrate to by-name --- .../te/tela-circle-icon-theme/package.nix} | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-) rename pkgs/{data/icons/tela-circle-icon-theme/default.nix => by-name/te/tela-circle-icon-theme/package.nix} (85%) diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix similarity index 85% rename from pkgs/data/icons/tela-circle-icon-theme/default.nix rename to pkgs/by-name/te/tela-circle-icon-theme/package.nix index e9226c205d0a..dd1c27305de6 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, adwaita-icon-theme, - breeze-icons, + libsForQt5, gtk3, hicolor-icon-theme, jdupes, @@ -44,7 +44,7 @@ lib.checkListOfEnum "${pname}: color variants" src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; + tag = version; hash = "sha256-5Kqf6QNM+/JGGp2H3Vcl69Vh1iZYPq3HJxhvSH6k+eQ="; }; @@ -55,7 +55,7 @@ lib.checkListOfEnum "${pname}: color variants" propagatedBuildInputs = [ adwaita-icon-theme - breeze-icons + libsForQt5.breeze-icons hicolor-icon-theme ]; @@ -84,11 +84,11 @@ lib.checkListOfEnum "${pname}: color variants" passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Flat and colorful personality icon theme"; homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme"; - license = licenses.gpl3Only; - platforms = platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6cde488533..b3c726d4ab85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11700,10 +11700,6 @@ with pkgs; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { }; - tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { - inherit (libsForQt5) breeze-icons; - }; - tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; From 7914096306b6c4f20ef71b0f23eafb181f4a005a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 16:53:47 -0500 Subject: [PATCH 5/7] hollywood: migrate to by-name --- .../misc => by-name/ho}/hollywood/nixos-paths.patch | 0 .../default.nix => by-name/ho/hollywood/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{applications/misc => by-name/ho}/hollywood/nixos-paths.patch (100%) rename pkgs/{applications/misc/hollywood/default.nix => by-name/ho/hollywood/package.nix} (100%) diff --git a/pkgs/applications/misc/hollywood/nixos-paths.patch b/pkgs/by-name/ho/hollywood/nixos-paths.patch similarity index 100% rename from pkgs/applications/misc/hollywood/nixos-paths.patch rename to pkgs/by-name/ho/hollywood/nixos-paths.patch diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/by-name/ho/hollywood/package.nix similarity index 100% rename from pkgs/applications/misc/hollywood/default.nix rename to pkgs/by-name/ho/hollywood/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8df040634ca..65d3b6d5be7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12508,10 +12508,6 @@ with pkgs; haskellPackages.hledger-web; hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; - hollywood = callPackage ../applications/misc/hollywood { - inherit (python3Packages) pygments; - }; - hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; From 30919bd4e0f273657b8d223086491382648799f6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 16:57:11 -0500 Subject: [PATCH 6/7] hollywood: move definition out of top-level --- pkgs/by-name/ho/hollywood/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ho/hollywood/package.nix b/pkgs/by-name/ho/hollywood/package.nix index 3761121dabd3..c45f76163b3a 100644 --- a/pkgs/by-name/ho/hollywood/package.nix +++ b/pkgs/by-name/ho/hollywood/package.nix @@ -8,7 +8,7 @@ atop, bmon, cmatrix, - pygments, + python3Packages, moreutils, util-linux, jp2a, @@ -57,7 +57,7 @@ stdenv.mkDerivation { atop bmon cmatrix - pygments + python3Packages.pygments moreutils util-linux man From 205e6ec1c21f82e08a531a37e5cd18173e609b72 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Jul 2025 06:38:02 +0200 Subject: [PATCH 7/7] =?UTF-8?q?ocamlPackages.melange:=205.0.0=20=E2=86=92?= =?UTF-8?q?=205.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/melange/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/ocaml/melange/default.nix b/pkgs/development/tools/ocaml/melange/default.nix index 4e4401fe7681..0578dc0c18fc 100644 --- a/pkgs/development/tools/ocaml/melange/default.nix +++ b/pkgs/development/tools/ocaml/melange/default.nix @@ -23,25 +23,25 @@ let versionHash = if lib.versionAtLeast ocaml.version "5.3" then { - version = "5.0.0-53"; - hash = "sha256-ZZ3/TdhEJQ74Q3wJkWqoiONEfV6x77z0Sbr8cAirXbA="; + version = "5.1.0-53"; + hash = "sha256-96rDDzul/v+Dc+IWTNtbOKWUV8rf7HS1ZMK2LQNcpKk="; } else if lib.versionAtLeast ocaml.version "5.2" then { - version = "5.0.0-52"; - hash = "sha256-DyjBiMvnCHufFepk8xHMMmVU+j/yECvV7My4WeAW4WQ="; + version = "5.1.0-52"; + hash = "sha256-EGIInGCo3JADYyE4mLw5Fzkm4OB+V9yi2ayV0lVq3v0="; } else if lib.versionAtLeast ocaml.version "5.1" then { - version = "5.0.0-51"; - hash = "sha256-rPU6pqzEDo5heGkHhMGfwsF8elDohoptNbbZyGcWLKA="; + version = "5.1.0-51"; + hash = "sha256-DIF8vZLEKsFf6m5tl1/T6zqjHyKxDMois2h//tDhsJI="; } else if lib.versionAtLeast ocaml.version "5.0" then throw "melange is not available for OCaml ${ocaml.version}" else { - version = "5.0.0-414"; - hash = "sha256-07+tEx6b5dUY949VF2K22HqRSoKmvBwnxo7B/Gqb+ro="; + version = "5.1.0-414"; + hash = "sha256-Sv1XyOqCNhICTsXzetXh/zqX/tdTupYZ0Q1nZRLfpe0="; }; version = versionHash.version; hash = versionHash.hash; @@ -58,9 +58,11 @@ buildDunePackage { cppo makeWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ cmdliner dune-build-info + ]; + propagatedBuildInputs = [ menhirLib ppxlib ];