diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/awslimitchecker/default.nix | 44 | ||||
-rw-r--r-- | pkgs/tools/admin/fits-cloudctl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/games/opentracker/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/graphics/oxipng/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/misc/btrfs-assistant/default.nix | 90 | ||||
-rw-r--r-- | pkgs/tools/misc/dooit/default.nix | 60 | ||||
-rw-r--r-- | pkgs/tools/misc/fastfetch/default.nix | 158 | ||||
-rw-r--r-- | pkgs/tools/misc/sqlite3-to-mysql/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/chaos/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/mqttmultimeter/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/v2ray/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/cryptomator/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/system/lact/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/mdbook-epub/default.nix | 8 |
16 files changed, 60 insertions, 374 deletions
diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/tools/admin/awslimitchecker/default.nix index 548bf69e6f070..760a6f1e67d0e 100644 --- a/pkgs/tools/admin/awslimitchecker/default.nix +++ b/pkgs/tools/admin/awslimitchecker/default.nix @@ -1,17 +1,29 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + fetchFromGitHub, + python3, +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "awslimitchecker"; version = "12.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "jantman"; repo = "awslimitchecker"; - rev = version; - sha256 = "1p6n4kziyl6sfq7vgga9v88ddwh3sgnfb1m1cx6q25n0wyl7phgv"; + rev = "refs/tags/${version}"; + hash = "sha256-+8F7qOfAFoFNZ6GG5ezTA/LWENpJvbcPdtpQH/8k1tw="; }; - propagatedBuildInputs = with python3Packages; [ + patches = [ + # Fix the version lookup to use only the hardcoded version in the source package + ./version.patch + ]; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ boto3 botocore pytz @@ -19,27 +31,15 @@ python3Packages.buildPythonApplication rec { versionfinder ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python3.pkgs; [ freezegun onetimepass - pytestCheckHook pyotp + mock + (pytestCheckHook.override { pytest = pytest_7; }) testfixtures ]; - patches = [ - # Fix the version lookup to use only the hardcoded version in the source package - ./version.patch - ]; - - pytestFlagsArray = [ - "awslimitchecker/tests" - - # Upstream did not adapt to pytest 8 yet. - "-W" - "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTestPaths = [ # AWS tests that use the network "awslimitchecker/tests/services" @@ -53,11 +53,11 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "awslimitchecker.checker" ]; meta = with lib; { + description = "A script and python package to check your AWS service limits and usage via boto3"; homepage = "http://awslimitchecker.readthedocs.org"; changelog = "https://github.com/jantman/awslimitchecker/blob/${version}/CHANGES.rst"; - description = "A script and python package to check your AWS service limits and usage via boto3"; - mainProgram = "awslimitchecker"; license = licenses.agpl3Plus; maintainers = with maintainers; [ zakame ]; + mainProgram = "awslimitchecker"; }; } diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 2e508323d75ec..cab43f365692d 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.17"; + version = "0.12.18"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - hash = "sha256-nKVCYgecrjCfAx+9aiFJYq2m/E1yFh1Ie2vK4HqusUo="; + hash = "sha256-ScHdYSDZVs9YYIh1/U/8ZcGa9BF5L+fIHnSHWSRlB4k="; }; - vendorHash = "sha256-xcwJ1tEOCF9BGjcWZPVY/IZkNc2TUtufa7zQfIU4CQQ="; + vendorHash = "sha256-7vIcfxDmO8tmVewRDx6JhOgtkKeHOk0qyFZf1U0VQs4="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 6bb5fc8ff207d..5bab19fa2ad97 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -3,7 +3,6 @@ stdenv, buildDotnetModule, fetchFromGitHub, - autoPatchelfHook, wrapGAppsHook, dotnetCorePackages, fontconfig, @@ -40,7 +39,6 @@ buildDotnetModule rec { ]; nativeBuildInputs = [ - autoPatchelfHook wrapGAppsHook ]; @@ -64,12 +62,6 @@ buildDotnetModule rec { libXi ]); - # Attempts to patchelf unneeded SOs - autoPatchelfIgnoreMissingDeps = [ - "libc.musl-x86_64.so.1" - "libintl.so.8" - ]; - meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; homepage = "https://github.com/trippsc2/OpenTracker"; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 23f9692597a3a..4650db3e506d6 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "9.0.0"; + version = "9.1.1"; pname = "oxipng"; src = fetchCrate { inherit version pname; - hash = "sha256-1OpSweosYiqtLqCcAw1EsAtBAYVc/VH8kRtVSpmTytM="; + hash = "sha256-I+1yQQEzhGApvHxPM8W1wySQtDglGp3V4vkwoTd92EU="; }; - cargoHash = "sha256-kPdAfqMNOoQPSdv+VLRDUr6AXGPy47UnldXwvpwKp6s="; + cargoHash = "sha256-miXrQVFahz9WYRCduSF5+RSY4j/XNEt8lnSuOohBUFU="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index d0199bdbed4a0..95155aa6469a9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -12,19 +12,19 @@ let zip-codes = fetchFromGitHub { owner = "musjj"; repo = "jp-zip-codes"; - rev = "a1eed9bae0ba909c8c8f5387008b08ff490f5e57"; - hash = "sha256-VfI8qAMPPCC2H4vjm4a6sAmSwc1YkXlMyLm1cnufvrU="; + rev = "119c888a38032a92e139c52cd26f45bb495c4d54"; + hash = "sha256-uyAL2TcFJsYZACFDAxIQ4LE40Hi4PVrQRnJl5O5+RmU="; }; in buildBazelPackage rec { pname = "ibus-mozc"; - version = "2.29.5268.102"; + version = "2.29.5374.102"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; rev = version; - hash = "sha256-B7hG8OUaQ1jmmcOPApJlPVcB8h1Rw06W5LAzlTzI9rU="; + hash = "sha256-AcIN5sWPBe4JotAUYv1fytgQw+mJzdFhKuVPLR48soA="; fetchSubmodules = true; }; @@ -38,11 +38,11 @@ buildBazelPackage rec { inherit bazel; fetchAttrs = { - sha256 = "sha256-17QHh1MJUu8OK/T+WSpLXEx83DmRORLN7yLzILqP7vw="; + sha256 = "sha256-TJ5ksmGCZ8Vy3WmwqQQqQh+kYZvrBeGXc4zcOt1ZYI4="; - # remove references of buildInputs + # remove references of buildInputs and zip code files preInstall = '' - rm -rv $bazelOut/external/{ibus,qt_linux} + rm -rv $bazelOut/external/{ibus,qt_linux,zip_code_*} ''; }; diff --git a/pkgs/tools/misc/btrfs-assistant/default.nix b/pkgs/tools/misc/btrfs-assistant/default.nix deleted file mode 100644 index d3bdc74980228..0000000000000 --- a/pkgs/tools/misc/btrfs-assistant/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, bash -, btrfs-progs -, cmake -, coreutils -, git -, pkg-config -, qt6 -, snapper -, util-linux -, enableSnapper ? true -, nix-update-script -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "btrfs-assistant"; - version = "2.0"; - - src = fetchFromGitLab { - owner = "btrfs-assistant"; - repo = "btrfs-assistant"; - rev = finalAttrs.version; - hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ="; - }; - - nativeBuildInputs = [ - cmake - git - pkg-config - ]; - - buildInputs = [ - btrfs-progs - qt6.qtbase - qt6.qtsvg - qt6.qttools - qt6.qtwayland - ]; - - propagatedBuildInputs = [ qt6.wrapQtAppsHook ]; - - prePatch = '' - substituteInPlace src/util/System.cpp \ - --replace '/bin/bash' "${lib.getExe bash}" - '' - + lib.optionalString enableSnapper '' - substituteInPlace src/main.cpp \ - --replace '/usr/bin/snapper' "${lib.getExe snapper}" - ''; - - postPatch = '' - substituteInPlace src/org.btrfs-assistant.pkexec.policy \ - --replace '/usr/bin' "$out/bin" - - substituteInPlace src/btrfs-assistant \ - --replace 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin" - - substituteInPlace src/btrfs-assistant-launcher \ - --replace 'btrfs-assistant' "$out/bin/btrfs-assistant" - '' - + lib.optionalString enableSnapper '' - substituteInPlace src/btrfs-assistant.conf \ - --replace '/usr/bin/snapper' "${lib.getExe snapper}" - ''; - - qtWrapperArgs = - let - runtimeDeps = lib.makeBinPath ([ - coreutils - util-linux - ] - ++ lib.optionals enableSnapper [ snapper ]); - in - [ - "--prefix PATH : ${runtimeDeps}" - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "A GUI management tool to make managing a Btrfs filesystem easier"; - homepage = "https://gitlab.com/btrfs-assistant/btrfs-assistant"; - license = lib.licenses.gpl3Only; - mainProgram = "btrfs-assistant-bin"; - maintainers = with lib.maintainers; [ khaneliman ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix deleted file mode 100644 index c532b13877d30..0000000000000 --- a/pkgs/tools/misc/dooit/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, fetchFromGitHub -, dooit -, python3 -, testers -, nix-update-script -}: - -python3.pkgs.buildPythonApplication rec { - pname = "dooit"; - version = "2.2.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "kraanzu"; - repo = "dooit"; - rev = "v${version}"; - hash = "sha256-GtXRzj+o+FClleh73kqelk0JrSyafZhf847lX1BiS9k="; - }; - - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "textual" - "tzlocal" - ]; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - pyperclip - python-dateutil - pyyaml - textual - tzlocal - ]; - - # No tests available - doCheck = false; - - passthru = { - tests.version = testers.testVersion { - package = dooit; - command = "HOME=$(mktemp -d) dooit --version"; - }; - - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "A TUI todo manager"; - homepage = "https://github.com/kraanzu/dooit"; - changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ khaneliman wesleyjrz ]; - mainProgram = "dooit"; - }; -} diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix deleted file mode 100644 index 27da89ceb31ac..0000000000000 --- a/pkgs/tools/misc/fastfetch/default.nix +++ /dev/null @@ -1,158 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, chafa -, cmake -, darwin -, dbus -, dconf -, ddcutil -, glib -, hwdata -, imagemagick_light -, libXrandr -, libglvnd -, libpulseaudio -, libselinux -, libsepol -, libxcb -, makeBinaryWrapper -, networkmanager -, nix-update-script -, ocl-icd -, opencl-headers -, pcre -, pcre2 -, pkg-config -, python3 -, rpm -, sqlite -, testers -, util-linux -, vulkan-loader -, wayland -, xfce -, xorg -, yyjson -, zlib -, rpmSupport ? false -, vulkanSupport ? true -, waylandSupport ? true -, x11Support ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "fastfetch"; - version = "2.9.2"; - - src = fetchFromGitHub { - owner = "fastfetch-cli"; - repo = "fastfetch"; - rev = finalAttrs.version; - hash = "sha256-SEt/qw8ixlgRY2+fqyCmhqzLVoAw/BMl//JqQxbuB0s="; - }; - - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ - cmake - makeBinaryWrapper - pkg-config - python3 - ]; - - buildInputs = [ - chafa - imagemagick_light - pcre - pcre2 - sqlite - yyjson - ] ++ lib.optionals stdenv.isLinux [ - dbus - dconf - ddcutil - glib - hwdata - libpulseaudio - libselinux - libsepol - networkmanager - ocl-icd - opencl-headers - util-linux - zlib - ] ++ lib.optionals rpmSupport [ - rpm - ] ++ lib.optionals vulkanSupport [ - vulkan-loader - ] ++ lib.optionals waylandSupport [ - wayland - ] ++ lib.optionals x11Support [ - libXrandr - libglvnd - libxcb - xorg.libXau - xorg.libXdmcp - xorg.libXext - ] ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ - xfce.xfconf - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Apple80211 - AppKit - AVFoundation - Cocoa - CoreDisplay - CoreVideo - CoreWLAN - DisplayServices - IOBluetooth - MediaRemote - OpenCL - SystemConfiguration - darwin.moltenvk - ]); - - cmakeFlags = [ - (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") - (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) - (lib.cmakeBool "ENABLE_DRM" false) - (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) - (lib.cmakeBool "ENABLE_OSMESA" false) - (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) - (lib.cmakeBool "ENABLE_GLX" x11Support) - (lib.cmakeBool "ENABLE_RPM" rpmSupport) - (lib.cmakeBool "ENABLE_VULKAN" x11Support) - (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) - (lib.cmakeBool "ENABLE_X11" x11Support) - (lib.cmakeBool "ENABLE_XCB" x11Support) - (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) - (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) - (lib.cmakeBool "ENABLE_XRANDR" x11Support) - ]; - - postInstall = '' - wrapProgram $out/bin/fastfetch \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" - wrapProgram $out/bin/flashfetch \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" - ''; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "fastfetch -v | cut -d '(' -f 1"; - version = "fastfetch ${finalAttrs.version}"; - }; - }; - - meta = { - description = "Like neofetch, but much faster because written in C"; - homepage = "https://github.com/fastfetch-cli/fastfetch"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; - platforms = lib.platforms.all; - mainProgram = "fastfetch"; - }; -}) diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index ece36f82f3253..8d93736ffdac2 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.1.8"; + version = "2.1.9"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-j9AjgLwEqt+PI4LKc3gPjXW95zAKmRjIzPFnOB0n6MM="; + hash = "sha256-TnqNPW/d1dcVuS5sg9NOXH5ns7AzcbyailY2pYcpUEU="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/tools/networking/chaos/default.nix index 3e66ddac7b6c9..f77f2114d4933 100644 --- a/pkgs/tools/networking/chaos/default.nix +++ b/pkgs/tools/networking/chaos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "chaos"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "chaos-client"; rev = "refs/tags/v${version}"; - hash = "sha256-TpzTDNkfwL2CgEZwk2b5Zojhh61hXBm3PgjLkav6B3M="; + hash = "sha256-YjwxInBEPgovSk5EZzpeNhp4/FRWf6prZnNqcyyFFJg="; }; - vendorHash = "sha256-Zu3TxBFTrXkAOmtUELjSdyzlE6CIr4SUBSdvaRnKy+k="; + vendorHash = "sha256-c5J2cTzyb7CiBlS4vS3PdRhr6DhIvXE2lt40u0s6G0k="; subPackages = [ "cmd/chaos/" diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix index e2d6f4e6fbd37..1c2c290bef787 100644 --- a/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/pkgs/tools/networking/mqttmultimeter/default.nix @@ -4,7 +4,6 @@ , dotnet-runtime_8 , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , fontconfig , xorg , libglvnd @@ -12,9 +11,6 @@ , copyDesktopItems }: -# NOTES: -# 1. we need autoPatchelfHook for quite a number of things in $out/lib - buildDotnetModule rec { pname = "mqttmultimeter"; version = "1.8.2.272"; @@ -35,13 +31,11 @@ buildDotnetModule rec { executables = [ "mqttMultimeter" ]; nativeBuildInputs = [ - autoPatchelfHook copyDesktopItems ]; buildInputs = [ stdenv.cc.cc.lib fontconfig ]; - # don't care about musl and windows versions, as they fail autoPatchelfHook postInstall = '' rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*} ''; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 0bd4f1fff80b6..c46af01f79234 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.15.1"; + version = "5.15.3"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-EENeJQfIKHtbh5dmWeUtnVepIGsBsXMs6Yhi/QzeRRs="; + hash = "sha256-45VS+Hrl7egIS2PBrgmDsKgX6vKirEFyQUKy2TBxY4U="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-SQ7DcrKYf4Wclp/HG8e7q5YPvVNj/kHV/pGmEyOU/BY="; + vendorHash = "sha256-Z3jD7auUixTgrY9Cm0LoNRHIyEFbStMYpumTCqKv+x0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index bf2d48e4adfb1..37194739e5d18 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.19.4"; + version = "2.21.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-97ZqhTMqnAr1rzEy96faceWzFyWexnYbH1aTfc1y0JE="; + hash = "sha256-StJq7Zy+/iVBUAKFzhHWlsirFucZ3gNtzXhAYXAsNnw="; }; buildInputs = [ boost diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 2766a4e88ac27..8fb34dbbbcc23 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -33,6 +33,8 @@ mavenJdk.buildMavenPackage rec { # This is based on the instructins in https://github.com/cryptomator/cryptomator/blob/develop/dist/linux/appimage/build.sh installPhase = '' + runHook preInstall + mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/ cp target/libs/* $out/share/cryptomator/libs/ @@ -70,9 +72,15 @@ mavenJdk.buildMavenPackage rec { cp ${src}/dist/linux/common/org.cryptomator.Cryptomator256.png $out/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png cp ${src}/dist/linux/common/org.cryptomator.Cryptomator512.png $out/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg $out/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked-symbolic.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray.svg $out/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-symbolic.svg cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.desktop $out/share/applications/org.cryptomator.Cryptomator.desktop cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml $out/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml cp ${src}/dist/linux/common/application-vnd.cryptomator.vault.xml $out/share/mime/packages/application-vnd.cryptomator.vault.xml + + runHook postInstall ''; nativeBuildInputs = [ diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/tools/system/lact/default.nix index 11901caa4cafa..d51dc2e7ffd1c 100644 --- a/pkgs/tools/system/lact/default.nix +++ b/pkgs/tools/system/lact/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "lact"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; rev = "v${version}"; - hash = "sha256-Ts2byWYn1MwQCJPQfwTxezsa/fnwlgVOZyNDUXWgZ0s="; + hash = "sha256-Umi+J6RnYgHO30kFPFKhhKtqyzsLVPMkeQPeG3I4jcs="; }; - cargoHash = "sha256-7zGZu3q2CF/xzWjbicEb/JOt6pXEC2Skg7eR2syvUmY="; + cargoHash = "sha256-CMK8o1Hcs5E+GtP9EgKmAa5fXHsY5PCYuFQh1zf0YE4="; nativeBuildInputs = [ blueprint-compiler diff --git a/pkgs/tools/text/mdbook-epub/default.nix b/pkgs/tools/text/mdbook-epub/default.nix index 830d6f92a8ad4..48dbe92ca6ce3 100644 --- a/pkgs/tools/text/mdbook-epub/default.nix +++ b/pkgs/tools/text/mdbook-epub/default.nix @@ -9,18 +9,18 @@ let pname = "mdbook-epub"; - version = "unstable-2022-12-25"; + version = "0.4.37"; in rustPlatform.buildRustPackage { inherit pname version; src = fetchFromGitHub { owner = "michael-f-bryan"; repo = pname; - rev = "2e1e48d0d1a1b4c1b0f866267e6666b41c598225"; - hash = "sha256-wjn/7dv/Z2OmwvH/XaEeCz/JOvJWlMJ60q5qozzOEWY="; + rev = version; + hash = "sha256-ddWClkeGabvqteVUtuwy4pWZGnarrKrIbuPEe62m6es="; }; - cargoHash = "sha256-4oSpQUYJDK0srABZMwJ8x8jv6DOnLShXSnjLjf8c9Ac="; + cargoHash = "sha256-cJS9HgbnLYXkZrAyGNEeu6q+znH+7cj8CUGIbTCbB9Y="; nativeBuildInputs = [ pkg-config |