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

pkgs/applications/audio/alsa-scarlett-gui/default.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		, stdenv
		, fetchFromGitHub
		, pkg-config
		, makeWrapper
		, alsa-utils
		, alsa-lib
		, gtk4
		, wrapGAppsHook4
		@@ -22,9 +24,11 @@ stdenv.mkDerivation rec {

		makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ];
		sourceRoot = "${src.name}/src";
		nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
		nativeBuildInputs = [ pkg-config wrapGAppsHook4 makeWrapper ];
		buildInputs = [ gtk4 alsa-lib ];
		postInstall = ''
		wrapProgram $out/bin/alsa-scarlett-gui --prefix PATH : ${lib.makeBinPath [ alsa-utils ]}

		substituteInPlace $out/share/applications/vu.b4.alsa-scarlett-gui.desktop \
		--replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/alsa-scarlett-gui"
		'';

pkgs/applications/version-management/degit/default.nix

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		{ lib
		, buildNpmPackage
		, fetchFromGitHub
		}:

		buildNpmPackage rec {
		pname = "degit";
		version = "2.8.4";

		src = fetchFromGitHub {
		owner = "Rich-Harris";
		repo = "degit";
		rev = "v${version}";
		hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE=";
		};

		npmDepsHash = "sha256-42cM31C2c1Gr7HWOowMUTEUEyL0mGnyl5fyQECcz1Sw=";

		meta = {
		changelog = "https://github.com/Rich-Harris/degit/blob/${src.rev}/CHANGELOG.md";
		description = "Make copies of git repositories";
		homepage = "https://github.com/Rich-Harris/degit";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [ kidonng ];
		};
		}

pkgs/applications/window-managers/i3/status-rust.nix

+3 −3

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

		rustPlatform.buildRustPackage rec {
		pname = "i3status-rust";
		version = "0.32.0";
		version = "0.32.1";

		src = fetchFromGitHub {
		owner = "greshake";
		repo = pname;
		rev = "refs/tags/v${version}";
		hash = "sha256-cBcmNeGfVPCdVvXkMe2Vx3zUaWGE1vMSfwmNPapTwBo=";
		hash = "sha256-F09gIDByRIJENwbzUb2IlWkyXjva0b7ivORgXotL/20=";
		};

		cargoHash = "sha256-cD4QFrDgwwJIrpSYmoale+2p0xD2JMHcIcuc4sRH4wI=";
		cargoHash = "sha256-D0XGH6b6dJrgLnFUViRAl9+AhnR2Bt4J2hDXUyJhOyg=";

		nativeBuildInputs = [ pkg-config makeWrapper ];

pkgs/development/libraries/libredwg/default.nix

+13 −3

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, fetchpatch
		, autoreconfHook
		, writeShellScript
		, pkg-config
		@@ -17,19 +18,28 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "libredwg";
		version = "0.12.5";
		version = "0.12.5.6248";

		src = fetchFromGitHub {
		owner = "LibreDWG";
		repo = pname;
		rev = version;
		sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE=";
		hash = "sha256-EHfqj+FeZZpQzF9/LFWg+onTMz2/9tvXNcdpZrdjry0=";
		fetchSubmodules = true;
		};

		patches = [
		(fetchpatch {
		name = "dwg2svg-strcasestr-musl-fix.patch";
		# https://github.com/LibreDWG/libredwg/pull/822
		url = "https://github.com/LibreDWG/libredwg/commit/eec0b7aac6d2f695b7b258f47c3bde3f71f963ee.patch";
		hash = "sha256-TjpJuhRl9t0b9NOJ1FEOO0/y586WwaJcNzTM0cTwmYI=";
		})
		];

		postPatch = let
		printVersion = writeShellScript "print-version" ''
		echo ${lib.escapeShellArg version}
		echo -n ${lib.escapeShellArg version}
		'';
		in ''
		# avoid git dependency

pkgs/development/node-packages/aliases.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ mapAliases {
		inherit (pkgs) configurable-http-proxy; # added 2023-08-19
		inherit (pkgs) cordova; # added 2023-08-18
		dat = throw "dat was removed because it was broken"; # added 2023-08-21
		inherit (pkgs) degit; # added 2023-08-18
		inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18
		eask = pkgs.eask; # added 2023-08-17
		inherit (pkgs.elmPackages) elm-test;
		eslint_d = pkgs.eslint_d; # Added 2023-05-26
		@@ -67,8 +69,11 @@ mapAliases {
		flood = pkgs.flood; # Added 2023-07-25
		git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
		glob = pkgs.node-glob; # added 2023-08-18
		inherit (pkgs) gqlint; # added 2023-08-19
		inherit (pkgs) graphqurl; # added 2023-08-19
		gtop = pkgs.gtop; # added 2023-07-31
		hs-client = pkgs.hsd; # added 2023-08-20
		inherit (pkgs) hsd; # added 2023-08-19
		inherit (pkgs) html-minifier; # added 2023-08-19
		inherit (pkgs) htmlhint; # added 2023-08-19
		hueadm = pkgs.hueadm; # added 2023-07-31
		@@ -76,19 +81,24 @@ mapAliases {
		immich = pkgs.immich-cli; # added 2023-08-19
		indium = throw "indium was removed because it was broken"; # added 2023-08-19
		ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
		inherit (pkgs) jake; # added 2023-08-19
		inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
		karma = pkgs.karma-runner; # added 2023-07-29
		leetcode-cli = vsc-leetcode-cli; # added 2023-08-31
		manta = pkgs.node-manta; # Added 2023-05-06
		markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
		inherit (pkgs) markdownlint-cli2; # added 2023-08-22
		mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
		musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
		node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
		inherit (pkgs) npm-check-updates; # added 2023-08-22
		inherit (pkgs) react-static; # added 2023-08-21
		readability-cli = pkgs.readability-cli; # Added 2023-06-12
		reveal-md = pkgs.reveal-md; # added 2023-07-31
		inherit (pkgs) rtlcss; # added 2023-08-29
		s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
		inherit (pkgs) snyk; # Added 2023-08-30
		"@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
		ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
		stf = throw "stf was removed because it was broken"; # added 2023-08-21
		thelounge = pkgs.thelounge; # Added 2023-05-22

Admin message