Merge master into staging-next (022751ad) · Commits · nix / nixpkgs

pkgs/games/amoeba/data.nix→pkgs/by-name/am/amoeba-data/package.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -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;
		};
		}
		})

+0 −0

File moved.

+8 −8

Original line number	Diff line number	Diff line
		@@ -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;
		};
		}
		})

+2 −2

Original line number	Diff line number	Diff line
		@@ -11,13 +11,13 @@

		buildGoModule (finalAttrs: {
		pname = "apko";
		version = "0.30.13";
		version = "0.30.15";

		src = fetchFromGitHub {
		owner = "chainguard-dev";
		repo = "apko";
		tag = "v${finalAttrs.version}";
		hash = "sha256-b90o1MmFYhEc8mwh7ejTm6I59zlaa8Jv46dtuZdC6GQ=";
		hash = "sha256-eFcj/Yo0qvIgZKiKkm4DNhslOLokFmLoj7QrjeK/iT8=";
		# populate values that require us to use git. By doing this in postFetch we
		# can delete .git afterwards and maintain better reproducibility of the src.
		leaveDotGit = true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ let

		outputHash =
		{
		"aarch64-linux" = "sha256-92UFGgYLmtN13hW0/BV0gJa6ImrVyn+zRpDp5KeRRhs=";
		"aarch64-linux" = "sha256-fa/WGRb4lWSXMqBmGhCd+N2fZr1YZKsskr3Oowp8gRE=";
		"x86_64-linux" = "sha256-jVi+pgcz96Dj25T4e/s+SHqsZfonzXs1WZYe0lCI48Q=";
		}
		.${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");