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

pkgs/applications/misc/redshift/default.nix

+4 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ let
		"--enable-quartz=${if withQuartz then "yes" else "no"}"
		"--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
		] ++ lib.optionals (pname == "gammastep") [
		"--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/"
		"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user/"
		"--enable-apparmor"
		];

		@@ -117,6 +117,7 @@ rec {
		license = licenses.gpl3Plus;
		homepage = "http://jonls.dk/redshift";
		platforms = platforms.unix;
		mainProgram = "redshift";
		maintainers = with maintainers; [ yana ];
		};
		};
		@@ -137,7 +138,8 @@ rec {
		longDescription = "Gammastep"
		+ lib.removePrefix "Redshift" redshift.meta.longDescription;
		homepage = "https://gitlab.com/chinstrap/gammastep";
		maintainers = [ lib.maintainers.primeos ] ++ redshift.meta.maintainers;
		mainProgram = "gammastep";
		maintainers = (with lib.maintainers; [ eclairevoyant primeos ]) ++ redshift.meta.maintainers;
		};
		};
		}

pkgs/applications/misc/tippecanoe/default.nix

+5 −3

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

		stdenv.mkDerivation (finalAttrs: {
		pname = "tippecanoe";
		version = "2.19.0";
		version = "2.35.0";

		src = fetchFromGitHub {
		owner = "felt";
		repo = "tippecanoe";
		rev = finalAttrs.version;
		hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM=";
		hash = "sha256-l19p/Ql1gaNJpmDH46jwLgUUmJ5YTYRQi6DdayAd84Q=";
		};

		buildInputs = [ sqlite zlib ];
		@@ -17,7 +17,9 @@ stdenv.mkDerivation (finalAttrs: {
		makeFlags = [ "PREFIX=$(out)" ];

		enableParallelBuilding = true;
		doCheck = true;

		# https://github.com/felt/tippecanoe/issues/148
		doCheck = false;

		passthru.tests.version = testers.testVersion {
		package = finalAttrs.finalPackage;

pkgs/applications/networking/geph/Cargo.lock

0 → 100644

+4451 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/geph/default.nix

+69 −26

Original line number	Diff line number	Diff line
		@@ -2,19 +2,23 @@
		, stdenvNoCC
		, rustPlatform
		, fetchFromGitHub
		, buildNpmPackage
		, buildGoModule
		, makeWrapper
		, nodePackages
		, esbuild
		, jq
		, moreutils
		, perl
		, pkg-config
		, glib
		, webkitgtk
		, libappindicator-gtk3
		, libayatana-appindicator
		, cairo
		, openssl
		}:

		let
		version = "4.7.8";
		version = "4.10.1";
		geph-meta = with lib; {
		description = "A modular Internet censorship circumvention system designed specifically to deal with national filtering.";
		homepage = "https://geph.io";
		@@ -31,10 +35,10 @@ in
		owner = "geph-official";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-DVGbLyFgraQMSIUAqDehF8DqbnvcaeWbuLVgiSQY3KE=";
		hash = "sha256-e0Pdg4pQ5s1wvTnFm1rKuAwkYtCtu2Uacd7yH3EHeCo=";
		};

		cargoHash = "sha256-uBq6rjUnKEscwhu60HEZffLvuXcArz+AiR52org+qKw=";
		cargoHash = "sha256-Kwc+EOH2pJJVvIcTUfL39Xrv/7YmTPUDge7mmjDs9pQ=";

		nativeBuildInputs = [ perl ];

		@@ -50,52 +54,91 @@ in
		src = fetchFromGitHub {
		owner = "geph-official";
		repo = "gephgui-pkg";
		rev = "85a55bfc2f4314d9c49608f252080696b1f8e2a9";
		hash = "sha256-id/sfaQsF480kUXg//O5rBIciuuhDuXY19FQe1E3OQs=";
		rev = "4163e12188dd679ba548e127fc9771cb5e87bab0";
		hash = "sha256-wBvhfgp5sZTRCBR9HZqs1G0VaIt9DW2e9CWMAp/T5WI=";
		fetchSubmodules = true;
		};

		gephgui = buildNpmPackage {
		pname = "gephgui";
		inherit version src;

		sourceRoot = "${src.name}/gephgui-wry/gephgui";
		pnpm-deps = stdenvNoCC.mkDerivation {
		pname = "${pname}-pnpm-deps";
		inherit src version;

		postPatch = "ln -s ${./package-lock.json} ./package-lock.json";
		sourceRoot = "source/gephgui-wry/gephgui";

		npmDepsHash = "sha256-5y6zpMF4M56DiWVhMvjJGsYpVdlJSoWoWyPgLc7hJoo=";
		nativeBuildInputs = [
		jq
		moreutils
		nodePackages.pnpm
		];

		installPhase = ''
		runHook preInstall

		mkdir -p $out
		mv dist $out

		runHook postInstall
		export HOME=$(mktemp -d)
		pnpm config set store-dir $out
		pnpm install --ignore-scripts

		# Remove timestamp and sort the json files
		rm -rf $out/v3/tmp
		for f in $(find $out -name "*.json"); do
		sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
		jq --sort-keys . $f \| sponge $f
		done
		'';

		dontFixup = true;
		outputHashMode = "recursive";
		outputHash = "sha256-OKPx5xRI7DWd6m31nYx1biP0k6pcZ7fq7dfVlHda4O0=";
		};

		gephgui-wry = rustPlatform.buildRustPackage rec {
		gephgui-wry = rustPlatform.buildRustPackage {
		pname = "gephgui-wry";
		inherit version src;

		sourceRoot = "${src.name}/gephgui-wry";
		sourceRoot = "source/gephgui-wry";

		cargoHash = "sha256-lidlUUfHXKPUlICdaVv/SFlyyWsZ7cYHyTJ3kkMn3L4=";
		cargoLock = {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"tao-0.5.2" = "sha256-HyQyPRoAHUcgtYgaAW7uqrwEMQ45V+xVSxmlAZJfhv0=";
		"wry-0.12.2" = "sha256-kTMXvignEF3FlzL0iSlF6zn1YTOCpyRUDN8EHpUS+yI=";
		};
		};

		nativeBuildInputs = [ pkg-config ];
		nativeBuildInputs = [
		pkg-config
		nodePackages.pnpm
		makeWrapper
		];

		buildInputs = [
		glib
		webkitgtk
		libappindicator-gtk3
		libayatana-appindicator
		cairo
		openssl
		];

		ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {
		buildGoModule = args: buildGoModule (args // rec {
		version = "0.15.10";
		src = fetchFromGitHub {
		owner = "evanw";
		repo = "esbuild";
		rev = "v${version}";
		hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
		};
		vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
		});
		})}";

		preBuild = ''
		ln -s ${gephgui}/dist ./gephgui
		cd gephgui
		export HOME=$(mktemp -d)
		pnpm config set store-dir ${pnpm-deps}
		pnpm install --ignore-scripts --offline
		chmod -R +w node_modules
		pnpm rebuild
		pnpm build
		cd ..
		'';
		};

pkgs/applications/networking/geph/package-lock.json

deleted100644 → 0

+0 −3658

File deleted.

Preview size limit exceeded, changes collapsed.