Merge master into staging-next

authored by nixpkgs-ci[bot] and committed by GitHub 5dcdb809 d826eeab

+103 -1
+65
pkgs/by-name/nu/nucleus/package.nix
···
··· 1 + { 2 + lib, 3 + python3Packages, 4 + fetchFromGitea, 5 + ninja, 6 + meson, 7 + pkg-config, 8 + wrapGAppsHook4, 9 + glib, 10 + desktop-file-utils, 11 + appstream-glib, 12 + blueprint-compiler, 13 + libadwaita, 14 + nix-update-script, 15 + }: 16 + let 17 + version = "1"; 18 + in 19 + python3Packages.buildPythonApplication { 20 + pname = "nucleus"; 21 + inherit version; 22 + pyproject = false; 23 + 24 + src = fetchFromGitea { 25 + domain = "codeberg.org"; 26 + owner = "lo-vely"; 27 + repo = "nucleus"; 28 + tag = "v${version}"; 29 + hash = "sha256-8y3sbtfq4hZuEwReduIkud91SOj9XrURrZRUs2M74mQ="; 30 + }; 31 + 32 + nativeBuildInputs = [ 33 + meson 34 + ninja 35 + pkg-config 36 + wrapGAppsHook4 37 + glib 38 + desktop-file-utils 39 + appstream-glib 40 + blueprint-compiler 41 + ]; 42 + 43 + dependencies = with python3Packages; [ 44 + pygobject3 45 + ]; 46 + 47 + buildInputs = [ 48 + libadwaita 49 + ]; 50 + 51 + dontWrapGApps = true; 52 + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; 53 + 54 + passthru.updateScript = nix-update-script { }; 55 + 56 + meta = { 57 + description = "Unofficial GNOME Periodic Table"; 58 + homepage = "https://codeberg.org/lo-vely/nucleus"; 59 + changelog = "https://codeberg.org/lo-vely/nucleus/releases/tag/v${version}"; 60 + license = lib.licenses.gpl3Plus; 61 + mainProgram = "nucleus"; 62 + platforms = lib.platforms.linux; 63 + maintainers = [ lib.maintainers.awwpotato ]; 64 + }; 65 + }
+7 -1
pkgs/by-name/tu/tutanota-desktop/package.nix
··· 2 lib, 3 appimageTools, 4 fetchurl, 5 gitUpdater, 6 }: 7 ··· 16 17 extraPkgs = pkgs: [ pkgs.libsecret ]; 18 19 extraInstallCommands = 20 let 21 appimageContents = appimageTools.extract { inherit pname version src; }; ··· 26 27 substituteInPlace $out/share/applications/tutanota-desktop.desktop \ 28 --replace 'Exec=AppRun' 'Exec=${pname}' 29 ''; 30 31 passthru.updateScript = gitUpdater { ··· 40 changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; 41 license = lib.licenses.gpl3Only; 42 sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; 43 - maintainers = with lib.maintainers; [ ]; 44 mainProgram = "tutanota-desktop"; 45 platforms = [ "x86_64-linux" ]; 46 };
··· 2 lib, 3 appimageTools, 4 fetchurl, 5 + makeWrapper, 6 gitUpdater, 7 }: 8 ··· 17 18 extraPkgs = pkgs: [ pkgs.libsecret ]; 19 20 + nativeBuildInputs = [ makeWrapper ]; 21 + 22 extraInstallCommands = 23 let 24 appimageContents = appimageTools.extract { inherit pname version src; }; ··· 29 30 substituteInPlace $out/share/applications/tutanota-desktop.desktop \ 31 --replace 'Exec=AppRun' 'Exec=${pname}' 32 + 33 + wrapProgram $out/bin/tutanota-desktop \ 34 + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" 35 ''; 36 37 passthru.updateScript = gitUpdater { ··· 46 changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; 47 license = lib.licenses.gpl3Only; 48 sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; 49 + maintainers = [ lib.maintainers.awwpotato ]; 50 mainProgram = "tutanota-desktop"; 51 platforms = [ "x86_64-linux" ]; 52 };
+29
pkgs/development/python-modules/slh-dsa/default.nix
···
··· 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchPypi, 5 + pdm-backend, 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "slh-dsa"; 10 + version = "0.1.3"; 11 + pyproject = true; 12 + 13 + src = fetchPypi { 14 + pname = "slh_dsa"; 15 + inherit version; 16 + hash = "sha256-0OtjlI/w3F0OWu+fsQI9M3lIQY0Nx48YbvoGcQ0AJ1Y="; 17 + }; 18 + 19 + build-system = [ pdm-backend ]; 20 + 21 + pythonImportsCheck = [ "slhdsa" ]; 22 + 23 + meta = with lib; { 24 + description = "Pure Python implementation of the SLH-DSA algorithm"; 25 + homepage = "https://github.com/colinxu2020/slhdsa"; 26 + license = licenses.mit; 27 + maintainers = with maintainers; [ prusnak ]; 28 + }; 29 + }
+2
pkgs/top-level/python-packages.nix
··· 16704 } 16705 ); 16706 16707 slicedimage = callPackage ../development/python-modules/slicedimage { }; 16708 16709 slicer = callPackage ../development/python-modules/slicer { };
··· 16704 } 16705 ); 16706 16707 + slh-dsa = callPackage ../development/python-modules/slh-dsa { }; 16708 + 16709 slicedimage = callPackage ../development/python-modules/slicedimage { }; 16710 16711 slicer = callPackage ../development/python-modules/slicer { };