diff options
Diffstat (limited to 'pkgs/applications/misc')
45 files changed, 174 insertions, 471 deletions
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index e977dffc444b6..c151bedd29e61 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -59,7 +59,7 @@ let homepage = "https://1password.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ]; + maintainers = with maintainers; [ timstott savannidgerinel sebtm ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 7ef91e330cbd5..09bae86572cf9 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { description = "1Password command-line tool"; homepage = "https://developer.1password.com/docs/cli/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; - maintainers = with maintainers; [ joelburget marsam ]; + maintainers = with maintainers; [ joelburget ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; inherit mainProgram platforms; diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index 932db21317c66..67b21e5199de5 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -5,12 +5,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ablog"; - version = "0.11.6"; + version = "0.11.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fV4W4AaiqyruIz3OQ7/lGkMPMKmyiFa+fdU2QeeQCvs="; + hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix deleted file mode 100644 index 95a439b675390..0000000000000 --- a/pkgs/applications/misc/authy/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ autoPatchelfHook -, electron -, fetchurl -, lib -, makeWrapper -, squashfsTools -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "authy"; - # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.4.1"; - rev = "21"; - - src = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - hash = "sha256-a5z6Lwdgody88f7has/f2AMg9m9fGWsJSexZM6KUGOY="; - }; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; - - unpackPhase = '' - runHook preUnpack - unsquashfs "$src" - cd squashfs-root - if ! grep -q '${version}' meta/snap.yaml; then - echo "Package version differs from version found in snap metadata:" - grep 'version: ' meta/snap.yaml - echo "While the nix package specifies: ${version}." - echo "You probably chose the wrong revision or forgot to update the nix version." - exit 1 - fi - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps - - # Copy only what is needed - cp -r resources* $out/ - cp -r locales* $out/ - cp meta/gui/authy.desktop $out/share/applications/ - cp meta/gui/icon.png $out/share/pixmaps/authy.png - - # Replace icon name in Desktop file - sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/share/applications/authy.desktop" - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/resources/app.asar - ''; - - meta = with lib; { - homepage = "https://www.authy.com"; - description = "Twilio Authy two factor authentication desktop application"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ iammrinal0 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "authy"; - }; -} diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index 797a8ffe5c936..d8ae98e66acd6 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -15,7 +15,6 @@ , makeDesktopItem , copyDesktopItems , icoutils -, autoPatchelfHook , bintools , fixDarwinDylibNames , autoSignDarwinBinariesHook @@ -40,8 +39,7 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems icoutils - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 64fa760ef9d24..43b6cb8769ef7 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -1,49 +1,50 @@ -{ stdenv -, lib -, openexr -, jemalloc -, c-blosc -, binutils -, fetchFromGitHub -, cmake -, pkg-config -, wrapGAppsHook -, boost179 -, cereal -, cgal_5 -, curl -, dbus -, eigen -, expat -, gcc-unwrapped -, glew -, glfw -, glib -, glib-networking -, gmp -, gstreamer -, gst-plugins-base -, gst-plugins-bad -, gst-plugins-good -, gtest -, gtk3 -, hicolor-icon-theme -, ilmbase -, libpng -, mesa -, mpfr -, nlopt -, opencascade-occt -, openvdb -, pcre -, qhull -, systemd -, tbb_2021_11 -, webkitgtk -, wxGTK31 -, xorg -, fetchpatch -, withSystemd ? stdenv.isLinux +{ + stdenv, + lib, + openexr, + jemalloc, + c-blosc, + binutils, + fetchFromGitHub, + cmake, + pkg-config, + wrapGAppsHook, + boost179, + cereal, + cgal_5, + curl, + dbus, + eigen, + expat, + gcc-unwrapped, + glew, + glfw, + glib, + glib-networking, + gmp, + gstreamer, + gst-plugins-base, + gst-plugins-bad, + gst-plugins-good, + gtest, + gtk3, + hicolor-icon-theme, + ilmbase, + libpng, + mesa, + mpfr, + nlopt, + opencascade-occt, + openvdb, + pcre, + qhull, + systemd, + tbb_2021_11, + webkitgtk, + wxGTK31, + xorg, + fetchpatch, + withSystemd ? stdenv.isLinux, }: let wxGTK31' = wxGTK31.overrideAttrs (old: { @@ -53,7 +54,14 @@ let ]; }); openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { - buildInputs = [ openexr boost179 tbb_2021_11 jemalloc c-blosc ilmbase ]; + buildInputs = [ + openexr + boost179 + tbb_2021_11 + jemalloc + c-blosc + ilmbase + ]; }); in stdenv.mkDerivation rec { @@ -106,9 +114,7 @@ stdenv.mkDerivation rec { webkitgtk wxGTK31' xorg.libX11 - ] ++ lib.optionals withSystemd [ - systemd - ] ++ checkInputs; + ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; patches = [ # Fix for webkitgtk linking @@ -169,11 +175,8 @@ stdenv.mkDerivation rec { # needed to prevent collisions between the LICENSE.txt files of # bambu-studio and orca-slicer. postInstall = '' - mkdir -p $out/share/doc - mv $out/LICENSE.txt $out/share/doc/LICENSE.txt - if [ -f $out/README.md ]; then - mv $out/README.md $out/share/doc/README.md - fi + mv $out/LICENSE.txt $out/share/BambuStudio/LICENSE.txt + mv $out/README.md $out/share/BambuStudio/README.md ''; meta = with lib; { diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 5e10050078d6c..af89be65246d3 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,27 +1,41 @@ -{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: +{ + lib, + fetchFromGitHub, + bambu-studio, +}: -bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "2.0.0"; - pname = "orca-slicer"; +bambu-studio.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "2.0.0"; + pname = "orca-slicer"; - # Don't inherit patches from bambu-studio - patches = [ - ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch - ]; + # 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-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; - }; + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; + }; - 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; - }; -}) + # needed to prevent collisions between the LICENSE.txt files of + # bambu-studio and orca-slicer. + postInstall = '' + mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt + ''; + + 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/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index 128c668eb0a51..7387bc212c649 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -37,8 +37,6 @@ appimageTools.wrapAppImage rec { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - mv $out/bin/bazecor-* $out/bin/bazecor - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications substituteInPlace $out/share/applications/Bazecor.desktop \ --replace 'Exec=Bazecor' 'Exec=bazecor' diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index e36ece60d751c..336b4d7c1a507 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "cobang"; - version = "0.10.5"; + version = "0.10.9"; pyproject = true; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; rev = "refs/tags/v${version}"; - hash = "sha256-CfT/farNOJiWIioFBPx2q7bAFAE4khcojdZ7AsYaU6o="; + hash = "sha256-xOP2XkmHOGMe50dn4StX/9veTdloLHq76ENWEUK4Keo="; }; postPatch = '' diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 16a59b2fdb710..ca96bd3d2eec8 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { The interface is inspired by htop and shortcut keys are inspired by vim. ''; homepage = "https://cointop.sh"; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ sarcasticadmin ]; license = licenses.asl20; mainProgram = "cointop"; }; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index 55fe2b9e2cf79..c6307cb3fa9a1 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -3,7 +3,6 @@ let version = "0.7.2"; pname = "devdocs-desktop"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; @@ -11,14 +10,13 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop install -m 444 -D ${appimageContents}/devdocs.png $out/share/icons/hicolor/0x0/apps/devdocs.png substituteInPlace $out/share/applications/devdocs.desktop \ diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index 9df2118b02fb7..41cd6c42a5b3f 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -16,7 +16,6 @@ in appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications $out/share/pixmaps - mv $out/bin/${pname}-${version} $out/bin/firefly-desktop cp ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop substituteInPlace $out/share/applications/firefly-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=firefly-desktop' \ diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/applications/misc/fspy/default.nix index 1a4504d5608c0..96178649efe7f 100644 --- a/pkgs/applications/misc/fspy/default.nix +++ b/pkgs/applications/misc/fspy/default.nix @@ -11,10 +11,6 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - ''; - meta = with lib; { description = "A cross platform app for quick and easy still image camera matching"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index e456fd595617a..afe2f188363e7 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}"; + changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${finalAttrs.version}"; description = "Wayland-native application launcher, similar to rofi’s drun mode"; homepage = "https://codeberg.org/dnkl/fuzzel"; license = with licenses; [ mit zlib ]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index c4dd51951bd2b..f89fdbe71a043 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -47,6 +47,6 @@ buildPythonApplication rec { changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; mainProgram = "gallery-dl"; - maintainers = with maintainers; [ dawidsowa marsam ]; + maintainers = with maintainers; [ dawidsowa ]; }; } diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index ff46b57e1a3ce..308f43b7d4634 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -17,7 +17,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/GoldenCheetah + mv $out/bin/${pname} $out/bin/GoldenCheetah mkdir -p $out/share/applications mkdir -p $out/share/pixmaps cp ${appimageContents}/GoldenCheetah.desktop $out/share/applications/ diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index b4e2acc645fbe..947c18050ea76 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.18"; + version = "13.19"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-FetXV1D1aW7eanhPQkNzcGwKMMwzXLhBZjrzg1LD980="; + hash = "sha256-Q/Na+uc6a+OSLvJK75MEIxgdJhg/At830SBrix38Qj8="; }; buildInputs = [ diff --git a/pkgs/applications/misc/has/default.nix b/pkgs/applications/misc/has/default.nix index a18a996f92aa8..6fa84195a2f06 100644 --- a/pkgs/applications/misc/has/default.nix +++ b/pkgs/applications/misc/has/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: rec { pname = "has"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kdabir"; repo = "has"; rev = "v${finalAttrs.version}"; - hash = "sha256-3XsNSl4lQfJjEPNGoFj6ABXGkwOUsg9AFDAz8euZApE="; + hash = "sha256-TL8VwFx2tf+GkBwz0ILQg0pwcLJSTky57Wx9OW5+lS4="; }; dontBuild = true; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index a8245a2234669..55acb6ef0db2a 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -52,7 +52,6 @@ let multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index eacd64b06b557..35be59a3166e5 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.10.8"; + version = "0.10.9"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-kVnQ33gozrL6BOWQxUfiMypiIZOffeT2cMVMHIfsaWg="; + hash = "sha256-XROuY2RlKnGvK1VNvzauHuLJiveXVKrIYPppoz8fCmc="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 017eb17a40ad1..4bdb6cca92cae 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -18,8 +18,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index bc9418d57838e..647e833e69604 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -27,9 +27,6 @@ appimageTools.wrapType2 rec { ]; extraInstallCommands = '' - # Strip version from binary name. - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop substituteInPlace $out/share/applications/marktext.desktop \ --replace "Exec=AppRun" "Exec=${pname} --" diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index 42cd8067fe326..f01ef56e5d02c 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -2,21 +2,19 @@ let pname = "neo4j-desktop"; version = "1.5.8"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; + url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${pname}-${version}-x86_64.AppImage"; hash = "sha256-RqzR4TuvDasbkj/wKvOOS7r46sXDxvw3B5ydFGZeHX8="; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 4606ee9432787..45416035f7b34 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -5,15 +5,13 @@ let version = "1.8.4"; sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; - name = "${pname}-${version}"; - src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; inherit sha256; }; appimageContents = appimageTools.extract { - inherit name src; + inherit pname version src; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +27,6 @@ appimageTools.wrapType2 rec { multiArch = false; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ $out/share/icons/hicolor/1024x1024/apps/notable.png diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 62788b5a7f13f..48f3e6e9cce8f 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -51,7 +51,6 @@ let multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps substituteInPlace $out/share/applications/notesnook.desktop \ diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 0a13013e5da2e..c537afbb98ed1 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -115,13 +115,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-71uE8JvcS++xH8WSVWj5x0+9s3XIwf3A64c6YtxpSRc="; + hash = "sha256-gM989Wh4HYU5/afCcZ6iRJWb4bkFZfnnxBmyklSZep4="; }; propagatedBuildInputs = with self; [ diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index da67c39ab585d..11bee79962e39 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -55,6 +55,6 @@ buildGoModule rec { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ danderson kalbasit ]; + maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix index b0591cc0c12a6..fbb25f30d41be 100644 --- a/pkgs/applications/misc/projectlibre/default.nix +++ b/pkgs/applications/misc/projectlibre/default.nix @@ -1,23 +1,24 @@ -{ lib -, stdenv -, fetchgit -, ant -, jdk -, stripJavaArchivesHook -, makeWrapper -, jre -, coreutils -, which +{ + lib, + stdenv, + fetchgit, + ant, + jdk, + stripJavaArchivesHook, + makeWrapper, + jre, + coreutils, + which, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "projectlibre"; - version = "1.7.0"; + version = "1.9.3"; src = fetchgit { url = "https://git.code.sf.net/p/projectlibre/code"; - rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged - hash = "sha256-eLUbsQkYuVQxt4px62hzfdUNg2zCL/VOSVEVctfbxW8="; + rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged + hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU="; }; nativeBuildInputs = [ @@ -27,9 +28,17 @@ stdenv.mkDerivation { makeWrapper ]; + runtimeDeps = [ + jre + coreutils + which + ]; + + env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; + buildPhase = '' runHook preBuild - ant -f openproj_build/build.xml + ant -f projectlibre_build/build.xml runHook postBuild ''; @@ -38,7 +47,7 @@ stdenv.mkDerivation { mkdir -p $out/share/{projectlibre/samples,doc/projectlibre} - pushd openproj_build + pushd projectlibre_build cp -R dist/* $out/share/projectlibre cp -R license $out/share/doc/projectlibre cp -R resources/samples/* $out/share/projectlibre/samples @@ -51,7 +60,7 @@ stdenv.mkDerivation { --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" wrapProgram $out/bin/projectlibre \ - --prefix PATH : ${lib.makeBinPath [ jre coreutils which ]} + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} runHook postInstall ''; @@ -61,8 +70,10 @@ stdenv.mkDerivation { homepage = "https://www.projectlibre.com/"; license = lib.licenses.cpal10; mainProgram = "projectlibre"; - maintainers = with lib.maintainers; [ Mogria tomasajt ]; + maintainers = with lib.maintainers; [ + Mogria + tomasajt + ]; platforms = jre.meta.platforms; }; -} - +}) diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index 24cc1f5438ec5..9fbe6d0f4aa38 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -1,10 +1,10 @@ { appimageTools, fetchurl, lib }: let pname = "protonup-qt"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-rT+vRYGE62SMBYhCsxYc9gnvKpOkqz0Qkr9QtKQx/Uc="; + hash = "sha256-d1UjyhU7BezOoQZBnmrk96gD0MbYST0XR+PWVYmvGFQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in @@ -12,7 +12,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} mkdir -p $out/share/{applications,pixmaps} cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 69483be06db65..6a9c6e0e5febe 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec { ''; changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ sarcasticadmin ]; }; } diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 585f7443ec476..d9028d8876db1 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -40,7 +40,7 @@ in installPhase = '' runHook preInstall - install -Dm755 ${appexec}/bin/remnote-${version} $out/bin/remnote + install -Dm755 ${appexec}/bin/remnote $out/bin/remnote install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications/ install -Dm444 ${icon} $out/share/pixmaps/remnote.png diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix index 5851ea49289e5..fe5735d0e553a 100644 --- a/pkgs/applications/misc/sqls/default.nix +++ b/pkgs/applications/misc/sqls/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "SQL language server written in Go"; mainProgram = "sqls"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ vinnymeller ]; }; } diff --git a/pkgs/applications/misc/ssw/default.nix b/pkgs/applications/misc/ssw/default.nix index 062f106369124..e94c84209fcde 100644 --- a/pkgs/applications/misc/ssw/default.nix +++ b/pkgs/applications/misc/ssw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ssw"; - version = "0.8"; + version = "0.10"; src = fetchurl { url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz"; - sha256 = "sha256-hYnYKY/PO1hQ0JaLBIAaT0D68FVVRPbMnZVLAWLplUs="; + sha256 = "sha256-gGkuw1AnGZXhR9x1mSnN1507ZF5rXvqmtX9NLQXoR+U="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index f377e493dfd9b..cd81fee9f1ec0 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.thehedgeh0g ]; + maintainers = [ maintainers.pyrox0 ]; }; } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index bc429817d55ae..4745a942304ad 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -6,6 +6,7 @@ , makeDesktopItem , jdk , ant +, stripJavaArchivesHook , gtk3 , gsettings-desktop-schemas , p7zip @@ -51,7 +52,7 @@ let find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths ''; - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook stripJavaArchivesHook ]; buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; # upstream targets Java 7 by default diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index f4fe14fb6751b..a426494b61f64 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -5,6 +5,7 @@ , makeDesktopItem , jdk , ant +, stripJavaArchivesHook , gtk3 , gsettings-desktop-schemas , sweethome3dApp @@ -33,7 +34,7 @@ let categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper stripJavaArchivesHook ]; buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ]; # upstream targets Java 7 by default diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index 351df8c558ad2..c4fef60cff0c6 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -28,7 +28,6 @@ in appimageTools.wrapAppImage { extraInstallCommands = '' # Add desktop convencience stuff - mv $out/bin/{${pname}-*,${pname}} install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps substituteInPlace $out/share/applications/todoist.desktop \ diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index a602c31008ded..459a47bfcab09 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -34,6 +34,6 @@ buildPythonApplication rec { mainProgram = "tcd"; homepage = "https://github.com/TheDrHax/Twitch-Chat-Downloader"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 4e07cf62821d2..b65d2b36e31f9 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with lib.maintainers; [ aleksana federicoschonborn ]; + maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix deleted file mode 100644 index f5d93ff4f0273..0000000000000 --- a/pkgs/applications/misc/waybar/default.nix +++ /dev/null @@ -1,200 +0,0 @@ -{ lib -, stdenv -, bash -, fetchFromGitHub -, fetchFromGitLab -, SDL2 -, alsa-lib -, catch2_3 -, fftw -, glib -, gobject-introspection -, gtk-layer-shell -, gtkmm3 -, howard-hinnant-date -, hyprland -, iniparser -, jsoncpp -, libdbusmenu-gtk3 -, libevdev -, libinotify-kqueue -, libinput -, libjack2 -, libmpdclient -, libnl -, libpulseaudio -, libsigcxx -, libxkbcommon -, meson -, ncurses -, ninja -, pipewire -, pkg-config -, playerctl -, portaudio -, python3 -, scdoc -, sndio -, spdlog -, sway -, udev -, upower -, wayland -, wireplumber -, wrapGAppsHook - -, cavaSupport ? true -, evdevSupport ? true -, experimentalPatches ? true -, hyprlandSupport ? true -, inputSupport ? true -, jackSupport ? true -, mpdSupport ? true -, mprisSupport ? stdenv.isLinux -, nlSupport ? true -, pipewireSupport ? true -, pulseSupport ? true -, rfkillSupport ? true -, runTests ? true -, sndioSupport ? true -, swaySupport ? true -, traySupport ? true -, udevSupport ? true -, upowerSupport ? true -, wireplumberSupport ? true -, withMediaPlayer ? mprisSupport && false -, nix-update-script -}: - -let - # Derived from subprojects/cava.wrap - libcava.src = fetchFromGitHub { - owner = "LukashonakV"; - repo = "cava"; - rev = "0.10.1"; - hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "waybar"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "Alexays"; - repo = "Waybar"; - rev = finalAttrs.version; - hash = "sha256-xDeY0Bnwr+jCS0IpseWNgryQ3yV7RJ1VNNbOkT/xl5c="; - }; - - postUnpack = lib.optional cavaSupport '' - pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1 - patchShebangs . - popd - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - scdoc - wrapGAppsHook - ] ++ lib.optional withMediaPlayer gobject-introspection; - - propagatedBuildInputs = lib.optionals withMediaPlayer [ - glib - playerctl - python3.pkgs.pygobject3 - ]; - - strictDeps = false; - - buildInputs = [ - gtk-layer-shell - gtkmm3 - howard-hinnant-date - jsoncpp - libsigcxx - libxkbcommon - spdlog - wayland - ] - ++ lib.optionals cavaSupport [ - SDL2 - alsa-lib - fftw - iniparser - ncurses - portaudio - ] - ++ lib.optional evdevSupport libevdev - ++ lib.optional hyprlandSupport hyprland - ++ lib.optional inputSupport libinput - ++ lib.optional jackSupport libjack2 - ++ lib.optional mpdSupport libmpdclient - ++ lib.optional mprisSupport playerctl - ++ lib.optional nlSupport libnl - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional sndioSupport sndio - ++ lib.optional swaySupport sway - ++ lib.optional traySupport libdbusmenu-gtk3 - ++ lib.optional udevSupport udev - ++ lib.optional upowerSupport upower - ++ lib.optional wireplumberSupport wireplumber - ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; - - nativeCheckInputs = [ catch2_3 ]; - doCheck = runTests; - - mesonFlags = (lib.mapAttrsToList lib.mesonEnable { - "cava" = cavaSupport; - "dbusmenu-gtk" = traySupport; - "jack" = jackSupport; - "libinput" = inputSupport; - "libnl" = nlSupport; - "libudev" = udevSupport; - "man-pages" = true; - "mpd" = mpdSupport; - "mpris" = mprisSupport; - "pipewire" = pipewireSupport; - "pulseaudio" = pulseSupport; - "rfkill" = rfkillSupport; - "sndio" = sndioSupport; - "systemd" = false; - "tests" = runTests; - "upower_glib" = upowerSupport; - "wireplumber" = wireplumberSupport; - }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); - - postPatch = '' - substituteInPlace include/util/command.hpp \ - --replace-fail /bin/sh ${lib.getExe' bash "sh"} - ''; - - preFixup = lib.optionalString withMediaPlayer '' - cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py - - wrapProgram $out/bin/waybar-mediaplayer.py \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - homepage = "https://github.com/alexays/waybar"; - description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; - changelog = "https://github.com/alexays/waybar/releases/tag/${finalAttrs.version}"; - license = lib.licenses.mit; - mainProgram = "waybar"; - maintainers = with lib.maintainers; [ - FlorianFranzen - lovesegfault - minijackson - rodrgz - synthetica - khaneliman - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index 748c2d3b84c92..23d9f2404ea20 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -9,6 +9,7 @@ , pango , wayland , wayland-protocols +, wayland-scanner , libxkbcommon , scdoc }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; meta = with lib; { diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix deleted file mode 100644 index 6cba42d0c1582..0000000000000 --- a/pkgs/applications/misc/wttrbar/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "wttrbar"; - version = "0.9.4"; - - src = fetchFromGitHub { - owner = "bjesus"; - repo = "wttrbar"; - rev = version; - hash = "sha256-kRrVqUfkrSK/9z3Hj4J+mKcdV7JdTzjhxlVRa/kf8sw="; - }; - - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - - cargoHash = "sha256-HxSyGME95FWR5VwodmrMUX0jPlfE9SJV0WBbICuuTok="; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "A simple but detailed weather indicator for Waybar using wttr.in"; - homepage = "https://github.com/bjesus/wttrbar"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ khaneliman ]; - mainProgram = "wttrbar"; - }; -} diff --git a/pkgs/applications/misc/xlights/default.nix b/pkgs/applications/misc/xlights/default.nix index e878039d0ede2..8e83f64417775 100644 --- a/pkgs/applications/misc/xlights/default.nix +++ b/pkgs/applications/misc/xlights/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2023.13"; + version = "2024.09"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-vNauKG7F7AiSMZrkMPwR9C+Mshot4NOf4oIdEr5Pu3Q="; + hash = "sha256-eXoSZUbwKu7174UVPguK9R0MgaMrV2jtRtLK/zSGvtw="; }; meta = with lib; { diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index db7bdd4fc727b..ff9965c3403db 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.2"; + version = "6.21.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-0ej2+g+B9K50JIs0wi1SfLBsaYTsk+0/cImLLZLNtmc="; + hash = "sha256-1lIrxJ1Y5YRoXbZn77Msah5lSVW71gDczYUlXQjf01s="; }; patches = [ diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 0b26d57e7c4e9..da45da749e2c6 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -10,22 +10,20 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; inherit hash; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; multiArch = false; # no 32bit needed extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png substituteInPlace $out/share/applications/Zettlr.desktop \ |