Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-04-10 06:01:13 +00:00 committed by GitHub
commit 39f71c03bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
70 changed files with 316 additions and 314 deletions

View file

@ -40,17 +40,24 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under
## Custom packages {#sec-language-texlive-custom-packages}
You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.
You may find that you need to use an external TeX package. A derivation for such package has to provide contents of the "texmf" directory in its output and provide the `tlType` attribute. Here is a (very verbose) example:
Such derivation must then be listed in the attribute `pkgs` of an attribute set passed to `texlive.combine`, for instance by passing `extraPkgs = { pkgs = [ custom_package ]; };`. Within Nixpkgs, `pkgs` should be part of the derivation itself, allowing users to call `texlive.combine { inherit (texlive) scheme-small; inherit some_tex_package; }`.
Here is a (very verbose) example where the attribute `pkgs` is attached to the derivation itself, which requires creating a fixed point. See also the packages `auctex`, `eukleides`, `mftrace` for more examples.
```nix
with import <nixpkgs> {};
let
foiltex_run = stdenvNoCC.mkDerivation {
foiltex = stdenvNoCC.mkDerivation (finalAttrs: {
pname = "latex-foiltex";
version = "2.1.4b";
passthru.tlType = "run";
passthru = {
pkgs = [ finalAttrs.finalPackage ];
tlDeps = with texlive; [ latex ];
tlType = "run";
};
srcs = [
(fetchurl {
@ -102,8 +109,7 @@ let
maintainers = with maintainers; [ veprbl ];
platforms = platforms.all;
};
};
foiltex = { pkgs = [ foiltex_run ]; };
});
latex_with_foiltex = texlive.combine {
inherit (texlive) scheme-small;

View file

@ -69,50 +69,21 @@ in
package = mkOption {
type = types.package;
internal = true;
default = cfg.mesaPackage;
description = lib.mdDoc ''
The package that provides the OpenGL implementation.
The default is Mesa's drivers which should cover all OpenGL-capable
hardware. If you want to use another Mesa version, adjust
{option}`mesaPackage`.
'';
};
package32 = mkOption {
type = types.package;
internal = true;
default = cfg.mesaPackage32;
description = lib.mdDoc ''
Same as {option}`package` but for the 32-bit OpenGL implementation on
64-bit systems. Used when {option}`driSupport32Bit` is set.
The package that provides the 32-bit OpenGL implementation on
64-bit systems. Used when {option}`driSupport32Bit` is
set.
'';
};
mesaPackage = mkOption {
type = types.package;
default = pkgs.mesa;
defaultText = literalExpression "pkgs.mesa";
example = literalExpression "pkgs.mesa_22";
description = lib.mdDoc ''
The Mesa driver package used for rendering support on the system.
You should only need to adjust this if you require a newer Mesa
version for your hardware or because you need to patch a bug.
'';
apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");
};
mesaPackage32 = mkOption {
type = types.package;
default = pkgs.pkgsi686Linux.mesa;
defaultText = literalExpression "pkgs.pkgsi686Linux.mesa";
example = literalExpression "pkgs.pkgsi686Linux.mesa_22";
description = lib.mdDoc ''
Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit
systems. Used when {option}`driSupport32Bit` is set.
'';
apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");
};
extraPackages = mkOption {
type = types.listOf types.package;
default = [];
@ -126,6 +97,7 @@ in
:::
'';
};
extraPackages32 = mkOption {
type = types.listOf types.package;
default = [];
@ -181,6 +153,9 @@ in
environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath
([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib");
hardware.opengl.package = mkDefault pkgs.mesa.drivers;
hardware.opengl.package32 = mkDefault pkgs.pkgsi686Linux.mesa.drivers;
boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
};
}

View file

@ -23,14 +23,13 @@
, poppler
, auto-multiple-choice
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: rec {
pname = "auto-multiple-choice";
version = "1.5.2";
src = fetchurl {
url = "https://download.auto-multiple-choice.net/${pname}_${version}_precomp.tar.gz";
sha256 = "sha256-AjonJOooSe53Fww3QU6Dft95ojNqWrTuPul3nkIbctM=";
};
tlType = "run";
# There's only the Makefile
dontConfigure = true;
@ -137,6 +136,11 @@ stdenv.mkDerivation rec {
XMLWriter
]);
passthru = {
tlType = "run";
pkgs = [ finalAttrs.finalPackage ];
};
meta = with lib; {
description = "Create and manage multiple choice questionnaires with automated marking.";
longDescription = ''
@ -156,10 +160,7 @@ stdenv.mkDerivation rec {
auto-multiple-choice
(texlive.combine {
inherit (pkgs.texlive) scheme-full;
extra =
{
pkgs = [ auto-multiple-choice ];
};
inherit auto-multiple-choice;
})
];
</screen>
@ -172,4 +173,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.thblt ];
platforms = platforms.all;
};
}
})

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "multus-cni";
version = "3.9.2";
version = "3.9.3";
src = fetchFromGitHub {
owner = "k8snetworkplumbingwg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AYSUJEoNYt4DYNcPynRBal5c5QAzRVltkjwoEM66VcY=";
sha256 = "sha256-43cFBrFM2jvD/SJ+QT1JQkr593jkdzAAvYlVUAQArEw=";
};
ldflags = [
@ -21,7 +21,7 @@ buildGoModule rec {
mv $GOPATH/bin/cmd $GOPATH/bin/multus
'';
vendorSha256 = null;
vendorHash = null;
# Some of the tests require accessing a k8s cluster
doCheck = false;

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "sngrep";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "irontec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dXCOuae/T38Ltq4uywPJW5TGMyXwaECUj3/Zq4sDflU=";
sha256 = "sha256-gFba2wOU4GwpOZTo5A2QpBgnC6OgDJEeyaPGHbA+7tA=";
};
nativeBuildInputs = [

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo4, getopt, readline, texlive }:
lib.fix (eukleides: stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: rec {
pname = "eukleides";
version = "1.5.4";
@ -49,10 +49,12 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
outputs = [ "out" "doc" "tex" ];
passthru.tlType = "run";
passthru.pkgs = [ eukleides.tex ]
passthru = {
tlType = "run";
# packages needed by euktoeps, euktopdf and eukleides.sty
++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs);
tlDeps = with texlive; [ collection-pstricks epstopdf iftex moreverb ];
pkgs = [ finalAttrs.finalPackage.tex ];
};
meta = {
description = "Geometry Drawing Language";

View file

@ -269,8 +269,8 @@ rec {
};
crystal_1_7 = generic {
version = "1.7.2";
sha256 = "sha256-Bwd9Gmtwa/0oLhps3fc8GqBlB4o31LCR1Sf98Pz4i90=";
version = "1.7.3";
sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE=";
binary = binaryCrystal_1_2;
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
version = "1.8.10";
version = "1.8.20";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
hash = "sha256-TD+nvBu57zBYojGdi8w7cZYHn4jpL9zY0wSkb0trV4c=";
sha256 = "1r0ann14rjr3f1idwhkfk5s1gr6b6wnkawjmg96gvsp2qv1p9pqh";
};
propagatedBuildInputs = [ jre ] ;

View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "kotlin-native";
version = "1.8.10";
version = "1.8.20";
src = let
getArch = {
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
getHash = arch: {
"macos-aarch64" = "119ar6wax0bkp5fmardplhsvaw1jhpfr5xgkpkkv10nmx4agbkh8";
"macos-x86_64" = "1nqqzx397k1ifpdymaw39iz5mzpyi7n00kpw03y5iq5avzr7rsjj";
"linux-x86_64" = "0hlpda33y07d8dybjn65gzdl0ws0r8vda515pr2rhfisls18lp2c";
"macos-aarch64" = "1lin4yd4wy56m4spkkd0glicphkwfr0gzvs66prm925fcx1hzk5y";
"macos-x86_64" = "0ma0d0kvpbqw8cx8ixmnhk96y5xz6ljy6phbzsl8cbmfp0g817p3";
"linux-x86_64" = "0f24ag9azzjgar3qg1fjh9q5haigj4k0yjpqxfrvjqj8khag5ls3";
}.${arch};
in
fetchurl {
@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out
rm bin/kotlinc
mv * $out
runHook postInstall

View file

@ -17,11 +17,11 @@ let
in
stdenv.mkDerivation rec {
pname = "mongoc";
version = "1.23.2";
version = "1.23.3";
src = fetchzip {
url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf";
sha256 = "sha256-wxcBnJENL3hMzf7GKLucjw7K08tK35+0sMNWZb2mWIo=";
};
# https://github.com/NixOS/nixpkgs/issues/25585

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.29.0";
version = "3.30.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Dk13N2SeCGBjjwXCffLGVM0iOL6fGptRcmNidbxnzQc=";
hash = "sha256-GwQtIivEho0/nuDABMdAlOQLc2zstGQ/9xJCeHMQX60=";
};
propagatedBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "lmdb";
version = "1.4.0";
version = "1.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OfbE7hRdKNFwJdNQcgq7b5XbgWUU6GjbV0RP3vUcu0c=";
hash = "sha256-H0x2ryTpB1k0h8kE7166GZO+s47Tha+CrbJahY8tZY0=";
};
buildInputs = [

View file

@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "quart";
version = "0.18.3";
version = "0.18.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "pallets";
repo = "quart";
rev = "refs/tags/${version}";
hash = "sha256-aQM8kEhienBG+/zQQ8C/DKiDIMF3l9rq8HSAvg7wvLM=";
hash = "sha256-iT/pePUtH1hwNIOG8Y/YbqCVseNXVOKC0nrXfB2RTlQ=";
};
nativeBuildInputs = [

View file

@ -1,26 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "go-bindata";
version = "3.24.0";
version = "4.0.2";
src = fetchFromGitHub {
owner = "kevinburke";
repo = pname;
rev = "v${version}";
hash = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss=";
hash = "sha256-3/1RqJrv1fsPKsZpurp2dHsMg8FJBcFlI/pwwCf5H6E=";
};
vendorHash = null;
patches = [
# Add go modules support
(fetchpatch {
url = "https://github.com/kevinburke/go-bindata/commit/b5c6f880d411b9c24a8ae1c8b608ab80cb9aacb4.patch";
hash = "sha256-dzzp5p+jdg09oo6jeSlms+MMMDWUXpsescj132MT6D8=";
})
];
subPackages = [ "go-bindata" ];
ldflags = [ "-s" "-w" ];

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }:
lib.fix (noweb: stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: rec {
pname = "noweb";
version = "2.12";
@ -70,8 +70,10 @@ lib.fix (noweb: stdenv.mkDerivation rec {
outputs = [ "out" "tex" ];
tlType = "run";
passthru.pkgs = [ noweb.tex ];
passthru = {
tlType = "run";
pkgs = [ finalAttrs.finalPackage.tex ];
};
meta = with lib; {
description = "A simple, extensible literate-programming tool";

View file

@ -79,6 +79,7 @@
tree-sitter-scheme = lib.importJSON ./tree-sitter-scheme.json;
tree-sitter-scss = lib.importJSON ./tree-sitter-scss.json;
tree-sitter-smithy = lib.importJSON ./tree-sitter-smithy.json;
tree-sitter-solidity = lib.importJSON ./tree-sitter-solidity.json;
tree-sitter-sparql = lib.importJSON ./tree-sitter-sparql.json;
tree-sitter-sql = lib.importJSON ./tree-sitter-sql.json;
tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/polarmutex/tree-sitter-beancount",
"rev": "b807e0c5255221f5e4baa08b3325d08e2ba56ba2",
"date": "2022-07-02T10:33:09-04:00",
"path": "/nix/store/9kqvj3rpqlqgxr5nkcc43pkcvs460h14-tree-sitter-beancount",
"sha256": "0vh2sz5qjsgkmqlcw0kyq01wj5mxwymhyg9w8hfyd7kd779lfa86",
"rev": "6d580bc408741ce2ba1a566c972e9ff414c65456",
"date": "2023-01-27T21:26:56-05:00",
"path": "/nix/store/8sfwfmc20bs3vmfns5qb82jf63h625hb-tree-sitter-beancount",
"sha256": "0q4f1qqd8m7x4qxj4bpwgk8fxksh60n1m4payvhd0y0xrrhb06v8",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
"rev": "7175a6dd5fc1cee660dce6fe23f6043d75af424a",
"date": "2022-08-01T15:02:51-07:00",
"path": "/nix/store/qhd6cw55bgmgjmi0fwd16q00yhfq612w-tree-sitter-c",
"sha256": "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v",
"rev": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2",
"date": "2023-02-22T10:24:35+01:00",
"path": "/nix/store/7q7p3iw8dsa5gwvbabnn26w81fkbp46a-tree-sitter-c",
"sha256": "0dhl0vz0x0s64n4nq2chnncq89j7xsbg0s73cavpjdq4ajiamdjc",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/sogaiu/tree-sitter-clojure",
"rev": "087bac78c53fe1387756cd5b8e68a69b3f6d7244",
"date": "2022-07-19T19:21:35+09:00",
"path": "/nix/store/n0kwbvimmzp36y789sb5jrbarjzlwmyf-tree-sitter-clojure",
"sha256": "018xrralv15d7r1v63knds7cyix77ssy4jr0qdjmbakdr00r4ara",
"rev": "421546c2547c74d1d9a0d8c296c412071d37e7ca",
"date": "2023-02-25T16:13:05+09:00",
"path": "/nix/store/y64fl2527y2d97yl89i62m66dv0n68lq-tree-sitter-clojure",
"sha256": "0da18c1kj8pyrzmkg8zv186qy36xyjnmrj8wj7bl4k7gk18xmw0r",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/uyha/tree-sitter-cmake",
"rev": "6e51463ef3052dd3b328322c22172eda093727ad",
"date": "2022-08-26T09:50:26+02:00",
"path": "/nix/store/h7v6r9x9d552gfl8s8dwf26azvdrmsc1-tree-sitter-cmake",
"sha256": "14l7l6cc9pdqinff9hjda7rakzfvwk0qcbv6djl0s9f21875l4nv",
"rev": "399605a02bcd5daa309ce63a6459c600dce3473f",
"date": "2023-02-05T17:55:52+01:00",
"path": "/nix/store/myib3gz6xjmp68mq0cc1gxmfkdh3hz2y-tree-sitter-cmake",
"sha256": "00zs5s2dvyqki7ghmhp5n9ssrjbsaklzvzg5rvh6fikxyk4wm77f",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
"rev": "5ead1e26c6ab71919db0f1880c46a278a93bc5ea",
"date": "2022-10-19T20:38:44-05:00",
"path": "/nix/store/0zigaml3k0fk0w9mzsjrhrp1968hd6r7-tree-sitter-cpp",
"sha256": "1572qhfw1jjkm1q6c110lnnj2n384a97fgn645c5q9ikciv8kac7",
"rev": "66262d3e76eb2046c76e6d661a6b72664bfb5819",
"date": "2023-02-22T10:24:05+01:00",
"path": "/nix/store/bairlzwv7gak6wfvk185q1jixncz4wj0-tree-sitter-cpp",
"sha256": "09myna6pa1pl0qzj6kfvs4h7jw0fm2mnfnx3lv8r90k6b1vf56ji",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/thehamsta/tree-sitter-cuda",
"rev": "7f1a79e612160aa02be87f1a24469ae3655fe818",
"date": "2022-10-19T23:28:33-07:00",
"path": "/nix/store/6sgr13lqfw9s9lzlq4m116kvazzkkbmk-tree-sitter-cuda",
"sha256": "1bcci9v61lcgiqq3jqf4gl0kbq89w2h5kjn70g8x2g4lmky6y6fc",
"rev": "9b1f7481a151686fce8af66da147f40388f8ee4d",
"date": "2023-02-22T17:21:33-08:00",
"path": "/nix/store/d5aqw99m6kgqf56a4sl2h5wcqdmljglh-tree-sitter-cuda",
"sha256": "19zn8aqfqg7y225hbb1ag50ma59adlw0l0gjbpjns0f0dbz3qr11",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
"rev": "91fc5ae1140d5c9d922312431f7d251a48d7b8ce",
"date": "2022-11-03T14:16:56-07:00",
"path": "/nix/store/6z47mgb533bf76l1x22bh64rck5phq8z-tree-sitter-embedded-template",
"sha256": "161bw6hhx4pgzdav5hah4is5w0rfhyid4q9gak0yp05ylk0040sq",
"rev": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205",
"date": "2023-02-06T19:11:08+01:00",
"path": "/nix/store/mch0z6q00g2pp5vjjcdcl2xzs1h96jzh-tree-sitter-embedded-template",
"sha256": "0gf33p08a6hqbxwy9zlp8y65gds2d6siqpgasc58ladh5p5n99j9",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/ram02z/tree-sitter-fish",
"rev": "84436cf24c2b3176bfbb220922a0fdbd0141e406",
"date": "2022-08-21T20:31:28+01:00",
"path": "/nix/store/mf86jwsgjr0jdsdp88haqlqhfnpwvsh9-tree-sitter-fish",
"sha256": "12s3db2mg9qa8l1i4a5h59kd7kl5j83wyl5kzq7j2k56xmvq56x0",
"rev": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9",
"date": "2023-02-12T14:42:20+00:00",
"path": "/nix/store/hg229jskwvgmfgi9awznvp9cj5riacay-tree-sitter-fish",
"sha256": "1yxvibmmpkwswwrg1mzvcnfj6y0rpccrwyg27k4wpr2630ma9xcw",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/stadelmanma/tree-sitter-fortran",
"rev": "f0f2f100952a353e64e26b0fa710b4c296d7af13",
"date": "2021-09-02T21:24:27-04:00",
"path": "/nix/store/5abj5miyzb7dvyq4zw0j1mxgdxqyj2yx-tree-sitter-fortran",
"sha256": "17iiz38s7adkzv9rw97nn5nd9kvn1vyccm7r6ywipaa5aim0nm6a",
"rev": "31552ac43ecaffa443a12ebea68cc526d334892f",
"date": "2023-02-26T07:44:33-05:00",
"path": "/nix/store/5ihp07ibidlf9q5chyj3m483x9823048-tree-sitter-fortran",
"sha256": "08x2smw31ijd6c4dg7sf09nb466h827dyy8mv702p3h6aj31sb7b",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/prestonknopp/tree-sitter-gdscript",
"rev": "2a6abdaa47fcb91397e09a97c7433fd995ea46c6",
"date": "2021-12-20T23:14:36-08:00",
"path": "/nix/store/kzps55mk9caigy4s9smvsqwm1savaaq7-tree-sitter-gdscript",
"sha256": "0k7lgli5b9f6dlsafl29lrmzd221ayj50q1axjihm7w70miwyck0",
"rev": "fbbe22c7e3f8191f65df8cfb4cc8c6137eedb09a",
"date": "2023-02-08T15:20:29-08:00",
"path": "/nix/store/62skx6k41f6k95qf32b7yjd9m516z3lk-tree-sitter-gdscript",
"sha256": "0f4g5vnls2rkwnry47cvpmhsymf1s109sbzdf4x7h94k58f5ggw4",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/thehamsta/tree-sitter-glsl",
"rev": "a743ada24fa17da9acc5665133f07d56e03530be",
"date": "2022-09-04T21:41:54+02:00",
"path": "/nix/store/z4bzmqy26xqwi4lysjicllf2jrk6pvvm-tree-sitter-glsl",
"sha256": "04naalz59mczi0dlnjg49z5ygl0f9v1byr2kfclw6q6rhx9pcswp",
"rev": "e2c2214045de2628b81089b1a739962f59654558",
"date": "2022-11-24T01:46:06+01:00",
"path": "/nix/store/s203fvxw2v3gvbnf5qavms10f308ssl0-tree-sitter-glsl",
"sha256": "146v3ki2c2g8grlkz40iay6wi2crkxiy3i3jkcpv096ya9wf3dhs",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
"rev": "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611",
"date": "2022-10-20T09:01:48+02:00",
"path": "/nix/store/p44flk3wlp5n99jc550pkm8rzjqnvy84-tree-sitter-go",
"sha256": "1qymkdi4qcnj8ywmsanb6pdl9zd71cbm6kzl87zk241h7dhkkkvz",
"rev": "64457ea6b73ef5422ed1687178d4545c3e91334a",
"date": "2022-12-08T10:45:14+01:00",
"path": "/nix/store/4kdv3qc219w96wcciypw0znkv2izbpd2-tree-sitter-go",
"sha256": "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
"rev": "bee6b49543e34c2967c6294a4b05e8bd2bf2da59",
"date": "2022-09-30T18:11:21+02:00",
"path": "/nix/store/d6c30iv724f2kpcb969zskcxbh6fcrdz-tree-sitter-haskell",
"sha256": "069pyll6nvzakj5rhpd28md9dfzhcap2jwffqkwjyaavwcwar9gz",
"rev": "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3",
"date": "2023-02-09T02:03:40+01:00",
"path": "/nix/store/pv2ar6i072q3i1jy51s0wirarjqsk2ra-tree-sitter-haskell",
"sha256": "1hg19af1n510bndf5k5iri7dzb48xb527vispv1aapki4mvr98gx",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/MichaHoffmann/tree-sitter-hcl",
"rev": "4ff21306a71269c4ac814769b90b0ecf3194d21d",
"date": "2022-06-02T20:13:06+02:00",
"path": "/nix/store/jsn5dixjqqvwagcgwgjdr91igic2r42w-tree-sitter-hcl",
"sha256": "1gvpl6kw83ywwd64ssz5xs4idc8ip2jmiz2mfy9xlkjbl9nfngci",
"rev": "6b74f88b3d396e0f101c93f807e0b3667cd3e3a2",
"date": "2022-12-02T21:24:38+01:00",
"path": "/nix/store/nn324j92ywapf4smjhkjyljlf6f5f96q-tree-sitter-hcl",
"sha256": "1dm129c91qyg955mpxy408wa7cmxyvh5n79c8rlb3yhc77f4z2px",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/ntbbloodbath/tree-sitter-http",
"rev": "30a9c1789d64429a830802cde5b1760ff1064312",
"date": "2022-08-21T21:33:18-04:00",
"path": "/nix/store/0zk2zzhhx9vsp7h7gsb57db5sk20p3ji-tree-sitter-http",
"sha256": "0gd3dv8kr0rzhagxi729fwjzsnipyxln823a4qfqr7lzzvmb14jy",
"rev": "2c6c44574031263326cb1e51658bbc0c084326e7",
"date": "2023-01-06T03:29:38+01:00",
"path": "/nix/store/p6dxp8z5fyyjs9s0lky651dhmln7ciw0-tree-sitter-http",
"sha256": "15spzks4wpd1zvqkaq9irlr5xqk1n144lyxdkijkc9zvyvm6gka7",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/sogaiu/tree-sitter-janet-simple",
"rev": "e6c04e4b243cf3e5aca8f201e48926a72cc18334",
"date": "2022-03-29T10:00:03+09:00",
"path": "/nix/store/4ynwhc2s20xm093inlpyxgdb6pbc753m-tree-sitter-janet-simple",
"sha256": "1anbd0bx8vcg1rb6mr8hknnd5f9f6zr3h7kn98x8s7znyvlj4w6q",
"rev": "c796533cc82ae29d64f13b9a36e715bc02e28e72",
"date": "2023-02-25T21:44:49+09:00",
"path": "/nix/store/mqc5gh2zfm3vbc63i4pi1mi9xhqpr2ha-tree-sitter-janet-simple",
"sha256": "00mnkkmfygfrnx5cjhcll42j3xjy0blj9sisz94s7hkf6x21m9a0",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-java",
"rev": "ac14b4b1884102839455d32543ab6d53ae089ab7",
"date": "2022-05-30T15:48:08+02:00",
"path": "/nix/store/plcr9wxxfhsfgwb9xfj3xwns2sh53xsa-tree-sitter-java",
"sha256": "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341",
"rev": "09d650def6cdf7f479f4b78f595e9ef5b58ce31e",
"date": "2022-09-19T09:37:51+02:00",
"path": "/nix/store/478mfssm2335hdflgba22n4f0dir7xmr-tree-sitter-java",
"sha256": "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
"rev": "936d976a782e75395d9b1c8c7c7bf4ba6fe0d86b",
"date": "2022-08-18T14:29:19+02:00",
"path": "/nix/store/y3ndi84v9y3li5vnfyyp9xhb8hsgsipf-tree-sitter-javascript",
"sha256": "1g252s51amn9w0j6wi4jk6zic9rbw8hajqhcdycq9ma4sqpvb5dr",
"rev": "5720b249490b3c17245ba772f6be4a43edb4e3b7",
"date": "2023-02-24T13:50:01+01:00",
"path": "/nix/store/ddv5a3159sgib21v066wrfpb8lvlnb85-tree-sitter-javascript",
"sha256": "19bbxpg98bzbg7rh7y4kcfzg8lv7yp00pv1mqfyy913dfx4hnadd",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/sourcegraph/tree-sitter-jsonnet",
"rev": "0475a5017ad7dc84845d1d33187f2321abcb261d",
"date": "2022-05-27T01:23:53-04:00",
"path": "/nix/store/n4yijz5b0bky4zd8kvh632a5zlxc3rfv-tree-sitter-jsonnet",
"sha256": "1dh8wqi8mnsapzicrdjg6cj6skj9f2ia4ijg08pl45bcxc1lidzc",
"rev": "fdc775714afa27fdef823adbaba6ab98f5ae66f2",
"date": "2023-02-07T11:40:49-05:00",
"path": "/nix/store/7ls5cjd7jpd4pvwvac1yvzwj8lnwh9s0-tree-sitter-jsonnet",
"sha256": "0kyicx2zqf443fxyjby0i9c9fml210kxan2f2ylml2z2f83m4ni9",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-julia",
"rev": "628713553c42f30595a3b0085bb587e9359b986a",
"date": "2022-11-15T18:14:44-05:00",
"path": "/nix/store/4d712q8sjvbh845cd2b0xbvlng1iasaj-tree-sitter-julia",
"sha256": "12xlv4gbqdw0mr1zgnzs74pxpdkq4vfvs77gnr49zsrycjflf7xw",
"rev": "e2f449e2bcc95f1d07ceb62d67f986005f73a6be",
"date": "2023-02-03T12:13:41-05:00",
"path": "/nix/store/wlmmi1411yhfirxhpnwdrm18ksm8rkyh-tree-sitter-julia",
"sha256": "1gwfy5hx168bgcdpzhvb5vjqal4mg3zksw7r4cmzyy31gfyc8yb5",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/cbarrete/tree-sitter-ledger",
"rev": "47b8971448ce5e9abac865f450c1b14fb3b6eee9",
"date": "2022-07-09T09:40:08-04:00",
"path": "/nix/store/qzp0n5gcw7hakcv3ahxf1nrqrk8j2l3w-tree-sitter-ledger",
"sha256": "0j5fsgmmvc8z0ihsifc38qbvx8xdwd25bxq2a0k6kb8mbbmzk30f",
"rev": "f787ae635ca79589faa25477b94291a87e2d3e23",
"date": "2023-02-16T12:14:48+01:00",
"path": "/nix/store/rv2mrwcnjf0q1wxwjsggpkx4a1f5jmbl-tree-sitter-ledger",
"sha256": "1r3c5svcrh5bb0i3qn7d2rnppxvqndwnnry918rlb18nhvc3c9zm",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/MunifTanjim/tree-sitter-lua",
"rev": "fb30e8cb605e2ebd6c643e6981325a63fbbde320",
"date": "2022-10-31T13:56:07+06:00",
"path": "/nix/store/ifpy40hx70sg9syjr3d35ngrfkmmqi18-tree-sitter-lua",
"sha256": "1hhffz45ilni4g9idsbpp1aymdjkjnyd4491xbdmr47bglf9cgc1",
"rev": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd",
"date": "2022-12-16T15:23:55+06:00",
"path": "/nix/store/cm9ff3d8f48sqgjkrc38sqjg7lbpswz9-tree-sitter-lua",
"sha256": "07mj9jydnxmp2dr7ssj58qlwrjx3gp6jnri79wa2jxaaygblzcri",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/MDeiml/tree-sitter-markdown",
"rev": "272e080bca0efd19a06a7f4252d746417224959e",
"date": "2022-10-27T17:15:20+02:00",
"path": "/nix/store/n8n85lvdf3galrlr5ywjjkpsny6mvg7n-tree-sitter-markdown",
"sha256": "1q9s8ln6pag0362ckvzid8jpc2h14pd7kfr1qq4dpirzqq0y79l0",
"rev": "6138ee0c0d0ddafc4bf0e25728b73f902bbf2c98",
"date": "2023-02-28T15:28:45+01:00",
"path": "/nix/store/i184yz0i3afs1hbw10b3k9i58fxzdzcv-tree-sitter-markdown",
"sha256": "1rx6m2qj9a08qzzaxrkij68pcw7m1rl78qggg6k93caskjab461z",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/nickel-lang/tree-sitter-nickel",
"rev": "9d83db400b6c11260b9106f131f93ddda8131933",
"date": "2022-07-06T11:43:01+02:00",
"path": "/nix/store/i7arz4binnq34j1k0hwlpl4apd9b4j4x-tree-sitter-nickel",
"sha256": "0rm63fnxja59zzkm7gz4vbzics8mdf7d6ijazcy9394kdqrcdzi6",
"rev": "d6c7eeb751038f934b5b1aa7ff236376d0235c56",
"date": "2023-01-27T10:31:38+01:00",
"path": "/nix/store/nyv8hdasyh5hgs65r38saxdn2m26b70r-tree-sitter-nickel",
"sha256": "1qdhggiprs1z5nnans2a876znfga95az3nafl4qp7j0ngg0m3x0g",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/nvim-neorg/tree-sitter-norg",
"rev": "dfac5ad2740a79b18ae849590a924e7bad3f1b23",
"date": "2022-10-13T09:07:45+02:00",
"path": "/nix/store/9csv2xax6ris1wghj83gdf1sjvbh7jfq-tree-sitter-norg",
"sha256": "0jws376b7a2jqr0d32c20qh9v3d0wi8af95dprmfhi8pcvd5hzww",
"rev": "1a305093569632de50f9a316ff843dcda25b4ef5",
"date": "2023-02-12T20:47:35+01:00",
"path": "/nix/store/w7drx78c8w9claw3c6h7vlxdhyvfj8j6-tree-sitter-norg",
"sha256": "1wl6h5pin861msgmg5q3k0h62fl73svdwn0ppn4vp7a37s9p5xvm",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ocaml",
"rev": "cc26b1ef111100f26a137bcbcd39fd4e35be9a59",
"date": "2022-06-19T21:41:43+02:00",
"path": "/nix/store/m5z0cdxb8mg1ff64529p8sfj9afq50l5-tree-sitter-ocaml",
"sha256": "1qra2zihw09ff16gxfmpmdmyj0rilvnk1xc9y4wb01j2a4292fc1",
"rev": "de07323343946c32759933cb3b7c78e821098cad",
"date": "2022-12-14T19:50:15+01:00",
"path": "/nix/store/h6h50380i2gp7j00i525vgs9llv58jzs-tree-sitter-ocaml",
"sha256": "021vnbpzzb4cca3ncd4qhzy583vynhndn3qhwayxrpgdl61m44i6",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/ganezdragon/tree-sitter-perl",
"rev": "749d26fe13fb131b92e6515416096e572575b981",
"date": "2022-11-05T19:54:52+05:30",
"path": "/nix/store/b2w0s5livx7ysni6jlwwpmkd0f3wvqnh-tree-sitter-perl",
"sha256": "1ldl83nia3ij7ps5nx5fqzz5pzwzcmphajjhjf1vnrbm11zfzqjl",
"rev": "c43bae0090cfcfc62d9904312599ded1b645a66d",
"date": "2023-02-25T16:52:44+05:30",
"path": "/nix/store/k7mnrlm1b2cw17fr1qn2cnip3fhmgqyp-tree-sitter-perl",
"sha256": "16bpjnydl1qdiqy6j0ahi0ff9fdsxhmz1n0sni4amn57xky6sxiz",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
"rev": "ab2e72179ceb8bb0b249c8ac9162a148e911b3dc",
"date": "2022-09-24T09:03:15+02:00",
"path": "/nix/store/99jwdb92ng3xr6j881aja24dgwra4lvx-tree-sitter-php",
"sha256": "0gfjvpa5rfi1lgz30jhmdfr8f09vl34k3xjad8n8l2cv5q9203if",
"rev": "f860e598194f4a71747f91789bf536b393ad4a56",
"date": "2023-02-10T07:41:01+01:00",
"path": "/nix/store/dmiqjxsagqmqvsmw9hp4z4wbrp9nsb26-tree-sitter-php",
"sha256": "02yc5b3qps8ghsmy4b5m5kldyr5pnqz9yw663v13pnz92r84k14g",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/victorhqc/tree-sitter-prisma",
"rev": "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c",
"date": "2022-06-11T23:04:44+02:00",
"path": "/nix/store/qdkwinjdy495z59wvxhifk8caksndswj-tree-sitter-prisma",
"sha256": "1pw9mi6hhvww4i7gf7snl893b3hwnfwp18rhbcsf7z52cr78mmqi",
"rev": "eca2596a355b1a9952b4f80f8f9caed300a272b5",
"date": "2023-01-05T15:24:25+01:00",
"path": "/nix/store/hj6bbz4zdfwi7ps72zbbv0hg132g13gr-tree-sitter-prisma",
"sha256": "19zb3dkwp2kpyivygqxk8yph0jpl7hn9zzcry15mshn2n0rs9sih",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/zealot128/tree-sitter-pug",
"rev": "63e214905970e75f065688b1e8aa90823c3aacdc",
"date": "2022-05-05T14:29:30+02:00",
"path": "/nix/store/8nwqja3ff6cmy06sgxx6wzlbg7qx6x1r-tree-sitter-pug",
"sha256": "1r3zhz4adfpg2ihlbdfx4nb9svv6apnlahgfqqzmacj3bm8r3wmp",
"rev": "884e225b5ecca5d885ae627275f16ef648acd42e",
"date": "2023-02-05T22:06:33+01:00",
"path": "/nix/store/29x0z42g27xbd2ddj2n7yf5shr9f9iwl-tree-sitter-pug",
"sha256": "047kcjyf8y981ix22fmnd1qgsaqvxlvqgsxfkvrv1x9hgd5dbxx8",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
"rev": "b14614e2144b8f9ee54deed5a24f3c6f51f9ffa8",
"date": "2022-10-24T22:08:56+02:00",
"path": "/nix/store/n4jhzd32dykrfxzar6cymx1b8njmmsxs-tree-sitter-python",
"sha256": "086v2mrczj8gavl4w8w8m982pg94w8ph5vf5iaksi1pvgcmw8c71",
"rev": "62827156d01c74dc1538266344e788da74536b8a",
"date": "2023-02-28T17:23:11+01:00",
"path": "/nix/store/vnh5j5nb3crn0zfc71i35fig0blsilsl-tree-sitter-python",
"sha256": "038l9zdn821s2igwfiwxq2ajkc1d66iri4zj9afazbma7kh5fnw5",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/nvim-treesitter/tree-sitter-query",
"rev": "0695cd0760532de7b54f23c667d459b5d1332b44",
"date": "2022-10-14T22:40:48+02:00",
"path": "/nix/store/s8jkcp7vk5hpw9qxwkr4xq926na9sxa6-tree-sitter-query",
"sha256": "1m8dsni3wzs94yc7y6zydh4l6zgm35wy9r1lcmk17phvylx6y20g",
"rev": "0717de07078a20a8608c98ad5f26c208949d0e15",
"date": "2022-12-19T17:53:12+01:00",
"path": "/nix/store/gdf77qz6qmfikks2vjqh38wxsvn80r8w-tree-sitter-query",
"sha256": "19025zagdmimqixd25gh2rwn5hr9jfr7s08fvil3n5fqr9zshrbm",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
"rev": "0431a2c60828731f27491ee9fdefe25e250ce9c9",
"date": "2022-11-03T12:28:18-07:00",
"path": "/nix/store/w0c9d84wvp2d8zx15h7dc3v33n1njmfz-tree-sitter-rust",
"sha256": "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f",
"rev": "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a",
"date": "2023-02-22T10:25:29+01:00",
"path": "/nix/store/90qz5h5a0ikn665d9q1d7nj4wcyyc5km-tree-sitter-rust",
"sha256": "1accbzkp6h4c9z7sakqnrjajx08ja5w8p6j17bgnbc9vy50jhsl5",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
"rev": "140c96cf398693189d4e50f76d19ddfcd8a018f8",
"date": "2022-06-06T08:54:55+02:00",
"path": "/nix/store/a1pi2xyaq2jjllbkj44xhi5cp0vnlnm4-tree-sitter-scala",
"sha256": "1hfx696x5pfww6zsfv36wkmxld14f02krmx55fy5rgzlz1m3xgja",
"rev": "918f0fb948405181707a1772cab639f2d278d384",
"date": "2023-01-05T16:03:13-05:00",
"path": "/nix/store/38yd5q5d19fdry4icmq5fqz0kkmz3xi3-tree-sitter-scala",
"sha256": "0ffcx6lrpvg56wci0a4crk58as8hs8aljrqsim2kqbb171mc4wzy",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/6cdh/tree-sitter-scheme",
"rev": "bdcd2c8496701153506a9e3e1b76dfed852873ba",
"date": "2022-11-06T17:17:49+08:00",
"path": "/nix/store/l096qb2872kab34avgscn9bwizrzail5-tree-sitter-scheme",
"sha256": "12knvhmayck9da3zj2w55al4yjhkkr9gxmfdmrjiz7vn9wc1dxr9",
"rev": "67b90a365bebf4406af4e5a546d6336de787e135",
"date": "2023-01-16T14:32:14+08:00",
"path": "/nix/store/vsbfzbn9phgkn008633yjxr3d95zf4y1-tree-sitter-scheme",
"sha256": "1pvxckza1kdfwqs78ka3lbwldrwkgymb31f5x1fq5vyawg60wxk8",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -0,0 +1,11 @@
{
"url": "https://github.com/JoranHonig/tree-sitter-solidity",
"rev": "168020304759ad5d8b4a88a541a699134e3730c5",
"date": "2022-12-14T12:24:29+01:00",
"path": "/nix/store/37x7jqscpg36xncjy7i4zbvmx42dc1wh-tree-sitter-solidity",
"sha256": "1bg7q7l5jv5xrr7pfzg6i3bfgs6mrzzflh3rf4lqcd373xf8290q",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/derekstride/tree-sitter-sql",
"rev": "4f1b91246b43190e34957d9de9a0f3625879ba33",
"date": "2022-11-18T10:16:02-05:00",
"path": "/nix/store/l84kfw631akx7v4k6c0s4hdvaanjh8a1-tree-sitter-sql",
"sha256": "03wbxfkwk5i31knf1hgqkb56r66vk18k5n4919hhnhy9vvrm0mw3",
"rev": "d4b8be1e52b07b66e5ec62d2f1c0d701dfa85ed9",
"date": "2023-03-01T10:01:35-05:00",
"path": "/nix/store/sx2ycgc20fw4hqc5vkh2lynl4s947qsg-tree-sitter-sql",
"sha256": "04if27bdl03w2fqgyja6aq29hy7j5lb82r5jd5s75am5g1lwiicj",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/ambroisie/tree-sitter-tiger",
"rev": "eb1d3714998977ae76ca7c6a102b10ee37efc2b5",
"date": "2022-06-13T13:43:12+02:00",
"path": "/nix/store/97jbgip2nh59zrxyhnqlmw14g25c7g89-tree-sitter-tiger",
"sha256": "1p1hn99lsmqlmqgv7i3yw2jsqbj5xrrnvs87wkir74y7li2h9g4i",
"rev": "a233ebe360a73a92c50978e5c4e9e471bc59ff42",
"date": "2022-11-22T10:59:45+01:00",
"path": "/nix/store/30fd7jd6p4rc2x1ahax19jxxa0blz7lq-tree-sitter-tiger",
"sha256": "0jv8dawvdjws0klypf80z4fff4va5963vcxdp22rvp3g1n8dc3cm",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
"rev": "deaf0e5c573ad4e2bbfc9a29abb7b6dcb572556e",
"date": "2022-07-26T16:48:02-04:00",
"path": "/nix/store/40jlhkwlrvzdg3s95w132kvs5rax8mbj-tree-sitter-tlaplus",
"sha256": "01nsi5403vxcc725x9rvd0ff6xfkg2lw5350i1w5998jbs9kd00g",
"rev": "c54aebd31e2ac394a0aa70b510724c99144119f1",
"date": "2023-02-04T13:10:02-05:00",
"path": "/nix/store/p4jybbcwfv9x1s3kxp9bzifl2zsd3nil-tree-sitter-tlaplus",
"sha256": "06sshz8ia27ypzbwy5isx7ndyi9sc6x4xyr8r50njcpy3av4d7wn",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
"rev": "0ab9d99867435a7667c5548a6617a6bf73dbd830",
"date": "2022-10-10T11:19:39-07:00",
"path": "/nix/store/fjbslm2md38afkaxbnc3l537j23z9mvv-tree-sitter-typescript",
"sha256": "0kv91f8k7jwzkmkz2zvx9rh0ncgbcys9c37jbj0g4y1zhzn8l7rp",
"rev": "c6e56d44c686a67c89e29e773e662567285d610f",
"date": "2023-02-24T18:42:51+01:00",
"path": "/nix/store/m7hqakchzx02kb56d8sf17623jpkp35w-tree-sitter-typescript",
"sha256": "1vdqmna7zqs8aw7a87z4pn3ivplbgbn8jqjpyaxx6k5czmnl1ims",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/vigoux/tree-sitter-viml",
"rev": "4ae7bd67706d7e10afed827ce2ded884ab41650f",
"date": "2022-11-02T08:03:51+01:00",
"path": "/nix/store/k2fsslkwfsxscmcghiz6qqah9v275hy9-tree-sitter-viml",
"sha256": "082yw8qgi4fp9wfjfinnyh60f6rvp7fbyi88yaw6kdx4mjrnl0z6",
"rev": "e39a7bbcfdcfc7900629962b785c7e14503ae590",
"date": "2023-02-06T05:55:47+01:00",
"path": "/nix/store/haqij5xp39vjwh7p1rzdrzbicscnqx3l-tree-sitter-viml",
"sha256": "0p9vkl4z0kvyl3mv71rq57zghddvl2ghxbir2amjgrwb00gh0xbz",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/hubro/tree-sitter-yang",
"rev": "8e9d175982afcefa3dac8ca20d40d1643accd2bd",
"date": "2021-07-29T23:07:25+02:00",
"path": "/nix/store/ark7nssjv3jzy1kw9anlma7li5k9zpnb-tree-sitter-yang",
"sha256": "044q9fikaxnrcrnfwc7cfjnwdg6v7jb6rg7mj556iryv0bkv48s1",
"rev": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502",
"date": "2022-11-21T21:25:21+01:00",
"path": "/nix/store/ypd2cggg44l0sx0snvkgjbspkfcyscmf-tree-sitter-yang",
"sha256": "1vwcsp20dhccr2ag5s09j3jz9cnlkndb2hdn0h3va7md8ka0lhp8",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/maxxnino/tree-sitter-zig",
"rev": "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca",
"date": "2022-11-02T09:17:19+07:00",
"path": "/nix/store/h3wg6zkkzyq1vicp7bi4xkcvjb9himh0-tree-sitter-zig",
"sha256": "0l5703qxyyhp8h2a0ms8ncak6kzgrhp2msvpr8cgxjnlsc5xgmxx",
"rev": "1cd5f339b146b764f39b36bb7be98ca631a2e02a",
"date": "2023-02-28T21:37:35+07:00",
"path": "/nix/store/hl9gqwnlplia44nkq9mhd2ck3gf0clxy-tree-sitter-zig",
"sha256": "1pg17xq7x3m4nlqbnc261zz9603xwl3am82qs21b0wkqc6zs3fyb",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -358,6 +358,10 @@ let
orga = "sourcegraph";
repo = "tree-sitter-jsonnet";
};
"tree-sitter-solidity" = {
orga = "JoranHonig";
repo = "tree-sitter-solidity";
};
};
allGrammars =

View file

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2023-03-27";
cargoSha256 = "sha256-9yMDyjBFv4CIo6msseTzO+gsoH+vK90sb0g/wiTYlWU=";
version = "2023-04-04";
cargoSha256 = "sha256-TeoSMRISS1ztxCqU+TZp7t5odQ9xhaO7LdUJfwpVbxU=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-cG5g+rNGqCVMlQqNXhP40OtCqkYwTG/C4C353e4z2cU=";
sha256 = "sha256-IPBtZCOh3BdrR+V77cL7r6WQnclWcZ/85BDYnmq/GnQ=";
};
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "function-runner";
version = "3.2.4";
version = "3.3.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wppEnNsh8E8GY7iAQUNnaAqmoRZynD0s23xaOVig8vY=";
sha256 = "sha256-AnY9WIb3bHhC9o0ymdFM2MFro1Rx/yoVXMsbjCSNJaE=";
};
cargoHash = "sha256-D5oEAHB/1EIsE83b+Ph4LZzbag0qZB3Bz2/Rc3NXRtI=";
cargoHash = "sha256-oM6DMtQhtHR47AEw5RubNCGNpUKbIx/jVZeeoK3utlY=";
meta = with lib; {
description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";

View file

@ -4,10 +4,9 @@
, texlive
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: rec {
pname = "sagetex";
version = "3.6.1";
passthru.tlType = "run";
src = fetchFromGitHub {
owner = "sagemath";
@ -30,6 +29,11 @@ stdenv.mkDerivation rec {
cp -va *.sty *.cfg *.def "$path/"
'';
passthru = {
tlType = "run";
pkgs = [ finalAttrs.finalPackage ];
};
meta = with lib; {
description = "Embed code, results of computations, and plots from Sage into LaTeX documents";
homepage = "https://github.com/sagemath/sagetex";
@ -37,4 +41,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ alexnortung ];
platforms = platforms.all;
};
}
})

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bind_exporter";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "prometheus-community";
repo = "bind_exporter";
sha256 = "sha256-MZ+WjEtSTGsi+2iKSZ4Xy6gq+Zf7DZHolBiq3wop22A=";
sha256 = "sha256-qyTfo4Pkp07v575p7SePwe/OfCZRVuHKGyaEQQOkYjk=";
};
vendorSha256 = "sha256-uTjY4Fx2GR6e/3nXKNcmjsWbDjnOnu/jOShXzMF+b3Q=";
vendorHash = "sha256-ZQKQY7budLH6eAusLMwSF5cLJ6QdiXLJc29xJk+XBxI=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; };

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
version = "1.1.5";
version = "1.1.6";
src = fetchFromGitHub {
owner = "printfn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9qvIxKg/fj08wYY2fK5J1nWzojStUb9ArXwvA/cTOcQ=";
sha256 = "sha256-PO8QKZwtiNMlEFT2P61oe5kj6PWsP5uouOOTRtvpyxI=";
};
cargoHash = "sha256-kVnA8w2YVg6+h1V1O4cvciuB7GM4/LULFsGrzy8xUMQ=";
cargoHash = "sha256-og2YoPUKKMBqEjryzSGqwLIm44WfKkerNtG2N7yl1wE=";
nativeBuildInputs = [ pandoc installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubernetes-polaris";
version = "7.3.2";
version = "7.4.1";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "polaris";
rev = version;
sha256 = "sha256-LteclhYNMFNuGjFSuhPuY9ZA1Vlq4DPdcCGAQaujwh8=";
sha256 = "sha256-PXyJpzmGTwSthaN0nVex8B7WpCxX7QxqRDoIJERSK6o=";
};
vendorSha256 = "sha256-3htwwRkUOf8jLyLfRlhcWhftBImmcUglc/PP/Yk2oF0=";
vendorHash = "sha256-SwHJRw75pP1zwi9ZMfUfcXt788pURM1KSbTNQF6XVqk=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vals";
version = "0.23.0";
version = "0.24.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "variantdev";
repo = pname;
sha256 = "sha256-YIzy8WPguIrhkg1HW2X714Xp9b+eL6bej/oXN62kyus=";
sha256 = "sha256-qUcNwpmWoJkrT4ClW8uq2ufFEgmiZQcDG446SSO6mR0=";
};
vendorHash = "sha256-CzfAUNKskEbxWmVGz/XHItUS9Mp12zjTJ3z9X7YBjR4=";
vendorHash = "sha256-6DJiqDEgEHQbyIt4iShoBnagBvspd3W3vD56/FGjESs=";
ldflags = [
"-s"

View file

@ -20,7 +20,7 @@
- fontforge = null (limited functionality)
*/
let self = stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: rec {
pname = "mftrace";
version = "1.2.20";
@ -39,14 +39,16 @@ let self = stdenv.mkDerivation rec {
buildInputs = [ fontforge potrace ];
postInstall = ''
wrapProgram $out/bin/mftrace --prefix PATH : ${lib.makeBinPath buildInputs}
wrapProgram $out/bin/mftrace --prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs}
'';
# experimental texlive.combine support
# (note that only the bin/ folder will be combined into texlive)
passthru.tlType = "bin";
passthru.pkgs = [ self ] ++
(with texlive; kpathsea.pkgs ++ t1utils.pkgs ++ metafont.pkgs);
passthru = {
tlType = "bin";
tlDeps = with texlive; [ kpathsea t1utils metafont ];
pkgs = [ finalAttrs.finalPackage ];
};
meta = with lib; {
description = "Scalable PostScript Fonts for MetaFont";
@ -60,4 +62,4 @@ let self = stdenv.mkDerivation rec {
maintainers = with maintainers; [ xworld21 ];
platforms = platforms.all;
};
}; in self
})

View file

@ -10,18 +10,18 @@ let
pkgSet = removeAttrs args [ "pkgFilter" "extraName" "extraVersion" ] // {
# include a fake "core" package
core.pkgs = [
(bin.core.out // { pname = "core"; tlType = "bin"; })
(bin.core.doc // { pname = "core"; tlType = "doc"; })
(bin.core.out // { pname = "core"; version = "0"; tlType = "bin"; })
(bin.core.doc // { pname = "core"; version = "0"; tlType = "doc"; })
];
};
pkgList = rec {
all = lib.filter pkgFilter (combinePkgs (lib.attrValues pkgSet));
splitBin = builtins.partition (p: p.tlType == "bin") all;
bin = mkUniqueOutPaths splitBin.right
bin = splitBin.right
++ lib.optional
(lib.any (p: p.tlType == "run" && p.pname == "pdfcrop") splitBin.wrong)
(lib.getBin ghostscript);
nonbin = mkUniqueOutPaths splitBin.wrong;
nonbin = splitBin.wrong;
# extra interpreters needed for shebangs, based on 2015 schemes "medium" and "tetex"
# (omitted tk needed in pname == "epspdf", bin/epspdftk)
@ -33,17 +33,13 @@ let
++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby;
};
sortedUniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list);
mkUniqueOutPaths = pkgs: lib.unique
(map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));
name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}";
texmf = (buildEnv {
name = "${name}-texmf";
paths = pkgList.nonbin;
# remove fake derivations (without 'outPath') to avoid undesired build dependencies
paths = lib.catAttrs "outPath" pkgList.nonbin;
nativeBuildInputs = [ perl bin.core.out ];
@ -72,7 +68,9 @@ in (buildEnv {
inherit name;
ignoreCollisions = false;
paths = pkgList.bin ++ [ doc ];
# remove fake derivations (without 'outPath') to avoid undesired build dependencies
paths = lib.catAttrs "outPath" pkgList.bin ++ [ doc ];
pathsToLink = [
"/"
"/bin" # ensure these are writeable directories
@ -123,9 +121,9 @@ in (buildEnv {
# now filter hyphenation patterns and formats
(let
hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong;
hyphenPNames = sortedUniqueStrings (map (p: p.pname) hyphens);
hyphenPNames = map (p: p.pname) hyphens;
formats = lib.filter (p: p.hasFormats or false && p.tlType == "run") pkgList.splitBin.wrong;
formatPNames = sortedUniqueStrings (map (p: p.pname) formats);
formatPNames = map (p: p.pname) formats;
# sed expression that prints the lines in /start/,/end/ except for /end/
section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n";
script =

View file

@ -31,10 +31,8 @@ let
# the set of TeX Live packages, collections, and schemes; using upstream naming
tl = let
orig = import ./tlpdb.nix;
removeSelfDep = lib.mapAttrs
(n: p: if p ? deps then p // { deps = lib.filter (dn: n != dn) p.deps; }
else p);
clean = removeSelfDep (orig // {
overridden = orig // {
# overrides of texlive.tlpdb
texlive-msg-translations = orig.texlive-msg-translations // {
@ -57,11 +55,6 @@ let
deps = orig.collection-plaingeneric.deps ++ [ "xdvi" ];
};
# override cyclic dependency until #167226 is fixed
xecjk = orig.xecjk // {
deps = lib.remove "ctex" orig.xecjk.deps;
};
texdoc = orig.texdoc // {
# build Data.tlpdb.lua (part of the 'tlType == "run"' package)
postUnpack = ''
@ -80,19 +73,16 @@ let
fi
'';
};
}); # overrides
}; # overrides
linkDeps = lib.mapAttrs (_: attrs: attrs // lib.optionalAttrs (attrs ? deps) {
deps = builtins.map (n: tl.${n}) attrs.deps;
}); # transform [ "dep1" "dep2" ... ] into [ tl."dep1" ... ]
in lib.mapAttrs flatDeps (linkDeps clean);
in lib.mapAttrs mkTLPkg overridden;
# TODO: texlive.infra for web2c config?
flatDeps = pname: attrs:
# create a TeX package: an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations
mkTLPkg = pname: attrs:
let
version = attrs.version or (builtins.toString attrs.revision);
version = attrs.version or (toString attrs.revision);
mkPkgV = tlType: let
pkg = attrs // {
sha512 = attrs.sha512.${tlType};
@ -110,13 +100,13 @@ let
tlType = "run";
hasFormats = attrs.hasFormats or false;
hasHyphens = attrs.hasHyphens or false;
tlDeps = map (n: tl.${n}) (attrs.deps or []);
}
)]
++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc")
++ lib.optional (attrs.sha512 ? source) (mkPkgV "source")
++ lib.optional (bin ? ${pname})
( bin.${pname} // { inherit pname; tlType = "bin"; } )
++ combinePkgs (attrs.deps or []);
( bin.${pname} // { tlType = "bin"; } );
};
# for daily snapshots
@ -172,6 +162,9 @@ let
# metadata for texlive.combine
passthru = {
inherit pname tlType version;
} // lib.optionalAttrs (tlType == "run" && args ? deps) {
tlDeps = map (n: tl.${n}) args.deps;
} // lib.optionalAttrs (tlType == "run") {
hasFormats = args.hasFormats or false;
hasHyphens = args.hasHyphens or false;
};
@ -190,8 +183,20 @@ let
);
# combine a set of TL packages into a single TL meta-package
combinePkgs = pkgList: lib.concatLists # uniqueness is handled in `combine`
(builtins.map (a: a.pkgs) pkgList);
combinePkgs = pkgList: lib.catAttrs "pkg" (
let
# a TeX package is an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations
# the derivations make up the TeX package and optionally (for backward compatibility) its dependencies
tlPkgToSets = { pkgs, ... }: map ({ pname, tlType, version, outputName ? "", ... }@pkg: {
# outputName required to distinguish among bin.core-big outputs
key = "${pname}.${tlType}-${version}-${outputName}";
inherit pkg;
}) pkgs;
pkgListToSets = lib.concatMap tlPkgToSets; in
builtins.genericClosure {
startSet = pkgListToSets pkgList;
operator = { pkg, ... }: pkgListToSets (pkg.tlDeps or []);
});
in
tl // {