Merge master into staging-next
This commit is contained in:
commit
1bb285561e
|
@ -155,7 +155,7 @@
|
||||||
|
|
||||||
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
|
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
|
||||||
|
|
||||||
- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:
|
- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream (specifically, Cinnamon now defaults to the gtk2 style instead, following the default in Linux Mint). If you still want it, you can add the following options to your configuration but it will probably be eventually removed:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
qt = {
|
qt = {
|
||||||
|
|
|
@ -212,6 +212,13 @@ in
|
||||||
programs.bash.vteIntegration = mkDefault true;
|
programs.bash.vteIntegration = mkDefault true;
|
||||||
programs.zsh.vteIntegration = mkDefault true;
|
programs.zsh.vteIntegration = mkDefault true;
|
||||||
|
|
||||||
|
# Qt application style
|
||||||
|
qt = {
|
||||||
|
enable = mkDefault true;
|
||||||
|
style = mkDefault "gtk2";
|
||||||
|
platformTheme = mkDefault "gtk2";
|
||||||
|
};
|
||||||
|
|
||||||
# Default Fonts
|
# Default Fonts
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
source-code-pro # Default monospace font in 3.32
|
source-code-pro # Default monospace font in 3.32
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
"new": "neodev-nvim"
|
"new": "neodev-nvim"
|
||||||
},
|
},
|
||||||
"nvchad-extensions": {
|
"nvchad-extensions": {
|
||||||
"date": "2023-08-19",
|
"date": "2023-08-19",
|
||||||
"new": "nvchad-ui"
|
"new": "nvchad-ui"
|
||||||
},
|
},
|
||||||
"nvim-bufferline-lua": {
|
"nvim-bufferline-lua": {
|
||||||
"date": "2021-08-22",
|
"date": "2021-08-22",
|
||||||
|
|
|
@ -2997,12 +2997,12 @@ final: prev:
|
||||||
|
|
||||||
dressing-nvim = buildVimPluginFrom2Nix {
|
dressing-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "dressing.nvim";
|
pname = "dressing.nvim";
|
||||||
version = "2023-08-13";
|
version = "2023-08-19";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stevearc";
|
owner = "stevearc";
|
||||||
repo = "dressing.nvim";
|
repo = "dressing.nvim";
|
||||||
rev = "6bde51adabba06f7fd4a469885a85f36d78a5f52";
|
rev = "ee571505f3566f84fd252e76c4ce6df6eaf2fb94";
|
||||||
sha256 = "00djz2ppikh911ldndcaygb95a7l48s7wmq7a9p9vr4vzwhxab5l";
|
sha256 = "0xahisrz7yz0838ijvg2s6wbskdb443fal72yxjr2h5z1dvzxswq";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
|
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -4557,6 +4557,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/nanotech/jellybeans.vim/";
|
meta.homepage = "https://github.com/nanotech/jellybeans.vim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
jinja-vim = buildVimPluginFrom2Nix {
|
||||||
|
pname = "jinja.vim";
|
||||||
|
version = "2020-06-18";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "HiPhish";
|
||||||
|
repo = "jinja.vim";
|
||||||
|
rev = "51b8a2a504416c4959127c82eac26f14f3508975";
|
||||||
|
sha256 = "15ax7v6crdzra4sqqmjpvl9q1p9dmsksrs4j68zqqrj6kka0zkgn";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/HiPhish/jinja.vim/";
|
||||||
|
};
|
||||||
|
|
||||||
jq-vim = buildVimPluginFrom2Nix {
|
jq-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "jq.vim";
|
pname = "jq.vim";
|
||||||
version = "2022-11-26";
|
version = "2022-11-26";
|
||||||
|
@ -5931,8 +5943,8 @@ final: prev:
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NeogitOrg";
|
owner = "NeogitOrg";
|
||||||
repo = "neogit";
|
repo = "neogit";
|
||||||
rev = "cdea52c881ea4944b46f09b5c4705a51dc5cf390";
|
rev = "7cba95de79476d28c19e8ee34b303ad60fdef59f";
|
||||||
sha256 = "06hi06pkr0bww1nsrx22llhgfllmbykshwb2k8y2wbl03fjqyixz";
|
sha256 = "18jixqv9mcvc873gs39g6fd84s0lpyglqk25gy00siznyjl2mcis";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||||
};
|
};
|
||||||
|
|
|
@ -381,6 +381,7 @@ https://github.com/vim-scripts/jdaddy.vim/,,
|
||||||
https://github.com/davidhalter/jedi-vim/,,
|
https://github.com/davidhalter/jedi-vim/,,
|
||||||
https://github.com/metalelf0/jellybeans-nvim/,,
|
https://github.com/metalelf0/jellybeans-nvim/,,
|
||||||
https://github.com/nanotech/jellybeans.vim/,,
|
https://github.com/nanotech/jellybeans.vim/,,
|
||||||
|
https://github.com/HiPhish/jinja.vim/,HEAD,
|
||||||
https://github.com/vito-c/jq.vim/,,
|
https://github.com/vito-c/jq.vim/,,
|
||||||
https://github.com/neoclide/jsonc.vim/,,
|
https://github.com/neoclide/jsonc.vim/,,
|
||||||
https://github.com/JuliaEditorSupport/julia-vim/,,
|
https://github.com/JuliaEditorSupport/julia-vim/,,
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchFromGitLab
|
||||||
, fetchpatch2
|
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -14,28 +13,23 @@
|
||||||
, libiconv
|
, libiconv
|
||||||
, json-glib
|
, json-glib
|
||||||
, libintl
|
, libintl
|
||||||
|
, zathura
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "girara";
|
pname = "girara";
|
||||||
version = "0.3.9";
|
version = "0.4.0";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitLab {
|
||||||
url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
|
domain = "git.pwmt.org";
|
||||||
hash = "sha256-DoqYykR/N17BHQ90GoLvAYluQ3odWPwUGRTacN6BiWU=";
|
owner = "pwmt";
|
||||||
|
repo = "girara";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-dzWdiFGJ45JcH+wNwq2P3NZeWwHXAvXR1eJC85mYy7M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix memory management bug revealed by GLib 2.76.
|
|
||||||
# https://git.pwmt.org/pwmt/girara/-/issues/17
|
|
||||||
(fetchpatch2 {
|
|
||||||
url = "https://git.pwmt.org/pwmt/girara/-/commit/6926cc1234853ccf3010a1e2625aafcf462ed60e.patch";
|
|
||||||
hash = "sha256-uayT6ikXtaBPxhZFyskShug3Tbvy2a9qimLRwdiAsic=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
@ -75,6 +69,10 @@ stdenv.mkDerivation rec {
|
||||||
meson test --print-errorlogs
|
meson test --print-errorlogs
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
inherit zathura;
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://git.pwmt.org/pwmt/girara";
|
homepage = "https://git.pwmt.org/pwmt/girara";
|
||||||
description = "User interface library";
|
description = "User interface library";
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kubectl-klock";
|
pname = "kubectl-klock";
|
||||||
version = "0.3.1";
|
version = "0.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jillejr";
|
owner = "jillejr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-zOdi2QUVvRPPiI22bm7Z5OeShslysjcnvkhroOjbZrU=";
|
sha256 = "sha256-tXsRifIZRS2W4O4VOONuLsunYGLG5C9KfgnZQQqKACg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-r4oAmD/7CXYiWEWR/FC/Ab0LNxehWv6oCWjQ/fGU2rU=";
|
vendorSha256 = "sha256-r4oAmD/7CXYiWEWR/FC/Ab0LNxehWv6oCWjQ/fGU2rU=";
|
||||||
|
|
|
@ -27,7 +27,10 @@
|
||||||
npmInstallHook = makeSetupHook
|
npmInstallHook = makeSetupHook
|
||||||
{
|
{
|
||||||
name = "npm-install-hook";
|
name = "npm-install-hook";
|
||||||
propagatedBuildInputs = [ buildPackages.makeWrapper ];
|
propagatedBuildInputs = with buildPackages; [
|
||||||
|
installShellFiles
|
||||||
|
makeWrapper
|
||||||
|
];
|
||||||
substitutions = {
|
substitutions = {
|
||||||
hostNode = "${nodejs}/bin/node";
|
hostNode = "${nodejs}/bin/node";
|
||||||
jq = "${buildPackages.jq}/bin/jq";
|
jq = "${buildPackages.jq}/bin/jq";
|
||||||
|
|
|
@ -25,8 +25,7 @@ npmInstallHook() {
|
||||||
else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json")
|
else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json")
|
||||||
|
|
||||||
while IFS= read -r man; do
|
while IFS= read -r man; do
|
||||||
mkdir -p "$out/share/man"
|
installManPage "$packageOut/$man"
|
||||||
ln -s "$packageOut/$man" "$out/share/man"
|
|
||||||
done < <(@jq@ --raw-output '(.man | type) as $typ | if $typ == "string" then .man
|
done < <(@jq@ --raw-output '(.man | type) as $typ | if $typ == "string" then .man
|
||||||
elif $typ == "list" then .man | join("\n")
|
elif $typ == "list" then .man | join("\n")
|
||||||
else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json")
|
else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json")
|
||||||
|
|
|
@ -22,13 +22,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ghex";
|
pname = "ghex";
|
||||||
version = "44.1";
|
version = "44.2";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "QEvfZJ6qE5IqgK4y8Z/kDnHw7g9GHEXtrHKIigDq1sI=";
|
sha256 = "6+y0xoo30zk3uewmPIV23x2MaascHT4S1WaP0gB+kws=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -27,14 +27,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-bluetooth";
|
pname = "gnome-bluetooth";
|
||||||
version = "42.5";
|
version = "42.6";
|
||||||
|
|
||||||
# TODO: split out "lib"
|
# TODO: split out "lib"
|
||||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "pPXxrC27e3uS99bStCwDD2Ku2bVCa53BFpRgQfPLqPc=";
|
sha256 = "WGT+bx5xhxXbJrYiAbdaWQIM9CR/7DdkWzVZzS26WdA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -47,11 +47,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "geary";
|
pname = "geary";
|
||||||
version = "44.0";
|
version = "44.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "gBSsWorTxURMpWl32a0QBr1vTvXJLkNzXFEw3o7ckJ0=";
|
sha256 = "fRHLbhxQThCMLckaoiVqRATcq+fRyHPY1glOLfM1onc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -49,7 +49,9 @@ mapAliases {
|
||||||
balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31
|
balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31
|
||||||
bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
|
bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
|
||||||
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
|
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
|
||||||
|
inherit (pkgs) carto; # added 2023-08-17
|
||||||
castnow = pkgs.castnow; # added 2023-07-30
|
castnow = pkgs.castnow; # added 2023-07-30
|
||||||
|
inherit (pkgs) clean-css-cli; # added 2023-08-18
|
||||||
eask = pkgs.eask; # added 2023-08-17
|
eask = pkgs.eask; # added 2023-08-17
|
||||||
inherit (pkgs.elmPackages) elm-test;
|
inherit (pkgs.elmPackages) elm-test;
|
||||||
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
carbon-now-cli = "carbon-now";
|
carbon-now-cli = "carbon-now";
|
||||||
cdk8s-cli = "cdk8s";
|
cdk8s-cli = "cdk8s";
|
||||||
cdktf-cli = "cdktf";
|
cdktf-cli = "cdktf";
|
||||||
clean-css-cli = "cleancss";
|
|
||||||
clipboard-cli = "clipboard";
|
clipboard-cli = "clipboard";
|
||||||
clubhouse-cli = "club";
|
clubhouse-cli = "club";
|
||||||
conventional-changelog-cli = "conventional-changelog";
|
conventional-changelog-cli = "conventional-changelog";
|
||||||
|
|
|
@ -41,10 +41,8 @@
|
||||||
, "browser-sync"
|
, "browser-sync"
|
||||||
, "btc-rpc-explorer"
|
, "btc-rpc-explorer"
|
||||||
, "carbon-now-cli"
|
, "carbon-now-cli"
|
||||||
, "carto"
|
|
||||||
, "cdk8s-cli"
|
, "cdk8s-cli"
|
||||||
, "cdktf-cli"
|
, "cdktf-cli"
|
||||||
, "clean-css-cli"
|
|
||||||
, "clipboard-cli"
|
, "clipboard-cli"
|
||||||
, "clubhouse-cli"
|
, "clubhouse-cli"
|
||||||
, "coc-clangd"
|
, "coc-clangd"
|
||||||
|
|
138
pkgs/development/node-packages/node-packages.nix
generated
138
pkgs/development/node-packages/node-packages.nix
generated
|
@ -90994,95 +90994,6 @@ in
|
||||||
bypassCache = true;
|
bypassCache = true;
|
||||||
reconstructLock = true;
|
reconstructLock = true;
|
||||||
};
|
};
|
||||||
carto = nodeEnv.buildNodePackage {
|
|
||||||
name = "carto";
|
|
||||||
packageName = "carto";
|
|
||||||
version = "1.2.0";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://registry.npmjs.org/carto/-/carto-1.2.0.tgz";
|
|
||||||
sha512 = "WMWMOJGgBiKddgYpOs8Q1+wBb3oJCWtXKHh2TTCVjIo1MyfzVOLBXFE8zKPNkQUR4rmqi/SDaSwYQ5QT/YhjuQ==";
|
|
||||||
};
|
|
||||||
dependencies = [
|
|
||||||
sources."ansi-regex-3.0.1"
|
|
||||||
sources."argparse-1.0.10"
|
|
||||||
sources."camelcase-5.3.1"
|
|
||||||
sources."chroma-js-1.3.7"
|
|
||||||
sources."cliui-4.1.0"
|
|
||||||
sources."code-point-at-1.1.0"
|
|
||||||
sources."cross-spawn-6.0.5"
|
|
||||||
sources."decamelize-1.2.0"
|
|
||||||
sources."end-of-stream-1.4.4"
|
|
||||||
sources."esprima-4.0.1"
|
|
||||||
sources."execa-1.0.0"
|
|
||||||
sources."find-up-3.0.0"
|
|
||||||
sources."get-caller-file-1.0.3"
|
|
||||||
sources."get-stream-4.1.0"
|
|
||||||
sources."hsluv-0.0.3"
|
|
||||||
sources."invert-kv-2.0.0"
|
|
||||||
sources."is-fullwidth-code-point-1.0.0"
|
|
||||||
sources."is-stream-1.1.0"
|
|
||||||
sources."isexe-2.0.0"
|
|
||||||
sources."js-yaml-3.12.2"
|
|
||||||
sources."lcid-2.0.0"
|
|
||||||
sources."locate-path-3.0.0"
|
|
||||||
sources."lodash-4.17.21"
|
|
||||||
sources."map-age-cleaner-0.1.3"
|
|
||||||
sources."mapnik-reference-8.10.0"
|
|
||||||
sources."mem-4.3.0"
|
|
||||||
sources."mimic-fn-2.1.0"
|
|
||||||
sources."nice-try-1.0.5"
|
|
||||||
sources."npm-run-path-2.0.2"
|
|
||||||
sources."number-is-nan-1.0.1"
|
|
||||||
sources."once-1.4.0"
|
|
||||||
sources."os-locale-3.1.0"
|
|
||||||
sources."p-defer-1.0.0"
|
|
||||||
sources."p-finally-1.0.0"
|
|
||||||
sources."p-is-promise-2.1.0"
|
|
||||||
sources."p-limit-2.3.0"
|
|
||||||
sources."p-locate-3.0.0"
|
|
||||||
sources."p-try-2.2.0"
|
|
||||||
sources."path-exists-3.0.0"
|
|
||||||
sources."path-key-2.0.1"
|
|
||||||
sources."pump-3.0.0"
|
|
||||||
sources."require-directory-2.1.1"
|
|
||||||
sources."require-main-filename-1.0.1"
|
|
||||||
sources."semver-5.6.0"
|
|
||||||
sources."set-blocking-2.0.0"
|
|
||||||
sources."shebang-command-1.2.0"
|
|
||||||
sources."shebang-regex-1.0.0"
|
|
||||||
sources."signal-exit-3.0.7"
|
|
||||||
sources."sprintf-js-1.0.3"
|
|
||||||
(sources."string-width-2.1.1" // {
|
|
||||||
dependencies = [
|
|
||||||
sources."is-fullwidth-code-point-2.0.0"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
sources."strip-ansi-4.0.0"
|
|
||||||
sources."strip-eof-1.0.0"
|
|
||||||
sources."which-1.3.1"
|
|
||||||
sources."which-module-2.0.1"
|
|
||||||
(sources."wrap-ansi-2.1.0" // {
|
|
||||||
dependencies = [
|
|
||||||
sources."ansi-regex-2.1.1"
|
|
||||||
sources."string-width-1.0.2"
|
|
||||||
sources."strip-ansi-3.0.1"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
sources."wrappy-1.0.2"
|
|
||||||
sources."y18n-4.0.3"
|
|
||||||
sources."yargs-12.0.5"
|
|
||||||
sources."yargs-parser-11.1.1"
|
|
||||||
];
|
|
||||||
buildInputs = globalBuildInputs;
|
|
||||||
meta = {
|
|
||||||
description = "Mapnik Stylesheet Compiler";
|
|
||||||
homepage = "https://github.com/mapbox/carto#readme";
|
|
||||||
license = "Apache-2.0";
|
|
||||||
};
|
|
||||||
production = true;
|
|
||||||
bypassCache = true;
|
|
||||||
reconstructLock = true;
|
|
||||||
};
|
|
||||||
cdk8s-cli = nodeEnv.buildNodePackage {
|
cdk8s-cli = nodeEnv.buildNodePackage {
|
||||||
name = "cdk8s-cli";
|
name = "cdk8s-cli";
|
||||||
packageName = "cdk8s-cli";
|
packageName = "cdk8s-cli";
|
||||||
|
@ -92060,55 +91971,6 @@ in
|
||||||
bypassCache = true;
|
bypassCache = true;
|
||||||
reconstructLock = true;
|
reconstructLock = true;
|
||||||
};
|
};
|
||||||
clean-css-cli = nodeEnv.buildNodePackage {
|
|
||||||
name = "clean-css-cli";
|
|
||||||
packageName = "clean-css-cli";
|
|
||||||
version = "5.6.2";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.2.tgz";
|
|
||||||
sha512 = "GDQkr6zVqHJhO3yWTy3sA22sMCT6iUqaJuBdqZMW6oI25MtiJ2iZXDmWzErpjoRotsB+TYPTpuZSNSgaC1n4lA==";
|
|
||||||
};
|
|
||||||
dependencies = [
|
|
||||||
sources."anymatch-3.1.3"
|
|
||||||
sources."balanced-match-1.0.2"
|
|
||||||
sources."binary-extensions-2.2.0"
|
|
||||||
sources."brace-expansion-1.1.11"
|
|
||||||
sources."braces-3.0.2"
|
|
||||||
sources."chokidar-3.5.3"
|
|
||||||
sources."clean-css-5.3.2"
|
|
||||||
sources."commander-7.2.0"
|
|
||||||
sources."concat-map-0.0.1"
|
|
||||||
sources."fill-range-7.0.1"
|
|
||||||
sources."fs.realpath-1.0.0"
|
|
||||||
sources."fsevents-2.3.2"
|
|
||||||
sources."glob-7.2.3"
|
|
||||||
sources."glob-parent-5.1.2"
|
|
||||||
sources."inflight-1.0.6"
|
|
||||||
sources."inherits-2.0.4"
|
|
||||||
sources."is-binary-path-2.1.0"
|
|
||||||
sources."is-extglob-2.1.1"
|
|
||||||
sources."is-glob-4.0.3"
|
|
||||||
sources."is-number-7.0.0"
|
|
||||||
sources."minimatch-3.1.2"
|
|
||||||
sources."normalize-path-3.0.0"
|
|
||||||
sources."once-1.4.0"
|
|
||||||
sources."path-is-absolute-1.0.1"
|
|
||||||
sources."picomatch-2.3.1"
|
|
||||||
sources."readdirp-3.6.0"
|
|
||||||
sources."source-map-0.6.1"
|
|
||||||
sources."to-regex-range-5.0.1"
|
|
||||||
sources."wrappy-1.0.2"
|
|
||||||
];
|
|
||||||
buildInputs = globalBuildInputs;
|
|
||||||
meta = {
|
|
||||||
description = "A command-line interface to clean-css CSS optimization library";
|
|
||||||
homepage = "https://github.com/clean-css/clean-css-cli#readme";
|
|
||||||
license = "MIT";
|
|
||||||
};
|
|
||||||
production = true;
|
|
||||||
bypassCache = true;
|
|
||||||
reconstructLock = true;
|
|
||||||
};
|
|
||||||
clipboard-cli = nodeEnv.buildNodePackage {
|
clipboard-cli = nodeEnv.buildNodePackage {
|
||||||
name = "clipboard-cli";
|
name = "clipboard-cli";
|
||||||
packageName = "clipboard-cli";
|
packageName = "clipboard-cli";
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
x86_64-linux = {
|
||||||
|
platform = "manylinux1_x86_64";
|
||||||
|
cpu = {
|
||||||
|
cp39 = "sha256-Yu/FWoMhYp+behAth/jH0FKlf2LJr8TyvL9MBwmuews=";
|
||||||
|
cp310 = "sha256-O7d/5LY2dEMf5gW5WrN3xzIIEi2vT0RWoMeVOk5lATk=";
|
||||||
|
};
|
||||||
|
gpu = {
|
||||||
|
cp39 = "sha256-XHREY27jc+BrVyCJgpMvPVOFiKgPwuiNXPXO3biMLnc=";
|
||||||
|
cp310 = "sha256-oTEBa26o5g6ruuTBgUljjDqign5fXmCn0EnL/0mv+ao=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
x86_64-darwin = {
|
||||||
|
platform = "macosx_10_9_x86_64";
|
||||||
|
cpu = {
|
||||||
|
cp39 = "sha256-5g9b2gC6uosMpoJiobpj8yToIS6ifAFRvLEqnc/o/QQ=";
|
||||||
|
cp310 = "sha256-2c1hjwNCOOOx9tVfBk+Pyk/pF0m/2tAmRsBH91834eM=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
aarch64-darwin = {
|
||||||
|
platform = "macosx_11_0_arm64";
|
||||||
|
cpu = {
|
||||||
|
cp39 = "sha256-JhYNTOx1UkuNf/63lHXBDry6FQjPnbIB8jU5jKcyX2k=";
|
||||||
|
cp310 = "sha256-4ltYEYm2OzPBc6D2bQt2dEh6Sz+5m1mMKGGYgQGLSAY=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
97
pkgs/development/python-modules/paddlepaddle/default.nix
Normal file
97
pkgs/development/python-modules/paddlepaddle/default.nix
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
{ stdenv
|
||||||
|
, config
|
||||||
|
, lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, python
|
||||||
|
, pythonOlder
|
||||||
|
, pythonAtLeast
|
||||||
|
, openssl_1_1
|
||||||
|
, zlib
|
||||||
|
, setuptools
|
||||||
|
, cudaSupport ? config.cudaSupport or false
|
||||||
|
, cudaPackages_11 ? {}
|
||||||
|
, addOpenGLRunpath
|
||||||
|
# runtime dependencies
|
||||||
|
, httpx
|
||||||
|
, numpy
|
||||||
|
, protobuf
|
||||||
|
, pillow
|
||||||
|
, decorator
|
||||||
|
, astor
|
||||||
|
, paddle-bfloat
|
||||||
|
, opt-einsum
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
pname = "paddlepaddle" + lib.optionalString cudaSupport "-gpu";
|
||||||
|
version = "2.5.0";
|
||||||
|
format = "wheel";
|
||||||
|
pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}";
|
||||||
|
allHashAndPlatform = import ./binary-hashes.nix;
|
||||||
|
hash = allHashAndPlatform."${stdenv.system}"."${if cudaSupport then "gpu" else "cpu"}"."${pyShortVersion}";
|
||||||
|
platform = allHashAndPlatform."${stdenv.system}".platform;
|
||||||
|
src = fetchPypi ({
|
||||||
|
inherit version format hash platform;
|
||||||
|
pname = builtins.replaceStrings [ "-" ] [ "_" ] pname;
|
||||||
|
dist = pyShortVersion;
|
||||||
|
python = pyShortVersion;
|
||||||
|
abi = pyShortVersion;
|
||||||
|
});
|
||||||
|
in
|
||||||
|
buildPythonPackage {
|
||||||
|
inherit pname version format src;
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.9" || pythonAtLeast "3.11";
|
||||||
|
|
||||||
|
libraryPath = lib.makeLibraryPath (
|
||||||
|
# TODO: remove openssl_1_1 and zlib, maybe by building paddlepaddle from
|
||||||
|
# source as suggested in the following comment:
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/243583#issuecomment-1641450848
|
||||||
|
[ openssl_1_1 zlib ] ++ lib.optionals cudaSupport (with cudaPackages_11; [
|
||||||
|
cudatoolkit.lib
|
||||||
|
cudatoolkit.out
|
||||||
|
cudnn
|
||||||
|
])
|
||||||
|
);
|
||||||
|
|
||||||
|
postFixup = lib.optionalString stdenv.isLinux ''
|
||||||
|
function fixRunPath {
|
||||||
|
p=$(patchelf --print-rpath $1)
|
||||||
|
patchelf --set-rpath "$p:$libraryPath" $1
|
||||||
|
${lib.optionalString cudaSupport ''
|
||||||
|
addOpenGLRunpath $1
|
||||||
|
''}
|
||||||
|
}
|
||||||
|
fixRunPath $out/${python.sitePackages}/paddle/fluid/libpaddle.so
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
addOpenGLRunpath
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
setuptools
|
||||||
|
httpx
|
||||||
|
numpy
|
||||||
|
protobuf
|
||||||
|
pillow
|
||||||
|
decorator
|
||||||
|
astor
|
||||||
|
paddle-bfloat
|
||||||
|
opt-einsum
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "paddle" ];
|
||||||
|
|
||||||
|
# no tests
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "PArallel Distributed Deep LEarning: Machine Learning Framework from Industrial Practice (『飞桨』核心框架,深度学习&机器学习高性能单机、分布式训练和跨平台部署";
|
||||||
|
homepage = "https://github.com/PaddlePaddle/Paddle";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ happysalada ];
|
||||||
|
platforms = [ "x86_64-linux" ] ++ optionals (!cudaSupport) [ "x86_64-darwin" "aarch64-darwin" ];
|
||||||
|
};
|
||||||
|
}
|
29
pkgs/development/tools/carto/default.nix
Normal file
29
pkgs/development/tools/carto/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{ lib
|
||||||
|
, buildNpmPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildNpmPackage rec {
|
||||||
|
pname = "carto";
|
||||||
|
version = "1.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mapbox";
|
||||||
|
repo = "carto";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-TylMgb2EI52uFmVeMJiQltgNCSh6MutFwUjsYC7gfEA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
npmDepsHash = "sha256-8M9hze71bQWhyxcXeI/EOr0SQ+tx8Lb9LfvnGxYYo0A=";
|
||||||
|
|
||||||
|
dontNpmBuild = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
changelog = "https://github.com/mapbox/carto/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
description = "Mapnik stylesheet compiler";
|
||||||
|
homepage = "https://github.com/mapbox/carto";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
mainProgram = "carto";
|
||||||
|
maintainers = with lib.maintainers; [ Luflosi ];
|
||||||
|
};
|
||||||
|
}
|
29
pkgs/development/tools/clean-css-cli/default.nix
Normal file
29
pkgs/development/tools/clean-css-cli/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{ lib
|
||||||
|
, buildNpmPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildNpmPackage rec {
|
||||||
|
pname = "clean-css-cli";
|
||||||
|
version = "5.6.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "clean-css";
|
||||||
|
repo = "clean-css-cli";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-ONWJn6mehXeNwRVEEM+Ad/heXwNWC9E9yA5eUQsi98A=";
|
||||||
|
};
|
||||||
|
|
||||||
|
npmDepsHash = "sha256-eVd6YSTHhp6qzGYn5PlikUgjNS+GJoRwfm6KPrEJKGE=";
|
||||||
|
|
||||||
|
dontNpmBuild = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
changelog = "https://github.com/clean-css/clean-css-cli/blob/${src.rev}/History.md";
|
||||||
|
description = "Command-line interface to the clean-css CSS optimization library";
|
||||||
|
homepage = "https://github.com/clean-css/clean-css-cli";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
mainProgram = "cleancss";
|
||||||
|
maintainers = with lib.maintainers; [ ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -3267,7 +3267,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typst-lsp"
|
name = "typst-lsp"
|
||||||
version = "0.9.3"
|
version = "0.9.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-compression",
|
"async-compression",
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "typst-lsp";
|
pname = "typst-lsp";
|
||||||
version = "0.9.3";
|
version = "0.9.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvarner";
|
owner = "nvarner";
|
||||||
repo = "typst-lsp";
|
repo = "typst-lsp";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-maLiwM3ruCAf5qTv5Kky60eCdlpAp6JVKK6/E6vLVEw=";
|
hash = "sha256-qbmNZFXg+XaDkHdBA3dU0ICKovEQrl7AAcMkElMLbMA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
|
|
610
pkgs/development/tools/misc/patsh/Cargo.lock
generated
610
pkgs/development/tools/misc/patsh/Cargo.lock
generated
|
@ -1,610 +0,0 @@
|
||||||
# This file is automatically @generated by Cargo.
|
|
||||||
# It is not intended for manual editing.
|
|
||||||
version = 3
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "aho-corasick"
|
|
||||||
version = "0.7.20"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "anyhow"
|
|
||||||
version = "1.0.66"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "assert_cmd"
|
|
||||||
version = "2.0.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fa3d466004a8b4cb1bc34044240a2fd29d17607e2e3bd613eb44fd48e8100da3"
|
|
||||||
dependencies = [
|
|
||||||
"bstr",
|
|
||||||
"doc-comment",
|
|
||||||
"predicates",
|
|
||||||
"predicates-core",
|
|
||||||
"predicates-tree",
|
|
||||||
"wait-timeout",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bitflags"
|
|
||||||
version = "1.3.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bstr"
|
|
||||||
version = "1.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
"once_cell",
|
|
||||||
"regex-automata",
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cc"
|
|
||||||
version = "1.0.77"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cfg-if"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap"
|
|
||||||
version = "4.0.29"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"clap_derive",
|
|
||||||
"clap_lex",
|
|
||||||
"is-terminal",
|
|
||||||
"once_cell",
|
|
||||||
"strsim",
|
|
||||||
"termcolor",
|
|
||||||
"terminal_size",
|
|
||||||
"unicase",
|
|
||||||
"unicode-width",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap_derive"
|
|
||||||
version = "4.0.21"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
|
|
||||||
dependencies = [
|
|
||||||
"heck",
|
|
||||||
"proc-macro-error",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap_lex"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
|
|
||||||
dependencies = [
|
|
||||||
"os_str_bytes",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "difflib"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dissimilar"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "doc-comment"
|
|
||||||
version = "0.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "either"
|
|
||||||
version = "1.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "errno"
|
|
||||||
version = "0.2.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
|
|
||||||
dependencies = [
|
|
||||||
"errno-dragonfly",
|
|
||||||
"libc",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "errno-dragonfly"
|
|
||||||
version = "0.1.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "expect-test"
|
|
||||||
version = "1.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1d4661aca38d826eb7c72fe128e4238220616de4c0cc00db7bfc38e2e1364dd3"
|
|
||||||
dependencies = [
|
|
||||||
"dissimilar",
|
|
||||||
"once_cell",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fastrand"
|
|
||||||
version = "1.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
|
|
||||||
dependencies = [
|
|
||||||
"instant",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "heck"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hermit-abi"
|
|
||||||
version = "0.2.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "instant"
|
|
||||||
version = "0.1.12"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "io-lifetimes"
|
|
||||||
version = "1.0.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "is-terminal"
|
|
||||||
version = "0.4.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
|
|
||||||
dependencies = [
|
|
||||||
"hermit-abi",
|
|
||||||
"io-lifetimes",
|
|
||||||
"rustix",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "is_executable"
|
|
||||||
version = "1.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
|
|
||||||
dependencies = [
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "itertools"
|
|
||||||
version = "0.10.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
|
|
||||||
dependencies = [
|
|
||||||
"either",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libc"
|
|
||||||
version = "0.2.138"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "linux-raw-sys"
|
|
||||||
version = "0.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "memchr"
|
|
||||||
version = "2.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "once_cell"
|
|
||||||
version = "1.16.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "os_str_bytes"
|
|
||||||
version = "6.4.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "patsh"
|
|
||||||
version = "0.2.0"
|
|
||||||
dependencies = [
|
|
||||||
"anyhow",
|
|
||||||
"assert_cmd",
|
|
||||||
"clap",
|
|
||||||
"expect-test",
|
|
||||||
"is_executable",
|
|
||||||
"shell-escape",
|
|
||||||
"tempfile",
|
|
||||||
"tree-sitter",
|
|
||||||
"tree-sitter-bash",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "predicates"
|
|
||||||
version = "2.1.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f54fc5dc63ed3bbf19494623db4f3af16842c0d975818e469022d09e53f0aa05"
|
|
||||||
dependencies = [
|
|
||||||
"difflib",
|
|
||||||
"itertools",
|
|
||||||
"predicates-core",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "predicates-core"
|
|
||||||
version = "1.0.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "predicates-tree"
|
|
||||||
version = "1.0.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
|
|
||||||
dependencies = [
|
|
||||||
"predicates-core",
|
|
||||||
"termtree",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro-error"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro-error-attr",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
"version_check",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro-error-attr"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"version_check",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro2"
|
|
||||||
version = "1.0.47"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
|
|
||||||
dependencies = [
|
|
||||||
"unicode-ident",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "quote"
|
|
||||||
version = "1.0.21"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "redox_syscall"
|
|
||||||
version = "0.2.16"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex"
|
|
||||||
version = "1.7.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
|
|
||||||
dependencies = [
|
|
||||||
"aho-corasick",
|
|
||||||
"memchr",
|
|
||||||
"regex-syntax",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-automata"
|
|
||||||
version = "0.1.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-syntax"
|
|
||||||
version = "0.6.28"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "remove_dir_all"
|
|
||||||
version = "0.5.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
|
||||||
dependencies = [
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rustix"
|
|
||||||
version = "0.36.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"errno",
|
|
||||||
"io-lifetimes",
|
|
||||||
"libc",
|
|
||||||
"linux-raw-sys",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde"
|
|
||||||
version = "1.0.148"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "shell-escape"
|
|
||||||
version = "0.1.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "strsim"
|
|
||||||
version = "0.10.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "syn"
|
|
||||||
version = "1.0.105"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"unicode-ident",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tempfile"
|
|
||||||
version = "3.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"fastrand",
|
|
||||||
"libc",
|
|
||||||
"redox_syscall",
|
|
||||||
"remove_dir_all",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "termcolor"
|
|
||||||
version = "1.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
|
|
||||||
dependencies = [
|
|
||||||
"winapi-util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "terminal_size"
|
|
||||||
version = "0.2.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
|
|
||||||
dependencies = [
|
|
||||||
"rustix",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "termtree"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tree-sitter"
|
|
||||||
version = "0.20.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d4423c784fe11398ca91e505cdc71356b07b1a924fc8735cfab5333afe3e18bc"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"regex",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tree-sitter-bash"
|
|
||||||
version = "0.19.0"
|
|
||||||
source = "git+https://github.com/tree-sitter/tree-sitter-bash#4488aa41406547e478636a4fcfd24f5bbc3f2f74"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"tree-sitter",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicase"
|
|
||||||
version = "2.6.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
|
|
||||||
dependencies = [
|
|
||||||
"version_check",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-ident"
|
|
||||||
version = "1.0.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-width"
|
|
||||||
version = "0.1.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "version_check"
|
|
||||||
version = "0.9.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wait-timeout"
|
|
||||||
version = "0.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi"
|
|
||||||
version = "0.3.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
|
||||||
dependencies = [
|
|
||||||
"winapi-i686-pc-windows-gnu",
|
|
||||||
"winapi-x86_64-pc-windows-gnu",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-i686-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-util"
|
|
||||||
version = "0.1.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
|
||||||
dependencies = [
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-x86_64-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows-sys"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
|
|
||||||
dependencies = [
|
|
||||||
"windows_aarch64_gnullvm",
|
|
||||||
"windows_aarch64_msvc",
|
|
||||||
"windows_i686_gnu",
|
|
||||||
"windows_i686_msvc",
|
|
||||||
"windows_x86_64_gnu",
|
|
||||||
"windows_x86_64_gnullvm",
|
|
||||||
"windows_x86_64_msvc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_aarch64_gnullvm"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_aarch64_msvc"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_gnu"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_msvc"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_gnu"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_gnullvm"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_msvc"
|
|
||||||
version = "0.42.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
|
|
|
@ -18,21 +18,16 @@ in
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "patsh";
|
pname = "patsh";
|
||||||
version = "0.2.0";
|
version = "0.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
repo = pname;
|
repo = "patsh";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-7HXJspebluQeejKYmVA7sy/F3dtU1gc4eAbKiPexMMA=";
|
sha256 = "sha256-d2Br4RAlKO7Bpse8sFbIDCIYd2fYvby0ar9oIbQS2jc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
cargoHash = "sha256-hAWMm3YjwTB8ajn3QeXEOJYmPzbbitdwyO4k/IyhlOI=";
|
||||||
lockFile = ./Cargo.lock;
|
|
||||||
outputHashes = {
|
|
||||||
"tree-sitter-bash-0.19.0" = "sha256-gTsA874qpCI/N5tmBI5eT8KDaM25gXM4VbcCbUU2EeI=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeCheckInputs = [ custom ];
|
nativeCheckInputs = [ custom ];
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "syft";
|
pname = "syft";
|
||||||
version = "0.86.1";
|
version = "0.87.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "anchore";
|
owner = "anchore";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-9NrUNaBRrewoep4eUm94gw/ndI/Qhh3P848NB2IH2qM=";
|
hash = "sha256-qDeUo/xAGCy/Ih5B8AyiJ7q9aCd5iWNkW7T+0OqAfTY=";
|
||||||
# populate values that require us to use git. By doing this in postFetch we
|
# populate values that require us to use git. By doing this in postFetch we
|
||||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
||||||
};
|
};
|
||||||
# hash mismatch with darwin
|
# hash mismatch with darwin
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
vendorHash = "sha256-tHP6BBeKWJpynnGp2EP3tKGWiv/JIdi6xvTrg6IivWg=";
|
vendorHash = "sha256-7lrim4N3hT2qkpTIVF1A/GUu5BfJ3Z8A6H1nd8yHwaw=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
@ -75,6 +75,6 @@ buildGoModule rec {
|
||||||
vulnerability detection when used with a scanner tool like Grype.
|
vulnerability detection when used with a scanner tool like Grype.
|
||||||
'';
|
'';
|
||||||
license = with licenses; [ asl20 ];
|
license = with licenses; [ asl20 ];
|
||||||
maintainers = with maintainers; [ jk developer-guy ];
|
maintainers = with maintainers; [ jk developer-guy kashw2 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,17 +7,18 @@
|
||||||
, pcre2
|
, pcre2
|
||||||
, xz
|
, xz
|
||||||
, zlib
|
, zlib
|
||||||
|
, zstd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "ugrep";
|
pname = "ugrep";
|
||||||
version = "3.12.6";
|
version = "4.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Genivia";
|
owner = "Genivia";
|
||||||
repo = "ugrep";
|
repo = "ugrep";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-bf/MWJKqHuwqVyCtI8rBiYyEFvBpHq89YXtatQEqDHo=";
|
hash = "sha256-kRpHJl/ouYgvwFMk6uO4XobyT2kTCH9kLfeF70IqMuc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -27,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
pcre2
|
pcre2
|
||||||
xz
|
xz
|
||||||
zlib
|
zlib
|
||||||
|
zstd
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -18771,6 +18771,8 @@ with pkgs;
|
||||||
|
|
||||||
cadre = callPackage ../development/tools/cadre { };
|
cadre = callPackage ../development/tools/cadre { };
|
||||||
|
|
||||||
|
carto = callPackage ../development/tools/carto { };
|
||||||
|
|
||||||
catnip = callPackage ../tools/audio/catnip { };
|
catnip = callPackage ../tools/audio/catnip { };
|
||||||
|
|
||||||
catnip-gtk4 = callPackage ../tools/audio/catnip-gtk4 { };
|
catnip-gtk4 = callPackage ../tools/audio/catnip-gtk4 { };
|
||||||
|
@ -18849,6 +18851,8 @@ with pkgs;
|
||||||
|
|
||||||
cl-launch = callPackage ../development/tools/misc/cl-launch { };
|
cl-launch = callPackage ../development/tools/misc/cl-launch { };
|
||||||
|
|
||||||
|
clean-css-cli = callPackage ../development/tools/clean-css-cli { };
|
||||||
|
|
||||||
cloud-nuke = callPackage ../development/tools/cloud-nuke { };
|
cloud-nuke = callPackage ../development/tools/cloud-nuke { };
|
||||||
|
|
||||||
cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
|
cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
|
||||||
|
|
|
@ -1187,6 +1187,8 @@ self: super: with self; {
|
||||||
|
|
||||||
paddle2onnx = callPackage ../development/python-modules/paddle2onnx { };
|
paddle2onnx = callPackage ../development/python-modules/paddle2onnx { };
|
||||||
|
|
||||||
|
paddlepaddle = callPackage ../development/python-modules/paddlepaddle { };
|
||||||
|
|
||||||
pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; };
|
pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; };
|
||||||
|
|
||||||
pulumi-aws = callPackage ../development/python-modules/pulumi-aws { };
|
pulumi-aws = callPackage ../development/python-modules/pulumi-aws { };
|
||||||
|
|
Loading…
Reference in a new issue