diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/pkgs/tools/misc | |
parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
22 files changed, 332 insertions, 63 deletions
diff --git a/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix b/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix new file mode 100644 index 000000000000..dde0bc349248 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, bzip2 +, libdivsufsort +, jsoncpp +, openssl +, mpfr +}: + +stdenv.mkDerivation rec { + pname = "SP800-90B_EntropyAssessment"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "usnistgov"; + repo = "SP800-90B_EntropyAssessment"; + rev = "v${version}"; + hash = "sha256-KZQ7kC0PbBkjLEQZIqYakQ91OvCxruhdfUwiRHtno3w="; + }; + + buildInputs = [ bzip2 libdivsufsort jsoncpp openssl mpfr ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "-march=native" "" + ''; + + sourceRoot = "source/cpp"; + + makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "ARCH=${stdenv.hostPlatform.linuxArch}" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp ea_* $out/bin + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/usnistgov/SP800-90B_EntropyAssessment"; + description = "Implementation of min-entropy assessment methods included in Special Publication 800-90B."; + platforms = lib.platforms.linux; + license = lib.licenses.free; #this software uses the NIST software license + maintainers = with lib.maintainers; [ orichter thillux ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/backdown/default.nix b/nixpkgs/pkgs/tools/misc/backdown/default.nix new file mode 100644 index 000000000000..e578b1ab4295 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/backdown/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "backdown"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = "backdown"; + rev = "v${version}"; + hash = "sha256-w9EdDSGqmHRLXwx5qFo0BngKATKtQsieMt6dPgfOrQ0="; + }; + + cargoHash = "sha256-BOwhXq/xVuk3KylL3KeIkiIG3SXVASFiYkUgKJhMzuU="; + + meta = with lib; { + description = "A file deduplicator"; + homepage = "https://github.com/Canop/backdown"; + changelog = "https://github.com/Canop/backdown/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "backdown"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/btc-rpc-explorer/default.nix b/nixpkgs/pkgs/tools/misc/btc-rpc-explorer/default.nix new file mode 100644 index 000000000000..9e548d5f3dfd --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/btc-rpc-explorer/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, pkg-config +, python3 +, vips +}: + +buildNpmPackage rec { + pname = "btc-rpc-explorer"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "janoside"; + repo = "btc-rpc-explorer"; + rev = "v${version}"; + hash = "sha256-ZGg3jwSl1XyzS9hMa2YqwExhHSNgrsUmSscZtfF2h54="; + }; + + npmDepsHash = "sha256-9pVjydGaEaHytZqwXv0/kaJAVqlE7zzuTvubBFTkuBg="; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + + makeCacheWritable = true; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + buildInputs = [ + vips + ]; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/janoside/btc-rpc-explorer/blob/${src.rev}/CHANGELOG.md"; + description = "Database-free, self-hosted Bitcoin explorer, via RPC to Bitcoin Core"; + homepage = "https://github.com/janoside/btc-rpc-explorer"; + license = lib.licenses.mit; + mainProgram = "btc-rpc-explorer"; + maintainers = with lib.maintainers; [ d-xo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index d37c5bbe5fed..f700f0477333 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-AXn2D4vWiFYlmAN2egqKdi5vOYU88FopEGYyDGgy0ig="; + hash = "sha256-s8E+Nva/lsZ/jPzDuGRN0P8JOeJPUK6Xj6bHqiozwNA="; }; - vendorHash = "sha256-OU1ChDJiIeRjBBKVcxah/cEXScepW0VY9tkNDALT4fI="; + vendorHash = "sha256-UFEpP5I++8+F8OTMqm5G6/2Kn31Q2U3+8g0deeLMWDc="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/cloc/default.nix b/nixpkgs/pkgs/tools/misc/cloc/default.nix index e89e785e9bdc..a8fc4a4f01b8 100644 --- a/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: -stdenv.mkDerivation rec { +let version = "1.98"; +in stdenv.mkDerivation { pname = "cloc"; - version = "1.96"; + inherit version; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "sha256-20vL+SX8Tbp6QxErDn76c6sLWnB1IJwHlQX4YAvj+Eg="; + sha256 = "sha256-OTzIzLgE9sdbHZUSARSbVrxD95dW8gPiM8tvMvqm1Bg="; }; setSourceRoot = '' @@ -27,6 +28,28 @@ stdenv.mkDerivation rec { postFixup = "wrapProgram $out/bin/cloc --prefix PERL5LIB : $PERL5LIB"; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + echo -n 'checking --version...' + $out/bin/cloc --version | grep '${version}' > /dev/null + echo ' ok' + + cat > test.nix <<EOF + {a, b}: { + test = a + + b; + } + EOF + + echo -n 'checking lines in test.nix...' + $out/bin/cloc --quiet --csv test.nix | grep '1,Nix,0,0,4' > /dev/null + echo ' ok' + + runHook postInstallCheck + ''; + meta = { description = "A program that counts lines of source code"; homepage = "https://github.com/AlDanial/cloc"; diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 1b33f15ce203..6ee0ca8a8702 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-/mXaNRTRIBIPUHY/MOHpGmpB8wBp18wwftn/EdmoffQ="; + hash = "sha256-YbfN9ZdcxP78/dNaONBhb1UqcZYJcet+lHuKmvXk9MI="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-VadE9E4B8BIIHGl+PN4oDl0H56xE3GQn0MxGw5fGsvM="; + vendorHash = "sha256-2Cu9o26R9y2EBUB9kLf98n2AKFOE7NE1NrcMD+8pvRY="; preCheck = '' buildFlagsArray+="-short" diff --git a/nixpkgs/pkgs/tools/misc/colorpicker/default.nix b/nixpkgs/pkgs/tools/misc/colorpicker/default.nix index 475041b4f682..8b45da17626c 100644 --- a/nixpkgs/pkgs/tools/misc/colorpicker/default.nix +++ b/nixpkgs/pkgs/tools/misc/colorpicker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "colorpicker"; - version = "unstable-2018-01-14"; + version = "unstable-2017-09-01"; src = fetchFromGitHub { - owner = "Ancurio"; + owner = "Jack12816"; repo = "colorpicker"; - rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17"; - sha256 = "1kj1dpb79llrfpszraaz6r7ci114zqi5rmqxwsvq2dnnpjxyi29r"; + rev = "a4455b92fde1dfbac81e7852f171093932154a30"; + sha256 = "z2asxTIP8WcsWcePmIg0k4bOF2JwkqOxNqSpQv4/a40="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Click on a pixel on your screen and print its color value in RGB"; - homepage = "https://github.com/Ancurio/colorpicker"; + homepage = "https://github.com/Jack12816/colorpicker"; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; mainProgram = "colorpicker"; diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index e736ce1468a9..284570617032 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "246"; + version = "247"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-z7wrc8hveKqMJsJMLQXO3z+wcJxpY8QFoYxTBUzfGPg="; + hash = "sha256-sbLny1eK/eyCQKeSUyQc3DTvlHeCp8rAgrx681KjvNQ="; }; outputs = [ diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 8a3f2579543a..ea6cfdfb282f 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.8.1"; + version = "2023.8.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a85nNUVaa7CbYdI/xM30fp7i1gMRz18Ior4mwseFZqU="; + hash = "sha256-KizeBaDw/9XoPwIjjc3VKkiaHTK5VYQXss4cQZZaGzs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/eza/default.nix b/nixpkgs/pkgs/tools/misc/eza/default.nix index 715eee9c05d0..8ee47ac4cd70 100644 --- a/nixpkgs/pkgs/tools/misc/eza/default.nix +++ b/nixpkgs/pkgs/tools/misc/eza/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-f8js+zToP61lgmxucz2gyh3uRZeZSnoxS4vuqLNVO7c="; + hash = "sha256-3g4eauJqnbIqWtDmRvKsDiZh1eAz171FP9idF2nBXLQ="; }; - cargoHash = "sha256-G3zNv8pG9uS12PsBug51RaS9Hx0sGHHnVEF4bHb+v18="; + cargoHash = "sha256-HS/nmLxr5zvyneiSJk9tPUhszF5vFwSo5HMsRql9I38="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix index 722f81cb751c..731cd459d41c 100644 --- a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , chafa , cmake , dbus , dconf +, ddcutil , glib , imagemagick_light , libglvnd @@ -42,23 +42,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.0.0"; + version = "2.0.3"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-mXbkzPlX1OsK+ahUSJWktV5D7Mo2zkhXgXP54QjbIR4="; + hash = "sha256-Zh77m1jezjKJPC8Ua3Uv3w7MIeuLJ6U9WBFzT0uuLSo="; }; - patches = [ - # Don't fetch yyjson. - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch"; - hash = "sha256-mOykwXSuad8BrUBmjX39EmQb0/hnKezgmWe8cpAybsw="; - }) - ]; - nativeBuildInputs = [ cmake makeBinaryWrapper @@ -74,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.isLinux [ dbus dconf + ddcutil glib libglvnd libpulseaudio @@ -105,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + "-DENABLE_SYSTEM_YYJSON=YES" ]; postInstall = '' @@ -127,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { 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 ]; + maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; }; diff --git a/nixpkgs/pkgs/tools/misc/findutils/default.nix b/nixpkgs/pkgs/tools/misc/findutils/default.nix index 62f39492437e..b37eaeaea1be 100644 --- a/nixpkgs/pkgs/tools/misc/findutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/findutils/default.nix @@ -90,5 +90,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.gpl3Plus; + + mainProgram = "find"; }; } diff --git a/nixpkgs/pkgs/tools/misc/gaphor/default.nix b/nixpkgs/pkgs/tools/misc/gaphor/default.nix index a97b887f1caa..48f9fa7a7bba 100644 --- a/nixpkgs/pkgs/tools/misc/gaphor/default.nix +++ b/nixpkgs/pkgs/tools/misc/gaphor/default.nix @@ -59,7 +59,7 @@ buildPythonApplication rec { desktopName = "Gaphor"; }; - # We need to wrap it manually to resolve all icons + # Disable automatic wrapGAppsHook to prevent double wrapping dontWrapGApps = true; postInstall = '' @@ -67,10 +67,11 @@ buildPythonApplication rec { ''; preFixup = '' - wrapProgram $out/bin/gaphor \ - ''${gappsWrapperArgs[@]} \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + ) ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/hyperpotamus/default.nix b/nixpkgs/pkgs/tools/misc/hyperpotamus/default.nix new file mode 100644 index 000000000000..869b8aea9143 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/hyperpotamus/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "hyperpotamus"; + version = "0.39.0"; + + src = fetchFromGitHub { + owner = "pmarkert"; + repo = "hyperpotamus"; + rev = "v${version}"; + hash = "sha256-dExkvObz+PNjqAZnigZHs/DCSHq31jDg9pgFmmtPmWk="; + }; + + npmDepsHash = "sha256-cH0VEhs4q13gnFKQmmu8fXjueBu/u7xtySE6HTm+bik="; + + dontNpmBuild = true; + + meta = { + description = "YAML based HTTP script processing engine"; + homepage = "https://github.com/pmarkert/hyperpotamus"; + license = lib.licenses.mit; + mainProgram = "hyperpotamus"; + maintainers = with lib.maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ollama/default.nix b/nixpkgs/pkgs/tools/misc/ollama/default.nix index d8463766f823..8de315533746 100644 --- a/nixpkgs/pkgs/tools/misc/ollama/default.nix +++ b/nixpkgs/pkgs/tools/misc/ollama/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ollama"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-QFik6Vlo06s2Nz5tsS3yvm3JYhCTIZHMiphtqz99sTI="; + hash = "sha256-p2YLgLyjmf2MPvFue45+wW7kqKpUli9rX3aWNH08cDk="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ @@ -22,7 +22,7 @@ buildGoModule rec { MetalKit ]); - vendorHash = "sha256-eAvedN47InwUcsWLtnzxuLnmyeOoxHEDtQy9kjsFJnE="; + vendorHash = "sha256-IgEf/WOc1eNGCif1fViIFxbgZAd6mHBqfxcaqH/WvGg="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/misc/pipreqs/default.nix b/nixpkgs/pkgs/tools/misc/pipreqs/default.nix index 3e22fa839e14..2689581b6c06 100644 --- a/nixpkgs/pkgs/tools/misc/pipreqs/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipreqs/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "pipreqs"; - version = "0.4.11"; + version = "0.4.13"; src = fetchPypi { inherit pname version; - sha256 = "c793b4e147ac437871b3a962c5ce467e129c859ece5ba79aca83c20f4d9c3aef"; + hash = "sha256-oX8WeIC2khvjdTPOTIHdxuIrRlwQeq1VfbQ7Gt1WqZs="; }; propagatedBuildInputs = [ yarg docopt ]; diff --git a/nixpkgs/pkgs/tools/misc/pv/default.nix b/nixpkgs/pkgs/tools/misc/pv/default.nix index 4438662de385..236137ff7937 100644 --- a/nixpkgs/pkgs/tools/misc/pv/default.nix +++ b/nixpkgs/pkgs/tools/misc/pv/default.nix @@ -1,31 +1,22 @@ { lib , stdenv , fetchurl -, fetchpatch }: stdenv.mkDerivation rec { pname = "pv"; - version = "1.6.20"; + version = "1.7.24"; src = fetchurl { - url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.bz2"; - sha256 = "00y6zla8h653sn4axgqz7rr0x79vfwl62a7gn6lzn607zwg9acg8"; + url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.gz"; + sha256 = "sha256-O/Q8WAnI1QBm6urqWhFfZQPFejjBUZdbcQqivuhXtl4="; }; - patches = [ - # Fix build on aarch64-darwin using patch from Homebrew - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/homebrew-core/0780f1df9fdbd8914ff50ac24eb0ec0d3561c1b7/Formula/pv.rb"; - sha256 = "001xayskfprri4s2gd3bqwajw6nz6nv0ggb0835par7q7bsd0dzr"; - }) - ]; - meta = { - homepage = "http://www.ivarch.com/programs/pv"; + homepage = "https://www.ivarch.com/programs/pv.shtml"; description = "Tool for monitoring the progress of data through a pipeline"; license = lib.licenses.artistic2; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; all; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/starry/default.nix b/nixpkgs/pkgs/tools/misc/starry/default.nix new file mode 100644 index 000000000000..b2ffe3175bfb --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/starry/default.nix @@ -0,0 +1,38 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "starry"; + version = "2.0.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-CPEMjg70MXlV+ruYnEHpTmqlc27NMTUKTR4/fpQmYcI="; + }; + + cargoHash = "sha256-d6icXOgju4qEV2+J+G09/xeQMIX3/4XUFmuWfD/Cqhc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Current stars history tells only half the story"; + homepage = "https://github.com/Canop/starry"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "starry"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/tere/default.nix b/nixpkgs/pkgs/tools/misc/tere/default.nix index 216a0db0c83b..a2a4a506bc0d 100644 --- a/nixpkgs/pkgs/tools/misc/tere/default.nix +++ b/nixpkgs/pkgs/tools/misc/tere/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tere"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mgunyho"; repo = "tere"; rev = "v${version}"; - sha256 = "sha256-gEoy7pwZxlCIPTQZVPSo5TIdmSliSSePunXO3hD3Ryo="; + sha256 = "sha256-xqbFBRzBfTwSdkC8e85yANdVA45G6E1FYlTXP8QfVIk="; }; - cargoSha256 = "sha256-4XvVisRLSHw4jz+nUndWzS1IK2tnzmxdcgqNHHOvkQg="; + cargoHash = "sha256-Y2Zgo/VAJxzQd2cXxyiJS5AqcVRClAuUsEogivK3EJw="; postPatch = '' rm .cargo/config.toml; diff --git a/nixpkgs/pkgs/tools/misc/timetagger_cli/default.nix b/nixpkgs/pkgs/tools/misc/timetagger_cli/default.nix new file mode 100644 index 000000000000..38b0cc88bb1e --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/timetagger_cli/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "timetagger_cli"; + version = "23.8.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "almarklein"; + repo = "timetagger_cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-vOpwMR7/EGf/l5KvlHn7mQ1vGGZ1Whd5x2uxLV9nCbk="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + toml + ]; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Track your time from the command-line "; + homepage = "https://github.com/almarklein/timetagger_cli"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index 4ec5052503ea..81610e41cef8 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.1.1"; + version = "5.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubikey-manager"; rev = version; - hash = "sha256-rF1oOhlZP1EKiqErJ4L/otkoEvW0iA2P4g5MWCKrCO4="; + hash = "sha256-33Y2adUuGIDi5gdenkwZJKKKk2NtcHwLzxy1NXhBa9M="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/zotero-translation-server/default.nix b/nixpkgs/pkgs/tools/misc/zotero-translation-server/default.nix new file mode 100644 index 000000000000..21428cf12458 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/zotero-translation-server/default.nix @@ -0,0 +1,35 @@ +{ lib, buildNpmPackage, fetchFromGitHub, nodejs }: + +buildNpmPackage rec { + pname = "zotero-translation-server"; + version = "unstable-2023-07-13"; + + src = fetchFromGitHub { + owner = "zotero"; + repo = "translation-server"; + rev = "cf96d57f4e2af66fee7df9bad00681b3f4ac7d77"; + hash = "sha256-GJn7UAl0raVGzplvFzo4A0RUjNbyGt/YI2mt1UZIJv0="; + fetchSubmodules = true; + }; + + npmDepsHash = "sha256-JHoBxUybs1GGRxEVG5GgX2mOCplTgR5dcPjnR42SEbY="; + + makeCacheWritable = true; + + dontNpmBuild = true; + + postInstall = '' + mkdir -p $out/bin/ $out/share/zotero-translation-server/ + makeWrapper ${nodejs}/bin/node $out/bin/translation-server \ + --add-flags "$out/lib/node_modules/translation-server/src/server.js" + ln -s $out/lib/node_modules/translation-server/config $out/share/zotero-translation-server/config + ln -s $out/lib/node_modules/translation-server/modules $out/share/zotero-translation-server/modules + ''; + + meta = with lib; { + description = "A Node.js-based server to run Zotero translators"; + homepage = "https://github.com/zotero/translation-server"; + license = licenses.agpl3Only; + maintainers = [ maintainers.marsam ]; + }; +} |