From ee361a241a4007dbb4ddb3ed2869d1c60140d9a1 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Fri, 27 Dec 2024 20:02:06 +0100 Subject: [PATCH] remove raze --- pkgs/_upstreamed.nix | 3 + pkgs/default.nix | 17 +++-- pkgs/raze/_sources/generated.json | 43 ------------ pkgs/raze/_sources/generated.nix | 33 ---------- pkgs/raze/default.nix | 105 ------------------------------ pkgs/raze/nvfetcher.toml | 7 -- 6 files changed, 15 insertions(+), 193 deletions(-) create mode 100644 pkgs/_upstreamed.nix delete mode 100644 pkgs/raze/_sources/generated.json delete mode 100644 pkgs/raze/_sources/generated.nix delete mode 100644 pkgs/raze/default.nix delete mode 100644 pkgs/raze/nvfetcher.toml diff --git a/pkgs/_upstreamed.nix b/pkgs/_upstreamed.nix new file mode 100644 index 00000000..6a269d53 --- /dev/null +++ b/pkgs/_upstreamed.nix @@ -0,0 +1,3 @@ +{ + raze = ["raze"]; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index a8835dbe..b972333d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -10,6 +10,8 @@ callPackages' = pkg: pkgs.callPackages pkg (callPackageArgs pkg); + concat = pkgs.lib.concatStringsSep "."; + packages = { actuate = callPackage' ./actuate; aida-x = callPackage' ./aida-x; @@ -72,7 +74,6 @@ propertree = callPackage' ./propertree; protrekkr = callPackage' ./protrekkr; pythonPackages = callPackages' ./pythonPackages; - raze = callPackage' ./raze; roomreverb = callPackage' ./roomreverb; satty = callPackage' ./satty; schrammel-ojd = callPackage' ./schrammel-ojd; @@ -104,8 +105,14 @@ in packages // (pkgs.lib.mapAttrsRecursive - (old: new: let - concat = pkgs.lib.concatStringsSep "."; - in - pkgs.lib.warn "${concat old} has been renamed to ${concat new}" (pkgs.lib.attrByPath new null packages)) + (old: new: + pkgs.lib.warn + "${concat old} has been renamed to ${concat new}" + (pkgs.lib.attrByPath new null packages)) (import ./_renamed.nix)) + // (pkgs.lib.mapAttrsRecursive + (old: new: + pkgs.lib.warn + "${concat old} has been upstreamed to nixpkgs as ${concat (["pkgs"] ++ new)}" + (pkgs.lib.attrByPath new null pkgs)) + (import ./_upstreamed.nix)) diff --git a/pkgs/raze/_sources/generated.json b/pkgs/raze/_sources/generated.json deleted file mode 100644 index 1e8f6dcd..00000000 --- a/pkgs/raze/_sources/generated.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "raze": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "raze", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "ZDoom", - "repo": "Raze", - "rev": "1.10.2", - "sha256": "sha256-8kr+BLwfTQ0kx6TMqu1AUxiCgvwJd2urZqJ09FH48lo=", - "sparseCheckout": [], - "type": "github" - }, - "version": "1.10.2" - }, - "zmusic": { - "cargoLocks": null, - "date": "2024-11-23", - "extract": null, - "name": "zmusic", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "628cd492219fc749bdc69d99fa5c3cd7acd47ac6", - "sha256": "sha256-uOWz99Ql9e1SERnBz9QNgWYz08BkrxVn7Q8m32tes1c=", - "sparseCheckout": [], - "type": "git", - "url": "https://github.com/ZDoom/ZMusic" - }, - "version": "628cd492219fc749bdc69d99fa5c3cd7acd47ac6" - } -} diff --git a/pkgs/raze/_sources/generated.nix b/pkgs/raze/_sources/generated.nix deleted file mode 100644 index 78a1df1b..00000000 --- a/pkgs/raze/_sources/generated.nix +++ /dev/null @@ -1,33 +0,0 @@ -# This file was generated by nvfetcher, please do not modify it manually. -{ - fetchgit, - fetchurl, - fetchFromGitHub, - dockerTools, -}: { - raze = { - pname = "raze"; - version = "1.10.2"; - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "Raze"; - rev = "1.10.2"; - fetchSubmodules = false; - sha256 = "sha256-8kr+BLwfTQ0kx6TMqu1AUxiCgvwJd2urZqJ09FH48lo="; - }; - }; - zmusic = { - pname = "zmusic"; - version = "628cd492219fc749bdc69d99fa5c3cd7acd47ac6"; - src = fetchgit { - url = "https://github.com/ZDoom/ZMusic"; - rev = "628cd492219fc749bdc69d99fa5c3cd7acd47ac6"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = []; - sha256 = "sha256-uOWz99Ql9e1SERnBz9QNgWYz08BkrxVn7Q8m32tes1c="; - }; - date = "2024-11-23"; - }; -} diff --git a/pkgs/raze/default.nix b/pkgs/raze/default.nix deleted file mode 100644 index 9c6f89f8..00000000 --- a/pkgs/raze/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - pkgs, - sources, - ... -}: let - zmusic = pkgs.stdenv.mkDerivation { - inherit (sources.zmusic) src pname version; - - nativeBuildInputs = with pkgs; [ - cmake - pkg-config - ]; - - buildInputs = with pkgs; [ - alsa-lib - glib - libsndfile - mpg123 - zlib - fluidsynth - ]; - - cmakeFlags = [ - "-DDYN_SNDFILE=OFF" - "-DDYN_MPG123=OFF" - "-DDYN_FLUIDSYNTH=OFF" - ]; - - preConfigure = '' - sed -i \ - -e "s@/usr/share/sounds/sf2/@${pkgs.soundfont-fluid}/share/soundfonts/@g" \ - -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - source/mididevices/music_fluidsynth_mididevice.cpp - ''; - }; -in - pkgs.stdenv.mkDerivation { - inherit (sources.raze) src pname version; - - nativeBuildInputs = with pkgs; [ - cmake - makeWrapper - pkg-config - copyDesktopItems - ]; - - buildInputs = with pkgs; [ - SDL2 - bzip2 - fluidsynth - glib - gtk3 - libGL - libjpeg - libsndfile - libvpx - libwebp - openal - pcre - zlib - zmusic - ]; - - cmakeFlags = [ - "-DDYN_GTK=OFF" - "-DDYN_OPENAL=OFF" - ]; - - NIX_CFLAGS_LINK = "-lfluidsynth"; - - desktopItems = [ - (pkgs.makeDesktopItem { - name = "raze"; - exec = "raze"; - desktopName = "Raze"; - categories = ["Game"]; - }) - ]; - - installPhase = '' - runHook preInstall - - install -Dm755 raze "$out/lib/raze/raze" - - for i in *.pk3; do - install -Dm644 "$i" "$out/lib/raze/$i" - done - - for i in soundfonts/*; do - install -Dm644 "$i" "$out/lib/raze/$i" - done - - mkdir $out/bin - makeWrapper $out/lib/raze/raze $out/bin/raze - - runHook postInstall - ''; - - meta = with pkgs.lib; { - description = "Build engine port backed by GZDoom tech. Currently supports Duke Nukem 3D, Blood, Shadow Warrior, Redneck Rampage and Powerslave/Exhumed."; - homepage = "https://github.com/ZDoom/Raze"; - license = licenses.gpl2; - platforms = platforms.linux; - }; - } diff --git a/pkgs/raze/nvfetcher.toml b/pkgs/raze/nvfetcher.toml deleted file mode 100644 index a90fa425..00000000 --- a/pkgs/raze/nvfetcher.toml +++ /dev/null @@ -1,7 +0,0 @@ -[zmusic] -src.git = "https://github.com/ZDoom/ZMusic" -fetch.git = "https://github.com/ZDoom/ZMusic" - -[raze] -src.github = "ZDoom/Raze" -fetch.github = "ZDoom/Raze"