Merge staging-next into staging
This commit is contained in:
@@ -99,17 +99,12 @@ failure. To prevent this, guard the completion generation commands.
|
||||
```nix
|
||||
{
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
|
||||
let
|
||||
emulator = stdenv.hostPlatform.emulator buildPackages;
|
||||
in
|
||||
''
|
||||
# using named fd
|
||||
installShellCompletion --cmd foobar \
|
||||
--bash <(${emulator} $out/bin/foobar --bash-completion) \
|
||||
--fish <(${emulator} $out/bin/foobar --fish-completion) \
|
||||
--zsh <(${emulator} $out/bin/foobar --zsh-completion)
|
||||
''
|
||||
);
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# using named fd
|
||||
installShellCompletion --cmd foobar \
|
||||
--bash <($out/bin/foobar --bash-completion) \
|
||||
--fish <($out/bin/foobar --fish-completion) \
|
||||
--zsh <($out/bin/foobar --zsh-completion)
|
||||
'';
|
||||
}
|
||||
```
|
||||
|
||||
@@ -354,6 +354,10 @@
|
||||
|
||||
- `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement.
|
||||
|
||||
- `rocmPackages_6` has been updated to ROCm 6.3.
|
||||
|
||||
- `rocmPackages_5` has been removed.
|
||||
|
||||
- `rocmPackages.rocm-thunk` has been removed and its functionality has been integrated with the ROCm CLR. Use `rocmPackages.clr` instead.
|
||||
|
||||
- `rocmPackages.clang-ocl` has been removed. [It was deprecated by AMD in 2023.](https://github.com/ROCm/clang-ocl)
|
||||
|
||||
@@ -2,4 +2,10 @@
|
||||
|
||||
makeInstalledTest {
|
||||
tested = pkgs.libxmlb;
|
||||
|
||||
testConfig = {
|
||||
environment.variables = {
|
||||
G_TEST_SRCDIR = "${pkgs.libxmlb.installedTests}/libexec/installed-tests/libxmlb";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -44,23 +44,33 @@
|
||||
|
||||
with subtest("lomiri calendar launches"):
|
||||
machine.succeed("lomiri-calendar-app >&2 &")
|
||||
machine.wait_for_text(r"(January|February|March|April|May|June|July|August|September|October|November|December)")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(2)
|
||||
# Default page is unbearably slow to OCR on, switch to another
|
||||
machine.succeed("xdotool mousemove 580 50 click 1")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text(r"(January|February|March|April|May|June|July|August|September|October|November|December|Mon|Tue|Wed|Thu|Fri|Sat|Sun)")
|
||||
machine.screenshot("lomiri-calendar")
|
||||
|
||||
with subtest("lomiri calendar works"):
|
||||
# Switch to Agenda tab, less busy
|
||||
machine.succeed("xdotool mousemove 300 50 click 1")
|
||||
machine.succeed("xdotool mousemove 380 50 click 1")
|
||||
machine.sleep(2)
|
||||
|
||||
# Still on main page
|
||||
machine.succeed("xdotool mousemove 500 650 click 1")
|
||||
machine.succeed("xdotool mousemove 500 720 click 1")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text(r"(Date|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday|All day|Name|Details|More)")
|
||||
machine.screenshot("lomiri-calendar_newevent")
|
||||
|
||||
# On New Event page
|
||||
machine.succeed("xdotool mousemove 500 230 click 1")
|
||||
machine.sleep(2)
|
||||
machine.send_chars("foobar")
|
||||
machine.sleep(2) # make sure they're actually in there
|
||||
machine.succeed("xdotool mousemove 780 40 click 1")
|
||||
machine.succeed("xdotool mousemove 1000 40 click 1")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text("Agenda")
|
||||
machine.screenshot("lomiri-calendar_eventadded")
|
||||
|
||||
@@ -73,6 +83,9 @@
|
||||
|
||||
with subtest("lomiri calendar localisation works"):
|
||||
machine.succeed("env LANG=de_DE.UTF-8 lomiri-calendar-app >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text(r"(Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|Sonntag)")
|
||||
machine.screenshot("lomiri-calendar_localised")
|
||||
'';
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
testScript =
|
||||
let
|
||||
qrLabel = "Image";
|
||||
qrLabel = "Feed";
|
||||
qrContent = "Test";
|
||||
in
|
||||
''
|
||||
@@ -55,6 +55,10 @@
|
||||
|
||||
with subtest("lomiri camera launches"):
|
||||
machine.succeed("lomiri-camera-app >&2 &")
|
||||
machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("Cannot access")
|
||||
machine.screenshot("lomiri-camera_open")
|
||||
|
||||
@@ -64,21 +68,26 @@
|
||||
machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1")
|
||||
machine.succeed("qrtool encode '${qrContent}' -s 20 -m 10 > qr.png")
|
||||
# Horizontal flip, add text, flip back. Camera displays image mirrored, so need reversed text for OCR
|
||||
machine.succeed("magick qr.png -flop -pointsize 70 -fill black -annotate +100+100 '${qrLabel}' -flop output.png")
|
||||
machine.succeed("magick qr.png -flop -pointsize 30 -fill black -annotate +100+100 '${qrLabel}' -flop output.png")
|
||||
machine.succeed("ffmpeg -re -loop 1 -i output.png -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &")
|
||||
|
||||
with subtest("lomiri camera uses camera"):
|
||||
machine.succeed("lomiri-camera-app >&2 &")
|
||||
machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("${qrLabel}")
|
||||
machine.screenshot("lomiri-camera_feed")
|
||||
|
||||
machine.succeed("xdotool mousemove 320 610 click 1") # take photo
|
||||
machine.wait_until_succeeds("find /root/Pictures/camera.ubports -name '*.jpg'")
|
||||
machine.succeed("xdotool mousemove 510 670 click 1") # take photo
|
||||
machine.wait_until_succeeds("ls /root/Pictures/camera.ubports | grep '\\.jpg$'")
|
||||
|
||||
# Check that the image is correct
|
||||
machine.send_key("ctrl-alt-right")
|
||||
machine.succeed("magick /root/Pictures/camera.ubports/IMG_00000001.jpg -flop photo_flip.png")
|
||||
machine.succeed("feh photo_flip.png >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.wait_for_text("${qrLabel}")
|
||||
machine.screenshot("lomiri-camera_photo")
|
||||
|
||||
@@ -88,18 +97,25 @@
|
||||
|
||||
with subtest("lomiri barcode scanner uses camera"):
|
||||
machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &")
|
||||
machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("${qrLabel}")
|
||||
machine.succeed("xdotool mousemove 320 610 click 1") # open up QR decode result
|
||||
machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result
|
||||
|
||||
# OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else
|
||||
machine.sleep(5)
|
||||
machine.screenshot("lomiri-barcode_decode")
|
||||
machine.succeed("xdotool mousemove 350 530 click 1")
|
||||
machine.succeed("xdotool mousemove 540 590 click 1")
|
||||
machine.sleep(5)
|
||||
|
||||
# Need to make a new window without closing camera app, otherwise clipboard content gets lost?
|
||||
machine.send_key("ctrl-alt-right")
|
||||
machine.succeed("gnome-text-editor >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("New")
|
||||
|
||||
# Font size up to help with OCR
|
||||
@@ -129,6 +145,10 @@
|
||||
|
||||
with subtest("lomiri camera localisation works"):
|
||||
machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &")
|
||||
machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("Kamera")
|
||||
machine.screenshot("lomiri-camera_localised")
|
||||
'';
|
||||
|
||||
@@ -34,14 +34,20 @@
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("lomiri clock launches"):
|
||||
machine.execute("lomiri-clock-app >&2 &")
|
||||
machine.succeed("lomiri-clock-app >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text(r"(clock.ubports|City|Alarms)")
|
||||
machine.screenshot("lomiri-clock_open")
|
||||
|
||||
machine.succeed("pkill -f lomiri-clock-app")
|
||||
|
||||
with subtest("lomiri clock localisation works"):
|
||||
machine.execute("env LANG=de_DE.UTF-8 lomiri-clock-app >&2 &")
|
||||
machine.succeed("env LANG=de_DE.UTF-8 lomiri-clock-app >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text(r"(Stadt|Weckzeiten)")
|
||||
machine.screenshot("lomiri-clock_localised")
|
||||
'';
|
||||
|
||||
@@ -46,6 +46,9 @@ in
|
||||
|
||||
with subtest("lomiri docviewer launches"):
|
||||
machine.succeed("lomiri-docviewer-app >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("No documents")
|
||||
machine.screenshot("lomiri-docviewer_open")
|
||||
|
||||
@@ -57,6 +60,9 @@ in
|
||||
|
||||
with subtest("lomiri docviewer txt works"):
|
||||
machine.succeed("lomiri-docviewer-app /etc/docviewer-sampletext.txt >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("${exampleText}")
|
||||
machine.screenshot("lomiri-docviewer_txt")
|
||||
|
||||
@@ -64,6 +70,9 @@ in
|
||||
|
||||
with subtest("lomiri docviewer odt works"):
|
||||
machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.odt >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("${exampleText}")
|
||||
machine.screenshot("lomiri-docviewer_odt")
|
||||
|
||||
@@ -71,6 +80,9 @@ in
|
||||
|
||||
with subtest("lomiri docviewer pdf works"):
|
||||
machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.pdf >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("${exampleText}")
|
||||
machine.screenshot("lomiri-docviewer_pdf")
|
||||
|
||||
@@ -78,6 +90,9 @@ in
|
||||
|
||||
with subtest("lomiri docviewer localisation works"):
|
||||
machine.succeed("env LANG=de_DE.UTF-8 lomiri-docviewer-app >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("Keine Dokumente")
|
||||
machine.screenshot("lomiri-docviewer_localised")
|
||||
'';
|
||||
|
||||
@@ -59,8 +59,15 @@
|
||||
machine.succeed("mkdir /root/Pictures /root/Videos")
|
||||
# Setup example data, OCR-friendly:
|
||||
# - White square, black text
|
||||
# - Small text for display OCR
|
||||
# - Big text for gallery preview OCR
|
||||
# - uppercase extension
|
||||
machine.succeed("magick -size 500x500 -background white -fill black canvas:white -pointsize 70 -annotate +100+300 '${imageLabel}' /root/Pictures/output.PNG")
|
||||
machine.succeed(
|
||||
"magick -size 500x500 -background white -fill black canvas:white "
|
||||
+ "-pointsize 20 -annotate +100+100 '${imageLabel}' "
|
||||
+ "-pointsize 50 -annotate +100+300 '${imageLabel}' "
|
||||
+ "/root/Pictures/output.PNG"
|
||||
)
|
||||
|
||||
# Different image formats
|
||||
machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.JPG")
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, ... }:
|
||||
let
|
||||
ocrContent = "Video Test";
|
||||
ocrContent = "Feed";
|
||||
videoFile = "test.webm";
|
||||
in
|
||||
{
|
||||
@@ -25,8 +25,8 @@ in
|
||||
];
|
||||
}
|
||||
''
|
||||
magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png
|
||||
ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 100K -t 120 $out -loglevel fatal
|
||||
magick -size 600x600 canvas:white -pointsize 20 -fill black -annotate +100+100 '${ocrContent}' output.png
|
||||
ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 200K -t 120 $out -loglevel fatal
|
||||
'';
|
||||
systemPackages = with pkgs.lomiri; [
|
||||
suru-icon-theme
|
||||
@@ -54,6 +54,8 @@ in
|
||||
|
||||
with subtest("lomiri mediaplayer launches"):
|
||||
machine.succeed("lomiri-mediaplayer-app >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.wait_for_text("Choose from")
|
||||
machine.screenshot("lomiri-mediaplayer_open")
|
||||
|
||||
@@ -61,6 +63,8 @@ in
|
||||
|
||||
with subtest("lomiri mediaplayer plays video"):
|
||||
machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.wait_for_text("${ocrContent}")
|
||||
machine.screenshot("lomiri-mediaplayer_playback")
|
||||
|
||||
@@ -71,6 +75,8 @@ in
|
||||
# Cause an error, and look for the error popup
|
||||
machine.succeed("touch invalid.mp4")
|
||||
machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.wait_for_text("Fehler")
|
||||
machine.screenshot("lomiri-mediaplayer_localised")
|
||||
'';
|
||||
|
||||
@@ -140,8 +140,10 @@ in
|
||||
|
||||
with subtest("lomiri music launches"):
|
||||
machine.succeed("lomiri-music-app >&2 &")
|
||||
machine.wait_for_text("favorite music")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text("favorite music")
|
||||
machine.screenshot("lomiri-music")
|
||||
|
||||
with subtest("lomiri music plays music"):
|
||||
@@ -187,6 +189,9 @@ in
|
||||
|
||||
with subtest("lomiri music localisation works"):
|
||||
machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text("Titel")
|
||||
machine.screenshot("lomiri-music_localised")
|
||||
'';
|
||||
|
||||
@@ -109,7 +109,11 @@
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("lomiri system settings launches"):
|
||||
machine.execute("lomiri-system-settings >&2 &")
|
||||
machine.succeed("lomiri-system-settings >&2 &")
|
||||
machine.wait_for_console_text("qml: Plugin about does not exist")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("System Settings")
|
||||
machine.screenshot("lss_open")
|
||||
|
||||
@@ -137,7 +141,11 @@
|
||||
machine.execute("pkill -f lomiri-system-settings")
|
||||
|
||||
with subtest("lomiri system settings localisation works"):
|
||||
machine.execute("env LANG=de_DE.UTF-8 lomiri-system-settings >&2 &")
|
||||
machine.succeed("env LANG=de_DE.UTF-8 lomiri-system-settings >&2 &")
|
||||
machine.wait_for_console_text("qml: Plugin about does not exist")
|
||||
machine.sleep(10)
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(5)
|
||||
machine.wait_for_text("Systemeinstellungen")
|
||||
machine.screenshot("lss_localised_open")
|
||||
|
||||
|
||||
@@ -34,14 +34,20 @@
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("teleports launches"):
|
||||
machine.execute("teleports >&2 &")
|
||||
machine.succeed("teleports >&2 &")
|
||||
machine.wait_for_console_text("authorizationStateWaitPhoneNumber")
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text(r"(TELEports|Phone Number)")
|
||||
machine.screenshot("teleports_open")
|
||||
|
||||
machine.succeed("pkill -f teleports")
|
||||
|
||||
with subtest("teleports localisation works"):
|
||||
machine.execute("env LANG=de_DE.UTF-8 teleports >&2 &")
|
||||
machine.succeed("env LANG=de_DE.UTF-8 teleports >&2 &")
|
||||
machine.wait_for_console_text("authorizationStateWaitPhoneNumber")
|
||||
machine.send_key("alt-f10")
|
||||
machine.sleep(2)
|
||||
machine.wait_for_text("Telefonnummer")
|
||||
machine.screenshot("teleports_localised")
|
||||
'';
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2025-05-02";
|
||||
version = "0-unstable-2025-05-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "2d2a3682695b0cfa49934f29a34adabbe9470db5";
|
||||
hash = "sha256-yPFeVSK3yUhD0e7/7WftMJ3hx3ZAOMhB8zuYJ3uKwZY=";
|
||||
rev = "96d27505b8332bac1bac7b8f02c049b1cc0ca800";
|
||||
hash = "sha256-dX8aH5zGcrCJc/hG/4Yfzv/O2jy8h+HB8pVwI3qPXEY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
@@ -14,15 +14,13 @@
|
||||
laszip,
|
||||
mpfr,
|
||||
pcl,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
tbb,
|
||||
xercesc,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cloudcompare";
|
||||
version = "2.13.2";
|
||||
|
||||
@@ -39,6 +37,7 @@ mkDerivation rec {
|
||||
eigen # header-only
|
||||
wrapGAppsHook3
|
||||
copyDesktopItems
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -50,9 +49,9 @@ mkDerivation rec {
|
||||
laszip
|
||||
mpfr
|
||||
pcl
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qttools
|
||||
tbb
|
||||
xercesc
|
||||
];
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkDerivation,
|
||||
fetchurl,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
pkg-config,
|
||||
djvulibre,
|
||||
qtbase,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
xorg,
|
||||
libtiff,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "djview";
|
||||
version = "4.12";
|
||||
|
||||
@@ -33,12 +31,13 @@ mkDerivation rec {
|
||||
automake
|
||||
libtool
|
||||
pkg-config
|
||||
qttools
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
djvulibre
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
xorg.libXt
|
||||
libtiff
|
||||
];
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
lib,
|
||||
jre,
|
||||
qt5,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -20,7 +19,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qt5.qtbase
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
python3Packages.setuptools
|
||||
python3Packages.rfc3987
|
||||
python3Packages.jpype1
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
libpng,
|
||||
giflib,
|
||||
libjpeg,
|
||||
@@ -28,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
libpng
|
||||
giflib
|
||||
libjpeg
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qttools,
|
||||
qtwebkit,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fontmatrix";
|
||||
version = "0.9.100";
|
||||
|
||||
@@ -19,11 +18,14 @@ mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qttools
|
||||
qtwebkit
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtwebkit
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
|
||||
|
||||
@@ -2,15 +2,18 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
mkDerivation,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fstl";
|
||||
version = "0.11.0";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
mkDerivation,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
stdenv.mkDerivation {
|
||||
pname = "glabels-qt";
|
||||
version = "unstable-2021-02-06";
|
||||
|
||||
@@ -19,7 +19,8 @@ mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
libraw,
|
||||
exiv2,
|
||||
zlib,
|
||||
@@ -14,7 +13,7 @@
|
||||
copyDesktopItems,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdrmerge";
|
||||
version = "0.5.0-unstable-2024-08-02";
|
||||
src = fetchFromGitHub {
|
||||
@@ -27,12 +26,12 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
libraw
|
||||
exiv2
|
||||
zlib
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonApplication,
|
||||
pythonOlder,
|
||||
pillow,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "imgp";
|
||||
version = "2.9";
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = python3Packages.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
@@ -18,7 +16,7 @@ buildPythonApplication rec {
|
||||
hash = "sha256-yQ2BzOBn6Bl9ieZkREKsj1zLnoPcf0hZhZ90Za5kiKA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pillow ];
|
||||
propagatedBuildInputs = [ python3Packages.pillow ];
|
||||
|
||||
installFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
|
||||
@@ -74,11 +74,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "inkscape";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-dHlqivThSg1dXBzFjT7B6m1IigQwbdbo0ywR8HSNcjI=";
|
||||
sha256 = "sha256-IABTDHkX5SYMnoV1pxVP9pJmQ9IAZIfXFOMEqWPwx4I=";
|
||||
};
|
||||
|
||||
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivationWith,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
libsForQt5,
|
||||
p7zip,
|
||||
archiveSupport ? true,
|
||||
}:
|
||||
|
||||
mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "kcc";
|
||||
version = "5.5.1";
|
||||
|
||||
@@ -17,6 +17,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pillow
|
||||
pyqt5
|
||||
|
||||
@@ -1,24 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
kconfig,
|
||||
kinit,
|
||||
kdoctools,
|
||||
kio,
|
||||
kparts,
|
||||
kwidgetsaddons,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
libsForQt5,
|
||||
boost,
|
||||
graphviz,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kgraphviewer";
|
||||
version = "2.4.3";
|
||||
|
||||
@@ -28,8 +21,8 @@ mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
boost
|
||||
graphviz
|
||||
];
|
||||
@@ -39,10 +32,11 @@ mkDerivation rec {
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
kdoctools
|
||||
libsForQt5.kdoctools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with libsForQt5; [
|
||||
kconfig
|
||||
kinit
|
||||
kio
|
||||
|
||||
@@ -4,12 +4,9 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
poppler,
|
||||
gnuplot,
|
||||
qmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
}:
|
||||
|
||||
# This package only builds ktikz without KDE integration because KDE4 is
|
||||
@@ -54,15 +51,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qttools
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
QT_PLUGIN_PATH = "${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}";
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
poppler
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.poppler
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
|
||||
@@ -4,12 +4,10 @@
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
povray,
|
||||
qmake,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
replaceVars,
|
||||
zlib,
|
||||
testers,
|
||||
wrapQtAppsHook,
|
||||
nix-update-script,
|
||||
libGL,
|
||||
}:
|
||||
@@ -38,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
@@ -14,14 +14,11 @@
|
||||
libraw,
|
||||
libtiff,
|
||||
openexr,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
qttools,
|
||||
qtwebengine,
|
||||
libsForQt5,
|
||||
eigen,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luminance-hdr";
|
||||
version = "2.6.1.1";
|
||||
|
||||
@@ -43,10 +40,10 @@ mkDerivation rec {
|
||||
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qttools
|
||||
qtwebengine
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtdeclarative
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtwebengine
|
||||
eigen
|
||||
boost
|
||||
exiv2
|
||||
@@ -60,6 +57,7 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.wrapQtAppsHook
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libpng,
|
||||
gsl,
|
||||
libsndfile,
|
||||
lzo,
|
||||
qmake,
|
||||
qttools,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
libsForQt5,
|
||||
withOpenCL ? true,
|
||||
opencl-clhpp ? null,
|
||||
ocl-icd ? null,
|
||||
@@ -18,7 +15,7 @@
|
||||
assert withOpenCL -> opencl-clhpp != null;
|
||||
assert withOpenCL -> ocl-icd != null;
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mandelbulber";
|
||||
version = "2.32";
|
||||
|
||||
@@ -30,13 +27,14 @@ mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
qtbase
|
||||
qtmultimedia
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
libpng
|
||||
gsl
|
||||
libsndfile
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libsForQt5,
|
||||
libGLU,
|
||||
qtbase,
|
||||
qtscript,
|
||||
qtxmlpatterns,
|
||||
lib3ds,
|
||||
bzip2,
|
||||
muparser,
|
||||
@@ -43,7 +41,7 @@ let
|
||||
hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58=";
|
||||
};
|
||||
in
|
||||
mkDerivation {
|
||||
stdenv.mkDerivation {
|
||||
pname = "meshlab-unstable";
|
||||
version = "2023.12-unstable-2025-02-21";
|
||||
|
||||
@@ -59,9 +57,9 @@ mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
libGLU
|
||||
qtbase
|
||||
qtscript
|
||||
qtxmlpatterns
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtscript
|
||||
libsForQt5.qtxmlpatterns
|
||||
lib3ds
|
||||
bzip2
|
||||
muparser
|
||||
@@ -82,7 +80,10 @@ mkDerivation {
|
||||
structuresynth
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir src/external/downloads
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libsForQt5,
|
||||
libGLU,
|
||||
qtbase,
|
||||
qtscript,
|
||||
qtxmlpatterns,
|
||||
lib3ds,
|
||||
bzip2,
|
||||
muparser,
|
||||
@@ -36,7 +34,7 @@ let
|
||||
hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
|
||||
};
|
||||
in
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meshlab";
|
||||
version = "2023.12";
|
||||
|
||||
@@ -49,9 +47,9 @@ mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
libGLU
|
||||
qtbase
|
||||
qtscript
|
||||
qtxmlpatterns
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtscript
|
||||
libsForQt5.qtxmlpatterns
|
||||
lib3ds
|
||||
bzip2
|
||||
muparser
|
||||
@@ -73,7 +71,10 @@ mkDerivation rec {
|
||||
structuresynth
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
|
||||
|
||||
@@ -4,16 +4,11 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qtbase,
|
||||
qtxmlpatterns,
|
||||
qttools,
|
||||
qtwebengine,
|
||||
libsForQt5,
|
||||
libGL,
|
||||
fontconfig,
|
||||
openssl,
|
||||
poppler,
|
||||
wrapQtAppsHook,
|
||||
ffmpeg,
|
||||
libva,
|
||||
alsa-lib,
|
||||
@@ -27,7 +22,6 @@
|
||||
lame,
|
||||
fdk_aac,
|
||||
libass,
|
||||
quazip,
|
||||
libXext,
|
||||
libXfixes,
|
||||
}:
|
||||
@@ -44,8 +38,11 @@ let
|
||||
sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase ];
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase = ''
|
||||
@@ -79,14 +76,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtxmlpatterns
|
||||
qttools
|
||||
qtwebengine
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtxmlpatterns
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtwebengine
|
||||
libGL
|
||||
fontconfig
|
||||
openssl
|
||||
@@ -104,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lame
|
||||
fdk_aac
|
||||
libass
|
||||
quazip
|
||||
libsForQt5.quazip
|
||||
libXext
|
||||
libXfixes
|
||||
];
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
qscintilla,
|
||||
libsForQt5,
|
||||
bison,
|
||||
flex,
|
||||
eigen,
|
||||
@@ -26,21 +24,17 @@
|
||||
double-conversion,
|
||||
lib3mf,
|
||||
libzip,
|
||||
mkDerivation,
|
||||
qtmacextras,
|
||||
qmake,
|
||||
spacenavSupport ? stdenv.hostPlatform.isLinux,
|
||||
libspnav,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wrapGAppsHook3,
|
||||
qtwayland,
|
||||
cairo,
|
||||
openscad,
|
||||
runCommand,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openscad";
|
||||
version = "2021.01";
|
||||
|
||||
@@ -95,7 +89,8 @@ mkDerivation rec {
|
||||
flex
|
||||
pkg-config
|
||||
gettext
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
@@ -115,9 +110,9 @@ mkDerivation rec {
|
||||
double-conversion
|
||||
freetype
|
||||
fontconfig
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qscintilla
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qscintilla
|
||||
cairo
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
@@ -125,9 +120,9 @@ mkDerivation rec {
|
||||
libGL
|
||||
wayland
|
||||
wayland-protocols
|
||||
qtwayland
|
||||
libsForQt5.qtwayland
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin libsForQt5.qtmacextras
|
||||
++ lib.optional spacenavSupport libspnav;
|
||||
|
||||
qmakeFlags =
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
libglut,
|
||||
freetype,
|
||||
glew,
|
||||
libsForQt5,
|
||||
libjpeg,
|
||||
libmypaint,
|
||||
libpng,
|
||||
@@ -15,14 +16,9 @@
|
||||
openblas,
|
||||
opencv,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
qtscript,
|
||||
qtserialport,
|
||||
lib,
|
||||
stdenv,
|
||||
superlu,
|
||||
wrapQtAppsHook,
|
||||
libtiff,
|
||||
zlib,
|
||||
}:
|
||||
@@ -103,7 +99,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -121,10 +117,10 @@ stdenv.mkDerivation {
|
||||
lzo
|
||||
openblas
|
||||
opentoonz-opencv
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtscript
|
||||
qtserialport
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtscript
|
||||
libsForQt5.qtserialport
|
||||
superlu
|
||||
];
|
||||
|
||||
|
||||
@@ -14,14 +14,8 @@
|
||||
netcdf,
|
||||
openssl,
|
||||
python3,
|
||||
qscintilla,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
qt6Packages,
|
||||
copyDesktopItems,
|
||||
# needed to run natively on wayland
|
||||
qtwayland,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -39,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
qt6Packages.wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
@@ -53,11 +47,12 @@ stdenv.mkDerivation rec {
|
||||
netcdf
|
||||
openssl
|
||||
python3
|
||||
qscintilla
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
qtwayland
|
||||
qt6Packages.qscintilla
|
||||
qt6Packages.qtbase
|
||||
qt6Packages.qtsvg
|
||||
qt6Packages.qttools
|
||||
# needed to run natively on wayland
|
||||
qt6Packages.qtwayland
|
||||
];
|
||||
|
||||
# manually create a desktop file
|
||||
|
||||
@@ -6,12 +6,7 @@
|
||||
boost,
|
||||
cmake,
|
||||
ffmpeg,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtx11extras,
|
||||
qttools,
|
||||
qtxmlpatterns,
|
||||
qtsvg,
|
||||
libsForQt5,
|
||||
gdal,
|
||||
gfortran,
|
||||
libXt,
|
||||
@@ -62,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Find the Qt platform plugin "minimal"
|
||||
preConfigure = ''
|
||||
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -88,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper
|
||||
ninja
|
||||
gfortran
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -100,11 +95,11 @@ stdenv.mkDerivation rec {
|
||||
boost
|
||||
ffmpeg
|
||||
gdal
|
||||
qtbase
|
||||
qtx11extras
|
||||
qttools
|
||||
qtxmlpatterns
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtx11extras
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtxmlpatterns
|
||||
libsForQt5.qtsvg
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
graphicsmagick,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
graphicsmagick,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "photoflare";
|
||||
version = "1.6.13";
|
||||
|
||||
@@ -20,11 +18,12 @@ mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
graphicsmagick
|
||||
];
|
||||
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
exiv2,
|
||||
}:
|
||||
|
||||
@@ -29,11 +27,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
exiv2
|
||||
];
|
||||
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
pygobject3,
|
||||
pycairo,
|
||||
python3Packages,
|
||||
glib,
|
||||
gtk3,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
python3Packages.buildPythonPackage {
|
||||
pname = "pick-colour-picker";
|
||||
version = "unstable-2022-05-08";
|
||||
|
||||
@@ -32,7 +30,7 @@ buildPythonPackage {
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
pythonPath = with python3Packages; [
|
||||
pygobject3
|
||||
pycairo
|
||||
];
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qtsvg,
|
||||
qttools,
|
||||
exiv2,
|
||||
wrapQtAppsHook,
|
||||
cmake,
|
||||
qt6Packages,
|
||||
exiv2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -22,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
qt6Packages.qttools
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtsvg
|
||||
qt6Packages.qtsvg
|
||||
exiv2
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
stdenv,
|
||||
lib,
|
||||
requireFile,
|
||||
wrapQtAppsHook,
|
||||
autoPatchelfHook,
|
||||
unixtools,
|
||||
fakeroot,
|
||||
@@ -31,20 +30,7 @@
|
||||
gdk-pixbuf,
|
||||
gtk3,
|
||||
pango,
|
||||
# Qt 6 subpackages
|
||||
qtbase,
|
||||
qtserialport,
|
||||
qtserialbus,
|
||||
qtvirtualkeyboard,
|
||||
qtmultimedia,
|
||||
qt3d,
|
||||
mlt,
|
||||
qtlocation,
|
||||
qtwebengine,
|
||||
qtquick3d,
|
||||
qtwayland,
|
||||
qtwebview,
|
||||
qtscxml,
|
||||
qt6Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -68,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
unixtools.script
|
||||
fakeroot
|
||||
wrapQtAppsHook
|
||||
qt6Packages.wrapQtAppsHook
|
||||
autoPatchelfHook
|
||||
mailcap
|
||||
libudev0-shim
|
||||
@@ -102,20 +88,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk3
|
||||
pango
|
||||
# Qt stuff
|
||||
qt3d
|
||||
mlt
|
||||
qtbase
|
||||
qt6Packages.qt3d
|
||||
qt6Packages.mlt
|
||||
qt6Packages.qtbase
|
||||
#qtgamepad
|
||||
qtserialport
|
||||
qtserialbus
|
||||
qtvirtualkeyboard
|
||||
qtmultimedia
|
||||
qtlocation
|
||||
qtwebengine
|
||||
qtquick3d
|
||||
qtwayland
|
||||
qtwebview
|
||||
qtscxml
|
||||
qt6Packages.qtserialport
|
||||
qt6Packages.qtserialbus
|
||||
qt6Packages.qtvirtualkeyboard
|
||||
qt6Packages.qtmultimedia
|
||||
qt6Packages.qtlocation
|
||||
qt6Packages.qtwebengine
|
||||
qt6Packages.qtquick3d
|
||||
qt6Packages.qtwayland
|
||||
qt6Packages.qtwebview
|
||||
qt6Packages.qtscxml
|
||||
]
|
||||
++ (with xorg; [
|
||||
libX11
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtx11extras,
|
||||
poppler,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qcomicbook";
|
||||
version = "0.9.1";
|
||||
|
||||
@@ -24,13 +21,14 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtx11extras
|
||||
poppler
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtx11extras
|
||||
libsForQt5.poppler
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,21 +1,16 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
cmake,
|
||||
pkg-config,
|
||||
|
||||
libsForQt5,
|
||||
exiv2,
|
||||
mpv,
|
||||
opencv4,
|
||||
qtbase,
|
||||
qtimageformats,
|
||||
qtsvg,
|
||||
qttools,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qimgv";
|
||||
version = "1.0.3-unstable-2024-10-11";
|
||||
|
||||
@@ -29,6 +24,7 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -39,10 +35,10 @@ mkDerivation rec {
|
||||
exiv2
|
||||
mpv
|
||||
opencv4
|
||||
qtbase
|
||||
qtimageformats
|
||||
qtsvg
|
||||
qttools
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtimageformats
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
pkg-config,
|
||||
lua,
|
||||
flam3,
|
||||
@@ -51,13 +49,13 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
lua
|
||||
flam3
|
||||
libxml2
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtx11extras,
|
||||
wrapQtAppsHook,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -23,12 +20,12 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtx11extras
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtx11extras
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "Simple creation and editing of screenshots";
|
||||
|
||||
@@ -3,10 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
wrapQtAppsHook,
|
||||
qmake,
|
||||
qtsvg,
|
||||
qtx11extras,
|
||||
libsForQt5,
|
||||
graphviz,
|
||||
}:
|
||||
|
||||
@@ -31,11 +28,12 @@ stdenv.mkDerivation rec {
|
||||
);
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
];
|
||||
|
||||
buildInputs = if stdenv.hostPlatform.isDarwin then [ qtsvg ] else [ qtx11extras ];
|
||||
buildInputs =
|
||||
if stdenv.hostPlatform.isDarwin then [ libsForQt5.qtsvg ] else [ libsForQt5.qtx11extras ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt Visual Graph Editor";
|
||||
|
||||
@@ -1,17 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtimageformats,
|
||||
qtsvg,
|
||||
qtx11extras,
|
||||
libsForQt5,
|
||||
x11Support ? true,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qview";
|
||||
version = "6.1";
|
||||
|
||||
@@ -24,14 +19,17 @@ mkDerivation rec {
|
||||
|
||||
qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtimageformats
|
||||
qtsvg
|
||||
] ++ lib.optionals x11Support [ qtx11extras ];
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtimageformats
|
||||
libsForQt5.qtsvg
|
||||
] ++ lib.optionals x11Support [ libsForQt5.qtx11extras ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Practical and minimal image viewer";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivationWith,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
libsForQt5,
|
||||
file,
|
||||
intltool,
|
||||
gobject-introspection,
|
||||
@@ -20,7 +20,7 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rapid-photo-downloader";
|
||||
version = "0.9.36";
|
||||
pyproject = true;
|
||||
@@ -75,6 +75,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.wrapQtAppsHook
|
||||
file
|
||||
intltool
|
||||
gobject-introspection
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
mkDerivation,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtiff,
|
||||
boost,
|
||||
qtbase,
|
||||
qttools,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scantailor-advanced";
|
||||
version = "1.0.19";
|
||||
|
||||
@@ -24,14 +23,15 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
boost
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkDerivation,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
zlib,
|
||||
openjpeg,
|
||||
libjpeg_turbo,
|
||||
@@ -29,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
zlib
|
||||
libjpeg_turbo
|
||||
libpng
|
||||
@@ -40,8 +37,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,23 +1,17 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libsForQt5,
|
||||
addDriverRunpath,
|
||||
poppler-utils,
|
||||
qtxmlpatterns,
|
||||
qtsvg,
|
||||
libgbm,
|
||||
xvfb-run,
|
||||
fontconfig,
|
||||
freetype,
|
||||
xorg,
|
||||
qmake,
|
||||
python3,
|
||||
qttools,
|
||||
git,
|
||||
qtmultimedia,
|
||||
}:
|
||||
let
|
||||
qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]);
|
||||
@@ -34,13 +28,13 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtmultimedia
|
||||
libsForQt5.qtmultimedia
|
||||
git
|
||||
qtPython
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
poppler-utils
|
||||
qtxmlpatterns
|
||||
qtsvg
|
||||
libsForQt5.qtxmlpatterns
|
||||
libsForQt5.qtsvg
|
||||
libgbm
|
||||
freetype
|
||||
xorg.libXi
|
||||
@@ -52,9 +46,9 @@ stdenv.mkDerivation rec {
|
||||
addDriverRunpath
|
||||
xvfb-run
|
||||
fontconfig
|
||||
wrapQtAppsHook
|
||||
qmake
|
||||
qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fftw,
|
||||
qtbase,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -22,11 +20,11 @@ stdenv.mkDerivation rec {
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
fftw
|
||||
];
|
||||
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -16,12 +15,12 @@ python3Packages.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
python3Packages.sip
|
||||
python3Packages.tomli
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
|
||||
# veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap
|
||||
# it automatically -> we have to do it explicitly
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
libsForQt5,
|
||||
poppler,
|
||||
pkg-config,
|
||||
libunarr,
|
||||
libGLU,
|
||||
qtdeclarative,
|
||||
qtgraphicaleffects,
|
||||
qtmultimedia,
|
||||
qtquickcontrols2,
|
||||
qtscript,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yacreader";
|
||||
version = "9.15.0";
|
||||
|
||||
@@ -26,20 +21,21 @@ mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
poppler
|
||||
libunarr
|
||||
libGLU
|
||||
qtmultimedia
|
||||
qtscript
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtscript
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
qtdeclarative
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtgraphicaleffects
|
||||
libsForQt5.qtdeclarative
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "136.0.7103.92",
|
||||
"version": "136.0.7103.113",
|
||||
"chromedriver": {
|
||||
"version": "136.0.7103.93",
|
||||
"hash_darwin": "sha256-6u+hJWBZZlqjc81Hs/5dL6csWP3QiWzQvfW3O+bfaaA=",
|
||||
"hash_darwin_aarch64": "sha256-b4MfxITtIwqV41Jc5Hv42WgOt1+U6dNjIvSDG4VNqw8="
|
||||
"version": "136.0.7103.114",
|
||||
"hash_darwin": "sha256-RAWarx2vOh23XKvhNwAkCgG9swGxX1dw8LaqIQBPJFo=",
|
||||
"hash_darwin_aarch64": "sha256-TZcO5RiRW0dN0+jBArclBkIvYSSirhmPgJXswfTufgk="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -20,8 +20,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "cb81a4cc5087a8303a6c8827ee2b80b71d26e334",
|
||||
"hash": "sha256-mySbSMnbM/KBEGnOyJKJMr4WD4PNgIDDeNK0fTPfcnI=",
|
||||
"rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71",
|
||||
"hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -96,8 +96,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "ecc378cc61109732d174d6542c41fd523c331b13",
|
||||
"hash": "sha256-+Cgf3OocFbD2rL4izA/0Z0qjWQiIUwiTW/z0cW0pGb0="
|
||||
"rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
|
||||
"hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -241,8 +241,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "e793e21a020b53a66ae13ef8673f80b8e8a73746",
|
||||
"hash": "sha256-BHD/XVQquh9/cr+Kv43lKGFReHy4YbQIAJq5792+4Sw="
|
||||
"rev": "4a53cbe7a1270c91ec60903ee792de658453becb",
|
||||
"hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -791,13 +791,13 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "b6178615ecae6d84b347cb7a1812cad9afca51f2",
|
||||
"hash": "sha256-Gc7huCu+d5XBwI420V1nutKeJpqBfvJ6fhh5zpRtMw4="
|
||||
"rev": "5297e56d91816747d539abca52b578e5832135f0",
|
||||
"hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go="
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "136.0.7103.92",
|
||||
"version": "136.0.7103.113",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
|
||||
@@ -808,16 +808,16 @@
|
||||
"hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "136.0.7103.92-1",
|
||||
"hash": "sha256-mZ/qG7tWKJH1pGE4Onw9P50/WBYva7bvKeAiy4Ckjd0="
|
||||
"rev": "136.0.7103.113-1",
|
||||
"hash": "sha256-+xQvBkwza1QLwWgijoMnih2k2v0I7cBiAjxOeqMf6A0="
|
||||
},
|
||||
"npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "cb81a4cc5087a8303a6c8827ee2b80b71d26e334",
|
||||
"hash": "sha256-mySbSMnbM/KBEGnOyJKJMr4WD4PNgIDDeNK0fTPfcnI=",
|
||||
"rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71",
|
||||
"hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -892,8 +892,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "ecc378cc61109732d174d6542c41fd523c331b13",
|
||||
"hash": "sha256-+Cgf3OocFbD2rL4izA/0Z0qjWQiIUwiTW/z0cW0pGb0="
|
||||
"rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
|
||||
"hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -1037,8 +1037,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "e793e21a020b53a66ae13ef8673f80b8e8a73746",
|
||||
"hash": "sha256-BHD/XVQquh9/cr+Kv43lKGFReHy4YbQIAJq5792+4Sw="
|
||||
"rev": "4a53cbe7a1270c91ec60903ee792de658453becb",
|
||||
"hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -1587,8 +1587,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "b6178615ecae6d84b347cb7a1812cad9afca51f2",
|
||||
"hash": "sha256-Gc7huCu+d5XBwI420V1nutKeJpqBfvJ6fhh5zpRtMw4="
|
||||
"rev": "5297e56d91816747d539abca52b578e5832135f0",
|
||||
"hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -417,11 +417,11 @@
|
||||
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
||||
},
|
||||
"equinix": {
|
||||
"hash": "sha256-ae9mtP5at9b3EB8aaBcjomL3ahr6ta+wm8jv9reQW20=",
|
||||
"hash": "sha256-erQUWFpGqnxtU88AaD4Lq0OQyhOg0gXoFBMf6wQC1Fs=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v3.7.0",
|
||||
"rev": "v3.8.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-sjEgBLwk/dYUmq+kL0PtamEukXgC9rzeyTT87HK0Y8E="
|
||||
},
|
||||
@@ -552,13 +552,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"harbor": {
|
||||
"hash": "sha256-ryNGeQ9Ac81iQo+iaqao2dvZ30xYy9TGMOqrPldY5/8=",
|
||||
"hash": "sha256-KYCyqNKqW/I4q1JHVK4rD9H8/D60IL7H9cCgz6wLg5Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/goharbor/harbor",
|
||||
"owner": "goharbor",
|
||||
"repo": "terraform-provider-harbor",
|
||||
"rev": "v3.10.20",
|
||||
"rev": "v3.10.21",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-6kK9FMT+Ew6RBzNNR9OxYaCz1NjzKRv75Aa9l+p+B5E="
|
||||
"vendorHash": "sha256-C1MT4mA7ubh1mN4+HO0bwMpjVHjDIG6UXZI6gvXHFZE="
|
||||
},
|
||||
"hcloud": {
|
||||
"hash": "sha256-DSTxn4t6YWxRBimMlqkP1VLqqxk1Kox+h0u9i9rSdhc=",
|
||||
@@ -1219,22 +1219,22 @@
|
||||
"vendorHash": "sha256-K/44Jio2a1kKYuyI6o/5wwMNRaZvx9zrNEC85v56xdU="
|
||||
},
|
||||
"spacelift": {
|
||||
"hash": "sha256-9TYSIIIqRSOFGbGv6mUgGyvcUb+PoMJ3IAHQFeRsSZ8=",
|
||||
"hash": "sha256-uRqZ5GRCP+oxm42cVVUdwUUixKLZbqfd6PjohbF7wNQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
|
||||
"owner": "spacelift-io",
|
||||
"repo": "terraform-provider-spacelift",
|
||||
"rev": "v1.21.0",
|
||||
"rev": "v1.22.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-dQeOucXwHW0GeZ2irKbdx+GvnjuA1PKnW+RFjvjwNc0=",
|
||||
"hash": "sha256-gRR0Ie27Wsc8Hf4u5gto2tkuZp/VoPbKBfDcJYN4W9A=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.216.2",
|
||||
"rev": "v1.219.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-STIPYBMj6r630/J71fAeLTkrvop/8u7gToGcijopqCo="
|
||||
"vendorHash": "sha256-M6MkqX8iVeP9IpLSLfkl7cMDDtO1VLw1YpODd0zPJvU="
|
||||
},
|
||||
"ssh": {
|
||||
"hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
|
||||
@@ -1264,20 +1264,20 @@
|
||||
"vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
|
||||
},
|
||||
"sumologic": {
|
||||
"hash": "sha256-HdK4YOrOoaivdYOHBTcOjjx4kI7kAITWY39aZ6WFpgU=",
|
||||
"hash": "sha256-P/icRnqd24To3n/WCS666n3slQwt7eNUpt9aD7c9GGU=",
|
||||
"homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
|
||||
"owner": "SumoLogic",
|
||||
"repo": "terraform-provider-sumologic",
|
||||
"rev": "v3.0.9",
|
||||
"rev": "v3.0.10",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-S3SBp17+qqA64tWydD5DYc9KahycJ+qDrdXvFwu6Lbc="
|
||||
},
|
||||
"sysdig": {
|
||||
"hash": "sha256-bvYbLU1MgBcgu/koj/cl30rI1WlTVKJybP+vC7H54v0=",
|
||||
"hash": "sha256-fkMVPPKqUQdp/JSPByV3yuMaY3SKVy75u1ljAL9bEZc=",
|
||||
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
|
||||
"owner": "sysdiglabs",
|
||||
"repo": "terraform-provider-sysdig",
|
||||
"rev": "v1.54.0",
|
||||
"rev": "v1.56.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s="
|
||||
},
|
||||
@@ -1336,13 +1336,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"time": {
|
||||
"hash": "sha256-namFdrrCw5/pAb1yvTmvli+9jewGzlVaa9TjS9Rt48g=",
|
||||
"hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/time",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-time",
|
||||
"rev": "v0.13.0",
|
||||
"rev": "v0.13.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-0o7WKJm4IesxparbbWhzXJNL80qxCUkJvQFypMobR1A="
|
||||
"vendorHash": "sha256-4XCCzB5Va1jtTn5vgIVKjQq4g8sKe0SIw3ynZExz/Vg="
|
||||
},
|
||||
"tls": {
|
||||
"hash": "sha256-t/nUt0deyckP8opNiPZc5rbC1SleZwkrFXuQFw47sqA=",
|
||||
|
||||
@@ -194,9 +194,9 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.11.4";
|
||||
hash = "sha256-VGptJz+MbJ8nJRGUW9LzX6IDLYbjI5tK40ZhkZCGVf0=";
|
||||
vendorHash = "sha256-pDtWGDKEnYq4wJYG+Rr5C1pWN/X92P+wvHrNm0Ldh+8=";
|
||||
version = "1.12.0";
|
||||
hash = "sha256-+EjsKl13kx3uJ50TrZIJLrvf4RBWDJsp1PD1dwtP6XA=";
|
||||
vendorHash = "sha256-zWNLIurNP5e/AWr84kQCb2+gZIn6EAsuvr0ZnfSq7Zw=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
||||
@@ -40,13 +40,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "svxlink";
|
||||
version = "24.02";
|
||||
version = "25.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sm0svx";
|
||||
repo = "svxlink";
|
||||
tag = version;
|
||||
hash = "sha256-QNm3LQ9RY24F/wmRuP+D2G5of1490YpZD9bp6dZErU0=";
|
||||
hash = "sha256-xFtfHkLnStG730o5tGATLLZvcqYYpR+7ATUdib7B2rw=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "abctl";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airbytehq";
|
||||
repo = "abctl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O+ABjageccJudXtO5wUYLIT/kI04f68RLW0B7d//jdw=";
|
||||
hash = "sha256-ZM0ae4Oiz/q4KSkxVxEXPe6oJa5fsNWzw+fX5hobc1c=";
|
||||
};
|
||||
|
||||
checkFlags =
|
||||
@@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
in
|
||||
[ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
vendorHash = "sha256-4pi5EX7N4zf72rez2aClFezgnT70A7Crd2YTasl5CvU=";
|
||||
vendorHash = "sha256-9djIgVLPQmqEzDqUBipmXA8DlwYx9D4QlMna26vyJKI=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
Generated
+76
-76
@@ -654,18 +654,18 @@
|
||||
"jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=",
|
||||
"pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k="
|
||||
},
|
||||
"com/strumenta#antlr-kotlin-gradle-plugin/1.0.2": {
|
||||
"jar": "sha256-neZCtD2Y8AS8TX0wkpVdsuBaL8XKa8Q+tBVqNZVVkos=",
|
||||
"module": "sha256-t1m4LoiMovlmQAXj1oy58wM2Vdv7KBrG0yqf6XxQ3c4=",
|
||||
"pom": "sha256-MfifVba08ApogkXzkhvTzCO4Z9PizyAgYSRplmhZPJ0="
|
||||
"com/strumenta#antlr-kotlin-gradle-plugin/1.0.3": {
|
||||
"jar": "sha256-5VI7i8hPUYGRUEHSNsdTuaemtxM22yon7eQcRAYe81U=",
|
||||
"module": "sha256-4AgFnvxtTXyXhNBV7cL8+I0FalWxjLeP1n+hN52K6Mc=",
|
||||
"pom": "sha256-6aXHG2HPFEq+C0vhR9kFy9XibQe5xL3ocPk5aqj4tAU="
|
||||
},
|
||||
"com/strumenta#antlr-kotlin-target/1.0.2": {
|
||||
"jar": "sha256-PNB1k/m4DnGNobdHHpfbjjuxU1hTkQk5qnvq+hlpFHQ=",
|
||||
"module": "sha256-tzg2oj8tHSx6Zij3FLPcGB+QdvuWCRabJ/QwM6bz5AE=",
|
||||
"pom": "sha256-CH31pxn7CrLgjHvQjgtP8YccIHqWvuz3Sz5sOgKO2UI="
|
||||
"com/strumenta#antlr-kotlin-target/1.0.3": {
|
||||
"jar": "sha256-lqRnHwdcq2Cs3wfpebaekNprmlbgT9gtCgJwK71A5fU=",
|
||||
"module": "sha256-bIyr2lyJg151FjpUGn4oXUqjFa1uic7pRFmd9DqHn0A=",
|
||||
"pom": "sha256-LYVuemGj8sPqq2la0+VIgZmMhZ2VvibtMM3mdIjQA7M="
|
||||
},
|
||||
"com/strumenta/antlr-kotlin#com.strumenta.antlr-kotlin.gradle.plugin/1.0.2": {
|
||||
"pom": "sha256-k9f3Q5oTfttR/u3P53O0DEMrCq215CigG8erzV8Vn5E="
|
||||
"com/strumenta/antlr-kotlin#com.strumenta.antlr-kotlin.gradle.plugin/1.0.3": {
|
||||
"pom": "sha256-QexbCkIylibd1Tm6buHXXt6NhjhmGswhCt4ks7uH7IU="
|
||||
},
|
||||
"com/sun/activation#all/1.2.2": {
|
||||
"pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44="
|
||||
@@ -950,28 +950,28 @@
|
||||
"jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
|
||||
"pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#core/1.0.0-alpha03": {
|
||||
"jar": "sha256-sXY83+E7TDiJLkTqUbKyBEzWdB73v7ppAeWSttDPdss=",
|
||||
"module": "sha256-6B2a5ZhgmkSrE5l7lgnFu/hU0j/GBP3/Zj071dhUwEw=",
|
||||
"pom": "sha256-ZDkxOX0cJjb3BJdlmSk5SKNt4II5RquXUz4atBBD7hM="
|
||||
"org/jetbrains/compose/hot-reload#core/1.0.0-alpha05": {
|
||||
"jar": "sha256-sxLfmlRSkDi4835keehBs5dF9iZbSYE2d9BlliJ/O94=",
|
||||
"module": "sha256-rqsb+JwLN0x2rnXYEd4HQSXZh2oREH8ZnUwreznCZrI=",
|
||||
"pom": "sha256-C5YOLk1d1uqJ0Jl96xqer/QulPf6QNpOYc9mKTaBiWo="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#gradle-core/1.0.0-alpha03": {
|
||||
"jar": "sha256-ArOlcPFBb10zQws+/DO6X6uHcr2bAySJnFMpJg+iXQg=",
|
||||
"module": "sha256-TL4UEllYyAE/juhiFS/rRWTltEFDrb3SuKaqScQTDe0=",
|
||||
"pom": "sha256-yVcTDcpxhlk+k6lBjKJJwHSEmncZ7cWfNKvOVqDNh9M="
|
||||
"org/jetbrains/compose/hot-reload#gradle-core/1.0.0-alpha05": {
|
||||
"jar": "sha256-7kWrwVHX4AywZfkDccecD7DuVRxnlshjIRIpJR7Ri5o=",
|
||||
"module": "sha256-7/zPQpnAW+lcRthgfOAxMPOVlVDugysS8Ehte+Yi6ZM=",
|
||||
"pom": "sha256-CAukVwfeQWzNqVJ8E4D2clG7d0KK2J/8RIy2iVtBR40="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#gradle-plugin/1.0.0-alpha03": {
|
||||
"jar": "sha256-kT5z6wT3AoGlRRQW5/1KiZD7lJdsvf61zs5UrcPIADw=",
|
||||
"module": "sha256-4vhcxiwri2vlC3qx79MSLSFBXi19h4xZ4NrMdIMVVIw=",
|
||||
"pom": "sha256-H/FOLefyU9o7v15vv4DjGgztd39qvRnovBvonqtRYkA="
|
||||
"org/jetbrains/compose/hot-reload#gradle-plugin/1.0.0-alpha05": {
|
||||
"jar": "sha256-oTw5Byo4IyBOHZ9CXWjZbMUT6+9cYjyKbsc8bhdXgqw=",
|
||||
"module": "sha256-weJpoNnKRyKDQa8UHzm93CJ06qQcn8q79Cf8j3EBf5k=",
|
||||
"pom": "sha256-KBm/7ol3Qev1iRsgkoqwiAyXwzGeuyQYhrrnDDQBVDM="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#orchestration/1.0.0-alpha03": {
|
||||
"jar": "sha256-tJSgulpBLpxImvtn5FUj5QBnOczDsnLotmZJi5nxazQ=",
|
||||
"module": "sha256-VD+3LEWr2cBGKPIxa17H8GUVbxmme9Bqr+RA3lKBMsU=",
|
||||
"pom": "sha256-fsMmjEdZdtzGHnR3idvcj8Ng+bECO+crxahWdUGGt98="
|
||||
"org/jetbrains/compose/hot-reload#orchestration/1.0.0-alpha05": {
|
||||
"jar": "sha256-g5JIQknG2u2ux4aSIz0tquo3mRuF6zhCbzifKaH3zhg=",
|
||||
"module": "sha256-HF7Cr+l1CoQ3Utktjmqcz8IWRtBxtfU5N0jGNiNZl5w=",
|
||||
"pom": "sha256-46cK348/uX/OabYXAUUiGcMGj0MbGJnkr7QWPRjNeQY="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#org.jetbrains.compose.hot-reload.gradle.plugin/1.0.0-alpha03": {
|
||||
"pom": "sha256-ynIJvP9Ake+iyJdFtsYg/Kt63h9qiM3exgkxsqStie4="
|
||||
"org/jetbrains/compose/hot-reload#org.jetbrains.compose.hot-reload.gradle.plugin/1.0.0-alpha05": {
|
||||
"pom": "sha256-0LBsmU0E8W1HkDDuJ4uIBvVYPLn4zEvAGUhSWH/p0dY="
|
||||
},
|
||||
"org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
|
||||
"jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
|
||||
@@ -1634,14 +1634,14 @@
|
||||
"module": "sha256-aRc2CEF6IRPm+mr+t7RUCyDfcM/aP6Fsc6qk+nAv+tM=",
|
||||
"pom": "sha256-QOr9s+epasxcFR3pzL7BKFDy37XL53Ph90zrU2JVggM="
|
||||
},
|
||||
"com/strumenta#antlr-kotlin-runtime-jvm/1.0.2": {
|
||||
"com/strumenta#antlr-kotlin-runtime-jvm/1.0.3": {
|
||||
"jar": "sha256-Hy+1MJxqlAq1K0GMHWN055qy79+mqcYbPd16f5VgROQ=",
|
||||
"module": "sha256-ZOXc7bM5dAyT31zG6rPoWuT/Aj/B46AqnkzPtM4cD1Y=",
|
||||
"pom": "sha256-/0wnuIMb7JgQPTarjPSKYzVCP64knOwQKFBEWOeDiBc="
|
||||
"module": "sha256-Q3Q+dXyRTUnqniw40PdBVjum8IGTNXuoK5VXi9wS+OU=",
|
||||
"pom": "sha256-1ASIHsVa6sEEiWDIm8iKxJtk9IaGa5/k2Heo5vMsiGI="
|
||||
},
|
||||
"com/strumenta#antlr-kotlin-runtime/1.0.2": {
|
||||
"module": "sha256-/O5noEMQ823oFiypQt8rH+rqYf+SWEoJ3KXnYLYkGZA=",
|
||||
"pom": "sha256-JRjb+jPn3pMMJ1dBpUTwPo86/BRnCMEGvIxRcKVBIPU="
|
||||
"com/strumenta#antlr-kotlin-runtime/1.0.3": {
|
||||
"module": "sha256-Sw9znKgtPCPKsNUbt1FZMMu15geYvGmkda6stdgtdfM=",
|
||||
"pom": "sha256-z1Sha4i+Muw+HXsuHfqNl60Sif/MdmtzLMW6sOu4q7k="
|
||||
},
|
||||
"com/sun/activation#all/1.2.0": {
|
||||
"pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
|
||||
@@ -2557,19 +2557,19 @@
|
||||
"module": "sha256-9oLYatpLCjX0kvltrnryeLTkVQRoj6CWOi+F9UmmsCo=",
|
||||
"pom": "sha256-YdA6m9aCwFJtOkRsur7DUUKl0W+N9aG9zTpa4d6f6OU="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha03": {
|
||||
"jar": "sha256-cBMG+ehDNn8KOONndw3kXCGyKsQDOuYzq28EmlrbOCs=",
|
||||
"module": "sha256-MJrWoqxCI13Bv5SiLm4ydv70iLXDud5MMIkGCnDXnuM=",
|
||||
"pom": "sha256-rfc6kmMv+o3HXRIBQ87jycO3uTidd7ZiHxpeKxfnI9o="
|
||||
"org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha05": {
|
||||
"jar": "sha256-+2p7PMWZNC8rUApqQ17M8vue1B2pcsfUgCzbSn4DFGI=",
|
||||
"module": "sha256-XphVM5YuX4vKHnPq7LRw2S0LyC08/H9RydVNB8foCmc=",
|
||||
"pom": "sha256-6mjs2xBA1jFGN8MN7iTkMqMHcLoDNh9IAIw6AB+ytOs="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#runtime-api/1.0.0-alpha03": {
|
||||
"module": "sha256-v6USCSOJEC7uxPFlokR2i5j7QpCm/yJmYt76w6/8kH4=",
|
||||
"pom": "sha256-U/KEvIGlcvtWlORFWvxGAc2GdyOzVdbLvuqdZAzahdc="
|
||||
"org/jetbrains/compose/hot-reload#runtime-api/1.0.0-alpha05": {
|
||||
"module": "sha256-VpDI/Ph2E+SAxgPr7QMKRGlUzS3K+9dk9zE1u+eP8DM=",
|
||||
"pom": "sha256-7dli33dNo1SH/dpP7yi7G1gQj4eeQwpMFQ+oWA4xgqE="
|
||||
},
|
||||
"org/jetbrains/compose/hot-reload#runtime-jvm/1.0.0-alpha03": {
|
||||
"jar": "sha256-s9L61JESmSI/pmo/WxGFQQasUVsqjM0vYI2C2L7Z0KE=",
|
||||
"module": "sha256-M1PgB201Bp9n0oy+p/afZH/jJBL3IJ85/pAZmdMQoJI=",
|
||||
"pom": "sha256-ei0jfOFBdd94w134qn0jfG4X+DCou9jppQyG91GlKGY="
|
||||
"org/jetbrains/compose/hot-reload#runtime-jvm/1.0.0-alpha05": {
|
||||
"jar": "sha256-238TALVeJgQ639D38TzROTpKqD3twn6kw6AJRiGUriw=",
|
||||
"module": "sha256-LBG1MeaMgYj7+H0QTIumK3trdF5wPNaCvqLcdiG8YXg=",
|
||||
"pom": "sha256-Qx1LGtWuX0mxy0TAYzZR6WmPpzDjcKR/iziowomZt1Q="
|
||||
},
|
||||
"org/jetbrains/compose/material#material-desktop/1.8.0-alpha04": {
|
||||
"jar": "sha256-Jigh7AXNWziN0f9Z2e9q/aE1jUyewBXzjOMf90J7Ngg=",
|
||||
@@ -3357,49 +3357,49 @@
|
||||
"module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=",
|
||||
"pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk="
|
||||
},
|
||||
"org/openani/mediamp#catalog/0.0.25": {
|
||||
"module": "sha256-RLBggEOm3icmkUsO/3gynkyUTCglWj9gEsSmtvTcw1A=",
|
||||
"pom": "sha256-IpCOObVhNrYeZR9JM/SUAlsRU/dQHI1BEOliUP4bLvw="
|
||||
"org/openani/mediamp#catalog/0.0.26": {
|
||||
"module": "sha256-I16xb6VSWCPEXR00K6Pqe+1Ord4hoVegIdFJCjiw70I=",
|
||||
"pom": "sha256-itzCsDj32fyeFUTVTKskJnG7J9I1ketiWnzmCOCjNfc="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-desktop/0.0.25": {
|
||||
"org/openani/mediamp#mediamp-api-desktop/0.0.26": {
|
||||
"jar": "sha256-wq88zxU6os+DET2GQqnWf7IFQisk8nQfuOMm7yaRhxg=",
|
||||
"module": "sha256-MXt+vTcFPagmRz20p8Yc3Hfvv6IxnBbEUFbhTRLWAAc=",
|
||||
"pom": "sha256-xpu0PHOKwpHlQmT55zDFZqkCh3DSNcs+T3O8B7bV4Hc="
|
||||
"module": "sha256-Robr2Hjhc9Mucq0MlPX9uDbPTGU37OM+EQMyCuyGCFM=",
|
||||
"pom": "sha256-rYSUUSwrno45hElP5s65pi+HpfySFdniNZAgLsxFs5Y="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api/0.0.25": {
|
||||
"module": "sha256-GGZ5gkP96zF4I9RqwLsTLCVXabkoXY/29o96THCNUnM=",
|
||||
"pom": "sha256-NvLZVpFI9kzup4+s1Rt8f2iRF5IvLEtRs8I36T1VQq4="
|
||||
"org/openani/mediamp#mediamp-api/0.0.26": {
|
||||
"module": "sha256-67z9qC1RG4iuQ4LkN3hZX8nU/RlqJdB5kgR4WZfdAV4=",
|
||||
"pom": "sha256-/YHwjj6d4vOu5v9yr9ctEAV7J7aIQPtF+Nc5Zy5Z7MI="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-compose-desktop/0.0.25": {
|
||||
"org/openani/mediamp#mediamp-compose-desktop/0.0.26": {
|
||||
"jar": "sha256-oC7g3ItyOR0dT7B8L1ncqpQcYYmkC5CbbgKfmXBbCxQ=",
|
||||
"module": "sha256-wXl1ZiDOfKEwiNMl/6xvFicuwbwIinx8Br7t+wq6b0w=",
|
||||
"pom": "sha256-xHDUSQ6Q9AYoh5uMBnqClJOLnjQl9/+EAk5Tr83+Glw="
|
||||
"module": "sha256-KUPXp03ZHWwJoFW9Yv3G7qZ6KVnzu9kXaHko0sCwa1M=",
|
||||
"pom": "sha256-gCRVtSffFrskMft9QoPlP00xAkx5fO0RufLK6F+XDPQ="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-compose/0.0.25": {
|
||||
"module": "sha256-lnwjp0GSCUlcXdOVXXpREfdwXSCIHop+12vL/4scNkY=",
|
||||
"pom": "sha256-ypU2W27nTUDFHU5l2RQmwA3qBomypDxcjHK6RyCTzRY="
|
||||
"org/openani/mediamp#mediamp-compose/0.0.26": {
|
||||
"module": "sha256-GourAD3L6fbG/2vk6sAcWFbAixi8JMT8VS4hLM5vKGg=",
|
||||
"pom": "sha256-kDFj3l1wpEcOGnBM5+auo4ir1muIHfb9NW9PaZ8exG8="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.25": {
|
||||
"org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.26": {
|
||||
"jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=",
|
||||
"module": "sha256-+L+8bBK8EWYmgLCZruaHln/EBMG5yHUU6O+Hfc1ydC8=",
|
||||
"pom": "sha256-rOZygEVU3rbOo93jZUviPVG+UW9ugV7q7AlviGknlaQ="
|
||||
"module": "sha256-5IKmn1mlfajGIvv66eSr8SBOU+V5dcndh+FlU8gf5nw=",
|
||||
"pom": "sha256-rWfE+eWilDOkDWU2xLzA+qv2x8/dF+Qwhet7lGVTnd0="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio/0.0.25": {
|
||||
"module": "sha256-tjK6VgNDEW7ql4BkFaqp38X9VAvBaptZPneZpo7Qz8A=",
|
||||
"pom": "sha256-N3VH1d/xULwg/i48Inp4GfJ+AR7Btm7S9ozveI/FSok="
|
||||
"org/openani/mediamp#mediamp-source-ktxio/0.0.26": {
|
||||
"module": "sha256-YT7EHwxB69StjLsu3EmPYhb4MWHJLxLfJ7CSy+X7INk=",
|
||||
"pom": "sha256-Fd7cpjCUJnGnofv2uq3DqePrH00ahYT+f96hVi3Grlc="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-vlc-compose/0.0.25": {
|
||||
"jar": "sha256-2OhSi5wEWMQNbhNLLZ+FRVibCCccHx/7UV6eWML9h34=",
|
||||
"module": "sha256-Wr1cLaZulaLEs2xORbkzLEjvka5o2A7gXHoLBwWKJkQ=",
|
||||
"pom": "sha256-LXuOr48ZOQKU+/PrgMw/SOO9nhB6ghh54fyI9hraiNc="
|
||||
"org/openani/mediamp#mediamp-vlc-compose/0.0.26": {
|
||||
"jar": "sha256-FpRyBToA2qz5SNOQPmTDKr+RO/AZuco60pGvUHueTLQ=",
|
||||
"module": "sha256-0RYTOM3zHsvu9VY9GIaIUYXyZhIWJGh+qVbt/QuSoLY=",
|
||||
"pom": "sha256-i1WxsUV+u/uKjTURro7eR08gU55kI2G+v31g48BCTpc="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-vlc/0.0.25": {
|
||||
"jar": "sha256-6xtrAnFEE8WkO/BF+vfGLKFpog1va7RwUgS3YR9xuaw=",
|
||||
"module": "sha256-5amJLVbqLGiq0bSZA1MN0L9iQ46/6q7MrKjTN+rnfzs=",
|
||||
"pom": "sha256-FWH7XzZbM5nOzozdJwsFiBhGFsGAhPc7fs/SSjTL9xA="
|
||||
"org/openani/mediamp#mediamp-vlc/0.0.26": {
|
||||
"jar": "sha256-6kpP5IZcVMPP+YlO5zSgYaMhi0LpbLGSarofI17Qviw=",
|
||||
"module": "sha256-19aWYPuBD+jGAxH+vYjlUUmqGnl+XGs+jguNlO3724M=",
|
||||
"pom": "sha256-gO7O6O/LGGPEvgOCoQzgcrqAdSWesJqc223ZVlC2yXg="
|
||||
},
|
||||
"org/openani/mediamp/catalog/0.0.25/catalog-0.0.25": {
|
||||
"toml": "sha256-lT6UFnmhYD/YDIKLIdbjm7HyEJ0KdyhoTYEvWzcw0Ic="
|
||||
"org/openani/mediamp/catalog/0.0.26/catalog-0.0.26": {
|
||||
"toml": "sha256-OuAXWWvPwKdSS1Xx4zrv4tcOkzYl5BpsbwQb5+gX88g="
|
||||
},
|
||||
"org/ow2#ow2/1.5.1": {
|
||||
"pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
|
||||
|
||||
@@ -79,20 +79,29 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "animeko";
|
||||
version = "4.9.1";
|
||||
version = "4.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-ani";
|
||||
repo = "animeko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NmvZR0NSo9y3vvdLqtyVKUlhCGq4Qu7Pbz/7Ufvf7rQ=";
|
||||
hash = "sha256-sFEq6tJfADH5x8+wdQ9T89awT7/Qx2RV5r+cND3J0iw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# copy currentAniBuildConfig from upstream release asset to local.properties
|
||||
postPatch = ''
|
||||
echo "jvm.toolchain.version=21" >> local.properties
|
||||
echo "ani.dandanplay.app.id=2qkvdr35cy" >> local.properties
|
||||
echo "ani.dandanplay.app.secret=WspqhGkCD4DQbIUiXTPprrGmpn3YHFeX" >> local.properties
|
||||
echo "ani.sentry.dsn=https://e548a2f9a8d7dbf1785da0b1a90e1595@o4508788947615744.ingest.us.sentry.io/4508788953448448" >> local.properties
|
||||
echo "ani.analytics.server=https://us.i.posthog.com" >> local.properties
|
||||
echo "ani.analytics.key=phc_7uXkMsKVXfFP9ERNbTT5lAHjVLYAskiRiakjxLROrHw" >> local.properties
|
||||
echo "kotlin.native.ignoreDisabledTargets=true" >> local.properties
|
||||
sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties
|
||||
sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties
|
||||
substituteInPlace gradle/libs.versions.toml \
|
||||
--replace-fail 'antlr-kotlin = "1.0.2"' 'antlr-kotlin = "1.0.3"'
|
||||
'';
|
||||
|
||||
gradleBuildTask = "createReleaseDistributable";
|
||||
|
||||
@@ -3,18 +3,19 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.14.10";
|
||||
version = "2.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Z+xSA0LrvXHHmNg7+i53Y1mSYnLYURZUglXRKvkld14=";
|
||||
hash = "sha256-KCU/WMytx4kOzlkZDwLfRRfutBtdk6UVBNdXOWC5kWc=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
@@ -26,25 +27,27 @@ buildGoModule rec {
|
||||
|
||||
ldflags =
|
||||
let
|
||||
package_url = "github.com/argoproj/argo-cd/v2/common";
|
||||
packageUrl = "github.com/argoproj/argo-cd/v2/common";
|
||||
in
|
||||
[
|
||||
"-s"
|
||||
"-w"
|
||||
"-X ${package_url}.version=${version}"
|
||||
"-X ${package_url}.buildDate=unknown"
|
||||
"-X ${package_url}.gitCommit=${src.rev}"
|
||||
"-X ${package_url}.gitTag=${src.rev}"
|
||||
"-X ${package_url}.gitTreeState=clean"
|
||||
"-X ${package_url}.kubectlVersion=v0.31.2"
|
||||
# NOTE: Update kubectlVersion when upgrading this package with
|
||||
# https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22k8s.io%2Fkubectl%22+path%3Ago.mod&type=code
|
||||
# Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code
|
||||
# Will need a way to automate it :P
|
||||
"-X ${packageUrl}.version=${version}"
|
||||
"-X ${packageUrl}.buildDate=unknown"
|
||||
"-X ${packageUrl}.gitCommit=${src.rev}"
|
||||
"-X ${packageUrl}.gitTag=${src.rev}"
|
||||
"-X ${packageUrl}.gitTreeState=clean"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# set ldflag for kubectlVersion since it is needed for argo
|
||||
# Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code
|
||||
prePatch = ''
|
||||
export KUBECTL_VERSION=$(grep 'k8s.io/kubectl v' go.mod | cut -f 2 -d " " | cut -f 1 -d "=" )
|
||||
echo using $KUBECTL_VERSION
|
||||
ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v2/common.kubectlVersion=''${KUBECTL_VERSION}"
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
@@ -64,6 +67,8 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/argocd completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Declarative continuous deployment for Kubernetes";
|
||||
mainProgram = "argocd";
|
||||
@@ -74,6 +79,7 @@ buildGoModule rec {
|
||||
shahrukh330
|
||||
bryanasdev000
|
||||
qjoly
|
||||
FKouhai
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz";
|
||||
sha256 = "09fn0046i69in1jpizkzbaq5ggij0mpflcsparyskm3wh71mbzvr";
|
||||
url = "https://web.archive.org/web/20230130224632/https://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz";
|
||||
hash = "sha256-RG8QPSXHo2qfOEn6eWWTh0ilg44tI1KyjXFm+SYnKKM=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "https://www.baudline.com/baudline_${version}_linux_i686.tar.gz";
|
||||
sha256 = "1waip5pmcf5ffcfvn8lf1rvsaq2ab66imrbfqs777scz7k8fhhjb";
|
||||
url = "https://web.archive.org/web/20230130224632/https://www.baudline.com/baudline_${version}_linux_i686.tar.gz";
|
||||
hash = "sha256-2A13FyUl4NNWzRConw6gGjBaHxCXYlwtgxbz0ARgI28=";
|
||||
}
|
||||
else
|
||||
throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bibiman";
|
||||
version = "0.11.4";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "lukeflo";
|
||||
repo = "bibiman";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LYoo3j3On4oCANg0acsyL7knFhOjKW0/zBVyK20knDs=";
|
||||
hash = "sha256-nyONqQmS8MvgMrq6XIuMjc8FkP9wKQu+EVnQUcSAjEo=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-VYG9KshZ4/MIgtwmfJ+sa8PKj9dgPuNgCUgqF+XRiMA=";
|
||||
cargoHash = "sha256-fdUCrf6gdZZtrL93GQMnA+4ZJ8qkjsBKJJN5u4VKE1w=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "broot";
|
||||
version = "1.46.3";
|
||||
version = "1.46.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "broot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MfBlJ7SokBKkAkmBSj4NsE2hKVqYeGN3z/xiq2VK3vU=";
|
||||
hash = "sha256-YoTR/rj/edg2KQhPRoihA38V4XM5EM5oJtLIH6zR/38=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-QJJxZDRJZkg/A1NjTBj7KpcfO8VUnXXcJT9knguAf/g=";
|
||||
cargoHash = "sha256-IFDKHsBTJFEmQ6FUG7yJmAEAVrzMvY9qbWQTnvUg274=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bstone";
|
||||
version = "1.2.15";
|
||||
version = "1.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bibendovsky";
|
||||
repo = "bstone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-L07GfqeQPTWGQb+vOOXNgbYLYpxQ2OHFnCLWd4uSlBw=";
|
||||
hash = "sha256-6BNIMBbLBcQoVx5lnUz14viAvBcFjoZLY8c30EgcvKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh"
|
||||
, "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs="
|
||||
, "buck2-x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo="
|
||||
, "rust-project-x86_64-linux": "sha256-UbC43xyEIIT76K2OHnp4lBo3saoTeuZxYDRieEry+tE="
|
||||
, "buck2-x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E="
|
||||
, "rust-project-x86_64-darwin": "sha256-mp8xR4bFb9esN3QABG03H07t09caMNQLKOqxdg8+CEw="
|
||||
, "buck2-aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs="
|
||||
, "rust-project-aarch64-linux": "sha256-rwT6mO0lyRnyCfdUtYcdelJArHZCHP6K/A//n+yLtgA="
|
||||
, "buck2-aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M="
|
||||
, "rust-project-aarch64-darwin": "sha256-JYQiCEcplVHTK2iPLDBpGyyoMXU5B0/P/r8VCN1IDko="
|
||||
, "_prelude": "sha256-eU4EZ9OqJVUH/YPFctJZM+KZK70IEslr2qLUUvz3ctM="
|
||||
, "buck2-x86_64-linux": "sha256-r/5txsY7/i0fQaQsH40YdAhSD/bXtr5aGlAuxaOs8jg="
|
||||
, "rust-project-x86_64-linux": "sha256-XJFhaxJvOklMMO3emtdJS4zNu989HLCIU9qBP31XpCo="
|
||||
, "buck2-x86_64-darwin": "sha256-9SW0xn7w2dH81oHwze/ysnQyrIAgu8+1WJuXMmxslFo="
|
||||
, "rust-project-x86_64-darwin": "sha256-MvYv96OtOU7NEZKXf3gDvCjEcbegLI+1HFN7XBdPAXA="
|
||||
, "buck2-aarch64-linux": "sha256-wlmkgWdotvqxmflzoJG266weCsjxtM0mVO0xf7vKVr0="
|
||||
, "rust-project-aarch64-linux": "sha256-7zhO+s8LOuDj5ysyADkfqRIZiOG9ewBtfcB43sPfVc4="
|
||||
, "buck2-aarch64-darwin": "sha256-0bNtPX8TLTCxf7rEeiUYtJUbzRmgRdgHrv98mmmM/Rg="
|
||||
, "rust-project-aarch64-darwin": "sha256-a4OLLLYJjTBskXfB7OWqULPkV5amgDEHudJKRLGwuAU="
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ let
|
||||
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
|
||||
|
||||
# our version of buck2; this should be a git tag
|
||||
version = "2025-01-02";
|
||||
version = "2025-05-06";
|
||||
|
||||
# map our platform name to the rust toolchain suffix
|
||||
# NOTE (aseipp): must be synchronized with update.sh!
|
||||
@@ -82,7 +82,7 @@ let
|
||||
# tooling
|
||||
prelude-src =
|
||||
let
|
||||
prelude-hash = "d11a72de049a37b9b218a3ab8db33d3f97b9413c";
|
||||
prelude-hash = "48c249f8c7b99ff501d6e857754760315072b306";
|
||||
name = "buck2-prelude-${version}.tar.gz";
|
||||
hash = buildHashes."_prelude";
|
||||
url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz";
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
"cli"
|
||||
"desktop"
|
||||
];
|
||||
version = "0.47.1";
|
||||
version = "0.48.0";
|
||||
cli = fetchurl {
|
||||
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-T+NOp5UEKcP8slDddQ9vyrrpoZVGEChJ379Da5E7pVw=";
|
||||
hash = "sha256-9481W8AsgxCCvdTkCy2kXH6CG72xP5S3kejjxcXLVkg=";
|
||||
};
|
||||
desktop = fetchurl {
|
||||
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-J2FvEdLy77uO52KNlugZZ+flsraKatXT2n17npMYo9M=";
|
||||
hash = "sha256-XIRjuvBxmfdHnizbVOh7kWKHm4OkUDwuSSNYzjJW/dA=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ddns-go";
|
||||
version = "6.9.1";
|
||||
version = "6.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeessy2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QGvXUYeT01+P843gBX+IJWTyPg0cPI9jZWh3tAcmEqE=";
|
||||
hash = "sha256-78Y6kJWrF3EtbvLc5Jk+mNZQRfydcIPn4bw7tIUvGoY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5XrwVIaQ2dMizx3Pj0dmLkpYwypUVnfxLNxmNsVhVzY=";
|
||||
vendorHash = "sha256-RPYjw4G1jfsrge1eXKdQ6RdNL7srjagUY14GzXBJvpI=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duperemove";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markfasheh";
|
||||
repo = "duperemove";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T17XkR6AUvOerg9FN4SxTfoMavVXnxujtrA4p4GEnFE=";
|
||||
hash = "sha256-Y3HIqq61bLfZi4XR2RtSyuCPmcWrTxeWvqpTh+3hUjc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dysk";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "dysk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA=";
|
||||
hash = "sha256-B6iEssB9+BUXO4p1aSzrOGlBA8TiUOZY7a9U8F9SXaQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-vVU10Mj+dRIAOREQiGIO0S+mDBeLtM5v0KjmmoCn3/g=";
|
||||
cargoHash = "sha256-qfKNxLtvVaXGVP0wzOoZ5jaViO4hcMoZIOqxrpXiWzc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eww";
|
||||
version = "0.6.0-unstable-2025-03-25";
|
||||
version = "0.6.0-unstable-2025-05-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elkowar";
|
||||
repo = "eww";
|
||||
rev = "a9aa0f96892f20e4741e94f4cd46ca31106e492c";
|
||||
hash = "sha256-T9OZ8jke2T73Zeqt8VekH82ar23AV7llA7ta8b7HP2o=";
|
||||
rev = "15315a05ece87aa36fd6b0ff54f6484823e40cda";
|
||||
hash = "sha256-0AEYrizfnhhFmxADBEjnXL4VHvzdTvpmZ0Gjk2IQr9g=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-tjhF4D5WFw6qBUXRWcWjaB57zyXeWBDULsOcr2MJJgA=";
|
||||
cargoHash = "sha256-GjYeto/As8fM0xqTHfyKQ5YWAciBW9tvXM9ra3V86Eo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2025-05-02";
|
||||
version = "2025-05-10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XBmSiLp92mOudYCytkooHifDHtn+hqTMUOl3eTAUcMs=";
|
||||
hash = "sha256-YcSkBnzw3iMuD0MtpqtUq1gOBoj2ptigI63cI1wBibY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "expr";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "expr-lang";
|
||||
repo = "expr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-teP/14czczNiz0kxoLNmZQg/AvcDuB8K4jdQpJf5JLQ=";
|
||||
hash = "sha256-oi5dMTuirAnUFOC8zBlu7YErp13DZPoSGNpueKXdNtE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/repl";
|
||||
|
||||
vendorHash = "sha256-DamIlXTuuPifGgpbVXn7OPI97ppqlwiCtcZAnQ00YD0=";
|
||||
vendorHash = "sha256-tSerrcRS7Nl0rZQqGfUKgdHsGBXEAFFF+Cn7HqFyfqA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPackages,
|
||||
edid-decode,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
meson,
|
||||
pkg-config,
|
||||
ninja,
|
||||
@@ -48,14 +49,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gamescope";
|
||||
version = "3.16.4";
|
||||
version = "3.16.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveSoftware";
|
||||
repo = "gamescope";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-2AxqvZA1eZaJFKMfRljCIcP0M2nMngw0FQiXsfBW7IA=";
|
||||
hash = "sha256-q0yTOyu47tQXorFfnmRa4wrt0KRnyelLDmfcg4iwPfs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -63,6 +64,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./shaders-path.patch
|
||||
# patch relative gamescopereaper path with absolute
|
||||
./gamescopereaper.patch
|
||||
|
||||
# Revert change to always use vendored stb/glm libraries
|
||||
# Upstream discussion: https://github.com/ValveSoftware/gamescope/pull/1751
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ValveSoftware/gamescope/commit/baae74c4b13676fa76a8b200f21ac78f55079734.patch";
|
||||
revert = true;
|
||||
hash = "sha256-XpbyLQ4R9KgBR3hlrgPzmM7Zxr2jm4Q10zGjyhh/Qxw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ValveSoftware/gamescope/commit/72bae179ba2ebbbc91ed07c7f66e7e4964a4cd9e.patch";
|
||||
revert = true;
|
||||
hash = "sha256-aglfGvEuycNyPlaFYxqqvPAgFpWns3xZ3B2GiAefxtg=";
|
||||
})
|
||||
];
|
||||
|
||||
# We can't substitute the patch itself because substituteAll is itself a derivation,
|
||||
|
||||
@@ -125,7 +125,7 @@ class GitRepo(Repo):
|
||||
self.fetcher = "fetchgit"
|
||||
self.args = {
|
||||
"url": url,
|
||||
"rev": rev,
|
||||
"rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev,
|
||||
}
|
||||
|
||||
|
||||
@@ -136,13 +136,14 @@ class GitHubRepo(Repo):
|
||||
self.args = {
|
||||
"owner": owner,
|
||||
"repo": repo,
|
||||
"rev": rev,
|
||||
"rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev,
|
||||
}
|
||||
|
||||
def get_file(self, filepath: str) -> str:
|
||||
rev_or_tag = self.args['rev'] if 'rev' in self.args else f"refs/tags/{self.args['tag']}"
|
||||
return (
|
||||
urlopen(
|
||||
f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}"
|
||||
f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{rev_or_tag}/{filepath}"
|
||||
)
|
||||
.read()
|
||||
.decode("utf-8")
|
||||
@@ -155,7 +156,7 @@ class GitilesRepo(Repo):
|
||||
self.fetcher = "fetchFromGitiles"
|
||||
self.args = {
|
||||
"url": url,
|
||||
"rev": rev,
|
||||
"rev" if re.match(r"[0-9a-f]{40}", rev) else "tag": rev,
|
||||
}
|
||||
|
||||
# Quirk: Chromium source code exceeds the Hydra output limit
|
||||
@@ -172,9 +173,10 @@ class GitilesRepo(Repo):
|
||||
self.args["postFetch"] += "rm -r $out/media/test/data; "
|
||||
|
||||
def get_file(self, filepath: str) -> str:
|
||||
rev_or_tag = self.args['rev'] if 'rev' in self.args else f"refs/tags/{self.args['tag']}"
|
||||
return base64.b64decode(
|
||||
urlopen(
|
||||
f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT"
|
||||
f"{self.args['url']}/+/{rev_or_tag}/{filepath}?format=TEXT"
|
||||
).read()
|
||||
).decode("utf-8")
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "getmail6";
|
||||
version = "6.19.07";
|
||||
version = "6.19.08";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getmail6";
|
||||
repo = "getmail6";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uu+soEYC12LWx0aLbPupoK7g/rnD47dp32w7jpRj/38=";
|
||||
hash = "sha256-GUO6zozdh5u3dpFVQUYK/2PlurzXSEswgtdcpiPmhV8=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Program for retrieving mail";
|
||||
homepage = "https://getmail6.org";
|
||||
changelog = "https://github.com/getmail6/getmail6/blob/${src.rev}/docs/CHANGELOG";
|
||||
changelog = "https://github.com/getmail6/getmail6/blob/${src.tag}/docs/CHANGELOG";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [
|
||||
abbe
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "git-upstream";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@@ -15,11 +15,11 @@ rustPlatform.buildRustPackage {
|
||||
owner = "9999years";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ooqz2Xp/nljx2+zQsc/RjVbGG/5YTeggU6pB8lGK0o8=";
|
||||
hash = "sha256-rdxpo1OZD/fpBm76zD7U/YeZOBpliKXJN87LJkw6A28=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-oIrUjb+yJgDR5GYrG3hPLpXYJynR9eeX00emcrcjmZY=";
|
||||
cargoHash = "sha256-7h0aWb7xJjDJedQp9xXc+deW0hM+qBJcG36Sd8fo+Fg=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/9999years/git-upstream";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.25.1";
|
||||
version = "8.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = "gitleaks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ji13lmGrtJeQuOYi2HsFICs2XUZdmWgsgVrWj/Shh/c=";
|
||||
hash = "sha256-lBIoEUjAllhUTS9PRSqdWUeBhEGs6wOHOWivj0PC9Is=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc=";
|
||||
|
||||
@@ -27,12 +27,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glamoroustoolkit";
|
||||
version = "1.1.21";
|
||||
version = "1.1.22";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-KQOTCB34zxy34y5gq+xUjBiBO5zKSZHRDtQY/DnRkdo=";
|
||||
hash = "sha256-+YFQU7qCj2hpRuBpUn0hn5GNq+T0DHQFZwEoLu1FY4c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,22 +2,23 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "glance";
|
||||
version = "0.7.13";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glanceapp";
|
||||
repo = "glance";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MinskibgOCb8OytC+Uxg31g00Ha/un7MF+uvL9xosUU=";
|
||||
hash = "sha256-syWalphoKjUYrQjKrQUMDijgILQ+AIOVTMqYCiYVWyU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+7mOCU5GNQV8+s9QPki+7CDi4qtOIpwjC//QracwzHI=";
|
||||
vendorHash = "sha256-81FAWMe7ksmbklXGGg15v2W4nuT6AcBHLIhXF7bI78c=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -25,7 +26,9 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/glanceapp/glance/internal/glance.buildVersion=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
excludedPackages = [ "scripts/build-and-ship" ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -15,17 +15,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.15.10";
|
||||
version = "1.15.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QVgi4IDPDGlvg8J3Wwrjtzkd6eYi3aAwU8IJbnIr5fU=";
|
||||
hash = "sha256-2XGKkimwe9h8RxO3SzUta5Bh2Ooldl2LiHqUpn8FK7I=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-1FuVdx84jvMBo8VO6q+WaFpK3hWn88J7p8vhIDsQHPM=";
|
||||
vendorHash = "sha256-R9Qg6estiyjMAwN6tvuN9ZuE7+JqjEy+qYOPAg5lIJY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "goshs";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patrickhener";
|
||||
repo = "goshs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-j/GsNkaheYDavxxoibR61knMR3x7o1pkc6NcmGrHSxY=";
|
||||
hash = "sha256-5/KWAytz0SQYgIerf1xyTfJxzX5ynA2BhKfbYmu/vU8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LzuY3l6QQnMtAoVM2i206BuoTkVLVHg1DTWZhjIepY8=";
|
||||
|
||||
@@ -1,53 +1,53 @@
|
||||
{
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
|
||||
ncurses,
|
||||
gnupg,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.7.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
# mdp renamed to gpg-mdp because there is a mdp package already.
|
||||
pname = "gpg-mdp";
|
||||
inherit version;
|
||||
version = "0.7.5";
|
||||
|
||||
meta = {
|
||||
homepage = "https://tamentis.com/projects/mdp/";
|
||||
changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}";
|
||||
license = [ lib.licenses.isc ];
|
||||
description = "Manage your passwords with GnuPG and a text editor";
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "https://tamentis.com/projects/mdp/files/mdp-${version}.tar.gz";
|
||||
sha256 = "04mdnx4ccpxf9m2myy9nvpl9ma4jgzmv9bkrzv2b9affzss3r34g";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tamentis";
|
||||
repo = "mdp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y92y70XkUbB+lhWAzEkCB/cvfUPPKIfu0yrlCS2pKn0=";
|
||||
};
|
||||
patches = [
|
||||
# Pull fix pending upstream inclusion for -fno-common toolchain support:
|
||||
# https://github.com/tamentis/mdp/pull/9
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/tamentis/mdp/commit/95c77de3beb96dc7c76ff36d3f3dfb18411d7c54.patch";
|
||||
sha256 = "1j6yvjzkx31b758yav4arhlm5ig7phl8mgx4fcwj7lm2pfvzwcsz";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace ./configure \
|
||||
--replace "alias echo=/bin/echo" ""
|
||||
--replace-fail "alias echo=/bin/echo" "" \
|
||||
--replace-fail "main()" "int main()"
|
||||
|
||||
substituteInPlace ./src/config.c \
|
||||
--replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \
|
||||
--replace "/usr/bin/vi" "vi"
|
||||
--replace-fail "/usr/bin/gpg" "${lib.getExe gnupg}" \
|
||||
--replace-fail "/usr/bin/vi" "vi"
|
||||
|
||||
substituteInPlace ./mdp.1 \
|
||||
--replace "/usr/bin/gpg" "${gnupg}/bin/gpg"
|
||||
--replace-fail "/usr/bin/gpg" "${lib.getExe gnupg}"
|
||||
'';
|
||||
|
||||
# we add symlinks to the binary and man page with the name 'gpg-mdp', in case
|
||||
# the completely unrelated program also named 'mdp' is already installed.
|
||||
postFixup = ''
|
||||
ln -s $out/bin/mdp $out/bin/gpg-mdp
|
||||
ln -s $out/share/man/man1/mdp.1.gz $out/share/man/man1/gpg-mdp.1.gz
|
||||
'';
|
||||
}
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
})
|
||||
|
||||
@@ -16,14 +16,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gurobi";
|
||||
version = "12.0.1";
|
||||
version = "12.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz";
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-hQPqdZVU5G1kj/sR8j2QY1eLMn3JVahnWfWnVrk0P7o=";
|
||||
x86_64-linux = "sha256-kXIJPmXeBPwUxsXSNXaO6j/hXIqctuqS5oBuu4UunYY=";
|
||||
aarch64-linux = "sha256-vlhF3OIMCVyS9Y31RS4eVhs4wQ4CUDGQZlNkf98Uji0=";
|
||||
x86_64-linux = "sha256-DMSmk41YzGoonHdX2xLsioU9RTBLn4kQy4v6HgVa08U=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -1,47 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
lib,
|
||||
dpkg,
|
||||
nautilus-python,
|
||||
insync-emblem-icons,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "insync-nautilus";
|
||||
version = lib.getVersion insync-emblem-icons;
|
||||
version = "3.9.5.60024";
|
||||
pyproject = true;
|
||||
|
||||
# Download latest from: https://www.insynchq.com/downloads/linux#nautilus
|
||||
|
||||
src = fetchurl rec {
|
||||
urls = [
|
||||
"https://cdn.insynchq.com/builds/linux/insync-nautilus_${finalAttrs.version}_all.deb"
|
||||
"https://web.archive.org/web/20240409080611/${builtins.elemAt urls 0}"
|
||||
"https://cdn.insynchq.com/builds/linux/${finalAttrs.version}/insync-nautilus_${finalAttrs.version}_all.deb"
|
||||
"https://web.archive.org/web/20250502162242/${builtins.elemAt urls 0}"
|
||||
];
|
||||
hash = "sha256-aB1/ZzcQH3T1lviMZO8jXbtdbe4TW20f0TAcv4HDOGI=";
|
||||
hash = "sha256-yfPZ58xWZknpCqE8cJ7e7fR4+nzsCdprgBFRL0U0LvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
buildInputs = [
|
||||
nautilus-python
|
||||
insync-emblem-icons
|
||||
];
|
||||
buildInputs = [ nautilus-python ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -R usr/share $out/
|
||||
cp -rs "${insync-emblem-icons}"/share/icons $out/share/icons
|
||||
|
||||
cp -r usr $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ hellwolf ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ hellwolf ];
|
||||
homepage = "https://www.insynchq.com";
|
||||
description = "This package contains the Python extension and icons for integrating Insync with Nautilus";
|
||||
};
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "kicli";
|
||||
version = "0.0.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anned20";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Mt1lHOC8gBcLQ6kArUvlPrH+Y/63mIQTCsUY2UTJE2c=";
|
||||
hash = "sha256-NXKo+zK5HnuMXRsi29lEhoo7RCagwvZdXXPNfp4pHtc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+8L/9NJ3dzP4k+LXkPD208uFGeARv7aT39bhH+R08e0=";
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "konstraint";
|
||||
version = "0.41.0";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plexsystems";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-45zCzjzbKYLsLxmo7yGbbyeYP1WyULD9d+nnNLP9Zzo=";
|
||||
sha256 = "sha256-DwfBevCGDndMfQiwiuV+J95prhbxT20siMrEY2T7h1w=";
|
||||
};
|
||||
vendorHash = "sha256-ZPK3+x0GOMs2RXxIs90BvEg25lb/j11J9zECaMHg4zY=";
|
||||
vendorHash = "sha256-iCth5WrX0XG218PfbXt4jeA3MZuZ68eNaV+RtzMhXP0=";
|
||||
|
||||
# Exclude go within .github folder
|
||||
excludedPackages = ".github";
|
||||
|
||||
@@ -42,14 +42,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
gtksourceview5
|
||||
enchant
|
||||
icu
|
||||
libsysprof-capture
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# These were moved from buildInputs because they are
|
||||
# listed in `Requires` key of `libspelling-1.pc`
|
||||
glib
|
||||
gtk4
|
||||
gtksourceview5
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau-lsp";
|
||||
version = "1.45.0";
|
||||
version = "1.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnnyMorganz";
|
||||
repo = "luau-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OJAjTy0vTRb43TTiPeXafWq4kjIpnDXoTprVzbMnaWQ=";
|
||||
hash = "sha256-UlZ+v202E2daRsV3KBK2WD3NaXcIbhIFL32DZjZ/eus=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau";
|
||||
version = "0.672";
|
||||
version = "0.673";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-FMFW7AikBnoT6FZhmCOHKqRVCi2qcO8kXxYCaAfCfNY=";
|
||||
hash = "sha256-0a+4BHDIOeMuJzsDSlYeXCcmnUT5KzKO/q4kDhpfHxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lucky-commit";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "not-an-aardvark";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-57eOhlOkRU1sz0y/sfEyEFXQJx165qehBTP8iWiEGx8=";
|
||||
sha256 = "sha256-pghc2lTI81/z1bPJ6P2bFPyZkM8pko0V7lqv9rUUxWM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-8Z/bfSDjSrvGbPOVpvIYzOz5wxjkMsuwOWASnOA8ziM=";
|
||||
cargoHash = "sha256-zuWPkaYltxOOLaR6NTVkf1WbKzUQByml45jNL+e5UJ0=";
|
||||
|
||||
buildInputs = lib.optional (withOpenCL && (!stdenv.hostPlatform.isDarwin)) ocl-icd;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lux-cli";
|
||||
|
||||
version = "0.4.4";
|
||||
version = "0.5.0";
|
||||
|
||||
src = luaPackages.lux-lua.src;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "marktext";
|
||||
version = "0.17.0-unstable-2024-06-10";
|
||||
version = "0.17.1-unstable-2024-06-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marktext";
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mergiraf";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "mergiraf";
|
||||
repo = "mergiraf";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6psvTt0r+s5GuPpy1PwdvnUJ8n+lfvC2lWfMYzMvUkg=";
|
||||
hash = "sha256-CQriH0vZ+ZBSIZcj0MKQEojpugS2g4sCuDICmwLCUBE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-IJ/ywVDHMdd37/jCLzkYyBNVEow9sdK6iSDHlCZXKK0=";
|
||||
cargoHash = "sha256-nsWRysIupGC3w0L7OMChcgPPTHSwnmcKv58BTn51cY4=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "netdiscover";
|
||||
version = "0.11";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdiscover-scanner";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
hash = "sha256-LUM6vl6pohrTW3X9c1FaDE7j9mvMuAiDkFBKWc4KZso=";
|
||||
hash = "sha256-I3t9GsgKFo/eJrqYzj8T2Epfi3SURicwRYPBK25uHEw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-RI86VdWuPTcjkQstwDBN/rDLv/Imy9kYH/nIJSGuIcI=";
|
||||
hash = "sha256-7hTlY/WKJaw+ZMSn8A5F0p1vhg67NUY/CCjw7xdOg2M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,26 +4,26 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "obs-cmd";
|
||||
version = "0.18.2";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grigio";
|
||||
repo = "obs-cmd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/LgQqxZqxbE8hgip+yl8VVjiRYD+6AblKag2MQo1gDs=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ZKHm6N7y5FbDFiK2QfQ+9siexgzrdLpBs5Xikh1SRLo=";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Minimal CLI to control OBS Studio via obs-websocket";
|
||||
homepage = "https://github.com/grigio/obs-cmd";
|
||||
changelog = "https://github.com/grigio/obs-cmd/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
changelog = "https://github.com/grigio/obs-cmd/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "obs-cmd";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
poppler,
|
||||
nautilus,
|
||||
djvulibre,
|
||||
libspectre,
|
||||
libarchive,
|
||||
libsecret,
|
||||
wrapGAppsHook4,
|
||||
@@ -26,7 +25,8 @@
|
||||
gsettings-desktop-schemas,
|
||||
dbus,
|
||||
gi-docgen,
|
||||
libgxps,
|
||||
libsysprof-capture,
|
||||
libspelling,
|
||||
withLibsecret ? true,
|
||||
supportNautilus ? (!stdenv.hostPlatform.isDarwin),
|
||||
libadwaita,
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "papers";
|
||||
version = "47.3";
|
||||
version = "48.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -47,19 +47,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-PlhTk+gef6D5r55U38hvYSa1w9hS6pDf3DumsHlSxKo=";
|
||||
hash = "sha256-HpvFlhNCS/ZVIjxr3Khzri8d2ifPAtc0K/9bVZBRYG0=";
|
||||
};
|
||||
|
||||
cargoRoot = "shell-rs";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs)
|
||||
src
|
||||
pname
|
||||
version
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE=";
|
||||
hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -88,9 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gsettings-desktop-schemas
|
||||
libadwaita
|
||||
libarchive
|
||||
libgxps
|
||||
librsvg
|
||||
libspectre
|
||||
libsysprof-capture
|
||||
libspelling
|
||||
pango
|
||||
poppler
|
||||
]
|
||||
@@ -102,10 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
mesonFlags =
|
||||
[
|
||||
"-Dps=enabled"
|
||||
]
|
||||
++ lib.optionals (!withLibsecret) [
|
||||
lib.optionals (!withLibsecret) [
|
||||
"-Dkeyring=disabled"
|
||||
]
|
||||
++ lib.optionals (!supportNautilus) [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user