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

pkgs/applications/editors/vscode/vscode.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -36,22 +36,22 @@ let

		sha256 =
		{
		x86_64-linux = "07bnp0ywrpcpfqmr6h3adsv1gwng4fiyf2dqpj8g4dbwkgakalzk";
		x86_64-darwin = "1k5wmhnr8dr3f76f65agkn2igzbi40qqz3df7fai1gk1ichsw0s2";
		aarch64-linux = "0s8s5x3vhs3rv4kj86irprzp1pprx1npyv0sbgvd821h3bh6s6k9";
		aarch64-darwin = "1li4s74lqj5qr4w2biz29r88dx741a85v5s3mfxxqvnlhi7rkmx5";
		armv7l-linux = "028g7f7fhvni7kn2kvpn7q1n66r03jr8maxkxihwsxr0xh6srca0";
		x86_64-linux = "12606f4b6drp9gnb2y6q8b9zd1q7pjqg4ikjsfz47wgsi4009096";
		x86_64-darwin = "18hj3n81ja0kj4l4l1v2s3ahgagl9p7bv0zzmj710vqpr3k3h2p8";
		aarch64-linux = "03k92827lvb7rnavpii1kx0z3rpxsmbv21rdi06w5agpk4l3xs9k";
		aarch64-darwin = "08x5gv338yf1by04djvykjwnlifffb1bfbqr6vnxshcy9r30n925";
		armv7l-linux = "05cchap0r3vxfa32i3di838kj6wyrsm2qcga0gcl2aa27c86cn3c";
		}
		.${system} or throwSystem;
		in
		callPackage ./generic.nix rec {
		# Please backport all compatible updates to the stable release.
		# This is important for the extension ecosystem.
		version = "1.96.0";
		version = "1.96.2";
		pname = "vscode" + lib.optionalString isInsiders "-insiders";

		# This is used for VS Code - Remote SSH test
		rev = "138f619c86f1199955d53b4166bef66ef252935c";
		rev = "fabdb6a30b49f79a7aba0f2ad9df9b399473380f";

		executableName = "code" + lib.optionalString isInsiders "-insiders";
		longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
		@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
		src = fetchurl {
		name = "vscode-server-${rev}.tar.gz";
		url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
		sha256 = "1kjivqnc0abrnqjn9dw2l612z7qra7y2fvxxrallsrqmqiibzcdk";
		sha256 = "1gbjxmmi800mdslr7yys04fw160crjg0v8bjhcshk6w6fdz39wp1";
		};
		stdenv = stdenvNoCC;
		};

pkgs/by-name/bi/bilibili/sources.nix

+3 −3

Original line number	Diff line number	Diff line
		# Generated by ./update.sh - do not update manually!
		{
		version = "1.16.1-1";
		arm64-hash = "sha256-2pdrzOkF3Ni8Cjwrkevv8QmXioGFtNIHkUF/x+NoZIo=";
		x86_64-hash = "sha256-yAC1CZEOjip80fBbmor4bCOlEtyXMA1R3Hnxvmj56IQ=";
		version = "1.16.1-2";
		arm64-hash = "sha256-6TcmPJ1TxCc+YTaYSpnmFf2pEhMRHXubR241+UVoFRU=";
		x86_64-hash = "sha256-Bwo6Pe4Z4H0Yt0IALKtMrNryemXDemybqsiwc6B+26E=";
		}

pkgs/by-name/br/bruno/package.nix

+14 −8

Original line number	Diff line number	Diff line
		@@ -18,20 +18,20 @@

		buildNpmPackage rec {
		pname = "bruno";
		version = "1.34.2";
		version = "1.37.0";

		src = fetchFromGitHub {
		owner = "usebruno";
		repo = "bruno";
		rev = "v${version}";
		hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc=";
		tag = "v${version}";
		hash = "sha256-+CLop9fU0fk5n5jNkLbTXZfXyfOXyigukRhTHnML4t0=";

		postFetch = ''
		${lib.getExe npm-lockfile-fix} $out/package-lock.json
		'';
		};

		npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI=";
		npmDepsHash = "sha256-K7M4eZQpI79TUI2rf0UP2hEipqaOVjhjMRjIVlcy7c8=";
		npmFlags = [ "--legacy-peer-deps" ];

		nativeBuildInputs =
		@@ -69,6 +69,10 @@ buildNpmPackage rec {
		postPatch = ''
		substituteInPlace scripts/build-electron.sh \
		--replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'

		# disable telemetry
		substituteInPlace packages/bruno-app/src/providers/App/index.js \
		--replace-fail "useTelemetry();" ""
		'';

		postConfigure = ''
		@@ -81,9 +85,12 @@ buildNpmPackage rec {
		# remove giflib dependency
		npmRebuildFlags = [ "--ignore-scripts" ];
		preBuild = ''
		# upstream keeps removing and adding back canvas, only patch it when it is present
		if [[ -e node_modules/canvas/binding.gyp ]]; then
		substituteInPlace node_modules/canvas/binding.gyp \
		--replace-fail "'with_gif%': '<!(node ./util/has_lib.js gif)'" "'with_gif%': 'false'"
		npm rebuild
		fi
		'';

		buildPhase = ''
		@@ -137,7 +144,6 @@ buildNpmPackage rec {
		installPhase = ''
		runHook preInstall


		${
		if stdenv.hostPlatform.isDarwin then
		''

pkgs/by-name/sd/SDL_sound/package.nix

+2 −4

Original line number	Diff line number	Diff line
		@@ -19,10 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
		hash = "sha256-OZn9C7tIUomlK+FLL2i1ccuE44DMQzh+rfd49kx55t8=";
		};

		nativeBuildInputs = [
		SDL
		];

		buildInputs = [
		SDL
		flac
		@@ -34,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
		(lib.enableFeature enableSdltest "sdltest")
		];

		env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";

		strictDeps = true;

		meta = {

pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix

+3 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
		})
		];

		# Fix build with gcc 14
		env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";

		nativeBuildInputs = [
		pkg-config
		intltool

Admin message