Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.120";
|
||||
version = "2.0.122";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-L3+tDhobD1j3X63181mLEVSwDUmcwkPDnW1vZ8W6vTU=";
|
||||
sha256 = "sha256-jUmcAAh4gp4uAtwle4GdnVvV82tCyOVLddDKB6IH+gA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vta5xn8x/TZopgVCvc/RzQhMzM9OnLd3HeTrRO8ePOI=";
|
||||
cargoHash = "sha256-vbOlpFUYbHxG397wqiD9ZqmLshhX9lkkdIsFQ7hIX88=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -336,9 +336,9 @@
|
||||
|
||||
vm-repair = mkAzExtension rec {
|
||||
pname = "vm-repair";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
|
||||
hash = "sha256-atqfMIN0FjLZjSIRh+T9MBxt34y6VWpxexCEBFsPTaM=";
|
||||
hash = "sha256-ppsK4rJa/nFFkO2XJvjnK0PIRp9/haVwWfqfF7oN5WQ=";
|
||||
description = "Support for repairing Azure Virtual Machines";
|
||||
propagatedBuildInputs = with python3Packages; [ opencensus ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "candy-icons";
|
||||
version = "0-unstable-2026-02-13";
|
||||
version = "0-unstable-2026-03-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "candy-icons";
|
||||
rev = "b0a85a7414504191342b0c6d073c6f9233cb923a";
|
||||
hash = "sha256-SzZMCNNTIctzFqx2qHwE4y4lioctpum39AyRrylurZA=";
|
||||
rev = "83512fbcadcb7e1015ebbe1729a1894946b021be";
|
||||
hash = "sha256-TzovzmfrUuaSrtpKCQxyXcih7cKSBhBtMpZLVwY/ScA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "conceal";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TD-Sky";
|
||||
repo = "conceal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B6vZ4Xl7H6KOlscys+FT8fMXb0Xrvosr2DXHzvRjLis=";
|
||||
hash = "sha256-kPK00DjBHhyZVwCTuL3VSazS5pYY8lgLBn9bHTkaQ5s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aBc9ijRObFi9AyQxSoQZs/3exAzOlYq5uNqFfvjNhvw=";
|
||||
cargoHash = "sha256-6MPYgReVYkEQhmifzT7sAMRuMIink8k9nWOnSUCOGG0=";
|
||||
|
||||
env.CONCEAL_GEN_COMPLETIONS = "true";
|
||||
|
||||
|
||||
@@ -74,13 +74,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "elephant";
|
||||
version = "2.19.3";
|
||||
version = "2.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abenz1267";
|
||||
repo = "elephant";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IyHoHbhLFuIgFG+n7dqHwJaXuNnRaEsxCfAsfudV1KY=";
|
||||
hash = "sha256-r2ucLztXQFRu70VrGtNcL3PONyazxDPwq/hSn7opD+I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tO+5x2FIY1UBvWl9x3ZSpHwTWUlw1VNDTi9+2uY7xdU=";
|
||||
|
||||
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2026-02-26";
|
||||
version = "0-unstable-2026-03-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "aiyahm";
|
||||
repo = "FairyWren-Icons";
|
||||
rev = "fcffa4ea729bd046836d7b5430d112663eee36f5";
|
||||
hash = "sha256-3hAd0Z4f9Gbo+dFv3Ci3j3RRAwVdNobFlD0WtD+Z8gw=";
|
||||
rev = "07bcdd4e83c4d46a698a4af60b9b8acc422af39f";
|
||||
hash = "sha256-Gzr3AiVD+IFnJa3X3wp8CAFl6SL/gD3dCrFGMDHDMos=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "framework-tool";
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "framework-system";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wgleuZ0txkmv0+tyr31PiVTNyTSc+OPy/jJwL1Ryyu4=";
|
||||
hash = "sha256-lpd6686qN06WgJbs1PuCIFMRGEqBFtQqyVauKGG9jH4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-W+k/PAcdwl9mvajB9D4SUH4o5VqpeD/BnK6ZEJzPpmI=";
|
||||
cargoHash = "sha256-y17Qlw8D7XWcStJ/54h1ARgODg1htzf9FVKjFZGERss=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
install -Dm644 "50-goxlr.rules" "$out/etc/udev/rules.d/50-goxlr.rules"
|
||||
install -Dm644 "daemon/resources/goxlr-utility.png" "$out/share/icons/hicolor/48x48/apps/goxlr-utility.png"
|
||||
install -Dm644 "daemon/resources/goxlr-utility.svg" "$out/share/icons/hicolor/scalable/apps/goxlr-utility.svg"
|
||||
install -Dm644 "daemon/resources/goxlr-utility-large.png" "$out/share/pixmaps/goxlr-utility.png"
|
||||
install -Dm644 "daemon/resources/goxlr-utility-large.png" "$out/share/icons/hicolor/128x128/apps/goxlr-utility.png"
|
||||
install -Dm644 "daemon/resources/goxlr-utility.desktop" "$out/share/applications/goxlr-utility.desktop"
|
||||
substituteInPlace $out/share/applications/goxlr-utility.desktop \
|
||||
--replace-fail /usr/bin $out/bin
|
||||
|
||||
@@ -92,7 +92,7 @@ else
|
||||
''
|
||||
# Install .desktop files
|
||||
install -Dm444 ${appimageContents}/Hoppscotch.desktop $out/share/applications/hoppscotch.desktop
|
||||
install -Dm444 ${appimageContents}/Hoppscotch.png $out/share/pixmaps/hoppscotch.png
|
||||
install -Dm444 ${appimageContents}/Hoppscotch.png $out/share/icons/hicolor/256x256/apps/hoppscotch.png
|
||||
substituteInPlace $out/share/applications/hoppscotch.desktop \
|
||||
--replace-fail "hoppscotch-desktop" "hoppscotch"
|
||||
'';
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
mpfr,
|
||||
wavpack,
|
||||
kdePackages,
|
||||
imagemagick,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -40,6 +41,7 @@ stdenv.mkDerivation {
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
kdePackages.wrapQtAppsHook
|
||||
imagemagick
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -79,10 +81,11 @@ stdenv.mkDerivation {
|
||||
mkdir -p "$out/share/applications"
|
||||
mv ./usr/share/applications/* "$out/share/applications"
|
||||
|
||||
# pixmaps
|
||||
mkdir -p "$out/share/pixmaps"
|
||||
mv ./usr/share/pixmaps/* "$out/share/pixmaps"
|
||||
|
||||
# icons
|
||||
mkdir -p $out/share/icons/hicolor/96x96/apps
|
||||
install -D ./usr/share/pixmaps/hqplayer5client.png -t $out/share/icons/hicolor/128x128/apps
|
||||
install -D ./usr/share/pixmaps/hqplayer5desktop.png -t $out/share/icons/hicolor/128x128/apps
|
||||
magick ./usr/share/pixmaps/hqplayer5desktop-manual.png -resize 96x96 $out/share/icons/hicolor/96x96/apps/hqplayer5desktop-manual.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hyprviz";
|
||||
version = "0.8.1";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timasoft";
|
||||
repo = "hyprviz";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CzuCBeJWtfHvCcWtV7X6suTagx0Sw+OagleHwwlyEms=";
|
||||
hash = "sha256-73KcrKlnmdFNllRe7V3MO2FEn95G/pKtFNwRuIjCkew=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fg4bPn/18Pu7LUorF3egCeBd9di+3OmCQxTeWr1Pybw=";
|
||||
cargoHash = "sha256-gkLWqvd/4xVFkluv0Q16PjHUckHmMH9eoNxPU8qN+WE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
|
||||
$out/share/mime/packages/ideamaker.xml
|
||||
|
||||
install -D usr/share/ideamaker/icons/ideamaker-icon.png \
|
||||
$out/share/pixmaps/ideamaker.png
|
||||
$out/share/icons/hicolor/128x128/apps/ideamaker.png
|
||||
|
||||
ln -sf $out/usr/lib/x86_64-linux-gnu/ideamaker/ideamaker $out/bin/ideamaker
|
||||
|
||||
|
||||
@@ -43,12 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
}" \
|
||||
--add-flags "-Xmx256m -cp $out/share/${finalAttrs.pname}-${finalAttrs.version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
cp usr/share/applications/ipscan.desktop $out/share/applications/ipscan.desktop
|
||||
substituteInPlace $out/share/applications/ipscan.desktop --replace "/usr/bin" "$out/bin"
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp usr/share/pixmaps/ipscan.png $out/share/pixmaps/ipscan.png
|
||||
install -D usr/share/applications/ipscan.desktop -t $out/share/applications/
|
||||
substituteInPlace $out/share/applications/ipscan.desktop --replace-fail "Exec=sh /usr/bin/ipscan" "Exec=ipscan"
|
||||
install -D usr/share/pixmaps/ipscan.png -t $out/share/icons/hicolor/128x128/apps
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
install -Dm644 releases/${version}/jameica/jameica.jar $out/share/java/
|
||||
install -Dm644 plugin.xml $out/share/java/
|
||||
install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
|
||||
install -Dm644 build/jameica-icon.png $out/share/icons/hicolor/64x64/apps/jameica.png
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications/
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -39,7 +39,9 @@ stdenv.mkDerivation {
|
||||
|
||||
install -D linux-packaging/liberation-circuit.desktop $out/share/applications/liberation-circuit.desktop
|
||||
install -D linux-packaging/liberation-circuit.appdata.xml $out/share/metainfo/liberation-circuit.appdata.xml
|
||||
install -D linux-packaging/icon-256px.png $out/share/pixmaps/liberation-circuit.png
|
||||
install -D linux-packaging/icon-16px.png $out/share/icons/hicolor/16x16/apps/liberation-circuit.png
|
||||
install -D linux-packaging/icon-32px.png $out/share/icons/hicolor/32x32/apps/liberation-circuit.png
|
||||
install -D linux-packaging/icon-256px.png $out/share/icons/hicolor/256x256/apps/liberation-circuit.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "Binary firmware collection packaged by kernel.org";
|
||||
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
|
||||
license = lib.licenses.unfreeRedistributableFirmware;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fpletz ];
|
||||
priority = 6; # give precedence to kernel firmware
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
|
||||
|
||||
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
|
||||
--set-rpath ${lib.makeLibraryPath buildInputs} \
|
||||
$out/share/lorien/lorien
|
||||
|
||||
install -Dm644 images/lorien.png $out/share/pixmaps/lorien.png
|
||||
install -Dm644 images/lorien.png -t $out/share/icons/hicolor/64x64/apps
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -77,10 +77,10 @@ stdenv.mkDerivation {
|
||||
env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/applications $out/share/pixmaps $out/bin
|
||||
mkdir -p $out/share/applications $out/bin
|
||||
|
||||
cp deb/midisheetmusic.desktop $out/share/applications
|
||||
cp NotePair.png $out/share/pixmaps/midisheetmusic.png
|
||||
install -D NotePair.png $out/share/icons/hicolor/256x256/apps/midisheetmusic.png
|
||||
cp bin/Debug/MidiSheetMusic.exe $out/bin/.MidiSheetMusic.exe
|
||||
|
||||
makeWrapper ${mono}/bin/mono $out/bin/midisheetmusic.mono.exe \
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
||||
install -Dm755 {.,$out/bin}/Nanosaur
|
||||
wrapProgram $out/bin/Nanosaur --chdir "$out/share/Nanosaur"
|
||||
install -Dm644 $src/packaging/io.jor.nanosaur.desktop $out/share/applications/nanosaur.desktop
|
||||
install -Dm644 $src/packaging/io.jor.nanosaur.png $out/share/pixmaps/nanosaur-desktopicon.png
|
||||
install -Dm644 $src/packaging/io.jor.nanosaur.png -t $out/share/icons/hicolor/512x512/apps
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
||||
install -Dm755 {.,$out/bin}/Nanosaur2
|
||||
wrapProgram $out/bin/Nanosaur2 --chdir "$out/share/Nanosaur2"
|
||||
install -Dm644 $src/packaging/io.jor.nanosaur2.desktop $out/share/applications/nanosaur2.desktop
|
||||
install -Dm644 $src/packaging/io.jor.nanosaur2.png $out/share/pixmaps/nanosaur2.png
|
||||
install -Dm644 $src/packaging/io.jor.nanosaur2.png -t $out/share/icons/hicolor/256x256/apps
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation {
|
||||
--prefix PATH : ${neovim}/bin
|
||||
|
||||
# link .desktop file
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s ${unwrapped}/share/applications $out/share/applications
|
||||
ln -s ${unwrapped}/share/icons $out/share/icons
|
||||
'';
|
||||
|
||||
@@ -126,11 +126,11 @@ buildGoModule (finalAttrs: {
|
||||
''
|
||||
# assemble & adjust netbird.desktop files for the GUI
|
||||
+ lib.optionalString (stdenv.hostPlatform.isLinux && componentName == "ui") ''
|
||||
install -Dm644 "$src/client/ui/assets/netbird-systemtray-connected.png" "$out/share/pixmaps/netbird.png"
|
||||
install -Dm644 "$src/client/ui/assets/netbird-systemtray-connected.png" "$out/share/icons/hicolor/256x256/apps/netbird.png"
|
||||
install -Dm644 "$src/client/ui/build/netbird.desktop" "$out/share/applications/netbird.desktop"
|
||||
|
||||
substituteInPlace $out/share/applications/netbird.desktop \
|
||||
--replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/${component.binaryName}"
|
||||
--replace-fail "Exec=/usr/bin/netbird-ui" "Exec=${component.binaryName}"
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = lib.lists.optionals (component ? versionCheckProgramArg) [
|
||||
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
makeWrapper ${jre}/bin/java $out/bin/netlogo \
|
||||
--chdir $out/opt/netlogo \
|
||||
--add-flags "-jar netlogo-${finalAttrs.version}.jar"
|
||||
install -Dm644 ${desktopicon} $out/share/pixmaps/netlogo.png
|
||||
install -Dm644 ${desktopicon} $out/share/icons/hicolor/256x256/apps/netlogo.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -71,7 +71,7 @@ buildDotnetModule rec {
|
||||
install -D NetworkMiner/NetworkMiner.desktop $out/share/applications/NetworkMiner.desktop
|
||||
substituteInPlace $out/share/applications/NetworkMiner.desktop \
|
||||
--replace-fail "Icon=./Images/NetworkMiner_logo_313x313.png" "Icon=NetworkMiner"
|
||||
install -D NetworkMiner/networkminericon-96x96.png $out/share/pixmaps/NetworkMiner.png
|
||||
install -D NetworkMiner/networkminericon-96x96.png $out/share/icons/hicolor/96x96/apps/NetworkMiner.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -66,9 +66,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
++ [ libdbusmenu-gtk3 ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{applications,pixmaps}
|
||||
cp $src/nwg-panel-config.desktop nwg-processes.desktop $out/share/applications/
|
||||
cp $src/nwg-shell.svg $src/nwg-panel.svg nwg-processes.svg $out/share/pixmaps/
|
||||
install -D $src/nwg-panel-config.desktop nwg-processes.desktop -t $out/share/applications/
|
||||
install -D $src/nwg-shell.svg $src/nwg-panel.svg nwg-processes.svg -t $out/share/icons/hicolor/scalable/apps/
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
||||
install -Dm755 {.,$out/bin}/OttoMatic
|
||||
wrapProgram $out/bin/OttoMatic --chdir "$out/share/OttoMatic"
|
||||
install -Dm644 $src/packaging/io.jor.ottomatic.desktop $out/share/applications/io.jor.ottomatic.desktop
|
||||
install -Dm644 $src/packaging/io.jor.ottomatic.png $out/share/pixmaps/io.jor.ottomatic.png
|
||||
install -Dm644 $src/packaging/io.jor.ottomatic.png $out/share/icons/hicolor/512x512/apps/io.jor.ottomatic.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
ant,
|
||||
jdk,
|
||||
imagemagick,
|
||||
makeWrapper,
|
||||
wrapGAppsHook3,
|
||||
makeDesktopItem,
|
||||
@@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapGAppsHook3
|
||||
copyDesktopItems
|
||||
stripJavaArchivesHook
|
||||
imagemagick
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
@@ -45,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/icons/hicolor/96x96/apps
|
||||
install -Dm644 pattypan.jar -t $out/share/pattypan
|
||||
install -Dm644 src/pattypan/resources/logo.png $out/share/pixmaps/pattypan.png
|
||||
magick src/pattypan/resources/logo.png -resize 96x96 $out/share/icons/hicolor/96x96/apps/pattypan.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
lib,
|
||||
libGLU,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
qt5,
|
||||
}:
|
||||
|
||||
@@ -22,28 +23,29 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt5.wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
buildInputs = [
|
||||
libGLU
|
||||
qt5.qtbase
|
||||
];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "plater";
|
||||
exec = "plater";
|
||||
icon = "plater";
|
||||
desktopName = "Ideamaker";
|
||||
genericName = meta.description;
|
||||
categories = [
|
||||
"Utility"
|
||||
"Engineering"
|
||||
];
|
||||
};
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "plater";
|
||||
exec = "plater";
|
||||
icon = "plater";
|
||||
desktopName = "Ideamaker";
|
||||
genericName = meta.description;
|
||||
categories = [
|
||||
"Utility"
|
||||
"Engineering"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s ${desktopItem}/share/applications $out/share/
|
||||
cp $src/gui/img/plater.png $out/share/pixmaps/${pname}.png
|
||||
install -D $src/gui/img/plater.png -t $out/share/icons/hicolor/128x128/apps
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -75,11 +75,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "postfix";
|
||||
version = "3.10.8";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-MdSz64CT2CO1oVH1cXGf98BGJXG8leZEDYfKUlv7CWw=";
|
||||
hash = "sha256-Y2fcxrnWtETEodCen9o6vxR52IycQ0oxzVz+BvnDZic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp -R license $out/share/doc/projectlibre
|
||||
cp -R resources/samples/* $out/share/projectlibre/samples
|
||||
install -Dm644 resources/projectlibre.desktop -t $out/share/applications
|
||||
install -Dm644 resources/projectlibre.png -t $out/share/pixmaps
|
||||
install -Dm644 resources/projectlibre.png -t $out/share/icons/hicolor/128x128/apps
|
||||
install -Dm755 resources/projectlibre -t $out/bin
|
||||
popd
|
||||
|
||||
|
||||
@@ -74,8 +74,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/share/qgroundcontrol
|
||||
cp -rv resources/ $out/share/qgroundcontrol
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps
|
||||
install -D resources/icons/qgroundcontrol.png -t $out/share/icons/hicolor/128x128/apps
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -99,12 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/applications $out/share/pixmaps $out/share/icons
|
||||
|
||||
mkdir -p $out/bin $out/share/applications
|
||||
copyDesktopItems
|
||||
|
||||
cp ../srb2.png $out/share/pixmaps/.
|
||||
cp ../srb2.png $out/share/icons/.
|
||||
install -D ../srb2.png -t $out/share/icons/hicolor/256x256/apps
|
||||
|
||||
cp bin/lsdlsrb2 $out/bin/srb2
|
||||
wrapProgram $out/bin/srb2 --set SRB2WADDIR "${finalAttrs.assets}/share/srb2"
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stasis";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saltnpepper97";
|
||||
repo = "stasis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ILv0TY1x7DdZw+AqTSs1+TW8bdxlCIN0/tiLsAuIpXc=";
|
||||
hash = "sha256-Rq3JnZAYzysIPdcVVM/ctKBARPGxKzzae2owVwqNPt8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-reu0SJt5gQ/+XOx508PXzg9VL1+iBFwvUiyJyQC+oR0=";
|
||||
cargoHash = "sha256-wAuiD66MFoQoAxsDL2bGV1GIUn7mw2TVespuD1gJcuQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tideways-daemon";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
|
||||
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-T32SqZfpZBraQ/KaO1RhOBh7HjesK6KHopiWsw/lDjE=";
|
||||
hash = "sha256-eylOdAhPnB2x6h9k8lcErXuM8IRHME4zSrR6rwwVwgk=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-wzchxvmRWp8HF7MEoUbY/7nNAtR7nmhWamfxg1YiHv4=";
|
||||
hash = "sha256-Ymz7KyB1M0nhAbxvK5iWzRz0w+p9F3/UqkyKAyQazeg=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-W9Eyd7U01kghw7Zy6H9WUxtaEkEgbpDqdmI0RA0sOn8=";
|
||||
hash = "sha256-rKLNzmHP4K1JseV8FUYsmj48c7d2h2RikmWt3IFTAHY=";
|
||||
};
|
||||
};
|
||||
updateScript = "${
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DLUA_SUPPORT=on"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lcrypt";
|
||||
env.NIX_LDFLAGS = "-lcrypt";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/uhttpd \
|
||||
|
||||
@@ -20,16 +20,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "walker";
|
||||
version = "2.14.2";
|
||||
version = "2.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abenz1267";
|
||||
repo = "walker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-y1jBFFO0u+V21y3YldHZozrDwVJVrdC+o3c4M8/rasU=";
|
||||
hash = "sha256-8ybD6u78Em3Vbm+yFNa4mCxSDjr047Twcwo4jEz+3Uo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7QQdHbkwjVcZCd2FaBxLL5BUSoWjTsH1GuDhzh7DuRY=";
|
||||
cargoHash = "sha256-UrZw/FXBWIl2fQbGrTnT0ae7XEKdvuJXZuUeYFFgzrs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
@@ -60,9 +60,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
meta = {
|
||||
description = "Wayland-native application runner";
|
||||
homepage = "https://github.com/abenz1267/walker";
|
||||
changelog = "https://github.com/abenz1267/walker/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
adamcstephens
|
||||
donovanglover
|
||||
saadndm
|
||||
];
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
mypy-protobuf,
|
||||
|
||||
# dependencies
|
||||
evaluate,
|
||||
joblib,
|
||||
ninja,
|
||||
numpy,
|
||||
onnx,
|
||||
onnxscript,
|
||||
onnxslim,
|
||||
pandas,
|
||||
plotly,
|
||||
protobuf,
|
||||
pydantic,
|
||||
rich,
|
||||
scipy,
|
||||
sentencepiece,
|
||||
tqdm,
|
||||
zstandard,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "amd-quark";
|
||||
version = "0.11.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amd";
|
||||
repo = "Quark";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x0y3NFbXAF1SnlzQSkWKEWiz0qRPYHWvQ6oTizKpyQw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"protobuf-protoc-bin==31.1",' ""
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail 'subprocess.check_output(["git", "rev-parse", "--short", "HEAD"])' 'b"nix"'
|
||||
'';
|
||||
|
||||
env.QUARK_RELEASE = "1";
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
mypy-protobuf
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
evaluate
|
||||
joblib
|
||||
ninja
|
||||
numpy
|
||||
onnx
|
||||
onnxscript
|
||||
onnxslim
|
||||
pandas
|
||||
plotly
|
||||
protobuf
|
||||
pydantic
|
||||
rich
|
||||
scipy
|
||||
sentencepiece
|
||||
tqdm
|
||||
zstandard
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
pythonImportsCheck = [ "quark" ];
|
||||
|
||||
# Most of the tests require gpu and some other unspecified dependencies
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "AMD Quark Model Optimizer";
|
||||
homepage = "https://github.com/amd/Quark";
|
||||
changelog = "https://github.com/amd/Quark/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lach ];
|
||||
};
|
||||
})
|
||||
@@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
google-auth
|
||||
|
||||
@@ -26,6 +26,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
protobuf
|
||||
|
||||
@@ -24,6 +24,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -30,6 +30,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
|
||||
@@ -24,6 +24,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
pytest-xdist,
|
||||
torchvision,
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-0lQe5fWR4t3uAJVfGVebkxiWHx8TvgNQzJylKNmjjo0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
packaging
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-attachments";
|
||||
version = "10.0.1";
|
||||
version = "11.0.0b2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.pythonVersion != netbox.python.pythonVersion;
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Kani999";
|
||||
repo = "netbox-attachments";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZsK6RKYkfzn6YSS9ern9QxLsRdcwzt8BmMdYGJTMOKM=";
|
||||
hash = "sha256-TaEzYUhuBBXYoCmB6bY/1n8KzyaXNbOMRGiDbMDroLw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyturbojpeg";
|
||||
version = "2.0.0";
|
||||
version = "2.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lilohuang";
|
||||
repo = "PyTurboJPEG";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yITX+6mP8AihaTFjZG9A5U6pAUTdPy6UDbbjnznwuqI=";
|
||||
hash = "sha256-Sue8S/2/dY3aF7fihHuqpHXotcXcijcqAXGCJn8Z5VE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
legacy-cgi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "wfuzz";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmendez";
|
||||
repo = "wfuzz";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OYMZHo0ujRzwOcE+EKRNPxffxVbbiMHe+AqBz7q/u2A=";
|
||||
};
|
||||
|
||||
@@ -37,11 +37,6 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "pyparsing>=2.4*" "pyparsing>=2.4"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -80,7 +75,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/xmendez/wfuzz/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/xmendez/wfuzz/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Web content fuzzer to facilitate web applications assessments";
|
||||
longDescription = ''
|
||||
Wfuzz provides a framework to automate web applications security assessments
|
||||
@@ -91,4 +86,4 @@ buildPythonPackage rec {
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
maintainers = with lib.maintainers; [ pamplemousse ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
sys,
|
||||
buildFreebsd,
|
||||
linux-firmware,
|
||||
}:
|
||||
mkDerivation rec {
|
||||
# out-of-tree, but we still want to use freebsd.mkDerivation, which wants an in-tree path
|
||||
path = "...";
|
||||
|
||||
pname = "iwlwifi-firmware";
|
||||
version = linux-firmware.version;
|
||||
|
||||
# Upstream FreeBSD doesn't wrap wifi firmware, only gpu firmware.
|
||||
# We have to write our own build scripts for this.
|
||||
src = ./src;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"debug"
|
||||
];
|
||||
|
||||
extraNativeBuildInputs = [ buildFreebsd.xargs-j ];
|
||||
|
||||
env = sys.passthru.env;
|
||||
SYSDIR = "${sys.src}/sys";
|
||||
KERN_DEBUGDIR = "${builtins.placeholder "debug"}/lib/debug";
|
||||
KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel";
|
||||
KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel";
|
||||
KMODDIR = "${placeholder "out"}/kernel";
|
||||
|
||||
LINUX_FIRMWARE = "${linux-firmware}/lib/firmware";
|
||||
|
||||
# generates relocations the linker can't handle
|
||||
hardeningDisable = [
|
||||
"pic"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"DEBUG_FLAGS=-g"
|
||||
"XARGS_J=xargs-j"
|
||||
"NO_XREF=1"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
bash gen-makefiles
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Intel Wifi Firmware for FreeBSD";
|
||||
platforms = lib.platforms.freebsd;
|
||||
license = linux-firmware.meta.license;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
KMOD= ${NAME}
|
||||
|
||||
FIRMWS= ${NAME}:${NAME}
|
||||
|
||||
CLEANFILES+= ${NAME} ${NAME}.fwo ${NAME}.ko.debug ${NAME}.ko.full
|
||||
|
||||
${NAME}: ${LINUX_FIRMWARE}/intel/iwlwifi/${NAME}
|
||||
cp $? ${.TARGET}
|
||||
@@ -0,0 +1,26 @@
|
||||
set -e
|
||||
|
||||
scriptdir=$(cd $(dirname $0) && pwd)
|
||||
fwdir=$LINUX_FIRMWARE/intel/iwlwifi
|
||||
|
||||
for dir in $scriptdir/*; do
|
||||
if [ ! -d "$dir" ]; then
|
||||
continue
|
||||
fi
|
||||
rm -rf "$dir"
|
||||
done
|
||||
|
||||
for file in $fwdir/*.*; do
|
||||
base=$(basename $file)
|
||||
|
||||
echo "SUBDIR += $base" >> Makefile
|
||||
|
||||
mkdir -p "$scriptdir/$base"
|
||||
cat > "$scriptdir/$base/Makefile" <<EOF
|
||||
NAME= $base
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
EOF
|
||||
done
|
||||
|
||||
echo ".include <bsd.subdir.mk>" >> Makefile
|
||||
@@ -714,6 +714,8 @@ self: super: with self; {
|
||||
|
||||
amcrest = callPackage ../development/python-modules/amcrest { };
|
||||
|
||||
amd-quark = callPackage ../development/python-modules/amd-quark { };
|
||||
|
||||
amdsmi = toPythonModule (
|
||||
pkgs.rocmPackages.amdsmi.override {
|
||||
inherit python;
|
||||
|
||||
Reference in New Issue
Block a user