amoeba, amoeba-data: move to by-name, modernize (#450363)

This commit is contained in:
Yohann Boniface
2025-10-11 23:30:21 +00:00
committed by GitHub
4 changed files with 16 additions and 19 deletions
@@ -4,13 +4,13 @@
fetchurl,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "amoeba-data";
version = "1.1";
src = fetchurl {
url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${version}.orig.tar.gz";
sha256 = "1bgclr1v63n14bj9nwzm5zxg48nm0cla9bq1rbd5ylxra18k0jbg";
url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${finalAttrs.version}.orig.tar.gz";
hash = "sha256-b0kwUVC5U1/aygGvpCgD1SLy+i/1c5vkIsEOs0Om7K0=";
};
installPhase = ''
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
cp demo.dat $out/share/amoeba/
'';
meta = with lib; {
meta = {
description = "Fast-paced, polished OpenGL demonstration by Excess (data files)";
homepage = "https://packages.qa.debian.org/a/amoeba-data.html";
license = licenses.unfree;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.all;
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ dezgeg ];
platforms = lib.platforms.all;
};
}
})
@@ -14,18 +14,18 @@
installShellFiles,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "amoeba";
version = "1.1";
debver = "31";
srcs = [
(fetchurl {
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}.orig.tar.gz";
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${finalAttrs.version}.orig.tar.gz";
hash = "sha256-NT6oMuAlTcVZEnYjMCF+BD+k3/w7LfWEmj6bkQln3sM=";
})
(fetchurl {
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}-${debver}.debian.tar.xz";
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${finalAttrs.version}-${finalAttrs.debver}.debian.tar.xz";
hash = "sha256-Ga/YeXbPXjkG/6qd9Z201d14Hlj/Je6DxgzeIQOqrWc=";
})
];
@@ -60,11 +60,11 @@ stdenv.mkDerivation rec {
installManPage ../debian/amoeba.1
'';
meta = with lib; {
meta = {
description = "Fast-paced, polished OpenGL demonstration by Excess";
homepage = "https://packages.qa.debian.org/a/amoeba.html";
license = licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
license = lib.licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree
maintainers = with lib.maintainers; [ dezgeg ];
platforms = lib.platforms.linux;
};
}
})
-3
View File
@@ -13282,9 +13282,6 @@ with pkgs;
qgo = libsForQt5.callPackage ../games/qgo { };
amoeba = callPackage ../games/amoeba { };
amoeba-data = callPackage ../games/amoeba/data.nix { };
anki = callPackage ../games/anki {
protobuf = protobuf_31;
};