about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/filesystems/sasquatch/default.nix76
-rw-r--r--pkgs/tools/graphics/grim/default.nix55
-rw-r--r--pkgs/tools/package-management/protontricks/default.nix78
-rw-r--r--pkgs/tools/security/gitleaks/default.nix6
-rw-r--r--pkgs/tools/system/automatic-timezoned/default.nix6
-rw-r--r--pkgs/tools/system/nsc/default.nix8
-rw-r--r--pkgs/tools/text/vale/default.nix58
-rw-r--r--pkgs/tools/text/vale/styles.nix144
8 files changed, 60 insertions, 371 deletions
diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix
deleted file mode 100644
index f8d66683fccbf..0000000000000
--- a/pkgs/tools/filesystems/sasquatch/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchurl
-, xz
-, lzo
-, zlib
-, zstd
-, lz4
-, lz4Support ? false
-}:
-
-let
-  patch = fetchFromGitHub
-    {
-      # NOTE: This uses my personal fork for now, until
-      # https://github.com/devttys0/sasquatch/pull/40 is merged.
-      # I, cole-h, will keep this fork available until that happens.
-      owner = "cole-h";
-      repo = "sasquatch";
-      rev = "6edc54705454c6410469a9cb5bc58e412779731a";
-      sha256 = "x+PuPYGD4Pd0fcJtlLWByGy/nggsmZkxwSXxJfPvUgo=";
-    } + "/patches/patch0.txt";
-in
-stdenv.mkDerivation rec {
-  pname = "sasquatch";
-  version = "4.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/squashfs/squashfs${version}.tar.gz";
-    sha256 = "qYGz8/IFS1ouZYhRo8BqJGCtBKmopkXgr+Bjpj/bsH4=";
-  };
-
-  buildInputs = [
-    xz
-    lzo
-    zlib
-    zstd
-  ]
-  ++ lib.optionals lz4Support [ lz4 ];
-
-  patches = [ patch ];
-  patchFlags = [ "-p0" ];
-
-  postPatch = ''
-    # Drop blanket -Werror to avoid build failure on fresh toolchains
-    # like gcc-11.
-    substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' '
-    cd squashfs-tools
-  '';
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: unsquashfs_xattr.o:/build/squashfs4.4/squashfs-tools/error.h:34: multiple definition of
-  #     `verbose'; unsquashfs.o:/build/squashfs4.4/squashfs-tools/error.h:34: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  installFlags = [ "INSTALL_DIR=\${out}/bin" ];
-
-  makeFlags = [
-    "XZ_SUPPORT=1"
-    "CC=${stdenv.cc.targetPrefix}cc"
-    "CXX=${stdenv.cc.targetPrefix}c++"
-    "AR=${stdenv.cc.targetPrefix}ar"
-  ]
-    ++ lib.optional lz4Support "LZ4_SUPPORT=1";
-
-  meta = with lib; {
-    homepage = "https://github.com/devttys0/sasquatch";
-    description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.pamplemousse ];
-    platforms = platforms.linux;
-    mainProgram = "sasquatch";
-  };
-}
diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix
deleted file mode 100644
index caea55766d1fe..0000000000000
--- a/pkgs/tools/graphics/grim/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib
-, stdenv
-, fetchFromSourcehut
-, pixman
-, libpng
-, libjpeg
-, meson
-, ninja
-, pkg-config
-, scdoc
-, wayland
-, wayland-protocols
-, wayland-scanner
-}:
-
-stdenv.mkDerivation rec {
-  pname = "grim";
-  version = "1.4.1";
-
-  src = fetchFromSourcehut {
-    owner = "~emersion";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o=";
-  };
-
-  mesonFlags = [
-    "-Dwerror=false"
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    scdoc
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    pixman
-    libpng
-    libjpeg
-    wayland
-    wayland-protocols
-  ];
-
-  meta = with lib; {
-    description = "Grab images from a Wayland compositor";
-    homepage = "https://github.com/emersion/grim";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
-    mainProgram = "grim";
-  };
-}
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 468a1ca75b3fb..13b7158e79697 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -1,29 +1,31 @@
-{ lib
-, buildPythonApplication
-, fetchFromGitHub
-, setuptools-scm
-, setuptools
-, vdf
-, pillow
-, substituteAll
-, writeShellScript
-, steam-run
-, winetricks
-, yad
-, pytestCheckHook
-, nix-update-script
-, extraCompatPaths ? ""
+{
+  lib,
+  buildPythonApplication,
+  fetchFromGitHub,
+  substituteAll,
+  writeShellScript,
+  steam-run,
+  fetchpatch2,
+  setuptools-scm,
+  setuptools,
+  vdf,
+  pillow,
+  winetricks,
+  yad,
+  pytestCheckHook,
+  nix-update-script,
+  extraCompatPaths ? "",
 }:
 
 buildPythonApplication rec {
   pname = "protontricks";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "Matoking";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-a40IAFrzQ0mogMoXKb+Lp0fPc1glYophqtftigk3nAc=";
+    repo = "protontricks";
+    rev = "refs/tags/${version}";
+    hash = "sha256-dCb8mcwXoxD4abJjLEwk5tGp65XkvepmOX+Kc9Dl7fQ=";
   };
 
   patches = [
@@ -35,6 +37,19 @@ buildPythonApplication rec {
         exec ${lib.getExe steam-run} bash "$@"
       '';
     })
+
+    # Revert vendored vdf since our vdf includes `appinfo.vdf` v29 support
+    (fetchpatch2 {
+      url = "https://github.com/Matoking/protontricks/commit/4198b7ea82369a91e3084d6e185f9b370f78eaec.patch";
+      revert = true;
+      hash = "sha256-1U/LiAliKtk3ygbIBsmoavXN0RSykiiegtml+bO8CnI=";
+    })
+
+    # Fix test_run_no_args test
+    (fetchpatch2 {
+      url = "https://github.com/Matoking/protontricks/commit/ff2381ad379a612e73f0d4604f1c9c3a012b3355.patch";
+      hash = "sha256-aiafLbiqS6TBBiQpfTYPVqhQs2OXYg/4yCtbuTv6Ug8=";
+    })
   ];
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -45,14 +60,18 @@ buildPythonApplication rec {
     pillow
   ];
 
-  makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [
-      winetricks
-      yad
-    ]}"
-    # Steam Runtime does not work outside of steam-run, so don't use it
-    "--set STEAM_RUNTIME 0"
-  ] ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}";
+  makeWrapperArgs =
+    [
+      "--prefix PATH : ${
+        lib.makeBinPath [
+          winetricks
+          yad
+        ]
+      }"
+      # Steam Runtime does not work outside of steam-run, so don't use it
+      "--set STEAM_RUNTIME 0"
+    ]
+    ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}";
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -71,6 +90,9 @@ buildPythonApplication rec {
     homepage = "https://github.com/Matoking/protontricks";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ kira-bruneau ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
   };
 }
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index d8aee0952d68e..5c926bdd2fd63 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gitleaks";
-  version = "8.19.2";
+  version = "8.19.3";
 
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VC8Bf6jcxXdBws7IParh9Srk34JiYVx5Tk2LLilrNJ4=";
+    hash = "sha256-PBgUx4O9CM/yo53go6+1uyEvD3dffo9bNvD+ikOsNFI=";
   };
 
-  vendorHash = "sha256-DgCtWRo5KNuFCdhGJvzoH2v8n7mIxNk8eHyZFPUPo24=";
+  vendorHash = "sha256-KdwKogBrsGYyAY4Cmuf3MysnWIsHoGPs04xaihM4QAA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix
index b149649a75eb2..83ac6002f20c1 100644
--- a/pkgs/tools/system/automatic-timezoned/default.nix
+++ b/pkgs/tools/system/automatic-timezoned/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "2.0.32";
+  version = "2.0.33";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-J8DAHwbpcSQtOWOkWjya3zXRhr9Dje2QzumDmeq2rR0=";
+    sha256 = "sha256-q2OVd3eb1zGQMiI3T0oXAq5dFzdYTYQGqPNBUeuMEck=";
   };
 
-  cargoHash = "sha256-M0MX2ZjVsJuWQ6nuxpF1VDYIlGPAsebRbxZ40oSYVO0=";
+  cargoHash = "sha256-cu6d9sCvVYt+85cl0dTOY9874QdnyA13T7Nb/KFjkMg=";
 
   meta = with lib; {
     description = "Automatically update system timezone based on location";
diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix
index 88dafe7f4f3e7..deefe7056929c 100644
--- a/pkgs/tools/system/nsc/default.nix
+++ b/pkgs/tools/system/nsc/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "nsc";
-  version = "2.8.9";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-KNW9meeThHT9ZZJFXsb9RAzLsvgnaXWbuMR4tei/s2U=";
+    hash = "sha256-pzUjcezzZ3Fo9b7nuPV08ZSxrk7cBufQL6Dbfvmjkg4=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
     "-X main.builtBy=nixpkgs"
   ];
 
-  vendorHash = "sha256-3qUgzvb7VkYrlYb+W0ZycJ0S7CQAHSUFNQSfwiKqMdI=";
+  vendorHash = "sha256-tZTrjIax3zofrRuSJQO7VA7rlTXN/GT1KTcsLpvB+2Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -46,7 +46,7 @@ buildGoModule rec {
   # the test strips table formatting from the command output in a naive way
   # that removes all the table characters, including '-'.
   # The nix build directory looks something like:
-  # /private/tmp/nix-build-nsc-2.8.9.drv-0/nsc_test2000598938/keys
+  # /private/tmp/nix-build-nsc-2.9.0.drv-0/nsc_test2000598938/keys
   # Then the `-` are removed from the path unintentionally and the test fails.
   # This should be fixed upstream to avoid mangling the path when
   # removing the table decorations from the command output.
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
deleted file mode 100644
index fa256b04aca49..0000000000000
--- a/pkgs/tools/text/vale/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, makeBinaryWrapper
-, runCommand
-, symlinkJoin
-, vale
-, valeStyles
-}:
-
-buildGoModule rec {
-  pname = "vale";
-  version = "3.7.1";
-
-  subPackages = [ "cmd/vale" ];
-
-  src = fetchFromGitHub {
-    owner = "errata-ai";
-    repo = "vale";
-    rev = "v${version}";
-    hash = "sha256-jb+ap+XQMrSqstgexycpgO+M2YyENDeSmMQXrV2FiM4=";
-  };
-
-  vendorHash = "sha256-0AeG0/ALU/mkXxVKzqGhxXLqq2XYmnF/ZRaZkJ5eQxU=";
-
-  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
-
-  # Tests require network access
-  doCheck = false;
-
-  passthru.withStyles = selector: symlinkJoin {
-    name = "vale-with-styles-${vale.version}";
-    paths = [ vale ] ++ selector valeStyles;
-    nativeBuildInputs = [ makeBinaryWrapper ];
-    postBuild = ''
-      wrapProgram "$out/bin/vale" \
-        --set VALE_STYLES_PATH "$out/share/vale/styles/"
-    '';
-    meta = {
-      inherit (vale.meta) mainProgram;
-    };
-  };
-
-  meta = with lib; {
-    description = "Syntax-aware linter for prose built with speed and extensibility in mind";
-    longDescription = ''
-      Vale in Nixpkgs offers the helper `.withStyles` allow you to install it
-      predefined styles:
-
-          vale.withStyles (s: [ s.alex s.google ])
-    '';
-    homepage = "https://vale.sh/";
-    changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}";
-    mainProgram = "vale";
-    license = licenses.mit;
-    maintainers = [ maintainers.pbsds ];
-  };
-}
diff --git a/pkgs/tools/text/vale/styles.nix b/pkgs/tools/text/vale/styles.nix
deleted file mode 100644
index 6022d38497a9f..0000000000000
--- a/pkgs/tools/text/vale/styles.nix
+++ /dev/null
@@ -1,144 +0,0 @@
-{ lib, stdenvNoCC, fetchFromGitHub, fetchzip, nix-update-script }:
-
-let
-  buildStyle =
-    { name
-    , stylePath ? name
-    , ...
-    }@args:
-    stdenvNoCC.mkDerivation ({
-      pname = "vale-style-${lib.toLower name}";
-
-      dontConfigure = true;
-      dontBuild = true;
-      doCheck = false;
-      dontFixup = true;
-
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out/share/vale/styles
-        cp -R ${stylePath} "$out/share/vale/styles/${name}"
-        runHook postInstall
-      '';
-
-      passthru.updateScript = nix-update-script { };
-
-      meta = {
-        platforms = lib.platforms.all;
-        maintainers = with lib.maintainers; [ katexochen ];
-      } // (args.meta or { });
-    } // removeAttrs args [ "meta" "name" ]);
-in
-{
-  alex = buildStyle rec {
-    name = "alex";
-    version = "0.2.2";
-    src = fetchFromGitHub {
-      owner = "errata-ai";
-      repo = "alex";
-      rev = "v${version}";
-      hash = "sha256-mfeMa+KlkqwyS+h+oo5p5+P2bsmZ0BOph2nbQiaoNqM=";
-    };
-    meta = {
-      description = "Vale-compatible implementation of the guidelines enforced by the alex linter";
-      homepage = "https://github.com/errata-ai/alex";
-      license = lib.licenses.mit;
-    };
-  };
-
-  google = buildStyle rec {
-    name = "Google";
-    version = "0.6.1";
-    src = fetchFromGitHub {
-      owner = "errata-ai";
-      repo = "Google";
-      rev = "v${version}";
-      hash = "sha256-jSmfUgzlIbDVh2zLtnTNpM/z6dHMp358F9adLZ5+qcw=";
-    };
-    meta = {
-      description = "Vale-compatible implementation of the Google Developer Documentation Style Guide";
-      homepage = "https://github.com/errata-ai/Google";
-      license = lib.licenses.mit;
-    };
-  };
-
-  joblint = buildStyle rec {
-    name = "Joblint";
-    version = "0.4.1";
-    src = fetchFromGitHub {
-      owner = "errata-ai";
-      repo = "Joblint";
-      rev = "v${version}";
-      hash = "sha256-zRz5ThOg5RLTZj3dYPe0PDvOF5DjO31lduSpi2Us87U=";
-    };
-    meta = {
-      description = "Vale-compatible implementation of the Joblint linter";
-      homepage = "https://github.com/errata-ai/Joblint";
-      license = lib.licenses.mit;
-    };
-  };
-
-  microsoft = buildStyle rec {
-    name = "Microsoft";
-    version = "0.14.1";
-    src = fetchFromGitHub {
-      owner = "errata-ai";
-      repo = "Microsoft";
-      rev = "v${version}";
-      hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A=";
-    };
-    meta = {
-      description = "Vale-compatible implementation of the Microsoft Writing Style Guide";
-      homepage = "https://github.com/errata-ai/Microsoft";
-      license = lib.licenses.mit;
-    };
-  };
-
-  proselint = buildStyle rec {
-    name = "proselint";
-    version = "0.3.4";
-    src = fetchFromGitHub {
-      owner = "errata-ai";
-      repo = "proselint";
-      rev = "v${version}";
-      hash = "sha256-ryKJDX1JrvDWVKLC5qQGctweDf74yuwEXxl/IqumM4s=";
-    };
-    meta = {
-      description = "Vale-compatible implementation of Python's proselint linter";
-      homepage = "https://github.com/errata-ai/proselint";
-      license = lib.licenses.bsd3;
-    };
-  };
-
-  readability = buildStyle rec {
-    name = "Readability";
-    version = "0.1.1";
-    src = fetchFromGitHub {
-      owner = "errata-ai";
-      repo = "readability";
-      rev = "v${version}";
-      hash = "sha256-5Y9v8QsZjC2w3/pGIcL5nBdhpogyJznO5IFa0s8VOOI=";
-    };
-    meta = {
-      description = "Vale-compatible implementations of many popular \"readability\" metrics";
-      homepage = "https://github.com/errata-ai/readability";
-      license = lib.licenses.mit;
-    };
-  };
-
-  write-good = buildStyle rec {
-    name = "write-good";
-    version = "0.4.1";
-    src = fetchFromGitHub {
-      owner = "errata-ai";
-      repo = "write-good";
-      rev = "v${version}";
-      hash = "sha256-W/eHlXklAVlAnY8nLPi/SIKsg8UUnH8UkH99BDo5yKk=";
-    };
-    meta = {
-      description = "Vale-compatible implementation of the write-good linter";
-      homepage = "https://github.com/errata-ai/write-good";
-      license = lib.licenses.mit;
-    };
-  };
-}
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-29 08:25:13 +0000