From 5da5e2586d0a539de73b5d0b712010ddf44b67fe Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 22 May 2025 02:55:52 +0200 Subject: [PATCH 01/10] pkgs/ranger-git: update --- pkgs/by-name/ra/ranger-git/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/ranger-git/package.nix b/pkgs/by-name/ra/ranger-git/package.nix index fea9d31..ff80cfd 100644 --- a/pkgs/by-name/ra/ranger-git/package.nix +++ b/pkgs/by-name/ra/ranger-git/package.nix @@ -16,8 +16,8 @@ ranger.overrideAttrs (selfAttrs: superAttrs: { src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "b31db0f638118c103a35be5a57d1a0f3609838d6"; - hash = "sha256-ksWlopkqD/98hwVspIRIEGCN/L/OuVlVyXftfza4LhI="; + rev = "fa812718c586cfc12c1a4b6237877c79f8b4a521"; + hash = "sha256-husMv1RxyvvU1X6C6BQn8Lly63Z40Gwr/k7NZX8DNIw="; }; patches = superAttrs.patches or [] ++ [ From 6712cb63e1a8c0fd54586d824d07dadb4d05e2c0 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 22 May 2025 03:00:25 +0200 Subject: [PATCH 02/10] lock: update --- lock.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lock.nix b/lock.nix index d862daf..e45f3e9 100644 --- a/lock.nix +++ b/lock.nix @@ -4,19 +4,19 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "5d736263df906c5da72ab0f372427814de2f52f8"; - sha256 = "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM="; + revision = "72841a4a8761d1aed92ef6169a636872c986c76d"; + sha256 = "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw="; }; nixpkgs-unstable = { - revision = "adaa24fbf46737f3f1b5497bf64bae750f82942e"; - sha256 = "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY="; + revision = "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f"; + sha256 = "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q="; }; nix-bitcoin = { - revision = "040231d830fe444c3979307e8aced18850703fce"; - sha256 = "sha256-b9oebJIW9bcP2vjreMRBAPSbdy2vrAr8wQGSX1P5aTk="; + revision = "52809afbf4112d4c9cfe0438610cd5286deb478b"; + sha256 = "sha256-HKYkzpsXGN/Zhn5GfpOAveWtvgSbO0Neaf6Nr01JsKM="; }; cosmic-modules = { - revision = "0fee0ad9921c4ffa8da6b8cac5d687b4b73cfce8"; - sha256 = "sha256-cULcw99N61o/sN82dTvM7QpC5dRNyp1yvEr2cTLTA5I="; + revision = "77186d5962bb36c907a3ed0f595ad2c44b060bb3"; + sha256 = "sha256-5GgW4Ijy8ERN4iB6O5O0E/OJj3NfQniLSEdaTHKE2sM="; }; } From 81518b6f0c94767549acae70a88cf261090244b8 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 24 May 2025 08:29:31 +0200 Subject: [PATCH 03/10] inputs: update nixpkgs branch to 25.05 --- inputs.nix | 2 +- lock.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inputs.nix b/inputs.nix index b5f0b13..228abc4 100644 --- a/inputs.nix +++ b/inputs.nix @@ -33,7 +33,7 @@ self = { updateScript = pkgs.den-http-get-updater { fileLocation = lockFile; previousVersion = lock.nixpkgs.revision; - versionUrl = "https://channels.nixos.org/nixos-24.11/git-revision"; + versionUrl = "https://channels.nixos.org/nixos-25.05/git-revision"; prefetchList = [{ previousHash = lock.nixpkgs.sha256; prefetchUrlLocation = { diff --git a/lock.nix b/lock.nix index e45f3e9..20e5580 100644 --- a/lock.nix +++ b/lock.nix @@ -4,8 +4,8 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "72841a4a8761d1aed92ef6169a636872c986c76d"; - sha256 = "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw="; + revision = "55d1f923c480dadce40f5231feb472e81b0bab48"; + sha256 = "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ="; }; nixpkgs-unstable = { revision = "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f"; From 8550725910f4ccf78af0bbff286aefbf13cc4042 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 24 May 2025 09:39:22 +0200 Subject: [PATCH 04/10] nixos: apply changes for 25.05 --- nixos/modules/account.nix | 2 +- nixos/modules/core-desktop.nix | 4 ++-- nixos/modules/desktopManagers/cosmic.nix | 25 ++++++++++++++---------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/nixos/modules/account.nix b/nixos/modules/account.nix index 8d8a2ca..35b48ae 100644 --- a/nixos/modules/account.nix +++ b/nixos/modules/account.nix @@ -23,7 +23,7 @@ }) vesktop unstablePkgs.vscode - gimp + gimp3 inkscape jitsi-meet-electron krita diff --git a/nixos/modules/core-desktop.nix b/nixos/modules/core-desktop.nix index 0d40ca5..d81ceec 100644 --- a/nixos/modules/core-desktop.nix +++ b/nixos/modules/core-desktop.nix @@ -8,7 +8,7 @@ config = { services.printing.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -103,7 +103,7 @@ # Fonts fonts.packages = with pkgs; [ corefonts - (nerdfonts.override { fonts = [ "Meslo" ]; }) + nerd-fonts.meslo-lg roboto ]; diff --git a/nixos/modules/desktopManagers/cosmic.nix b/nixos/modules/desktopManagers/cosmic.nix index 6dd7bbd..3e623cf 100644 --- a/nixos/modules/desktopManagers/cosmic.nix +++ b/nixos/modules/desktopManagers/cosmic.nix @@ -7,19 +7,24 @@ }: let - cosmic-configuration = pkgs.substituteAllFiles { + cosmic-configuration = pkgs.stdenv.mkDerivation { name = "cosmic-configuration"; src = ./cosmic-config; - files = [ "." ]; # All files - postInstall = '' - mkdir -p $share/share/cosmic - cp -rt $share/share/cosmic $out/* - ''; outputs = [ "out" "share" ]; - - wallpaper = builtins.path { path = "${self}/media/wallpaper.png"; }; - corner_radii_theme = "2.0"; - corner_radii_panel = "2"; + dontConfigure = true; + buildPhase = '' + for file in $(find . -type f); do + substituteInPlace "$file" \ + --subst-var-by wallpaper "${builtins.path { path = "${self}/media/wallpaper.png"; }}" \ + --subst-var-by corner_radii_theme "2.0" \ + --subst-var-by corner_radii_panel "2" + done + ''; + installPhase = '' + mkdir -p $out $share/share/cosmic + cp -r ./* $out/ + cp -r ./* $share/share/cosmic/ + ''; }; in From b1e0daf1e369f002325c4e65a5421b068761b4c3 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 24 May 2025 14:13:09 +0200 Subject: [PATCH 05/10] nixos/core-desktop: disable cuda for qimgv --- nixos/modules/core-desktop.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/core-desktop.nix b/nixos/modules/core-desktop.nix index d81ceec..72a1f33 100644 --- a/nixos/modules/core-desktop.nix +++ b/nixos/modules/core-desktop.nix @@ -27,7 +27,12 @@ kdePackages.kdeconnect-kde pcmanfm pwvucontrol - qimgv + (qimgv.override { + opencv4 = opencv4.override { + # https://github.com/NixOS/nixpkgs/issues/383175 + enableCuda = false; + }; + }) ]; programs.mpv = let From 9239fdc7dbc044083dcbbe8aff8ca94b92fdcb28 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 24 May 2025 14:14:55 +0200 Subject: [PATCH 06/10] lock: update --- lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lock.nix b/lock.nix index 20e5580..dd2495c 100644 --- a/lock.nix +++ b/lock.nix @@ -12,8 +12,8 @@ sha256 = "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q="; }; nix-bitcoin = { - revision = "52809afbf4112d4c9cfe0438610cd5286deb478b"; - sha256 = "sha256-HKYkzpsXGN/Zhn5GfpOAveWtvgSbO0Neaf6Nr01JsKM="; + revision = "e7e6353b3a72205b037be53eda2e71e24e46b45e"; + sha256 = "sha256-Y53kyw7CQUEUiKPVQQzCMB4OIiZtOoFNurJhhM6Xvx4="; }; cosmic-modules = { revision = "77186d5962bb36c907a3ed0f595ad2c44b060bb3"; From 0900eeb1abc682697a387df4f4ec7b7151048e8f Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 24 May 2025 14:15:07 +0200 Subject: [PATCH 07/10] pkgs/ranger-git: update --- pkgs/by-name/ra/ranger-git/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/ranger-git/package.nix b/pkgs/by-name/ra/ranger-git/package.nix index ff80cfd..d60114a 100644 --- a/pkgs/by-name/ra/ranger-git/package.nix +++ b/pkgs/by-name/ra/ranger-git/package.nix @@ -16,8 +16,8 @@ ranger.overrideAttrs (selfAttrs: superAttrs: { src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "fa812718c586cfc12c1a4b6237877c79f8b4a521"; - hash = "sha256-husMv1RxyvvU1X6C6BQn8Lly63Z40Gwr/k7NZX8DNIw="; + rev = "b00f923911090204139c9e19ba42e9d80aa0889f"; + hash = "sha256-uMvo+5I5WCJGT5+XRS/NFClDGH4F59ogQJb+RYuraX4="; }; patches = superAttrs.patches or [] ++ [ From a83809ce0975b9af63813c1ecd4400bef483f5f4 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 24 May 2025 19:23:58 +0200 Subject: [PATCH 08/10] lock: update --- lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lock.nix b/lock.nix index dd2495c..64f2376 100644 --- a/lock.nix +++ b/lock.nix @@ -16,7 +16,7 @@ sha256 = "sha256-Y53kyw7CQUEUiKPVQQzCMB4OIiZtOoFNurJhhM6Xvx4="; }; cosmic-modules = { - revision = "77186d5962bb36c907a3ed0f595ad2c44b060bb3"; - sha256 = "sha256-5GgW4Ijy8ERN4iB6O5O0E/OJj3NfQniLSEdaTHKE2sM="; + revision = "e3bea95daa167bf84a4bf3387ef6f01f081152b6"; + sha256 = "sha256-QhmqgiAGqR7VYxyNsdpR2qfejRnviyf7ElZ8v8MtwwY="; }; } From 6d32f8da73d59db504a973ec3b18e955df33f85f Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 25 May 2025 20:43:16 +0200 Subject: [PATCH 09/10] pkgs/ultimatepp: rename to upp --- .../{ul/ultimatepp => up/upp}/buildUppPackage.nix | 8 ++++---- .../{ul/ultimatepp => up/upp}/no-build-info.patch | 0 pkgs/by-name/{ul/ultimatepp => up/upp}/package.nix | 12 ++++++------ .../remove-inline-from-HighlightSetup-InitOnce.patch | 0 4 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/by-name/{ul/ultimatepp => up/upp}/buildUppPackage.nix (90%) rename pkgs/by-name/{ul/ultimatepp => up/upp}/no-build-info.patch (100%) rename pkgs/by-name/{ul/ultimatepp => up/upp}/package.nix (94%) rename pkgs/by-name/{ul/ultimatepp => up/upp}/remove-inline-from-HighlightSetup-InitOnce.patch (100%) diff --git a/pkgs/by-name/ul/ultimatepp/buildUppPackage.nix b/pkgs/by-name/up/upp/buildUppPackage.nix similarity index 90% rename from pkgs/by-name/ul/ultimatepp/buildUppPackage.nix rename to pkgs/by-name/up/upp/buildUppPackage.nix index 83f795b..2ceabee 100644 --- a/pkgs/by-name/ul/ultimatepp/buildUppPackage.nix +++ b/pkgs/by-name/up/upp/buildUppPackage.nix @@ -2,7 +2,7 @@ lib, pkg-config, stdenv, - ultimatepp, + upp, }: { @@ -24,15 +24,15 @@ in stdenv.mkDerivation (self: { nativeBuildInputs = [ pkg-config - ultimatepp + upp ] ++ args.nativeBuildInputs or []; - buildInputs = ultimatepp.uppsrcDependencies ++ args.buildInputs or []; + buildInputs = upp.uppsrcDependencies ++ args.buildInputs or []; assemblies = lib.concatStringsSep "," ( lib.singleton assembly ++ extraAssemblies - ++ lib.optional includeUppsrcAssembly "${ultimatepp.src}/uppsrc" + ++ lib.optional includeUppsrcAssembly "${upp.src}/uppsrc" ); postUnpack = '' diff --git a/pkgs/by-name/ul/ultimatepp/no-build-info.patch b/pkgs/by-name/up/upp/no-build-info.patch similarity index 100% rename from pkgs/by-name/ul/ultimatepp/no-build-info.patch rename to pkgs/by-name/up/upp/no-build-info.patch diff --git a/pkgs/by-name/ul/ultimatepp/package.nix b/pkgs/by-name/up/upp/package.nix similarity index 94% rename from pkgs/by-name/ul/ultimatepp/package.nix rename to pkgs/by-name/up/upp/package.nix index 867f5cc..26f686a 100644 --- a/pkgs/by-name/ul/ultimatepp/package.nix +++ b/pkgs/by-name/up/upp/package.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation (self: let }; }); in { - pname = "ultimatepp"; + pname = "upp"; version = "2025.1"; src = fetchFromGitHub { @@ -116,10 +116,10 @@ in { --unset WAYLAND_DISPLAY mkdir -p $out/share/icons/hicolor/scalable/apps - cp uppsrc/ide/icon.svg $out/share/icons/hicolor/scalable/apps/ultimatepp-theide.svg + cp uppsrc/ide/icon.svg $out/share/icons/hicolor/scalable/apps/upp-theide.svg for size in 16 32 64 128 256 512; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps - cp uppsrc/ide/icon''${size}x''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/ultimatepp-theide.png + cp uppsrc/ide/icon''${size}x''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/upp-theide.png done '') + '' runHook postInstall @@ -127,11 +127,11 @@ in { desktopItems = [ (makeDesktopItem { - name = "ultimatepp-theide"; + name = "upp-theide"; exec = "theide"; - icon = "ultimatepp-theide"; + icon = "upp-theide"; desktopName = "TheIDE"; - comment = "The Ultimate++ Framework IDE"; + comment = "The U++ Framework IDE"; categories = [ "Development" "IDE" ]; terminal = false; }) diff --git a/pkgs/by-name/ul/ultimatepp/remove-inline-from-HighlightSetup-InitOnce.patch b/pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch similarity index 100% rename from pkgs/by-name/ul/ultimatepp/remove-inline-from-HighlightSetup-InitOnce.patch rename to pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch From f92651afdf2037e0dbc2ecbd2d151f4b5f125c30 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 25 May 2025 20:47:24 +0200 Subject: [PATCH 10/10] pkgs/upp: fetch remove inline patch from pr --- pkgs/by-name/up/upp/package.nix | 7 ++++++- ...remove-inline-from-HighlightSetup-InitOnce.patch | 13 ------------- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch diff --git a/pkgs/by-name/up/upp/package.nix b/pkgs/by-name/up/upp/package.nix index 26f686a..dbe9700 100644 --- a/pkgs/by-name/up/upp/package.nix +++ b/pkgs/by-name/up/upp/package.nix @@ -2,6 +2,7 @@ lib, callPackage, fetchFromGitHub, + fetchpatch, makeWrapper, pkg-config, stdenv, @@ -68,7 +69,11 @@ in { patches = [ ./no-build-info.patch - ./remove-inline-from-HighlightSetup-InitOnce.patch + (fetchpatch { + # https://github.com/ultimatepp/ultimatepp/pull/271 + url = "https://github.com/ultimatepp/ultimatepp/commit/db5cad68673f9571e6571116e0570e22e3e44fe8.patch"; + hash = "sha256-t2PducjE6b5MjDSAIKvEMdHnT8oTGmI073qYuhLFCh0="; + }) ]; postPatch = '' patchShebangs ./configure_makefile diff --git a/pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch b/pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch deleted file mode 100644 index 1d86a43..0000000 --- a/pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a b -index eca1b54..dede1d5 100644 ---- a/uppsrc/CodeEditor/Style.cpp -+++ b/uppsrc/CodeEditor/Style.cpp -@@ -38,7 +38,7 @@ void HighlightSetup::DefaultHlStyles() - WhiteTheme(); - } - --inline void HighlightSetup::InitOnce() -+void HighlightSetup::InitOnce() - { - ONCELOCK { - static bool initialised;