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

pkgs/applications/networking/browsers/palemoon/bin.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@

		stdenv.mkDerivation rec {
		pname = "palemoon-bin";
		version = "32.1.1";
		version = "32.2.0";

		src = fetchzip {
		urls = [
		@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
		"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
		];
		hash = if withGTK3 then
		"sha256-Kre+F1AE4bC5hAODYjo+S6TUCpKk8KMnYumQWHz+epY="
		"sha256-Bw8L5+3f46lOGJ5xR3bBF7sQWwEFxoK/NH3ngs1i4lU="
		else
		"sha256-LIsep7KsNhsw3zlmgltu6/4qZEWjGQbUmLqHCabSTfg=";
		"sha256-eP7GIsWPFLYmBPUcMPn6vAlsFEAP3Oyy9mhj0oGeMT4=";
		};

		preferLocalBuild = true;

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ assert with lib.strings; (

		stdenv.mkDerivation rec {
		pname = "palemoon";
		version = "32.1.1";
		version = "32.2.0";

		src = fetchFromGitea {
		domain = "repo.palemoon.org";
		@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
		repo = "Pale-Moon";
		rev = "${version}_Release";
		fetchSubmodules = true;
		sha256 = "sha256-Z9dBYO5AGDYRLlnEfHUu6thgc2a8OK/tPuRzwp0j9J8=";
		sha256 = "sha256-ftY3xSvpAdjnoPsNNL+XyVD6hFPRmReLyrYT5pqSNho=";
		};

		nativeBuildInputs = [

+7 −12

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, fetchurl
		, fetchpatch
		, copyDesktopItems
		, pkg-config
		@@ -12,21 +12,20 @@
		, libssh2
		, openssl
		, wxGTK32
		, gitUpdater
		, makeDesktopItem
		}:

		stdenv.mkDerivation rec {
		pname = "freefilesync";
		version = "12.2";
		version = "12.3";

		src = fetchFromGitHub {
		owner = "hkneptune";
		repo = "FreeFileSync";
		rev = "v${version}";
		hash = "sha256-pCXMpK+NF06vgEgX31wyO24+kPhvPhdTeRk1j84nYd0=";
		src = fetchurl {
		url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip";
		hash = "sha256-s6jNWqqriL/ePFCUQvLeNxNjHz+nZevD2x1kkw1gDE8=";
		};

		sourceRoot = ".";

		# Patches from Debian
		patches = [
		# Disable loading of the missing Animal.dat
		@@ -112,10 +111,6 @@ stdenv.mkDerivation rec {
		})
		];

		passthru.updateScript = gitUpdater {
		rev-prefix = "v";
		};

		meta = with lib; {
		description = "Open Source File Synchronization & Backup Software";
		homepage = "https://freefilesync.org";

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		{ callPackage, ... } @ args:

		callPackage ./generic-v3.nix ({
		version = "3.8.0";
		sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8";
		} // args)

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@

		buildPythonPackage rec {
		pname = "ecs-logging";
		version = "2.0.0";
		version = "2.0.2";
		format = "flit";

		disabled = pythonOlder "3.8";
		@@ -17,7 +17,7 @@ buildPythonPackage rec {
		owner = "elastic";
		repo = "ecs-logging-python";
		rev = "refs/tags/${version}";
		hash = "sha256-2BfZ96D24sfjFD6l+gjp6xXbSJ0kjQD/FhHLI3bpVGM=";
		hash = "sha256-CfPpUpzNfPuCAiuNsJrJ1nVLiUCPvclfrK7tByytoQE=";
		};

		nativeBuildInputs = [