mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge branch 'master' into staging-next
This commit is contained in:
Vladimír Čunát
commit
300eaad172
@ -29,12 +29,12 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe
|
||||
|
||||
## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker}
|
||||
|
||||
The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
|
||||
The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-color-emoji` is needed:
|
||||
|
||||
On NixOS, it can be installed using the following expression:
|
||||
|
||||
```nix
|
||||
{ pkgs, ... }: {
|
||||
fonts.packages = with pkgs; [ noto-fonts-emoji ];
|
||||
fonts.packages = with pkgs; [ noto-fonts-color-emoji ];
|
||||
}
|
||||
```
|
||||
|
||||
@ -876,6 +876,12 @@
|
||||
githubId = 153175;
|
||||
name = "Andrew Marshall";
|
||||
};
|
||||
amaxine = {
|
||||
email = "max@ine.dev";
|
||||
github = "amaxine";
|
||||
githubId = 35892750;
|
||||
name = "Maxine Aubrey";
|
||||
};
|
||||
ambroisie = {
|
||||
email = "bruno.nixpkgs@belanyi.fr";
|
||||
github = "ambroisie";
|
||||
@ -10328,6 +10334,12 @@
|
||||
githubId = 782440;
|
||||
name = "Luna Nova";
|
||||
};
|
||||
luochen1990 = {
|
||||
email = "luochen1990@gmail.com";
|
||||
github = "luochen1990";
|
||||
githubId = 2309868;
|
||||
name = "Luo Chen";
|
||||
};
|
||||
lurkki = {
|
||||
email = "jussi.kuokkanen@protonmail.com";
|
||||
github = "Lurkki14";
|
||||
@ -10879,12 +10891,6 @@
|
||||
githubId = 502805;
|
||||
name = "Max Zerzouri";
|
||||
};
|
||||
maxeaubrey = {
|
||||
email = "maxeaubrey@gmail.com";
|
||||
github = "maxeaubrey";
|
||||
githubId = 35892750;
|
||||
name = "Maxine Aubrey";
|
||||
};
|
||||
maxhbr = {
|
||||
email = "nixos@maxhbr.dev";
|
||||
github = "maxhbr";
|
||||
|
||||
@ -102,12 +102,13 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:
|
||||
|
||||
alias = before_equal
|
||||
alias_unquoted = before_equal.strip('"')
|
||||
after_equal_list = [x.strip(";:") for x in after_equal.split()]
|
||||
replacement = next(x.strip(";:") for x in after_equal.split())
|
||||
replacement = replacement.removeprefix("pkgs.")
|
||||
|
||||
converted = (
|
||||
f"{indent}{alias} = throw \"'{alias_unquoted}' has been renamed to/replaced by"
|
||||
f" '{after_equal_list.pop(0)}'\";"
|
||||
f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}'
|
||||
f"{indent}{alias} = throw \"'{alias_unquoted}' has been"
|
||||
f" renamed to/replaced by '{replacement}'\";"
|
||||
f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}"
|
||||
)
|
||||
converted_list.append((line, converted))
|
||||
|
||||
|
||||
@ -365,7 +365,7 @@ with lib.maintainers; {
|
||||
hedning
|
||||
jtojnar
|
||||
dasj19
|
||||
maxeaubrey
|
||||
amaxine
|
||||
];
|
||||
githubTeams = [
|
||||
"gnome"
|
||||
@ -918,6 +918,18 @@ with lib.maintainers; {
|
||||
shortName = "Vim/Neovim";
|
||||
};
|
||||
|
||||
wdz = {
|
||||
members = [
|
||||
n0emis
|
||||
netali
|
||||
vidister
|
||||
johannwagner
|
||||
yuka
|
||||
];
|
||||
scope = "Group registration for WDZ GmbH team members who collectively maintain packages.";
|
||||
shortName = "WDZ GmbH";
|
||||
};
|
||||
|
||||
xfce = {
|
||||
members = [
|
||||
bobby285271
|
||||
|
||||
@ -193,6 +193,10 @@
|
||||
|
||||
- The `hail` NixOS module was removed, as `hail` was unmaintained since 2017.
|
||||
|
||||
- Package `noto-fonts-emoji` was renamed to `noto-fonts-color-emoji`;
|
||||
see [#221181](https://github.com/NixOS/nixpkgs/issues/221181).
|
||||
|
||||
|
||||
## Other Notable Changes {#sec-release-23.11-notable-changes}
|
||||
|
||||
- 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.
|
||||
|
||||
@ -37,7 +37,7 @@ in
|
||||
gyre-fonts # TrueType substitutes for standard PostScript fonts
|
||||
liberation_ttf
|
||||
unifont
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,16 +16,24 @@ with lib;
|
||||
|
||||
config = {
|
||||
|
||||
# can be generated with: filter (drv: (builtins.tryEval (drv ? terminfo)).value) (attrValues pkgs)
|
||||
# can be generated with:
|
||||
# attrNames (filterAttrs
|
||||
# (_: drv: (builtins.tryEval (isDerivation drv && drv ? terminfo)).value)
|
||||
# pkgs)
|
||||
environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs; [
|
||||
alacritty
|
||||
contour
|
||||
foot
|
||||
kitty
|
||||
mtm
|
||||
rio
|
||||
rxvt-unicode-unwrapped
|
||||
rxvt-unicode-unwrapped-emoji
|
||||
st
|
||||
termite
|
||||
tmux
|
||||
wezterm
|
||||
yaft
|
||||
]));
|
||||
|
||||
environment.pathsToLink = [
|
||||
|
||||
@ -81,7 +81,7 @@ in
|
||||
if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then
|
||||
PROMPT_COLOR="1;31m"
|
||||
((UID)) && PROMPT_COLOR="1;32m"
|
||||
if [ -n "$INSIDE_EMACS" ] || [ "$TERM" = "eterm" ] || [ "$TERM" = "eterm-color" ]; then
|
||||
if [ -n "$INSIDE_EMACS" ]; then
|
||||
# Emacs term mode doesn't support xterm title escape sequence (\e]0;)
|
||||
PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
|
||||
else
|
||||
|
||||
@ -38,7 +38,7 @@ let cfg = config.services.networking.websockify; in {
|
||||
description = "Service to forward websocket connections to TCP connections (from port:to port %I)";
|
||||
script = ''
|
||||
IFS=':' read -a array <<< "$1"
|
||||
${pkgs.pythonPackages.websockify}/bin/websockify --ssl-only \
|
||||
${pkgs.python3Packages.websockify}/bin/websockify --ssl-only \
|
||||
--cert=${cfg.sslCert} --key=${cfg.sslKey} 0.0.0.0:''${array[0]} 0.0.0.0:''${array[1]}
|
||||
'';
|
||||
scriptArgs = "%i";
|
||||
|
||||
@ -147,7 +147,7 @@ in {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Make MemTest86+ available from the systemd-boot menu. MemTest86+ is a
|
||||
Make Memtest86+ available from the systemd-boot menu. Memtest86+ is a
|
||||
program for testing memory.
|
||||
'';
|
||||
};
|
||||
@ -191,7 +191,7 @@ in {
|
||||
default = {};
|
||||
example = literalExpression ''
|
||||
{ "memtest86.conf" = '''
|
||||
title MemTest86+
|
||||
title Memtest86+
|
||||
efi /efi/memtest86/memtest.efi
|
||||
'''; }
|
||||
'';
|
||||
@ -285,7 +285,7 @@ in {
|
||||
boot.loader.systemd-boot.extraEntries = mkMerge [
|
||||
(mkIf cfg.memtest86.enable {
|
||||
"${cfg.memtest86.entryFilename}" = ''
|
||||
title MemTest86
|
||||
title Memtest86+
|
||||
efi /efi/memtest86/memtest.efi
|
||||
'';
|
||||
})
|
||||
|
||||
@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, ... }:
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
fonts.enableDefaultPackages = true; # Background fonts
|
||||
fonts.packages = with pkgs; [
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
cantarell-fonts
|
||||
twitter-color-emoji
|
||||
source-code-pro
|
||||
|
||||
@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
];
|
||||
fontconfig.defaultFonts = {
|
||||
serif = [ "Noto Serif" "Noto Serif CJK SC" ];
|
||||
|
||||
@ -68,7 +68,9 @@ least specific (the system profile)"
|
||||
;; TODO: We should also add the other `NIX_PROFILES' to this path.
|
||||
;; However, these are user-specific, so we would need to discover
|
||||
;; them dynamically after connecting via `tramp'
|
||||
'(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
|
||||
'(progn
|
||||
(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")
|
||||
(add-to-list 'tramp-remote-path "/run/wrappers/bin")))
|
||||
|
||||
;;; C source directory
|
||||
;;;
|
||||
|
||||
@ -1,6 +1,2 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'sensu'
|
||||
gem 'iruby'
|
||||
gem 'cztop'
|
||||
gem 'ffi-rzmq'
|
||||
gem 'rbczmq'
|
||||
gem 'iruby', "0.7.4"
|
||||
|
||||
@ -1,119 +1,35 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.6.0)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
amq-protocol (2.0.1)
|
||||
amqp (1.6.0)
|
||||
amq-protocol (>= 2.0.1)
|
||||
eventmachine
|
||||
bond (0.5.1)
|
||||
childprocess (0.5.8)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
cookiejar (0.3.3)
|
||||
czmq-ffi-gen (0.15.0)
|
||||
ffi (~> 1.9.10)
|
||||
cztop (0.13.1)
|
||||
czmq-ffi-gen (~> 0.15.0)
|
||||
data_uri (0.1.0)
|
||||
em-http-request (1.1.5)
|
||||
addressable (>= 2.3.4)
|
||||
cookiejar (!= 0.3.1)
|
||||
em-socksify (>= 0.3)
|
||||
eventmachine (>= 1.0.3)
|
||||
http_parser.rb (>= 0.6.0)
|
||||
em-http-server (0.1.8)
|
||||
eventmachine
|
||||
em-socksify (0.3.2)
|
||||
eventmachine (>= 1.0.0.beta.4)
|
||||
em-worker (0.0.2)
|
||||
eventmachine
|
||||
eventmachine (1.2.7)
|
||||
ffi (1.9.21)
|
||||
ffi (1.15.5)
|
||||
ffi-rzmq (2.0.7)
|
||||
ffi-rzmq-core (>= 1.0.7)
|
||||
ffi-rzmq-core (1.0.7)
|
||||
ffi
|
||||
http_parser.rb (0.6.0)
|
||||
iruby (0.3)
|
||||
bond (~> 0.5)
|
||||
io-console (0.6.0)
|
||||
irb (1.7.4)
|
||||
reline (>= 0.3.6)
|
||||
iruby (0.7.4)
|
||||
data_uri (~> 0.1)
|
||||
mimemagic (~> 0.3)
|
||||
ffi-rzmq
|
||||
irb
|
||||
mime-types (>= 3.3.1)
|
||||
multi_json (~> 1.11)
|
||||
mimemagic (0.3.3)
|
||||
multi_json (1.13.1)
|
||||
oj (2.18.1)
|
||||
parse-cron (0.1.4)
|
||||
public_suffix (3.0.3)
|
||||
rbczmq (1.7.9)
|
||||
sensu (1.6.2)
|
||||
em-http-request (= 1.1.5)
|
||||
em-http-server (= 0.1.8)
|
||||
eventmachine (= 1.2.7)
|
||||
parse-cron (= 0.1.4)
|
||||
sensu-extension (= 1.5.2)
|
||||
sensu-extensions (= 1.10.0)
|
||||
sensu-json (= 2.1.1)
|
||||
sensu-logger (= 1.2.2)
|
||||
sensu-redis (= 2.4.0)
|
||||
sensu-settings (= 10.14.0)
|
||||
sensu-spawn (= 2.5.0)
|
||||
sensu-transport (= 8.2.0)
|
||||
sensu-extension (1.5.2)
|
||||
eventmachine
|
||||
sensu-extensions (1.10.0)
|
||||
sensu-extension
|
||||
sensu-extensions-check-dependencies (= 1.1.0)
|
||||
sensu-extensions-debug (= 1.0.0)
|
||||
sensu-extensions-json (= 1.0.0)
|
||||
sensu-extensions-occurrences (= 1.2.0)
|
||||
sensu-extensions-only-check-output (= 1.0.0)
|
||||
sensu-extensions-ruby-hash (= 1.0.0)
|
||||
sensu-json (>= 1.1.0)
|
||||
sensu-logger
|
||||
sensu-settings
|
||||
sensu-extensions-check-dependencies (1.1.0)
|
||||
sensu-extension
|
||||
sensu-extensions-debug (1.0.0)
|
||||
sensu-extension
|
||||
sensu-extensions-json (1.0.0)
|
||||
sensu-extension
|
||||
sensu-extensions-occurrences (1.2.0)
|
||||
sensu-extension
|
||||
sensu-extensions-only-check-output (1.0.0)
|
||||
sensu-extension
|
||||
sensu-extensions-ruby-hash (1.0.0)
|
||||
sensu-extension
|
||||
sensu-json (2.1.1)
|
||||
oj (= 2.18.1)
|
||||
sensu-logger (1.2.2)
|
||||
eventmachine
|
||||
sensu-json
|
||||
sensu-redis (2.4.0)
|
||||
eventmachine
|
||||
sensu-settings (10.14.0)
|
||||
parse-cron
|
||||
sensu-json (>= 1.1.0)
|
||||
sensu-spawn (2.5.0)
|
||||
childprocess (= 0.5.8)
|
||||
em-worker (= 0.0.2)
|
||||
eventmachine
|
||||
ffi (= 1.9.21)
|
||||
sensu-transport (8.2.0)
|
||||
amq-protocol (= 2.0.1)
|
||||
amqp (= 1.6.0)
|
||||
eventmachine
|
||||
sensu-redis (>= 1.0.0)
|
||||
native-package-installer
|
||||
mime-types (3.5.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2023.0808)
|
||||
multi_json (1.15.0)
|
||||
native-package-installer (1.1.8)
|
||||
reline (0.3.8)
|
||||
io-console (~> 0.5)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
cztop
|
||||
ffi-rzmq
|
||||
iruby
|
||||
rbczmq
|
||||
sensu
|
||||
iruby (= 0.7.4)
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.2
|
||||
2.4.19
|
||||
|
||||
@ -1,89 +1,4 @@
|
||||
{
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.0";
|
||||
};
|
||||
amq-protocol = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.1";
|
||||
};
|
||||
amqp = {
|
||||
dependencies = ["amq-protocol" "eventmachine"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
};
|
||||
bond = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r19ifc4skyl2gxnifrxa5jvbbay9fb2in79ppgv02b6n4bhsw90";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.1";
|
||||
};
|
||||
childprocess = {
|
||||
dependencies = ["ffi"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.8";
|
||||
};
|
||||
cookiejar = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.3";
|
||||
};
|
||||
czmq-ffi-gen = {
|
||||
dependencies = ["ffi"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ngsd1yxiayd50v402vwhmq7ma9ang6pcba5kqiwq7smpdvfmbmp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.15.0";
|
||||
};
|
||||
cztop = {
|
||||
dependencies = ["czmq-ffi-gen"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12xcz7g42dbp2ryhcwdm2ykj7bmwfhjhla296hy18g7a09zlfnz7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.13.1";
|
||||
};
|
||||
data_uri = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -94,69 +9,15 @@
|
||||
};
|
||||
version = "0.1.0";
|
||||
};
|
||||
em-http-request = {
|
||||
dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.5";
|
||||
};
|
||||
em-http-server = {
|
||||
dependencies = ["eventmachine"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.8";
|
||||
};
|
||||
em-socksify = {
|
||||
dependencies = ["eventmachine"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.2";
|
||||
};
|
||||
em-worker = {
|
||||
dependencies = ["eventmachine"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.2";
|
||||
};
|
||||
eventmachine = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8";
|
||||
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.21";
|
||||
version = "1.15.5";
|
||||
};
|
||||
ffi-rzmq = {
|
||||
dependencies = ["ffi-rzmq-core"];
|
||||
@ -180,250 +41,88 @@
|
||||
};
|
||||
version = "1.0.7";
|
||||
};
|
||||
"http_parser.rb" = {
|
||||
io-console = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
|
||||
sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.0";
|
||||
};
|
||||
iruby = {
|
||||
dependencies = ["bond" "data_uri" "mimemagic" "multi_json"];
|
||||
irb = {
|
||||
dependencies = ["reline"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wdf2c0x8y6cya0n3y0p3p7b1sxkb2fdavdn2k58rf4rs37s7rzn";
|
||||
sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3";
|
||||
version = "1.7.4";
|
||||
};
|
||||
mimemagic = {
|
||||
iruby = {
|
||||
dependencies = ["data_uri" "ffi-rzmq" "irb" "mime-types" "multi_json" "native-package-installer"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw";
|
||||
sha256 = "0856ncjk7akm55gxcnhfmv426xsl4ryywdxrqbwgphwpqwm9w8fc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.3";
|
||||
version = "0.7.4";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = ["mime-types-data"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.1";
|
||||
};
|
||||
mime-types-data = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2023.0808";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
|
||||
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.1";
|
||||
version = "1.15.0";
|
||||
};
|
||||
oj = {
|
||||
native-package-installer = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f";
|
||||
sha256 = "004wx9xhcam92g1d4ybvrl1yqablm2svalyck9sq4igy9nwkz9nb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.18.1";
|
||||
version = "1.1.8";
|
||||
};
|
||||
parse-cron = {
|
||||
reline = {
|
||||
dependencies = ["io-console"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg";
|
||||
sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.4";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.3";
|
||||
};
|
||||
rbczmq = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bqr44m2nb61smza6y5cahp09hk16lsn0z3wpq9g5zpr9nhp50fx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.9";
|
||||
};
|
||||
sensu = {
|
||||
dependencies = ["em-http-request" "em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rxv6yj63nkxlzmmqk6qpfpcvrbar9s4sd4kgfb5zsv9bw7236cr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.2";
|
||||
};
|
||||
sensu-extension = {
|
||||
dependencies = ["eventmachine"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bpizp4n01rv72cryjjlrbfxxj3csish3mkxjzdy4inpi5j5h1dw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
};
|
||||
sensu-extensions = {
|
||||
dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04v221qjv8qy3jci40i66p63ig5vrrh0dpgmf1l8229x5m7bxrsg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
};
|
||||
sensu-extensions-check-dependencies = {
|
||||
dependencies = ["sensu-extension"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hc4kz7k983f6fk27ikg5drvxm4a85qf1k07hqssfyk3k75jyj1r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
sensu-extensions-debug = {
|
||||
dependencies = ["sensu-extension"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
sensu-extensions-json = {
|
||||
dependencies = ["sensu-extension"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
sensu-extensions-occurrences = {
|
||||
dependencies = ["sensu-extension"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
};
|
||||
sensu-extensions-only-check-output = {
|
||||
dependencies = ["sensu-extension"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
sensu-extensions-ruby-hash = {
|
||||
dependencies = ["sensu-extension"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
sensu-json = {
|
||||
dependencies = ["oj"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08zlxg5j3bhs72cc7wcllp026jbif0xiw6ib1cgawndlpsfl9fgx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.1";
|
||||
};
|
||||
sensu-logger = {
|
||||
dependencies = ["eventmachine" "sensu-json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jpw4kz36ilaknrzb3rbkhpbgv93w2d668z2cv395dq30d4d3iwm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.2";
|
||||
};
|
||||
sensu-redis = {
|
||||
dependencies = ["eventmachine"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0widfmmj1h9ca2kk14wy1sqmlkq40linp89a73s3ghngnzri0xyk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
};
|
||||
sensu-settings = {
|
||||
dependencies = ["parse-cron" "sensu-json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "152n4hazv2l4vbzrgd316rpj135jmz042fyh6k2yv2kw0x29pi0f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "10.14.0";
|
||||
};
|
||||
sensu-spawn = {
|
||||
dependencies = ["childprocess" "em-worker" "eventmachine" "ffi"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17yc8ivjpjbvig9r7yl6991d6ma0kcq75fbpz6i856ljvcr3lmd5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.0";
|
||||
};
|
||||
sensu-transport = {
|
||||
dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0x6vyfmg1jm1srf7xa5aka73by7qwcmry2rx8kq8phwa4g0v4mzr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.2.0";
|
||||
version = "0.3.8";
|
||||
};
|
||||
}
|
||||
|
||||
18
pkgs/applications/editors/jupyter-kernels/iruby/update.sh
Executable file
18
pkgs/applications/editors/jupyter-kernels/iruby/update.sh
Executable file
@ -0,0 +1,18 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq bundler bundix ruby
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# Update Gemfile with the latest iruby version
|
||||
echo "source 'https://rubygems.org'" > Gemfile
|
||||
echo -n "gem 'iruby', " >> Gemfile
|
||||
curl https://rubygems.org/api/v1/gems/iruby.json | jq .version >> Gemfile
|
||||
|
||||
# Regenerate Gemfile.lock
|
||||
export BUNDLE_FORCE_RUBY_PLATFORM=1
|
||||
bundle lock
|
||||
|
||||
# Regenerate gemset.nix
|
||||
bundix -l
|
||||
@ -97,7 +97,7 @@ in
|
||||
homepage = "https://code.visualstudio.com/";
|
||||
downloadPage = "https://code.visualstudio.com/Updates";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ eadwu synthetica maxeaubrey bobby285271 Enzime ];
|
||||
maintainers = with maintainers; [ eadwu synthetica amaxine bobby285271 Enzime ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megapixels";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "postmarketOS";
|
||||
repo = "megapixels";
|
||||
rev = version;
|
||||
hash = "sha256-ZkTDHDL5nhpR8PKqia12pbrEZLnRXEm8DwBYdYrP5Qo=";
|
||||
hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -59,7 +59,7 @@ let
|
||||
homepage = "https://1password.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];
|
||||
maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ];
|
||||
platforms = builtins.attrNames sources.${channel};
|
||||
mainProgram = "1password";
|
||||
};
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "camunda-modeler";
|
||||
version = "5.13.0";
|
||||
version = "5.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-/9Af/1ZP2Hkc0PP9yXObNDNmxe6riBNWSv+JaM7O5Vs=";
|
||||
hash = "sha256-zGxuvS4T1olMH+QOqrPcsFjfO3PDERmFQOa+ISN9u0c=";
|
||||
};
|
||||
sourceRoot = "camunda-modeler-${version}-linux-x64";
|
||||
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "markmind";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MarkMindCkm/Mark-Mind/releases/download/v${version}/Mark.Mind-${version}.AppImage";
|
||||
sha256 = "sha256-iOJ0IOIzleA69rv94Qd35rMbHc+XSi8OPatf2V6sYrI=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
name = "markmind-${version}";
|
||||
inherit src;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/markmind $out/share/applications
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/markmind
|
||||
cp -a ${appimageContents}/mind.desktop $out/share/applications/markmind.desktop
|
||||
cp -a ${appimageContents}/usr/share/icons $out/share
|
||||
substituteInPlace $out/share/applications/markmind.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=markmind'
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/markmind \
|
||||
--add-flags $out/share/markmind/resources/app.asar
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mind map and outliner editor";
|
||||
homepage = "https://github.com/MarkMindCkm/Mark-Mind";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -12,20 +12,20 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.4.5";
|
||||
version = "1.4.11";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
homepage = "https://obsidian.md";
|
||||
downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
|
||||
license = licenses.obsidian;
|
||||
maintainers = with maintainers; [ atila conradmearns zaninime qbit ];
|
||||
maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ];
|
||||
};
|
||||
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
sha256 = if stdenv.isDarwin then "sha256-1xGlXjQrJ8gNtKYlCBiIfNnTZU591JZdU6NJqMA5gug=" else "sha256-Y/RlT+3xBbF9tjCbRQnQ+j8ogzLMfsQPnOdiCVj+NK0=";
|
||||
sha256 = if stdenv.isDarwin then "sha256-bJLWXdeVzbVrb8jmIRpyQG6a5H1jMydhO9ioHOGk3Ms=" else "sha256-Z4DojO90PAlGGsItcZugPsi+48UPnOjvCn2BIzrDQpc=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
{ stdenv, lib, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, electron }:
|
||||
|
||||
let
|
||||
version = "0.13.0";
|
||||
appIcon = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/Splode/pomotroid/v${version}/static/icon.png";
|
||||
sha256 = "sha256-BEPoOBErw5ZCeK4rtdxdwZZLimbpglu1Cu++4xzuVUs=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pomotroid";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Splode/pomotroid/releases/download/v${version}/${pname}-${version}-linux.tar.gz";
|
||||
sha256 = "sha256-AwpVnvwWQd/cgmZvtr5NprnLyeXz6ym4Fywc808tcSc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = "pomotroid";
|
||||
icon = "pomotroid";
|
||||
comment = meta.description;
|
||||
desktopName = "Pomotroid";
|
||||
genericName = "Pomodoro Application";
|
||||
})
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt/pomotroid $out/share/pomotroid $out/share/pixmaps
|
||||
|
||||
cp -r ./ $out/opt/pomotroid
|
||||
mv $out/opt/pomotroid/{locales,resources} $out/share/pomotroid
|
||||
cp ${appIcon} $out/share/pixmaps/pomotroid.png
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/pomotroid \
|
||||
--add-flags $out/share/pomotroid/resources/app.asar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and visually-pleasing Pomodoro timer";
|
||||
homepage = "https://splode.github.io/pomotroid";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -41,9 +41,9 @@
|
||||
version = "2023-06-09";
|
||||
};
|
||||
};
|
||||
sha256 = "09b0i48sr5ynlhpya4lwnhgp081q4lqd23cc5l59dsxzh5ivbycb";
|
||||
sha256bin64 = "1d49qcjh5mhfzqzjn4ilj23dpzd6nyl1pij5iv43dwxl8z2r3l3m";
|
||||
version = "116.0.5845.179";
|
||||
sha256 = "152lyrw8k36gbmf4fmfny4ajqh0523y5d48yrshbgwn5klmbhaji";
|
||||
sha256bin64 = "118sk39939d52srws2vgs1mfizpikswxh5ihd9x053vzn0aj8cfa";
|
||||
version = "116.0.5845.187";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "polypane";
|
||||
version = "14.0.1";
|
||||
version = "14.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-UBWd8ApSb5YN5TUqSxv/352+jAwwRjiv/pM1rocqukk=";
|
||||
sha256 = "sha256-UJ4Ccz9PjpmZqJGbJjw3lyqR3VCl9xf3F6WUoBaUEVg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -40,7 +40,7 @@ let
|
||||
homepage = "https://www.nomadproject.io/";
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ];
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick ];
|
||||
};
|
||||
} // attrs');
|
||||
in
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rke2";
|
||||
version = "1.27.3+rke2r1";
|
||||
version = "1.27.5+rke2r1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M/3F97iNeXdMMhs0eoPODeBC6Jp+yo/PwlPiG28SfYU=";
|
||||
hash = "sha256-LKVz/oKt3WDf84KEEj4dRyjkRWZIWbOnEgG03EHvfGQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7Za8PQr22kvZBvoYRVbI4bXUvGWkfILQC+kAmw9ZCro=";
|
||||
vendorHash = "sha256-Ck3/sMvCLoXKtOIhn0uE8hHdTlPFjIT04l3zoZQNKPs=";
|
||||
|
||||
postPatch = ''
|
||||
# Patch the build scripts so they work in the Nix build environment.
|
||||
@ -36,5 +36,6 @@ buildGoModule rec {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zimbatm zygot ];
|
||||
mainProgram = "rke2";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ let
|
||||
Chili-Man
|
||||
babariviere
|
||||
kalbasit
|
||||
maxeaubrey
|
||||
amaxine
|
||||
timstott
|
||||
zimbatm
|
||||
zowoq
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, libdeltachat
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, noto-fonts-emoji
|
||||
, noto-fonts-color-emoji
|
||||
, pkg-config
|
||||
, python3
|
||||
, roboto
|
||||
@ -85,7 +85,7 @@ buildNpmPackage rec {
|
||||
install -D build/icon.png \
|
||||
$out/share/icons/hicolor/scalable/apps/deltachat.png
|
||||
|
||||
ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \
|
||||
ln -sf ${noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf \
|
||||
$out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji
|
||||
for font in $out/lib/node_modules/deltachat-desktop/html-dist/fonts/Roboto-*.ttf; do
|
||||
ln -sf ${roboto}/share/fonts/truetype/$(basename $font) \
|
||||
|
||||
@ -4,7 +4,7 @@ let
|
||||
stable = "0.0.29";
|
||||
ptb = "0.0.45";
|
||||
canary = "0.0.166";
|
||||
development = "0.0.217";
|
||||
development = "0.0.232";
|
||||
} else {
|
||||
stable = "0.0.273";
|
||||
ptb = "0.0.59";
|
||||
@ -28,7 +28,7 @@ let
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
sha256 = "sha256-fzNFKrYo5qckrWZAkkiK337czCt6nOM1O8FeG18Q8Y0=";
|
||||
sha256 = "sha256-AsHdQvDLzflhuYO8V4R+2zjQYpRo+aPa8HYXc3taayY=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
|
||||
@ -84,7 +84,7 @@ let
|
||||
changelog = "https://slack.com/release-notes";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ mmahut maxeaubrey ];
|
||||
maintainers = with maintainers; [ mmahut amaxine ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
|
||||
mainProgram = "slack";
|
||||
};
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rclone";
|
||||
version = "1.63.1";
|
||||
version = "1.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-H//Y7BFBr3VXAoKZZgjSgU4aA+Af7tvFozhpoj14ba0=";
|
||||
hash = "sha256-miXYBKUTmsqAvVLmxcVCpjgEO3HeKQpUZKSvzaxhqdU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y=";
|
||||
vendorHash = "sha256-rpF44yd8ElOkXTT1lSW0l3ZwTqeNdGS1OxrvNY8atzA=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "veryfasttree";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citiususc";
|
||||
repo = "veryfasttree";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-JMBhSxfGO3qz7Yl4s5r6zWHFefXGzu0ktEJdRUh/Uqg=";
|
||||
hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -47,6 +47,8 @@ mkDerivation rec {
|
||||
sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@ -86,6 +88,12 @@ mkDerivation rec {
|
||||
sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/nix-support $terminfo/share
|
||||
mv $out/share/terminfo $terminfo/share/
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.contour;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
inherit patches;
|
||||
|
||||
configFile = lib.optionalString (conf != null)
|
||||
@ -51,7 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
] ++ extraLibs;
|
||||
|
||||
preInstall = ''
|
||||
export TERMINFO=$out/share/terminfo
|
||||
export TERMINFO=$terminfo/share/terminfo
|
||||
mkdir -p $TERMINFO $out/nix-support
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
|
||||
version = "0.2.9";
|
||||
pname = "yaft";
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uobikiemukot";
|
||||
repo = "yaft";
|
||||
@ -15,6 +17,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/nix-support $terminfo/share
|
||||
mv $out/share/terminfo $terminfo/share/
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/uobikiemukot/yaft";
|
||||
description = "Yet another framebuffer terminal";
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-cliff";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "git-cliff";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EmpWJWvYxyg6m08Q77kRehtcVSQOm16ZdcmZWncLch4=";
|
||||
hash = "sha256-HD/g9zXE7w9x8o0ERBym5OZvODQ6n4a/bkzf457QPxM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ECTvfS09CglAavj8LJbfpxnaWQtsp4DZb7GMJHIeEAA=";
|
||||
cargoHash = "sha256-tTH5FMlOHv+T9rd0C7O2WaPkp2nUTQ3Ulsi16WiwbdE=";
|
||||
|
||||
# attempts to run the program on .git in src which is not deterministic
|
||||
doCheck = false;
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitnr";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reemus-dev";
|
||||
repo = "gitnr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5HZT/e53e2dUMFnT+4a5GJk3JqJu5+62yxrsnNfSqD8=";
|
||||
hash = "sha256-0LuQqDNyMd98cHCG3JDyRx/2hhjNlcGQ7n61Z264WzA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rO8qHa+GI76s5CN52aMa58W8ERuTWQtQ96jpLbXKzOs=";
|
||||
cargoHash = "sha256-H9aLOHdd2UP2YH/dptTwE0bzfFAJk7jwp3ecd0w8bjY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -7,12 +7,13 @@ rec {
|
||||
, mobyRev, mobyHash
|
||||
, runcRev, runcHash
|
||||
, containerdRev, containerdHash
|
||||
, tiniRev, tiniHash, buildxSupport ? true, composeSupport ? true
|
||||
, tiniRev, tiniHash
|
||||
, buildxSupport ? true, composeSupport ? true, sbomSupport ? false
|
||||
# package dependencies
|
||||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config, glibc
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute2, docker-buildx, docker-compose
|
||||
, sqlite, iproute2, docker-buildx, docker-compose, docker-sbom
|
||||
, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests
|
||||
, clientOnly ? !stdenv.isLinux, symlinkJoin
|
||||
@ -159,7 +160,8 @@ rec {
|
||||
});
|
||||
|
||||
plugins = lib.optional buildxSupport docker-buildx
|
||||
++ lib.optional composeSupport docker-compose;
|
||||
++ lib.optional composeSupport docker-compose
|
||||
++ lib.optional sbomSupport docker-sbom;
|
||||
pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; };
|
||||
in
|
||||
buildGoPackage (lib.optionalAttrs (!clientOnly) {
|
||||
@ -273,7 +275,7 @@ rec {
|
||||
To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline vdemeester periklis maxeaubrey ];
|
||||
maintainers = with maintainers; [ offline vdemeester periklis amaxine ];
|
||||
mainProgram = "docker";
|
||||
};
|
||||
});
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
diff --git a/test/cli/all_formats_expressible_test.go b/test/cli/all_formats_expressible_test.go
|
||||
index 3f40a46..5ba04e8 100644
|
||||
--- a/test/cli/all_formats_expressible_test.go
|
||||
+++ b/test/cli/all_formats_expressible_test.go
|
||||
@@ -8,7 +8,8 @@ import (
|
||||
"github.com/anchore/syft/syft"
|
||||
)
|
||||
|
||||
-func TestAllFormatsExpressible(t *testing.T) {
|
||||
+// Disabled because it needs a running docker daemon
|
||||
+func disabledTestAllFormatsExpressible(t *testing.T) {
|
||||
commonAssertions := []traitAssertion{
|
||||
func(tb testing.TB, stdout, _ string, _ int) {
|
||||
tb.Helper()
|
||||
diff --git a/test/cli/sbom_cmd_test.go b/test/cli/sbom_cmd_test.go
|
||||
index 0a0771c..a086c3b 100644
|
||||
--- a/test/cli/sbom_cmd_test.go
|
||||
+++ b/test/cli/sbom_cmd_test.go
|
||||
@@ -8,7 +8,8 @@ import (
|
||||
"github.com/docker/sbom-cli-plugin/internal"
|
||||
)
|
||||
|
||||
-func TestSBOMCmdFlags(t *testing.T) {
|
||||
+// Disabled because it needs a running docker daemon
|
||||
+func disabledTestSBOMCmdFlags(t *testing.T) {
|
||||
hiddenPackagesImage := getFixtureImage(t, "image-hidden-packages")
|
||||
coverageImage := getFixtureImage(t, "image-pkg-coverage")
|
||||
tmp := t.TempDir() + "/"
|
||||
43
pkgs/applications/virtualization/docker/sbom.nix
Normal file
43
pkgs/applications/virtualization/docker/sbom.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, docker
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-sbom";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "sbom-cli-plugin";
|
||||
rev = "tags/v${version}";
|
||||
hash = "sha256-i3gIogHb0oW/VDuZUo6LGBmvqs/XfMXjpvTTYeGCK7Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable tests that require a docker daemon to be running
|
||||
# in the sandbox
|
||||
./sbom-disable-tests.patch
|
||||
];
|
||||
|
||||
vendorHash = "sha256-XPPVAdY2NaasZ9bkf24VWWk3X5pjnryvsErYIWkeekc=";
|
||||
|
||||
nativeBuildInputs = [ docker ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D $GOPATH/bin/sbom-cli-plugin $out/libexec/docker/cli-plugins/docker-sbom
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/libexec/docker/cli-plugins/docker-sbom $out/bin/docker-sbom
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for Docker CLI to support SBOM creation using Syft";
|
||||
homepage = "https://github.com/docker/sbom-cli-plugin";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ raboof ];
|
||||
};
|
||||
}
|
||||
@ -165,7 +165,9 @@
|
||||
|
||||
dontInstall = true;
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
# NIX_NPM_TOKENS environment variable should be a JSON mapping in the shape of:
|
||||
# `{ "registry.example.com": "example-registry-bearer-token", ... }`
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_TOKENS" ];
|
||||
|
||||
SSL_CERT_FILE = if (hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash)
|
||||
then "${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
|
||||
@ -108,7 +108,7 @@ fn fixup_lockfile(
|
||||
|
||||
// Recursive helper to fixup v1 lockfile deps
|
||||
fn fixup_v1_deps(
|
||||
dependencies: &mut serde_json::Map<String, Value>,
|
||||
dependencies: &mut Map<String, Value>,
|
||||
cache: &Option<HashMap<String, String>>,
|
||||
fixed: &mut bool,
|
||||
) {
|
||||
|
||||
@ -139,9 +139,9 @@ impl Package {
|
||||
None => Specifics::Registry {
|
||||
integrity: pkg
|
||||
.integrity
|
||||
.expect("non-git dependencies should have assosciated integrity")
|
||||
.expect("non-git dependencies should have associated integrity")
|
||||
.into_best()
|
||||
.expect("non-git dependencies should have non-empty assosciated integrity"),
|
||||
.expect("non-git dependencies should have non-empty associated integrity"),
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@ use isahc::{
|
||||
config::{CaCertificate, Configurable, RedirectPolicy, SslOption},
|
||||
Body, Request, RequestExt,
|
||||
};
|
||||
use serde_json::{Map, Value};
|
||||
use std::{env, path::Path};
|
||||
use url::Url;
|
||||
|
||||
@ -22,6 +23,18 @@ pub fn get_url(url: &Url) -> Result<Body, isahc::Error> {
|
||||
}
|
||||
}
|
||||
|
||||
// Respect NIX_NPM_TOKENS environment variable, which should be a JSON mapping in the shape of:
|
||||
// `{ "registry.example.com": "example-registry-bearer-token", ... }`
|
||||
if let Some(host) = url.host_str() {
|
||||
if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") {
|
||||
if let Ok(tokens) = serde_json::from_str::<Map<String, Value>>(&npm_tokens) {
|
||||
if let Some(token) = tokens.get(host).and_then(|val| val.as_str()) {
|
||||
request = request.header("Authorization", format!("Bearer {token}"));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(request.body(())?.send()?.into_body())
|
||||
}
|
||||
|
||||
|
||||
@ -72,6 +72,22 @@ libfoo = callPackage ../by-name/so/some-package/package.nix {
|
||||
};
|
||||
```
|
||||
|
||||
## Manual migration guidelines
|
||||
|
||||
Most packages are still defined in `all-packages.nix` and the [category hierarchy](../README.md#category-hierarchy).
|
||||
Please hold off migrating your maintained packages to this directory.
|
||||
|
||||
1. An automated migration for the majority of packages [is being worked on](https://github.com/NixOS/nixpkgs/pull/211832).
|
||||
In order to save on contributor and reviewer time, packages should only be migrated manually afterwards if they couldn't be migrated automatically.
|
||||
|
||||
1. Manual migrations should only be lightly encouraged if the relevant code is being worked on anyways.
|
||||
For example with a package update or refactoring.
|
||||
|
||||
1. Manual migrations should not remove definitions from `all-packages.nix` with custom arguments.
|
||||
That is a backwards-incompatible change because it changes the `.override` interface.
|
||||
Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`.
|
||||
See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults).
|
||||
|
||||
## Limitations
|
||||
|
||||
There's some limitations as to which packages can be defined using this structure:
|
||||
|
||||
31
pkgs/by-name/qu/quicktype/package.nix
Normal file
31
pkgs/by-name/qu/quicktype/package.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub, jq }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "quicktype";
|
||||
version = "23.0.75"; # version from https://npm.im/quicktype
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quicktype";
|
||||
repo = "quicktype";
|
||||
rev = "9b570a73a896306778940c793c0037a38815304a"; # version not tagged
|
||||
hash = "sha256-boCBgIoM2GECipZTJlp9IaeXT24aR8tawS1X8CFDDqw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cat <<< $(${jq}/bin/jq '.version = "${version}"' package.json) > package.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-RA4HVQfB/ge1aIKl9HiUT7vUM5n+Ro6N2D6xj1dgSu8=";
|
||||
|
||||
postInstall = ''
|
||||
mv packages/ $out/lib/node_modules/quicktype/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate types and converters from JSON, Schema, and GraphQL";
|
||||
homepage = "https://quicktype.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
mainProgram = "quicktype";
|
||||
};
|
||||
}
|
||||
39
pkgs/by-name/sl/sleek-grub-theme/package.nix
Normal file
39
pkgs/by-name/sl/sleek-grub-theme/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, withBanner ? "Grub Bootloader" # use override to specify your own banner text
|
||||
, withStyle ? "white" # use override to specify one of "dark" / "orange" / "bigSur"
|
||||
}:
|
||||
|
||||
assert builtins.any (s: withStyle == s) ["white" "dark" "orange" "bigSur"];
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sleek-grub-theme";
|
||||
version = "unstable-2022-06-04";
|
||||
|
||||
src = fetchFromGitHub ({
|
||||
owner = "sandesh236";
|
||||
repo = "sleek--themes";
|
||||
rev = "981326a8e35985dc23f1b066fdbe66ff09df2371";
|
||||
hash = "sha256-yD4JuoFGTXE/aI76EtP4rEWCc5UdFGi7Ojys6Yp8Z58=";
|
||||
});
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/
|
||||
|
||||
cp -r 'Sleek theme-${withStyle}'/sleek/* $out/
|
||||
sed -i "s/Grub Bootloader/${withBanner}/" $out/theme.txt
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Grub bootloader themes, contains light/dark/orange/bigSur styles";
|
||||
homepage = "https://github.com/sandesh236/sleek--themes";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ luochen1990 ];
|
||||
};
|
||||
}
|
||||
@ -164,7 +164,7 @@ rec {
|
||||
sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg=";
|
||||
};
|
||||
|
||||
noto-fonts-emoji =
|
||||
noto-fonts-color-emoji =
|
||||
let
|
||||
version = "2.038";
|
||||
emojiPythonEnv =
|
||||
@ -217,7 +217,7 @@ rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Color and Black-and-White emoji fonts";
|
||||
description = "Color emoji font";
|
||||
homepage = "https://github.com/googlefonts/noto-emoji";
|
||||
license = with licenses; [ ofl asl20 ];
|
||||
platforms = platforms.all;
|
||||
@ -225,6 +225,50 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
noto-fonts-monochrome-emoji =
|
||||
# Metadata fetched from
|
||||
# https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=Noto+Emoji
|
||||
let metadata = with builtins; head (fromJSON (readFile ./noto-emoji.json)).items;
|
||||
urlHashes = with builtins; fromJSON (readFile ./noto-emoji.hashes.json);
|
||||
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "noto-fonts-monochrome-emoji";
|
||||
version = "${lib.removePrefix "v" metadata.version}.${metadata.lastModified}";
|
||||
preferLocalBuild = true;
|
||||
|
||||
dontUnpack = true;
|
||||
srcs = let
|
||||
weightNames = {
|
||||
"300" = "Light";
|
||||
regular = "Regular";
|
||||
"500" = "Medium";
|
||||
"600" = "SemiBold";
|
||||
"700" = "Bold";
|
||||
};
|
||||
in lib.mapAttrsToList
|
||||
(variant: url: fetchurl { name = "NotoEmoji-${weightNames.${variant}}.ttf";
|
||||
hash = urlHashes.${url};
|
||||
inherit url; } )
|
||||
metadata.files;
|
||||
|
||||
installPhase = ''
|
||||
for src in $srcs; do
|
||||
install -D $src $out/share/fonts/noto/$(stripHash $src)
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Monochrome emoji font";
|
||||
homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji";
|
||||
license = [ licenses.ofl ];
|
||||
maintainers = [ maintainers.nicoo ];
|
||||
|
||||
platforms = platforms.all;
|
||||
sourceProvenance = [ sourceTypes.binaryBytecode ];
|
||||
};
|
||||
};
|
||||
|
||||
noto-fonts-emoji-blob-bin =
|
||||
let
|
||||
pname = "noto-fonts-emoji-blob-bin";
|
||||
|
||||
7
pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json
Normal file
7
pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-9ndQqJJzsCkR6KcYRNVW3wXWMxcH+0QzFgQQdCG8vSo=",
|
||||
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-AXGLdWebddyJhTKMW/D/6tW8ODcaXrUM96m2hN9wYlg=",
|
||||
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-wzF9kKNMeQTYZ2QUT5pIgauhl2qMpZ2nMLNTeAJuqtQ=",
|
||||
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-NIelE8X+lKtH6yT3eFPZV7zYUR3Y5GnNobAbf7AckR0=",
|
||||
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-zkJuJ8YlTrUV+28wHIqny3yQvjvZqEPG4WXYmaLcY8A="
|
||||
}
|
||||
30
pkgs/data/fonts/noto-fonts/noto-emoji.json
Normal file
30
pkgs/data/fonts/noto-fonts/noto-emoji.json
Normal file
@ -0,0 +1,30 @@
|
||||
{
|
||||
"kind": "webfonts#webfontList",
|
||||
"items": [
|
||||
{
|
||||
"family": "Noto Emoji",
|
||||
"variants": [
|
||||
"300",
|
||||
"regular",
|
||||
"500",
|
||||
"600",
|
||||
"700"
|
||||
],
|
||||
"subsets": [
|
||||
"emoji"
|
||||
],
|
||||
"version": "v46",
|
||||
"lastModified": "2023-09-07",
|
||||
"files": {
|
||||
"300": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf",
|
||||
"regular": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf",
|
||||
"500": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf",
|
||||
"600": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf",
|
||||
"700": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf"
|
||||
},
|
||||
"category": "sans-serif",
|
||||
"kind": "webfonts#webfont",
|
||||
"menu": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf"
|
||||
}
|
||||
]
|
||||
}
|
||||
183
pkgs/data/fonts/noto-fonts/noto-emoji.py
Executable file
183
pkgs/data/fonts/noto-fonts/noto-emoji.py
Executable file
@ -0,0 +1,183 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i "python3 -I" -p python3
|
||||
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
from typing import Iterable, Optional
|
||||
from urllib import request
|
||||
|
||||
import hashlib, json
|
||||
|
||||
|
||||
def getMetadata(apiKey: str, family: str = "Noto Emoji"):
|
||||
'''Fetch the Google Fonts metadata for a given family.
|
||||
|
||||
An API key can be obtained by anyone with a Google account (🚮) from
|
||||
`https://developers.google.com/fonts/docs/developer_api#APIKey`
|
||||
'''
|
||||
from urllib.parse import urlencode
|
||||
|
||||
with request.urlopen(
|
||||
"https://www.googleapis.com/webfonts/v1/webfonts?" +
|
||||
urlencode({ 'key': apiKey, 'family': family })
|
||||
) as req:
|
||||
return json.load(req)
|
||||
|
||||
def getUrls(metadata) -> Iterable[str]:
|
||||
'''Fetch all files' URLs from Google Fonts' metadata.
|
||||
|
||||
The metadata must obey the API v1 schema, and can be obtained from:
|
||||
https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=${FAMILY}
|
||||
'''
|
||||
return ( url for i in metadata['items'] for _, url in i['files'].items() )
|
||||
|
||||
|
||||
def hashUrl(url: str, *, hash: str = 'sha256'):
|
||||
'''Compute the hash of the data from HTTP GETing a given `url`.
|
||||
|
||||
The `hash` must be an algorithm name `hashlib.new` accepts.
|
||||
'''
|
||||
with request.urlopen(url) as req:
|
||||
return hashlib.new(hash, req.read())
|
||||
|
||||
|
||||
def sriEncode(h) -> str:
|
||||
'''Encode a hash in the SRI format.
|
||||
|
||||
Takes a `hashlib` object, and produces a string that
|
||||
nixpkgs' `fetchurl` accepts as `hash` parameter.
|
||||
'''
|
||||
from base64 import b64encode
|
||||
return f"{h.name}-{b64encode(h.digest()).decode()}"
|
||||
|
||||
def validateSRI(sri: Optional[str]) -> Optional[str]:
|
||||
'''Decode an SRI hash, return `None` if invalid.
|
||||
|
||||
This is not a full SRI hash parser, hash options aren't supported.
|
||||
'''
|
||||
from base64 import b64decode
|
||||
|
||||
if sri is None:
|
||||
return None
|
||||
|
||||
try:
|
||||
hashName, b64 = sri.split('-', 1)
|
||||
|
||||
h = hashlib.new(hashName)
|
||||
digest = b64decode(b64, validate=True)
|
||||
assert len(digest) == h.digest_size
|
||||
|
||||
except:
|
||||
return None
|
||||
else:
|
||||
return sri
|
||||
|
||||
|
||||
def hashUrls(
|
||||
urls: Iterable[str],
|
||||
knownHashes: dict[str, str] = {},
|
||||
) -> dict[str, str]:
|
||||
'''Generate a `dict` mapping URLs to SRI-encoded hashes.
|
||||
|
||||
The `knownHashes` optional parameter can be used to avoid
|
||||
re-downloading files whose URL have not changed.
|
||||
'''
|
||||
return {
|
||||
url: validateSRI(knownHashes.get(url)) or sriEncode(hashUrl(url))
|
||||
for url in urls
|
||||
}
|
||||
|
||||
|
||||
@contextmanager
|
||||
def atomicFileUpdate(target: Path):
|
||||
'''Atomically replace the contents of a file.
|
||||
|
||||
Yields an open file to write into; upon exiting the context,
|
||||
the file is closed and (atomically) replaces the `target`.
|
||||
|
||||
Guarantees that the `target` was either successfully overwritten
|
||||
with new content and no exception was raised, or the temporary
|
||||
file was cleaned up.
|
||||
'''
|
||||
from tempfile import mkstemp
|
||||
fd, _p = mkstemp(
|
||||
dir = target.parent,
|
||||
prefix = target.name,
|
||||
)
|
||||
tmpPath = Path(_p)
|
||||
|
||||
try:
|
||||
with open(fd, 'w') as f:
|
||||
yield f
|
||||
|
||||
tmpPath.replace(target)
|
||||
|
||||
except Exception:
|
||||
tmpPath.unlink(missing_ok = True)
|
||||
raise
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
from os import environ
|
||||
from urllib.error import HTTPError
|
||||
|
||||
environVar = 'GOOGLE_FONTS_TOKEN'
|
||||
currentDir = Path(__file__).parent
|
||||
metadataPath = currentDir / 'noto-emoji.json'
|
||||
|
||||
try:
|
||||
apiToken = environ[environVar]
|
||||
metadata = getMetadata(apiToken)
|
||||
|
||||
except (KeyError, HTTPError) as exn:
|
||||
# No API key in the environment, or the query was rejected.
|
||||
match exn:
|
||||
case KeyError if exn.args[0] == environVar:
|
||||
print(f"No '{environVar}' in the environment, "
|
||||
"skipping metadata update")
|
||||
|
||||
case HTTPError if exn.getcode() == 403:
|
||||
print("Got HTTP 403 (Forbidden)")
|
||||
if apiToken != '':
|
||||
print("Your Google API key appears to be valid "
|
||||
"but does not grant access to the fonts API.")
|
||||
print("Aborting!")
|
||||
raise SystemExit(1)
|
||||
|
||||
case HTTPError if exn.getcode() == 400:
|
||||
# Printing the supposed token should be fine, as this is
|
||||
# what the API returns on invalid tokens.
|
||||
print(f"Got HTTP 400 (Bad Request), is this really an API token: '{apiToken}' ?")
|
||||
case _:
|
||||
# Unknown error, let's bubble it up
|
||||
raise
|
||||
|
||||
# In that case just use the existing metadata
|
||||
with metadataPath.open() as metadataFile:
|
||||
metadata = json.load(metadataFile)
|
||||
|
||||
lastModified = metadata["items"][0]["lastModified"];
|
||||
print(f"Using metadata from file, last modified {lastModified}")
|
||||
|
||||
else:
|
||||
# If metadata was successfully fetched, validate and persist it
|
||||
lastModified = metadata["items"][0]["lastModified"];
|
||||
print(f"Fetched current metadata, last modified {lastModified}")
|
||||
with atomicFileUpdate(metadataPath) as metadataFile:
|
||||
json.dump(metadata, metadataFile, indent = 2)
|
||||
metadataFile.write("\n") # Pacify nixpkgs' dumb editor config check
|
||||
|
||||
hashPath = currentDir / 'noto-emoji.hashes.json'
|
||||
try:
|
||||
with hashPath.open() as hashFile:
|
||||
hashes = json.load(hashFile)
|
||||
except FileNotFoundError:
|
||||
hashes = {}
|
||||
|
||||
with atomicFileUpdate(hashPath) as hashFile:
|
||||
json.dump(
|
||||
hashUrls(getUrls(metadata), knownHashes = hashes),
|
||||
hashFile,
|
||||
indent = 2,
|
||||
)
|
||||
hashFile.write("\n") # Pacify nixpkgs' dumb editor config check
|
||||
@ -10,7 +10,7 @@
|
||||
, python3
|
||||
, which
|
||||
, zopfli
|
||||
, noto-fonts-emoji
|
||||
, noto-fonts-color-emoji
|
||||
}:
|
||||
|
||||
let
|
||||
@ -33,15 +33,15 @@ stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
srcs = [
|
||||
noto-fonts-emoji.src
|
||||
noto-fonts-color-emoji.src
|
||||
twemojiSrc
|
||||
];
|
||||
|
||||
sourceRoot = noto-fonts-emoji.src.name;
|
||||
sourceRoot = noto-fonts-color-emoji.src.name;
|
||||
|
||||
postUnpack = ''
|
||||
chmod -R +w ${twemojiSrc.name}
|
||||
mv ${twemojiSrc.name} ${noto-fonts-emoji.src.name}
|
||||
mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
"s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#"
|
||||
];
|
||||
in ''
|
||||
${noto-fonts-emoji.postPatch}
|
||||
${noto-fonts-color-emoji.postPatch}
|
||||
|
||||
sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl
|
||||
pushd ${twemojiSrc.name}/assets/72x72/
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "23.08.16";
|
||||
version = "23.09.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FXWue9CiX2zh7FXLnlG+SOto2Z4oznWNYpgZlMvVGn4=";
|
||||
sha256 = "sha256-9GTNE9Gt+dxdfOLD0Qv1utSkwigalAPxixGSC5Nj8XM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "23.08.16";
|
||||
version = "23.09.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zlh3Jh3ZrNo58ijGPwdaiHnTFoT6L3ZC0VTRY0Se3qs=";
|
||||
sha256 = "sha256-YipdEvmQnqiuxheYS+y5t37uonzr/nH54PVLm4xp31E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/ubuntu/yaru";
|
||||
license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fortuneteller2k maxeaubrey ];
|
||||
maintainers = with maintainers; [ fortuneteller2k amaxine ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Integrates maximized windows with the top panel";
|
||||
homepage = "https://github.com/poehlerj/no-title-bar";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jonafato svsdep maxeaubrey ];
|
||||
maintainers = with maintainers; [ jonafato svsdep amaxine ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ let
|
||||
homepage = "https://wiki.gnome.org/Projects/Vala";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ antono jtojnar maxeaubrey ] ++ teams.pantheon.members;
|
||||
maintainers = with maintainers; [ antono jtojnar amaxine ] ++ teams.pantheon.members;
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@ -93,10 +93,12 @@ mapAliases {
|
||||
inherit (pkgs) markdownlint-cli2; # added 2023-08-22
|
||||
mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
|
||||
musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
|
||||
inherit (pkgs) near-cli; # added 2023-09-09
|
||||
node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
|
||||
inherit (pkgs) npm-check-updates; # added 2023-08-22
|
||||
ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
|
||||
parcel-bundler = parcel; # added 2023-09-04
|
||||
inherit (pkgs) quicktype; # added 2023-09-09
|
||||
inherit (pkgs) react-static; # added 2023-08-21
|
||||
readability-cli = pkgs.readability-cli; # Added 2023-06-12
|
||||
reveal-md = pkgs.reveal-md; # added 2023-07-31
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
less = "lessc";
|
||||
localtunnel = "lt";
|
||||
lua-fmt = "luafmt";
|
||||
near-cli = "near";
|
||||
neovim = "neovim-node-host";
|
||||
parsoid = "parse.js";
|
||||
poor-mans-t-sql-formatter-cli = "sqlformat";
|
||||
|
||||
@ -177,7 +177,6 @@
|
||||
, "meat"
|
||||
, "mocha"
|
||||
, "multi-file-swagger"
|
||||
, "near-cli"
|
||||
, "neovim"
|
||||
, "nijs"
|
||||
, "node-gyp"
|
||||
@ -216,7 +215,6 @@
|
||||
, "purty"
|
||||
, "pxder"
|
||||
, "pyright"
|
||||
, "quicktype"
|
||||
, "react-native-cli"
|
||||
, "react-tools"
|
||||
, "redoc-cli"
|
||||
|
||||
536
pkgs/development/node-packages/node-packages.nix
generated
536
pkgs/development/node-packages/node-packages.nix
generated
@ -97313,374 +97313,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
near-cli = nodeEnv.buildNodePackage {
|
||||
name = "near-cli";
|
||||
packageName = "near-cli";
|
||||
version = "3.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/near-cli/-/near-cli-3.4.2.tgz";
|
||||
sha512 = "0EaNAw5SKSIIJrJajG32CNMGfBtZTgIrOVKSXBTWpvo+F0OozsbvuO4UG3ZSRNThXHijxybp58SqPiU3JuzXGA==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@babel/code-frame-7.22.10" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-3.2.1"
|
||||
sources."chalk-2.4.2"
|
||||
sources."color-convert-1.9.3"
|
||||
sources."color-name-1.1.3"
|
||||
sources."has-flag-3.0.0"
|
||||
sources."supports-color-5.5.0"
|
||||
];
|
||||
})
|
||||
sources."@babel/helper-validator-identifier-7.22.5"
|
||||
(sources."@babel/highlight-7.22.10" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-3.2.1"
|
||||
sources."chalk-2.4.2"
|
||||
sources."color-convert-1.9.3"
|
||||
sources."color-name-1.1.3"
|
||||
sources."has-flag-3.0.0"
|
||||
sources."supports-color-5.5.0"
|
||||
];
|
||||
})
|
||||
sources."@jest/environment-27.5.1"
|
||||
sources."@jest/fake-timers-27.5.1"
|
||||
sources."@jest/types-27.5.1"
|
||||
sources."@ledgerhq/devices-8.0.7"
|
||||
sources."@ledgerhq/errors-6.14.0"
|
||||
sources."@ledgerhq/hw-transport-6.28.8"
|
||||
sources."@ledgerhq/hw-transport-node-hid-6.27.21"
|
||||
sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.19"
|
||||
(sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // {
|
||||
dependencies = [
|
||||
sources."@ledgerhq/devices-5.51.1"
|
||||
sources."@ledgerhq/errors-5.50.0"
|
||||
sources."@ledgerhq/hw-transport-5.51.1"
|
||||
sources."@ledgerhq/logs-5.50.0"
|
||||
];
|
||||
})
|
||||
(sources."@ledgerhq/hw-transport-webhid-5.51.1" // {
|
||||
dependencies = [
|
||||
sources."@ledgerhq/devices-5.51.1"
|
||||
sources."@ledgerhq/errors-5.50.0"
|
||||
sources."@ledgerhq/hw-transport-5.51.1"
|
||||
sources."@ledgerhq/logs-5.50.0"
|
||||
];
|
||||
})
|
||||
(sources."@ledgerhq/hw-transport-webusb-5.53.1" // {
|
||||
dependencies = [
|
||||
sources."@ledgerhq/devices-5.51.1"
|
||||
sources."@ledgerhq/errors-5.50.0"
|
||||
sources."@ledgerhq/hw-transport-5.51.1"
|
||||
sources."@ledgerhq/logs-5.50.0"
|
||||
];
|
||||
})
|
||||
sources."@ledgerhq/logs-6.10.1"
|
||||
sources."@segment/loosely-validate-event-2.0.0"
|
||||
sources."@sindresorhus/is-0.14.0"
|
||||
sources."@sinonjs/commons-1.8.6"
|
||||
sources."@sinonjs/fake-timers-8.1.0"
|
||||
sources."@szmarczak/http-timer-1.1.2"
|
||||
sources."@types/istanbul-lib-coverage-2.0.4"
|
||||
sources."@types/istanbul-lib-report-3.0.0"
|
||||
sources."@types/istanbul-reports-3.0.1"
|
||||
sources."@types/node-20.5.3"
|
||||
sources."@types/stack-utils-2.0.1"
|
||||
sources."@types/w3c-web-usb-1.0.6"
|
||||
sources."@types/yargs-16.0.5"
|
||||
sources."@types/yargs-parser-21.0.0"
|
||||
sources."analytics-node-6.2.0"
|
||||
sources."ansi-align-3.0.1"
|
||||
sources."ansi-regex-5.0.1"
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."ascii-table-0.0.9"
|
||||
sources."asynckit-0.4.0"
|
||||
sources."axios-0.27.2"
|
||||
sources."axios-retry-3.2.0"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."base-x-3.0.9"
|
||||
sources."base64-js-1.5.1"
|
||||
sources."bindings-1.5.0"
|
||||
(sources."bip39-3.0.2" // {
|
||||
dependencies = [
|
||||
sources."@types/node-11.11.6"
|
||||
];
|
||||
})
|
||||
sources."bip39-light-1.0.7"
|
||||
sources."bl-4.1.0"
|
||||
sources."bn.js-5.2.1"
|
||||
sources."borsh-0.6.0"
|
||||
sources."boxen-5.1.2"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."braces-3.0.2"
|
||||
sources."bs58-4.0.1"
|
||||
sources."buffer-5.7.1"
|
||||
(sources."cacheable-request-6.1.0" // {
|
||||
dependencies = [
|
||||
sources."get-stream-5.2.0"
|
||||
sources."lowercase-keys-2.0.0"
|
||||
];
|
||||
})
|
||||
sources."camelcase-6.3.0"
|
||||
sources."capability-0.2.5"
|
||||
sources."chalk-4.1.2"
|
||||
sources."charenc-0.0.2"
|
||||
sources."chownr-1.1.4"
|
||||
sources."ci-info-2.0.0"
|
||||
sources."cipher-base-1.0.4"
|
||||
sources."cli-boxes-2.2.1"
|
||||
sources."cliui-7.0.4"
|
||||
sources."clone-response-1.0.3"
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."combined-stream-1.0.8"
|
||||
sources."component-type-1.2.1"
|
||||
sources."concat-map-0.0.1"
|
||||
sources."configstore-5.0.1"
|
||||
sources."create-hash-1.2.0"
|
||||
sources."create-hmac-1.1.7"
|
||||
sources."crypt-0.0.2"
|
||||
sources."crypto-random-string-2.0.0"
|
||||
(sources."debug-4.3.1" // {
|
||||
dependencies = [
|
||||
sources."ms-2.1.2"
|
||||
];
|
||||
})
|
||||
sources."decompress-response-3.3.0"
|
||||
sources."deep-extend-0.6.0"
|
||||
sources."deep-is-0.1.4"
|
||||
sources."defer-to-connect-1.1.3"
|
||||
sources."define-lazy-prop-2.0.0"
|
||||
sources."delayed-stream-1.0.0"
|
||||
sources."depd-2.0.0"
|
||||
sources."detect-libc-2.0.2"
|
||||
sources."dot-prop-5.3.0"
|
||||
sources."duplexer3-0.1.5"
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."encoding-0.1.13"
|
||||
sources."end-of-stream-1.4.4"
|
||||
sources."error-polyfill-0.1.3"
|
||||
sources."escalade-3.1.1"
|
||||
sources."escape-goat-2.1.1"
|
||||
sources."escape-string-regexp-1.0.5"
|
||||
sources."events-3.3.0"
|
||||
sources."expand-template-2.0.3"
|
||||
sources."file-uri-to-path-1.0.0"
|
||||
sources."fill-range-7.0.1"
|
||||
sources."flagged-respawn-1.0.1"
|
||||
sources."follow-redirects-1.15.2"
|
||||
sources."form-data-4.0.0"
|
||||
sources."fs-constants-1.0.0"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."get-caller-file-2.0.5"
|
||||
sources."get-stream-4.1.0"
|
||||
sources."github-from-package-0.0.0"
|
||||
sources."glob-7.2.3"
|
||||
sources."global-dirs-3.0.1"
|
||||
sources."got-9.6.0"
|
||||
sources."graceful-fs-4.2.11"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."has-yarn-2.1.0"
|
||||
sources."hash-base-3.1.0"
|
||||
sources."homedir-polyfill-1.0.3"
|
||||
sources."http-cache-semantics-4.1.1"
|
||||
(sources."http-errors-1.8.1" // {
|
||||
dependencies = [
|
||||
sources."depd-1.1.2"
|
||||
];
|
||||
})
|
||||
sources."iconv-lite-0.6.3"
|
||||
sources."ieee754-1.2.1"
|
||||
sources."import-lazy-2.1.0"
|
||||
sources."imurmurhash-0.1.4"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."ini-2.0.0"
|
||||
sources."ip-regex-4.3.0"
|
||||
sources."is-buffer-1.1.6"
|
||||
sources."is-ci-2.0.0"
|
||||
sources."is-docker-2.2.1"
|
||||
sources."is-fullwidth-code-point-3.0.0"
|
||||
sources."is-installed-globally-0.4.0"
|
||||
sources."is-npm-5.0.0"
|
||||
sources."is-number-7.0.0"
|
||||
sources."is-obj-2.0.0"
|
||||
sources."is-path-inside-3.0.3"
|
||||
sources."is-retry-allowed-1.2.0"
|
||||
sources."is-typedarray-1.0.0"
|
||||
sources."is-url-1.2.4"
|
||||
sources."is-wsl-2.2.0"
|
||||
sources."is-yarn-global-0.3.0"
|
||||
sources."is2-2.0.9"
|
||||
sources."jest-environment-node-27.5.1"
|
||||
sources."jest-message-util-27.5.1"
|
||||
sources."jest-mock-27.5.1"
|
||||
(sources."jest-util-27.5.1" // {
|
||||
dependencies = [
|
||||
sources."ci-info-3.8.0"
|
||||
];
|
||||
})
|
||||
sources."join-component-1.1.0"
|
||||
sources."js-sha256-0.9.0"
|
||||
sources."js-tokens-4.0.0"
|
||||
sources."json-buffer-3.0.0"
|
||||
sources."keyv-3.1.0"
|
||||
sources."latest-version-5.1.0"
|
||||
sources."lodash-4.17.21"
|
||||
sources."lodash.isstring-4.0.1"
|
||||
sources."lowercase-keys-1.0.1"
|
||||
sources."lru-cache-6.0.0"
|
||||
(sources."make-dir-3.1.0" // {
|
||||
dependencies = [
|
||||
sources."semver-6.3.1"
|
||||
];
|
||||
})
|
||||
sources."md5-2.3.0"
|
||||
sources."md5.js-1.3.5"
|
||||
sources."micromatch-4.0.5"
|
||||
sources."mime-db-1.52.0"
|
||||
sources."mime-types-2.1.35"
|
||||
sources."mimic-response-1.0.1"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."minimist-1.2.8"
|
||||
sources."mkdirp-classic-0.5.3"
|
||||
sources."ms-2.1.3"
|
||||
sources."mustache-4.2.0"
|
||||
sources."napi-build-utils-1.0.2"
|
||||
sources."ncp-2.0.0"
|
||||
(sources."near-api-js-0.44.2" // {
|
||||
dependencies = [
|
||||
sources."bn.js-5.2.0"
|
||||
];
|
||||
})
|
||||
sources."near-hd-key-1.2.1"
|
||||
sources."near-ledger-js-0.2.1"
|
||||
sources."near-seed-phrase-0.2.0"
|
||||
sources."node-abi-3.47.0"
|
||||
sources."node-addon-api-3.2.1"
|
||||
sources."node-fetch-2.6.13"
|
||||
sources."node-gyp-build-4.6.0"
|
||||
sources."node-hid-2.1.2"
|
||||
sources."normalize-url-4.5.1"
|
||||
sources."o3-1.0.3"
|
||||
sources."once-1.4.0"
|
||||
sources."open-8.4.2"
|
||||
sources."p-cancelable-1.1.0"
|
||||
(sources."package-json-6.5.0" // {
|
||||
dependencies = [
|
||||
sources."semver-6.3.1"
|
||||
];
|
||||
})
|
||||
sources."parse-passwd-1.0.0"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."pbkdf2-3.1.2"
|
||||
sources."picomatch-2.3.1"
|
||||
sources."platform-1.3.6"
|
||||
sources."prebuild-install-7.1.1"
|
||||
sources."prepend-http-2.0.0"
|
||||
(sources."pretty-format-27.5.1" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-5.2.0"
|
||||
];
|
||||
})
|
||||
sources."pump-3.0.0"
|
||||
sources."pupa-2.1.1"
|
||||
sources."randombytes-2.1.0"
|
||||
(sources."rc-1.2.8" // {
|
||||
dependencies = [
|
||||
sources."ini-1.3.8"
|
||||
];
|
||||
})
|
||||
sources."react-is-17.0.2"
|
||||
sources."readable-stream-3.6.2"
|
||||
sources."registry-auth-token-4.2.2"
|
||||
sources."registry-url-5.1.0"
|
||||
sources."remove-trailing-slash-0.1.1"
|
||||
sources."require-directory-2.1.1"
|
||||
sources."responselike-1.0.2"
|
||||
sources."rimraf-3.0.2"
|
||||
sources."ripemd160-2.0.2"
|
||||
sources."rxjs-6.6.7"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."semver-7.5.4"
|
||||
(sources."semver-diff-3.1.1" // {
|
||||
dependencies = [
|
||||
sources."semver-6.3.1"
|
||||
];
|
||||
})
|
||||
sources."setprototypeof-1.2.0"
|
||||
sources."sha.js-2.4.11"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-concat-1.0.1"
|
||||
(sources."simple-get-4.0.1" // {
|
||||
dependencies = [
|
||||
sources."decompress-response-6.0.0"
|
||||
sources."mimic-response-3.1.0"
|
||||
];
|
||||
})
|
||||
sources."slash-3.0.0"
|
||||
(sources."stack-utils-2.0.6" // {
|
||||
dependencies = [
|
||||
sources."escape-string-regexp-2.0.0"
|
||||
];
|
||||
})
|
||||
sources."statuses-1.5.0"
|
||||
sources."stoppable-1.1.0"
|
||||
sources."string-width-4.2.3"
|
||||
sources."string_decoder-1.3.0"
|
||||
sources."strip-ansi-6.0.1"
|
||||
sources."strip-json-comments-2.0.1"
|
||||
sources."supports-color-7.2.0"
|
||||
sources."tar-fs-2.1.1"
|
||||
sources."tar-stream-2.2.0"
|
||||
sources."tcp-port-used-1.0.2"
|
||||
sources."text-encoding-utf-8-1.0.2"
|
||||
sources."to-readable-stream-1.0.0"
|
||||
sources."to-regex-range-5.0.1"
|
||||
sources."toidentifier-1.0.1"
|
||||
sources."tr46-0.0.3"
|
||||
sources."tslib-1.14.1"
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."tweetnacl-1.0.3"
|
||||
sources."type-detect-4.0.8"
|
||||
sources."type-fest-0.20.2"
|
||||
sources."typedarray-to-buffer-3.1.5"
|
||||
sources."u2f-api-0.2.7"
|
||||
sources."u3-0.1.1"
|
||||
sources."unique-string-2.0.0"
|
||||
sources."update-notifier-5.1.0"
|
||||
sources."url-parse-lax-3.0.0"
|
||||
(sources."usb-2.9.0" // {
|
||||
dependencies = [
|
||||
sources."node-addon-api-6.1.0"
|
||||
];
|
||||
})
|
||||
sources."util-deprecate-1.0.2"
|
||||
sources."uuid-8.3.2"
|
||||
sources."v8flags-3.2.0"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
sources."widest-line-3.1.0"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."write-file-atomic-3.0.3"
|
||||
sources."xdg-basedir-4.0.0"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yallist-4.0.0"
|
||||
sources."yargs-16.2.0"
|
||||
sources."yargs-parser-20.2.9"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "General purpose command line tools for interacting with NEAR Protocol";
|
||||
homepage = "https://github.com/near/near-cli#readme";
|
||||
license = "(MIT AND Apache-2.0)";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
neovim = nodeEnv.buildNodePackage {
|
||||
name = "neovim";
|
||||
packageName = "neovim";
|
||||
@ -102904,174 +102536,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
quicktype = nodeEnv.buildNodePackage {
|
||||
name = "quicktype";
|
||||
packageName = "quicktype";
|
||||
version = "23.0.71";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.71.tgz";
|
||||
sha512 = "MPPTnromb8qSKPU5UdLyp9Kzkj8YhmmOfw5y1ZvBLnzNjVG2QVqlwyLkUL9NTfmKszb0/047p3hiznEnFGn4EA==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@75lb/deep-merge-1.1.1" // {
|
||||
dependencies = [
|
||||
sources."typical-7.1.1"
|
||||
];
|
||||
})
|
||||
sources."@cspotcode/source-map-support-0.8.1"
|
||||
sources."@glideapps/ts-necessities-2.1.3"
|
||||
sources."@jridgewell/resolve-uri-3.1.1"
|
||||
sources."@jridgewell/sourcemap-codec-1.4.15"
|
||||
sources."@jridgewell/trace-mapping-0.3.9"
|
||||
(sources."@mark.probst/typescript-json-schema-0.55.0" // {
|
||||
dependencies = [
|
||||
sources."typescript-4.9.4"
|
||||
];
|
||||
})
|
||||
sources."@swc/core-1.3.78"
|
||||
sources."@swc/core-darwin-arm64-1.3.78"
|
||||
sources."@swc/core-darwin-x64-1.3.78"
|
||||
sources."@swc/core-linux-arm-gnueabihf-1.3.78"
|
||||
sources."@swc/core-linux-arm64-gnu-1.3.78"
|
||||
sources."@swc/core-linux-arm64-musl-1.3.78"
|
||||
sources."@swc/core-linux-x64-gnu-1.3.78"
|
||||
sources."@swc/core-linux-x64-musl-1.3.78"
|
||||
sources."@swc/core-win32-arm64-msvc-1.3.78"
|
||||
sources."@swc/core-win32-ia32-msvc-1.3.78"
|
||||
sources."@swc/core-win32-x64-msvc-1.3.78"
|
||||
sources."@swc/helpers-0.5.1"
|
||||
sources."@swc/wasm-1.3.78"
|
||||
sources."@tsconfig/node10-1.0.9"
|
||||
sources."@tsconfig/node12-1.0.11"
|
||||
sources."@tsconfig/node14-1.0.3"
|
||||
sources."@tsconfig/node16-1.0.4"
|
||||
sources."@types/json-schema-7.0.12"
|
||||
sources."@types/node-16.18.43"
|
||||
sources."@types/urijs-1.19.19"
|
||||
sources."abort-controller-3.0.0"
|
||||
sources."acorn-8.10.0"
|
||||
sources."acorn-walk-8.2.0"
|
||||
sources."ansi-regex-5.0.1"
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."arg-4.1.3"
|
||||
sources."array-back-3.1.0"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."base64-js-1.5.1"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."browser-or-node-2.1.1"
|
||||
sources."buffer-6.0.3"
|
||||
sources."chalk-4.1.2"
|
||||
sources."chalk-template-0.4.0"
|
||||
sources."cliui-8.0.1"
|
||||
sources."collection-utils-1.0.1"
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."command-line-args-5.2.1"
|
||||
(sources."command-line-usage-7.0.1" // {
|
||||
dependencies = [
|
||||
sources."array-back-6.2.2"
|
||||
sources."typical-7.1.1"
|
||||
];
|
||||
})
|
||||
sources."concat-map-0.0.1"
|
||||
sources."create-require-1.1.1"
|
||||
sources."cross-fetch-4.0.0"
|
||||
sources."diff-4.0.2"
|
||||
sources."emoji-regex-8.0.0"
|
||||
sources."encoding-0.1.13"
|
||||
sources."escalade-3.1.1"
|
||||
sources."event-target-shim-5.0.1"
|
||||
sources."events-3.3.0"
|
||||
sources."find-replace-3.0.0"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."get-caller-file-2.0.5"
|
||||
sources."glob-7.2.3"
|
||||
sources."graphql-0.11.7"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."iconv-lite-0.6.3"
|
||||
sources."ieee754-1.2.1"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."is-fullwidth-code-point-3.0.0"
|
||||
sources."is-url-1.2.4"
|
||||
sources."iterall-1.1.3"
|
||||
sources."js-base64-3.7.5"
|
||||
sources."lodash-4.17.21"
|
||||
sources."lodash.assignwith-4.2.0"
|
||||
sources."lodash.camelcase-4.3.0"
|
||||
sources."make-error-1.3.6"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."moment-2.29.4"
|
||||
sources."node-fetch-2.6.13"
|
||||
sources."once-1.4.0"
|
||||
sources."pako-1.0.11"
|
||||
sources."path-equal-1.2.5"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."pluralize-8.0.0"
|
||||
sources."process-0.11.10"
|
||||
sources."quicktype-core-23.0.71"
|
||||
sources."quicktype-graphql-input-23.0.71"
|
||||
sources."quicktype-typescript-input-23.0.71"
|
||||
sources."readable-stream-4.4.2"
|
||||
sources."require-directory-2.1.1"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."safe-stable-stringify-2.4.3"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."stream-chain-2.2.5"
|
||||
sources."stream-json-1.8.0"
|
||||
sources."stream-read-all-3.0.1"
|
||||
(sources."string-to-stream-3.0.1" // {
|
||||
dependencies = [
|
||||
sources."readable-stream-3.6.2"
|
||||
];
|
||||
})
|
||||
sources."string-width-4.2.3"
|
||||
sources."string_decoder-1.3.0"
|
||||
sources."strip-ansi-6.0.1"
|
||||
sources."supports-color-7.2.0"
|
||||
(sources."table-layout-3.0.2" // {
|
||||
dependencies = [
|
||||
sources."array-back-6.2.2"
|
||||
sources."typical-7.1.1"
|
||||
];
|
||||
})
|
||||
sources."tiny-inflate-1.0.3"
|
||||
sources."tr46-0.0.3"
|
||||
sources."ts-node-10.9.1"
|
||||
sources."tslib-2.6.2"
|
||||
sources."typescript-4.9.5"
|
||||
sources."typical-4.0.0"
|
||||
sources."unicode-properties-1.4.1"
|
||||
(sources."unicode-trie-2.0.0" // {
|
||||
dependencies = [
|
||||
sources."pako-0.2.9"
|
||||
];
|
||||
})
|
||||
sources."urijs-1.19.11"
|
||||
sources."util-deprecate-1.0.2"
|
||||
sources."v8-compile-cache-lib-3.0.1"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
sources."wordwrap-1.0.0"
|
||||
sources."wordwrapjs-5.1.0"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yaml-2.3.1"
|
||||
sources."yargs-17.7.2"
|
||||
sources."yargs-parser-21.1.1"
|
||||
sources."yn-3.1.1"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "";
|
||||
homepage = "https://github.com/quicktype/quicktype#readme";
|
||||
license = "Apache-2.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
react-native-cli = nodeEnv.buildNodePackage {
|
||||
name = "react-native-cli";
|
||||
packageName = "react-native-cli";
|
||||
|
||||
@ -204,14 +204,6 @@ final: prev: {
|
||||
'';
|
||||
});
|
||||
|
||||
near-cli = prev.near-cli.override {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
libusb1
|
||||
final.prebuild-install
|
||||
final.node-gyp-build
|
||||
pkg-config
|
||||
];
|
||||
};
|
||||
|
||||
node-gyp = prev.node-gyp.override {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "argh";
|
||||
version = "0.28.1";
|
||||
version = "0.29.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sgkwhvDoCaPswktkohRTCe6PVtA0k2zVnlfFWKNXMp0=";
|
||||
hash = "sha256-WOQ4zpFpqqLm3hR+POs0zqz+JlVqIwb1Di1G9Sd5rLE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.17.0";
|
||||
version = "2.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/q+th07TdqnR8Imer8llDSH9siKPkN6bh0GoBsITtCI=";
|
||||
hash = "sha256-Y7MbZ23LJ4amUNI9Mk2PiGxOFFhq/dDP5uJgpz8SRI4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
53
pkgs/development/python-modules/litellm/default.nix
Normal file
53
pkgs/development/python-modules/litellm/default.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, importlib-metadata
|
||||
, openai
|
||||
, python-dotenv
|
||||
, tiktoken
|
||||
}:
|
||||
let
|
||||
version = "0.1.590";
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
format = "pyproject";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "7cb96e86b4753008cbf8d116aca514750e98d360";
|
||||
hash = "sha256-ITMcwGjelNfNGnfBmmdu0Xwph4u0mxiFSfHnysUxWCQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm -rf dist
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
importlib-metadata
|
||||
openai
|
||||
python-dotenv
|
||||
tiktoken
|
||||
];
|
||||
|
||||
# the import check phase fails trying to do a network request to openai
|
||||
# pythonImportsCheck = [ "litellm" ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Use any LLM as a drop in replacement for gpt-3.5-turbo. Use Azure, OpenAI, Cohere, Anthropic, Ollama, VLLM, Sagemaker, HuggingFace, Replicate (100+ LLMs)";
|
||||
homepage = "https://github.com/BerriAI/litellm";
|
||||
license = licenses.mit;
|
||||
changelog = "https://github.com/BerriAI/litellm/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings-python";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zbF+fqgXb8BAN+Nf2pRV/SeOXnJXLXJBIWZyZ6a9zP4=";
|
||||
hash = "sha256-jppuuzROhVqNHm44gITpnC+xSN4s3ueY00N9v+IoJfE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.8.5";
|
||||
version = "23.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mWnQIQEG1kTytAarhdNf2AI2Sq4TSfNtCN3riklNAeQ=";
|
||||
hash = "sha256-7AU2K4XQ7B29IY53+uh0yre8RaOZ2GFc8hpyLWQilTE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-ironicclient";
|
||||
version = "5.3.0";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-veDhwpSXPtoi27tKI6xebH4haAeq+sUsEEk9TxQSbg4=";
|
||||
hash = "sha256-Q9yGuYf9TS7RCo9aV1hnNSrHoll7AOUiSpzRYxi+JXU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -26,16 +26,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.177.1";
|
||||
version = "2.184.0.post0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Jqbk3DiV5K+TRXXSgCdoqjvddh6V2qc7mf7LotJdqys=";
|
||||
hash = "sha256-gQQsHJ9b5ZbbPW0nJRdudSwaL+Hc8kwBpK9um8QWQio=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -49,9 +49,6 @@ in buildPythonPackage {
|
||||
inherit (packages) version;
|
||||
format = "wheel";
|
||||
|
||||
# Python 3.11 still unsupported
|
||||
disabled = pythonAtLeast "3.11";
|
||||
|
||||
src = let
|
||||
pyVerNoDot = lib.strings.stringAsChars (x: lib.optionalString (x != ".") x) python.pythonVersion;
|
||||
platform = if stdenv.isDarwin then "mac" else "linux";
|
||||
@ -152,14 +149,23 @@ in buildPythonPackage {
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/tf2tensorrt/"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/tf2xla/ops/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/experimental/microfrontend/python/ops/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/analyzer_wrapper/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/interpreter_wrapper/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/metrics/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/optimize/"
|
||||
"$out/${python.sitePackages}/tensorflow/python/"
|
||||
"$out/${python.sitePackages}/tensorflow/python/framework/"
|
||||
"$out/${python.sitePackages}/tensorflow/python/autograph/impl/testing"
|
||||
"$out/${python.sitePackages}/tensorflow/python/client"
|
||||
"$out/${python.sitePackages}/tensorflow/python/data/experimental/service"
|
||||
"$out/${python.sitePackages}/tensorflow/python/framework"
|
||||
"$out/${python.sitePackages}/tensorflow/python/grappler"
|
||||
"$out/${python.sitePackages}/tensorflow/python/lib/core"
|
||||
"$out/${python.sitePackages}/tensorflow/python/lib/io"
|
||||
"$out/${python.sitePackages}/tensorflow/python/platform"
|
||||
"$out/${python.sitePackages}/tensorflow/python/profiler/internal"
|
||||
"$out/${python.sitePackages}/tensorflow/python/saved_model"
|
||||
"$out/${python.sitePackages}/tensorflow/python/util"
|
||||
"$out/${python.sitePackages}/tensorflow/tsl/python/lib/core"
|
||||
"${rpath}"
|
||||
)
|
||||
|
||||
|
||||
@ -1,39 +1,51 @@
|
||||
{
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
linux_py_38_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1lqdb3n8dp2f1vignddfqfbbghidkbrq9g78fqkjir8g318zf1m4";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "14pnklfp24hpybl5yqvvi2rxxhmc35rkjsijq86acakx0bx6afkw";
|
||||
};
|
||||
linux_py_39_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1k595l4gpmar9rg4kim2i41fv25i8p018fdmgxcb5v6836d5ns2m";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1vqvapsb0fqihkl3xgjy7ywljf7gp5rqdj6iwkv39cfvr9z3rs10";
|
||||
};
|
||||
linux_py_310_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1mhq429j9v82jwyqk6dcaz0sh57n0kyf2bfjrjz13xjblssij6rn";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "00mx8qmxaxq2ldh84g3wh21c5aizlnysfbipfm64v8b7c4753ljs";
|
||||
};
|
||||
linux_py_311_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "0r8fgq06nzfp4rcl4bhxjv57k43n31xc2j27sgn0hfbakxwy483y";
|
||||
};
|
||||
linux_py_38_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "009wyvzdlzghb39mmrv36fvjrrrbllyadny9jzb7ixzry4r07193";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "04hrs1v50sp1bgr921xjsgslng3npnn6sq2f23xvfscdqd4aq8i8";
|
||||
};
|
||||
linux_py_39_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "0l1cwsfw91vfgx8xqwz7cdphj1dy6ppfifm7f7f0n0i6rda6l382";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "0whwm93adgw2px8x678ik2nmsz8adi8vmj2np40jsbiq5y68pmkj";
|
||||
};
|
||||
linux_py_310_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "0dl3nvr4pk4zknx484qd2mqdkjkms6s4alqrxqkqv2hqa4l9sz9m";
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "0am36a7n744xjn2m8hkf2cnncczsxigwazmwqsgkj07qwagbdw78";
|
||||
};
|
||||
linux_py_311_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "09cczbh19mw44n526bqc3h83q5hcfdjwlp38mn3ngch22y86gvhr";
|
||||
};
|
||||
mac_py_38_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp38-cp38-macosx_10_15_x86_64.whl";
|
||||
sha256 = "0jkxd9ccbq2czn16w3his6k1hxx0nhkrb56bkrskwzss9is4w6d7";
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp38-cp38-macosx_10_15_x86_64.whl";
|
||||
sha256 = "1fk9ymlm1n8i48dm418g8r3ixw655vk2kms6jzcb6wivlash704l";
|
||||
};
|
||||
mac_py_39_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp39-cp39-macosx_10_15_x86_64.whl";
|
||||
sha256 = "0n7rsrxlkn143y80579bm8wwsabg2a9x6sx1h7ksw3s2x4sjdz22";
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp39-cp39-macosx_10_15_x86_64.whl";
|
||||
sha256 = "10pbhfhjzy7zfd85s18nsf0pnir77097hxkqm11bdmcfjgic023s";
|
||||
};
|
||||
mac_py_310_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp310-cp310-macosx_10_15_x86_64.whl";
|
||||
sha256 = "18fj2jxl8b69jrzjkixhyyrml8qjwcid76y15ggzc5ksrkgw0jmy";
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp310-cp310-macosx_10_15_x86_64.whl";
|
||||
sha256 = "009icsdwvhs2g3csx3jczprgf7rbmggjk8g4qicq0m4qx51m84l9";
|
||||
};
|
||||
mac_py_311_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp311-cp311-macosx_10_15_x86_64.whl";
|
||||
sha256 = "0sjq82q7q7k80f35rrpkjbrm3fd25rfjfi6s6k3a91njc5k45zvg";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
version="2.12.0"
|
||||
version="2.13.0"
|
||||
|
||||
bucket="https://storage.googleapis.com/tensorflow"
|
||||
|
||||
@ -11,12 +11,15 @@ url_and_key_list=(
|
||||
"linux_py_38_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"linux_py_39_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"linux_py_310_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"linux_py_311_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"linux_py_38_gpu $bucket/linux/gpu/tensorflow-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"linux_py_39_gpu $bucket/linux/gpu/tensorflow-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"linux_py_310_gpu $bucket/linux/gpu/tensorflow-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"linux_py_311_gpu $bucket/linux/gpu/tensorflow-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_15_x86_64.whl"
|
||||
"mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_15_x86_64.whl"
|
||||
"mac_py_310_cpu $bucket/mac/cpu/tensorflow-${version}-cp310-cp310-macosx_10_15_x86_64.whl"
|
||||
"mac_py_311_cpu $bucket/mac/cpu/tensorflow-${version}-cp311-cp311-macosx_10_15_x86_64.whl"
|
||||
)
|
||||
|
||||
hashfile=binary-hashes.nix
|
||||
|
||||
39
pkgs/development/python-modules/tokentrim/default.nix
Normal file
39
pkgs/development/python-modules/tokentrim/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, tiktoken
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "tokentrim";
|
||||
version = "unstable-2023-09-07";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KillianLucas";
|
||||
repo = "tokentrim";
|
||||
rev = "e98ad3a2ca0e321a7347f76c30be584175495139";
|
||||
hash = "sha256-95xitHnbFFaj0xPuLMWvIvuJzoCO3VSd592X1RI9h3A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tiktoken
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tokentrim" ];
|
||||
|
||||
# tests connect to openai
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easily trim 'messages' arrays for use with GPTs";
|
||||
homepage = "https://github.com/KillianLucas/tokentrim";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
53
pkgs/development/python-modules/vg/default.nix
Normal file
53
pkgs/development/python-modules/vg/default.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vg";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lace";
|
||||
repo = "vg";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZNUAfkhjmsxD8cH0fR8Htjs+/F/3R9xfe1XgRyndids=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'requires = ["setuptools", "poetry-core>=1.0.0"]' 'requires = ["poetry-core>=1.0.0"]'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"vg"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linear algebra for humans: a very good vector-geometry and linear-algebra toolbelt";
|
||||
homepage = "https://github.com/lace/vg";
|
||||
changelog = "https://github.com/lace/vg/blob/${version}/CHANGELOG.md";
|
||||
license = with licenses; [ bsd2 ];
|
||||
maintainers = with maintainers; [ clerie ];
|
||||
};
|
||||
}
|
||||
@ -26,15 +26,6 @@ rec {
|
||||
|
||||
electron-bin = electron_26-bin;
|
||||
|
||||
electron_9-bin = mkElectron "9.4.4" {
|
||||
x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450";
|
||||
x86_64-darwin = "f41c0bf874ddbba00c3d6989d07f74155a236e2d5a3eaf3d1d19ef8d3eb2256c";
|
||||
i686-linux = "40e37f8f908a81c9fac1073fe22309cd6df2d68e685f83274c6d2f0959004187";
|
||||
armv7l-linux = "2dfe3e21d30526688cc3d3215d06dfddca597a2cb62ff0c9d0d5f33d3e464a33";
|
||||
aarch64-linux = "f1145e9a1feb5f2955e5f5565962423ac3c52ffe45ccc3b96c6ca485fa35bf27";
|
||||
headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885";
|
||||
};
|
||||
|
||||
electron_10-bin = mkElectron "10.4.7" {
|
||||
x86_64-linux = "e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995";
|
||||
x86_64-darwin = "8f01e020563b7fce68dc2e3d4bbf419320d13b088e89eb64f9645e9d73ad88fb";
|
||||
|
||||
@ -28,7 +28,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "analysis"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chain-map"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
@ -131,7 +131,7 @@ source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a7847
|
||||
|
||||
[[package]]
|
||||
name = "cm-syntax"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
@ -160,7 +160,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"serde",
|
||||
@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
|
||||
|
||||
[[package]]
|
||||
name = "cov-mark"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
@ -427,7 +427,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "input"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"cm-syntax",
|
||||
"config",
|
||||
@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
|
||||
|
||||
[[package]]
|
||||
name = "lang-srv"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"anyhow",
|
||||
@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "lex-util"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
@ -575,7 +575,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "millet-cli"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"codespan-reporting",
|
||||
@ -593,7 +593,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "millet-ls"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
@ -613,7 +613,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-hir"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"paths",
|
||||
@ -624,7 +624,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-statics"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@ -648,7 +648,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-syntax"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
@ -711,7 +711,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
|
||||
|
||||
[[package]]
|
||||
name = "panic-hook"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"better-panic",
|
||||
]
|
||||
@ -924,7 +924,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "slash-var-path"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
@ -932,14 +932,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-comment"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"sml-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"fmt-util",
|
||||
@ -950,7 +950,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics-tests"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"pretty_assertions",
|
||||
@ -966,7 +966,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-file-syntax"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"elapsed",
|
||||
@ -980,7 +980,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-fixity"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
@ -989,7 +989,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-hir"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"la-arena",
|
||||
"sml-lab",
|
||||
@ -1000,7 +1000,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-hir-lower"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"config",
|
||||
"cov-mark",
|
||||
@ -1015,14 +1015,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-lab"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-lex"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"cov-mark",
|
||||
"diagnostic",
|
||||
@ -1037,7 +1037,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7
|
||||
|
||||
[[package]]
|
||||
name = "sml-naive-fmt"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-comment",
|
||||
@ -1046,11 +1046,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-namespace"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
|
||||
[[package]]
|
||||
name = "sml-parse"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"event-parse",
|
||||
@ -1062,14 +1062,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-path"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-scon"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
@ -1078,7 +1078,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"config",
|
||||
@ -1101,7 +1101,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics-types"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"code-h2-md-map",
|
||||
@ -1120,7 +1120,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-symbol-kind"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"sml-namespace",
|
||||
"sml-statics-types",
|
||||
@ -1128,7 +1128,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-syntax"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"code-h2-md-map",
|
||||
"fast-hash",
|
||||
@ -1139,7 +1139,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-ty-var-scope"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-hir",
|
||||
@ -1210,7 +1210,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"cm-syntax",
|
||||
@ -1554,7 +1554,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.13.1"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"flate2",
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qq4SACB0heCOB8rJha+9Xi/ZZuAbasOieWM9IdZqYUw=";
|
||||
hash = "sha256-GiuP5Cx4Qx2LH34v6VeGyWgjJgPR8/qLUOZIrh9ES1U=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.28811";
|
||||
version = "0.1.28995";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HaBFKjVw6EzhH1oxSeKFmZUDZleFGrxjOegTVCGmrzI=";
|
||||
sha256 = "sha256-+Gyv3GO6nOueswPAriUm7QkQgEkYEilnBT7hqmiqDW8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OWdJ7nFR5hrKQf2H763ezjXkEh0PvtBcjjeSNvH+ca4=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.17.2";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t71h+s97Ip3Gqs7oCzF8GWpTX0p0ltPt7JT61Gk8xF0=";
|
||||
hash = "sha256-l9uPn5eLGfCq2E6gogXCefbhxro6iOOYraeIPj9/S50=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oJ+zAtTwFSSzwq1gvkRloBj8g30G8Eq7dG2RoaX39lA=";
|
||||
cargoHash = "sha256-2mbGwElBfo4L/iGZm3iRBR5UGeMFlfaSp79vVvCAIo0=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2023-09-04";
|
||||
cargoSha256 = "sha256-J8eEHv262v21b1rs3e2seTwaKtvoGne5hXqa2jgQmoY=";
|
||||
version = "2023-09-11";
|
||||
cargoSha256 = "sha256-bdF88QG++8ieFLG9H6D6nR6d9GHna36HMskp6TnTA4c=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-Mk35KaY7OkEKNoj3Q3NEJ0PjFhqUd9Ry+NSzd3K1QUw=";
|
||||
sha256 = "sha256-6GjjGVCn0lNlGQifjM8AqRRMzVxf/KNyQqmAl8a9HME=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
let
|
||||
pname = "mindustry";
|
||||
version = "145.1";
|
||||
version = "146";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
selectedGlew = if enableWayland then glew-egl else glew;
|
||||
@ -46,13 +46,13 @@ let
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xHF+3QIzP6Xekm1arXio4dAveOQpY9MXuiUC7OZFSUA=";
|
||||
hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HkJoYdnC4rwTMEmSO0r82cuhY3ZT7Baj3pyqSbzJrQ4=";
|
||||
hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
@ -131,7 +131,7 @@ let
|
||||
| sh
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-tSQV9A4uxKUVEJuFRxCQVZNb+0wEQrZofQOluQe0cfA=";
|
||||
outputHash = "sha256-hbWLsWorEo+1BBURvrFMXpxvZjJBZ1p7HVlJN5e5JZc=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://worldofgoo.com";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jcumming maxeaubrey ];
|
||||
maintainers = with maintainers; [ jcumming amaxine ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mic92 dtzWill maxeaubrey ];
|
||||
maintainers = with maintainers; [ mic92 dtzWill amaxine ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://fwupd.org/";
|
||||
maintainers = with maintainers; [ maxeaubrey ];
|
||||
maintainers = with maintainers; [ amaxine ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -92,6 +92,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Wireless daemon for Linux";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dtzWill fpletz maxeaubrey ];
|
||||
maintainers = with maintainers; [ dtzWill fpletz amaxine ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A high performance DDoS detector / sensor - commercial edition";
|
||||
homepage = "https://fastnetmon.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ yuka ];
|
||||
maintainers = teams.wdz.members;
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@ -16,20 +16,20 @@ let
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.91.2";
|
||||
version = "1.92.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U9SyDmO34s9PjLPnT1QYemGeCmKdXRaQvEC8KKcFXOI=";
|
||||
hash = "sha256-rCxoYtdvh+Gu0O2T3uu0k2FFFFc7m09LuKJvkSky3M4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-q3uoT2O/oTVSg6olZohU8tiWahijyva+1tm4e1GWGj4=";
|
||||
hash = "sha256-yZeCENWdPv80Na1++/IQFOrhah/VHWwJDNV2dI/yTHg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -153,7 +153,7 @@ py.pkgs.buildPythonPackage rec {
|
||||
description = "An Internet Routing Registry database server, processing IRR objects in the RPSL format";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/irrdnet/irrd";
|
||||
maintainers = with maintainers; [ netali yuka ];
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "unpoller";
|
||||
version = "2.8.1";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unpoller";
|
||||
repo = "unpoller";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w0DcU27wrqzWxPwoY/as2vBtJQytz1482tNIXdyvHbY=";
|
||||
hash = "sha256-ONr8xwvCXLnAlJKbgt/O+lCEKbV2SJXW/1oJPYRtQ3s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2uvQhEEtsnGPQxYnNND6kM1HeN3kFlHzUXiehM+GpMs=";
|
||||
vendorHash = "sha256-eLHtSEINxrqjlPyJZJwfSGA0gVaxcIolhWnqJxLXkew=";
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
|
||||
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
lnl7
|
||||
pjones
|
||||
thoughtpolice
|
||||
maxeaubrey
|
||||
amaxine
|
||||
MayNiklas
|
||||
];
|
||||
description = "Media library streaming server";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }:
|
||||
|
||||
let
|
||||
version = "1.48.1";
|
||||
version = "1.48.2";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale";
|
||||
@ -11,7 +11,7 @@ buildGoModule {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jWnke49b6inybPmiZOkxI3C8VoYe4Syi84YhvL8zxeI=";
|
||||
hash = "sha256-5Usi7W4y6JniyxBIfQid1XjDIZRS5oIw+KUMMiFRBwk=";
|
||||
};
|
||||
vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4=";
|
||||
|
||||
|
||||
@ -99,7 +99,7 @@ in py.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://peering-manager.net/";
|
||||
license = licenses.asl20;
|
||||
description = "BGP sessions management tool";
|
||||
maintainers = with maintainers; [ yuka ];
|
||||
maintainers = teams.wdz.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,6 +25,10 @@ let
|
||||
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
|
||||
export NIX_STATE_DIR=$TEST_ROOT/var/nix
|
||||
export NIX_STORE_DIR=$TEST_ROOT/store
|
||||
|
||||
# cargo tests run in parallel by default, which would then run into
|
||||
# https://github.com/NixOS/nix/issues/2706 unless the store is initialised first
|
||||
nix-store --init
|
||||
'';
|
||||
postCheck = ''
|
||||
cargo fmt --check
|
||||
|
||||
@ -30,9 +30,15 @@ pub fn check_values<W: io::Write>(
|
||||
// Write the list of packages we need to check into a temporary JSON file.
|
||||
// This can then get read by the Nix evaluation.
|
||||
let attrs_file = NamedTempFile::new().context("Failed to create a temporary file")?;
|
||||
// We need to canonicalise this path because if it's a symlink (which can be the case on
|
||||
// Darwin), Nix would need to read both the symlink and the target path, therefore need 2
|
||||
// NIX_PATH entries for restrict-eval. But if we resolve the symlinks then only one predictable
|
||||
// entry is needed.
|
||||
let attrs_file_path = attrs_file.path().canonicalize()?;
|
||||
|
||||
serde_json::to_writer(&attrs_file, &nixpkgs.package_names).context(format!(
|
||||
"Failed to serialise the package names to the temporary path {}",
|
||||
attrs_file.path().display()
|
||||
attrs_file_path.display()
|
||||
))?;
|
||||
|
||||
// With restrict-eval, only paths in NIX_PATH can be accessed, so we explicitly specify the
|
||||
@ -57,9 +63,9 @@ pub fn check_values<W: io::Write>(
|
||||
// Pass the path to the attrs_file as an argument and add it to the NIX_PATH so it can be
|
||||
// accessed in restrict-eval mode
|
||||
.args(["--arg", "attrsPath"])
|
||||
.arg(attrs_file.path())
|
||||
.arg(&attrs_file_path)
|
||||
.arg("-I")
|
||||
.arg(attrs_file.path())
|
||||
.arg(&attrs_file_path)
|
||||
// Same for the nixpkgs to test
|
||||
.args(["--arg", "nixpkgsPath"])
|
||||
.arg(&nixpkgs.path)
|
||||
|
||||
@ -140,6 +140,42 @@ mod tests {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Tests symlinked temporary directories.
|
||||
/// This is needed because on darwin, `/tmp` is a symlink to `/private/tmp`, and Nix's
|
||||
/// restrict-eval doesn't also allow access to the canonical path when you allow the
|
||||
/// non-canonical one.
|
||||
///
|
||||
/// The error if we didn't do this would look like this:
|
||||
/// error: access to canonical path '/private/var/folders/[...]/.tmpFbcNO0' is forbidden in restricted mode
|
||||
#[test]
|
||||
fn test_symlinked_tmpdir() -> anyhow::Result<()> {
|
||||
// Create a directory with two entries:
|
||||
// - actual (dir)
|
||||
// - symlinked -> actual (symlink)
|
||||
let temp_root = tempdir()?;
|
||||
fs::create_dir(temp_root.path().join("actual"))?;
|
||||
std::os::unix::fs::symlink("actual", temp_root.path().join("symlinked"))?;
|
||||
let tmpdir = temp_root.path().join("symlinked");
|
||||
|
||||
// Then set TMPDIR to the symlinked directory
|
||||
// Make sure to persist the old value so we can undo this later
|
||||
let old_tmpdir = env::var("TMPDIR").ok();
|
||||
env::set_var("TMPDIR", &tmpdir);
|
||||
|
||||
// Then run a simple test with this symlinked temporary directory
|
||||
// This should be successful
|
||||
test_nixpkgs("symlinked_tmpdir", Path::new("tests/success"), "")?;
|
||||
|
||||
// Undo the env variable change
|
||||
if let Some(old) = old_tmpdir {
|
||||
env::set_var("TMPDIR", old);
|
||||
} else {
|
||||
env::remove_var("TMPDIR");
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn test_nixpkgs(name: &str, path: &Path, expected_errors: &str) -> anyhow::Result<()> {
|
||||
let extra_nix_path = Path::new("tests/mock-nixpkgs.nix");
|
||||
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.180";
|
||||
version = "3.0.181";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-w1t1sx7Pcv444x3YPNSg3fRQdPga2Q9Z1+Iad7OTjOM=";
|
||||
sha256 = "sha256-xjOoWQyQCVoCDJMXboxFAyil7jRCWU6oIEt7gcPkIPo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bL1S6GML7XuLraVXcd6NcC3VSYAd05F2ktzI0KF3G8A=";
|
||||
vendorHash = "sha256-S8Nthnr3wASvRyZS5UTHILPnUA+FeZJEwIvT0O39U3I=";
|
||||
|
||||
subPackages = [ "main" ];
|
||||
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "textplots";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-NBUp5kFiODqoJrg/JBPhtaVsOikppqt2jbd3C3RQ7qg=";
|
||||
hash = "sha256-rYUo8A5jasGQb9CjW5u5kM7PIocq353R6v+Z7OhzVUg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hHj3Da399gbRbgHgHcBE53HJusWoPbRA184tcCSJ4fc=";
|
||||
cargoHash = "sha256-1Z+Og3n9/LUzfBoWNXjvNfuQByEq3vtXhGzi6X961w0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal plotting written in Rust";
|
||||
|
||||
52
pkgs/tools/llm/open-interpreter/default.nix
Normal file
52
pkgs/tools/llm/open-interpreter/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
let
|
||||
version = "0.1.3";
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "open-interpreter";
|
||||
format = "pyproject";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KillianLucas";
|
||||
repo = "open-interpreter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xmmyDIshEYql41k/7gF+ay7s3mI+iGCjr5gDfLkqLU0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
astor
|
||||
gitpython
|
||||
huggingface-hub
|
||||
inquirer
|
||||
litellm
|
||||
openai
|
||||
# pyreadline3 # this is a windows deps
|
||||
python-dotenv
|
||||
rich
|
||||
six
|
||||
tiktoken
|
||||
tokentrim
|
||||
wget
|
||||
];
|
||||
|
||||
# the import check phase fails trying to do a network request to openai
|
||||
# because of litellm
|
||||
# pythonImportsCheck = [ "interpreter" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenAI's Code Interpreter in your terminal, running locally";
|
||||
homepage = "https://github.com/KillianLucas/open-interpreter";
|
||||
license = licenses.mit;
|
||||
changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user