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

pkgs/applications/misc/gallery-dl/default.nix

+2 −2

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

		buildPythonApplication rec {
		pname = "gallery-dl";
		version = "1.25.2";
		version = "1.25.3";
		format = "setuptools";

		src = fetchPypi {
		inherit version;
		pname = "gallery_dl";
		sha256 = "sha256-T9PzvjOdcLaO7iTxBZxucQdiAPVpk1+9wDfcpShIBdM=";
		sha256 = "sha256-aosaA8F8TVBnY0Mz+TbRYQjVW5FUDiSiohl/7vqXwis=";
		};

		propagatedBuildInputs = [

+0 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@
		, version
		, desktopName
		, longDescription
		, broken ? false
		, buildFHSEnv
		, extraBuildInputs ? [ ]
		, jdk
		@@ -95,7 +94,6 @@ buildFHSEnv {
		];
		license = licenses.unfree;
		platforms = platforms.linux;
		inherit broken;
		mainProgram = pname;
		maintainers = [ maintainers.pwoelfel ];
		};

+5 −9

Original line number	Diff line number	Diff line
		@@ -31,17 +31,15 @@ in
		{
		pdfstudioviewer = callPackage ./common.nix rec {
		inherit desktopName pname program year;
		version = "${year}.2.2";
		version = "${year}.2.4";
		longDescription = ''
		PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
		'';
		src = fetchurl {
		url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb";
		sha256 = "sha256-cc8YjrMsYZqgmwp5+AA+HsqzjxzFcTT/ga31NQz/OWc=";
		sha256 = "sha256-QXNsH1T+ItV3s9r8CnwgRUo1mhVbe8LkEun9gUmlVQg=";
		};
		jdk = jdk11;

		broken = true; # Bad hash, probably unstable
		jdk = jdk17;
		};

		pdfstudio2021 = callPackage ./common.nix rec {
		@@ -59,16 +57,14 @@ in

		pdfstudio2022 = callPackage ./common.nix rec {
		inherit desktopName longDescription pname program year;
		version = "${year}.2.2";
		version = "${year}.2.4";
		src = fetchurl {
		url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
		sha256 = "sha256-CP2cCmvedQJ/xjZWQ4wj6UZRqCsU5qK3Ta83TUVJyts=";
		sha256 = "sha256-bti+WI8JdOmUsHq8ijfxGC4ZsWXwbwwM26kuBgPDUMQ=";
		};
		extraBuildInputs = [
		(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
		];
		jdk = jdk17;

		broken = true; # URL 404s, probably unstable
		};
		}.${pname}

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,16 +2,16 @@

		buildGoModule rec {
		pname = "kubergrunt";
		version = "0.11.1";
		version = "0.11.2";

		src = fetchFromGitHub {
		owner = "gruntwork-io";
		repo = "kubergrunt";
		rev = "v${version}";
		sha256 = "sha256-pg0D3zTSJirH+NNtbun7VoAILR/C32VstkNGbwpfoNo=";
		sha256 = "sha256-HVIPKfoAfBZH8wA2GMabhTkYxDLvP15XoZuTVSy2i8M=";
		};

		vendorHash = "sha256-K/Cw7Sh/2OqTbWQPEsoQbj/ejyaXcLxFT8Rg5Ore5DE=";
		vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0=";

		# Disable tests since it requires network access and relies on the
		# presence of certain AWS infrastructure

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec {
		'';
		homepage = "https://lieer.gaute.vetsj.com/";
		license = licenses.gpl3Plus;
		maintainers = with maintainers; [ flokli kaiha ];
		maintainers = with maintainers; [ flokli ];
		};
		}