Skip to content

Commit

Permalink
tclPackages: init
Browse files Browse the repository at this point in the history
  • Loading branch information
fgaz committed Oct 26, 2024
1 parent f8e0816 commit 1009ec8
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,15 @@
- pkgs/os-specific/linux/systemd/**/*
- nixos/modules/system/boot/systemd*/**/*

"6.topic: tcl":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/tcl.section.md
- pkgs/development/interpreters/tcl/*
- pkgs/development/tcl-modules/**/*
- pkgs/top-level/tcl-packages.nix

"6.topic: TeX":
- any:
- changed-files:
Expand Down
6 changes: 6 additions & 0 deletions ci/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
/pkgs/build-support/rust @zowoq @winterqt @figsoda
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda

# Tcl
/pkgs/development/interpreters/tcl @fgaz
/pkgs/development/libraries/tk @fgaz
/pkgs/top-level/tcl-packages.nix @fgaz
/pkgs/development/tcl-modules @fgaz

# C compilers
/pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm
Expand Down
17 changes: 17 additions & 0 deletions pkgs/development/tcl-modules/by-name/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Name-based Tcl package directories

The structure of this directory is identical to the one described in
[/pkgs/by-name/README.md](../../../by-name/README.md).
The only difference is the scope:

```nix
{ lib
# You can get tclPackages attributes directly
, mkTclDerivation
, tcllib
}:
mkTclDerivation {
# ...
}
```
3 changes: 3 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16614,6 +16614,9 @@ with pkgs;
tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
tcl-9_0 = callPackage ../development/interpreters/tcl/9.0.nix { };

# We don't need versioned package sets thanks to the tcl stubs mechanism
tclPackages = recurseIntoAttrs (callPackage ./tcl-packages.nix {});

tclreadline = callPackage ../development/interpreters/tclreadline { };

eltclsh = callPackage ../development/tools/eltclsh { };
Expand Down
18 changes: 18 additions & 0 deletions pkgs/top-level/tcl-packages.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
let
autoCalledPackages = import ./by-name-overlay.nix ../development/tcl-modules/by-name;
in

{
lib,
newScope,
tcl,
tk,
}:

lib.makeScope newScope (
lib.extends autoCalledPackages (self: {
inherit tcl tk;
inherit (tcl) mkTclDerivation tclPackageHook;

})
)

0 comments on commit 1009ec8

Please sign in to comment.