diff options
Diffstat (limited to 'pkgs/applications/misc')
327 files changed, 859 insertions, 945 deletions
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 21b445944abf..32825d3ba523 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,7 +9,7 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.27" else "8.10.28-11.BETA"; + version = if channel == "stable" then "8.10.27" else "8.10.28-21.BETA"; sources = { stable = { @@ -33,19 +33,19 @@ let beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-pchfBeZcXoyfSHutQqgAWkf6uzTEIQ/AbKDOC2N+BN8="; + hash = "sha256-Pz9tpGsKLmf37r0fnBxcE7qGjN3RZSF/iwQUnqev0Jk="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-rcjoyuEL8p4nCvjboPF0BV1lV5/+zo/rP9AP0ORB0N0="; + hash = "sha256-ezzdwUUcSBqJUKlG1By5HXbgrTFDpaGIJipU+V1FUBc="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-D3kYUpL69HMQnjJyzQ2/Ahiyt94uwxM86n7U9uQ/mVs="; + hash = "sha256-zFO8ypDqPGcJY/2eKke/ljQ4S3syI7jyZSexbYzBA+c="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-FJbFsMS/f7PHTvu9PxDgFQB3v47AsyESdKctr+S1LXk="; + hash = "sha256-LAhGmXqfcgjiDbE0RLhzpi15rluM8/fZ3GZ52yHdMKg="; }; }; }; diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 1bb980203b1d..140adde918fc 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -110,8 +110,8 @@ in stdenv.mkDerivation { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 895ba87f4f1e..9e9465f9c6ed 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.25.1"; + version = "2.26.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-3LUfqTaLpJal/tjtRzTztm8H4wl1g4VSHWiFRukAqvE=" "zip"; - i686-linux = fetch "linux_386" "sha256-QJu4SHfM4zzHP14MKaSydAeFCvAPa4wsMh+JvWGR7J4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-erZCpCH5Q4VqGO045qKP5KAp07xKgMKrVrY54btT5BM=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-kOAbr5MrDylgEQGMYUDklKCNNkZalVfJBcUwSZSMFH0=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-zWmWeAPtgSR8/3l40K4DPdMm0Pan+J1uNjUaEx+geO4=" "zip"; + i686-linux = fetch "linux_386" "sha256-OOjAMfRTSW+RuD0PPosvxMIPJcPQQok5Wn209sa0tuU=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-RwdEeqBFNj5dgBsmC2fiDwUGFWhuqeEL7g60ogFEq1Y=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-pwXHax0DBx1UpVmwYytpSikt5xdKZJXrdqvjWyWdUBM=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/9menu/default.nix b/pkgs/applications/misc/9menu/default.nix index 8e6b7b3bcbec..e383a2eb6b6f 100644 --- a/pkgs/applications/misc/9menu/default.nix +++ b/pkgs/applications/misc/9menu/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/arnoldrobbins/9menu"; description = "Simple X11 menu program for running commands"; + mainProgram = "9menu"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = libX11.meta.platforms; diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 6e20a855acb7..223fff1080e5 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -39,6 +39,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.sleepfiles.com/OSCAR/"; description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; + mainProgram = "OSCAR"; license = licenses.gpl3Only; maintainers = [ maintainers.roconnor ]; # Someone needs to create a suitable installPhase for Darwin and Windows. diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index a9cc6670e899..932db21317c6 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -41,6 +41,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "ABlog for blogging with Sphinx"; + mainProgram = "ablog"; homepage = "https://ablog.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ rgrinberg ]; diff --git a/pkgs/applications/misc/acpic/default.nix b/pkgs/applications/misc/acpic/default.nix index 7d05f0a05702..7a53e564c57c 100644 --- a/pkgs/applications/misc/acpic/default.nix +++ b/pkgs/applications/misc/acpic/default.nix @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Daemon extending acpid event handling capabilities."; + mainProgram = "acpic"; homepage = "https://github.com/psliwka/acpic"; license = licenses.wtfpl; maintainers = with maintainers; [ aacebedo ]; diff --git a/pkgs/applications/misc/aitrack/default.nix b/pkgs/applications/misc/aitrack/default.nix index 48e0afe13ebd..b9bb69623487 100644 --- a/pkgs/applications/misc/aitrack/default.nix +++ b/pkgs/applications/misc/aitrack/default.nix @@ -44,6 +44,7 @@ meta = with lib; { description = "6DoF Head tracking software"; + mainProgram = "aitrack"; maintainers = with maintainers; [ ck3d ]; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 3b27f5b96e30..35677f56cccb 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small GTK application to allow to keep a diary of your life"; + mainProgram = "almanah"; homepage = "https://wiki.gnome.org/Apps/Almanah_Diary"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 516b786222db..43fcab337a05 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -7,6 +7,7 @@ python3Packages.buildPythonApplication { meta = with lib; { homepage = "https://github.com/Tigge/antfs-cli"; description = "Extracts FIT files from ANT-FS based sport watches"; + mainProgram = "antfs-cli"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 78d353ce2a85..f45fb95aba59 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://naihe2010.github.io/apvlv/"; description = "PDF viewer with Vim-like behaviour"; + mainProgram = "apvlv"; longDescription = '' apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 with Vim-like behaviour. diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix index a4276dac1d1f..0ab79bb2134a 100644 --- a/pkgs/applications/misc/asciiquarium/default.nix +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -22,6 +22,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; + mainProgram = "asciiquarium"; homepage = "https://robobunny.com/projects/asciiquarium/html/"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index c9f97c5602b2..7b805496c2d8 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Convert .wav files into sound files for Lego NXT brick"; + mainProgram = "wavrsocvt"; longDescription = '' wavrsocvt is a command-line utility which can be used from a terminal window or script to convert .wav files into sound diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index dac943fee677..57e8b7620731 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "Two-factor authentication code generator for GNOME"; + mainProgram = "authenticator"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ austinbutler ]; diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 43aad6d5be16..bdd1e6fbb854 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -144,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Create and manage multiple choice questionnaires with automated marking."; + mainProgram = "auto-multiple-choice"; longDescription = '' Create, manage and mark multiple-choice questionnaires. auto-multiple-choice features automated or manual formatting with diff --git a/pkgs/applications/misc/avell-unofficial-control-center/default.nix b/pkgs/applications/misc/avell-unofficial-control-center/default.nix index 45d4f69075d2..c37d2c42b64f 100644 --- a/pkgs/applications/misc/avell-unofficial-control-center/default.nix +++ b/pkgs/applications/misc/avell-unofficial-control-center/default.nix @@ -20,6 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/rodgomesc/avell-unofficial-control-center"; description = "Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03"; + mainProgram = "aucc"; license = licenses.mit; maintainers = with maintainers; [ rkitover ]; }; diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 60559768994e..f58283564c13 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PC Software for BambuLab's 3D printers"; homepage = "https://github.com/bambulab/BambuStudio"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ zhaofengli ]; mainProgram = "bambu-studio"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index b600f6164010..dc55a4d02f69 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,24 +1,27 @@ { lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: -let - orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "1.9.1"; - pname = "orca-slicer"; - src = fetchFromGitHub { - owner = "SoftFever"; - repo = "OrcaSlicer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; - }; +bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { + version = "1.9.1"; + pname = "orca-slicer"; - meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; - homepage = "https://github.com/SoftFever/OrcaSlicer"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; - mainProgram = "orca-slicer"; - platforms = platforms.linux; - }; - }); -in -orca-slicer + # Don't inherit patches from bambu-studio + patches = [ + ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + ]; + + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; + }; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 0e3203e4a0b6..5fac61399127 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bemenu"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "Cloudef"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-pXuaNhrXy33rZxk+qisFWpYj6w9QW3p3WmGtE1kHGII="; + hash = "sha256-E/5wN7HpdBt//jFe9yAB8fuHKiFJ7D1UAJEvG8KBJ6k="; }; strictDeps = true; diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/applications/misc/bfcal/default.nix index 695f5bc69b0c..0f801aa2e130 100644 --- a/pkgs/applications/misc/bfcal/default.nix +++ b/pkgs/applications/misc/bfcal/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Quickly display a calendar"; + mainProgram = "bfcal"; homepage = "https://git.sr.ht/~bitfehler/bfcal"; license = licenses.gpl3Plus; platforms = qtbase.meta.platforms; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index f5b027a9b2de..f49477fae234 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://www.bibletime.info/"; description = "A powerful cross platform Bible study tool"; + mainProgram = "bibletime"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index f3e58b778718..21c6ac8c523d 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -63,6 +63,7 @@ buildPythonApplication rec { meta = with lib; { description = "Preprocessor for anyone writing specifications that converts source files into actual specs"; + mainProgram = "bikeshed"; longDescription = '' Bikeshed is a pre-processor for spec documents, turning a source document (containing only the actual spec content, plus several shorthands for linking diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix index 02b1b4c7b5d5..92ccc4112993 100644 --- a/pkgs/applications/misc/binocle/default.nix +++ b/pkgs/applications/misc/binocle/default.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Graphical tool to visualize binary data"; + mainProgram = "binocle"; homepage = "https://github.com/sharkdp/binocle"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index 4865f9f29eda..cbdb165a6484 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -31,6 +31,7 @@ mkDerivation rec { meta = with lib; { description = "Mail system tray notification icon for Thunderbird"; + mainProgram = "birdtray"; homepage = "https://github.com/gyunaev/birdtray"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix index d6c7faab4da5..5e067ac807d9 100644 --- a/pkgs/applications/misc/bitwarden-menu/default.nix +++ b/pkgs/applications/misc/bitwarden-menu/default.nix @@ -25,6 +25,7 @@ buildPythonApplication rec { meta = with lib; { changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}"; description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database."; + mainProgram = "bwm"; homepage = "https://github.com/firecat53/bitwarden-menu"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2a3a359b4304..c0fb3b336d0f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -84,6 +84,7 @@ let python3Packages = python310Packages; python3 = python3Packages.python; + pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them @@ -171,6 +172,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_SDL=OFF" "-DWITH_TBB=ON" + "-DWITH_USD=ON" # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" @@ -237,6 +239,7 @@ stdenv.mkDerivation (finalAttrs: { (opensubdiv.override { inherit cudaSupport; }) potrace pugixml + pyPkgsOpenusd python3 tbb zlib @@ -292,6 +295,7 @@ stdenv.mkDerivation (finalAttrs: { ps.numpy ps.requests ps.zstandard + pyPkgsOpenusd ]; blenderExecutable = diff --git a/pkgs/applications/misc/blucontrol/wrapper.nix b/pkgs/applications/misc/blucontrol/wrapper.nix index c0c76b4ef49d..3ace71b7644a 100644 --- a/pkgs/applications/misc/blucontrol/wrapper.nix +++ b/pkgs/applications/misc/blucontrol/wrapper.nix @@ -19,6 +19,7 @@ in meta = with lib; { description = "Configurable blue light filter"; + mainProgram = "blucontrol"; longDescription = '' This application is a blue light filter, with the main focus on configurability. Configuration is done in Haskell in the style of xmonad. diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/applications/misc/bluetooth_battery/default.nix index d9c3f5bc2a43..4158cdf8cc55 100644 --- a/pkgs/applications/misc/bluetooth_battery/default.nix +++ b/pkgs/applications/misc/bluetooth_battery/default.nix @@ -22,6 +22,7 @@ buildPythonApplication rec { meta = with lib; { description = "Fetch the battery charge level of some Bluetooth headsets"; + mainProgram = "bluetooth_battery"; homepage = "https://github.com/TheWeirdDev/Bluetooth_Headset_Battery_Level"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index e72f08fd381e..a4bbf4d4c104 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Break timer that forces you to take a break"; + mainProgram = "break-time"; homepage = "https://github.com/cdepillabout/break-time"; license = with licenses; [ mit ]; maintainers = with maintainers; [ cdepillabout ]; diff --git a/pkgs/applications/misc/brewtarget/default.nix b/pkgs/applications/misc/brewtarget/default.nix index 13a5681ebd37..d46cf7e0d5dd 100644 --- a/pkgs/applications/misc/brewtarget/default.nix +++ b/pkgs/applications/misc/brewtarget/default.nix @@ -33,6 +33,7 @@ mkDerivation rec { meta = with lib; { description = "Open source beer recipe creation tool"; + mainProgram = "brewtarget"; homepage = "http://www.brewtarget.org/"; license = licenses.gpl3; maintainers = [ maintainers.mmahut ]; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index ddf2b9f528da..4e2a5e29999c 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -78,6 +78,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with lib; { description = "Private cmdline bookmark manager"; + mainProgram = "buku"; homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/applications/misc/caerbannog/default.nix index 2825b371e06d..0d21c7e16570 100644 --- a/pkgs/applications/misc/caerbannog/default.nix +++ b/pkgs/applications/misc/caerbannog/default.nix @@ -52,6 +52,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Mobile-friendly Gtk frontend for password-store"; + mainProgram = "caerbannog"; homepage = "https://sr.ht/~craftyguy/caerbannog/"; changelog = "https://git.sr.ht/~craftyguy/caerbannog/refs/${version}"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/applications/misc/calcoo/default.nix index 5f90b4bb2363..462b56d50ce0 100644 --- a/pkgs/applications/misc/calcoo/default.nix +++ b/pkgs/applications/misc/calcoo/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchzip , ant -, canonicalize-jars-hook +, stripJavaArchivesHook , jdk , makeWrapper }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ ant - canonicalize-jars-hook + stripJavaArchivesHook jdk makeWrapper ]; diff --git a/pkgs/applications/misc/calcure/default.nix b/pkgs/applications/misc/calcure/default.nix index dcd2c62d2185..a9fd65a4d99d 100644 --- a/pkgs/applications/misc/calcure/default.nix +++ b/pkgs/applications/misc/calcure/default.nix @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Modern TUI calendar and task manager with minimal and customizable UI"; + mainProgram = "calcure"; homepage = "https://github.com/anufrievroman/calcure"; changelog = "https://github.com/anufrievroman/calcure/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6003212d16b5..da1e263107b3 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-fD2kTwH692x6Nm93NrUQvmbcXiX9hHBpo4wvUvBqLAM="; + hash = "sha256-+kz3Fz1RDQ+ROgv7y0WNAWvIESKvHKID8UnSeCh8yA4="; }; patches = [ diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/applications/misc/cambrinary/default.nix index 1fecfe1c17cb..15bb60d4c3f7 100644 --- a/pkgs/applications/misc/cambrinary/default.nix +++ b/pkgs/applications/misc/cambrinary/default.nix @@ -31,6 +31,7 @@ buildPythonApplication rec { meta = with lib; { description = "Cambridge dictionary in a terminal"; + mainProgram = "cambrinary"; homepage = "https://github.com/xueyuanl/cambrinary"; license = licenses.gpl3Only; platforms = platforms.unix; diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 3f9f2ec678b5..7b62e50e9006 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -25,6 +25,7 @@ mkDerivation rec { meta = with lib; { description = "GRBL controller application with G-Code visualizer written in Qt"; + mainProgram = "candle"; homepage = "https://github.com/Denvi/Candle"; license = licenses.gpl3; maintainers = with maintainers; [ matti-kariluoma ]; diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix index d90be2bc101c..008004aa3c8e 100644 --- a/pkgs/applications/misc/cartridges/default.nix +++ b/pkgs/applications/misc/cartridges/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A GTK4 + Libadwaita game launcher"; + mainProgram = "cartridges"; longDescription = '' A simple game launcher for all of your games. It has support for importing games from Steam, Lutris, Heroic diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index 603060ec5241..462696348839 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Public server and API to interface with Cask features"; + mainProgram = "CaskServer"; homepage = "https://github.com/Nitrux/cask-server"; license = with licenses; [ bsd2 diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 4d189d1c37a4..665957ca0ea1 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight and fast battery icon that sits in the system tray"; + mainProgram = "cbatticon"; homepage = "https://github.com/valr/cbatticon"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index 62db56495860..9ec41576c1a8 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -41,6 +41,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/npiv/chatblade/"; description = "A CLI Swiss Army Knife for ChatGPT"; + mainProgram = "chatblade"; license = licenses.gpl3Only; maintainers = with maintainers; [ deejayem ]; }; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 11944a21e0ef..74623b544af1 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An hierarchical note taking application"; + mainProgram = "cherrytree"; longDescription = '' Cherrytree is an hierarchical note taking application, featuring rich text, syntax highlighting and powerful search capabilities. It organizes diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index 13ee17999fe1..9cf163055a4b 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -19,6 +19,7 @@ mkDerivation rec { meta = with lib; { description = "Cross platform chewing user phrase editor"; + mainProgram = "chewing-editor"; longDescription = '' chewing-editor is a cross platform chewing user phrase editor. It provides a easy way to manage user phrase. With it, user can customize their user phrase to increase input performance. ''; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 7e6b84913a7a..b6958d86bbd0 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux bus interface that changes screen brightness/temperature"; + mainProgram = "clightd"; homepage = "https://github.com/FedeDP/Clightd"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 84095c416541..7646cb9ae87b 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -19,6 +19,7 @@ mkDerivation rec { meta = { description = "Offline conference schedule viewer"; + mainProgram = "confclerk"; homepage = "http://www.toastfreeware.priv.at/confclerk"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ehmry ]; diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index a1a63992349e..d75cdd4843fa 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -20,6 +20,7 @@ mkDerivation rec { broken = stdenv.isDarwin; homepage = "https://github.com/buggins/coolreader"; description = "Cross platform open source e-book reader"; + mainProgram = "cr3"; license = licenses.gpl2Plus; # see https://github.com/buggins/coolreader/issues/80 maintainers = with maintainers; [ gebner ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index dacb6c3af93d..79472e3840a4 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , cmake , ninja , extra-cmake-modules @@ -14,32 +13,24 @@ , qtwayland , wayland , wrapQtAppsHook +, kdePackages }: stdenv.mkDerivation rec { pname = "CopyQ"; - version = "7.1.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-aAmpFKIIFZLPWUaOcf4V1d/wVQ7xRcnXFsqFjROsabg="; + hash = "sha256-Ewunl4k9f0aDjilhKAsVxwR3S6uSZ1xwtu6ccNsNOgk="; }; - patches = [ - # itemfakevim: fix build with qt 6.6.0 - # https://github.com/hluk/CopyQ/pull/2508 - (fetchpatch2 { - url = "https://github.com/hluk/CopyQ/commit/a20bfff0d78296b334ff8cabb047ab5d842b7311.patch"; - hash = "sha256-F/6cQ8+O1Ttd4EFFxQas5ES6U+qxWdmYqUWRQLsVMa4="; - }) - ]; - nativeBuildInputs = [ cmake ninja - extra-cmake-modules + kdePackages.extra-cmake-modules wrapQtAppsHook ]; @@ -52,6 +43,9 @@ stdenv.mkDerivation rec { libXtst qtwayland wayland + kdePackages.kconfig + kdePackages.kstatusnotifieritem + kdePackages.knotifications ]; postPatch = '' diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 2b17ea756878..a7397da8d7cf 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -9,6 +9,8 @@ , glxinfo , polkit , procps +, pugixml +, spdlog , util-linux , vulkan-tools , qtbase @@ -23,13 +25,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.3.10"; + version = "1.4.0"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-fN4dX0Ya2DvPEkuwtKIw1zT+JEbC2zyJKtcGwLVdAUs="; + sha256 = "sha256-zTH7iSPN7VIhXvWFndOulvGnfUZ+uGWnW53WcnSW+e4="; }; patches = [ ./polkit-dir.patch @@ -47,6 +49,8 @@ stdenv.mkDerivation rec{ glxinfo polkit procps + pugixml + spdlog util-linux vulkan-tools qtbase diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 824b4353b35f..10ec80724739 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.4.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-q0SI/y4pSNoU+4aQzpkUNioqrxmLxiA2GD1pmyLUISw="; + hash = "sha256-Zs/RUpyu8GG4koprC+8aSzpPUSLc19p/XinY5fR5Z4A="; }; - cargoHash = "sha256-pwhihmrFzb7y4ztXnzJVeMbo5VBoyjJTEDh5ogECLrA="; + cargoHash = "sha256-jYKu1sAzPUfv8gQj3V4zxarRj3XUhyD/5n1WqMuLF/g="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index f95633f0c896..67848ea9354e 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -75,6 +75,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CLI for downloading Coursera.org videos and naming them"; + mainProgram = "coursera-dl"; homepage = "https://github.com/coursera-dl/coursera-dl"; changelog = "https://github.com/coursera-dl/coursera-dl/blob/0.11.5/CHANGELOG.md"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index dd4486f9b988..fd07542b7fa9 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "A graphical Minecraft seed finder and map viewer"; + mainProgram = "cubiomes-viewer"; longDescription = '' Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding utilities provided by cubiomes and a map viewer for the Minecraft biomes and structure generation. diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index b21f001a0a80..818e9da4494e 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -25,6 +25,7 @@ mkDerivation rec { meta = with lib; { description = "A side bar for showing widgets from the C Suite"; + mainProgram = "coreaction"; homepage = "https://gitlab.com/cubocore/coreapps/coreaction"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 590f41a764d0..691917e28da9 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -26,6 +26,7 @@ mkDerivation rec { meta = with lib; { description = "Archiver from the C Suite to create and extract archives"; + mainProgram = "corearchiver"; homepage = "https://gitlab.com/cubocore/coreapps/corearchiver"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index c618ee100a28..6bbd8ed8f785 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "A lightwight filemanager from the C Suite"; + mainProgram = "corefm"; homepage = "https://gitlab.com/cubocore/coreapps/corefm"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 4c332c4a9a2b..8a7050e5538a 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -26,6 +26,7 @@ mkDerivation rec { meta = with lib; { description = "A settings manager for the C Suite"; + mainProgram = "coregarage"; homepage = "https://gitlab.com/cubocore/coreapps/coregarage"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index 52c39752afae..d802a6f448af 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "A file finder utility from the C Suite"; + mainProgram = "corehunt"; homepage = "https://gitlab.com/cubocore/coreapps/corehunt"; license = licenses.gpl3Only; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 8ba09d6c9416..cbb5fba861fb 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "An image viewer from the C Suite"; + mainProgram = "coreimage"; homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index 69dbcd33a85f..6093c1176b80 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -27,6 +27,7 @@ mkDerivation rec { meta = with lib; { description = "A file information tool from the C Suite"; + mainProgram = "coreinfo"; homepage = "https://gitlab.com/cubocore/coreapps/coreinfo"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 734b183c844d..dcd05b4bf77f 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -27,6 +27,7 @@ mkDerivation rec { meta = with lib; { description = "A virtual keyboard for X11 from the C Suite"; + mainProgram = "corekeyboard"; homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index 4b27137980ea..8db13988b0b0 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "A document editor from the C Suite"; + mainProgram = "corepad"; homepage = "https://gitlab.com/cubocore/coreapps/corepad"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 958532bb6fce..345a9b26e666 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "A paint app from the C Suite"; + mainProgram = "corepaint"; homepage = "https://gitlab.com/cubocore/coreapps/corepaint"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index b7679827f321..242422fd8a3f 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -26,6 +26,7 @@ mkDerivation rec { meta = with lib; { description = "A PDF viewer from the C Suite"; + mainProgram = "corepdf"; homepage = "https://gitlab.com/cubocore/coreapps/corepdf"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index e1274c6d6dfe..cb31415ef5d0 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "A bookmarking app from the C Suite"; + mainProgram = "corepins"; homepage = "https://gitlab.com/cubocore/coreapps/corepins"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index 7d87fc6f4526..6d48c65fc95f 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "A batch file renamer from the C Suite"; + mainProgram = "corerenamer"; homepage = "https://gitlab.com/cubocore/coreapps/corerenamer"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index 183765f63511..3603becfc1e3 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -25,6 +25,7 @@ mkDerivation rec { meta = with lib; { description = "A screen capture utility from the C Suite"; + mainProgram = "coreshot"; homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index 8dd6f1089d45..e01691b9f618 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -25,6 +25,7 @@ mkDerivation rec { meta = with lib; { description = "A system resource viewer from the C Suite"; + mainProgram = "corestats"; homepage = "https://gitlab.com/cubocore/coreapps/corestats"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index a2946485ab56..933a09bbd188 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -32,6 +32,7 @@ mkDerivation rec { meta = with lib; { description = "An activity viewer from the C Suite"; + mainProgram = "corestuff"; homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index 30570f5e91e5..c4a8ea5c90e9 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -36,6 +36,7 @@ mkDerivation rec { meta = with lib; { description = "A terminal emulator from the C Suite"; + mainProgram = "coreterminal"; homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index c2a717453e78..b8ac4c39a1a3 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -25,6 +25,7 @@ mkDerivation rec { meta = with lib; { description = "A time related task manager from the C Suite"; + mainProgram = "coretime"; homepage = "https://gitlab.com/cubocore/coreapps/coretime"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index 920850cc6021..1296c8f57564 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -79,6 +79,7 @@ mkDerivation rec { meta = with lib; { description = "Additional features,plugins etc for CuboCore Application Suite"; + mainProgram = "shareIT"; homepage = "https://gitlab.com/cubocore/coreapps/coretoppings"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index 8eb056f7772c..df84578090f8 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Shows information about apps from the C Suite"; + mainProgram = "coreuniverse"; homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index d49987c82858..b06f77787ac0 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -28,6 +28,7 @@ buildPythonApplication rec { meta = with lib; { description = "comic updater, mangafied"; + mainProgram = "cum"; homepage = "https://github.com/Hamuko/cum"; license = licenses.asl20; maintainers = with maintainers; [ tadeokondrak ]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 31202a4be6e3..a385d31ec74b 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -57,6 +57,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; + mainProgram = "cura"; homepage = "https://github.com/Ultimaker/Cura"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 95d3a2aa9333..12f7920d3bf7 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -27,7 +27,7 @@ let meta = with lib; { description = "Enables printing directly to OctoPrint and monitoring the process"; homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ gebner ]; }; }; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 6bddfabfb5bb..0de7e18f172d 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Engine for processing 3D models into 3D printing instructions"; + mainProgram = "CuraEngine"; homepage = "https://github.com/Ultimaker/CuraEngine"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 75ffbb9080bd..56bd8bce5bc0 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "dasel"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-4SINZXjTILJDmjv6ubuAhBzBmrXY0gJ0huNM3Y0O7Go="; + hash = "sha256-N3WeU+8KJwYKvuN4I1ZNEtIgLTmh/XgnhwATwV7dsvY="; }; vendorHash = "sha256-G9IdTMF5Lnwq38rdJtuvUjD4RBaSmCYs3g+ETz29Mec="; diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix index 520c49d2159b..045e37cef160 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/applications/misc/ddcui/default.nix @@ -34,6 +34,7 @@ mkDerivation rec { meta = with lib; { description = "Graphical user interface for ddcutil - control monitor settings"; + mainProgram = "ddcui"; homepage = "https://www.ddcutil.com/ddcui_main/"; license = licenses.gpl2; maintainers = with maintainers; [ nh2 ]; diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix index 773b1b36e514..f977fd1980bb 100644 --- a/pkgs/applications/misc/deckmaster/default.nix +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -38,6 +38,7 @@ buildGoModule rec { meta = with lib; { description = "An application to control your Elgato Stream Deck on Linux"; + mainProgram = "deckmaster"; homepage = "https://github.com/muesli/deckmaster"; changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/applications/misc/dict-cc-py/default.nix b/pkgs/applications/misc/dict-cc-py/default.nix index cbacf1191275..9d4c40084f7f 100644 --- a/pkgs/applications/misc/dict-cc-py/default.nix +++ b/pkgs/applications/misc/dict-cc-py/default.nix @@ -25,6 +25,7 @@ python3.pkgs.buildPythonPackage rec { meta = with lib; { description = "Unofficial command line client for dict.cc"; + mainProgram = "dict.cc.py"; homepage = "https://github.com/rbaron/dict.cc.py"; license = with licenses; [ cc0 ]; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 370f41b1b831..4792003b792e 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -51,6 +51,7 @@ mkDerivation rec { meta = { homepage = "http://www.qtrac.eu/diffpdfc.html"; description = "Tool for diffing pdf files visually or textually"; + mainProgram = "diffpdf"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index 75e5f34174bc..0f5cf3c0adc1 100644 --- a/pkgs/applications/misc/diffuse/default.nix +++ b/pkgs/applications/misc/diffuse/default.nix @@ -71,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/MightyCreak/diffuse"; description = "Graphical tool for merging and comparing text files"; + mainProgram = "diffuse"; license = licenses.gpl2; maintainers = with maintainers; [ k3a ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 3c193d3f569a..d0791b492f09 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple and fast dictionary lookup tool"; + mainProgram = "ding"; homepage = "https://www-user.tu-chemnitz.de/~fri/ding/"; license = licenses.gpl2Plus; platforms = platforms.linux; # homepage says: unix-like except darwin diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index d5208ea7b02d..75c9302e0791 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -28,6 +28,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/dotlambda/dmensamenu"; description = "Print German canteen menus using dmenu and OpenMensa"; + mainProgram = "dmensamenu"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/applications/misc/dmenu-rs/Cargo.lock b/pkgs/applications/misc/dmenu-rs/Cargo.lock index f3da4c99885d..33e74c4e7ddf 100644 --- a/pkgs/applications/misc/dmenu-rs/Cargo.lock +++ b/pkgs/applications/misc/dmenu-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -22,39 +22,47 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", + "colorchoice", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] [[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] name = "anstyle-wincon" -version = "0.2.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -77,7 +85,7 @@ version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -100,6 +108,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -107,9 +121,12 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -128,9 +145,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -145,7 +162,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -155,45 +172,43 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.0" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.0" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671fcaa5debda4b9a84aa7fde49c907c8986c0e6ab927e04217c9cb74e7c8bc9" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim 0.10.0", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard" @@ -227,19 +242,10 @@ dependencies = [ ] [[package]] -name = "concolor-override" +name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "config" @@ -255,9 +261,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -267,9 +273,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -319,9 +325,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -331,23 +337,12 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "errno" -version = "0.2.8" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] @@ -373,9 +368,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -413,29 +408,26 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "io-lifetimes" -version = "1.0.9" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "hermit-abi 0.3.1", - "libc", "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi 0.3.3", "rustix", "windows-sys", ] @@ -460,9 +452,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "lazy_static" @@ -478,9 +470,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -493,6 +485,17 @@ dependencies = [ ] [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -500,18 +503,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "malloc_buf" @@ -531,9 +531,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "minimal-lexical" @@ -582,9 +582,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "overrider" @@ -615,9 +615,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pledge" @@ -644,9 +644,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -663,38 +663,50 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -703,9 +715,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustc-hash" @@ -734,13 +746,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.11" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ - "bitflags", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -748,15 +759,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "semver" @@ -775,9 +786,23 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "servo-fontconfig" @@ -802,15 +827,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "stest" version = "0.0.0" dependencies = [ - "clap 4.2.0", + "clap 4.4.8", ] [[package]] @@ -838,9 +863,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -860,9 +885,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -878,29 +903,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.39", ] [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" @@ -910,9 +935,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "utf8parse" @@ -934,13 +959,14 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -961,9 +987,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -976,18 +1002,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1000,45 +1026,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "x11" diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix index 1635e383e9bc..3340171c2da6 100644 --- a/pkgs/applications/misc/dmenu-rs/default.nix +++ b/pkgs/applications/misc/dmenu-rs/default.nix @@ -2,7 +2,6 @@ , rustPlatform , lib , fetchFromGitHub -, fetchpatch , cargo , expat , fontconfig @@ -19,13 +18,13 @@ # See: https://github.com/Shizcow/dmenu-rs#plugins stdenv.mkDerivation rec { pname = "dmenu-rs"; - version = "5.5.2"; + version = "5.5.3"; src = fetchFromGitHub { owner = "Shizcow"; - repo = pname; + repo = "dmenu-rs"; rev = version; - sha256 = "sha256-6yO2S6j/BD6x/bsuTFKAKvARl1n94KRiPwpmswmUOPU="; + hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g="; }; nativeBuildInputs = [ @@ -52,17 +51,6 @@ stdenv.mkDerivation rec { lockFile = ./Cargo.lock; }; - # Fix a bug in the makefile when installing. - # See https://github.com/Shizcow/dmenu-rs/pull/50 - patches = let - fix-broken-make-install-patch = fetchpatch { - url = "https://github.com/Shizcow/dmenu-rs/commit/1f4b3f8a07d73272f8c6f19bfb6ff3de5e042815.patch"; - sha256 = "sha256-hmXApWg8qngc1vHkHUnB7Lt7wQUOyCSsBmn4HC1j53M="; - }; - in [ - fix-broken-make-install-patch - ]; - # Copy the Cargo.lock stored here in nixpkgs into the build directory. postPatch = '' cp ${./Cargo.lock} src/Cargo.lock diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index b53fab409b04..70f7b0b58ca4 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dmenu"; - version = "5.2"; + version = "5.3"; src = fetchurl { url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; - sha256 = "sha256-1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I="; + sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8="; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/pkgs/applications/misc/dnd-tools/default.nix b/pkgs/applications/misc/dnd-tools/default.nix index 3b0d0ec90e25..130b4bd63126 100644 --- a/pkgs/applications/misc/dnd-tools/default.nix +++ b/pkgs/applications/misc/dnd-tools/default.nix @@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/savagezen/dnd-tools"; description = "A set of interactive command line tools for Dungeons and Dragons 5th Edition"; + mainProgram = "dnd-tools"; license = licenses.agpl3Only; maintainers = [ maintainers.urlordjames ]; }; diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/applications/misc/done/default.nix index 5e163df938b8..cbc23dc9eb4f 100644 --- a/pkgs/applications/misc/done/default.nix +++ b/pkgs/applications/misc/done/default.nix @@ -60,8 +60,6 @@ stdenv.mkDerivation rec { env = lib.optionalAttrs stdenv.isDarwin { GETTEXT_DIR = gettext; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; meta = with lib; { diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 52d5016200f9..017d18b0bce8 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -17,6 +17,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Easily manage your dotfiles"; + mainProgram = "dotfiles"; homepage = "https://github.com/jbernard/dotfiles"; license = licenses.isc; }; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 7760b57dd3b9..f28d1bf7e043 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -82,6 +82,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A Bitcoin Cash SPV Wallet"; + mainProgram = "electron-cash"; longDescription = '' An easy-to-use Bitcoin Cash client featuring wallets generated from mnemonic seeds (in addition to other, more advanced, wallet options) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 986681d5a819..eb24885ca142 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -9,10 +9,27 @@ , enableQt ? true , callPackage , qtwayland +, fetchPypi }: let - version = "4.5.3"; + version = "4.5.4"; + + python = python3.override { + self = python; + packageOverrides = self: super: { + # Pin ledger-bitcoin to 0.2.1 + ledger-bitcoin = super.ledger-bitcoin.overridePythonAttrs (oldAttrs: rec { + version = "0.2.1"; + format = "pyproject"; + src = fetchPypi { + pname = "ledger_bitcoin"; + inherit version; + hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; + }; + }); + }; + }; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -29,7 +46,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-Lr6ynHAbyaiaxYAWU5j5Wh5acxO5HkP1/jpnFrL4j68="; + sha256 = "sha256-fDu2PlEQOF7ftlS6dYw15S2XiAx+D/bng4zC9ELj6uk="; postFetch = '' mv $out ./all @@ -39,13 +56,13 @@ let in -python3.pkgs.buildPythonApplication { +python.pkgs.buildPythonApplication { pname = "electrum"; inherit version; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-kej0msc7SB+51ad5xZrT8MMEY5rfYOGqum6RO1gBH5s="; + sha256 = "sha256-lDuwXhOjcbCx8x/oIoigrklDwCbhn1trf5lDf/X/1Qc="; }; postUnpack = '' @@ -56,7 +73,7 @@ python3.pkgs.buildPythonApplication { nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -80,12 +97,15 @@ python3.pkgs.buildPythonApplication { ckcc-protocol keepkey trezor + bitbox02 + cbor + pyserial ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; - checkInputs = with python3.pkgs; lib.optionals enableQt [ + checkInputs = with python.pkgs; lib.optionals enableQt [ pyqt6 ]; @@ -117,7 +137,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "tests" ]; @@ -140,7 +160,7 @@ python3.pkgs.buildPythonApplication { changelog = "https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ joachifm np prusnak ]; + maintainers = with maintainers; [ joachifm np prusnak chewblacka ]; mainProgram = "electrum"; }; } diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index 87a85e9f986d..4ca911126c5b 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -10,7 +10,7 @@ }: let - version = "4.4.4"; + version = "4.5.4"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -32,11 +32,11 @@ python3.pkgs.buildPythonApplication { owner = "Groestlcoin"; repo = "electrum-grs"; rev = "refs/tags/v${version}"; - sha256 = "0fl01qdvb1z6l6kwipj1lj0qmjk3mzw25wv7yh5j1hh1f5lng0s8"; + sha256 = "1k078jg3bw4n3kcxy917m30x1skxm679w8hcw8mlxb94ikrjc66h"; }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -56,17 +56,25 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng certifi + jsonpatch # plugins btchip-python ledger-bitcoin ckcc-protocol keepkey trezor + bitbox02 + cbor + pyserial ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; + checkInputs = with python3.pkgs; lib.optionals enableQt [ + pyqt6 + ]; + postPatch = '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ @@ -115,5 +123,6 @@ python3.pkgs.buildPythonApplication { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ gruve-p ]; + mainProgram = "electrum-grs"; }; } diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 9b0c63834cfb..a85252027e96 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -127,6 +127,7 @@ python3.pkgs.buildPythonApplication { meta = with lib; { description = "Lightweight Litecoin Client"; + mainProgram = "electrum-ltc"; longDescription = '' Electrum-LTC is a simple, but powerful Litecoin wallet. A unique secret phrase (or “seed”) leaves intruders stranded and your peace of mind diff --git a/pkgs/applications/misc/electrum/update.nix b/pkgs/applications/misc/electrum/update.nix index 7a0fb8fd3eb6..509a64378088 100644 --- a/pkgs/applications/misc/electrum/update.nix +++ b/pkgs/applications/misc/electrum/update.nix @@ -4,6 +4,7 @@ , bash , coreutils , curl +, fetchurl , gnugrep , gnupg , gnused @@ -13,7 +14,22 @@ let downloadPageUrl = "https://download.electrum.org"; - signingKeys = ["6694 D8DE 7BE8 EE56 31BE D950 2BD5 824B 7F94 70E6"]; + signingKeys = lib.lists.map fetchurl [ + { + url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/Emzy.asc"; + hash = "sha256-QG0cM6AKlSKFacVlhcso/xvrooUdF7oqoppyezt0hjE="; + } + { + url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/ThomasV.asc"; + hash = "sha256-37ApVZlI+2EevxQIKXVKVpktt1Ls3UbWq4dfio2ORdo="; + } + { + url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/sombernight_releasekey.asc"; + hash = "sha256-GgdPJ9TB5hh5SPCcTZURfqXkrU4qwl0dCci52V/wpdQ="; + } + ]; + + gpgImportPaths = lib.concatStringsSep " " signingKeys; in writeScript "update-electrum" '' @@ -48,7 +64,7 @@ sigFile=$srcFile.asc export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" -gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)} +gpg --batch --import ${gpgImportPaths} gpg --batch --verify "$sigFile" "$srcFile" sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$srcFile") diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/applications/misc/epr/default.nix index 20b2b4ba8d90..5728972f2bd8 100644 --- a/pkgs/applications/misc/epr/default.nix +++ b/pkgs/applications/misc/epr/default.nix @@ -13,6 +13,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "CLI Epub Reader"; + mainProgram = "epr"; homepage = "https://github.com/wustho/epr"; license = licenses.mit; maintainers = [ maintainers.Br1ght0ne ]; diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index a4bbdc2eb7b3..85ff399ac83f 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://www.etesync.com/"; description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; + mainProgram = "etesync-dav"; license = licenses.gpl3; maintainers = with maintainers; [ thyol valodim ]; broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix index 9092fe99ff76..42000afd3d7e 100644 --- a/pkgs/applications/misc/evtest-qt/default.nix +++ b/pkgs/applications/misc/evtest-qt/default.nix @@ -30,6 +30,7 @@ mkDerivation rec { meta = with lib; { description = "Simple input device tester for linux with Qt GUI"; + mainProgram = "evtest-qt"; homepage = "https://github.com/Grumbel/evtest-qt"; maintainers = with maintainers; [ alexarice ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix index 35ea33bde3a2..b47fca90b9f6 100644 --- a/pkgs/applications/misc/extract_url/default.nix +++ b/pkgs/applications/misc/extract_url/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.memoryhole.net/~kyle/extract_url/"; description = "Extracts URLs from MIME messages or plain text"; + mainProgram = "extract_url"; license = licenses.bsd2; maintainers = [ maintainers.qyliss ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 7987a3c44d02..9aa92101a1cc 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -60,6 +60,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A self-hostable, statically generated bandcamp alternative"; + mainProgram = "faircamp"; longDescription = '' Faircamp takes a directory on your disk - your Catalog - and from it produces a fancy-looking (and technically simple and completely static) diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index 161991f03264..90d3f3b01424 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -71,6 +71,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { homepage = "https://github.com/trizen/fbmenugen"; description = "Simple menu generator for the Fluxbox Window Manager"; + mainProgram = "fbmenugen"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index a3f791940cbf..351796a036d2 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fucking Fast File-Manager"; + mainProgram = "fff"; homepage = "https://github.com/dylanaraps/fff"; license = licenses.mit; maintainers = [ maintainers.tadeokondrak ]; diff --git a/pkgs/applications/misc/flowtime/default.nix b/pkgs/applications/misc/flowtime/default.nix index 6637cb878191..06962d75452b 100644 --- a/pkgs/applications/misc/flowtime/default.nix +++ b/pkgs/applications/misc/flowtime/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Get what motivates you done, without losing concentration"; + mainProgram = "flowtime"; homepage = "https://github.com/Diego-Ivan/Flowtime"; license = licenses.gpl3Plus; maintainers = with maintainers; [ foo-dogsquared pokon548 ]; diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 719f08db6bcd..19e70ad7c54c 100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -53,6 +53,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A Gui editor (gtk) to configure applications launching on a fluxbox session"; + mainProgram = "fluxboxlauncher"; homepage = "https://github.com/mothsART/fluxboxlauncher"; maintainers = with maintainers; [ mothsart ]; license = licenses.bsdOriginal; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 40cbeaea6130..309d8fa2faf5 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fontmanager.github.io/"; description = "Simple font management for GTK desktop environments"; + mainProgram = "font-manager"; longDescription = '' Font Manager is intended to provide a way for average users to easily manage desktop fonts, without having to resort to command diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index ff84ecdf55f0..0bdf8df306a8 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mind-mapping software"; + mainProgram = "freemind"; homepage = "https://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/furtherance/default.nix b/pkgs/applications/misc/furtherance/default.nix index f6fea4c633d0..15616f32bebd 100644 --- a/pkgs/applications/misc/furtherance/default.nix +++ b/pkgs/applications/misc/furtherance/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Track your time without being tracked"; + mainProgram = "furtherance"; homepage = "https://github.com/lakoliu/Furtherance"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index 813b8113ee30..c69b7c0633f4 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -32,6 +32,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nh-server/fusee-interfacee-tk"; description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; + mainProgram = "fusee-interfacee-tk"; longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. Must be run as sudo."; maintainers = with maintainers; [ kristian-brucaj ]; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 04efe6f52dcd..bc293b455b2a 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple Gtk/Qt front-end to tesseract-ocr"; + mainProgram = "gimagereader-gtk"; homepage = "https://github.com/manisandro/gImageReader"; license = licenses.gpl3Plus; maintainers = with maintainers; [teto]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 09c0cdd0d1c4..7fb177d48289 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.8"; + version = "1.26.9"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-tfNmKgWKr2TGQNgvC/qo2+Dvij4LUL0Zy77mfTcci2k="; + sha256 = "sha256-PgbfppyJCpgFupBQng8MUPihbDmit4C+xWnSzCJyu5k="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 90b4883ec290..47950616578e 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -30,6 +30,7 @@ buildPythonApplication rec { meta = with lib; { description = "CLI for Google Calendar"; + mainProgram = "gcalcli"; homepage = "https://github.com/insanum/gcalcli"; license = licenses.mit; maintainers = with maintainers; [ nocoolnametom ]; diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix index 4a6b45469d27..0f6478f50fcd 100644 --- a/pkgs/applications/misc/gcstar/default.nix +++ b/pkgs/applications/misc/gcstar/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.com/Kerenoc/GCstar"; description = "Manage your collections of movies, games, books, music and more"; + mainProgram = "gcstar"; longDescription = '' GCstar is an application for managing your collections. It supports many types of collections, including movies, books, games, comics, stamps, coins, and many more. diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 12d056b01ec6..4f455d901c2d 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -46,6 +46,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { description = "Downloads TV and radio programmes from BBC iPlayer and BBC Sounds"; + mainProgram = "get_iplayer"; license = licenses.gpl3Plus; homepage = "https://github.com/get-iplayer/get_iplayer"; platforms = platforms.all; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 14173fc7057f..df5d6138d35f 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -80,6 +80,7 @@ in description = '' OpenGL audio spectrum visualizer ''; + mainProgram = "glava"; homepage = "https://github.com/wacossusca34/glava"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index a8465538b50a..31c62f53423c 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems"; + mainProgram = "gmtp"; homepage = "https://gmtp.sourceforge.io"; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index defaad0d2c97..4f94a5bc7f6b 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/gnome-firmware"; description = "Tool for installing firmware on devices"; + mainProgram = "gnome-firmware"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 31d81a332790..b4cca2f3bf63 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for writing an ISO file to multiple USB devices at once"; + mainProgram = "gnome-multi-writer"; homepage = "https://wiki.gnome.org/Apps/MultiWriter"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 818ef8fb96a0..dc4df70bc00e 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Recipe management application for GNOME"; + mainProgram = "gnome-recipes"; homepage = "https://wiki.gnome.org/Apps/Recipes"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index 179facc64fd5..c969c92ffdd2 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A nice way to view information about use of system resources, like memory and disk space"; + mainProgram = "gnome-usage"; homepage = "https://gitlab.gnome.org/GNOME/gnome-usage"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 1345dc51593d..9cc9b3bf6d47 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -76,6 +76,7 @@ in mkDerivation rec { meta = { description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; + mainProgram = "GoldenCheetah"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ adamcstephens ]; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix index 1af03a1528a2..aef599323b81 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with lib; { description = "A simple text-based Minecraft modpack manager"; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = src.meta.homepage; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index afb02c9937f9..0f1e60ff0165 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fuse FS to mount a digital camera"; + mainProgram = "gphotofs"; homepage = "http://www.gphoto.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 887a469397e1..9a18c9d5c9d9 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; + mainProgram = "gpx-viewer"; changelog = "https://github.com/DaveDavenport/gpx-viewer/blob/${src.rev}/NEWS"; platforms = with platforms; linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index 9d3d7c27ec8c..18c31afef6b5 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -27,6 +27,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/BourgeoisLab/GPXLab"; description = "Program to show and manipulate GPS tracks"; + mainProgram = "gpxlab"; longDescription = '' GPXLab is an application to display and manage GPS tracks previously recorded with a GPS tracker. diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 79164e932f33..227177d14369 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { broken = isQt6 && stdenv.isDarwin; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; description = "GPS log file viewer and analyzer"; + mainProgram = "gpxsee"; homepage = "https://www.gpxsee.org/"; license = lib.licenses.gpl3Only; longDescription = '' diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 7539b22087c3..bd0690b381a9 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -109,6 +109,7 @@ buildPythonApplication rec { meta = with lib; { description = "Genealogy software"; + mainProgram = "gramps"; homepage = "https://gramps-project.org"; maintainers = with maintainers; [ jk pinpox ]; changelog = "https://github.com/gramps-project/gramps/blob/v${version}/ChangeLog"; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index d9e0204be322..7131c5cd1227 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gummi.app"; description = "Simple LaTex editor for GTK users"; + mainProgram = "gummi"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ flokli ]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index 5f7b51bb6ee6..c425014e24ed 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -51,6 +51,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Time tracking application"; + mainProgram = "hamster"; homepage = "http://projecthamster.org/"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index 449b154cb8b6..fe6ec4f677aa 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "harsh"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-MpKfUvDqwkvPsnjTxR3fohzYfSLQ2Nx25czYOE8LpK4="; + hash = "sha256-NgYmzRoJCoFpfo4NXnQKCp/gvN9g076Y9Pq8CnMrC/s="; }; - vendorHash = "sha256-zjLXq64uC5iRm9uxUGDW5127z25gNSVV2qhVVXuYqY0="; + vendorHash = "sha256-Xzyu6jy4sbZPZv0EIksA2snlsivc0jp02QoOYpmFtQw="; meta = with lib; { description = "CLI habit tracking for geeks"; diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix index be6da03f1708..40bfede8551f 100644 --- a/pkgs/applications/misc/hcl2json/default.nix +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hcl2json"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tmccombs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6DCxpnTizTg3uhHIIze2IyA8IKcjIv44XoId7exdQZI="; + sha256 = "sha256-lnmWIyS1byXvShR1/ej8PAuo+WJBEBykQwJ79439Fus="; }; - vendorHash = "sha256-Ay6Sgdm7X+NxtLkFM0AT8aoWLdASjUhcidRUiV2K+us="; + vendorHash = "sha256-HbdectUQgyQZ9qcfBarwRTF3VjzSqaM2vhVekThv2+k="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 69f45cb407b9..b044c7fedbed 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -28,6 +28,7 @@ mkDerivation rec { meta = with lib; { description = "Simple cross-platform mind map and note-taking tool written in Qt"; + mainProgram = "heimer"; homepage = "https://github.com/juzzlin/Heimer"; changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix index f3b721bc4959..1b655e5afacc 100644 --- a/pkgs/applications/misc/hollywood/default.nix +++ b/pkgs/applications/misc/hollywood/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation { meta = { description = "Fill your console with Hollywood melodrama technobabble"; + mainProgram = "hollywood"; homepage = "https://a.hollywood.computer/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.anselmschueler ]; diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index 25e541cf3d48..c5623d2dac16 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -36,6 +36,7 @@ buildPythonApplication rec { meta = with lib; { description = "Makes impress.js presentations from reStructuredText"; + mainProgram = "hovercraft"; homepage = "https://github.com/regebro/hovercraft"; license = licenses.mit; maintainers = with maintainers; [ goibhniu makefu ]; diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix index 6c9c65cf4270..cee564d512d5 100644 --- a/pkgs/applications/misc/html5validator/default.nix +++ b/pkgs/applications/misc/html5validator/default.nix @@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command line tool that tests files for HTML5 validity"; + mainProgram = "html5validator"; homepage = "https://github.com/svenkreiss/html5validator"; changelog = "https://github.com/svenkreiss/html5validator/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 3a6f25ede695..37d43a90d05d 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Anti-vandalism tool for use on MediaWiki-based projects"; + mainProgram = "huggle"; homepage = "https://github.com/huggle/huggle3-qt-lx"; license = licenses.gpl3Only; maintainers = [ maintainers.fee1-dead ]; diff --git a/pkgs/applications/misc/hyprdim/default.nix b/pkgs/applications/misc/hyprdim/default.nix deleted file mode 100644 index 10938330196a..000000000000 --- a/pkgs/applications/misc/hyprdim/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "hyprdim"; - version = "2.2.3"; - - src = fetchFromGitHub { - owner = "donovanglover"; - repo = "hyprdim"; - rev = version; - hash = "sha256-Eeh0D3DkC4ureDUE+BXTGcMFNmZ0hLSidlKlL4ZDgsQ="; - }; - - cargoHash = "sha256-hgcGzRLB1L3yxJjw1ECDJPmbl1W+2OS4KDojclyVYrc="; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installManPage target/man/hyprdim.1 - - installShellCompletion --cmd hyprdim \ - --bash <(cat target/completions/hyprdim.bash) \ - --fish <(cat target/completions/hyprdim.fish) \ - --zsh <(cat target/completions/_hyprdim) - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Automatically dim windows in Hyprland when switching between them"; - homepage = "https://github.com/donovanglover/hyprdim"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ donovanglover ]; - mainProgram = "hyprdim"; - }; -} diff --git a/pkgs/applications/misc/hyprnome/default.nix b/pkgs/applications/misc/hyprnome/default.nix deleted file mode 100644 index d8d6ba70c8f7..000000000000 --- a/pkgs/applications/misc/hyprnome/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "hyprnome"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "donovanglover"; - repo = "hyprnome"; - rev = version; - hash = "sha256-zlXiT2EOIdgIDI4NQuU3C903SSq5bylBAFJXyv7mdJ4="; - }; - - cargoHash = "sha256-DpbRs97sr5wpJSrYF99ZiQ0SZOZdoQjfaLhKIAU95HA="; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installManPage target/man/hyprnome.1 - - installShellCompletion --cmd hyprnome \ - --bash <(cat target/completions/hyprnome.bash) \ - --fish <(cat target/completions/hyprnome.fish) \ - --zsh <(cat target/completions/_hyprnome) - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "GNOME-like workspace switching in Hyprland"; - homepage = "https://github.com/donovanglover/hyprnome"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ donovanglover ]; - mainProgram = "hyprnome"; - }; -} diff --git a/pkgs/applications/misc/imaginer/default.nix b/pkgs/applications/misc/imaginer/default.nix index 3f2b99954e08..1b00bd0614bd 100644 --- a/pkgs/applications/misc/imaginer/default.nix +++ b/pkgs/applications/misc/imaginer/default.nix @@ -62,6 +62,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/ImaginerApp/Imaginer"; description = "Imaginer with AI"; + mainProgram = "imaginer"; license = licenses.gpl3Plus; maintainers = with maintainers; [ _0xMRTT ]; }; diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 36d001d62d46..b711fd9330dc 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -89,6 +89,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://www.codelv.com/projects/inkcut/"; description = "Control 2D plotters, cutters, engravers, and CNC machines"; + mainProgram = "inkcut"; license = licenses.gpl3; maintainers = with maintainers; [ raboof ]; }; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index d9698c04aed5..f20f70c3b028 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -6,6 +6,8 @@ , pkg-config , fontconfig , xorg +, libxkbcommon +, wayland , libGL , openssl , darwin @@ -13,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "inlyne"; - version = "0.3.2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "trimental"; repo = pname; rev = "v${version}"; - hash = "sha256-DSi6iS1ySdvGf6FxZpsDOAFpAKx/APcZjxA3Qy0gQBU="; + hash = "sha256-kZQREYnauR8xusyX6enBPUKHSe39aBLlrZjKEjJlfx0="; }; - cargoHash = "sha256-UzegSJGAOBUDN8WluN7fLWS7NfHhm9YY0Zuq6DCIqHo="; + cargoHash = "sha256-2mQFr2nLJ/iBLpdOUmerY6F2C8Kt+/vMEjS6THpmJic="; nativeBuildInputs = [ installShellFiles @@ -36,6 +38,8 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr xorg.libxcb + wayland + libxkbcommon openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix index f9e942ca9411..6019ffed2b89 100644 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -9,11 +9,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.2.2.20062"; + version = "2.2.3.20090"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-wIO9QQa+YfNNqO5HlijVxBDOgVSsJhtGmfChKA8QpPo="; + sha256 = "sha256-SqxQF5pG61CySsDzdZ1P2C9cCe/B145D0S+T4NByif8="; stripRoot = false; }; diff --git a/pkgs/applications/misc/johnny/default.nix b/pkgs/applications/misc/johnny/default.nix index 0f1530afb50c..cead88817a54 100644 --- a/pkgs/applications/misc/johnny/default.nix +++ b/pkgs/applications/misc/johnny/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://openwall.info/wiki/john/johnny"; description = "Open Source GUI frontend for John the Ripper"; + mainProgram = "johnny"; license = licenses.bsd2; maintainers = with maintainers; [ Misaka13514 ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 67c58d5c3009..a8245a223466 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -28,6 +28,7 @@ let meta = with lib; { description = "An open source note taking and to-do application with synchronisation capabilities"; + mainProgram = "joplin-desktop"; longDescription = '' Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 3c3fc200c114..6b5ce0b3c44d 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,22 +3,29 @@ }: let pname = "josm"; - version = "18969"; + version = "19017"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-a8muRwE4+9WdYVz7lYE9dRnqVIGQxL8cFmIdBr2R65U="; + hash = "sha256-+PSsvauVe+e+qB7sz9AFmC/dZhWHFHe0zWYPEhgvRIQ="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-npXY7WJM1+9ygeAw102UtimnI/yXqs5vgPnatm4AIrI="; + hash = "sha256-QYvAC+W7gHC5unwfcbQ0sz5U1VkMwIIUkDWQK9vDe2A="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-RFZGRTDdWP/goH/Ev16nhq1SjxYkfFr3djwSrotK7Fo="; + sha256 = "sha256-Pb4EAyvERz6kP3EmkgmUy/58KQHhBJmZJvpAj72GCIk="; }; }; + + # Needed as of version 19017. + baseJavaOpts = toString [ + "--add-exports=java.base/sun.security.action=ALL-UNNAMED" + "--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" + "--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" + ]; in stdenv.mkDerivation rec { inherit pname version; @@ -38,7 +45,7 @@ stdenv.mkDerivation rec { # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \ - --add-flags "${extraJavaOpts} -jar $out/share/josm/josm.jar" \ + --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \ --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' ''; diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index d3c073e5663a..e1636e30267b 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -33,6 +33,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/jeromerobert/k4dirstat"; description = "A small utility program that sums up disk usage for directory trees"; + mainProgram = "k4dirstat"; license = licenses.gpl2; maintainers = [ maintainers.raboof ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/kanjidraw/default.nix b/pkgs/applications/misc/kanjidraw/default.nix index 53c752651d2d..0d5189474729 100644 --- a/pkgs/applications/misc/kanjidraw/default.nix +++ b/pkgs/applications/misc/kanjidraw/default.nix @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Handwritten kanji recognition"; + mainProgram = "kanjidraw"; longDescription = '' kanjidraw is a simple Python library + GUI for matching (the strokes of a) handwritten kanji against its database. diff --git a/pkgs/applications/misc/kapow/default.nix b/pkgs/applications/misc/kapow/default.nix index 49fbed7b1efb..db352199408c 100644 --- a/pkgs/applications/misc/kapow/default.nix +++ b/pkgs/applications/misc/kapow/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Punch clock to track time spent on projects"; + mainProgram = "kapow"; homepage = "https://gottcode.org/kapow/"; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix index 4d703bff0c22..83d077f82795 100644 --- a/pkgs/applications/misc/kchmviewer/default.nix +++ b/pkgs/applications/misc/kchmviewer/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CHM (Winhelp) files viewer"; + mainProgram = "kchmviewer"; homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/applications/misc/keepmenu/default.nix index d10c10c231d6..040f2f6f61a7 100644 --- a/pkgs/applications/misc/keepmenu/default.nix +++ b/pkgs/applications/misc/keepmenu/default.nix @@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/firecat53/keepmenu"; description = "Dmenu/Rofi frontend for Keepass databases"; + mainProgram = "keepmenu"; license = licenses.gpl3Only; maintainers = with maintainers; [ elliot ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 7af5465ad9e0..22f3ad668ccb 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -65,6 +65,7 @@ let meta = with lib; { description = "Free cross-platform password manager compatible with KeePass"; + mainProgram = "keeweb"; homepage = "https://keeweb.info/"; changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index a79169ff633e..fb5990f5dca0 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; + mainProgram = "keystore-explorer"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.numinit ]; diff --git a/pkgs/applications/misc/kickoff/default.nix b/pkgs/applications/misc/kickoff/default.nix index 21018f509b1c..cd1a57a09f35 100644 --- a/pkgs/applications/misc/kickoff/default.nix +++ b/pkgs/applications/misc/kickoff/default.nix @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Minimalistic program launcher"; + mainProgram = "kickoff"; homepage = "https://github.com/j0ru/kickoff"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pyxels ]; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 6e255b74f4b1..e804f890b832 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -39,6 +39,7 @@ mkDerivation { meta = with lib; { description = "An offline reader for Web content"; + mainProgram = "kiwix-desktop"; homepage = "https://kiwix.org"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix index 979ce433fb4b..b5e123b41264 100644 --- a/pkgs/applications/misc/kiwix/tools.nix +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kiwix-tools"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "kiwix"; repo = "kiwix-tools"; rev = finalAttrs.version; - hash = "sha256-+th86lMAuCcmWj06yQoZ1L7rLZKqNvuTrV+Rra2km44="; + hash = "sha256-JwF4EN5kyHEfNoMhHb9ywe+7pmgQtjEd2FeRUeTjvQw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix b/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix index 7cec6c592235..27a1a9050284 100644 --- a/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix +++ b/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Read the Word of God from your terminal + Apocrypha"; + mainProgram = "kjv"; homepage = "https://lukesmith.xyz/articles/command-line-bibles"; license = licenses.unlicense; platforms = platforms.unix; diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index a119dc6633f2..0b1bc647917a 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -58,6 +58,7 @@ mkDerivation rec { meta = with lib; { description = "High performance layout viewer and editor with support for GDS and OASIS"; + mainProgram = "klayout"; license = with licenses; [ gpl2Plus ]; homepage = "https://www.klayout.de/"; changelog = "https://www.klayout.de/development.html#${version}"; diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index baecf249a6b9..2eff4a1cf08d 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "klipper-estimator"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "Annex-Engineering"; repo = "klipper_estimator"; rev = "v${version}"; - hash = "sha256-1Od4sIHrg52DezV5DCg2NVv/2nbXQW3fK6f9aqVmlTk="; + hash = "sha256-zRHV8Bc4+diSfb/hhBxBTaSiZHlKZ9wgd8DZ4Kt6nf0="; }; - cargoHash = "sha256-5O2KUTegK5ArTalJ57/Kn9lzlkmAIXnzluljvfrIc5U="; + cargoHash = "sha256-zozZuVzn/xYjmP9+B5uzIBuu/rx/tymgvOuiKz617eo="; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 8589991ff522..789ab7c68828 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -48,7 +48,7 @@ meta = with lib; { description = "Touchscreen GUI for the Klipper 3D printer firmware"; homepage = "https://github.com/jordanruthe/KlipperScreen"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ cab404 ]; mainProgram = "KlipperScreen"; }; diff --git a/pkgs/applications/misc/konsave/default.nix b/pkgs/applications/misc/konsave/default.nix index 75950d28e232..f86f2c19c6c0 100644 --- a/pkgs/applications/misc/konsave/default.nix +++ b/pkgs/applications/misc/konsave/default.nix @@ -19,6 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Save Linux Customization"; + mainProgram = "konsave"; maintainers = with maintainers; [ MoritzBoehme ]; homepage = "https://github.com/Prayag2/konsave"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index b24ae5d06ad2..857ca1d26a8e 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/koreader/koreader"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; + mainProgram = "koreader"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; license = licenses.agpl3Only; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 6d575709208e..98ba8836efca 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -35,6 +35,7 @@ in mkDerivation rec { meta = with lib; { description = "A powerful batch renamer for KDE"; + mainProgram = "krename"; homepage = "https://kde.org/applications/utilities/krename/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index 80c46bd9c16d..c592d944c632 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -32,6 +32,7 @@ mkDerivation rec { meta = with lib; { description = "A cool desktop panel for KDE Plasma 5"; + mainProgram = "ksmoothdock"; license = licenses.mit; homepage = "https://dangvd.github.io/ksmoothdock/"; maintainers = with maintainers; [ shamilton ]; diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/applications/misc/kuro/default.nix index 50a773b5c518..55a2e04c9326 100644 --- a/pkgs/applications/misc/kuro/default.nix +++ b/pkgs/applications/misc/kuro/default.nix @@ -5,18 +5,21 @@ , makeDesktopItem , copyDesktopItems , mkYarnPackage -, electron +, electron_29 }: +let + electron = electron_29; +in mkYarnPackage rec { pname = "kuro"; version = "9.0.0"; src = fetchFromGitHub { owner = "davidsmorais"; - repo = pname; + repo = "kuro"; rev = "v${version}"; - sha256 = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU="; + hash = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU="; }; packageJSON = ./package.json; @@ -26,7 +29,7 @@ mkYarnPackage rec { hash = "sha256-GTiNv7u1QK/wjQgpka7REuoLn2wjZG59kYJQaZZPycI="; }; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ makeWrapper @@ -68,21 +71,23 @@ mkYarnPackage rec { desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; + name = "kuro"; + exec = "kuro"; + icon = "kuro"; desktopName = "Kuro"; genericName = "Microsoft To-Do Client"; comment = meta.description; categories = [ "Office" ]; - startupWMClass = pname; + startupWMClass = "kuro"; }) ]; meta = with lib; { + changelog = "https://github.com/davidsmorais/kuro/releases/tag/${src.rev}"; description = "An unofficial, featureful, open source, community-driven, free Microsoft To-Do app"; homepage = "https://github.com/davidsmorais/kuro"; license = licenses.mit; + mainProgram = "kuro"; maintainers = with maintainers; [ ChaosAttractor ]; inherit (electron.meta) platforms; }; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 6562cd7b4a29..ae1b13cc870a 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -30,6 +30,7 @@ mkDerivation rec { meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; + mainProgram = "latte-dock"; homepage = "https://invent.kde.org/plasma/latte-dock"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 77dd39bc0601..a5b729c3cf3b 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication { meta = with lib; { description = "A Password Safe V3 compatible password vault"; + mainProgram = "loxodo"; homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 7c2d33aebc00..91a2e11b3666 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -23,16 +23,18 @@ stdenv.mkDerivation rec { checkTarget = "test"; nativeCheckInputs = [ which zstd pbzip2 ]; + sharePath = "$out/share/${pname}"; + installPhase = '' runHook preInstall installManPage makeself.1 install -Dm555 makeself.sh $out/bin/makeself - install -Dm444 -t $out/share/${pname}/ makeself.lsm README.md makeself-header.sh + install -Dm444 -t ${sharePath}/ makeself.lsm README.md makeself-header.sh runHook postInstall ''; fixupPhase = '' - sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i $out/bin/makeself + sed -e "s|^HEADER=.*|HEADER=${sharePath}/makeself-header.sh|" -i $out/bin/makeself ''; meta = with lib; { diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index ce8ebef16a89..2f30e805c584 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -70,6 +70,7 @@ mkDerivation rec { meta = with lib; { description = "Core libraries of Maliit and server"; + mainProgram = "maliit-server"; homepage = "http://maliit.github.io/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ samueldr ]; diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index b662c2522df8..3669dfe5a5b7 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -67,6 +67,7 @@ mkDerivation rec { meta = with lib; { description = "Virtual keyboard"; + mainProgram = "maliit-keyboard"; homepage = "http://maliit.github.io/"; license = with licenses; [ lgpl3Only bsd3 cc-by-30 ]; maintainers = with maintainers; [ samueldr ]; diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix index 69b61afaee55..13809abe3929 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/applications/misc/mbutil/default.nix @@ -16,6 +16,7 @@ buildPythonApplication rec { meta = with lib; { description = "An importer and exporter for MBTiles"; + mainProgram = "mb-util"; homepage = "https://github.com/mapbox/mbutil"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index bc85e674c575..b1d472a605a6 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mediaelch.de/mediaelch/"; description = "Media Manager for Kodi"; + mainProgram = "MediaElch"; license = licenses.lgpl3Only; maintainers = with maintainers; [ stunkymonkey ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index b07133ecbbc2..c1a0b41a58ac 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -74,6 +74,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}"; description = "MeerK40t LaserCutter Software"; + mainProgram = "meerk40t"; homepage = "https://github.com/meerk40t/meerk40t"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index c0958cd23537..23ec74cd8b8d 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -13,6 +13,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Heuristics-driven menu generator for several window managers"; + mainProgram = "mmaker"; homepage = "https://menumaker.sourceforge.net"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 88df68f55979..24970e7a5832 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Python GTK application to view and clean metadata in files, using mat2"; + mainProgram = "metadata-cleaner"; homepage = "https://gitlab.com/rmnvgr/metadata-cleaner"; changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ gpl3Plus cc-by-sa-40 ]; diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/applications/misc/michabo/default.nix index c356dc19786d..6329bd9d2495 100644 --- a/pkgs/applications/misc/michabo/default.nix +++ b/pkgs/applications/misc/michabo/default.nix @@ -43,6 +43,7 @@ in mkDerivation rec { meta = with lib; { description = "A native desktop app for Pleroma and Mastodon servers"; + mainProgram = "Michabo"; homepage = "https://git.pleroma.social/kaniini/michabo"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index ee0c2043a6b4..7f97818c7452 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -6,6 +6,7 @@ , jre , ant , makeWrapper +, stripJavaArchivesHook , doCheck ? true , withExamples ? false }: @@ -30,10 +31,6 @@ stdenv.mkDerivation rec { ]; postPatch = with deps; '' - # Fix the output jar timestamps for reproducibility - substituteInPlace build.xml \ - --replace-fail '<jar ' '<jar modificationtime="0" ' - # Manually create version properties file for reproducibility mkdir -p build/classes cat > build/classes/mkgmap-version.properties << EOF @@ -61,7 +58,7 @@ stdenv.mkDerivation rec { '') testInputs} ''; - nativeBuildInputs = [ jdk ant makeWrapper ]; + nativeBuildInputs = [ jdk ant makeWrapper stripJavaArchivesHook ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 010b140e9bf9..801af789d47d 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -6,6 +6,7 @@ , jre , ant , makeWrapper +, stripJavaArchivesHook , doCheck ? true }: let @@ -30,10 +31,6 @@ stdenv.mkDerivation rec { ]; postPatch = with deps; '' - # Fix the output jar timestamps for reproducibility - substituteInPlace build.xml \ - --replace-fail '<jar ' '<jar modificationtime="0" ' - # Manually create version properties file for reproducibility mkdir -p build/classes cat > build/classes/splitter-version.properties << EOF @@ -58,7 +55,7 @@ stdenv.mkDerivation rec { '') testInputs} ''; - nativeBuildInputs = [ jdk ant makeWrapper ]; + nativeBuildInputs = [ jdk ant makeWrapper stripJavaArchivesHook ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/applications/misc/mnamer/default.nix index e928e631c07c..fbcc9e61be45 100644 --- a/pkgs/applications/misc/mnamer/default.nix +++ b/pkgs/applications/misc/mnamer/default.nix @@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/jkwill87/mnamer"; description = "An intelligent and highly configurable media organization utility"; + mainProgram = "mnamer"; license = licenses.mit; maintainers = with maintainers; [ urlordjames ]; }; diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index f41e927185ec..7fb218266fa1 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -35,6 +35,7 @@ buildGoModule rec { meta = with lib; { description = "Tool for smooth git handover"; + mainProgram = "mob"; homepage = "https://github.com/remotemobprogramming/mob"; license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index 6d8455e6915d..a19297acbc85 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -71,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Phabricator CLI from Mozilla to support submission of a series of commits"; + mainProgram = "moz-phab"; longDescription = '' moz-phab is a custom command-line tool, which communicates to Phabricator’s API, providing several conveniences, including support for diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index 58f6962f4c3a..8736abb413ba 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A mpc-like control interface for mpv"; + mainProgram = "mpvc"; homepage = "https://github.com/lwilletts/mpvc"; license = licenses.mit; maintainers = [ maintainers.neeasade ]; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index a31d6d5a90ab..6b647aab2473 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://jwilk.net/software/mwic"; description = "spell-checker that groups possible misspellings and shows them in their contexts"; + mainProgram = "mwic"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index 76bd2a44824e..b4479f10309e 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Font patcher to generate Nerd font"; + mainProgram = "nerd-font-patcher"; homepage = "https://nerdfonts.com/"; license = licenses.mit; maintainers = with maintainers; [ ck3d ]; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 17377c6dae55..49f6cf478fbb 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Daemon that displays passive pop-up notifications"; + mainProgram = "notify-osd"; homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; maintainers = [ maintainers.imalison ]; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 9c0c5a3921ef..77b5d52c22cf 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Daemon that displays passive pop-up notifications"; + mainProgram = "notify-osd"; homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; maintainers = [ maintainers.bodil ]; diff --git a/pkgs/applications/misc/notifymuch/default.nix b/pkgs/applications/misc/notifymuch/default.nix index e94b6f2f156b..6ba819133ecc 100644 --- a/pkgs/applications/misc/notifymuch/default.nix +++ b/pkgs/applications/misc/notifymuch/default.nix @@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Display desktop notifications for unread mail in a notmuch database"; + mainProgram = "notifymuch"; homepage = "https://github.com/kspi/notifymuch"; maintainers = with maintainers; [ arjan-s ]; license = licenses.gpl3; diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index de2c377b26c2..7a1393637dff 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { changelog = "https://git.sr.ht/~martijnbraam/numberstation/refs/${version}"; description = "TOTP Authentication application for mobile"; + mainProgram = "numberstation"; homepage = "https://sr.ht/~martijnbraam/numberstation/"; license = licenses.gpl3Only; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 0b4b7cd1e255..356b1edb15ae 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -38,6 +38,7 @@ buildGoModule rec { meta = with lib; { description = "GTK3-based button bar for sway and other wlroots-based compositors"; + mainProgram = "nwg-bar"; homepage = "https://github.com/nwg-piotr/nwg-bar"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index 676af3ec5891..607dd7c22fac 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "GTK3-based dock for Hyprland"; + mainProgram = "nwg-dock-hyprland"; homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/applications/misc/nwg-menu/default.nix index e587396e151a..179b4f71ae64 100644 --- a/pkgs/applications/misc/nwg-menu/default.nix +++ b/pkgs/applications/misc/nwg-menu/default.nix @@ -39,6 +39,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/nwg-piotr/nwg-menu"; description = "MenuStart plugin for nwg-panel"; + mainProgram = "nwg-menu"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ berbiche ]; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 308a1d0d2cee..b91ed927482f 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.25"; + version = "0.9.26"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-dTBV2OckPJNA707PNz/jmfUPpufhItt4EEDHAI79kxQ="; + hash = "sha256-FGSMXiVygkA3thHtWaA6s5Kz96PYZgMzQQwIjOr6a0c="; }; # No tests diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 2ff04c09b82e..5b2862831896 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { description = "Wrapper to display a script output or a text file content on the desktop in sway or other wlroots-based compositors"; + mainProgram = "nwg-wrapper"; homepage = "https://github.com/nwg-piotr/nwg-wrapper/"; license = licenses.mit; maintainers = with maintainers; [ artturin ]; diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix deleted file mode 100644 index 043ff2352e90..000000000000 --- a/pkgs/applications/misc/obinskit/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, lib -, fetchurl -, libxkbcommon -, systemd -, xorg -, electron_13 -, makeWrapper -, makeDesktopItem -}: -let - desktopItem = makeDesktopItem rec { - name = "Obinskit"; - exec = "obinskit"; - icon = "obinskit"; - desktopName = "Obinskit"; - genericName = "Obinskit keyboard configurator"; - categories = [ "Utility" ]; - }; - electron = electron_13; -in -stdenv.mkDerivation rec { - pname = "obinskit"; - version = "1.2.11"; - - src = fetchurl { - url = "https://s3.hexcore.xyz/occ/linux/tar/ObinsKit_${version}_x64.tar.gz"; - curlOptsList = [ "--header" "Referer: https://www.hexcore.xyz/" ]; - hash = "sha256-KhCu1TZsJmcXRSWSTaYOMjt+IA4qqavBwaYzXnkgls0="; - }; - - unpackPhase = "tar -xzf $src"; - - sourceRoot = "ObinsKit_${version}_x64"; - - nativeBuildInputs = [ makeWrapper ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/opt/obinskit - - cp -r resources $out/opt/obinskit/ - cp -r locales $out/opt/obinskit/ - - mkdir -p $out/share/{applications,pixmaps} - install resources/icons/tray-darwin@2x.png $out/share/pixmaps/obinskit.png - ln -s ${desktopItem}/share/applications/* $out/share/applications - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt xorg.libXtst ]}" - ''; - - meta = with lib; { - description = "Graphical configurator for Anne Pro and Anne Pro II keyboards"; - homepage = "https://www.hexcore.xyz/obinskit"; - license = licenses.unfree; - maintainers = with maintainers; [ shou ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 586d9744dbe2..0a3569e47305 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.5.8"; + version = "1.5.11"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-5olNmOLE9AgVUyRY8PylUPGYIMS+KoDG3g2BMCySdyE=" else "sha256-oc2iA2E3ac/uUNv6unzfac5meHqQzmzDVl/M9jNpS/M="; + hash = if stdenv.isDarwin then "sha256-RtIEjVaqYygylhZwFB9ObZPPhSSzvJTJniGVFzAa/VY=" else "sha256-QDxMgisyYc2lJ0OKn2hR0VA8OeAwysCq6Z4Q59qRvtU="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 5b42f1d08c3c..0a13013e5da2 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -38,6 +38,16 @@ let hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; }; }); + + netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { + version = "0.9.0"; + + src = fetchPypi { + pname = "netaddr"; + inherit version; + hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; + }; + }); } ) @@ -246,6 +256,7 @@ let meta = with lib; { homepage = "https://octoprint.org/"; description = "The snappy web interface for your 3D printer"; + mainProgram = "octoprint"; license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar gebner WhittlesJr gador ]; }; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index af251385fceb..ff920edbc272 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -53,7 +53,7 @@ in meta = with lib; { description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -72,7 +72,7 @@ in meta = with lib; { description = "Displays 3D mesh of bed topography report"; homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; - license = licenses.agpl3; + license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -110,7 +110,7 @@ in meta = with lib; { description = "Plugin for slicing via Cura Legacy from within OctoPrint"; homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -148,7 +148,7 @@ in meta = with lib; { description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ j0hax ]; }; }; @@ -186,7 +186,7 @@ in meta = with lib; { description = "Edit gcode on OctoPrint"; homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -205,7 +205,7 @@ in meta = with lib; { description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -226,7 +226,7 @@ in meta = with lib; { description = "Publish printer status MQTT"; homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ peterhoeg ]; }; }; @@ -256,7 +256,7 @@ in meta = with lib; { description = "Better print time estimation for OctoPrint"; homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -284,7 +284,7 @@ in meta = with lib; { description = "OctoPrint plugin to control ATX/AUX power supply"; homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -303,7 +303,7 @@ in meta = with lib; { description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -322,7 +322,7 @@ in meta = with lib; { description = "A simple stl viewer tab for OctoPrint"; homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar ]; }; }; @@ -362,7 +362,7 @@ in meta = with lib; { description = "Beautiful themes for OctoPrint"; homepage = "https://github.com/birkbjo/OctoPrint-Themeify"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -381,7 +381,7 @@ in meta = with lib; { description = "Show printers status in window title"; homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar ]; }; }; @@ -400,7 +400,7 @@ in meta = with lib; { description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -419,7 +419,7 @@ in meta = with lib; { description = "A plugin for a better integration of Klipper into OctoPrint"; homepage = "https://github.com/AliceGrey/OctoprintKlipperPlugin"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -473,7 +473,7 @@ in meta = with lib; { description = "A dashboard for Octoprint"; homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ j0hax ]; }; }; diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index da4de96fbce0..5349add035ae 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "The free computer aided translation (CAT) tool for professionals"; + mainProgram = "omegat"; longDescription = '' OmegaT is a free and open source multiplatform Computer Assisted Translation tool with fuzzy matching, translation memory, keyword search, glossaries, and diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index 4b7e1ec8c16a..108bb1aeff0d 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = { isIbusEngine = withIbusSupport; description = "An OpenSource, Unicode compliant Bengali Input Method"; + mainProgram = "openbangla-gui"; homepage = "https://openbangla.github.io/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ eclairevoyant hqurve ]; diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 63734811ff43..03b3cde0c835 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -50,6 +50,7 @@ mkDerivation { meta = with lib; { description = "A tool to edit resource files (BRF)"; + mainProgram = "openBrf"; homepage = "https://github.com/cfcohen/openbrf"; maintainers = with lib.maintainers; [ abbradar ]; license = licenses.free; diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index 84edbc567b41..d28a9e52a902 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -71,6 +71,7 @@ in meta = with lib; { homepage = "https://github.com/opentrack/opentrack"; description = "Head tracking software for MS Windows, Linux, and Apple OSX"; + mainProgram = "opentrack"; changelog = "https://github.com/opentrack/opentrack/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [zaninime]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index fdb7d3ac9879..283970a6e75e 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -98,6 +98,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Orca"; description = "Screen reader"; + mainProgram = "orca"; longDescription = '' A free, open source, flexible and extensible screen reader that provides access to the graphical desktop via speech and refreshable braille. diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index fc46ffb7ffac..230bc80d180a 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ]; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 077f9472c430..e53cc20874ba 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0BpdyZIUvDRGadomYRhEq5YLoPXsF9d3tewIi+q6wFs="; + hash = "sha256-3Nv2ci8MBjvWc7gF5UOJnyfSV8XK0REN1XwI8RUYgWI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index ec1ea90cd47c..762dec67a61d 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; description = "Process manager for Procfile-based applications and tmux"; + mainProgram = "overmind"; license = with licenses; [ mit ]; maintainers = [ maintainers.adisbladis ]; }; diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/applications/misc/oversteer/default.nix index a7567380c5f0..eb47b4225d87 100644 --- a/pkgs/applications/misc/oversteer/default.nix +++ b/pkgs/applications/misc/oversteer/default.nix @@ -70,6 +70,7 @@ in stdenv.mkDerivation { homepage = "https://github.com/berarma/oversteer"; changelog = "https://github.com/berarma/oversteer/releases/tag/${version}"; description = "Steering Wheel Manager for Linux"; + mainProgram = "oversteer"; license = licenses.gpl3Plus; maintainers = [ maintainers.srounce ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix deleted file mode 100644 index 44a711dfeec1..000000000000 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, nix-update-script -, fetchFromGitHub -, rustPlatform -, pkg-config -, installShellFiles -, zstd -, openssl -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "owmods-cli"; - version = "0.12.2"; - - src = fetchFromGitHub { - owner = "ow-mods"; - repo = "ow-mod-man"; - rev = "cli_v${version}"; - hash = "sha256-AfqpLL3cGZLKW5/BE6SaBe4S8GzYM2GKUZU8mFH5uX4="; - }; - - cargoHash = "sha256-PhdfpiUgeOB13ROgzPBYM+sBLGMP+RtV9j9ebo8PpJU="; - - nativeBuildInputs = [ - pkg-config - installShellFiles - ]; - - buildInputs = [ - zstd - ] ++ lib.optionals stdenv.isLinux [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - buildAndTestSubdir = "owmods_cli"; - - postInstall = '' - cargo xtask dist_cli - installManPage man/man*/* - installShellCompletion --cmd owmods \ - dist/cli/completions/owmods.{bash,fish,zsh} - ''; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - description = "CLI version of the mod manager for Outer Wilds Mod Loader"; - homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli"; - downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; - changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; - mainProgram = "owmods"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ locochoco ]; - }; -} diff --git a/pkgs/applications/misc/pairdrop/default.nix b/pkgs/applications/misc/pairdrop/default.nix index 7715481cffd5..f5ffafdb8015 100644 --- a/pkgs/applications/misc/pairdrop/default.nix +++ b/pkgs/applications/misc/pairdrop/default.nix @@ -33,6 +33,7 @@ buildNpmPackage rec { meta = with lib; { description = "Local file sharing in your browser"; + mainProgram = "pairdrop"; longDescription = '' PairDrop is a sublime alternative to AirDrop that works on all platforms. Send images, documents or text via peer to peer connection to devices in the same local network/Wi-Fi or to paired devices. diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/applications/misc/passky-desktop/default.nix index 927035ed8167..ec45bc3efaea 100644 --- a/pkgs/applications/misc/passky-desktop/default.nix +++ b/pkgs/applications/misc/passky-desktop/default.nix @@ -1,12 +1,15 @@ { lib , stdenv , fetchFromGitHub -, electron_22 +, electron_29 , makeWrapper , makeDesktopItem , copyDesktopItems }: +let + electron = electron_29; +in stdenv.mkDerivation rec { pname = "passky-desktop"; version = "8.1.1"; @@ -18,7 +21,10 @@ stdenv.mkDerivation rec { sha256 = "1ma8s1bngjdzclcc4m5pcmavk38sidaskmz7dgfnv84y35si18dr"; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; installPhase = '' runHook preInstall @@ -35,7 +41,7 @@ stdenv.mkDerivation rec { done mkdir "$out/share/applications" - makeWrapper ${electron_22}/bin/electron "$out/bin/passky" \ + makeWrapper ${electron}/bin/electron "$out/bin/passky" \ --add-flags "$out/share/passky/electron/" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" @@ -45,12 +51,13 @@ stdenv.mkDerivation rec { desktopItems = [ ( makeDesktopItem { - name = "Passky"; + name = "passky"; type = "Application"; - desktopName = "passky"; + desktopName = "Passky"; comment = "Simple, modern, open source and secure password manager."; icon = "passky"; exec = "passky %U"; + terminal = false; categories = [ "Utility" ]; startupWMClass = "Passky"; } diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix index aac0da8b4c40..c1f5aa84b0eb 100644 --- a/pkgs/applications/misc/pattypan/default.nix +++ b/pkgs/applications/misc/pattypan/default.nix @@ -7,7 +7,7 @@ , wrapGAppsHook , makeDesktopItem , copyDesktopItems -, canonicalize-jars-hook +, stripJavaArchivesHook }: stdenv.mkDerivation (finalAttrs: { @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper wrapGAppsHook copyDesktopItems - canonicalize-jars-hook + stripJavaArchivesHook ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 0245fadb171a..78151061700a 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication { meta = with lib; { homepage = "https://github.com/linuxerwang/pdf-quench"; description = "A visual tool for cropping pdf files"; + mainProgram = "pdf-quench"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 34077b857415..2973a4b9a36c 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -51,6 +51,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { inherit (src.meta) homepage; description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface"; + mainProgram = "pdfarranger"; platforms = platforms.linux; maintainers = with maintainers; [ symphorien ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 0fa676bdfb4b..9e36bba66961 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A presenter console with multi-monitor support for PDF files"; + mainProgram = "pdfpc"; homepage = "https://pdfpc.github.io/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/misc/pdfposter/default.nix b/pkgs/applications/misc/pdfposter/default.nix index 5261fe3dbfe2..ff7d97969e43 100644 --- a/pkgs/applications/misc/pdfposter/default.nix +++ b/pkgs/applications/misc/pdfposter/default.nix @@ -37,6 +37,7 @@ with localPython.pkgs; buildPythonApplication rec { meta = with lib; { description = "Split large pages of a PDF into smaller ones for poster printing"; + mainProgram = "pdfposter"; homepage = "https://pdfposter.readthedocs.io"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wamserma ]; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index b56f9374bddb..0d1e5e5f737c 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/torakiki/pdfsam"; description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + mainProgram = "pdfsam-basic"; sourceProvenance = with sourceTypes; [ binaryBytecode binaryNativeCode diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index 79307f777955..9a71d8add70e 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable Executable reversing tool with a friendly GUI"; + mainProgram = "PE-bear"; homepage = "https://hshrzd.wordpress.com/pe-bear/"; license = [ diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index ba12738c2e1c..fcc139bfa041 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.6"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-Km4PWvbIzgc1Kxsp26HYLCA4OkCfOsGWsdWYLmWf/NA="; + sha256 = "sha256-9/D5C3l3N15q+xP9lLAcdT+1+dEMcowBeR+DjE67fYQ="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index e50b9787236a..deccbabe3fd4 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Wayland compositor for mobile phones like the Librem 5"; + mainProgram = "phoc"; homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ masipcat tomfitzhenry zhaofengli ]; diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index 2f5ba3e6d9cb..f447ffcaeef6 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A commandline-tool to interactively write shell pipelines"; + mainProgram = "pipr"; homepage = "https://github.com/ElKowar/pipr"; license = licenses.mit; maintainers = with maintainers; [ elkowar ]; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 1a8f0df5e41c..fb3226e6d803 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Elegant, simple, clean dock"; + mainProgram = "plank"; homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/plots/default.nix b/pkgs/applications/misc/plots/default.nix index 4e6b9d24a56b..1e7db2651a10 100644 --- a/pkgs/applications/misc/plots/default.nix +++ b/pkgs/applications/misc/plots/default.nix @@ -56,6 +56,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Graph plotting app for GNOME"; + mainProgram = "plots"; longDescription = '' Plots is a graph plotting app for GNOME. Plots makes it easy to visualise mathematical formulae. diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index ad731c1050c9..983dc81d1790 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; + mainProgram = "polar-desktop-app"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/polar-bookshelf1/default.nix b/pkgs/applications/misc/polar-bookshelf1/default.nix index 41b7fb786abd..a4ff885a71b8 100644 --- a/pkgs/applications/misc/polar-bookshelf1/default.nix +++ b/pkgs/applications/misc/polar-bookshelf1/default.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; + mainProgram = "polar-bookshelf"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.dansbandit ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/pot/default.nix b/pkgs/applications/misc/pot/default.nix index 33e6c18932de..fdc0a6b6c414 100644 --- a/pkgs/applications/misc/pot/default.nix +++ b/pkgs/applications/misc/pot/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-platform translation software"; + mainProgram = "pot"; homepage = "https://pot.pylogmon.com"; platforms = platforms.linux; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 661bbd22be85..3bd280766b16 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages }: stdenv.mkDerivation rec { pname = "procmail"; @@ -30,8 +30,19 @@ stdenv.mkDerivation rec { sed -e "3i\ .PHONY: install " -i Makefile + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace src/Makefile.0 \ + --replace-fail '@./_autotst' '@${stdenv.hostPlatform.emulator buildPackages} ./_autotst' + sed -e '3i\ + _autotst() { ${stdenv.hostPlatform.emulator buildPackages} ./_autotst "$@"; } \ + _locktst() { ${stdenv.hostPlatform.emulator buildPackages} ./_locktst "$@"; } \ + ' -i src/autoconf ''; + # default target is binaries + manpages; manpages don't cross compile without more work. + makeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "bins" ]; + installTargets = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "install.bin" ]; + meta = with lib; { description = "Mail processing and filtering utility"; homepage = "https://github.com/BuGlessRB/procmail/"; diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix index ceb61d71866c..52e56ed0623c 100644 --- a/pkgs/applications/misc/projectlibre/default.nix +++ b/pkgs/applications/misc/projectlibre/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.projectlibre.com/"; description = "Project-Management Software similar to MS-Project"; + mainProgram = "projectlibre"; maintainers = [ maintainers.Mogria ]; license = licenses.cpal10; }; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 0b5a5065cf12..0a9e0c23fae9 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ moredread tweber tmarkus ]; platforms = platforms.unix; } // lib.optionalAttrs (stdenv.isDarwin) { diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 88423e36a956..63e547619696 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -81,7 +81,7 @@ let meta = with lib; { inherit description; homepage = "https://github.com/supermerill/SuperSlicer"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ cab404 moredread tmarkus ]; mainProgram = "superslicer"; }; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 739003720447..67a4bca94cf8 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://wpitchoune.net/ptask/"; description = "GTK-based GUI for taskwarrior"; + mainProgram = "ptask"; license = licenses.gpl2; maintainers = [ maintainers.spacefrogg ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 7e158853966b..69483be06db6 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.3.3"; + version = "3.4.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-Q1x97eJNjtET+L3KpWTXLKbz62XgkjxNZkAAZWhbMmM="; + hash = "sha256-kKu/+F+zK0UyRHGkrZdD8alvsQTZFHhTqYK2phxo/ZA="; }; - cargoHash = "sha256-i9SPOZo9AuITm6iI++D3ipY8c0xfZzkeHW7tb9SZ3iQ="; + cargoHash = "sha256-KwIGJiCGcFEKuloVtJr0GQxoFQVt/OHyJ/YCp4bCSGc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index d1bfe4132583..1531d6edb7a8 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-AZt0JcNegHkUkWy+NW5CNLZfxjjFyKWBrhLJgSTv3to="; + hash = "sha256-TeFolD3jXRdLGfXdy+QcwtOcQQVUB5fn8PwoYfRLaPQ="; fetchSubmodules = true; }; @@ -36,6 +36,7 @@ mkDerivation rec { meta = with lib; { description = "Display vector and raster maps, places, routes, and provide navigation instructions with a flexible selection of data and service providers"; + mainProgram = "pure-maps"; homepage = "https://github.com/rinigus/pure-maps"; changelog = "https://github.com/rinigus/pure-maps/blob/${src.rev}/NEWS.md"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 22ee11082f15..6d907fab0db4 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -91,6 +91,7 @@ in python.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/pytrainer/pytrainer"; description = "Application for logging and graphing sporting excursions"; + mainProgram = "pytrainer"; maintainers = with maintainers; [ rycee dotlambda ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 436c1fc70377..e6a672040824 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Stateless Master Password Manager"; + mainProgram = "qMasterPassword"; longDescription = '' Access all your passwords using only a single master password. But in contrast to other managers it does not store any passwords: Unique diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix deleted file mode 100644 index dc112d2d6935..000000000000 --- a/pkgs/applications/misc/qdirstat/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, fetchFromGitHub, qmake -, coreutils, xdg-utils, bash -, makeWrapper, perlPackages, mkDerivation }: - -let - pname = "qdirstat"; - version = "1.9"; - - src = fetchFromGitHub { - owner = "shundhammer"; - repo = pname; - rev = version; - sha256 = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU="; - }; -in - -mkDerivation { - inherit pname version src; - - nativeBuildInputs = [ qmake makeWrapper ]; - - buildInputs = [ perlPackages.perl ]; - - postPatch = '' - substituteInPlace scripts/scripts.pro \ - --replace /bin/true ${coreutils}/bin/true - - for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp - do - substituteInPlace $i \ - --replace /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open - done - for i in src/Cleanup.cpp src/cleanup-config-page.ui - do - substituteInPlace $i \ - --replace /bin/bash ${bash}/bin/bash \ - --replace /bin/sh ${bash}/bin/sh - done - substituteInPlace src/StdCleanup.cpp \ - --replace /bin/bash ${bash}/bin/bash - ''; - - qmakeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ]; - - postInstall = '' - wrapProgram $out/bin/qdirstat-cache-writer \ - --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.URI ]}" - ''; - - meta = with lib; { - description = "Graphical disk usage analyzer"; - homepage = src.meta.homepage; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - mainProgram = "qdirstat"; - }; -} diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/applications/misc/qelectrotech/default.nix index 3b97a69de226..b4d8bd3ab182 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/applications/misc/qelectrotech/default.nix @@ -69,6 +69,7 @@ mkDerivation rec { meta = with lib; { description = "Free software to create electric diagrams"; + mainProgram = "qelectrotech"; homepage = "https://qelectrotech.org/"; license = licenses.gpl2; maintainers = with maintainers; [ yvesf ]; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index af7cc7e01a6f..c0530dfe78e3 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; + mainProgram = "qolibri"; platforms = platforms.linux; maintainers = with maintainers; [ ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index d73c3793871a..a573ba814a42 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -34,6 +34,7 @@ mkDerivation rec { meta = with lib; { description = "Graphical sudo utility from Project Trident"; + mainProgram = "qsudo"; homepage = "https://github.com/project-trident/qsudo"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 7a84f85a9e21..937641021a5c 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -33,6 +33,7 @@ mkDerivation { meta = with lib; { description = "Editor of tesseract-ocr box files"; + mainProgram = "qt-box-editor-1.12rc1"; homepage = "https://github.com/zdenop/qt-box-editor"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index f8020fbdb447..4ebd059c9274 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Qt pip-mode-like video player for wlroots-based wayland compositors"; + mainProgram = "qt-video-wlr"; homepage = "https://github.com/xdavidwu/qt-video-wlr"; license = licenses.mit; maintainers = with maintainers; [ fionera rewine ]; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index d158c111c87f..ce265d5f67fd 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -27,6 +27,7 @@ mkDerivation rec { meta = with lib; { description = "Bitcoin trading client"; + mainProgram = "QtBitcoinTrader"; homepage = "https://centrabit.com/"; license = licenses.gpl3; platforms = qt5.qtbase.meta.platforms; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index ad940a77f99a..26807bc42a1c 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -54,6 +54,7 @@ mkDerivation rec { meta = with lib; { description = "A multi-platform GUI for pass, the standard unix password manager"; + mainProgram = "qtpass"; homepage = "https://qtpass.org"; license = licenses.gpl3; maintainers = [ maintainers.hrdinka ]; diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 9c5f35be9a9e..455b6df4d054 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -19,6 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { maintainers = with maintainers; [ winpat ]; description = "A run-or-raise-application-launcher for i3 window manager"; + mainProgram = "raiseorlaunch"; homepage = "https://github.com/open-dynaMIX/raiseorlaunch"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix index 8f78c0becaf5..9b18c60447e3 100644 --- a/pkgs/applications/misc/razergenie/default.nix +++ b/pkgs/applications/misc/razergenie/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/z3ntu/RazerGenie"; description = "Qt application for configuring your Razer devices under GNU/Linux"; + mainProgram = "razergenie"; license = licenses.gpl3; maintainers = with maintainers; [ f4814n Mogria ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index e5900a050efc..05daa180d029 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A desktop application to test regular expressions interactively"; + mainProgram = "com.github.artemanufrij.regextester"; homepage = "https://github.com/artemanufrij/regextester"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix index c5958aff724c..c9a60d4ce2e8 100644 --- a/pkgs/applications/misc/remarkable/restream/default.nix +++ b/pkgs/applications/misc/remarkable/restream/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "reMarkable screen sharing over SSH"; + mainProgram = "restream"; homepage = "https://github.com/rien/reStream"; license = licenses.mit; maintainers = [ maintainers.cpcloud ]; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index 24627025ca9f..52ad1dce2688 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -24,6 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Fast live viewer for reMarkable 1 and 2"; + mainProgram = "rmview"; homepage = "https://github.com/bordaigorl/rmview"; license = licenses.gpl3Only; maintainers = [ maintainers.nickhu ]; diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix index fdabc149d6db..0aabaababf6a 100644 --- a/pkgs/applications/misc/remontoire/default.nix +++ b/pkgs/applications/misc/remontoire/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A small GTK app for presenting keybinding hints"; + mainProgram = "remontoire"; homepage = "https://github.com/regolith-linux/remontoire"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix index b95bc98fdd3a..9748ca63c281 100644 --- a/pkgs/applications/misc/resp-app/default.nix +++ b/pkgs/applications/misc/resp-app/default.nix @@ -95,6 +95,7 @@ mkDerivation rec { meta = with lib; { description = "Cross-platform Developer GUI for Redis"; + mainProgram = "resp"; homepage = "https://resp.app/"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/pkgs/applications/misc/retool/default.nix b/pkgs/applications/misc/retool/default.nix deleted file mode 100644 index 8d7811120979..000000000000 --- a/pkgs/applications/misc/retool/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, python3 -, fetchFromGitHub -, qt6 -}: - -python3.pkgs.buildPythonApplication { - pname = "retool"; - version = "unstable-2023-08-24"; - - format = "pyproject"; - disabled = python3.pkgs.pythonOlder "3.10"; - - src = fetchFromGitHub { - owner = "unexpectedpanda"; - repo = "retool"; - rev = "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301"; - hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; - }; - - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - qt6.wrapQtAppsHook - ]; - - pythonRelaxDeps = true; - - # ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) - # ERROR: No matching distribution found for PySide6 - pythonRemoveDeps = [ "PySide6" ]; - - buildInputs = [ - qt6.qtbase - ] ++ - lib.optionals (stdenv.isLinux) [ - qt6.qtwayland - ]; - - propagatedBuildInputs = with python3.pkgs; [ - alive-progress - lxml - psutil - validators - pyside6 - strictyaml - ]; - - # Upstream has no tests - doCheck = false; - - meta = with lib; { - description = "A better filter tool for Redump and No-Intro dats"; - homepage = "https://github.com/unexpectedpanda/retool"; - license = licenses.bsd3; - maintainers = with maintainers; [ thiagokokada ]; - }; -} diff --git a/pkgs/applications/misc/revanced-cli/default.nix b/pkgs/applications/misc/revanced-cli/default.nix index 2e770a157398..2d0629f5e171 100644 --- a/pkgs/applications/misc/revanced-cli/default.nix +++ b/pkgs/applications/misc/revanced-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "revanced-cli"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar"; - hash = "sha256-zdkasyYwyPB6mPvRVMP3/UoaXdaRxAI8GyOxsCYBMEE="; + hash = "sha256-I25SmWUVJenFou1fKCd53PojoGt9FAQ7hDpEWweAICQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/rofi-screenshot/default.nix b/pkgs/applications/misc/rofi-screenshot/default.nix index fedb03fa613d..6b1861dc8fc5 100644 --- a/pkgs/applications/misc/rofi-screenshot/default.nix +++ b/pkgs/applications/misc/rofi-screenshot/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "Use rofi to perform various types of screenshots and screen captures"; + mainProgram = "rofi-screenshot"; homepage = "https://github.com/ceuk/rofi-screenshot"; maintainers = with lib.maintainers; [ zopieux ]; platforms = lib.platforms.all; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix deleted file mode 100644 index f620bb7bd832..000000000000 --- a/pkgs/applications/misc/rofimoji/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ buildPythonApplication -, fetchFromGitHub -, lib -, python3 -, installShellFiles - -, waylandSupport ? true -, x11Support ? true - -, configargparse -, rofi -, wl-clipboard -, wtype -, xdotool -, xsel -}: - -buildPythonApplication rec { - pname = "rofimoji"; - version = "6.1.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "fdw"; - repo = "rofimoji"; - rev = "refs/tags/${version}"; - sha256 = "sha256-eyzdTMLW9nk0x74T/AhvoVSrxXugc1HgNJy8EB5BApE="; - }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - installShellFiles - ]; - - # `rofi` and the `waylandSupport` and `x11Support` dependencies - # contain binaries needed at runtime. - propagatedBuildInputs = with lib; [ configargparse rofi ] - ++ optionals waylandSupport [ wl-clipboard wtype ] - ++ optionals x11Support [ xdotool xsel ]; - - # The 'extractors' sub-module is used for development - # and has additional dependencies. - postPatch = '' - rm -rf extractors - ''; - - postInstall = '' - installManPage src/picker/docs/rofimoji.1 - ''; - - meta = with lib; { - description = "A simple emoji and character picker for rofi"; - homepage = "https://github.com/fdw/rofimoji"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ justinlovinger ]; - }; -} diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix index ee536ca7c50f..41582e1b413c 100644 --- a/pkgs/applications/misc/rootbar/default.nix +++ b/pkgs/applications/misc/rootbar/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hg.sr.ht/~scoopta/rootbar"; description = "A bar for Wayland WMs"; + mainProgram = "rootbar"; longDescription = '' Root Bar is a bar for wlroots based wayland compositors such as sway and was designed to address the lack of good bars for wayland. diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index eb0944fd2a03..24d0a0eaa6ab 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -18,6 +18,7 @@ mkDerivation rec { meta = with lib; { description = "Takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)"; + mainProgram = "rsibreak"; license = licenses.gpl2; homepage = "https://www.kde.org/applications/utilities/rsibreak/"; maintainers = with maintainers; [ vandenoever ]; diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/applications/misc/schemes/default.nix index 41ec97f8b176..b3653d50646f 100644 --- a/pkgs/applications/misc/schemes/default.nix +++ b/pkgs/applications/misc/schemes/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Edit GtkSourceView style-schemes for an application or platform"; + mainProgram = "schemes"; homepage = "https://gitlab.gnome.org/chergert/schemes"; license = licenses.gpl3Plus; maintainers = with maintainers; [ _0xMRTT ]; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index e493b0188032..4c11333a4a01 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Simple terminal user interface for Signal"; + mainProgram = "scli"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/applications/misc/seashells/default.nix index 4ece0036c530..37a90478710c 100644 --- a/pkgs/applications/misc/seashells/default.nix +++ b/pkgs/applications/misc/seashells/default.nix @@ -16,6 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://seashells.io/"; description = "Pipe command-line programs to seashells.io"; + mainProgram = "seashells"; longDescription = '' Official cient for seashells.io, which allows you to view command-line output on the web, in real-time. diff --git a/pkgs/applications/misc/selectdefaultapplication/default.nix b/pkgs/applications/misc/selectdefaultapplication/default.nix index 39470d2b0edd..700ac3e75884 100644 --- a/pkgs/applications/misc/selectdefaultapplication/default.nix +++ b/pkgs/applications/misc/selectdefaultapplication/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A very simple application that lets you define default applications on Linux in a sane way"; + mainProgram = "selectdefaultapplication"; homepage = "https://github.com/sandsmark/selectdefaultapplication"; maintainers = with maintainers; [ nsnelson ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index fcf021a5ac7f..dc681b7385dc 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple plaintext presentation tool"; + mainProgram = "sent"; homepage = "https://tools.suckless.org/sent/"; license = licenses.isc; platforms = platforms.unix; diff --git a/pkgs/applications/misc/serial-studio/default.nix b/pkgs/applications/misc/serial-studio/default.nix index 1e205618f400..129f3d49eb75 100644 --- a/pkgs/applications/misc/serial-studio/default.nix +++ b/pkgs/applications/misc/serial-studio/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi-purpose serial data visualization & processing program"; + mainProgram = "serial-studio"; homepage = "https://serial-studio.github.io/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/sfwbar/default.nix b/pkgs/applications/misc/sfwbar/default.nix index bd46c449ffab..9f467fdf6a2d 100644 --- a/pkgs/applications/misc/sfwbar/default.nix +++ b/pkgs/applications/misc/sfwbar/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/LBCrion/sfwbar"; description = "A flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; + mainProgram = "sfwbar"; platforms = platforms.linux; maintainers = with maintainers; [ NotAShelf ]; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index dd6c723121d4..63294e404821 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Describe your shell commands in natural language"; + mainProgram = "shell-genie"; homepage = "https://github.com/dylanjcastillo/shell-genie"; license = licenses.mit; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/applications/misc/shipments/default.nix index dccd5dc89c69..792f997c5f85 100644 --- a/pkgs/applications/misc/shipments/default.nix +++ b/pkgs/applications/misc/shipments/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Postal package tracking application"; + mainProgram = "shipments"; homepage = "https://sr.ht/~martijnbraam/shipments/"; changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}"; license = licenses.lgpl3; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 145c34b7f8c0..1e82fce07898 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Yet another simple static gallery generator"; + mainProgram = "sigal"; homepage = "http://sigal.saimon.org/"; license = licenses.mit; maintainers = with maintainers; [ domenkozar matthiasbeyer ]; diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/applications/misc/siglo/default.nix index 520f4330e503..1231d2fd47fd 100644 --- a/pkgs/applications/misc/siglo/default.nix +++ b/pkgs/applications/misc/siglo/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK app to sync InfiniTime watch with PinePhone"; + mainProgram = "siglo"; homepage = "https://github.com/theironrobin/siglo"; changelog = "https://github.com/theironrobin/siglo/tags/v${version}"; license = licenses.mpl20; diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 3a59a2542eaf..3cdec7ec291f 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://sioyek.info/"; description = "A PDF viewer designed for research papers and technical books"; + mainProgram = "sioyek"; changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ podocarp ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 945ea6e25bdd..b054be4be094 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -65,6 +65,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/SkyTemple/skytemple"; description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; + mainProgram = "skytemple"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix marius851000 ]; }; diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index c924a3ec2bb5..901265016f8e 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -8,33 +8,34 @@ , shiboken2 }: let - version = "0.1.3"; + version = "0.1.3+"; in buildPythonApplication rec { pname = "sl1-to-photon"; inherit version; src = fetchFromGitHub { - owner = "fookatchu"; + owner = "cab404"; repo = "SL1toPhoton"; - rev = "v${version}"; - sha256 = "1hmb74rcky3nax4lxn7pw6lcd5a66fdbwrm11c84zb31xb51bakw"; + rev = "7edc6ea99818622f5d49ac7af80ddd4916b8c19f"; + sha256 = "ssFfjlBMi3FHosDBUA2gs71VUIBkEdPVcV3STNxmOIM="; }; - propagatedBuildInputs = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; + pythonPath = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; - format = "other"; + format = "setuptools"; + dontUseSetuptoolsCheck = true; installPhase = '' install -D -m 0755 SL1_to_Photon.py $out/bin/${pname} - sed -i '1i#!/usr/bin/env python' $out/bin/${pname} ''; meta = with lib; { maintainers = [ maintainers.cab404 ]; license = licenses.gpl3Plus; description = "Tool for converting Slic3r PE's SL1 files to Photon files for the Anycubic Photon 3D-Printer"; - homepage = "https://github.com/fookatchu/SL1toPhoton"; + homepage = "https://github.com/cab404/SL1toPhoton"; + mainProgram = "sl1-to-photon"; }; } diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 923e480c1f0f..6695f53e9932 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -89,13 +89,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "G-code generator for 3D printers"; + mainProgram = "slic3r"; longDescription = '' Slic3r is the tool you need to convert a digital 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.''; homepage = "https://slic3r.org/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 4c60e2947b97..c82b0813f78b 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Graphical interface for snapper"; + mainProgram = "snapper-gui"; longDescription = '' A graphical user interface for the tool snapper for Linux filesystem snapshot management. It can compare snapshots and revert differences between snapshots. diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix index b6d4f3f180eb..5851ea49289e 100644 --- a/pkgs/applications/misc/sqls/default.nix +++ b/pkgs/applications/misc/sqls/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/sqls-server/sqls"; description = "SQL language server written in Go"; + mainProgram = "sqls"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 6571bca3bfa6..9e9df71ddf9a 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A sticky notes app for the linux desktop"; + mainProgram = "sticky"; homepage = "https://github.com/linuxmint/sticky"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/applications/misc/stylish/default.nix index b1fed22b7ffe..8dce6409bb7c 100644 --- a/pkgs/applications/misc/stylish/default.nix +++ b/pkgs/applications/misc/stylish/default.nix @@ -45,6 +45,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/thevinter/styli.sh"; description = "A shell script to manage wallpapers"; + mainProgram = "styli.sh"; longDescription = '' Styli.sh is a Bash script that aims to automate the tedious process of finding new wallpapers, downloading and switching them via the diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 6831cea6c4f3..fb028c744751 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -140,6 +140,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A divelog program"; + mainProgram = "subsurface"; longDescription = '' Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. It allows tracking of dive locations including GPS coordinates (which can also diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index 525e25ae7e06..f377e493dfd9 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TUI Application launcher with Desktop Entry support."; + mainProgram = "sway-launcher-desktop"; longDescription = '' This is a TUI-based launcher menu made with bash and the amazing fzf. Despite its name, it does not (read: no longer) depend on the Sway window manager diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 2c8f9993fed5..c78e1246c5c8 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchzip , fetchurl , makeWrapper , makeDesktopItem @@ -50,9 +51,12 @@ let find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths ''; - nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; + # upstream targets Java 7 by default + env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8"; + buildPhase = '' runHook preBuild @@ -100,9 +104,6 @@ let mainProgram = exec; }; }; - - d2u = lib.replaceStrings ["."] ["_"]; - in { application = mkSweetHome3D rec { @@ -111,9 +112,9 @@ in { module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "sha256-Io3HfussfSy6CLHE0JCAk0gjBAla/u+pS1Gan8BxozY="; + hash = "sha256-RVuwxL/YATqHoQuc25ZaYgZ+o2rMOqnzU8/LLxb5Ra4="; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index d5cdebb76282..f4fe14fb6751 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchzip , makeWrapper , makeDesktopItem , jdk @@ -18,14 +18,6 @@ let + removeSuffix "libraryeditor" (toLower m) + "-editor"; - applicationSrc = stdenv.mkDerivation { - name = "application-src"; - src = sweethome3dApp.src; - nativeBuildInputs = [ unzip ]; - buildPhase = ""; - installPhase = "cp -r . $out"; - }; - mkEditorProject = { pname, module, version, src, license, description, desktopName }: @@ -41,18 +33,21 @@ let categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ]; + # upstream targets Java 7 by default + env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8"; + postPatch = '' - sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml + sed -i -e 's,../SweetHome3D,${sweethome3dApp.src},g' build.xml sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml ''; buildPhase = '' runHook preBuild - ant -lib ${applicationSrc}/libtest -lib ${applicationSrc}/lib -lib ${jdk}/lib + ant -lib ${sweethome3dApp.src}/libtest -lib ${sweethome3dApp.src}/lib -lib ${jdk}/lib runHook postBuild ''; @@ -90,9 +85,9 @@ in { pname = module; description = "Easily create SH3T files and edit the properties of the texture images it contain"; license = lib.licenses.gpl2Plus; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "03vb9y645qzffxxdhgbjb0d98k3lafxckg2vh2s86j62b6357d0h"; + hash = "sha256-v8hMEUujTgWvFnBTF8Dnd1iWgoIXBzGMUxBgmjdxx+g="; }; desktopName = "Sweet Home 3D - Textures Library Editor"; }; @@ -102,10 +97,10 @@ in { module = "FurnitureLibraryEditor"; pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; - license = lib.licenses.gpl2; - src = fetchurl { + license = lib.licenses.gpl2Plus; + src = fetchzip { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "sha256-r5xJlUctUdcknJfm8rbz+bdzFhqgHsHpHwxEC4mItws="; + hash = "sha256-pqsSxQPzsyx4PS98fgU6UFhPWhpQoepGm0uJtkvV46c="; }; desktopName = "Sweet Home 3D - Furniture Library Editor"; }; diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 737c713fb79c..94dc95a466cd 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; + mainProgram = "system76-keyboard-configurator"; homepage = "https://github.com/pop-os/keyboard-configurator"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ mirrexagon ]; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 5250581762b0..236c81da562c 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lharding/tasknc"; description = "A ncurses wrapper around taskwarrior"; + mainProgram = "tasknc"; maintainers = with maintainers; [ matthiasbeyer infinisil ]; platforms = platforms.linux; # Cannot test others license = licenses.mit; diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 54361a0fbbd5..ee40e19261a9 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Script for taking notes and open urls with taskwarrior"; + mainProgram = "taskopen"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index 34c01a197591..e39dd2462321 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Glorified WM-Independent Dropdown Creator"; + mainProgram = "tdrop"; homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix deleted file mode 100644 index 9e4f711d125c..000000000000 --- a/pkgs/applications/misc/teleprompter/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, asar, autoPatchelfHook}: - -let - electron = electron_10; -in -stdenv.mkDerivation rec { - pname = "teleprompter"; - version = "2.4.0"; - - src = fetchurl { - url = "https://github.com/ImaginarySense/Imaginary-Teleprompter-Electron/releases/download/${lib.versions.majorMinor version}/imaginary-teleprompter-${version}.tar.gz"; - sha256 = "bgdtK8l5d26avv1WUw9cfOgZrIL1q/a9890Ams4yidQ="; - }; - - dontBuild = true; - dontStrip = true; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper asar ]; - installPhase = '' - mkdir -p $out/bin $out/opt/teleprompter $out/share/applications - asar e resources/app.asar $out/opt/teleprompter/resources/app.asar.unpacked - ln -s ${desktopItem}/share/applications/* $out/share/applications - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/teleprompter \ - --add-flags "$out/opt/teleprompter/resources/app.asar.unpacked --without-update" - ''; - - desktopItem = makeDesktopItem { - name = "teleprompter"; - exec = "teleprompter"; - desktopName = "Teleprompter"; - }; - - meta = with lib; { - description = "The most complete, free, teleprompter app on the web"; - license = [ licenses.gpl3Plus ]; - homepage = "https://github.com/ImaginarySense/Teleprompter-Core"; - platforms = platforms.linux; - maintainers = with maintainers; [ Scriptkiddi ]; - }; -} - diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 52b513b89d6d..b990f0ddb0d2 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -61,6 +61,7 @@ mkDerivation rec { meta = with lib; { description = "Collection management software, free and simple"; + mainProgram = "tellico"; homepage = "https://tellico-project.org/"; license = with licenses; [ gpl2Only gpl3Only lgpl2Only ]; maintainers = with maintainers; [ numkem ]; diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index f28bd665a5e1..d2d592dce7e9 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -22,6 +22,7 @@ buildPythonApplication rec { meta = with lib; { description = "Starts a countdown to or from TIMESPEC"; + mainProgram = "termdown"; longDescription = "Countdown timer and stopwatch in your terminal"; homepage = "https://github.com/trehn/termdown"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index e51f7633e013..244bfee24032 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -32,6 +32,7 @@ buildPythonApplication { A graphical pdf (and epub, cbz, ...) reader that works inside the kitty terminal. ''; + mainProgram = "termpdf.py"; homepage = "https://github.com/dsanson/termpdf.py"; maintainers = with maintainers; [ teto ]; license = licenses.mit; diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index 945bd8de5420..652fe267852a 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -53,6 +53,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/ALEX11BR/ThemeChanger"; description = "A theme changing utility for Linux"; + mainProgram = "themechanger"; longDescription = '' This app is a theme changing utility for Linux, BSDs, and whatnots. It lets the user change GTK 2/3/4, Kvantum, icon and cursor themes, edit GTK CSS with live preview, and set some related options. diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index bf53848b5d38..2c31d2b5725d 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Task management system"; + mainProgram = "thinkingrock"; homepage = "http://www.thinkingrock.com.au/"; license = licenses.cddl; platforms = platforms.unix; diff --git a/pkgs/applications/misc/tilemaker/default.nix b/pkgs/applications/misc/tilemaker/default.nix deleted file mode 100644 index af4944ea8ba1..000000000000 --- a/pkgs/applications/misc/tilemaker/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages, cmake, installShellFiles -, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "tilemaker"; - version = "3.0.0"; - - src = fetchFromGitHub { - owner = "systemed"; - repo = "tilemaker"; - rev = "v${finalAttrs.version}"; - hash = "sha256-rB5oP03yaIzklwkGsIeS9ELbHOY9AObwjRrK9HBQFI4="; - }; - - postPatch = '' - substituteInPlace src/tilemaker.cpp \ - --replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \ - --replace "process.lua" "$out/share/tilemaker/process-openmaptiles.lua" - ''; - - nativeBuildInputs = [ cmake installShellFiles ]; - - buildInputs = [ boost lua protobuf rapidjson shapelib sqlite zlib ]; - - cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "-DPROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"; - - env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ]; - - postInstall = '' - installManPage ../docs/man/tilemaker.1 - install -Dm644 ../resources/* -t $out/share/tilemaker - ''; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "tilemaker --help"; - }; - - meta = with lib; { - description = "Make OpenStreetMap vector tiles without the stack"; - homepage = "https://tilemaker.org/"; - changelog = "https://github.com/systemed/tilemaker/blob/v${version}/CHANGELOG.md"; - license = licenses.free; # FTWPL - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 76ea8fb7fc0e..d61e0deabbd7 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -17,6 +17,7 @@ mkDerivation rec { meta = with lib; { description = "Learn and train typing with the ten-finger system"; + mainProgram = "tipp10"; homepage = "https://gitlab.com/tipp10/tipp10"; license = licenses.gpl2Only; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/applications/misc/tiv/default.nix index 30117180b74c..4bfb705ae861 100644 --- a/pkgs/applications/misc/tiv/default.nix +++ b/pkgs/applications/misc/tiv/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/stefanhaustein/TerminalImageViewer"; description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"; + mainProgram = "tiv"; license = licenses.asl20; maintainers = with maintainers; [ magnetophon ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index dd90ffe370e6..496644ff4d42 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Mastodon CLI interface"; + mainProgram = "toot"; homepage = "https://github.com/ihabunek/toot"; license = licenses.gpl3; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 9ece11043fa0..59e93dcb5dea 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A cli todo application compatible with the todo.txt format"; + mainProgram = "topydo"; homepage = "https://github.com/topydo/topydo"; changelog = "https://github.com/topydo/topydo/blob/${src.rev}/CHANGES.md"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 48ff9675a78d..90d1cc01ffb4 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://projects.sirrix.com/trac/tpmmanager"; description = "Tool for managing the TPM"; + mainProgram = "tpmmanager"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index 1b26f455649a..b3334c59c4a0 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -56,6 +56,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "DBus daemon to access Wacom SmartPad devices"; + mainProgram = "tuhi"; homepage = "https://github.com/tuhiproject/tuhi"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index d4188829d40b..a1c4f60c4e65 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -25,6 +25,7 @@ buildPythonApplication rec { meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; + mainProgram = "tuir"; homepage = "https://gitlab.com/ajak/tuir/"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index 61fb05250712..a602c31008de 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -31,6 +31,7 @@ buildPythonApplication rec { meta = with lib; { description = "Twitch Chat Downloader"; + mainProgram = "tcd"; homepage = "https://github.com/TheDrHax/Twitch-Chat-Downloader"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 7c49696141c6..7ca8c9f97345 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -16,6 +16,7 @@ buildPythonApplication rec { meta = with lib; { description = "Update timezone information based on geoip"; + mainProgram = "tzupdate"; homepage = "https://github.com/cdown/tzupdate"; maintainers = [ maintainers.michaelpj ]; license = licenses.unlicense; diff --git a/pkgs/applications/misc/ubpm/default.nix b/pkgs/applications/misc/ubpm/default.nix index 6e0d7f7f25f5..02e8411999fe 100644 --- a/pkgs/applications/misc/ubpm/default.nix +++ b/pkgs/applications/misc/ubpm/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://codeberg.org/LazyT/ubpm"; description = "Universal Blood Pressure Manager"; + mainProgram = "ubpm"; license = licenses.gpl3Only; maintainers = with maintainers; [ kurnevsky ]; }; diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index fbd93fe504cc..4e07cf62821d 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -60,8 +60,9 @@ stdenv.mkDerivation rec { "-Dvapi=false" ]; - meta = with lib; { + meta = { description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries"; + mainProgram = "valent"; longDescription = '' Note that you have to open firewall ports for other devices to connect to it. Use either: @@ -81,8 +82,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; + maintainers = with lib.maintainers; [ aleksana federicoschonborn ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index cf0272f075e2..e26496718f39 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -82,6 +82,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/varietywalls/variety"; description = "A wallpaper manager for Linux systems"; + mainProgram = "variety"; longDescription = '' Variety is a wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index ae0466c1faaa..43c3aea38e82 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { description = "A tool for generating terminal GIFs with code"; + mainProgram = "vhs"; homepage = "https://github.com/charmbracelet/vhs"; changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index be642790f386..8a987ed24672 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GPS data editor and analyzer"; + mainProgram = "viking"; longDescription = '' Viking is a free/open source program to manage GPS data. You can import and plot tracks and waypoints, show Openstreetmaps diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index b7594add350a..7bd7501f2296 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -33,6 +33,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; + mainProgram = "vit"; maintainers = with maintainers; [ dtzWill arcnmx ]; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 4815a7bc10af..e58b98c4e070 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.insilmaril.de/vym/"; description = "A mind-mapping software"; + mainProgram = "vym"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. Such maps can help you to improve your creativity and diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index b78d7f5277ca..c668aea45531 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "PineTime smart watch companion app for Linux phone and desktop"; + mainProgram = "watchmate"; homepage = "https://github.com/azymohliad/watchmate"; changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/watershot/default.nix b/pkgs/applications/misc/watershot/default.nix index 6a6feb209d05..6d29fab82527 100644 --- a/pkgs/applications/misc/watershot/default.nix +++ b/pkgs/applications/misc/watershot/default.nix @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { platforms = with platforms; linux; description = "A simple wayland native screenshot tool"; + mainProgram = "watershot"; homepage = "https://github.com/Kirottu/watershot"; license = licenses.gpl3Only; maintainers = with maintainers; [ lord-valen ]; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index dad61b88d4ff..fd24f6605e4e 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -2,6 +2,7 @@ , stdenv , bash , fetchFromGitHub +, fetchFromGitLab , SDL2 , alsa-lib , catch2_3 @@ -51,6 +52,7 @@ , mpdSupport ? true , mprisSupport ? stdenv.isLinux , nlSupport ? true +, pipewireSupport ? true , pulseSupport ? true , rfkillSupport ? true , runTests ? true @@ -68,24 +70,35 @@ let libcava.src = fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; - rev = "0.9.1"; - hash = "sha256-FnRJJV0poRmw+y4nt1X7Z0ipX86LRK1TJhNKHFk0rTw="; + rev = "0.10.1"; + hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; }; + + wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { + version = "0.4.17"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "wireplumber"; + rev = version; + hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; + }; + }); in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.9.24"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = finalAttrs.version; - hash = "sha256-JhLKGzqZ8akWcyHTav2TGcGmXk9dy9Xj4+/oFCPeNU0="; + hash = "sha256-p1VRrKT2kTDy48gDXPMHlLbfcokAOFeTZXGzTeO1SAE="; }; postUnpack = lib.optional cavaSupport '' pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.9.1 + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1 patchShebangs . popd ''; @@ -122,7 +135,6 @@ stdenv.mkDerivation (finalAttrs: { fftw iniparser ncurses - pipewire portaudio ] ++ lib.optional evdevSupport libevdev @@ -138,7 +150,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional traySupport libdbusmenu-gtk3 ++ lib.optional udevSupport udev ++ lib.optional upowerSupport upower - ++ lib.optional wireplumberSupport wireplumber + ++ lib.optional wireplumberSupport wireplumber_0_4 + ++ lib.optional (cavaSupport || pipewireSupport) pipewire ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; nativeCheckInputs = [ catch2_3 ]; @@ -147,7 +160,6 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = (lib.mapAttrsToList lib.mesonEnable { "cava" = cavaSupport; "dbusmenu-gtk" = traySupport; - "gtk-layer-shell" = true; "jack" = jackSupport; "libinput" = inputSupport; "libnl" = nlSupport; @@ -155,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { "man-pages" = true; "mpd" = mpdSupport; "mpris" = mprisSupport; + "pipewire" = pipewireSupport; "pulseaudio" = pulseSupport; "rfkill" = rfkillSupport; "sndio" = sndioSupport; diff --git a/pkgs/applications/misc/waycorner/default.nix b/pkgs/applications/misc/waycorner/default.nix index 66e5660042ad..2d1303bb26c7 100644 --- a/pkgs/applications/misc/waycorner/default.nix +++ b/pkgs/applications/misc/waycorner/default.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "waycorner"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "AndreasBackx"; repo = "waycorner"; rev = version; - hash = "sha256-xvmvtn6dMqt8kUwvn5d5Nl1V84kz1eWa9BSIN/ONkSQ="; + hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y="; }; - cargoHash = "sha256-Dl+GhJywWhaC4QMS70klazPsFipGVRW+6jrXH2XsEAI="; + cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU="; buildInputs = [ wayland ]; @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Hot corners for Wayland"; + mainProgram = "waycorner"; changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md"; homepage = "https://github.com/AndreasBackx/waycorner"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix index 1b2ca4843461..36f79865d31a 100644 --- a/pkgs/applications/misc/waypaper/default.nix +++ b/pkgs/applications/misc/waypaper/default.nix @@ -42,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { changelog = "https://github.com/anufrievroman/waypaper/releases/tag/${version}"; description = "GUI wallpaper setter for Wayland-based window managers"; + mainProgram = "waypaper"; longDescription = '' GUI wallpaper setter for Wayland-based window managers that works as a frontend for popular backends like swaybg and swww. diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 290de03f39ff..b17bca38d6e9 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://fungi.yuggoth.org/weather"; description = "Quick access to current weather conditions and forecasts"; + mainProgram = "weather"; license = licenses.isc; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/webfontkitgenerator/default.nix b/pkgs/applications/misc/webfontkitgenerator/default.nix index 57d006a5b569..c4a3a7b86e98 100644 --- a/pkgs/applications/misc/webfontkitgenerator/default.nix +++ b/pkgs/applications/misc/webfontkitgenerator/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Webfont Kit Generator is a simple utility that allows you to generate woff, woff2 and the necessary CSS boilerplate from non-web font formats (otf & ttf)"; + mainProgram = "webfontkitgenerator"; homepage = "https://apps.gnome.org/app/com.rafaelmardojai.WebfontKitGenerator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ benediktbroich ]; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index ce7d178f1c05..83b310ef885e 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -1,38 +1,54 @@ -{ lib, stdenv, fetchurl -, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, gnugrep, asar -, electron, python3, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, makeWrapper +, electron +, cacert +, gitMinimal +, yarn }: - stdenv.mkDerivation rec { pname = "whalebird"; - version = "5.0.7"; - - src = let - downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/v${version}"; - in - if stdenv.system == "x86_64-linux" then - fetchurl { - url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; - hash = "sha256-eufP038REwF2VwAxxI8R0S3fE8oJ+SX/CES5ozuut2w="; - } - else if stdenv.system == "aarch64-linux" then - fetchurl { - url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; - hash = "sha256-U0xVTUUm6wsRxYc1w4vfNtVE6o8dNzXTSi+IX4mgDEE="; - } - else - throw "Whalebird is not supported for ${stdenv.system}"; + version = "6.0.4"; + + src = fetchFromGitHub { + owner = "h3poteto"; + repo = "whalebird-desktop"; + rev = "v${version}"; + hash = "sha256-Yx0GEEPJ+d4/RvCbqZdKR6iE2iUNbOJr+RuboqjT8z8="; + }; + # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles + offlineCache = stdenv.mkDerivation { + name = "whalebird-${version}-offline-cache"; + inherit src; + + nativeBuildInputs = [ + cacert # needed for git + gitMinimal # needed to download git dependencies + yarn + ]; + + buildPhase = '' + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder $out + yarn config set --json supportedArchitectures.os '[ "linux" ]' + yarn config set --json supportedArchitectures.cpu '[ "arm64", "x64" ]' + yarn + ''; + + outputHashMode = "recursive"; + outputHash = "sha256-RjTGAgHRRQ4O3eTYpmTrl+KXafDZkWf1NH6lzdozVAA="; + }; nativeBuildInputs = [ - autoPatchelfHook makeWrapper copyDesktopItems - gnugrep - asar + yarn ]; - buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; - desktopItems = [ (makeDesktopItem { desktopName = "Whalebird"; @@ -44,28 +60,21 @@ stdenv.mkDerivation rec { }) ]; - unpackPhase = '' - mkdir -p opt - tar -xf ${src} -C opt - # remove the version/target suffix from the untar'd directory - mv opt/Whalebird-* opt/Whalebird - ''; + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; buildPhase = '' runHook preBuild - # Necessary steps to find the tray icon - # For aarch64-linux, we need to overwrite this symlink first as it points to - # /usr/bin/python3 - if [ "${stdenv.system}" = "aarch64-linux" ] - then ln -sf ${python3}/bin/python3 \ - opt/Whalebird/resources/app.asar.unpacked/node_modules/better-sqlite3/build/node_gyp_bins/python3 - fi - asar extract opt/Whalebird/resources/app.asar "$TMP/work" - substituteInPlace "$TMP/work/dist/electron/main.js" \ - --replace "$(grep -oE '.{2},"tray_icon.png"' "$TMP/work/dist/electron/main.js")" \ - "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" - asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder ${offlineCache} + + yarn --immutable-cache + yarn run nextron build --no-pack + yarn run electron-builder --dir \ + --config electron-builder.yml \ + -c.electronDist="${electron}/libexec/electron" \ + -c.electronVersion=${electron.version} runHook postBuild ''; @@ -73,26 +82,30 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir $out - mv opt $out + mkdir -p $out/opt + cp -r ./dist/*-unpacked $out/opt/Whalebird - # install icons - for icon in $out/opt/Whalebird/resources/build/icons/*.png; do - mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" - ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/whalebird.png" + # Install icons + # Taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=whalebird#n41 + for i in 16 32 128 256 512; do + install -Dm644 "resources/icons/icon.iconset/icon_$i"x"$i.png" \ + "$out/share/icons/hicolor/$i"x"$i/apps/whalebird.png" done + install -Dm644 "resources/icons/icon.iconset/icon_32x32@2x.png" \ + "$out/share/icons/hicolor/64x64/apps/whalebird.png" - makeWrapper ${electron}/bin/electron $out/bin/whalebird \ - --add-flags $out/opt/Whalebird/resources/app.asar \ + makeWrapper "${electron}/bin/electron" "$out/bin/whalebird" \ + --add-flags "$out/opt/Whalebird/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" runHook postInstall ''; meta = with lib; { - description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux"; + description = "Single-column Fediverse client for desktop"; + mainProgram = "whalebird"; homepage = "https://whalebird.social"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang colinsane weathercold ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index ec7dff141439..5f20f314d3f4 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -25,6 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A simple curses interface for MediaWiki sites such as Wikipedia"; + mainProgram = "wikicurses"; homepage = "https://github.com/ids1024/wikicurses/"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/applications/misc/wordbook/default.nix b/pkgs/applications/misc/wordbook/default.nix index 757fed5265f2..314ae208f9d5 100644 --- a/pkgs/applications/misc/wordbook/default.nix +++ b/pkgs/applications/misc/wordbook/default.nix @@ -61,6 +61,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Offline English-English dictionary application built for GNOME"; + mainProgram = "wordbook"; homepage = "https://github.com/fushinari/Wordbook"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 7d85f9c7a234..c4a5e692cfca 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "A program to help prevent Repetitive Strain Injury"; + mainProgram = "workrave"; longDescription = '' Workrave is a program that assists in the recovery and prevention of Repetitive Strain Injury (RSI). The program frequently alerts you to diff --git a/pkgs/applications/misc/wpm/default.nix b/pkgs/applications/misc/wpm/default.nix index b6db073eb945..f7786471839a 100644 --- a/pkgs/applications/misc/wpm/default.nix +++ b/pkgs/applications/misc/wpm/default.nix @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Console app for measuring typing speed in words per minute (WPM)"; + mainProgram = "wpm"; homepage = "https://pypi.org/project/wpm"; license = licenses.agpl3Only; maintainers = with maintainers; [ alejandrosame ]; diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 044c617ae38b..3d74cdf35c22 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-2oUj9G82+aGXU+qB37f+lRz5rctZNnb3bK8IETrt/4g="; + hash = "sha256-kRrVqUfkrSK/9z3Hj4J+mKcdV7JdTzjhxlVRa/kf8sw="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-yvgqvcOxl/AmvUg6jTFtYh13sgqAWKPt2uMFHaX5OMM="; + cargoHash = "sha256-HxSyGME95FWR5VwodmrMUX0jPlfE9SJV0WBbICuuTok="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index f5c8e90d2703..19b5a8e3ec2d 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,26 +1,35 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config -, libtool, openssl, qtbase, qttools, sphinx }: - -mkDerivation rec { +{ stdenv +, lib +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, pkg-config +, openssl +, qtbase +, qttools +, sphinx +}: + +stdenv.mkDerivation (finalAttrs: { pname = "xca"; - version = "2.4.0"; + version = "2.6.0"; src = fetchFromGitHub { - owner = "chris2511"; - repo = "xca"; - rev = "RELEASE.${version}"; - sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk"; + owner = "chris2511"; + repo = "xca"; + rev = "RELEASE.${finalAttrs.version}"; + hash = "sha256-E0Ap+JDK/oYTG+uaRHsdOxyLIywlYJ01T4ANQhNH220="; }; - # Adaptions to stay OpenSSL 3.0 compatible - patches = [ (fetchpatch { - url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch"; - hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8="; - }) ]; - - buildInputs = [ libtool openssl qtbase ]; + buildInputs = [ openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ]; + nativeBuildInputs = [ + cmake + pkg-config + qttools + sphinx + wrapQtAppsHook + ]; # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710) QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; @@ -28,11 +37,11 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; - homepage = "https://hohnstaedt.de/xca/"; - license = licenses.bsd3; + mainProgram = "xca"; + homepage = "https://hohnstaedt.de/xca/"; + license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; - platforms = platforms.all; + inherit (qtbase.meta) platforms; }; -} +}) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index a9ccb2399daf..130b97189a62 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -56,6 +56,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; + mainProgram = "xdgmenumaker"; homepage = "https://github.com/gapan/xdgmenumaker"; license = licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 6bcab225c25a..5bfdb209c1ff 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; + mainProgram = "xfontsel"; license = with licenses; [ x11 smlnj mit ]; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 0acaece4cc02..23b6c07ba6c6 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Monero (XMR) Stratum protocol proxy"; + mainProgram = "xmrig-proxy"; homepage = "https://github.com/xmrig/xmrig-proxy"; license = licenses.gpl3Plus; maintainers = with maintainers; [ aij ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index eab545cf0818..e282d84f9c93 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Utility for switching between keyboard layouts"; + mainProgram = "xneur"; homepage = "https://xneur.ru"; license = licenses.gpl2Plus; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 2a14cbe24fb5..13b29491bf3f 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A sticky note application for jotting down things to remember"; + mainProgram = "xpad"; homepage = "https://launchpad.net/xpad"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index b47bbef0188f..178522fbf518 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Auto-suspend inactive X11 applications"; + mainProgram = "xsuspender"; homepage = "https://kernc.github.io/xsuspender/"; license = licenses.wtfpl; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index f7b3f6837f7c..4ce68f77e25b 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://opengribs.org"; description = "Weather Forecast Visualization"; + mainProgram = "xygrib"; longDescription = '' XyGrib is a leading opensource weather visualization package. It interacts with OpenGribs's Grib server providing a choice diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 1c57456f4a19..0d52c230a423 100644 --- a/pkgs/applications/misc/ydict/default.nix +++ b/pkgs/applications/misc/ydict/default.nix @@ -36,6 +36,7 @@ buildGoModule rec { meta = with lib; { description = "Yet another command-line Youdao Chinese dictionary"; + mainProgram = "ydict"; homepage = "https://github.com/TimothyYe/ydict"; license = licenses.mit; maintainers = with maintainers; [ zendo ]; diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix index 14f50e3be290..26ce9f8f64a2 100644 --- a/pkgs/applications/misc/yewtube/default.nix +++ b/pkgs/applications/misc/yewtube/default.nix @@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Terminal based YouTube player and downloader, forked from mps-youtube"; + mainProgram = "yt"; homepage = "https://github.com/mps-youtube/yewtube"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz koral ]; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 4895f749ec8d..0611655da1bc 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -84,6 +84,7 @@ flutter.buildFlutterApplication rec { meta = with lib; { description = "Yubico Authenticator for Desktop"; + mainProgram = "yubioath-flutter"; homepage = "https://github.com/Yubico/yubioath-flutter"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index 9f6816f00dda..e565e1ecda75 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -25,6 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A powerful & scriptable shell for Apache ZooKeeper"; + mainProgram = "zk-shell"; homepage = "https://github.com/rgs1/zk_shell"; license = licenses.asl20; maintainers = [ maintainers.mahe ]; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index bc53ade06a78..ccdac791e336 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -20,6 +20,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A text scroller for use with panels and shells"; + mainProgram = "zscroll"; homepage = "https://github.com/noctuid/zscroll"; license = licenses.gpl3Plus; platforms = platforms.all; |