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

pkgs/applications/editors/jetbrains/linux.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		, unzip
		, libsecret
		, libnotify
		, udev
		, e2fsprogs
		, python3
		, vmopts ? null
		@@ -109,6 +110,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
		# Some internals want libstdc++.so.6
		stdenv.cc.cc.lib libsecret e2fsprogs
		libnotify
		# Required for Help -> Collect Logs
		# in at least rider and goland
		udev
		] ++ extraLdPath)}" \
		${lib.concatStringsSep " " extraWrapperArgs} \
		--set-default JDK_HOME "$jdk" \

pkgs/applications/misc/stog/default.nix

+7 −2

Original line number	Diff line number	Diff line
		{ lib, buildDunePackage, fetchFromGitLab, ocaml
		{ lib, buildDunePackage, fetchFromGitLab, fetchpatch, ocaml
		, fmt, lwt_ppx, menhir, ocf_ppx, ppx_blob, xtmpl_ppx
		, dune-build-info, dune-site, higlo, logs, lwt, ocf, ptime, uri, uutf, xtmpl
		}:
		@@ -10,7 +10,6 @@ else
		buildDunePackage rec {
		pname = "stog";
		version = "0.20.0";
		duneVersion = "3";
		minimalOCamlVersion = "4.12";
		src = fetchFromGitLab {
		domain = "framagit.org";
		@@ -20,6 +19,12 @@ buildDunePackage rec {
		sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x";
		};

		# Compatibility with higlo 0.9
		patches = fetchpatch {
		url = "https://framagit.org/zoggy/stog/-/commit/ea0546ab4cda8cc5c4c820ebaf2e3dfddc2ab101.patch";
		hash = "sha256-86GRHF9OjfcalGfA0Om2wXH99j4THCs9a4+o5ghuiJc=";
		};

		nativeBuildInputs = [ menhir ];
		buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ];
		propagatedBuildInputs = [

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

+9 −8

Original line number	Diff line number	Diff line
		@@ -17,19 +17,19 @@
		, palemoon-bin
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "palemoon-bin";
		version = "32.3.1";
		version = "32.4.0.1";

		src = fetchzip {
		urls = [
		"https://rm-eu.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
		"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
		"https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
		"https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
		];
		hash = if withGTK3 then
		"sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII="
		"sha256-kGt3pIgCjVeSD6UXRvj5w9opWrMx3q3B/Y0S55kKS08="
		else
		"sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY=";
		"sha256-kNvUC/ir7TKjvKXYFoEDOPAY75CEgeixmEV1tuB/WIM=";
		};

		preferLocalBuild = true;
		@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
		];

		desktopItems = [(makeDesktopItem rec {
		name = pname;
		name = "palemoon-bin";
		desktopName = "Pale Moon Web Browser";
		comment = "Browse the World Wide Web";
		keywords = [
		@@ -164,6 +164,7 @@ stdenv.mkDerivation rec {
		longDescription = ''
		Pale Moon is an Open Source, Goanna-based web browser focusing on
		efficiency and customization.

		Pale Moon offers you a browsing experience in a browser completely built
		from its own, independently developed source that has been forked off from
		Firefox/Mozilla code a number of years ago, with carefully selected
		@@ -186,4 +187,4 @@ stdenv.mkDerivation rec {
		platforms = [ "x86_64-linux" ];
		hydraPlatforms = [];
		};
		}
		})

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null)
		fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];

		# Upstream source
		version = "12.5.4";
		version = "12.5.5";

		lang = "ALL";

		@@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null)
		"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
		"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
		];
		hash = "sha256-AIwqIz8QG7Fq3Vvd22QTNFH1fnZgtH25qUaECX50QCQ=";
		hash = "sha256-FS1ywm/UJDZiSYPf0WHikoX/o6WGIP+lQQGFeD0g2dc=";
		};

		i686-linux = fetchurl {
		@@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null)
		"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
		"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
		];
		hash = "sha256-s8UReyurIKlxG0bT0ecGUcXMTTHyYKy/AcygTE6ujqo=";
		hash = "sha256-6ozGIQPC8QnZxS1oJ0ZEdZDMY2JkwRHs+7ZHUkqrL6U=";
		};
		};

pkgs/applications/networking/cluster/talosctl/default.nix

+3 −3

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

		buildGoModule rec {
		pname = "talosctl";
		version = "1.5.2";
		version = "1.5.3";

		src = fetchFromGitHub {
		owner = "siderolabs";
		repo = "talos";
		rev = "v${version}";
		hash = "sha256-CEalMrXdLa/pGok1uB60PmxYmmDnSas38cUxvOpkoGk=";
		hash = "sha256-RoodFtZ4BINyPxxpVkliMD9Sam0eRujvd3gXR2Hxk70=";
		};

		vendorHash = "sha256-JDhpRXYnNhVJ5BBKdUmCponRpckH54gMRoKLQ+wx5zM=";
		vendorHash = "sha256-PIuSn4qp6bLPFJwkLEb+pX1ra49IkxXYDRzEFbVqVI0=";

		ldflags = [ "-s" "-w" ];