From 3bb249f858b534feef964669c02b0f995ecbf21c Mon Sep 17 00:00:00 2001 From: Philipp Rintz Date: Wed, 24 Jan 2024 22:20:33 +0100 Subject: [PATCH] =?UTF-8?q?pupdate:=202.43.1=20=E2=86=92=203.0.0,=20rename?= =?UTF-8?q?=20from=20pocket-updater-utility?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pu/pupdate}/add-runtime-identifier.patch | 16 ++++---- .../pu/pupdate}/deps.nix | 0 .../pu/pupdate/package.nix} | 38 +++++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 28 insertions(+), 29 deletions(-) rename pkgs/{tools/games/pocket-updater-utility => by-name/pu/pupdate}/add-runtime-identifier.patch (56%) rename pkgs/{tools/games/pocket-updater-utility => by-name/pu/pupdate}/deps.nix (100%) rename pkgs/{tools/games/pocket-updater-utility/default.nix => by-name/pu/pupdate/package.nix} (55%) diff --git a/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch b/pkgs/by-name/pu/pupdate/add-runtime-identifier.patch similarity index 56% rename from pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch rename to pkgs/by-name/pu/pupdate/add-runtime-identifier.patch index 38d5dcd3af16..c70aaad58966 100644 --- a/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch +++ b/pkgs/by-name/pu/pupdate/add-runtime-identifier.patch @@ -1,19 +1,19 @@ -From c9ca58262045b82537bd8284d426c91582cc7ed7 Mon Sep 17 00:00:00 2001 +From f56083d95304752c45cc569fe42c3b0d7a2430bd Mon Sep 17 00:00:00 2001 From: Philipp Rintz -Date: Thu, 28 Sep 2023 21:22:18 +0200 +Date: Wed, 24 Jan 2024 22:11:50 +0100 Subject: [PATCH] uncommited --- - pocket_updater.csproj | 1 + + pupdate.csproj | 1 + 1 file changed, 1 insertion(+) -diff --git a/pocket_updater.csproj b/pocket_updater.csproj -index 30f77d5..ad6bf69 100644 ---- a/pocket_updater.csproj -+++ b/pocket_updater.csproj +diff --git a/pupdate.csproj b/pupdate.csproj +index a6f59a8..0563137 100644 +--- a/pupdate.csproj ++++ b/pupdate.csproj @@ -12,6 +12,7 @@ Matt Pannella - Analogue Pocket Updater Utility + Pupdate https://github.com/mattpannella/pocket-updater-utility + @RuntimeIdentifier@ diff --git a/pkgs/tools/games/pocket-updater-utility/deps.nix b/pkgs/by-name/pu/pupdate/deps.nix similarity index 100% rename from pkgs/tools/games/pocket-updater-utility/deps.nix rename to pkgs/by-name/pu/pupdate/deps.nix diff --git a/pkgs/tools/games/pocket-updater-utility/default.nix b/pkgs/by-name/pu/pupdate/package.nix similarity index 55% rename from pkgs/tools/games/pocket-updater-utility/default.nix rename to pkgs/by-name/pu/pupdate/package.nix index a5ad85fcadac..00e61e9f0140 100644 --- a/pkgs/tools/games/pocket-updater-utility/default.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -1,24 +1,24 @@ -{ pkgs ? import { system = builtins.currentSystem; } -, stdenv ? pkgs.stdenv -, lib ? pkgs.lib -, fetchFromGitHub ? pkgs.fetchFromGitHub -, buildDotnetModule ? pkgs.buildDotnetModule -, dotnetCorePackages ? pkgs.dotnetCorePackages -, openssl ? pkgs.openssl -, zlib ? pkgs.zlib -, hostPlatform ? stdenv.hostPlatform -, nix-update-script ? stdenv.nix-update-script +{ pkgs +, stdenv +, lib +, fetchFromGitHub +, buildDotnetModule +, dotnetCorePackages +, openssl +, zlib +, hostPlatform +, nix-update-script }: buildDotnetModule rec { - pname = "pocket-updater-utility"; - version = "2.43.1"; + pname = "pupdate"; + version = "3.0.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "${pname}"; rev = "${version}"; - hash = "sha256-ur7BEsG4MIEcdiRt5BkK4GCa7aVkrh2Djd10KhaWf3U="; + hash = "sha256-Lr3orYOSzFQCLduBhp2MtGbgiKtFB1CgP/iMMySSvEk="; }; buildInputs = [ @@ -30,17 +30,17 @@ buildDotnetModule rec { # See https://github.com/NixOS/nixpkgs/pull/196648/commits/0fb17c04fe34ac45247d35a1e4e0521652d9c494 patches = [ ./add-runtime-identifier.patch ]; postPatch = '' - substituteInPlace pocket_updater.csproj \ + substituteInPlace pupdate.csproj \ --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}" ''; - projectFile = "pocket_updater.csproj"; + projectFile = "pupdate.csproj"; nugetDeps = ./deps.nix; selfContainedBuild = true; - executables = [ "pocket_updater" ]; + executables = [ "pupdate" ]; dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" @@ -54,11 +54,11 @@ buildDotnetModule rec { }; meta = with lib; { - homepage = "https://github.com/mattpannella/pocket-updater-utility"; - description = "Analogue Pocket Updater Utility"; + homepage = "https://github.com/mattpannella/pupdate"; + description = "Pupdate - A thing for updating your Analogue Pocket "; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ p-rintz ]; - mainProgram = "pocket_updater"; + mainProgram = "pupdate"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 98c3c66e780f..ef73e8e36a3e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -831,6 +831,7 @@ mapAliases ({ pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 PlistCpp = plistcpp; # Added 2024-01-05 + pocket-updater-utility = pupdate; # Added 2024-01-25 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32b6cc46bb5d..9675c346c733 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2011,8 +2011,6 @@ with pkgs; pferd = callPackage ../tools/misc/pferd { }; - pocket-updater-utility = callPackage ../tools/games/pocket-updater-utility { }; - polygon-cli = callPackage ../tools/networking/polygon-cli { }; pricehist = python3Packages.callPackage ../tools/misc/pricehist { };