Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into staging-next | Martin Weinelt | 2023-11-14 |
|\ | | | | | | | | | Conflicts: - pkgs/development/libraries/gdcm/default.nix | ||
| * | spicy-parser-generator: 1.8.1 -> 1.9.0 | R. Ryantm | 2023-11-14 |
| | | |||
* | | Merge master into staging-next | github-actions[bot] | 2023-11-07 |
|\| | |||
| * | Merge pull request #265514 from xworld21/treewide-texlive-with-packages | Dmitry Kalinkin | 2023-11-06 |
| |\ | | | | | | | treewide: switch to texlive.withPackages | ||
| | * | ragel: replace texlive.combined.scheme-small with texliveSmall | Vincenzo Mantova | 2023-11-05 |
| | | | |||
* | | | Merge branch 'master' into staging-next | Weijia Wang | 2023-11-06 |
|\| | | |||
| * | | Merge pull request #244298 from oxalica/remove-unused | Thiago Kenji Okada | 2023-11-06 |
| |\ \ | | |/ | |/| | {birdtray,isgx,mycrypto,osu-lazer,stretchly,tree-sitter}: remove oxalica as maintainer | ||
| | * | {birdtray,isgx,mycrypto,osu-lazer,stretchly,tree-sitter}: remove oxalica as ↵ | oxalica | 2023-07-19 |
| | | | | | | | | | | | | maintainer | ||
* | | | Merge master into staging-next | github-actions[bot] | 2023-10-28 |
|\| | | |||
| * | | Merge pull request #261519 from r-ryantm/auto-update/re-flex | Weijia Wang | 2023-10-28 |
| |\ \ | | | | | | | | | re-flex: 3.4.1 -> 3.5.0 | ||
| | * | | re-flex: 3.4.1 -> 3.5.0 | R. Ryantm | 2023-10-16 |
| | | | | |||
* | | | | Merge branch 'staging' into staging-next | Vladimír Čunát | 2023-10-26 |
|\ \ \ \ | |/ / / |/| | | | |||
| * | | | Merge staging-next into staging | github-actions[bot] | 2023-10-17 |
| |\ \ \ | |||
| * \ \ \ | Merge staging-next into staging | github-actions[bot] | 2023-10-13 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| * | | | | Merge staging-next into staging | github-actions[bot] | 2023-10-12 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge staging-next into staging | github-actions[bot] | 2023-10-10 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge staging-next into staging | github-actions[bot] | 2023-10-09 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/staging-next' into staging | Alyssa Ross | 2023-10-07 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/top-level/linux-kernels.nix | ||
| * | | | | | | | | treewide: refactor `.attrs.sh` detection | Maximilian Bosch | 2023-10-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When specifying the `builder` attribute in `stdenv.mkDerivation`, this will be effectively transformed into builtins.derivation { builder = stdenv.shell; args = [ "-e" builder ]; } This also means that `default-builder.sh` is never sourced and as a result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct location[1]. Also, we need to source `.attrs.sh` to source `$stdenv`. So, the following is done now: * If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it. Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage (see previous commit for more context), so prefer the environment variable if possible. * Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this can happen. * If neither applies, it can be assumed that `__structuredAttrs` is turned off and thus nothing needs to be done. [1] It's possible that it doesn't exist at all - in case of Nix 2.3 or it can point to a wrong location on older Nix versions with a bug in `__structuredAttrs`. | ||
* | | | | | | | | | Merge pull request #259001 from acowley/init-tree-sitter-wgsl | Bernardo Meurer | 2023-10-25 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | tree-sitter-grammars: add wgsl | ||
| * | | | | | | | | tree-sitter-grammars: add wgsl | Anthony Cowley | 2023-10-04 |
| |/ / / / / / / | |||
* | | | | | | | | Merge pull request #238420 from r-ryantm/auto-update/spicy-parser-generator | Mario Rodas | 2023-10-17 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | spicy-parser-generator: 1.7.0 -> 1.8.1 | ||
| * | | | | | | | spicy-parser-generator: 1.7.0 -> 1.8.1 | R. Ryantm | 2023-07-09 |
| | |_|_|_|_|/ | |/| | | | | | |||
* | | | | | | | Merge pull request #259463 from r-ryantm/auto-update/re-flex | Weijia Wang | 2023-10-13 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | re-flex: 3.3.8 -> 3.4.1 | ||
| * | | | | | | re-flex: 3.3.8 -> 3.4.1 | R. Ryantm | 2023-10-06 |
| | |/ / / / | |/| | | | | |||
* | | | | | | tree-sitter: let nixpkgs-format reformat the buffer | Damien Cassou | 2023-10-12 |
| | | | | | | |||
* | | | | | | tree-sitter-grammars: add proto | Damien Cassou | 2023-10-12 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | The tree-sitter-proto.json file was created by running the update script as described in tree-sitter/default.nix. | ||
* | | | | | tree-sitter-grammars: fix typst grammar | Adam Stephens | 2023-10-09 |
| |_|_|/ |/| | | | |||
* | | | | tree-sitter-grammars: generate typst parser | Icy-Thought | 2023-10-08 |
| |_|/ |/| | | |||
* | | | tree-sitter-grammars: add typst | Icy-Thought | 2023-10-06 |
|/ / | |||
* | | tree-sitter: update grammars | Evgeny Kurnevsky | 2023-09-26 |
| | | |||
* | | Merge pull request #241340 from ErinvanderVeen/tree-sitter-emscripten-fix | Artturi | 2023-09-15 |
|\ \ | |||
| * | | tree-sitter: set emcc cache outside of nix store | Erin van der Veen | 2023-07-03 |
| | | | |||
* | | | antlr4_13: init at 4.13.0 | Nick Cao | 2023-09-03 |
| | | | |||
* | | | re-flex: 3.3.7 -> 3.3.8 | R. Ryantm | 2023-08-13 |
| | | | |||
* | | | Merge master into staging-next | github-actions[bot] | 2023-08-04 |
|\ \ \ | |||
| * | | | treewide: noop: refer to `src.name` or similar in `sourceRoot` where ↵ | Jan Malakhovski | 2023-08-03 |
| | | | | | | | | | | | | | | | | appropriate, part 1: trivial cases | ||
* | | | | Merge staging-next into staging | github-actions[bot] | 2023-07-23 |
|\| | | | |||
| * | | | Merge master into staging-next | github-actions[bot] | 2023-07-23 |
| |\ \ \ | |||
| | * | | | re-flex: 3.3.6 -> 3.3.7 | R. Ryantm | 2023-07-23 |
| | | | | | |||
* | | | | | Merge pull request #244427 from trofi/re2c-update | Sandro | 2023-07-21 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||
| * | | | | re2c: 3.0 -> 3.1 | Sergei Trofimovich | 2023-07-19 |
| |/ / / | | | | | | | | | | | | | Changes: https://re2c.org/releases/changelog/changelog.html#id1 | ||
* | | | | Merge master into staging-next | github-actions[bot] | 2023-07-19 |
|\| | | | |||
| * | | | re-flex: 3.3.5 -> 3.3.6 | R. Ryantm | 2023-07-19 |
| | |/ | |/| | |||
* / | | ragel: enableParallelBuilding | Artturin | 2023-07-10 |
|/ / | | | | | | | | | ragel: 47s -> 9s ragelDev: 1m51s 45s | ||
* / | rm Profpatsch from stuff without interest/capacity of maintaining | Profpatsch | 2023-07-07 |
|/ | | | | | For tree-sitter I’m still interested, but don’t want to be first in the list :) | ||
* | Merge pull request #239948 from Strum355/tree-sitter-playground | Nick Cao | 2023-06-29 |
|\ | | | | | tree-sitter: fix webui/playground notice & terminating | ||
| * | tree-sitter: fix webui/playground notice | Noah Santschi-Cooney | 2023-06-26 |
| | | |||
* | | tree-sitter-grammars: add wing (#240140) | Glib Shpychka | 2023-06-28 |
| | | |||
* | | tree-sitter: allow use of 'generate' argument | Glib Shpychka | 2023-06-26 |
|/ |