From ac700b363449b9baa3317a6ab410ef7257d57961 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 14 Nov 2025 16:35:12 +0000 Subject: [PATCH] asc: migrate to by-name - Move package from pkgs/games/asc/default.nix to pkgs/by-name/as/asc/package.nix - Update fetchFromGitHub to use `hash` instead of `sha256` - Drop local `with lib` block; reference `lib.licenses`, `lib.maintainers`, and `lib.platforms` explicitly - Remove top-level all-packages.nix entry; by-name layout exposes `pkgs.asc` automatically --- .../asc/default.nix => by-name/as/asc/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{games/asc/default.nix => by-name/as/asc/package.nix} (84%) diff --git a/pkgs/games/asc/default.nix b/pkgs/by-name/as/asc/package.nix similarity index 84% rename from pkgs/games/asc/default.nix rename to pkgs/by-name/as/asc/package.nix index 008d10ab6566..cad2d9710a09 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/by-name/as/asc/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { owner = "ValHaris"; repo = "asc-hq"; rev = "fa3bca082a5cea2b35812349f99b877f0113aef0"; - sha256 = "atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ="; + hash = "sha256-atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation { libsigcxx ]; - meta = with lib; { + meta = { description = "Turn based strategy game"; longDescription = '' @@ -78,9 +78,9 @@ stdenv.mkDerivation { homepage = "https://www.asc-hq.org/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d79a0a739829..ca9efa8923a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12939,11 +12939,6 @@ with pkgs; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; - asc = callPackage ../games/asc { - lua = lua5_1; - physfs = physfs_2; - }; - beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { inherit (python3Packages) beancount beangulp; };