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

nixos/tests/all-tests.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -457,7 +457,7 @@ in {
		kerberos = handleTest ./kerberos/default.nix {};
		kernel-generic = handleTest ./kernel-generic.nix {};
		kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};
		kernel-rust = handleTestOn ["x86_64-linux"] ./kernel-rust.nix {};
		kernel-rust = handleTest ./kernel-rust.nix {};
		keter = handleTest ./keter.nix {};
		kexec = handleTest ./kexec.nix {};
		keycloak = discoverTests (import ./keycloak.nix);

nixos/tests/kernel-rust.nix

+4 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		}:

		let
		inherit (pkgs.lib) const filterAttrs mapAttrs;
		inherit (pkgs.lib) const filterAttrs mapAttrs meta;

		kernelRustTest = kernelPackages: import ./make-test-python.nix ({ lib, ... }: {
		name = "kernel-rust";
		@@ -38,6 +38,8 @@ let
		inherit (builtins.tryEval (
		x.rust-out-of-tree-module or null != null
		)) success value;
		in success && value))
		available =
		meta.availableOn pkgs.stdenv.hostPlatform x.rust-out-of-tree-module;
		in success && value && available))
		pkgs.linuxKernel.vanillaPackages;
		in mapAttrs (const kernelRustTest) kernels

pkgs/applications/graphics/hello-wayland/default.nix

+3 −3

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

		stdenv.mkDerivation {
		pname = "hello-wayland";
		version = "unstable-2023-10-26";
		version = "0-unstable-2024-03-04";

		src = fetchFromGitHub {
		owner = "emersion";
		repo = "hello-wayland";
		rev = "b631afa4f6fd86560ccbdb8c7b6fe42851c06a57";
		sha256 = "MaBzGZ05uCoeeiglFYHC40hQlPvtDw5sQhqXgtVDySc=";
		rev = "5f3a35def81116f0a74fcaf5a421d66c6700482d";
		hash = "sha256-gcLR8gosQlPPgFrxqmRQ6/59RjAfJNX6CcsYP+L+A58=";
		};

		separateDebugInfo = true;

pkgs/applications/misc/ubpm/default.nix

+12 −15

Original line number	Diff line number	Diff line
		{ stdenv, lib, fetchFromGitea, qmake, qttools, qtbase, qtserialport
		, qtconnectivity, qtcharts, wrapQtAppsHook }:
		, qtconnectivity, qtcharts, wrapQtAppsHook, fetchpatch }:

		stdenv.mkDerivation (finalAttrs: {
		pname = "ubpm";
		version = "1.7.3";
		version = "1.10.0";

		src = fetchFromGitea {
		domain = "codeberg.org";
		owner = "LazyT";
		repo = "ubpm";
		rev = finalAttrs.version;
		hash = "sha256-6lvDSU0ssfs71xrac6R6qlmE0QyVcAMTUf0xmJPVzhY=";
		hash = "sha256-BUUn1WyLT7nm4I+2SpO1ZtIf8isGDy8Za15SiO7sXL8=";
		};

		postPatch = ''
		substituteInPlace sources/mainapp/mainapp.pro \
		--replace 'INSTALLDIR = /tmp/ubpm.AppDir' "INSTALLDIR = $out" \
		--replace '/usr/bin' '/bin' \
		--replace 'INSTALLS += target translations themes devices help lin' 'INSTALLS += target translations themes devices help'
		'';
		patches = [
		# fixes qmake for nix
		(fetchpatch {
		url =
		"https://codeberg.org/LazyT/ubpm/commit/f18841d6473cab9aa2a9d4c02392b8e103245ef6.diff";
		hash = "sha256-lgXWu8PUUCt66btj6hVgOFXz3U1BJM3ataSo1MpHkfU=";
		})
		];

		preConfigure = ''
		cd ./sources/
		'';

		postInstall = ''
		install -Dm644 ../package/lin/ubpm.desktop -t $out/share/applications/
		install -Dm644 ../package/lin/de.lazyt.ubpm.appdata.xml -t $out/share/metainfo/
		install -Dm644 ../sources/mainapp/res/ico/app.png $out/share/icons/hicolor/256x256/apps/ubpm.png
		'';

		postFixup = ''
		wrapQtApp $out/bin/ubpm
		'';
		@@ -47,5 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
		mainProgram = "ubpm";
		license = licenses.gpl3Only;
		maintainers = with maintainers; [ kurnevsky ];
		broken = stdenv.isDarwin;
		};
		})

pkgs/applications/radio/rtl-sdr/default.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "rtl-sdr";
		version = "0.8.0";
		version = "0.9.0";

		src = fetchFromGitHub {
		owner = "librtlsdr";
		repo = "librtlsdr";
		rev = "v${version}";
		hash = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk=";
		hash = "sha256-I1rbywQ0ZBw26wZdtMBkfpj7+kv09XKrrcoDuhIkRmw=";
		};

		postPatch = ''

Admin message