diff options
Diffstat (limited to 'pkgs/applications/misc')
104 files changed, 1420 insertions, 440 deletions
diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/applications/misc/1password-gui/darwin.nix new file mode 100644 index 0000000000000..04bc102311621 --- /dev/null +++ b/pkgs/applications/misc/1password-gui/darwin.nix @@ -0,0 +1,21 @@ +{ stdenv +, pname +, version +, src +, meta +, unzip +, undmg +}: + +stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 46480a0325987..7f8cc200a968f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -1,144 +1,58 @@ -{ lib -, stdenv +{ stdenv +, callPackage +, channel ? "stable" , fetchurl -, makeWrapper -, wrapGAppsHook -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libXcomposite -, libXdamage -, libXext -, libXfixes -, libXrandr -, libdrm -, libxcb -, libxkbcommon -, libxshmfence -, libGL -, libappindicator-gtk3 -, mesa -, nspr -, nss -, pango -, systemd -, udev -, xdg-utils +, lib +# This is only relevant for Linux, so we need to pass it through +, polkitPolicyOwners ? [ ] }: - # The 1Password polkit file requires a list of users for whom polkit - # integrations should be enabled. This should be a list of strings that - # correspond to usernames. -, polkitPolicyOwners ? [] -}: let - # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. - policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation rec { pname = "1password"; - version = "8.9.4"; + version = if channel == "stable" then "8.9.4" else "8.9.6-30.BETA"; - src = - if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "0y456ssfsx4cy6pcnihiwi64y90s91399qhgs4abn4pp9wr0h08g"; - } - else - fetchurl { + sources = { + stable = { + x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; sha256 = "sha256-Smq0gOGfBTjIOMwF1AI+TJwXaIiTi/YP9mGIqcjsCNQ="; }; + aarch64-linux = { + url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; + sha256 = "sha256-SJDUfAFEwYnOR+y/6Dg2S/CkA84QogoRpMXOPP5PyrM="; + }; + x86_64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; + sha256 = "sha256-+2FQQ5FiB0N30JM/Mtnfa04K2XZaf3r/W1+i8VKNslA="; + }; + aarch64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; + sha256 = "sha256-nhocEwtr6cMSSStPa7S+g8SwPStJVWPblA3HbqJ8q6Q="; + }; + }; + beta = { + x86_64-linux = { + url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; + sha256 = "sha256-xBfpBkYff1X26Iu0Ee03lIiR6UdJOiaG+kZMVotG0Hc="; + }; + aarch64-linux = { + url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; + sha256 = "0j0v90i78y1m77gpn65iyjdy1xslv1mar1ihxj9jzcmva0nmdmra"; + }; + x86_64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; + sha256 = "sha256-PNlEBFoIGYkDR4TzbudsqAE5vjbiVHTNL7XoflN+mUY="; + }; + aarch64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; + sha256 = "sha256-PYS0N4VeUjNhCncSDXvpyLuHlpv4nn35aJTPANdMXwk="; + }; + }; + }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ glib ]; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontWrapGApps = true; - - installPhase = - let rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - libGL - libappindicator-gtk3 - mesa - nspr - nss - pango - systemd - ] + ":${stdenv.cc.cc.lib}/lib64"; - in '' - runHook preInstall - - mkdir -p $out/bin $out/share/1password - cp -a * $out/share/1password - - # Desktop file - install -Dt $out/share/applications resources/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' - - '' + (lib.optionalString (polkitPolicyOwners != [ ]) - '' - # Polkit file - mkdir -p $out/share/polkit-1/actions - substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}" - '') + '' - - # Icons - 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} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - for file in $(find $out -type f -name \*.so\* ); do - patchelf --set-rpath ${rpath}:$out/share/1password $file - done - - runHook postInstall - ''; - - preFixup = '' - # Electron is trying to open udev via dlopen() - # and for some reason that doesn't seem to be impacted from the rpath. - # Adding udev to LD_LIBRARY_PATH fixes that. - # Make xdg-open overrideable at runtime. - makeWrapper $out/share/1password/1password $out/bin/1password \ - ''${gappsWrapperArgs[@]} \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} - ''; + src = fetchurl { + inherit (sources.${channel}.${stdenv.system}) url sha256; + }; meta = with lib; { description = "Multi-platform password manager"; @@ -146,6 +60,9 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = builtins.attrNames sources.${channel}; }; -} + +in if stdenv.isDarwin +then callPackage ./darwin.nix { inherit pname version src meta; } +else callPackage ./linux.nix { inherit pname version src meta polkitPolicyOwners; } diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/linux.nix index d90b3e46f50cb..06a10dd973d3d 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -1,6 +1,9 @@ { lib , stdenv -, fetchurl +, pname +, version +, src +, meta , makeWrapper , wrapGAppsHook , alsa-lib @@ -43,21 +46,8 @@ let # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation rec { - pname = "1password"; - version = "8.9.6-30.BETA"; - - src = - if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "0j0v90i78y1m77gpn65iyjdy1xslv1mar1ihxj9jzcmva0nmdmra"; - } - else - fetchurl { - url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-xBfpBkYff1X26Iu0Ee03lIiR6UdJOiaG+kZMVotG0Hc="; - }; +in stdenv.mkDerivation { + inherit pname version src meta; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ glib ]; @@ -120,8 +110,8 @@ in stdenv.mkDerivation rec { 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} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done @@ -139,14 +129,4 @@ in stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} ''; - - - meta = with lib; { - description = "Multi-platform password manager"; - homepage = "https://1password.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index a6fb04a9e7d7e..12445d958c806 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; }) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 1239d22f1f3e5..84499448a41b7 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "albert"; - version = "0.17.3"; + version = "0.17.6"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "sha256-UIG6yLkIcdf5IszhNPwkBcSfZe4/CyI5shK/QPOmpPE="; + sha256 = "sha256-nbnywrsKvFG8AkayjnylOKSnn7rRWgNv5zE9DDeOmLw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 5e4f448235485..3b27f5b96e30f 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -5,15 +5,15 @@ , atk , cairo , desktop-file-utils -, evolution-data-server +, evolution-data-server-gtk4 , evolution -, gcr +, gcr_4 , gettext , glib , gnome , gpgme , gtk3 -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libcryptui , libxml2 @@ -42,6 +42,20 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; }) + + # Port to Gcr 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; + sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; + }) + + # Port to GtkSourceView 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; + sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; + }) ]; nativeBuildInputs = [ @@ -58,13 +72,13 @@ stdenv.mkDerivation rec { buildInputs = [ atk cairo - evolution-data-server - gcr + evolution-data-server-gtk4 + gcr_4 glib evolution gpgme gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libcryptui sqlite diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 7b327cd7f0960..98ea0802f2e45 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.28.0"; + version = "0.29.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-tYeVz10saTJBf6DDGIVSd4IkSREDJFi/am/kg/An02E="; + sha256 = "sha256-xoHYQbV8fPsHs/G1iuTaQ197dpUZkMohmYM924y8NT0="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index d41685821cd7c..cdf6ca3e6f803 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , appstream-glib , clang , desktop-file-utils diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 7b98b429c82ea..37898709493e8 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-uDfC/PqT1Bb8np0l2DDIZUoNP9QpjxZH5v1hK2k1Miw="; + sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index f0e0b877d9d79..5b78e99932019 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.10"; + version = "0.6.13"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-pv/GxTGmpGc8RHjKO8F03jybS0uO+SS3z4KCZfHYV0Q="; + sha256 = "sha256-YGaAJOyVZBHEWQuZVfPIIbtuntv1klQk9GcWRN+oVF4="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/applications/misc/bfcal/default.nix new file mode 100644 index 0000000000000..695f5bc69b0ca --- /dev/null +++ b/pkgs/applications/misc/bfcal/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchFromSourcehut +, meson +, ninja +, pkg-config +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "bfcal"; + version = "1.0.1"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = "bfcal"; + rev = "v${version}"; + sha256 = "sha256-5xyBU+0XUNFUGgvw7U8YE64zncw6SvPmbJhc1LY2u/g="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + meta = with lib; { + description = "Quickly display a calendar"; + homepage = "https://git.sr.ht/~bitfehler/bfcal"; + license = licenses.gpl3Plus; + platforms = qtbase.meta.platforms; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1d26881868e51..ada160015bfa2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,37 +1,40 @@ { lib -, mkDerivation +, stdenv , fetchurl +, cmake , fetchpatch -, poppler_utils -, pkg-config -, libpng +, fontconfig +, hunspell +, hyphen +, icu , imagemagick , libjpeg -, fontconfig +, libmtp +, libpng +, libstemmer +, libuchardet +, libusb1 +, pkg-config , podofo -, qtbase +, poppler_utils +, python3Packages , qmake -, icu +, qtbase +, qtwayland +, removeReferencesTo , sqlite -, hunspell -, hyphen -, unrarSupport ? false -, python3Packages -, libusb1 -, libmtp +, wrapQtAppsHook , xdg-utils -, removeReferencesTo -, libstemmer -, wrapGAppsHook +, unrarSupport ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "calibre"; - version = "5.44.0"; + version = "6.7.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw="; + hash = "sha256-R1poU9qhqf1DYZJ9tkupJrPR99pn5nTpkS6vkMzrwCg="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -40,18 +43,18 @@ mkDerivation rec { (fetchpatch { name = "0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; - sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; + hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { name = "0006-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; - sha256 = "sha256-/X6iZZFxv4793h2yYI3UAz0mLNEmKpdVrmOnABFT0tE="; + hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings\"]@g" \ + sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ setup/build.py sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \ setup/build.py @@ -61,8 +64,15 @@ mkDerivation rec { ''; dontUseQmakeConfigure = true; + dontUseCmakeConfigure = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + qmake + removeReferencesTo + wrapQtAppsHook + ]; buildInputs = [ fontconfig @@ -74,10 +84,12 @@ mkDerivation rec { libmtp libpng libstemmer + libuchardet libusb1 podofo poppler_utils qtbase + qtwayland sqlite xdg-utils ] ++ ( @@ -102,7 +114,7 @@ mkDerivation rec { pillow pychm pyqt-builder - pyqt5 + pyqt6 python regex sip @@ -112,11 +124,11 @@ mkDerivation rec { pycryptodome # the following are distributed with calibre, but we use upstream instead odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [ + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ # much of calibre's functionality is usable without a web # browser, so we enable building on platforms which qtwebengine # does not support by simply omitting qtwebengine. - pyqtwebengine + pyqt6-webengine ] ++ lib.optional (unrarSupport) unrardll ); @@ -166,8 +178,7 @@ mkDerivation rec { $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do - wrapProgram $program \ - ''${qtWrapperArgs[@]} \ + wrapQtApp $program \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 494ed3001e5c1..e65bcd2ff2e2d 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif +{ stdenv, lib, fetchFromGitHub, motif, xorg , withAudioTracking ? false, libpulseaudio, aubio }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTINATION=$(out)/bin/" ] ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; - buildInputs = [ xlibsWrapper motif ] + buildInputs = [ motif xorg.libX11 xorg.libXext xorg.libXt ] ++ lib.optionals withAudioTracking [ libpulseaudio aubio ]; meta = with lib; { diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 749dc4b8e863d..8206698ce2ecd 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.11.5"; + version = "0.11.8"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4="; + sha256 = "sha256-yyb6sRCPjHCK0tkuHTffw2NkZHcqw9tIdHbbBiKLGu8="; }; }; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index a6efda32d8381..19a2e7aae2a02 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -8,7 +8,6 @@ , libXfixes , libXtst , qtx11extras -, git , knotifications , qtwayland , wayland diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 2243a8d093757..5832cf9432aee 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-vneX3Wo1DUK1WIwBP3nMUDV26EN2A7XIqMcTZQ4UI4A="; + sha256 = "sha256-Ge1dO2I4avblN+3BXY9AXFFmgX4lIwZYUf4IohH1vqc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 76a5808963f97..95d3a2aa93336 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }: +{ lib, stdenv, fetchFromGitHub, python3Packages, libspnav, jq }: let diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 32440ad7df197..ceb1b9833c928 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.2.0"; # When updating also update mvnSha256 + version = "22.2.2"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg="; + sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI="; }; - mvnSha256 = "HdIhENml6W4U+gM7ODxXinbex5o1X4YhWGTct5rpL5c="; + mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 5d77f301c8217..4625a6dda99dd 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "deadd-notification-center"; - version = "2021-03-10"; + version = "2022-04-20"; src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; - rev = "640ce0f"; - sha256 = "12ldr8vppylr90849g3mpjphmnr4lp0vsdkj01a5f4bv4ksx35fm"; + rev = "d31867472c35a09562c832b0a589479930c52b86"; + sha256 = "sha256-Arl4niscJPYCFWd4mw42IgNs+JsHsVpaTx86zEj3KFM="; }; patches = [ diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index b9d8b0f9797db..581a8126cadad 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "devilspie2"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; - sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; + url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2-${version}.tar.xz"; + sha256 = "Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA="; }; nativeBuildInputs = [ intltool pkg-config ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { positioned at a specific screen position, or position a window on a specific workspace. ''; - homepage = "https://www.gusnan.se/devilspie2/"; + homepage = "https://www.nongnu.org/devilspie2/"; license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 186826e6f7d45..918605366fe7d 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,12 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK, Cocoa }: -let - wxInputs = - if stdenv.isDarwin then - [ wxmac darwin.apple_sdk.frameworks.Cocoa ] - else - [ wxGTK ]; -in stdenv.mkDerivation rec { pname = "diff-pdf"; version = "0.5"; @@ -19,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ cairo poppler ] ++ wxInputs; + buildInputs = [ cairo poppler wxGTK ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index a6545db64cad0..452c1edc99f81 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook , secp256k1 }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 46ea57c6193d3..9421cce1d8f75 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -89,7 +89,13 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; - preBuild = '' + postPatch = '' + # make compatible with protobuf4 by easing dependencies ... + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace "protobuf>=3.12,<4" "protobuf>=3.12" + # ... and regenerating the paymentrequest_pb2.py file + protoc --python_out=. electrum/paymentrequest.proto + substituteInPlace ./electrum/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' diff --git a/pkgs/applications/misc/endeavour/default.nix b/pkgs/applications/misc/endeavour/default.nix new file mode 100644 index 0000000000000..3c48efe66c474 --- /dev/null +++ b/pkgs/applications/misc/endeavour/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, gettext +, gnome +, glib +, gtk4 +, wayland +, libadwaita +, libpeas +, gnome-online-accounts +, gsettings-desktop-schemas +, libportal-gtk4 +, evolution-data-server-gtk4 +, libical +, librest +, json-glib +, itstool +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "endeavour"; + version = "42.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Endeavour"; + rev = "v${version}"; + sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ="; + }; + + patches = [ + # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667 + (fetchpatch { + url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655"; + sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY="; + extraPrefix = ""; + name = "gnome-todo_meson-build.patch"; + }) + + # build: Fix building with -Werror=format-security + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch"; + sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo="; + }) + + # build: Use GNOME module post_install() + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch"; + sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + wrapGAppsHook4 + itstool + ]; + + buildInputs = [ + glib + gtk4 + wayland # required by gtk header + libadwaita + libpeas + gnome-online-accounts + gsettings-desktop-schemas + gnome.adwaita-icon-theme + + # Plug-ins + libportal-gtk4 # background + evolution-data-server-gtk4 # eds + libical + librest # todoist + json-glib # todoist + ]; + + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + }; + + meta = with lib; { + description = "Personal task manager for GNOME"; + homepage = "https://gitlab.gnome.org/World/Endeavour"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 1c590451a9b86..5ab3694728ad1 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -62,7 +62,7 @@ in python.pkgs.buildPythonApplication rec { homepage = "https://www.etesync.com/"; description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; license = licenses.gpl3; - maintainers = with maintainers; [ valodim ]; + maintainers = with maintainers; [ thyol valodim ]; broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 79420eacec827..f13d45059473e 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "exercism"; - version = "3.0.13"; + version = "3.1.0"; src = fetchFromGitHub { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7"; + sha256 = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo"; }; - vendorSha256 = "0b2m9xkac60k5rbxmb03cxf530m23av14pnsjk8067l998sm4vqi"; + vendorSha256 = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw"; doCheck = false; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index aafc332f6b9cb..2a23aac79f82c 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -2,7 +2,7 @@ , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz , IOKit, Carbon, Cocoa, AudioToolbox, OpenGL , withTTYX ? true, libX11 -, withGUI ? true, wxGTK30, wxmac +, withGUI ? true, wxGTK32 , withUCD ? true, libuchardet # Plugins @@ -12,18 +12,15 @@ , withPython ? false, python3Packages }: -let - wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK30); -in stdenv.mkDerivation rec { pname = "far2l"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-nfoAElPLQ97lj65MBX4JMEdgTFbkdEbR1BazYZgV/lg="; + sha256 = "sha256-0t1ND6LmDcivfrZ8RaEr1vjeS5JtaeWkoHkl2e7Xr5s="; }; patches = [ ./python_prebuild.patch ]; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config m4 makeWrapper ]; buildInputs = lib.optional withTTYX libX11 - ++ lib.optional withGUI wxWidgets + ++ lib.optional withGUI wxGTK32 ++ lib.optional withUCD libuchardet ++ lib.optionals withColorer [ spdlog xercesc ] ++ lib.optionals withMultiArc [ libarchive pcre ] @@ -73,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; - license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time + license = licenses.gpl2Only; maintainers = with maintainers; [ hypersw ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 9f1b6f73a1a81..0d01122e6a5ff 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.14"; + version = "3.0.15"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-Jx+MLItr+rIGfzJdQku1pRXaIldfrpG3vfOhjebSIZA="; + hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index c5d48ff454e4f..061fce572631a 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,32 +1,29 @@ -{ lib, rustPlatform, fetchFromGitHub, jq }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.1.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mw6mPOxiWnYu2QgqL4VccwwJhdxZ7zLJyX/oJWfGUhw="; + sha256 = "sha256-MB/i1jCxoGE8cPF+NE8aS7kF7ZsGb4+OyLcPcGp1hwI="; }; - cargoSha256 = "sha256-ygQklcRjdffGl0s77MwKsyHVJWqWJZHq4SU38cSMVug="; + cargoSha256 = "sha256-OBGJIR3REeMxHQu3ovEKSZZ8QNlhl/5jvWbR5OdsRTQ="; - depsExtraArgs = { - nativeBuildInputs = [ jq ]; - postBuild = '' - pushd $name/humansize + nativeBuildInputs = [ installShellFiles ]; - [ -d feature-tests ] && rm -r feature-tests + postInstall = '' + $out/bin/genact --print-manpage > genact.1 + installManPage genact.1 - jq '.files |= with_entries(select(.key | startswith("feature-tests") | not))' \ - -c .cargo-checksum.json > .cargo-checksum.json.new - mv .cargo-checksum.json{.new,} - - popd - ''; - }; + installShellCompletion --cmd genact \ + --bash <($out/bin/genact --print-completions bash) \ + --fish <($out/bin/genact --print-completions fish) \ + --zsh <($out/bin/genact --print-completions zsh) + ''; meta = with lib; { description = "A nonsense activity generator"; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 137682c397744..4fe60064cd59f 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3 +{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 1619f7f433422..c196a107f0068 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 2973ac81539c1..d7177906287ef 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.5"; + version = "11.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-bA5C+BFqeOS0oFgz/qlYOFMsuh3L/U6QJbzOcRQkNhY="; + hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index c8068d682237f..3a6a717b6e103 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronize folders, files and make backups"; homepage = "http://www.opbyte.it/grsync/"; - license = licenses.gpl1; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.kuznero ]; }; diff --git a/pkgs/applications/misc/gtkradiant/default.nix b/pkgs/applications/misc/gtkradiant/default.nix new file mode 100644 index 0000000000000..a8f5c91d1eb8e --- /dev/null +++ b/pkgs/applications/misc/gtkradiant/default.nix @@ -0,0 +1,163 @@ +{ lib, stdenv, fetchFromGitHub, fetchsvn +, scons, pkg-config, python3 +, glib, libxml2, gtk2, libGLU, gnome2 +, runCommand, writeScriptBin, runtimeShell +, makeDesktopItem, copyDesktopItems +}: + +let + q3Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk"; + rev = 144; + sha256 = "sha256-U1GtMv775JEOAJ1W2kSaRNPDCnW39W+KqVDTTG2yISY="; + }; + urtPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/UrTPack/trunk"; + rev = 144; + sha256 = "sha256-DQjENyQa1kEieU3ZWyMt2e4oEN0X2K3lxP79sBI91iI="; + }; + etPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/trunk"; + rev = 144; + sha256 = "sha256-mqaWOYfF/F6ABh7nKA36YvsywZIdwJ9IitFi2Xp5rgk="; + }; + qlPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QLPack/trunk"; + rev = 144; + sha256 = "sha256-lrn4nu3JI7j+t9jYd+UFE55GOCbc6+Sh2fZfVlEr1WM="; + }; + q2Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/trunk"; + rev = 144; + sha256 = "sha256-ad8dRV+28Zz5yQsJU7hvteSIn9wWpehuqxMspw3yvvU="; + }; + quetooPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/trunk"; + rev = 144; + sha256 = "sha256-SOblPJgdVEZrTYtvDlcF7paIm3UitSVFQ9+RahXkO64="; + }; + jaPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/trunk"; + rev = 144; + sha256 = "sha256-P6lI+nNrPwoWJl5ThUHIA3Iw1nWVo2djaaWHAF5HuDo="; + }; + stvefPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/STVEFPack/trunk"; + rev = 144; + sha256 = "sha256-quNyVC6fg1FIBsLWx0LzRK2JfxKMNJeUEIkWGhGJHhI="; + }; + wolfPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/trunk"; + rev = 144; + sha256 = "sha256-693k6KiIchQddVGBhRJf7ikv6ut5L9rcLt0FTZ7pSvw="; + }; + unvanquishedPack = fetchsvn { + url = "https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/gtkradiant/"; + rev = 212; + sha256 = "sha256-weBlnSBezPppbhsMOT66vubioTxpDC+AcKIOC2Xitdo="; + }; + q1Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q1Pack/trunk"; + rev = 144; + sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4="; + }; + packs = runCommand "gtkradiant-packs" {} '' + mkdir -p $out + ln -s ${q3Pack} $out/Q3Pack + ln -s ${urtPack} $out/UrTPack + ln -s ${etPack} $out/ETPack + ln -s ${qlPack} $out/QLPack + ln -s ${q2Pack} $out/Q2Pack + ln -s ${quetooPack} $out/QuetooPack + ln -s ${jaPack} $out/JAPack + ln -s ${stvefPack} $out/STVEFPack + ln -s ${wolfPack} $out/WolfPack + ln -s ${unvanquishedPack} $out/UnvanquishedPack + ln -s ${q1Pack} $out/Q1Pack + ''; + +in +stdenv.mkDerivation rec { + pname = "gtkradiant"; + + version = "unstable-2022-07-31"; + + src = fetchFromGitHub { + owner = "TTimo"; + repo = "GtkRadiant"; + rev = "5b498bfa01bde6c2c9eb60fb94cf04666e52d22d"; + sha256 = "sha256-407faeQnhxqbWgOUunQKj2JhHeqIzPPgrhz2K5O4CaM="; + }; + + # patch paths so that .game settings are put into the user's home instead of the read-only /nix/store + postPatch = '' + substituteInPlace radiant/preferences.cpp \ + --replace 'gameFilePath += "games/";' 'gameFilePath = g_get_home_dir(); gameFilePath += "/.cache/radiant/games/";printf("gameFilePath: %s\\n", gameFilePath);' \ + --replace 'radCreateDirectory( gameFilePath );' 'if (g_mkdir_with_parents( gameFilePath, 0777 ) == -1) {radCreateDirectory( gameFilePath );};' \ + --replace 'strGamesPath = g_strAppPath.GetBuffer();' 'strGamesPath = g_get_home_dir();' \ + --replace 'strGamesPath += "games";' 'strGamesPath += "/.cache/radiant/games";' + ''; + + nativeBuildInputs = + let + python = python3.withPackages (ps: with ps; [ + urllib3 + ]); + svn = writeScriptBin "svn" '' + #!${runtimeShell} -e + if [ "$1" = checkout ]; then + # link predownloaded pack to destination + mkdir -p $(dirname $3) + ln -s ${packs}/$(basename $3) $3 + # verify existence + test -e $(readlink $3) + elif [ "$1" = update ]; then + # verify existence + test -e $(readlink $3) + else + echo "$@" + exit 1 + fi + ''; + in [ + scons + pkg-config + python + svn + copyDesktopItems + ]; + + buildInputs = [ glib libxml2 gtk2 libGLU gnome2.gtkglext ]; + + enableParallelBuilding = true; + + desktopItems = [ (makeDesktopItem { + name = "gtkradiant"; + exec = "gtkradiant"; + desktopName = "GtkRadiant"; + comment = meta.description; + categories = [ "Development" ]; + icon = "gtkradiant"; + # includes its own splash screen + startupNotify = false; + }) ]; + + postInstall = '' + mkdir -p $out/{bin,lib} + cp -ar install $out/lib/gtkradiant + + ln -s ../lib/gtkradiant/radiant.bin $out/bin/gtkradiant + ln -s ../lib/gtkradiant/{q3map2,q3map2_urt,q3data} $out/bin/ + + mkdir -p $out/share/pixmaps + ln -s ../../lib/gtkradiant/bitmaps/icon.png $out/share/pixmaps/gtkradiant.png + ''; + + meta = with lib; { + description = "Level editor for idTech games"; + homepage = "https://icculus.org/gtkradiant/"; + license = with licenses; [ gpl2Only bsdOriginal lgpl21Only ]; + maintainers = with maintainers; [ astro ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index 8d77d75dafeb8..d4bd7c63a7225 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pEULArQDwKZzpD0GVH21L1v9xVZiBz91kL/jPJjJav4="; + sha256 = "sha256-6x1t/PLs1dqlY5XQ1F0PDqZ/TofZ0h1hTc0C1sjn3fA="; }; - vendorSha256 = "sha256-vvNoO5eABGVwvAzK33uPelmo3BKxfqiYgEXZI7kgeSo="; + vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 10dd5bd545c31..d9e0204be322b 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive +, glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkg-config, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 851f2d80c9763..d5aa1ac88179c 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { "--enable-SIGCHLD-fallback" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ Xaw3d ghostscriptX perl - pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index f7c5714f1262a..fb172eb22b016 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk3 texinfo ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk3 texinfo ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 2f6df287197f1..695706cefc5b8 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, fetchpatch }: +{ lib, fetchFromGitHub, python3 }: let diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix new file mode 100644 index 0000000000000..5a9c5122acc36 --- /dev/null +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, pkg-config +, dpkg +, openssl +, webkitgtk +, libappindicator +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "holochain-launcher"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; + sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + wrapGAppsHook # required for FileChooser + ]; + + buildInputs = [ + openssl + webkitgtk + libappindicator + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = '' + mv usr $out + ''; + + preFixup = '' + patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher" + ''; + + meta = with lib; { + description = "A cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; + homepage = "https://github.com/holochain/launcher"; + maintainers = [ maintainers.steveej ]; + license = licenses.cal10; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index f55752a229238..b9f78afda4bb3 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: +{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, unwrapped ? callPackage ./runtime.nix {} }: buildFHSUserEnv rec { name = "houdini-${unwrapped.version}"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 5481376af8c60..d57f2270daf18 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.104.2"; + version = "0.104.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7GB2bLf6J253oFkTLg8iblE6c2wFYS3WCUqTDsc61/8="; + sha256 = "sha256-bGyU0i/wwFprAoLENrmBY2IxLjwyX4pQ9z4LFIUguI4="; }; - vendorSha256 = "sha256-K7rQSs4PqFGV4gZ6UevS7S0w0OQykAkHntklKz5vPrU="; + vendorSha256 = "sha256-is1dQJwvhygn95rbeHeGI97vDXo8ftnNqug4eERN3gI="; doCheck = false; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index 6d78dd559c26f..a68ec733ab714 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -4,12 +4,8 @@ , stdenv , pkg-config , fontconfig -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg , libGL -, libX11 , openssl , AppKit , ApplicationServices @@ -42,10 +38,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ fontconfig - libXcursor - libXi - libXrandr - libxcb + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit @@ -64,7 +60,7 @@ rustPlatform.buildRustPackage rec { postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/inlyne \ - --add-rpath ${lib.makeLibraryPath [ libGL libX11 ]} + --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} ''; meta = with lib; { diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 7d99bd8558a94..aecd7a4b09001 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18543"; + version = "18570"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-AQmdBwgOVws8MDAX8i3P7bsk3r69g7x3jhADGwRWa2c="; + hash = "sha256-EAEh/n7M56rzjtkIs8ZteDvOLuHxNsMyT7VGFyPre6s="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-pGVn+NgfSlyYcT0BCTj+Ntbe7d0l6LJSeDi9xve0K4g="; + hash = "sha256-2xsHsaDxm/wjiCyS5tmD8uUlLrBdd3sS8JLal3pX3pA="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 6b594f196c942..b001b50c40126 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub +{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchFromGitHub , cmake, pkg-config, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 54f0fe1a7d379..d1f6094753989 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -1,7 +1,6 @@ { mkDerivation , extra-cmake-modules , fetchFromGitHub -, kdoctools , kiconthemes , kio , kjobwidgets diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 8f66eb87c24fc..85b409fe5ef31 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.23"; + version = "1.2.24"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-Sr20WAJLKy/vaCw76abq8qoKWZbuVgqjlCTZom/puPU="; + sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc="; }; dontBuild = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index fdac7cede1702..c7040e1c96c7f 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato turion ]; + maintainers = with maintainers; [ jonafato turion srapenne ]; platforms = platforms.linux ++ platforms.darwin; broken = stdenv.isDarwin; # see to https://github.com/NixOS/nixpkgs/issues/172165 }; diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index e019e9f1b9865..3a8750301fea4 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { ''; license = licenses.mit; homepage = "https://github.com/mschneider82/keylight-control"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index e64feb4165555..7f13494f65f5c 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,7 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , callPackage , pkg-config -, makeWrapper , qmake , qtbase , qtwebengine diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index 9d365cd328c8b..37f8203e047a5 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, fetchFromGitHub , meson, ninja, pkg-config , python3 , curl @@ -11,7 +11,6 @@ , gtest }: - stdenv.mkDerivation rec { pname = "kiwix-lib"; version = "10.1.1"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 0ff5b4a6a625b..278d2c363bdb7 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -62,6 +62,9 @@ in buildFHSUserEnv { # Osmose qt4 + # Overwatch 2 + libunwind + # PPSSPP glew snappy diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index e97008ab36cf9..f14084a865e5c 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "mangal"; - version = "3.10.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-rWj9CknWNI6SSh0AwaPpj5TxHQzkAmaAhWW7kze3xiY="; + hash = "sha256-1fWy7riInrbReQ0sQ1TF8GhqWQG0KXk1JzhmxlSuvmk="; }; proxyVendor = true; - vendorSha256 = "sha256-ZgeG8S78/yS9KfEK1bZ3VlQGmZPBo9TXLQLz8rXOEGo="; + vendorSha256 = "sha256-+HDuGSZinotUtCqffrmFkjHegxdArSJMWwnUG/tnLRc="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index 3144f59476b57..98bcda9943fcd 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -8,10 +8,15 @@ rustPlatform.buildRustPackage rec { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; + hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; }; - cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ="; + cargoPatches = [ + # Remove when new version of mdzk is released. + ./update-mdbook-for-rust-1.64.patch + ]; + + cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch b/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch new file mode 100644 index 0000000000000..79b7240b96f88 --- /dev/null +++ b/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch @@ -0,0 +1,246 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ae63793..4068e02 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -162,12 +162,46 @@ dependencies = [ + "ansi_term", + "atty", + "bitflags", +- "strsim", +- "textwrap", ++ "strsim 0.8.0", ++ "textwrap 0.11.0", + "unicode-width", + "vec_map", + ] + ++[[package]] ++name = "clap" ++version = "3.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6" ++dependencies = [ ++ "atty", ++ "bitflags", ++ "clap_lex", ++ "indexmap", ++ "lazy_static", ++ "strsim 0.10.0", ++ "termcolor", ++ "textwrap 0.15.1", ++] ++ ++[[package]] ++name = "clap_complete" ++version = "3.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" ++dependencies = [ ++ "clap 3.2.2", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" ++dependencies = [ ++ "os_str_bytes", ++] ++ + [[package]] + name = "cpufeatures" + version = "0.2.1" +@@ -222,9 +256,9 @@ dependencies = [ + + [[package]] + name = "env_logger" +-version = "0.7.1" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" + dependencies = [ + "atty", + "humantime", +@@ -385,15 +419,6 @@ dependencies = [ + "version_check", + ] + +-[[package]] +-name = "getopts" +-version = "0.2.21" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +-dependencies = [ +- "unicode-width", +-] +- + [[package]] + name = "getrandom" + version = "0.1.16" +@@ -471,7 +496,7 @@ dependencies = [ + "log", + "pest", + "pest_derive", +- "quick-error 2.0.1", ++ "quick-error", + "serde", + "serde_json", + ] +@@ -575,12 +600,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + + [[package]] + name = "humantime" +-version = "1.3.0" ++version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +-dependencies = [ +- "quick-error 1.2.3", +-] ++checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + + [[package]] + name = "hyper" +@@ -822,13 +844,14 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + + [[package]] + name = "mdbook" +-version = "0.4.15" ++version = "0.4.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6" ++checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9" + dependencies = [ + "anyhow", + "chrono", +- "clap", ++ "clap 3.2.2", ++ "clap_complete", + "env_logger", + "handlebars", + "lazy_static", +@@ -838,7 +861,6 @@ dependencies = [ + "pulldown-cmark", + "regex", + "serde", +- "serde_derive", + "serde_json", + "shlex", + "tempfile", +@@ -1062,6 +1084,12 @@ dependencies = [ + "winapi 0.3.9", + ] + ++[[package]] ++name = "os_str_bytes" ++version = "6.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" ++ + [[package]] + name = "parking_lot" + version = "0.11.2" +@@ -1258,17 +1286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" + dependencies = [ + "bitflags", +- "getopts", + "memchr", + "unicase", + ] + +-[[package]] +-name = "quick-error" +-version = "1.2.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +- + [[package]] + name = "quick-error" + version = "2.0.1" +@@ -1386,9 +1407,9 @@ dependencies = [ + + [[package]] + name = "regex" +-version = "1.5.4" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1403,9 +1424,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + + [[package]] + name = "regex-syntax" +-version = "0.6.25" ++version = "0.6.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + + [[package]] + name = "remove_dir_all" +@@ -1577,13 +1598,19 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + ++[[package]] ++name = "strsim" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" ++ + [[package]] + name = "structopt" + version = "0.3.26" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" + dependencies = [ +- "clap", ++ "clap 2.33.3", + "lazy_static", + "structopt-derive", + ] +@@ -1673,6 +1700,12 @@ dependencies = [ + "unicode-width", + ] + ++[[package]] ++name = "textwrap" ++version = "0.15.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" ++ + [[package]] + name = "thiserror" + version = "1.0.30" +diff --git a/Cargo.toml b/Cargo.toml +index dfeeb45..8b1e4e5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -38,7 +38,7 @@ handlebars = "4.2.1" + ignore = "0.4.18" + lazy_static = "1.4.0" + lazy-regex = "2.2.2" +-mdbook = { version = "0.4.15", default-features = false } ++mdbook = { version = "0.4.21", default-features = false } + notify = "4.0.17" + pest = "2.1.3" + pest_derive = "2.1.0" +diff --git a/src/renderer/mdzk_renderer.rs b/src/renderer/mdzk_renderer.rs +index 55b2423..f8480ca 100644 +--- a/src/renderer/mdzk_renderer.rs ++++ b/src/renderer/mdzk_renderer.rs +@@ -92,7 +92,7 @@ impl Renderer for HtmlMdzk { + "description", + json!(ctx.config.book.description.clone().unwrap_or_default()), + ); +- if let Some(ref livereload) = html_config.livereload_url { ++ if let Some(ref livereload) = html_config.live_reload_endpoint { + data.insert("livereload", json!(livereload)); + } + data.insert("fold_enable", json!(html_config.fold.enable)); diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index ec978b9fc3a2b..b8cb75b057fd1 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 1dba44531e595..52ced3b41753a 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.1.0"; + version = "1.2.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - hash = "sha256-A6qwsbeNZXfSOZwHp19/4JQ8dZgjsK7Y2zho6vJXsGA="; + hash = "sha256-e/KZrBnep5LbzgNnIoZlS5AMxhx4KlmdYDzdldMGVwg="; }; postPatch = '' diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index c38ee194b4e24..2ef17f9c1cdf3 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.15.9"; + version = "1.0.0"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let 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}"; - sha256 = if stdenv.isDarwin then "1q9almr8k1i2wzksd09libgnvypj5k9j15y6cxg4rgnw32fa152n" else "sha256-Qz1Ic5FtxXIk8J/2spNZaqpPIgx3yNyXiAQllbVrGjw="; + sha256 = if stdenv.isDarwin then "sha256-KVWqdXzbQT93Dj4yesdnfFwAdYin1vfpPsj/ur1AGA0=" else "sha256-H1Cl9SBz/mwN8gezFkcV4KxI7+xVjQV2AtyLKyjVpI8="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 639ad2175b414..29cdac6b8d163 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.3"; + version = "43.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+ty6C/6uHmZyJmJk529j/lq/jw77NL4Ri1qXP7by9yQ="; + sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; }; patches = [ diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index cefce001eba90..c463ade398622 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation , libosmscout, valhalla, libpostal, osrm-backend, protobuf -, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost +, libmicrohttpd, sqlite, marisa, kyotocabinet, boost }: let @@ -14,20 +14,20 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s="; + sha256 = "sha256-ngB3c6rUQ/+AeaJHKAFRl9lCkUobLWSnsn030brB+Bw="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ kirigami2 qtquickcontrols2 qtlocation - valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 + valhalla libosmscout osrm-backend libmicrohttpd libpostal sqlite marisa kyotocabinet boost protobuf date ]; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix new file mode 100644 index 0000000000000..2a6495ff0155f --- /dev/null +++ b/pkgs/applications/misc/oxker/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "oxker"; + version = "0.1.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-OhXU61F8XK5ts4GwDUkFv4+FGNFUmJJ9ooRS9/D0yvQ="; + }; + + cargoSha256 = "sha256-ldf0XYBhxLL2v0+yBX9Dqq8kYgJZ2f4Lor+rUA0/47E="; + + meta = with lib; { + description = "A simple tui to view & control docker containers"; + homepage = "https://github.com/mrjackwills/oxker"; + changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ siph ]; + }; +} diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index cffde0c3a3222..2da0374a67f70 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-hf0iU246cmTCDYotPdTACFY135L2+cRV3FpVYnRZtRc="; + sha256 = "sha256-En2ogxAD61w7DRTsCGIp6fEP/cC2A+pTYIbjeJ1MktY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix new file mode 100644 index 0000000000000..502ee9f7f0161 --- /dev/null +++ b/pkgs/applications/misc/parsec/bin.nix @@ -0,0 +1,81 @@ +{ stdenvNoCC, stdenv +, lib +, dpkg, autoPatchelfHook, makeWrapper +, fetchurl +, alsa-lib, openssl, udev +, libglvnd +, libX11, libXcursor, libXi, libXrandr +, libpulseaudio +, libva +, ffmpeg +}: + +stdenvNoCC.mkDerivation { + pname = "parsec-bin"; + version = "150_28"; + + src = fetchurl { + url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb"; + sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc"; + }; + + unpackPhase = '' + runHook preUnpack + + dpkg-deb -x $src . + + runHook postUnpack + ''; + + nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ]; + + buildInputs = [ + stdenv.cc.cc # libstdc++ + libglvnd + libX11 + ]; + + runtimeDependenciesPath = lib.makeLibraryPath [ + stdenv.cc.cc + libglvnd + openssl + udev + alsa-lib + libpulseaudio + libva + ffmpeg + libX11 + libXcursor + libXi + libXrandr + ]; + + prepareParsec = '' + if [[ ! -e "$HOME/.parsec/appdata.json" ]]; then + mkdir -p "$HOME/.parsec" + cp --no-preserve=mode,ownership,timestamps ${placeholder "out"}/share/parsec/skel/* "$HOME/.parsec/" + fi + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + mv usr/* $out + + wrapProgram $out/bin/parsecd \ + --prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \ + --run "$prepareParsec" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://parsecgaming.com/"; + description = "Remote streaming service client"; + license = licenses.unfree; + maintainers = with maintainers; [ arcnmx ]; + platforms = platforms.linux; + mainProgram = "parsecd"; + }; +} diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix new file mode 100644 index 0000000000000..19a9b18ce193f --- /dev/null +++ b/pkgs/applications/misc/pattypan/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, unzip +, jre +, jdk +, ant +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, glib +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pattypan"; + version = "22.03"; + + src = fetchFromGitHub { + owner = "yarl"; + repo = "pattypan"; + rev = "v${version}"; + sha256 = "0qmvlcqhqw5k500v2xdakk340ymgv5amhbfqxib5s4db1w32pi60"; + }; + + nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ]; + buildInputs = [ glib jre ]; + + buildPhase = '' + runHook preBuild + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/java + cp pattypan.jar $out/share/java/pattypan.jar + makeWrapper ${jre}/bin/java $out/bin/pattypan \ + --add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher" + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + desktopName = "Pattypan"; + genericName = "An uploader for Wikimedia Commons"; + categories = [ "Utility" ]; + exec = "pattypan"; + name = "pattypan"; + }) + ]; + + meta = with lib; { + homepage = "https://commons.wikimedia.org/wiki/Commons:Pattypan"; + description = "An uploader for Wikimedia Commons"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ fee1-dead ]; + }; +} diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index dffbd2079aead..2e75791e30823 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkg-config automake autoconf ]; - buildInputs = [ gtk2 libXft intltool libtool ]; + nativeBuildInputs = [ pkg-config automake autoconf intltool ]; + buildInputs = [ gtk2 libXft libtool ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 93d5d74ac731c..3416bb348567f 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -4,19 +4,18 @@ , qmake , mkDerivation , qtsvg -, libxml2 , postgresql }: mkDerivation rec { pname = "pgmodeler"; - version = "0.9.4"; + version = "1.0.0-beta"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-FwLPhIc2ofaB8Z2ZUYMFFt5XdoosEfEOwoIaI7pSxa0="; + sha256 = "sha256-1+1hKOY8unu6Z7LLv/WQ86JlwWUubQuhPP9OUjyXOrM="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index f27902a8aac76..fc6b6a1e2d4a5 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -1,30 +1,22 @@ { lib , fetchFromGitHub , bash -, cairo , glib -, qt5 -, hicolor-icon-theme , gdk-pixbuf +, gettext , imagemagick -, desktop-file-utils , ninja , meson , sassc -, ibus -, usbutils -, libxcb , python3Packages , gobject-introspection , gtk3 , wrapGAppsHook -, libappindicator-gtk3 }: python3Packages.buildPythonApplication rec { name = "polychromatic"; version = "0.7.3"; - format = "other"; src = fetchFromGitHub { @@ -41,57 +33,40 @@ python3Packages.buildPythonApplication rec { --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - substituteInPlace pylib/common.py --replace "/usr/share/polychromatic" "$out/share/polychromatic" + substituteInPlace pylib/common.py \ + --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; preConfigure = '' scripts/build-styles.sh ''; - buildInputs = [ - cairo - hicolor-icon-theme - ]; - - pythonPath = with python3Packages; [ - openrazer - pyqt5 - pyqtwebengine + nativeBuildInputs = with python3Packages; [ + gettext + gobject-introspection + meson + ninja + sassc + wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ - libxcb - colour colorama - setproctitle + colour + gtk3 openrazer - openrazer-daemon - requests - ibus - usbutils - pyqt5 - libappindicator-gtk3 - ]; - - nativeBuildInputs = with python3Packages; [ + pygobject3 pyqt5 - desktop-file-utils - qt5.wrapQtAppsHook - wrapGAppsHook - ninja - meson - sassc + pyqtwebengine + requests + setproctitle ]; - propagatedNativeBuildInputs = [ - gobject-introspection - gtk3 - gdk-pixbuf - imagemagick - ]; + dontWrapGapps = true; + dontWrapQtApps = true; makeWrapperArgs = [ - "\${qtWrapperArgs[@]}" + "\${gappsWrapperArgs[@]}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d7613b0c2a54f..405d992576da8 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python39 +, python39, fetchpatch }: let @@ -107,6 +107,16 @@ python3'.pkgs.buildPythonPackage rec { pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt ]; + patches = [ + # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes + # `Exceeds the limit (4300) for integer string conversion` in the tests, + # see https://hydra.nixos.org/build/192932057 + (fetchpatch { + url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch"; + sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ="; + }) + ]; + passthru.tests = { inherit (nixosTests) privacyidea; }; checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 80563a931292f..442f9d0e9b50b 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/guillaumegomez/process-viewer"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "process_viewer"; }; } diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 286abfb3fdb13..1592ef5461559 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -130,6 +130,15 @@ stdenv.mkDerivation rec { # likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3 # See issue #185808 for details. sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt + + # prusa-slicer expects the OCCTWrapper shared library in the same folder as + # the executable when loading STEP files. We force the loader to find it in + # the usual locations (i.e. LD_LIBRARY_PATH) instead. See the manpage + # dlopen(3) for context. + if [ -f "src/libslic3r/Format/STEP.cpp" ]; then + substituteInPlace src/libslic3r/Format/STEP.cpp \ + --replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";' + fi ''; src = fetchFromGitHub { @@ -147,11 +156,20 @@ stdenv.mkDerivation rec { postInstall = '' ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" + mkdir -p "$out/lib" + mv -v $out/bin/*.so $out/lib/ + mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib" + ) + ''; + meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/applications/misc/qcad/application-dir.patch index 0b8a29319eb3d..84782e1e7178f 100644 --- a/pkgs/applications/misc/qcad/application-dir.patch +++ b/pkgs/applications/misc/qcad/application-dir.patch @@ -33,16 +33,3 @@ index c6c31cbf5..c51b59ce6 100644 } int RSettings::getSnapRange() { -diff --git a/qcad.desktop b/qcad.desktop -index 93c5e9720..2d0e6bf32 100644 ---- a/qcad.desktop -+++ b/qcad.desktop -@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system - Comment[sl]=Sistem 2D CAD - Comment[uk]=2D САПР - Comment[tr]=2D CAD Sistemi --Exec=qcad %F -+Exec=qcad-bin %F - X-MultipleArgs=true - Icon=qcad_icon - Terminal=false diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix index c383baaaa9e22..9af70769e3d99 100644 --- a/pkgs/applications/misc/remarkable/restream/default.nix +++ b/pkgs/applications/misc/remarkable/restream/default.nix @@ -1,5 +1,4 @@ { lib -, bash , stdenv , lz4 , ffmpeg-full diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 624da925cc7c6..cca6c5b488720 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-khQ4Q2y/MJdz5EpfTSrLBROCX2QP2+3PXRO+x+FaXro="; + sha256 = "sha256-PObuO+Aea2MS1DW3/uOS7GajtFUPolDnPgwxYehGPlA="; }; - vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; + vendorSha256 = "sha256-LmKcHV0aq7NDEwaL+u8zXkbKzzdWD8zmnAGw5xShDYo="; doCheck = false; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 273b2d6046ed8..ea97f8305fee1 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: let version = "2.16.5.1"; diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index 206c32987cca6..5622c94d427f8 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -1,9 +1,7 @@ { lib , fetchFromGitHub , rustPlatform -, libX11 -, libXft -, libXinerama +, xorg }: rustPlatform.buildRustPackage rec { @@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec { # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch + patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch ''; meta = with lib; { diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 0357681b7493e..293f214b60736 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, substituteAll , makeWrapper , autoreconfHook diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/applications/misc/rofi-power-menu/default.nix index 657796a5972a0..e02b7062f4bca 100644 --- a/pkgs/applications/misc/rofi-power-menu/default.nix +++ b/pkgs/applications/misc/rofi-power-menu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rofi }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rofi-power-menu"; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 9729301f6e74c..abd47c149ebb2 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { urwid urwid-readline ]; + format = "other"; dontBuild = true; diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index a8a0bfb1e10aa..c924a3ec2bb54 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -6,7 +6,6 @@ , numpy , pyphotonfile , shiboken2 -, which }: let version = "0.1.3"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 02bf65761f019..10d4ffc77b4b2 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite , bluez diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 17888cc8041f1..0dd5afd3edb41 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , Carbon , Cocoa , ffmpeg @@ -12,14 +13,26 @@ , proj , python3 , wrapGAppsHook -, wxGTK30-gtk3 -, wxmac +, wxGTK32 , xlibsWrapper }: stdenv.mkDerivation rec { pname = "survex"; - version = "1.4.1"; + version = "1.4.3"; + + src = fetchurl { + url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM="; + }; + + patches = [ + # Fix cavern.tst to work with SOURCE_DATE_EPOCH set + (fetchpatch { + url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch"; + hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA="; + }) + ]; nativeBuildInputs = [ perl @@ -34,20 +47,14 @@ stdenv.mkDerivation rec { libGLU mesa proj + wxGTK32 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa - wxmac ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - wxGTK30-gtk3 xlibsWrapper ]; - src = fetchurl { - url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4="; - }; - postPatch = '' patchShebangs . ''; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 60954d567e22a..f756e9788ac95 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "synergy"; - version = "1.14.5.17"; + version = "1.14.5.22"; src = fetchFromGitHub { owner = "symless"; repo = "synergy-core"; rev = version; - sha256 = "sha256-9B6KPa1TsS4khCf7ccmwQZJ1KDEuLNw/W0PScYCgtlE="; + sha256 = "sha256-rqQ4n8P8pZSWRCxaQLa2PuduXMt2XeaFs051qcT3/o8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix new file mode 100644 index 0000000000000..49b38bec655a8 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub }: +rec { + version = "1.4.4"; + + src = fetchFromGitHub { + owner = "TandoorRecipes"; + repo = "recipes"; + rev = version; + sha256 = "sha256-1wqZoOT2Aafbs2P0mL33jw5HkrLIitUcRt6bQQcHx40="; + }; + + yarnSha256 = "sha256-gH0q3pJ2BC5pAU9KSo3C9DDRUnpypoyLOEqKSrkxYrk="; + + meta = with lib; { + homepage = "https://tandoor.dev/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix new file mode 100644 index 0000000000000..767d0c768ded0 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -0,0 +1,143 @@ +{ callPackage +, nixosTests +, python3 +}: +let + python = python3.override { + packageOverrides = self: super: { + django = super.django_4; + + # Tests are incompatible with Django 4 + django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: { + doCheck = false; + }); + }; + }; + + common = callPackage ./common.nix { }; + + frontend = callPackage ./frontend.nix { }; +in +python.pkgs.pythonPackages.buildPythonPackage rec { + pname = "tandoor-recipes"; + + inherit (common) version src; + + format = "other"; + + patches = [ + # Allow setting MEDIA_ROOT through environment variable + ./media-root.patch + ]; + + propagatedBuildInputs = with python.pkgs; [ + beautifulsoup4 + bleach + bleach-allowlist + boto3 + cryptography + django + django-allauth + django-annoying + django-auth-ldap + django-autocomplete-light + django-cleanup + django-cors-headers + django-crispy-forms + django-hcaptcha + django-js-reverse + django-oauth-toolkit + django-prometheus + django-scopes + django-storages + django-tables2 + django-webpack-loader + django_treebeard + djangorestframework + drf-writable-nested + gunicorn + icalendar + jinja2 + lxml + markdown + microdata + pillow + psycopg2 + pyppeteer + python-dotenv + pytube + pyyaml + recipe-scrapers + requests + six + uritemplate + validators + webdavclient3 + whitenoise + ]; + + configurePhase = '' + runHook preConfigure + + ln -sf ${frontend}/ cookbook/static/vue + cp ${frontend}/webpack-stats.json vue/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # Avoid dependency on django debug toolbar + export DEBUG=0 + + # See https://github.com/TandoorRecipes/recipes/issues/2043 + mkdir cookbook/static/themes/maps/ + touch cookbook/static/themes/maps/style.min.css.map + touch cookbook/static/themes/bootstrap.min.css.map + touch cookbook/static/css/bootstrap-vue.min.css.map + + ${python.pythonForBuild.interpreter} manage.py collectstatic_js_reverse + ${python.pythonForBuild.interpreter} manage.py collectstatic + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r . $out/lib/tandoor-recipes + chmod +x $out/lib/tandoor-recipes/manage.py + makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \ + --prefix PYTHONPATH : "$PYTHONPATH" + + # usually copied during frontend build (see vue.config.js) + cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/ + + runHook postInstall + ''; + + checkInputs = with python.pkgs; [ + pytestCheckHook + pytest-django + pytest-factoryboy + ]; + + passthru = { + inherit frontend python; + + updateScript = ./update.sh; + + tests = { + inherit (nixosTests) tandoor-recipes; + }; + }; + + meta = common.meta // { + description = '' + Application for managing recipes, planning meals, building shopping lists + and much much more! + ''; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix new file mode 100644 index 0000000000000..47dcde5aca517 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }: +let + common = callPackage ./common.nix { }; +in +stdenv.mkDerivation { + pname = "tandoor-recipes-frontend"; + inherit (common) version; + + src = "${common.src}/vue"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${common.src}/vue/yarn.lock"; + sha256 = common.yarnSha256; + }; + + nativeBuildInputs = [ + fixup_yarn_lock + # Use Node JS 16 because of @achrinza/node-ipc@9.2.2 + nodejs-16_x + nodejs-16_x.pkgs.yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup_yarn_lock yarn.lock + command -v yarn + yarn install --frozen-lockfile --offline --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R ../cookbook/static/vue/ $out + cp webpack-stats.json $out + echo "${common.version}" > "$out/version" + + runHook postInstall + ''; + + meta = common.meta // { + description = "Tandoor Recipes frontend"; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/media-root.patch b/pkgs/applications/misc/tandoor-recipes/media-root.patch new file mode 100644 index 0000000000000..8114ca8aaeb37 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/media-root.patch @@ -0,0 +1,17 @@ +diff --git a/recipes/settings.py b/recipes/settings.py +index 5676fe0a..6c6f1747 100644 +--- a/recipes/settings.py ++++ b/recipes/settings.py +@@ -426,10 +426,10 @@ if os.getenv('S3_ACCESS_KEY', ''): + AWS_S3_CUSTOM_DOMAIN = os.getenv('S3_CUSTOM_DOMAIN', '') + + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + else: + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + + # Serve static files with gzip + STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/applications/misc/tandoor-recipes/update.sh new file mode 100755 index 0000000000000..49b6d5f98ae95 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates packaging data for the tandoor-recipes package." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/TandoorRecipes/recipes/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +package_src="https://raw.githubusercontent.com/TandoorRecipes/recipes/$version" + +src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .sha256) + +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT + +pushd "$tmpdir" +wget "${TOKEN_ARGS[@]}" "$package_src/vue/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +# Use friendlier hashes +src_hash=$(nix hash to-sri --type sha256 "$src_hash") +yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix +sed -i -E -e "s#sha256 = \".*\"#sha256 = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 95937ea5f2e3c..4ccddcd70071c 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, fetchPypi , bibtool , pybtex , pymupdf diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index c9d845574ff0b..132b205f85c12 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "22.3.1"; + version = "23.0.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY="; + sha256 = "sha256-DyaJggucFOxkrpaJSmg5fTrK8O3HA0Byd5pHwcgPSIM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 48b1b2d57e05e..422cf8ea76231 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; + broken = true; }; } diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index 5ee13bb5ee3eb..9a93edb30f617 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, ninja, git, pandoc, pkg-config -, libGL, libGLU, libXxf86vm, freeimage +, libGL, libGLU, freeimage , catch2, fmt, glew, miniz, tinyxml-2, xorg , qtbase, wrapQtAppsHook , copyDesktopItems, makeDesktopItem @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ]; buildInputs = [ - libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 + libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 xorg.libSM ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 536d800001b23..9c50b189cc150 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -20,11 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ glib - intltool udev ]; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 63a8b485df533..491dd28435a9b 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ distutils_extra + gobject-introspection intltool wrapGAppsHook gdk-pixbuf @@ -40,7 +41,6 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gnome.adwaita-icon-theme - gobject-introspection gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 25cbac7d229ba..2473129bc6dc2 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: +{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.4"; + version = "1.3"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c"; + sha256 = "sha256-GxMjEXBPQniD+Yc9QZjd8TH4ILJAX5dNzrjxDawhy8w="; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 27694174d7037..5b52caeaf1ad5 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { }; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "wn"; }; } diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 0ba8c5a97ad9d..e7a871a171dfb 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y="; + sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto="; }; - vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0="; + vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps="; doCheck = false; diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 294beb06c5bf8..1af9f8e249e5c 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , curl, db, libgeotiff -, libXpm, libXt, motif, pcre +, xorg, motif, pcre , perl, proj, rastermagick, shapelib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl db libgeotiff - libXpm libXt motif pcre + xorg.libXpm xorg.libXt motif pcre perl proj rastermagick shapelib ]; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index d056dd66e8da8..ecafb9d5118cc 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: +{ lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }: stdenv.mkDerivation rec { pname = "xfontsel"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ libX11 libXaw ]; + buildInputs = [ xorg.libX11 xorg.libXaw ]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 73d111979f33a..5fffac0c7772b 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,5 +1,5 @@ -{ stdenv, stdenvGcc6, lib -, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl +{ stdenv, lib, fetchpatch +, fetchFromGitHub, cmake, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc , devDonationLevel ? "0.0" , openclSupport ? true @@ -18,11 +18,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-O3"; + patches = [ (fetchpatch { + name = "fix-libmicrohttpd-0-9-71.patch"; + url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch"; + excludes = [ "CMakeLists.txt.user" ]; + hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0="; + }) ]; + cmakeFlags = [ "-DCUDA_ENABLE=OFF" ] ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; nativeBuildInputs = [ cmake ]; - buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] + buildInputs = [ libmicrohttpd openssl hwloc ] ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; postPatch = '' diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index c5900fb9d507e..1040451efae09 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl -, donateLevel ? 0 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index dbb5eb42e1d94..2a14cbe24fb51 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ]; - buildInputs = [ glib intltool gtk3 gtksourceview ]; + buildInputs = [ glib gtk3 gtksourceview ]; meta = with lib; { description = "A sticky note application for jotting down things to remember"; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 5fca27915f0ac..392944aa2a990 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0aNtBf3np9cq9JTgHRWy73i4AKaVEOluhSMSUyobduI="; + sha256 = "sha256-oVMnhtsovZAqMdmtV8oJ8frgHGidjlFzVyrYxi+gNdg="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-DXPpW7vls4yDEMiRrqDndxEKSA7Uncrt6n8nmsBXHcU="; + cargoSha256 = "sha256-PDbhnVThdb/42Q/dp/MNU6i6Un/lkKzfKuGukFt5tmc="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index d6514e58517e3..5e76e3a14d537 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; - nativeBuildInputs = [ imake gccmakedep ]; + nativeBuildInputs = [ imake gccmakedep pkg-config ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 13c3f217de39d..3584d24f14944 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, meson, ninja, fetchurl, fetchpatch -, cairo +{ stdenv, lib, meson, ninja, fetchurl, cairo , girara , gtk-mac-integration , gumbo |