Merge master into haskell-updates

This commit is contained in:
github-actions[bot]
2022-09-12 00:15:26 +00:00
committed by GitHub
179 changed files with 4389 additions and 3482 deletions
+1
View File
@@ -44,6 +44,7 @@ jobs:
- name: Compare DocBook and MD manuals
id: check
run: |
export NIX_PATH=nixpkgs=$(pwd)
.github/workflows/compare-manuals.sh \
docbook/share/doc/nixos/options.html \
md/share/doc/nixos/options.html
+25 -20
View File
@@ -8,7 +8,7 @@ Loading can be deferred; see examples.
At the moment we support two different methods for managing plugins:
- Vim packages (*recommended*)
- vim-plug
- vim-plug (vim only)
## Custom configuration {#custom-configuration}
@@ -196,20 +196,8 @@ vim_configurable.customize {
}
```
For Neovim the syntax is:
Note: this is not possible anymore for Neovim.
```nix
neovim.override {
configure = {
customRC = ''
# your custom configuration goes here!
'';
plug.plugins = with pkgs.vimPlugins; [
vim-go
];
};
}
```
## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
@@ -227,7 +215,7 @@ Sometimes plugins require an override that must be changed when the plugin is up
To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running.
Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with vim/neovim.
Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim.
## Updating plugins in nixpkgs {#updating-plugins-in-nixpkgs}
@@ -243,10 +231,27 @@ Alternatively, set the number of processes to a lower count to avoid rate-limiti
./pkgs/applications/editors/vim/plugins/update.py --proc 1
```
## Important repositories {#important-repositories}
## How to maintain an out-of-tree overlay of vim plugins ?
- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
from VAM plugin manager meant to be used by others as well used by
You can use the updater script to generate basic packages out of a custom vim
plugin list:
```
pkgs/applications/editors/vim/plugins/update.py -i vim-plugin-names -o generated.nix --no-commit
```
with the contents of `vim-plugin-names` being for example:
```
repo,branch,alias
pwntester/octo.nvim,,
```
You can then reference the generated vim plugins via:
```nix
myVimPlugins = pkgs.vimPlugins.extend (
(pkgs.callPackage generated.nix {})
);
```
- [vim2nix](https://github.com/MarcWeber/vim-addon-vim2nix) which generates the
.nix code
+25
View File
@@ -2780,6 +2780,12 @@
githubId = 34543609;
name = "creator54";
};
crinklywrappr = {
email = "crinklywrappr@pm.me";
name = "Daniel Fitzpatrick";
github = "crinklywrappr";
githubId = 56522;
};
cript0nauta = {
email = "shareman1204@gmail.com";
github = "cript0nauta";
@@ -4310,6 +4316,12 @@
githubId = 7670450;
name = "Federico Beffa";
};
fbergroth = {
email = "fbergroth@gmail.com";
github = "fbergroth";
githubId = 1211003;
name = "Fredrik Bergroth";
};
fbrs = {
email = "yuuki@protonmail.com";
github = "cideM";
@@ -8617,6 +8629,13 @@
githubId = 71893;
name = "Michael Maclean";
};
mglolenstine = {
email = "mglolenstine@gmail.com";
github = "MGlolenstine";
githubId = 9406770;
matrix = "@mglolenstine:matrix.org";
name = "MGlolenstine";
};
mgregoire = {
email = "gregoire@martinache.net";
github = "M-Gregoire";
@@ -15308,4 +15327,10 @@
githubId = 7775707;
name = "RB";
};
bpaulin = {
email = "brunopaulin@bpaulin.net";
github = "bpaulin";
githubId = 115711;
name = "bpaulin";
};
}
+13 -10
View File
@@ -1,6 +1,6 @@
name,src,ref,server,version,luaversion,maintainers
alt-getopt,,,,,,arobyn
bit32,,,,5.3.0-1,lua5_1,lblasc
bit32,,,,5.3.0-1,5.1,lblasc
argparse,https://github.com/luarocks/argparse.git,,,,,
basexx,https://github.com/teto/basexx.git,,,,,
binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat
@@ -12,20 +12,20 @@ cosmo,,,,,,marsam
coxpcall,,,,1.17.0-1,,
cqueues,,,,,,vcunat
cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,
digestif,https://github.com/astoff/digestif.git,,,0.2-1,lua5_3,
digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3,
dkjson,,,,,,
fifo,,,,,,
fluent,,,,,,alerque
gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,lua5_1,
gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
http,,,,0.3-0,,vcunat
inspect,,,,,,
ldbus,,,http://luarocks.org/dev,,,
ldoc,https://github.com/stevedonovan/LDoc.git,,,,,
lgi,,,,,,
linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,,
ljsyscall,,,,,lua5_1,lblasc
lmathx,,,,,lua5_3,alexshpilkin
lmpfrlib,,,,,lua5_3,alexshpilkin
ljsyscall,,,,,5.1,lblasc
lmathx,,,,,5.3,alexshpilkin
lmpfrlib,,,,,5.3,alexshpilkin
loadkit,,,,,,alerque
lpeg,,,,,,vyp
lpeg_patterns,,,,,,
@@ -45,7 +45,7 @@ lua-resty-jwt,,,,,,
lua-resty-openidc,,,,,,
lua-resty-openssl,,,,,,
lua-resty-session,,,,,,
lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,lua5_1,scoder12
lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12
lua-term,,,,,,
lua-toml,,,,,,
lua-zlib,,,,,,koral
@@ -63,7 +63,7 @@ luaexpat,,,,1.4.1-1,,arobyn flosse
luaffi,,,http://luarocks.org/dev,,,
luafilesystem,,,,1.7.0-2,,flosse
lualogging,,,,,,
luaossl,,,,,lua5_1,
luaossl,,,,,5.1,
luaposix,,,,34.1.1-1,,vyp lblasc
luarepl,,,,,,
luasec,,,,,,flosse
@@ -71,22 +71,25 @@ luasocket,,,,,,
luasql-sqlite3,,,,,,vyp
luassert,,,,,,
luasystem,,,,,,
luaunbound,,,,,
luaunbound,,,,,,
luaunit,,,,,,lockejan
luautf8,,,,,,pstn
luazip,,,,,,
lua-yajl,,,,,,pstn
luuid,,,,,,
luv,,,,1.43.0-0,,
lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto
lyaml,,,,,,lblasc
markdown,,,,,,
mediator_lua,,,,,,
mpack,,,,,,
moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn
nvim-client,https://github.com/neovim/lua-client.git,,,,,
nvim-cmp,,,,,
penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque
plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,
plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1,
rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
rest.nvim,,,,,5.1,teto
readline,,,,,,
say,https://github.com/Olivine-Labs/say.git,,,,,
serpent,,,,,,lockejan
1 name src ref server version luaversion maintainers
2 alt-getopt arobyn
3 bit32 5.3.0-1 lua5_1 5.1 lblasc
4 argparse https://github.com/luarocks/argparse.git
5 basexx https://github.com/teto/basexx.git
6 binaryheap https://github.com/Tieske/binaryheap.lua vcunat
12 coxpcall 1.17.0-1
13 cqueues vcunat
14 cyrussasl https://github.com/JorjBauer/lua-cyrussasl.git
15 digestif https://github.com/astoff/digestif.git 0.2-1 lua5_3 5.3
16 dkjson
17 fifo
18 fluent alerque
19 gitsigns.nvim https://github.com/lewis6991/gitsigns.nvim.git lua5_1 5.1
20 http 0.3-0 vcunat
21 inspect
22 ldbus http://luarocks.org/dev
23 ldoc https://github.com/stevedonovan/LDoc.git
24 lgi
25 linenoise https://github.com/hoelzro/lua-linenoise.git
26 ljsyscall lua5_1 5.1 lblasc
27 lmathx lua5_3 5.3 alexshpilkin
28 lmpfrlib lua5_3 5.3 alexshpilkin
29 loadkit alerque
30 lpeg vyp
31 lpeg_patterns
45 lua-resty-openidc
46 lua-resty-openssl
47 lua-resty-session
48 lua-subprocess https://github.com/0x0ade/lua-subprocess lua5_1 5.1 scoder12
49 lua-term
50 lua-toml
51 lua-zlib koral
63 luaffi http://luarocks.org/dev
64 luafilesystem 1.7.0-2 flosse
65 lualogging
66 luaossl lua5_1 5.1
67 luaposix 34.1.1-1 vyp lblasc
68 luarepl
69 luasec flosse
71 luasql-sqlite3 vyp
72 luassert
73 luasystem
74 luaunbound
75 luaunit lockejan
76 luautf8 pstn
77 luazip
78 lua-yajl pstn
79 luuid
80 luv 1.43.0-0
81 lush.nvim https://github.com/rktjmp/lush.nvim teto
82 lyaml lblasc
83 markdown
84 mediator_lua
85 mpack
86 moonscript https://github.com/leafo/moonscript.git dev-1 arobyn
87 nvim-client https://github.com/neovim/lua-client.git
88 nvim-cmp
89 penlight https://github.com/lunarmodules/Penlight.git alerque
90 plenary.nvim https://github.com/nvim-lua/plenary.nvim.git lua5_1 5.1
91 rapidjson https://github.com/xpol/lua-rapidjson.git
92 rest.nvim 5.1 teto
93 readline
94 say https://github.com/Olivine-Labs/say.git
95 serpent lockejan
+5 -8
View File
@@ -161,7 +161,10 @@ def generate_pkg_nix(plug: LuaPlugin):
custom_env = os.environ.copy()
custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG
cmd = [ "luarocks", "nix"]
# we add --dev else luarocks wont find all the "scm" (=dev) versions of the
# packages
# , "--dev"
cmd = [ "luarocks", "nix" ]
if plug.maintainers:
cmd.append(f"--maintainers={plug.maintainers}")
@@ -185,13 +188,7 @@ def generate_pkg_nix(plug: LuaPlugin):
cmd.append(f"--only-server={plug.server}")
if plug.luaversion:
with CleanEnvironment():
local_pkgs = str(ROOT.resolve())
cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"]
log.debug("running %s", ' '.join(cmd2))
lua_drv_path=subprocess.check_output(cmd2, text=True).strip()
cmd.append(f"--lua-dir={lua_drv_path}/bin")
cmd.append(f"--lua-version={plug.luaversion}")
log.debug("running %s", ' '.join(cmd))
@@ -487,6 +487,12 @@
instead.
</para>
</listitem>
<listitem>
<para>
Neovim can not be configured with plug anymore (still works
for vim).
</para>
</listitem>
<listitem>
<para>
<literal>k3s</literal> no longer supports docker as runtime
@@ -168,7 +168,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone.
- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
Use `configure.packages` instead.
Use `configure.packages` instead.
- Neovim can not be configured with plug anymore (still works for vim).
- `k3s` no longer supports docker as runtime due to upstream dropping support.
+5 -4
View File
@@ -52,10 +52,11 @@ let
{ type = lib.types.commas;
default = "";
description = lib.mdDoc ''
A comma-separated list of capabilities to be given to the wrapper
program. For capabilities supported by the system check the
{manpage}`capabilities(7)`
manual page.
A comma-separated list of capability clauses to be given to the
wrapper program. The format for capability clauses is described in the
TEXTUAL REPRESENTATION section of the {manpage}`cap_from_text(3)`
manual page. For a list of capabilities supported by the system, check
the {manpage}`capabilities(7)` manual page.
::: {.note}
`cap_setpcap`, which is required for the wrapper
@@ -96,10 +96,8 @@ let
};
} cfg.extraConfig;
configFile = pkgs.runCommandLocal "config.toml" {
nativeBuildInputs = [ pkgs.remarshal ];
} ''
remarshal -if json -of toml \
configFile = pkgs.runCommandLocal "config.toml" { } ''
${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \
< ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \
> $out
'';
+3 -1
View File
@@ -362,7 +362,9 @@ in {
in mkIf cfg.enable {
systemd.services.mediatomb = {
description = "${cfg.serverName} media Server";
after = [ "network.target" ];
# Gerbera might fail if the network interface is not available on startup
# https://github.com/gerbera/gerbera/issues/1324
after = [ "network.target" "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${binaryCommand} --port ${toString cfg.port} ${interfaceFlag} ${configFlag} --home ${cfg.dataDir}";
serviceConfig.User = cfg.user;
+5 -5
View File
@@ -16,13 +16,13 @@ let
PAPERLESS_MEDIA_ROOT = cfg.mediaDir;
PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir;
GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
} // (
lib.mapAttrs (_: toString) cfg.extraConfig
) // optionalAttrs (config.time.timeZone != null) {
PAPERLESS_TIME_ZONE = lib.mkDefault config.time.timeZone;
} // optionalAttrs (config.time.timeZone != null) {
PAPERLESS_TIME_ZONE = config.time.timeZone;
} // optionalAttrs enableRedis {
PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";
};
} // (
lib.mapAttrs (_: toString) cfg.extraConfig
);
manage = let
setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);
@@ -529,6 +529,8 @@ in {
};
systemd.services = {
# upstream reference:
# https://github.com/syncthing/syncthing/blob/main/etc/linux-systemd/system/syncthing%40.service
syncthing = mkIf cfg.systemService {
description = "Syncthing service";
after = [ "network.target" ];
@@ -540,7 +542,7 @@ in {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
SuccessExitStatus = "2 3 4";
SuccessExitStatus = "3 4";
RestartForceExitStatus="3 4";
User = cfg.user;
Group = cfg.group;
@@ -29,6 +29,12 @@ in {
description = lib.mdDoc "Profile name, defaults to 'system' (NixOS).";
};
host = mkOption {
type = types.str;
default = null;
description = lib.mdDoc "Cachix uri to use.";
};
package = mkOption {
type = types.package;
default = pkgs.cachix;
@@ -63,7 +69,10 @@ in {
KillMode = "process";
Restart = "on-failure";
EnvironmentFile = cfg.credentialsFile;
ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";
ExecStart = ''
${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${lib.optionalString (cfg.host != null) "--host ${cfg.host}"} \
deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""}
'';
};
};
};
+15 -3
View File
@@ -148,6 +148,7 @@ let
+ optionalString dev.bypassWorkqueues " --perf-no_read_workqueue --perf-no_write_workqueue"
+ optionalString (dev.header != null) " --header=${dev.header}";
cschange = "cryptsetup luksChangeKey ${dev.device} ${optionalString (dev.header != null) "--header=${dev.header}"}";
fido2luksCredentials = dev.fido2.credentials ++ optional (dev.fido2.credential != null) dev.fido2.credential;
in ''
# Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g.
# if on a USB drive.
@@ -417,7 +418,7 @@ let
}
''}
${optionalString (luks.fido2Support && (dev.fido2.credential != null)) ''
${optionalString (luks.fido2Support && fido2luksCredentials != []) ''
open_with_hardware() {
local passsphrase
@@ -433,7 +434,7 @@ let
echo "Please move your mouse to create needed randomness."
''}
echo "Waiting for your FIDO2 device..."
fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase
fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} "${builtins.concatStringsSep "," fido2luksCredentials}" --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase
if [ $? -ne 0 ]; then
echo "No FIDO2 key found, falling back to normal open procedure"
open_normally
@@ -444,7 +445,7 @@ let
# commands to run right before we mount our device
${dev.preOpenCommands}
${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && (dev.fido2.credential != null)) then ''
${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && fido2luksCredentials != []) then ''
open_with_hardware
'' else ''
open_normally
@@ -695,6 +696,17 @@ in
description = lib.mdDoc "The FIDO2 credential ID.";
};
credentials = mkOption {
default = [];
example = [ "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2" ];
type = types.listOf types.str;
description = lib.mdDoc ''
List of FIDO2 credential IDs.
Use this if you have multiple FIDO2 keys you want to use for the same luks device.
'';
};
gracePeriod = mkOption {
default = 10;
type = types.int;
+32 -69
View File
@@ -1,81 +1,44 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
import ./make-test-python.nix {
name = "mediatomb";
nodes = {
serverGerbera =
{ ... }:
let port = 49152;
in {
imports = [ ../modules/profiles/minimal.nix ];
services.mediatomb = {
enable = true;
serverName = "Gerbera";
package = pkgs.gerbera;
interface = "eth1"; # accessible from test
openFirewall = true;
mediaDirectories = [
{ path = "/var/lib/gerbera/pictures"; recursive = false; hidden-files = false; }
{ path = "/var/lib/gerbera/audio"; recursive = true; hidden-files = false; }
];
};
server = {
services.mediatomb = {
enable = true;
serverName = "Gerbera";
interface = "eth1";
openFirewall = true;
mediaDirectories = [
{
path = "/var/lib/gerbera/pictures";
recursive = false;
hidden-files = false;
}
{
path = "/var/lib/gerbera/audio";
recursive = true;
hidden-files = false;
}
];
};
systemd.tmpfiles.rules = [
"d /var/lib/gerbera/pictures 0770 mediatomb mediatomb"
"d /var/lib/gerbera/audio 0770 mediatomb mediatomb"
];
};
serverMediatomb =
{ ... }:
let port = 49151;
in {
imports = [ ../modules/profiles/minimal.nix ];
services.mediatomb = {
enable = true;
serverName = "Mediatomb";
package = pkgs.mediatomb;
interface = "eth1";
inherit port;
mediaDirectories = [
{ path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; }
{ path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; }
];
};
networking.firewall.interfaces.eth1 = {
allowedUDPPorts = [ 1900 port ];
allowedTCPPorts = [ port ];
};
};
client = { ... }: { };
client = {};
};
testScript =
''
testScript = ''
start_all()
port = 49151
serverMediatomb.succeed("mkdir -p /var/lib/mediatomb/{pictures,audio}")
serverMediatomb.succeed("chown -R mediatomb:mediatomb /var/lib/mediatomb")
serverMediatomb.wait_for_unit("mediatomb")
serverMediatomb.wait_for_open_port(port)
serverMediatomb.succeed(f"curl --fail http://serverMediatomb:{port}/")
page = client.succeed(f"curl --fail http://serverMediatomb:{port}/")
assert "MediaTomb" in page and "Gerbera" not in page
serverMediatomb.shutdown()
server.wait_for_unit("mediatomb")
server.wait_until_succeeds("nc -z 192.168.1.2 49152")
server.succeed("curl -v --fail http://server:49152/")
port = 49152
serverGerbera.succeed("mkdir -p /var/lib/mediatomb/{pictures,audio}")
serverGerbera.succeed("chown -R mediatomb:mediatomb /var/lib/mediatomb")
# service running gerbera fails the first time claiming something is already bound
# gerbera[715]: 2020-07-18 23:52:14 info: Please check if another instance of Gerbera or
# gerbera[715]: 2020-07-18 23:52:14 info: another application is running on port TCP 49152 or UDP 1900.
# I did not find anything so here I work around this
serverGerbera.succeed("sleep 2")
serverGerbera.wait_until_succeeds("systemctl restart mediatomb")
serverGerbera.wait_for_unit("mediatomb")
serverGerbera.succeed(f"curl --fail http://serverGerbera:{port}/")
page = client.succeed(f"curl --fail http://serverGerbera:{port}/")
client.wait_for_unit("multi-user.target")
page = client.succeed("curl -v --fail http://server:49152/")
assert "Gerbera" in page and "MediaTomb" not in page
serverGerbera.shutdown()
client.shutdown()
'';
})
}
@@ -159,10 +159,10 @@
elpaBuild {
pname = "aircon-theme";
ename = "aircon-theme";
version = "0.0.5";
version = "0.0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/aircon-theme-0.0.5.tar";
sha256 = "0k9nsm64szi2hvngx9ciyjn8ic9qprfm3gmwp33f0kakq05ykpd1";
url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar";
sha256 = "09yjjx9gy1x2i8xk7jlblzk6gkx7cgglb0pwxbl8n6aj19ba40nd";
};
packageRequires = [ emacs ];
meta = {
@@ -234,10 +234,10 @@
elpaBuild {
pname = "async";
ename = "async";
version = "1.9.5";
version = "1.9.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/async-1.9.5.tar";
sha256 = "02f43vqlggy4qkqdggkl9mcg3rvagjysj45xgrx41jjx6cnjnm19";
url = "https://elpa.gnu.org/packages/async-1.9.6.tar";
sha256 = "0qyf1niqjhzaphb50q1znkwqzpdvqw3drivkzrqxrs747k7pm3my";
};
packageRequires = [ emacs ];
meta = {
@@ -249,10 +249,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.1.3";
version = "13.1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.1.3.tar";
sha256 = "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk";
url = "https://elpa.gnu.org/packages/auctex-13.1.4.tar";
sha256 = "1r9qysnfdbiblq3c95rgsh7vgy3k4qabnj0vicqhdkca0cl2b2bj";
};
packageRequires = [ emacs ];
meta = {
@@ -354,10 +354,10 @@
elpaBuild {
pname = "blist";
ename = "blist";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/blist-0.1.tar";
sha256 = "0p9jx7m05ynfi3bnd91jghw7101ym8qzm5r42rb1vy85pcf9lbad";
url = "https://elpa.gnu.org/packages/blist-0.2.tar";
sha256 = "1gsrj6clsfw36i7pdayfip615r80543j3iph6zm93p88wgwqigrq";
};
packageRequires = [];
meta = {
@@ -493,10 +493,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
version = "0.8";
version = "0.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cape-0.8.tar";
sha256 = "03zc1c2r8h3p9aqk2y8pwysiawbx0f5vgz7582d9qnixdygni117";
url = "https://elpa.gnu.org/packages/cape-0.9.tar";
sha256 = "0bjzm1jf3554q83mbmyj584v29cgb0s5wpj74y4p9iyy40g739rw";
};
packageRequires = [ emacs ];
meta = {
@@ -628,10 +628,10 @@
elpaBuild {
pname = "cobol-mode";
ename = "cobol-mode";
version = "1.0.0";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el";
sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi";
url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar";
sha256 = "1ivp0pghrkflhr2md34a6a86gwns867bnl30nqzwq8m4qc5xqjra";
};
packageRequires = [ cl-lib ];
meta = {
@@ -771,10 +771,10 @@
elpaBuild {
pname = "compat";
ename = "compat";
version = "28.1.2.0";
version = "28.1.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/compat-28.1.2.0.tar";
sha256 = "0gm2drvxdlmc3fjlapb5z8k1ymr6q7mrj9z7mb686jfy931b9mwr";
url = "https://elpa.gnu.org/packages/compat-28.1.2.2.tar";
sha256 = "1jymfbadvnbjfyml6lri7hc7gz4f97nadn7a7ifpcncm9mhi13bp";
};
packageRequires = [ emacs nadvice ];
meta = {
@@ -786,10 +786,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.18";
version = "0.19";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-0.18.tar";
sha256 = "0nvi8f0jrji26sjmji8f7rvc8gr1zq49kliq39z7h970d8p10cx2";
url = "https://elpa.gnu.org/packages/consult-0.19.tar";
sha256 = "11dac6cl40xyg05wzxanxsc74f1kgnnkqlgf5gqlkq24gwmlgvyk";
};
packageRequires = [ compat emacs ];
meta = {
@@ -801,10 +801,10 @@
elpaBuild {
pname = "consult-recoll";
ename = "consult-recoll";
version = "0.6.2";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-recoll-0.6.2.tar";
sha256 = "0ngisaxdsfmjcincxdjrpgj6q6vh4dav7b2bpfls9a7107rb2ycp";
url = "https://elpa.gnu.org/packages/consult-recoll-0.7.tar";
sha256 = "12a1qhp7yz6r5pblm68wp1zis0xnvsn2rm12rz9fircq8p3ff3j7";
};
packageRequires = [ consult emacs ];
meta = {
@@ -831,10 +831,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.26";
version = "0.27";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.26.tar";
sha256 = "13wsb0llrnmk65m27drnyaqzv9qicnxbpvqcanj0k90iv411kw21";
url = "https://elpa.gnu.org/packages/corfu-0.27.tar";
sha256 = "1i8nl94aaa5p4bp0idsmph3z61lccg9a7plbsnpicy0klsaj69r2";
};
packageRequires = [ emacs ];
meta = {
@@ -842,16 +842,16 @@
license = lib.licenses.free;
};
}) {};
coterm = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "coterm";
ename = "coterm";
version = "1.5";
version = "1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/coterm-1.5.tar";
sha256 = "1v8cl3bw5z0f36iw8x3gcgiizml74m1kfxfrasyfx8k01nbxcfs8";
url = "https://elpa.gnu.org/packages/coterm-1.6.tar";
sha256 = "0ikfm1acdsckflv1hcy9lmssyac2099x2yybhvb6vkghcgy99p00";
};
packageRequires = [ emacs ];
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/coterm.html";
license = lib.licenses.free;
@@ -906,10 +906,10 @@
elpaBuild {
pname = "crdt";
ename = "crdt";
version = "0.3.0";
version = "0.3.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/crdt-0.3.0.tar";
sha256 = "0fmrmpjqyzxcmx38kwl6mifq412qfgm9ak7j4f54j33kbp10hjj7";
url = "https://elpa.gnu.org/packages/crdt-0.3.3.tar";
sha256 = "12xdqdp4zwd163wc19cjakabgjyzm4l4xg4bns6q1p60zgynbkx8";
};
packageRequires = [];
meta = {
@@ -966,10 +966,10 @@
elpaBuild {
pname = "cursory";
ename = "cursory";
version = "0.2.1";
version = "0.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cursory-0.2.1.tar";
sha256 = "12q1icz1npan9fjn0sy2zfs3d0iz6b34hqsfggm187igq4zj3rrb";
url = "https://elpa.gnu.org/packages/cursory-0.3.0.tar";
sha256 = "1mgvdncqgf0ll2mn5zp47lvvbzrzgdga9dbbjwqaapzy6llfg51x";
};
packageRequires = [ emacs ];
meta = {
@@ -1041,10 +1041,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.32";
version = "0.33";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.32.tar";
sha256 = "1xp3mj3ndaljma0g7x9abziphgi2a6j8k1v52sb8xwgn4p5gdvby";
url = "https://elpa.gnu.org/packages/debbugs-0.33.tar";
sha256 = "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk";
};
packageRequires = [ emacs soap-client ];
meta = {
@@ -1071,10 +1071,10 @@
elpaBuild {
pname = "denote";
ename = "denote";
version = "0.4.0";
version = "0.6.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/denote-0.4.0.tar";
sha256 = "031ia1k5fqzq154jhi4icvivhdg8yn7zfkwy81yf0ivcsivri54s";
url = "https://elpa.gnu.org/packages/denote-0.6.1.tar";
sha256 = "1yxfnwq2b32xrl52g61a9g3i53m94iybx0n8hh6nbmcv5x4y43ya";
};
packageRequires = [ emacs ];
meta = {
@@ -1086,10 +1086,10 @@
elpaBuild {
pname = "detached";
ename = "detached";
version = "0.7";
version = "0.8.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/detached-0.7.tar";
sha256 = "1a2w6cmzy7c861rih9k2qbnmizyybrs1kwqp6lbz3wfs2h0zisrw";
url = "https://elpa.gnu.org/packages/detached-0.8.1.tar";
sha256 = "03riybjk2yls8wjkp1sqd30p0jpvrlz3qlj8r04cx7s1nn1kn9g3";
};
packageRequires = [ emacs ];
meta = {
@@ -1131,10 +1131,10 @@
elpaBuild {
pname = "diff-hl";
ename = "diff-hl";
version = "1.8.8";
version = "1.9.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar";
sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk";
url = "https://elpa.gnu.org/packages/diff-hl-1.9.0.tar";
sha256 = "00mqknqyibbqyfcvdvk1m7nwipfpsw3afbvipqmghh5zm2n7wjr4";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1386,10 +1386,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20220626";
version = "20220828";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20220626.tar";
sha256 = "0n09dws1qy23a31s5iv75dzl6xy8m5m7qy9gf7sk1b3133ly4sf5";
url = "https://elpa.gnu.org/packages/eev-20220828.tar";
sha256 = "0znsimjq61p67c2q3qbia5qrimy847xy6gjpl1jgyrdlpgm9hv6r";
};
packageRequires = [ emacs ];
meta = {
@@ -1397,6 +1397,21 @@
license = lib.licenses.free;
};
}) {};
ef-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "0.4.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-0.4.2.tar";
sha256 = "0ik9kzdv5r1q7hw81nh3raiychpmwi61034y12pqvbq24njp0y72";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/ef-themes.html";
license = lib.licenses.free;
};
}) {};
eglot = callPackage ({ eldoc
, elpaBuild
, emacs
@@ -1535,6 +1550,38 @@
license = lib.licenses.free;
};
}) {};
ement = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, map
, plz
, svg-lib
, taxy
, taxy-magit-section
, transient }:
elpaBuild {
pname = "ement";
ename = "ement";
version = "0.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ement-0.1.2.tar";
sha256 = "1n5k3rcgdq625b9fjhl53nl5zbis4dw0d00h4dk16m61nk98ra2l";
};
packageRequires = [
emacs
map
plz
svg-lib
taxy
taxy-magit-section
transient
];
meta = {
homepage = "https://elpa.gnu.org/packages/ement.html";
license = lib.licenses.free;
};
}) {};
emms = callPackage ({ cl-lib ? null
, elpaBuild
, fetchurl
@@ -1774,10 +1821,10 @@
elpaBuild {
pname = "fontaine";
ename = "fontaine";
version = "0.3.0";
version = "0.4.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/fontaine-0.3.0.tar";
sha256 = "0ixi48w3d0yvmw1103gj7iq2acj90p0qlyhna4hpfhnwa247lp2k";
url = "https://elpa.gnu.org/packages/fontaine-0.4.0.tar";
sha256 = "1phbni32zgwml5mwldbqmqmkbhbdj4vf4bs98wj0my6d902x6lbw";
};
packageRequires = [ emacs ];
meta = {
@@ -2208,10 +2255,10 @@
elpaBuild {
pname = "inspector";
ename = "inspector";
version = "0.5";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/inspector-0.5.tar";
sha256 = "19f2a0fw0zcrfirjhq7my910jiqxqkishyjprj87cahpksdp4cp9";
url = "https://elpa.gnu.org/packages/inspector-0.7.tar";
sha256 = "0cwfbg7bx4ni0xadba9v5jbkivz2slqwxcy7q8s3zipb4m578xbk";
};
packageRequires = [ emacs ];
meta = {
@@ -2438,10 +2485,10 @@
elpaBuild {
pname = "kind-icon";
ename = "kind-icon";
version = "0.1.6";
version = "0.1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/kind-icon-0.1.6.tar";
sha256 = "0ac53qrz217b054z51244r7whvjmyrq4941ld0bgl9crssrhb588";
url = "https://elpa.gnu.org/packages/kind-icon-0.1.7.tar";
sha256 = "02imi2qj329yrqvs23d4z7fv8bbaz0fvya6zdswb38blpdri4cn1";
};
packageRequires = [ emacs svg-lib ];
meta = {
@@ -2543,10 +2590,10 @@
elpaBuild {
pname = "lin";
ename = "lin";
version = "0.4.0";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/lin-0.4.0.tar";
sha256 = "1fynn3fpf3c2yamlpp9j6rakgd21ivyvqrx0hmsgcyr115q5afm4";
url = "https://elpa.gnu.org/packages/lin-1.0.0.tar";
sha256 = "0b090g2l8mvm3b6k7s31v9lw48qjcvcif2p201wlqgipddm6s180";
};
packageRequires = [ emacs ];
meta = {
@@ -2633,10 +2680,10 @@
elpaBuild {
pname = "logos";
ename = "logos";
version = "0.4.0";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/logos-0.4.0.tar";
sha256 = "12yypzfd6lf71qyix0a1088vkamh9ilq8inpmv2882w3r5dii345";
url = "https://elpa.gnu.org/packages/logos-0.5.0.tar";
sha256 = "026nzkgkfs96m9qxpng7h0kqvhxfah883pv4i08fz0950lrsxynd";
};
packageRequires = [ emacs ];
meta = {
@@ -2663,10 +2710,10 @@
elpaBuild {
pname = "marginalia";
ename = "marginalia";
version = "0.13";
version = "0.14";
src = fetchurl {
url = "https://elpa.gnu.org/packages/marginalia-0.13.tar";
sha256 = "1d5y3d2plkxnmm4458l0gfpim6q3vzps3bsfakvnzf86hh5nm77j";
url = "https://elpa.gnu.org/packages/marginalia-0.14.tar";
sha256 = "0y1mz9688h56knyly7by3gl6v37q437c3lp5bsx6jajysb8v69xw";
};
packageRequires = [ emacs ];
meta = {
@@ -2693,10 +2740,10 @@
elpaBuild {
pname = "math-symbol-lists";
ename = "math-symbol-lists";
version = "1.2.1";
version = "1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/math-symbol-lists-1.2.1.el";
sha256 = "015q44qg9snrpz04syz89f9f79pzg5h7w88nh84p38klynkx2f86";
url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar";
sha256 = "0h330j7vxmb56z66xgynqlxkr5bnp5id25j0w4ikyms407sdyrbs";
};
packageRequires = [];
meta = {
@@ -2862,10 +2909,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "2.5.0";
version = "2.6.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-2.5.0.tar";
sha256 = "0j2mx47fpbqvpwhkdskgrnyj5nzg25sqgxwsdvrvw22c7gxhirxn";
url = "https://elpa.gnu.org/packages/modus-themes-2.6.0.tar";
sha256 = "0i4y69rrdcm64mvqs5z7dmgx1xk0x7g5978q5gjblczlfka444k4";
};
packageRequires = [ emacs ];
meta = {
@@ -3130,10 +3177,10 @@
elpaBuild {
pname = "num3-mode";
ename = "num3-mode";
version = "1.4";
version = "1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/num3-mode-1.4.tar";
sha256 = "01cl5wc5xzf4milq6r5ps2f4ikpkdbdidk880svby9mhiw6agydh";
url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar";
sha256 = "0i01v0sl0wi98xvc3wkk2lwc3nxmnhhpyrhr9gn88x5ygc0p4rdw";
};
packageRequires = [];
meta = {
@@ -3235,10 +3282,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.5.4";
version = "9.5.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.5.4.tar";
sha256 = "1rcr1kyvd2l5h1i22z40x998jm4b6vk47i77y376blcrcx2dp26m";
url = "https://elpa.gnu.org/packages/org-9.5.5.tar";
sha256 = "13sykrkhb192vnmj5nlws5jc5a4fr7ynmyxpzanqlzx1gbdxv32p";
};
packageRequires = [ emacs ];
meta = {
@@ -3655,10 +3702,10 @@
elpaBuild {
pname = "pulsar";
ename = "pulsar";
version = "0.4.0";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pulsar-0.4.0.tar";
sha256 = "027kpywdjfd1xm1fxkprbc04iq96lnyzw2f3499wyrfj4vxk2dn2";
url = "https://elpa.gnu.org/packages/pulsar-0.5.0.tar";
sha256 = "1bs6f8j1a7vypwm087zsrccv5kbahxyg3nhc65ffgpwrnxfp4v96";
};
packageRequires = [ emacs ];
meta = {
@@ -3670,10 +3717,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "5.2.3";
version = "5.2.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-5.2.3.tar";
sha256 = "189r0qkd8nv5zjg2ljbzbj086jb8xbl4yd1jliz4azaprv8fhqv0";
url = "https://elpa.gnu.org/packages/pyim-5.2.4.tar";
sha256 = "1dzl4xaf31nyjb5hnwwf29i75x0i8dakpmmagbn4ks5hi3jl2ig0";
};
packageRequires = [ async emacs xr ];
meta = {
@@ -4181,10 +4228,10 @@
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.3.2";
version = "2.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.3.2.tar";
sha256 = "03hmk4gr9kjy3238n0ys9na00py035j9s0y8d87c45f5af6c6g2c";
url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar";
sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i";
};
packageRequires = [ emacs ];
meta = {
@@ -4730,14 +4777,29 @@
license = lib.licenses.free;
};
}) {};
topspace = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "topspace";
ename = "topspace";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar";
sha256 = "1c2raqmbyv5bd48gimh6dazfb6dmipjmf1j0w53vyrs48dx6kskq";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/topspace.html";
license = lib.licenses.free;
};
}) {};
tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.3.1";
version = "2.5.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.3.1.tar";
sha256 = "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a";
url = "https://elpa.gnu.org/packages/tramp-2.5.3.2.tar";
sha256 = "1jcicb9f7c1nmaqg20yy2j4wd0qfch4llc26ga7q3ckhx41pvbiw";
};
packageRequires = [ emacs ];
meta = {
@@ -5045,10 +5107,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.25";
version = "0.26";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.25.tar";
sha256 = "1v0icwqp4ppa2j1k1fk4fc5zdzqb4hcdc7khjc1c31q0gad6l3xy";
url = "https://elpa.gnu.org/packages/vertico-0.26.tar";
sha256 = "070dkw7ii5lfg4m0bwl9blbyq3rgqs212my142ri69ig1fz9x5ad";
};
packageRequires = [ emacs ];
meta = {
@@ -5462,4 +5524,19 @@
license = lib.licenses.free;
};
}) {};
zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
elpaBuild {
pname = "zuul";
ename = "zuul";
version = "0.4.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar";
sha256 = "1bm91g001q3n5m9ihxc719siiiy23pkpfkhplwi9p1i4i9zrpx5g";
};
packageRequires = [ emacs project ];
meta = {
homepage = "https://elpa.gnu.org/packages/zuul.html";
license = lib.licenses.free;
};
}) {};
}
@@ -135,21 +135,16 @@
license = lib.licenses.free;
};
}) {};
autothemer = callPackage ({ cl-lib ? null
, dash
, elpaBuild
, emacs
, fetchurl
, lib }:
autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "autothemer";
ename = "autothemer";
version = "0.2.5";
version = "0.2.14";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.5.tar";
sha256 = "1g07j8fmyqhhas0ci2f9l7i5l238cpb02vr93gyn2a3r3lq6wn4d";
url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.14.tar";
sha256 = "14y8b807d75qym1qviiqy1s85495z9g7jvvfqqz42ngdnk87l3qb";
};
packageRequires = [ cl-lib dash emacs ];
packageRequires = [ dash emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/autothemer.html";
license = lib.licenses.free;
@@ -219,10 +214,10 @@
elpaBuild {
pname = "buttercup";
ename = "buttercup";
version = "1.25";
version = "1.26";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/buttercup-1.25.tar";
sha256 = "1iadgn56sfakv927g9bk7fq7yjg0f3r10ygrmjpy46vgvfz0fqs6";
url = "https://elpa.nongnu.org/nongnu/buttercup-1.26.tar";
sha256 = "1ddzk6h4cxrl7mn8vr2qp4xjj2al3h5s3kwqxpdwd3zn6wqgyqm4";
};
packageRequires = [ emacs ];
meta = {
@@ -245,16 +240,16 @@
license = lib.licenses.free;
};
}) {};
cdlatex = callPackage ({ auctex, elpaBuild, fetchurl, lib }:
cdlatex = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "cdlatex";
ename = "cdlatex";
version = "4.12";
version = "4.14";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.12.tar";
sha256 = "1m8liqxz76r8f3b8hvyyn7kqgq0fkk5pv4pqgdscbgw36vpcbkry";
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.14.tar";
sha256 = "114g2afnq86c6662ychd0v64aam7nhk3hacbwx1cavhg1k2l7kci";
};
packageRequires = [ auctex ];
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/cdlatex.html";
license = lib.licenses.free;
@@ -273,10 +268,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
version = "1.4.1";
version = "1.5.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.4.1.tar";
sha256 = "0l36pqmjqzv6ykmw593h6qd24pygq7171qfinvlp2fh8897ac2nj";
url = "https://elpa.nongnu.org/nongnu/cider-1.5.0.tar";
sha256 = "0vggh2l92m8hm2wqzcyka439fs0kzbbfknfgyn79hf2f2f405534";
};
packageRequires = [
clojure-mode
@@ -793,6 +788,21 @@
license = lib.licenses.free;
};
}) {};
focus = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "focus";
ename = "focus";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/focus-1.0.0.tar";
sha256 = "0gicqiw7npcf18rfb99hm1s054m9l4izzcqzij2kpnc544aqgf9y";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/focus.html";
license = lib.licenses.free;
};
}) {};
forth-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "forth-mode";
@@ -832,10 +842,10 @@
elpaBuild {
pname = "geiser";
ename = "geiser";
version = "0.24";
version = "0.26.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-0.24.tar";
sha256 = "14qnni8ridrg3afh1wy9nvchbk0drn0h7ww5xgc6s03ivvmy7a71";
url = "https://elpa.nongnu.org/nongnu/geiser-0.26.1.tar";
sha256 = "1fq68gvyyrplxw8i0yma4q0yqmrzp00v1v7izlc5r7h58wryy39a";
};
packageRequires = [ emacs project transient ];
meta = {
@@ -922,10 +932,10 @@
elpaBuild {
pname = "geiser-guile";
ename = "geiser-guile";
version = "0.23.2";
version = "0.26.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.2.tar";
sha256 = "1z2khagg425y5cfja694zxrj3lyw3awsmqd86b2hpqhrylrb8jaa";
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.26.1.tar";
sha256 = "1ay7v2qsl0kr9zvf6j1sss3gxniwrqp8xgxhxf7nhlkmkgcfp1wk";
};
packageRequires = [ emacs geiser ];
meta = {
@@ -1123,10 +1133,10 @@
elpaBuild {
pname = "gruvbox-theme";
ename = "gruvbox-theme";
version = "1.27.0";
version = "1.30.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.27.0.tar";
sha256 = "0p36b2rrhizfrj8i86zm810bh0w7qikb5cwpyn106yfvgcv39jl8";
url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar";
sha256 = "19r3ffkyq779jjz0jvyxdf2zhm1yd1lax9sh0qsj1r5xrcmb15l7";
};
packageRequires = [ autothemer ];
meta = {
@@ -1345,10 +1355,10 @@
elpaBuild {
pname = "inf-ruby";
ename = "inf-ruby";
version = "2.6.1";
version = "2.6.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.1.tar";
sha256 = "0z57wwpm7wh04yp7za8fmv4ib56np629kmk4djs8qaz5bv494znr";
url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.2.tar";
sha256 = "09p9pny4p0bfw6lw5pf17spyd77jb0pliapp3mfn7r3w8l8wi8xc";
};
packageRequires = [ emacs ];
meta = {
@@ -1723,10 +1733,10 @@
elpaBuild {
pname = "org-auto-tangle";
ename = "org-auto-tangle";
version = "0.5.1";
version = "0.6.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.5.1.tar";
sha256 = "12sy30yr8r3g7gmvcdsrrmy62lhvajg3gp62gj7p836kh9xllpsl";
url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar";
sha256 = "07g1cwsr8j1sd8whshi9y2b69qx10g9vd77pmwki9ba4sy0m7b0p";
};
packageRequires = [ async emacs ];
meta = {
@@ -1944,10 +1954,10 @@
elpaBuild {
pname = "php-mode";
ename = "php-mode";
version = "1.24.0";
version = "1.24.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.0.tar";
sha256 = "158850zdmz5irjy6cjai1i8j7qs1vwp95a2dli9f341lbpv2jvzp";
url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.1.tar";
sha256 = "0ixm7z2bq4aacbwyzx53alfnqwbdn36i5ixdi3qjhr8rh5k48vg1";
};
packageRequires = [ emacs ];
meta = {
@@ -2338,10 +2348,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
version = "1.0.7";
version = "1.0.8";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.0.7.tar";
sha256 = "0js48yar8xgj3wjmlkv3k5208q1zvv74sg4lhk6asiy4cq3pqjia";
url = "https://elpa.nongnu.org/nongnu/subed-1.0.8.tar";
sha256 = "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1";
};
packageRequires = [ emacs ];
meta = {
@@ -2614,10 +2624,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.2.3";
version = "17.3.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.3.tar";
sha256 = "1fvkr3yvhx67wkcynid7xppaci3m1d5ggdaii3d4dfp57wwz5c13";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.1.tar";
sha256 = "0xlpxk9qscxip93lqyl1l5bzv6nxgq5yb8r05s4jslcipbbfil1d";
};
packageRequires = [ emacs ];
meta = {
@@ -2712,10 +2722,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "17.19.20220806194323";
version = "17.22.20220909110152";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.19.20220806194323.tar";
sha256 = "1cflsvp1cpyr3zsj2dij3mc36lprwjdhrvxx2k8ilavhzi4dn64v";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.22.20220909110152.tar";
sha256 = "1d8xkwcyd6dcxp926mwb8kgcpdqrcpmdv62ybdhx7izx0abia95y";
};
packageRequires = [ emacs ];
meta = {
File diff suppressed because it is too large Load Diff
@@ -1,17 +1,37 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p curl nix
#! nix-shell -i bash -p curl nix coreutils
set -euxo pipefail
export NIXPKGS_ALLOW_BROKEN=1
# This script piggybacks on the automatic code generation done by the nix-community emacs overlay
# You can use this to avoid running lengthy code generation jobs locally
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix
nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace
git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix
export NIXPKGS_ALLOW_BROKEN=1
curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json
download_change() {
local FILE_LOCATION="$1"
local BASEURL="https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos"
curl -s -O "${BASEURL}/${FILE_LOCATION}"
}
commit_change() {
local MESSAGE="$1"
local FILENAME="$2"
git diff --exit-code "${FILENAME}" > /dev/null || \
git commit -m "${MESSAGE}: updated $(date --iso) (from overlay)" -- "${FILENAME}"
}
download_change "elpa/elpa-generated.nix"
nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace
commit_change "elpa-packages" "elpa-generated.nix"
download_change "melpa/recipes-archive-melpa.json"
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages
git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json
commit_change "melpa-packages" "recipes-archive-melpa.json"
download_change "nongnu/nongnu-generated.nix"
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages
commit_change "nongnu-packages" "nongnu-generated.nix"
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "ghostwriter";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = version;
hash = "sha256-Vr1w9bAtjQK1ZevFDWQ7xNsUrdv5qrP+JHe1Cuc2CvE=";
hash = "sha256-YmZrT/KZUa34A0mMDM423GL99BDLrqrio7gNEW833SI=";
};
nativeBuildInputs = [ qmake pkg-config qttools ];
@@ -33,6 +33,7 @@
stdenv.mkDerivation rec {
pname = "pcsx2";
version = "1.7.3165";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "PCSX2";
+4 -4
View File
@@ -15,13 +15,13 @@ let
in {
mainline = libsForQt5.callPackage ./generic.nix rec {
pname = "yuzu-mainline";
version = "1137";
version = "1162";
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline";
rev = "mainline-0-${version}";
sha256 = "sha256-DLU5hmjTnlpRQ6sbcU7as/KeI9dDJAFUzVLciql5niE=";
sha256 = "sha256-1UNgB/3l6RN0OLRrmXqzwcEUgXlWGSE7PvHbZ8YSDro=";
fetchSubmodules = true;
};
@@ -30,13 +30,13 @@ in {
early-access = libsForQt5.callPackage ./generic.nix rec {
pname = "yuzu-ea";
version = "2907";
version = "2945";
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
sha256 = "sha256-spPW2/qeVyd1P1/Z2lcuA69igS3xV4KtcJ59yf9X4JI=";
sha256 = "sha256-/051EtQxhB5oKH/JxZZ2AjnxOBcRxCBIwd4Qr8lq7Ok=";
fetchSubmodules = true;
};
+2 -13
View File
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
@@ -19,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "drawing";
version = "1.0.0";
version = "1.0.1";
format = "other";
@@ -27,19 +26,9 @@ python3.pkgs.buildPythonApplication rec {
owner = "maoschanz";
repo = pname;
rev = version;
sha256 = "sha256-qNaljtuA5E/QaLJ9QILPRQCqOvKmX4ZGq/0z5unA8KA=";
sha256 = "sha256-9nosriI3Kdf1M5/TYFWn1jtQTqNKhBcFh7q3E4Uoq4s=";
};
patches = [
# Fix build with meson 0.61, can be removed on next update.
# https://github.com/NixOS/nixpkgs/issues/167584
(fetchpatch {
url = "https://github.com/maoschanz/drawing/commit/6dd271089af76b69322500778e3ad6615a117dcc.patch";
sha256 = "sha256-4pKWm3LYstVxZ4+gGsZDfM4K+7WBY8EYjylzc/CQZmo=";
includes = [ "data/meson.build" "help/meson.build" ];
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils
@@ -0,0 +1,49 @@
{ lib
, fetchFromGitLab
, rustPlatform
, cargo
, pkg-config
, binutils-unwrapped
, gtk3-x11
, atk
, glib
, librsvg
, gdk-pixbuf
, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
pname = "pizarra";
version = "1.7.3";
src = fetchFromGitLab {
owner = "categulario";
repo = "pizarra-gtk";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-XP+P2w6s47JQV4spKeMKe/Ktxid7uokGYH4IEJ5VHSc=";
};
cargoSha256 = "sha256-JQZ/95tRlmsrb0EJaPlE8G0fMSeEgLnDi3pkLjcJz/o=";
nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ];
buildInputs = [ gtk3-x11 atk glib librsvg ];
meta = with lib; {
description = "A simple blackboard written in GTK";
longDescription = ''
A simple endless blackboard.
Contains various features, such as:
- Pencil
- Rectangle
- Ellipse
- Line
- Text
- Grids
'';
homepage = "https://pizarra.categulario.tk/en/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mglolenstine ];
};
}
@@ -24,6 +24,6 @@ mkDerivation {
qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns
];
qtWrapperArgs = [
"--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl libkgapi ]}"
"--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl.out libkgapi ]}"
];
}
@@ -23,7 +23,10 @@ buildDotnetModule rec {
dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
nugetDeps = if stdenvNoCC.isAarch64 then ./deps-aarch64-linux.nix else ./deps-x86_64-linux.nix;
nugetDeps = ./deps.nix;
# Without this dotnet attempts to restore for Windows targets, which it cannot find the dependencies for
dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_6_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ];
projectFile = "ArchiSteamFarm.sln";
executables = [ "ArchiSteamFarm" ];
@@ -1,292 +0,0 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
(fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
(fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; })
(fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.14.1"; sha256 = "03rz12mxrjv5afm1hn4rrpimkkb8wdzp17634dcq10fhpbwhy6i5"; })
(fetchNuGet { pname = "Humanizer.Core.az"; version = "2.14.1"; sha256 = "138kdhy86afy5n72wy12qlb25q4034z73lz5nbibmkixxdnj9g5r"; })
(fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.14.1"; sha256 = "0scwzrvv8332prijkbp4y11n172smjb4sf7ygia6bi3ibhzq7zjy"; })
(fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.14.1"; sha256 = "1322kn7ym46mslh32sgwkv07l3jkkx7cw5wjphql2ziphxw536p8"; })
(fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.14.1"; sha256 = "1zl3vsdd2pw3nm05qpnr6c75y7gacgaghg9sj07ksvsjmklgqqih"; })
(fetchNuGet { pname = "Humanizer.Core.da"; version = "2.14.1"; sha256 = "10rmrvzwp212fpxv0sdq8f0sjymccsdn71k99f845kz0js83r70s"; })
(fetchNuGet { pname = "Humanizer.Core.de"; version = "2.14.1"; sha256 = "0j7kld0jdiqwin83arais9gzjj85mpshmxls64yi58qhl7qjzk0j"; })
(fetchNuGet { pname = "Humanizer.Core.el"; version = "2.14.1"; sha256 = "143q1321qh5506wwvcpy0fj7hpbd9i1k75247mqs2my05x9vc8n0"; })
(fetchNuGet { pname = "Humanizer.Core.es"; version = "2.14.1"; sha256 = "011kscy671mgyx412h55b0x9a1ngmdsgqzqq1w0l10xhf90y4hc8"; })
(fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.14.1"; sha256 = "184dxwkf251c27h7gg9y5zciixgcwy1cmdrs0bqrph7gg69kp6yq"; })
(fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.14.1"; sha256 = "144jlnlipr3pnbcyhbgrd2lxibx8vy00lp2zn60ihxppgbisircc"; })
(fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.14.1"; sha256 = "0klnfy8n659sp8zngd87gy7qakd56dwr1axjjzk0zph1zvww09jq"; })
(fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.14.1"; sha256 = "0b70illi4m58xvlqwcvar0smh6292zadzk2r8c25ryijh6d5a9qv"; })
(fetchNuGet { pname = "Humanizer.Core.he"; version = "2.14.1"; sha256 = "08xkiv88qqd1b0frpalb2npq9rvz2q1yz48k6dikrjvy6amggirh"; })
(fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.14.1"; sha256 = "12djmwxfg03018j2bqq5ikwkllyma8k7zmvpw61vxs7cv4izc6wh"; })
(fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.14.1"; sha256 = "0lw13p9b2kbqf96lif5kx59axxiahd617h154iswjfka9kxdw65x"; })
(fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.14.1"; sha256 = "1bgm0yabhvsv70amzmkvf3mls32lvd7yyr59yxf3xc96msqczgjh"; })
(fetchNuGet { pname = "Humanizer.Core.id"; version = "2.14.1"; sha256 = "1w0bnyac46f2321l09ckb6vz66s1bxl27skfww1iwrmf03i7m2cw"; })
(fetchNuGet { pname = "Humanizer.Core.is"; version = "2.14.1"; sha256 = "10w1fprlhxm1qy3rh0qf6z86ahrv8fcza3wrsx55idlmar1x9jyz"; })
(fetchNuGet { pname = "Humanizer.Core.it"; version = "2.14.1"; sha256 = "1msrmih8cp7r4yj7r85kr0l5h4yln80450mivliy1x322dav8xz2"; })
(fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.14.1"; sha256 = "04ry6z0v85y4y5vzbqlbxppfdm04i02dxbxaaykbps09rwqaa250"; })
(fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.14.1"; sha256 = "156641v0ilrpbzprscvbzfha57pri4y1i66n9v056nc8bm10ggbg"; })
(fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.14.1"; sha256 = "1scz21vgclbm1xhaw89f0v8s0vx46yv8yk3ij0nr6shsncgq9f7h"; })
(fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.14.1"; sha256 = "1909dsbxiv2sgj6myfhn8lbbmvkp2hjahj0knawypyq3jw9sq86g"; })
(fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.14.1"; sha256 = "1dmjrxb0kb297ycr8xf7ni3l7y4wdqrdhqbhy8xnm8dx90nmj9x5"; })
(fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.14.1"; sha256 = "0b183r1apzfa1hasimp2f27yfjkfp87nfbd8qdyrqdigw6nzcics"; })
(fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.14.1"; sha256 = "12rd75f83lv6z12b5hbwnarv3dkk29pvc836jpg2mzffm0g0kxj2"; })
(fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.14.1"; sha256 = "1n033yfw44sjf99mv51c53wggjdffz8b9wv7gwm3q7i6g7ck4vv1"; })
(fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.14.1"; sha256 = "0q4231by40bsr6mjy93n0zs365pz6da32pwkxcz1cc2hfdlkn0vd"; })
(fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.14.1"; sha256 = "0h2wbwrlcmjk8b2mryyd8rbb1qmripvg0zyg61gg0hifiqfg3cr2"; })
(fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.14.1"; sha256 = "0pg260zvyhqz8h1c96px1vs9q5ywvd0j2ixsq21mj96dj7bl5fay"; })
(fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.14.1"; sha256 = "04mr28bjcb9hs0wmpb4nk2v178i0fjr0ymc78dv9bbqkmrzfsmcn"; })
(fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.14.1"; sha256 = "060abvk7mrgawipjgw0h4hrvizby7acmj58w2g35fv54g43isgcl"; })
(fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.14.1"; sha256 = "182xiqf71kiqp42b8yqrag6z57wzqraqi10bnhx0crrc1gxq8v0j"; })
(fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.14.1"; sha256 = "12ygvzyqa0km7a0wz42zssq8qqakvghh96x1ng7qvwcrna3v2rdi"; })
(fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.14.1"; sha256 = "1ggj15qksyr16rilq2w76x38bxp6a6z75b30c9b7w5ni88nkgc7x"; })
(fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.14.1"; sha256 = "0lwr0gnashirny8lgaw0qnbb7x0qrjg8fs11594x8l7li3mahzz3"; })
(fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.14.1"; sha256 = "1c7yx59haikdqx7k7vqll6223jjmikgwbl3dzmrcs3laywgfnmgn"; })
(fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.14.1"; sha256 = "0kyyi5wc23i2lcag3zvrhga9gsnba3ahl4kdlaqvvg2jhdfarl4m"; })
(fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.14.1"; sha256 = "0rdvp0an263b2nj3c5v11hvdwgmj86ljf2m1h3g1x28pygbcx6am"; })
(fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.14.1"; sha256 = "0a2p6mhh0ajn0y7x98zbfasln1l04iiknd50sgf3svna99wybnxd"; })
(fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.14.1"; sha256 = "1jfzfgnk6wz5na2md800vq0djm6z194x618yvwxbnk2c7wikbjj2"; })
(fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.14.1"; sha256 = "0vimhw500rq60naxfari8qm6gjmjm8h9j6c04k67fs447djy8ndi"; })
(fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.14.1"; sha256 = "1yr0l73cy2qypkssmmjwfbbqgdplam62dqnzk9vx6x47dzpys077"; })
(fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; })
(fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; })
(fetchNuGet { pname = "Markdig.Signed"; version = "0.30.2"; sha256 = "094yy2hfwvnlzap919zmnbfc915v86gd1zb9hfcbfvzbly11rd7s"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "1fv3xvqc98l3ma4s8f2g4fklifbj1i24fngcvlhfm4j6s295xjj1"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "1qp64z6m7sr5ln3sa5b39vj73yd52zs7asqlsws3a9jpisns6vds"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.6"; sha256 = "0kygwac98rxq89g83lyzn21kslvgdkcqfd1dnba2ssw7q056fbgy"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.6"; sha256 = "0hlxq0k60ras0wj7d7q94dxd8nzjcry0kixxs6z1hyrbm4q0y3ls"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.6"; sha256 = "1wwwjldbqy6l8x9dlw0512zqac9jplsmnn0rrrwzrlb0p5amz0a4"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "088ggz1ac5z4ir707xmxiw4dlcaacfgmyvvlgwvsxhnv3fngf8b6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "04i4d7zhw7cqhfl84p93hpib8lhvkhmprip1li64sq5zrs36dxpx"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
(fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; })
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
(fetchNuGet { pname = "NLog"; version = "5.0.1"; sha256 = "1ln6qxm2kgq8vr4kja41y9b6mhcf2812fi7vbkmbc5q1bivawf1b"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.1"; sha256 = "1z7cp2zdnaiijm6m0449h5q4mpij3985nbpayscwbifsnv8xl9ci"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.0"; sha256 = "18jaxjbyaw5q166px5n5hanlwh0swlpw0fbcwh2qhvla7ik11gyk"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
(fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; })
(fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
(fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
(fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
(fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; })
(fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
(fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
(fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; })
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
(fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; })
(fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; })
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
(fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
(fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; })
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
(fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
(fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
(fetchNuGet { pname = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; })
(fetchNuGet { pname = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; })
(fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; })
(fetchNuGet { pname = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; })
(fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; })
(fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; })
(fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.4.0"; sha256 = "0yyh74b8vlngg2mg728ds86467y9vkxys29yszl129g2n8fk5q0m"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
(fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; })
(fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; })
(fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; })
(fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; })
(fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; })
(fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; })
(fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; })
(fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; })
(fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; })
(fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; })
(fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; })
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
(fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
(fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; })
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; })
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; })
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
(fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
(fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
(fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; })
(fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; })
(fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
(fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
(fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
(fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; })
(fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; })
(fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; })
(fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; })
(fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
(fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
(fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
(fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; })
(fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; })
]
@@ -55,12 +55,6 @@
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; })
(fetchNuGet { pname = "Markdig.Signed"; version = "0.30.2"; sha256 = "094yy2hfwvnlzap919zmnbfc915v86gd1zb9hfcbfvzbly11rd7s"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "1fv3xvqc98l3ma4s8f2g4fklifbj1i24fngcvlhfm4j6s295xjj1"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "1qp64z6m7sr5ln3sa5b39vj73yd52zs7asqlsws3a9jpisns6vds"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
@@ -77,17 +71,6 @@
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.6"; sha256 = "0kygwac98rxq89g83lyzn21kslvgdkcqfd1dnba2ssw7q056fbgy"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.6"; sha256 = "0hvawclkpp6srhbdl0b1ma2xsvf6yy8k8s1fp4by249qzpy26w7l"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.6"; sha256 = "1wwwjldbqy6l8x9dlw0512zqac9jplsmnn0rrrwzrlb0p5amz0a4"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "088ggz1ac5z4ir707xmxiw4dlcaacfgmyvvlgwvsxhnv3fngf8b6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "04i4d7zhw7cqhfl84p93hpib8lhvkhmprip1li64sq5zrs36dxpx"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
@@ -156,13 +139,6 @@
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
(fetchNuGet { pname = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; })
(fetchNuGet { pname = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; })
(fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; })
(fetchNuGet { pname = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; })
(fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; })
(fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; })
(fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; })
@@ -276,7 +252,6 @@
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
(fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; })
@@ -1,16 +1,16 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts nuget-to-nix
set -euox pipefail
#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
deps_file="$(realpath ./deps)"
deps_file="$(realpath ./deps.nix)"
new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
if [[ "$new_version" == "$old_version" ]]; then
echo "Already up to date!"
if [[ "$1" != "--deps-only" ]]; then
if [[ "${1-default}" != "--deps-only" ]]; then
exit 0
fi
fi
@@ -22,32 +22,8 @@ nixpkgs_path=$(pwd)
if [[ "${1:-}" != "--deps-only" ]]; then
update-source-version ArchiSteamFarm "$new_version"
fi
store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)"
platforms="$(nix-instantiate --strict --eval --json -A ArchiSteamFarm.meta.platforms | jq -r .[])"
src="$(mktemp -d /tmp/ArchiSteamFarm-src.XXX)"
trap '
rm -r "$src"
' EXIT
cp -rT "$store_src" "$src"
chmod -R +w "$src"
pushd "$src"
export DOTNET_NOLOGO=1
export DOTNET_CLI_TELEMETRY_OPTOUT=1
for i in $platforms; do
nix-shell -I nixpkgs="$nixpkgs_path" -p dotnet-sdk_6 --argstr system $i --run "
mkdir ./nuget_pkgs-$i
for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do
dotnet restore \$project --packages ./nuget_pkgs-$i
done;
nuget-to-nix ./nuget_pkgs-$i > $deps_file-$i.nix" \
|| echo "Did you set up binformat for $i?";
done;
$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file"
cd "$asf_path"
./web-ui/update.sh
+39
View File
@@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, ninja
, meson
, scdoc
, wayland-protocols
, freetype
, harfbuzz
, cairo
, pango
, wayland
, libxkbcommon
}:
stdenv.mkDerivation rec {
pname = "tofi";
version = "0.5.0";
src = fetchFromGitHub {
owner = "philj56";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mSW6o/yvqj3nqkdA9C4waB+b+YcFcEXDPAdRHqYXXhY=";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];
buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ];
meta = with lib; {
description = "Tiny dynamic menu for Wayland";
homepage = "https://github.com/philj56/tofi";
license = licenses.mit;
maintainers = with maintainers; [ fbergroth ];
platforms = platforms.linux;
broken = stdenv.isAarch64;
};
}
+7 -7
View File
@@ -1,17 +1,17 @@
{ stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }:
{ stdenv, lib, fetchzip, fetchurl, gtk3, jre8, libXtst, makeWrapper, makeDesktopItem, runtimeShell }:
stdenv.mkDerivation rec {
pname = "xmind";
version = "8-update8";
version = "8-update9";
src = fetchzip {
url = "https://xmind.net/xmind/downloads/${pname}-${version}-linux.zip";
url = "https://www.xmind.app/xmind/downloads/${pname}-${version}-linux.zip";
stripRoot = false;
sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn";
sha256 = "9769c4a9d42d3370ed2c2d1bed5a5d78f1fc3dc5bd604b064b56101fc7f90bb4";
};
srcIcon = fetchurl {
url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind";
url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind&id=41936c866b244b34d7dfbee373cbb835eed7860b";
sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f";
};
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
dontPatchELF = true;
dontStrip = true;
libPath = lib.makeLibraryPath [ gtk2 libXtst ];
libPath = lib.makeLibraryPath [ gtk3 libXtst ];
desktopItem = makeDesktopItem {
name = "XMind";
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
EOF
chmod +x $out/bin/XMind
ln -s ${jre} $out/libexec/jre
ln -s ${jre8} $out/libexec/jre
'';
meta = with lib; {
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.22.2";
version = "0.23.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D5NnCJrQQ2Iam9A5rxuiT6XOf00x/LOiwEC8SjSZdt0=";
sha256 = "sha256-WA/jkS6kArc+wZFzIpBekViVOVPafG6o1vPCVqXbBNs=";
};
vendorSha256 = "sha256-5QcltDNvhfyzUsFNbSjVnh0OMTxj+JU0VnDADSWTD48=";
vendorSha256 = "sha256-fR1793YcYMcemOHF6Pj32z1q8fxvwFJTFryDFHLL+Do=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
version = "0.8.11";
version = "0.8.12";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dkOkHsQ1ZfB5rSFuFRlrKf605EIo/7IkyyYz3ZhMggQ=";
sha256 = "sha256-FLOkGeGl2tpLCyJxiGubzo+d2fieF/aNfhNJ2nzOtfw=";
};
vendorSha256 = null;
@@ -0,0 +1,24 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec{
pname = "pinniped";
version = "0.17.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "pinniped";
rev = "v${version}";
sha256 = "sha256-0h7zyKe2gmC1n9EB5FRVI/io7Yj+91ZAtLy+1u3gyO0=";
};
subPackages = "cmd/pinniped";
vendorSha256 = "sha256-8ohyyciL1ORYOxPu64W0jXASTv+vVZR8StutzbF9N4Y=";
meta = with lib; {
description = "Tool to securely log in to your Kubernetes clusters";
homepage = "https://pinniped.dev/";
license = licenses.asl20;
maintainers = with maintainers; [ bpaulin ];
};
}
@@ -51,10 +51,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.183.0",
"sha256": "sha256-+bjDSRsQ407um35Qz/xfCtEd4jAjzjROh4T4iYsapmM=",
"rev": "v1.184.0",
"sha256": "sha256-MR0K1IqfTe1eA7F0URHcJtxRtptuiFOhlCU0ZenG0fI=",
"vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=",
"version": "1.183.0"
"version": "1.184.0"
},
"ansible": {
"owner": "nbering",
@@ -96,19 +96,19 @@
"owner": "AviatrixSystems",
"provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix",
"repo": "terraform-provider-aviatrix",
"rev": "v2.23.0",
"sha256": "sha256-ub8SKZC6l1+F2mEP4L6WP0VW/8k1ri80ruUjRvrl55A=",
"rev": "v2.24.0",
"sha256": "sha256-vLB6bMyjiZiebQWmnzSBW7geFW0ghCBba3YTteVzbII=",
"vendorSha256": null,
"version": "2.23.0"
"version": "2.24.0"
},
"aws": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.29.0",
"sha256": "sha256-hFvDQHiSr+UTSy2ikWM1BzRy139YZ5ulrbv738WQFrs=",
"vendorSha256": "sha256-PiOBkvIQ3X921HDPjUcfy1hcePh8mVVc3np17BnjdhI=",
"version": "4.29.0"
"rev": "v4.30.0",
"sha256": "sha256-MEHjn4F2HQLdewtZSPj3ruy7aHbws1gEmcJUGw6rINg=",
"vendorSha256": "sha256-tjebt9fxGJv5WHQoMyhIu+pqGskH7zAT0KYOFlaUI/I=",
"version": "4.30.0"
},
"azuread": {
"owner": "hashicorp",
@@ -123,10 +123,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v3.21.1",
"sha256": "sha256-Rsj1DGN3v6rwjSBVRa4bvXP67ZYkJMDoz5ANyYCgf/4=",
"rev": "v3.22.0",
"sha256": "sha256-E7rk78HNX5jaaA2bWaHCOcz4PxAICqxUWaHAfAIyO7I=",
"vendorSha256": null,
"version": "3.21.1"
"version": "3.22.0"
},
"azurestack": {
"owner": "hashicorp",
@@ -142,10 +142,10 @@
"owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
"rev": "v1.15.2",
"sha256": "sha256-RQTb1bIDpD5jvAJTOWG+aEVpMrSnJAqG6ZRQ/dOLZ4I=",
"vendorSha256": "sha256-dgcYdfManE48sYaRRMfYMxQ4qX4uqas0yx+bn60kPWU=",
"version": "1.15.2"
"rev": "v1.15.5",
"sha256": "sha256-GJdML2jq3g0HQKcORllEu2FZvBAx6A/deN+0LzIUkz4=",
"vendorSha256": "sha256-HSn4iNASqA1p9fT/poI3XlkyceafhpiS0cg3mL/TLEI=",
"version": "1.15.5"
},
"bigip": {
"owner": "F5Networks",
@@ -225,10 +225,10 @@
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v3.22.0",
"sha256": "sha256-K+0S7WSGP/9is7Q89aOPmSfFWZE9InBaS+KfhJKvNYk=",
"vendorSha256": "sha256-OuGc2msPWjczyv2XR8HESAdJd1Ovz0BihI/j6pdd9QY=",
"version": "3.22.0"
"rev": "v3.23.0",
"sha256": "sha256-x1DkYesbiJ362XD1gw8QmXS+hNgWO1J6qQNRT7E4aps=",
"vendorSha256": "sha256-QrBOxWB+Zs+2kMMv3G4qkUTnZbisDBadPbq1CTFr7Ns=",
"version": "3.23.0"
},
"cloudfoundry": {
"owner": "cloudfoundry-community",
@@ -289,10 +289,10 @@
"owner": "DataDog",
"provider-source-address": "registry.terraform.io/DataDog/datadog",
"repo": "terraform-provider-datadog",
"rev": "v3.14.0",
"sha256": "sha256-ErTbQEC01Vn8hqk2wglam/b+80ybzMELPfExwUE9TUo=",
"vendorSha256": "sha256-jWqkF0pyp2+pZJyC1+UNYMCDP40Tu9DBrX0WLOqpmnE=",
"version": "3.14.0"
"rev": "v3.15.1",
"sha256": "sha256-lHZURLE8woJzFVuuDFxSciyrt7rTAgvR7rF4INEGoVI=",
"vendorSha256": "sha256-X8X3nX+xHAqSb+j0P0PJ366MAFGRvUmcu/qYQqMI+0U=",
"version": "3.15.1"
},
"dhall": {
"owner": "awakesecurity",
@@ -343,10 +343,10 @@
"owner": "kreuzwerker",
"provider-source-address": "registry.terraform.io/kreuzwerker/docker",
"repo": "terraform-provider-docker",
"rev": "v2.20.3",
"sha256": "sha256-9zYqZ1bKOz2B4INrJqSklztNAl2ol3NGYW2IjPJfFkM=",
"vendorSha256": "sha256-G8gnEd7hT6XAC7cLOw711KsSFKjKvdd1BX/iaYV8a+U=",
"version": "2.20.3"
"rev": "v2.21.0",
"sha256": "sha256-btomRNWLTRf+p4H20b56l2/frYXW/j3p+m49JRISQOI=",
"vendorSha256": "sha256-9dsmWkIYrN+GDd/r7kKYUyj+77hKuVilfpVUMpQMseo=",
"version": "2.21.0"
},
"elasticsearch": {
"owner": "phillbaker",
@@ -361,10 +361,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/equinix",
"repo": "terraform-provider-equinix",
"rev": "v1.8.1",
"sha256": "sha256-eEYNCeft5gCjNRCJLIE58v8pNAdehP+KAQFYlinS9cU=",
"vendorSha256": "sha256-dB0asOYl4JUtsdmcuWhcX2WioqB4DI3MTJf5ynJOMVA=",
"version": "1.8.1"
"rev": "v1.9.0",
"sha256": "sha256-rawuS0k6f727/4zODo2+tWwEvtJ7mU7Fatm1vFVRVkc=",
"vendorSha256": "sha256-mrX0PWvND/DiQ4QruWpG6hx+AimV5I1zfpsyigzWl/8=",
"version": "1.9.0"
},
"exoscale": {
"owner": "exoscale",
@@ -388,10 +388,10 @@
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
"rev": "v2.2.1",
"sha256": "sha256-Ls5yTkwnvBjvGyJZ9Hr+BE6jFuwoTfl/iFVf3WsduF8=",
"rev": "v2.3.0",
"sha256": "sha256-rnB3GNh5t46ddonej1ofsbmUT3VAkMA8bbFJHhW9HcA=",
"vendorSha256": null,
"version": "2.2.1"
"version": "2.3.0"
},
"flexibleengine": {
"owner": "FlexibleEngineCloud",
@@ -435,30 +435,30 @@
"owner": "gitlabhq",
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
"repo": "terraform-provider-gitlab",
"rev": "v3.17.0",
"sha256": "sha256-jVBkrWwBWcRtyfq3Wt9fxoO6OewtYi0vw127iL1/ZJA=",
"vendorSha256": "sha256-0jzM/CvUKz8QECmMHfFirJxBRP8db+mhQxIQ5dTrlNM=",
"version": "3.17.0"
"rev": "v3.18.0",
"sha256": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
"vendorSha256": "sha256-YrgsycnRIB5UoWGADphfP6lf78M8ZnkJGP0Ti2QJtQ8=",
"version": "3.18.0"
},
"google": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.34.0",
"sha256": "sha256-pyp12UM42+dubwbPx7L4qIOYW0OulZ1D5OSgbdOUJQU=",
"rev": "v4.35.0",
"sha256": "sha256-4pp63xRIwJeX9NYTqcUejQoieqMFd4MzhktuOAs1fGo=",
"vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=",
"version": "4.34.0"
"version": "4.35.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.34.0",
"sha256": "sha256-1Ia2seissoXc98pGj4uvJcMP41eme1K/Tmnmtp8owLA=",
"rev": "v4.35.0",
"sha256": "sha256-e9290ZIfHqh5WelOLm1AYngbzLE3Ur0nwkZu0y0Qo7s=",
"vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=",
"version": "4.34.0"
"version": "4.35.0"
},
"googleworkspace": {
"owner": "hashicorp",
@@ -473,10 +473,10 @@
"owner": "grafana",
"provider-source-address": "registry.terraform.io/grafana/grafana",
"repo": "terraform-provider-grafana",
"rev": "v1.28.0",
"sha256": "sha256-j5kLmzPqEQkbn8ikjWs28gt8AXBW5/DAbnMZag0aP+Q=",
"vendorSha256": "sha256-NkGMblM6JB0JLTQJkNQqV90LXI8bEbULcgwwytwCwW4=",
"version": "1.28.0"
"rev": "v1.28.1",
"sha256": "sha256-VBwqjkiEFDgxYOCpmRXvJwHh2NOZMsPcYeIpsZbMXs8=",
"vendorSha256": "sha256-8iiJgAAKMeh/UBxthl9ebLCIcu/GCZZIfmDcerJakew=",
"version": "1.28.1"
},
"gridscale": {
"owner": "gridscale",
@@ -509,10 +509,10 @@
"owner": "heroku",
"provider-source-address": "registry.terraform.io/heroku/heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.1.2",
"sha256": "sha256-jZGjwJdQ/6j/kQvCmOwVUG+U4HXgQj5ca91hCUYaMGQ=",
"rev": "v5.1.3",
"sha256": "sha256-G0qQboL3GYmYkJg5yqEFJly9Z5PzVLiwz9Z9vG2QPDE=",
"vendorSha256": null,
"version": "5.1.2"
"version": "5.1.3"
},
"hetznerdns": {
"owner": "timohirt",
@@ -572,10 +572,10 @@
"owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm",
"rev": "v1.44.2",
"sha256": "sha256-rjpuuU456Kfnxxla6GwDnwnPp/EG6C3CMXNLWL5nwAE=",
"vendorSha256": "sha256-ew6aLScFXiBiBb4VbfsCJGG4pvO9yNbo3+IR0s4iH5Q=",
"version": "1.44.2"
"rev": "v1.45.0",
"sha256": "sha256-wKs9WWajz08u3EXNmevVLnXxBIY4FBazLuDYyPBPH3I=",
"vendorSha256": "sha256-FAoRQxnc/vD5KYp0hb6iWGbZiWEtLzEr6R+vdruitKc=",
"version": "1.45.0"
},
"icinga2": {
"owner": "Icinga",
@@ -626,10 +626,10 @@
"owner": "kingsoftcloud",
"provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
"repo": "terraform-provider-ksyun",
"rev": "v1.3.46",
"sha256": "sha256-qaRsja+pj0DgOZX9nNHSnCI2Ew18r3b5F0Ovqj3mR/Q=",
"rev": "v1.3.49",
"sha256": "sha256-cdEnY/pOYMUB6avsoZA/1TyEMOkKVGMSrfNOg6WtF0s=",
"vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=",
"version": "1.3.46"
"version": "1.3.49"
},
"kubectl": {
"owner": "gavinbunney",
@@ -780,10 +780,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.1.0",
"sha256": "sha256-pcY4SsElHVKHw8rh/ZYMsSqPOZ4XDlzLgwxgF9ivZmw=",
"rev": "v3.2.0",
"sha256": "sha256-t0bns7xtuOc1tankR3izyk97lrz3h87o1m0/CkSF49M=",
"vendorSha256": "sha256-PxMw2qjQP+dW1TAb8NxbtmHk/9yXAfM8aMIm4Qw5M1c=",
"version": "3.1.0"
"version": "3.2.0"
},
"nomad": {
"owner": "hashicorp",
@@ -835,10 +835,10 @@
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.91.0",
"sha256": "sha256-WLmY/vL0r2fQD4OPcWc9Pqs6hV2Fc2dbuTg7ssvwyu0=",
"rev": "v4.92.0",
"sha256": "sha256-uLoIGqVJD6CgQlixUgvhAYf7uUtwNDY6Xd3xqdvyYV4=",
"vendorSha256": null,
"version": "4.91.0"
"version": "4.92.0"
},
"okta": {
"owner": "okta",
@@ -898,19 +898,19 @@
"owner": "ovh",
"provider-source-address": "registry.terraform.io/ovh/ovh",
"repo": "terraform-provider-ovh",
"rev": "v0.19.1",
"sha256": "sha256-lQFiJLKxHfXKGNmwi+5wKO2AezmC/yI7igXHZHRnfak=",
"rev": "v0.20.0",
"sha256": "sha256-58eicQZElv0TVH2rPev/JLSIOkDkjjL3cDaTqV2SsOA=",
"vendorSha256": null,
"version": "0.19.1"
"version": "0.20.0"
},
"pagerduty": {
"owner": "PagerDuty",
"provider-source-address": "registry.terraform.io/PagerDuty/pagerduty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.6.1",
"sha256": "sha256-yBnxzXPNhibBx+p8od0IUQb9gdIQpgZk+9HEjcoe4fQ=",
"rev": "v2.6.2",
"sha256": "sha256-Kdm6WizssVdMwsTUyV4wUAW6QelUxDE9GZDGvnehFCw=",
"vendorSha256": null,
"version": "2.6.1"
"version": "2.6.2"
},
"panos": {
"owner": "PaloAltoNetworks",
@@ -961,19 +961,19 @@
"owner": "rancher",
"provider-source-address": "registry.terraform.io/rancher/rancher2",
"repo": "terraform-provider-rancher2",
"rev": "v1.24.0",
"sha256": "sha256-rNoz34ogNcthKBO26OL4TkIOyD95amPT2ByC6afqV1w=",
"vendorSha256": "sha256-cSf/peZBChjrElkwAK4eoczll1fyDvfnxm16wF/pqTs=",
"version": "1.24.0"
"rev": "v1.24.1",
"sha256": "sha256-B+GBBjqKw+1rU8Y2SW1ly5ZXBbTxQNc0FewWKe1WaVI=",
"vendorSha256": "sha256-4dhDSaekq9xyhiXtzk5WL3RTL1phrMnwL66mL9ixijA=",
"version": "1.24.1"
},
"random": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/random",
"repo": "terraform-provider-random",
"rev": "v3.4.2",
"sha256": "sha256-wLppAWv/pgsBUe4tEcP6CB4vHvYYAuugeF0Z+eKyEw8=",
"vendorSha256": "sha256-FBjwsOMtpKk0UhvWam9+7vQB6pIRwEOPD0A9fdiuDN4=",
"version": "3.4.2"
"rev": "v3.4.3",
"sha256": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=",
"vendorSha256": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=",
"version": "3.4.3"
},
"remote": {
"owner": "tenstad",
@@ -1078,10 +1078,10 @@
"owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.81.0",
"sha256": "sha256-UQgN9FTQCtEUvb0OqeQzYrCF/YOZwbvcNkmuyjfkxco=",
"vendorSha256": "sha256-hs6wvdUv4SUa1qYWSoJBaJntEJTCdTY1UeVOAoBUOg0=",
"version": "1.81.0"
"rev": "v1.82.0",
"sha256": "sha256-yCqNGpljTrlfDnKAk0A+rgSWZJGHT4tWl4UY99wzJ98=",
"vendorSha256": "sha256-VmN61ID/tbPtlBhc9lphSKAHZgADyc57ZyTlWsM9ZLA=",
"version": "1.82.0"
},
"stackpath": {
"owner": "stackpath",
@@ -1096,10 +1096,10 @@
"owner": "StatusCakeDev",
"provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake",
"repo": "terraform-provider-statuscake",
"rev": "v2.0.3",
"sha256": "sha256-QqTHH4wtMMIodOUa2E94L8ICI0G3LddbxWkNEZp5NLU=",
"vendorSha256": "sha256-E6DvzloOaamSX3jLKUQQmIccGiI6sFo4oNwU86td05E=",
"version": "2.0.3"
"rev": "v2.0.4",
"sha256": "sha256-wpDe+mtFh96qIbtfg+uilklvFNftQxqF9DOuudKLMm0=",
"vendorSha256": "sha256-FxTGEeJkElMovd6VGUEGss0gjorZPSPc+whqeHe4s2Y=",
"version": "2.0.4"
},
"sumologic": {
"owner": "SumoLogic",
@@ -1114,10 +1114,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.77.6",
"sha256": "sha256-1mdgrYbWy/PRIQ+o3UmTnSWhnP5p8k1D61Wz4U4N32A=",
"rev": "v1.77.8",
"sha256": "sha256-F3Lk7u/ecCduc7M1+pirJZcnHxmxulDLEZBdNUKPpbI=",
"vendorSha256": null,
"version": "1.77.6"
"version": "1.77.8"
},
"tfe": {
"owner": "hashicorp",
@@ -1277,9 +1277,9 @@
"owner": "yandex-cloud",
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
"repo": "terraform-provider-yandex",
"rev": "v0.78.0",
"sha256": "sha256-Llp0o/+CtyoWhymgWxVMPncl4C+XT2/5mhXAN4hYDLY=",
"vendorSha256": "sha256-QcFmk/kmhdhvO2HqpnLGDRIkOYu23A1g/mYKjzapIvc=",
"version": "0.78.0"
"rev": "v0.78.2",
"sha256": "sha256-jFeJMtwxytmNvCc4NoOlHXs28eQKYV727N4uWGozEmM=",
"vendorSha256": "sha256-PKWLVh/XMinLjj343fwlgWA7K2K+yVXJQ7M6LRmmdp8=",
"version": "0.78.2"
}
}
@@ -1,7 +1,6 @@
{ lib
, python3
, fetchFromGitHub
, which
, wrapQtAppsHook
}:
@@ -1,5 +1,6 @@
{ stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial
, setuptools, wxPython_4_0, billiard, gnureadline, opencv4 }:
{ stdenv, lib, buildPythonApplication, fetchPypi, lxml, matplotlib, numpy
, opencv4, pymavlink, pyserial, setuptools, wxPython_4_0, billiard
, gnureadline }:
buildPythonApplication rec {
pname = "MAVProxy";
@@ -16,13 +17,14 @@ buildPythonApplication rec {
'';
propagatedBuildInputs = [
lxml
matplotlib
numpy
opencv4
pymavlink
pyserial
setuptools
wxPython_4_0
opencv4
] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ];
# No tests
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.29.1";
version = "2.29.2";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-odlvhkgIiNB8fsRfVswiqfpAKLtP9EtcoMxd5SmhX8I=";
sha256 = "sha256-995+6AYhSkMkOSm/ZjlInS5zb1od5nbEChvUyS/8RHM=";
};
# Fix 'NameError: name 'ssl' is not defined'
@@ -38,13 +38,13 @@ let
in
buildPerlModule rec {
pname = "pipe-viewer";
version = "0.1.4";
version = "0.3.0";
src = fetchFromGitHub {
owner = "trizen";
repo = "pipe-viewer";
rev = version;
hash = "sha256-kDlZ3Cl8zvN/naGExh2yVW5yHwc1O04x4s22lNkbCzU=";
hash = "sha256-2Kzo7NYxARPFuOijwf2a3WQxnNumtKRiRhMhjrWA4GY=";
};
nativeBuildInputs = [ makeWrapper ]
@@ -1,28 +1,37 @@
{ stdenvNoCC, lib, fetchFromGitHub }:
{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, wget }:
stdenvNoCC.mkDerivation rec {
pname = "distrobox";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "89luca89";
repo = pname;
rev = version;
sha256 = "sha256-7qPEtWDshe3bHUvbf35k31EnL2sQEXeDmMUGBPkiB9U=";
sha256 = "sha256-XYqPwBiMbwG0bTiFRywZRWjp1OabTHcwhmbcx11SgPo=";
};
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
./install -p $out/bin
# https://github.com/89luca89/distrobox/issues/408
substituteInPlace ./distrobox-generate-entry \
--replace 'icon_default="''${HOME}/.local' "icon_default=\"$out"
./install -P $out
runHook postInstall
'';
# https://github.com/89luca89/distrobox/issues/407
postFixup = ''
wrapProgram "$out/bin/distrobox-generate-entry" \
--prefix PATH ":" ${lib.makeBinPath [ wget ]}
'';
meta = with lib; {
description = "Wrapper around podman or docker to create and start containers";
longDescription = ''
@@ -243,19 +243,19 @@ rec {
# Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec {
version = "20.10.17";
version = "20.10.18";
rev = "v${version}";
sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8=";
sha256 = "sha256-AyY6xfFEvUv7Kqo3M0gv9/4NoBUDqQyP4ZIcz+oGNys=";
moby-src = fetchFromGitHub {
owner = "moby";
repo = "moby";
rev = "v${version}";
sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I=";
sha256 = "sha256-c0A66JVvRPFNT/xCTIsW8k3a/EMIl73d/UlCohjmGMk=";
};
runcRev = "v1.1.2";
runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
containerdRev = "v1.6.6";
containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
runcRev = "v1.1.4";
runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
containerdRev = "v1.6.8";
containerdSha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8=";
tiniRev = "v0.19.0";
tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};
@@ -3,7 +3,12 @@
, rustPlatform
, fetchFromGitHub
, asciidoctor
, buildah
, buildah-unwrapped
, libiconv
, libkrun
, makeWrapper
, sigtool
}:
stdenv.mkDerivation rec {
@@ -22,17 +27,41 @@ stdenv.mkDerivation rec {
hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o=";
};
nativeBuildInputs = with rustPlatform;[
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
asciidoctor
makeWrapper
] ++ lib.optionals stdenv.isDarwin [ sigtool ];
buildInputs = [ libkrun ] ++ lib.optionals stdenv.isDarwin [
libiconv
];
buildInputs = [ libkrun ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
postPatch = ''
# do not pollute etc
substituteInPlace src/utils.rs \
--replace "etc/containers" "share/krunvm/containers"
'';
postInstall = ''
mkdir -p $out/share/krunvm/containers
install -D -m755 ${buildah-unwrapped.src}/docs/samples/registries.conf $out/share/krunvm/containers/registries.conf
install -D -m755 ${buildah-unwrapped.src}/tests/policy.json $out/share/krunvm/containers/policy.json
'';
# It attaches entitlements with codesign and strip removes those,
# voiding the entitlements and making it non-operational.
dontStrip = stdenv.isDarwin;
postFixup = ''
wrapProgram $out/bin/krunvm \
--prefix PATH : ${lib.makeBinPath [ buildah ]} \
'';
meta = with lib; {
description = "A CLI-based utility for creating microVMs from OCI images";
homepage = "https://github.com/containers/krunvm";
@@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "virt-manager";
version = "4.0.0";
version = "4.1.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y=";
hash = "sha256-UgZ58WLXq0U3EDt4311kv0kayVU17In4kwnQ+QN1E7A=";
};
nativeBuildInputs = [
@@ -33,16 +33,6 @@ python3.pkgs.buildPythonApplication rec {
pygobject3 libvirt libxml2 requests cdrtools
];
patches = [
# due to a recent change in setuptools-61, "packages=[]" needs to be included
# this patch can hopefully be removed, once virt-manager has an upstream version bump
(fetchpatch {
name = "fix-for-setuptools-61.patch";
url = "https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474.patch";
sha256 = "sha256-/RZG+7Pmd7rmxMZf8Fvg09dUggs2MqXZahfRQ5cLcuM=";
})
];
postPatch = ''
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
sed -i "/'install_egg_info'/d" setup.py
@@ -80,6 +70,8 @@ python3.pkgs.buildPythonApplication rec {
disabledTests = [
"testAlterDisk"
"test_misc_nonpredicatble_generate"
"test_disk_dir_searchable" # does something strange with permissions
"testCLI0001virt_install_many_devices" # expects /var to exist
];
preCheck = ''
+48
View File
@@ -142,4 +142,52 @@ with builtins; with lib; recursiveUpdate lib (rec {
if cl?case then compare cl.case var
else all (equal true) (zipListsWith compare cl.cases var); in
switch-if (map (cl: { cond = combine cl var; inherit (cl) out; }) clauses) default;
/* Override arguments to mkCoqDerivation for a Coq library.
This function allows you to easily override arguments to mkCoqDerivation,
even when they are not exposed by the Coq library directly.
Type: overrideCoqDerivation :: AttrSet -> CoqLibraryDerivation -> CoqLibraryDerivation
Example:
```nix
coqPackages.lib.overrideCoqDerivation
{
defaultVersion = "9999";
release."9999".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkw";
}
coqPackages.QuickChick;
```
This example overrides the `defaultVersion` and `release` arguments that
are passed to `mkCoqDerivation` in the QuickChick derivation.
Note that there is a difference between using `.override` on a Coq
library vs this `overrideCoqDerivation` function. `.override` allows you
to modify arguments to the derivation itself, for instance by passing
different versions of dependencies:
```nix
coqPackages.QuickChick.override { ssreflect = my-cool-ssreflect; }
```
whereas `overrideCoqDerivation` allows you to override arguments to the
call to `mkCoqDerivation` in the Coq library.
Note that all Coq libraries in Nixpkgs have a `version` argument for
easily using a different version. So if all you want to do is use a
different version, and the derivation for the Coq library already has
support for the version you want, you likely only need to update the
`version` argument on the library derivation. This is done with
`.override`:
```nix
coqPackages.QuickChick.override { version = "1.4.0"; }
```
*/
overrideCoqDerivation = f: drv: (drv.override (args: {
mkCoqDerivation = drv_: (args.mkCoqDerivation drv_).override f;
}));
})
@@ -1,4 +1,20 @@
{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeShellScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin, coreutils }:
{ lib
, stdenvNoCC
, callPackage
, linkFarmFromDrvs
, dotnetCorePackages
, dotnetPackages
, mkNugetSource
, mkNugetDeps
, srcOnly
, writeShellScript
, writeText
, makeWrapper
, nuget-to-nix
, cacert
, symlinkJoin
, coreutils
}:
{ name ? "${args.pname}-${args.version}"
, pname ? name
@@ -135,44 +151,73 @@ in stdenvNoCC.mkDerivation (args // {
inherit nuget-source;
fetch-deps = let
exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; };
# Because this list is rather long its put in its own store path to maintain readability of the generated script
exclusions = writeText "nuget-package-exclusions" (lib.concatStringsSep "\n" (dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; }));
runtimeIds = map (system: dotnet-sdk.systemToDotnetRid system) (args.meta.platforms or dotnet-sdk.meta.platforms);
# Derivations may set flags such as `--runtime <rid>` based on the host platform to avoid restoring/building nuget dependencies they dont have or dont need.
# This introduces an issue; In this script we loop over all platforms from `meta` and add the RID flag for it, as to fetch all required dependencies.
# The script would inherit the RID flag from the derivation based on the platform building the script, and set the flag for any iteration we do over the RIDs.
# That causes conflicts. To circumvent it we remove all occurances of the flag.
flags =
let
hasRid = flag: lib.any (v: v) (map (rid: lib.hasInfix rid flag) (lib.attrValues dotnet-sdk.runtimeIdentifierMap));
in
builtins.filter (flag: !(hasRid flag)) (dotnetFlags ++ dotnetRestoreFlags);
in writeShellScript "fetch-${pname}-deps" ''
set -euo pipefail
export PATH="${lib.makeBinPath [ coreutils dotnet-sdk nuget-to-nix ]}"
cd "$(dirname "''${BASH_SOURCE[0]}")"
case "''${1-}" in
--help|-h)
echo "usage: $0 <output path> [--help]"
echo " <output path> The path to write the lockfile to"
echo " --help Show this help message"
exit
;;
esac
export HOME=$(mktemp -d)
deps_file="''${1:-/tmp/${pname}-deps.nix}"
deps_file="$(realpath "''${1:-$(mktemp -t "XXXXXX-${pname}-deps.nix")}")"
export HOME=$(mktemp -td "XXXXXX-${pname}-home")
mkdir -p "$HOME/nuget_pkgs"
store_src="${srcOnly args}"
src="$(mktemp -d /tmp/${pname}.XXX)"
src="$(mktemp -td "XXXXXX-${pname}-src")"
cp -rT "$store_src" "$src"
chmod -R +w "$src"
trap "rm -rf $src $HOME" EXIT
pushd "$src"
cd "$src"
echo "Restoring project..."
export DOTNET_NOLOGO=1
export DOTNET_CLI_TELEMETRY_OPTOUT=1
mkdir -p "$HOME/nuget_pkgs"
for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do
dotnet restore "$project" \
${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
--packages "$HOME/nuget_pkgs" \
${lib.optionalString (dotnetRestoreFlags != []) (builtins.toString dotnetRestoreFlags)} \
${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)}
for rid in "${lib.concatStringsSep "\" \"" runtimeIds}"; do
for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do
dotnet restore "$project" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
--packages "$HOME/nuget_pkgs" \
--runtime "$rid" \
${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
${lib.optionalString (flags != []) (toString flags)}
done
done
echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions"
echo "Succesfully restored project"
echo "Writing lockfile..."
nuget-to-nix "$HOME/nuget_pkgs" "$HOME/package_exclusions" > "$deps_file"
echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$deps_file"
nuget-to-nix "$HOME/nuget_pkgs" "${exclusions}" >> "$deps_file"
echo "Succesfully wrote lockfile to: $deps_file"
'';
} // args.passthru or {};
meta = {
platforms = dotnet-sdk.meta.platforms;
} // args.meta or {};
})
@@ -1,20 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -105,8 +105,18 @@ stdenv.mkDerivation rec {
export DOTNET_CLI_TELEMETRY_OPTOUT=1
'';
passthru = {
passthru = rec {
inherit icu packages;
runtimeIdentifierMap = {
"x86_64-linux" = "linux-x64";
"aarch64-linux" = "linux-arm64";
"x86_64-darwin" = "osx-x64";
"aarch64-darwin" = "osx-arm64";
};
# Convert a "stdenv.hostPlatform.system" to a dotnet RID
systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}");
};
meta = with lib; {
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
makeFlags = [ "PYTHON=python" "STATIC_BUILD=${toString stdenv.hostPlatform.isStatic}" ];
installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
postFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libfdt.dylib $out/lib/libfdt-${version}.dylib
'';
# Checks are broken on aarch64 darwin
# https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436
doCheck = !stdenv.isDarwin;
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "julia-bin";
version = "1.8.0";
version = "1.8.1";
src = {
x86_64-linux = fetchurl {
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
sha256 = "sha256-6A1zLMt/eeAA15jLi2Vtw2QatZUW1uTlLhZ2UBeJKgA=";
sha256 = "sha256-MwVO5kfuik+1T8BREOB+C1PgRZH+U9Cky0x+16BekfE=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -83,7 +83,6 @@ in
inherit CoreFoundation Security;
};
clippy = self.callPackage ./clippy.nix { inherit Security; };
rls = self.callPackage ./rls { inherit CoreFoundation Security SystemConfiguration; };
});
};
}
@@ -1,53 +0,0 @@
{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform
, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
, CoreFoundation, Security, SystemConfiguration }:
rustPlatform.buildRustPackage rec {
pname = "rls";
inherit (rustPlatform.rust.rustc) src version;
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
cargoVendorDir = "vendor";
buildAndTestSubdir = "src/tools/rls";
preBuild = ''
# client tests are flaky
rm ${buildAndTestSubdir}/tests/client.rs
'';
# a nightly compiler is required unless we use this cheat code.
RUSTC_BOOTSTRAP=1;
# As of rustc 1.45.0, these env vars are required to build rls
# (due to https://github.com/rust-lang/rust/pull/72001)
CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly";
CFG_RELEASE_CHANNEL = "nightly";
# rls-rustc links to rustc_private crates
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
nativeBuildInputs = [ pkg-config cmake makeWrapper ];
buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ]
++ lib.optionals stdenv.isDarwin [ CoreFoundation Security SystemConfiguration ];
doCheck = true;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/rls --version
'';
RUST_SRC_PATH = rustPlatform.rustLibSrc;
postInstall = ''
wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc}
'';
meta = with lib; {
description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
homepage = "https://github.com/rust-lang/rls/";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ symphorien ];
};
}
@@ -6,7 +6,8 @@ with lib; mkCoqDerivation {
owner = "gappa";
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = if versions.range "8.8" "8.15" coq.coq-version then "1.5.1" else null;
defaultVersion = if versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null;
release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM=";
release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg";
release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n";
release."1.4.5".sha256 = "081hib1d9wfm29kis390qsqch8v6fs3q71g2rgbbzx5y5cf48n9k";
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_3 nix-prefetch-git
#!nix-shell -I nixpkgs=./. -i bash -p gnused jq common-updater-scripts nix-prefetch-git
set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
@@ -19,23 +19,5 @@ if [[ $new_rev == $old_rev ]]; then
fi
pushd ../../../..
update-source-version python-language-server "$new_version" "$new_hash" --rev="$new_rev"
store_src="$(nix-build -A python-language-server.src --no-out-link)"
src="$(mktemp -d /tmp/pylang-server-src.XXX)"
cp -rT "$store_src" "$src"
chmod -R +w "$src"
pushd "$src"
export DOTNET_NOLOGO=1
export DOTNET_CLI_TELEMETRY_OPTOUT=1
mkdir ./nuget_pkgs
dotnet restore src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj --packages ./nuget_pkgs
nuget-to-nix ./nuget_pkgs > "$deps_file"
trap ''
rm -r "$src"
'' EXIT
$(nix-build -A python-language-server.fetch-deps --no-out-link) "$deps_file"
@@ -1,25 +1,16 @@
{ stdenv, lib, fetchFromGitHub, buildGoModule, fetchpatch }:
buildGoModule rec {
pname = "starlark";
version = "unstable-2022-03-02";
version = "unstable-2022-08-17";
src = fetchFromGitHub {
owner = "google";
repo = "starlark-go";
rev = "5411bad688d12781515a91cc032645331b4fc302";
sha256 = "sha256-JNsGyGlIVMS5w0W4jHVsrPqqNms3Xfpa4n/XcEWqt6I=";
rev = "f738f5508c12fe5a9fae44bbdf07a94ddcf5030e";
sha256 = "sha256-nkQxwdP/lXEq5iiGy17mUTSMG6XiKAUJYfMDgbr10yM=";
};
vendorSha256 = "sha256-lgL5o3MQfZekZ++BNESwV0LeoTxwEZfziQAe99zm4RY=";
patches = [
# Fix floating point imprecision issue in the test suite.
# https://github.com/google/starlark-go/pull/409
(fetchpatch {
url = "https://github.com/google/starlark-go/commit/be6ed3bfcc376e5bf6fe2257ae89ddfb00d14e2c.patch";
sha256 = "sha256-A0tHPso6SfFn73kICcA9/5n3JHd7hMdQMGty+4L6T4k=";
})
];
vendorSha256 = "sha256-Kcjtaef//7LmUAIViyKv3gTK7kjynwJ6DwgGJ+pdbfM=";
ldflags = [ "-s" "-w" ];
@@ -0,0 +1,24 @@
diff --git a/scheme.c b/scheme.c
index 6186ef0..5a43592 100644
--- a/scheme.c
+++ b/scheme.c
@@ -4949,19 +4949,7 @@ pointer scheme_eval(scheme *sc, pointer obj)
#if STANDALONE
-#if defined(__APPLE__) && !defined (OSX)
-int main()
-{
- extern MacTS_main(int argc, char **argv);
- char** argv;
- int argc = ccommand(&argv);
- MacTS_main(argc,argv);
- return 0;
-}
-int MacTS_main(int argc, char **argv) {
-#else
int main(int argc, char **argv) {
-#endif
scheme sc;
FILE *fin;
char *file_name=InitFile;
@@ -0,0 +1,26 @@
diff --git a/makefile b/makefile
index aeb2fcd..4c111a1 100644
--- a/makefile
+++ b/makefile
@@ -18,7 +18,7 @@
#AR= echo
# Unix, generally
-CC = gcc -fpic -pedantic
+CC := $(CC) -fpic -pedantic
DEBUG=-g -Wall -Wno-char-subscripts -O
Osuf=o
SOsuf=so
@@ -27,10 +27,10 @@ EXE_EXT=
LIBPREFIX=lib
OUT = -o $@
RM= -rm -f
-AR= ar crs
+AR := $(AR) crs
# Linux
-LD = gcc
+LD := $(CC)
LDFLAGS = -shared
DEBUG=-g -Wno-char-subscripts -O
SYS_LIBS= -ldl -lm
@@ -0,0 +1,13 @@
diff --git a/makefile b/makefile
index 4c111a1..8d9e02e 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@
CC := $(CC) -fpic -pedantic
DEBUG=-g -Wall -Wno-char-subscripts -O
Osuf=o
-SOsuf=so
+SOsuf=dylib
LIBsuf=a
EXE_EXT=
LIBPREFIX=lib
@@ -1,4 +1,10 @@
{ lib, stdenv, fetchurl }:
{ lib
, stdenv
, fetchurl
, dos2unix
, runCommand
, tinyscheme
}:
stdenv.mkDerivation rec {
pname = "tinyscheme";
@@ -9,27 +15,68 @@ stdenv.mkDerivation rec {
sha256 = "sha256-F7Cxv/0i89SdWDPiKhILM5A50s/aC0bW/FHdLwG0B60=";
};
patchPhase = ''
nativeBuildInputs = [ dos2unix ];
prePatch = "dos2unix makefile";
patches = [
# The alternate macOS main makes use of `ccommand` which seems to be
# `MetroWerks CodeWarrier` specific:
# https://ptgmedia.pearsoncmg.com/imprint_downloads/informit/downloads/9780201703535/macfix.html
#
# In any case, this is not needed to build on macOS.
./01-remove-macOS-main.patch
# We want to have the makefile pick up $CC, etc. so that we don't have
# to unnecessarily tie this package to the GCC stdenv.
./02-use-toolchain-env-vars.patch
] ++ lib.optionals stdenv.targetPlatform.isDarwin [
# On macOS the library suffix is .dylib:
./03-macOS-SOsuf.patch
];
postPatch = ''
substituteInPlace scheme.c --replace "init.scm" "$out/lib/init.scm"
'';
installPhase = ''
mkdir -p $out/bin $out/lib
cp init.scm $out/lib
cp libtinyscheme* $out/lib
cp scheme $out/bin/tinyscheme
'';
passthru.tests = {
# Checks that the program can run and exit:
simple = runCommand "${pname}-simple-test" {} ''
${tinyscheme}/bin/tinyscheme <<<"(quit 0)"
echo "success" > $out
'';
fileIo = runCommand "${pname}-file-io-test" {} ''
${tinyscheme}/bin/tinyscheme <<EOF
(call-with-output-file "$out"
(lambda (p)
(begin
(write "success!" p)
(newline p)
)))
EOF
'';
helpText = runCommand "${pname}-help-text-test" {} ''
${tinyscheme}/bin/tinyscheme '-?' | tee > $out || :
[[ "$(cat $out)" =~ ^Usage: ]]
'';
};
meta = with lib; {
broken = stdenv.isDarwin;
description = "Lightweight Scheme implementation";
longDescription = ''
TinyScheme is a lightweight Scheme interpreter that implements as large a
subset of R5RS as was possible without getting very large and complicated.
'';
homepage = "http://tinyscheme.sourceforge.net/";
changelog = "http://tinyscheme.sourceforge.net/CHANGES";
license = licenses.bsdOriginal;
mainProgram = pname;
maintainers = [ maintainers.ebzzry ];
platforms = platforms.unix;
badPlatforms = [ "aarch64-darwin" ];
};
}
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc=";
};
postPatch = lib.optionalString stdenv.cc.isClang ''
substituteInPlace mk/ixp.mk \
--replace "©" "C "
'';
postConfigure = ''
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
'';
@@ -19,7 +24,6 @@ stdenv.mkDerivation rec {
buildInputs = [ txt2tags ];
meta = {
broken = stdenv.isDarwin;
homepage = "https://github.com/0intro/libixp";
description = "Portable, simple C-language 9P client and server libary";
maintainers = with lib.maintainers; [ kovirobi ];
+19 -3
View File
@@ -1,11 +1,15 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, rustPlatform
, pkg-config
, dtc
, glibc
, openssl
, libiconv
, libkrunfw
, Hypervisor
, sevVariant ? false
}:
@@ -13,11 +17,14 @@ stdenv.mkDerivation rec {
pname = "libkrun";
version = "1.3.0";
src = fetchFromGitHub {
src = if stdenv.isLinux then fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c=";
} else fetchurl {
url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
hash = "sha256-RBqeGUhB6Sdt+JujyQBW/76mZwnT0LNs9AMYr8+OCVU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
@@ -25,21 +32,30 @@ stdenv.mkDerivation rec {
hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0=";
};
nativeBuildInputs = with rustPlatform;[
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
] ++ lib.optional sevVariant pkg-config;
buildInputs = [
(libkrunfw.override { inherit sevVariant; })
] ++ lib.optionals stdenv.isLinux [
glibc
glibc.static
(libkrunfw.override { inherit sevVariant; })
] ++ lib.optionals stdenv.isDarwin [
libiconv
Hypervisor
dtc
] ++ lib.optional sevVariant openssl;
makeFlags = [ "PREFIX=${placeholder "out"}" ]
++ lib.optional sevVariant "SEV=1";
postFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libkrun.dylib $out/lib/libkrun.${version}.dylib
'';
meta = with lib; {
description = "A dynamic library providing Virtualization-based process isolation capabilities";
homepage = "https://github.com/containers/libkrun";
@@ -15,11 +15,14 @@ stdenv.mkDerivation rec {
pname = "libkrunfw";
version = "3.3.0";
src = fetchFromGitHub {
src = if stdenv.isLinux then fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg=";
} else fetchurl {
url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
hash = "sha256-9Wp93PC+PEqUpWHIe6BUnfDMpFvYL8rGGjTU2nWSUVY=";
};
kernelSrc = fetchurl {
@@ -28,14 +31,18 @@ stdenv.mkDerivation rec {
};
preBuild = ''
substituteInPlace Makefile --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)'
substituteInPlace Makefile \
--replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \
--replace 'gcc' '$(CC)'
'';
nativeBuildInputs = [ flex bison bc python3 python3.pkgs.pyelftools ];
buildInputs = [ elfutils ];
buildInputs = lib.optionals stdenv.isLinux [ elfutils ];
makeFlags = [ "PREFIX=${placeholder "out"}" ]
++ lib.optional sevVariant "SEV=1";
makeFlags = [
"PREFIX=${placeholder "out"}"
"SONAME_Darwin=-Wl,-install_name,${placeholder "out"}/lib/libkrunfw.dylib"
] ++ lib.optional sevVariant "SEV=1";
enableParallelBuilding = true;
@@ -44,6 +51,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/containers/libkrunfw";
license = with licenses; [ lgpl2Only lgpl21Only ];
maintainers = with maintainers; [ nickcao ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
};
}
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, Carbon }:
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, Carbon, AppKit }:
stdenv.mkDerivation rec {
pname = "liblqr-1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isDarwin [ Carbon ];
buildInputs = lib.optionals stdenv.isDarwin [ Carbon AppKit ];
propagatedBuildInputs = [ glib ];
meta = with lib; {
@@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "mlib";
version = "0.6.0";
src = fetchFromGitHub {
owner = "P-p-H-d";
repo = pname;
rev = "V${version}";
hash = "sha256-LoDw9nQdEtXuTs0wncScrc2+Z7BW61ps5ee9OfQE4M0=";
};
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ];
doCheck = true;
meta = with lib; {
description = "Library of generic and type safe containers in pure C language";
longDescription = ''
M*LIB (M star lib) is a C library enabling to define and use generic and
type safe container, aka handling generic containers in in pure C
language. The objects within the containers can be trivial or very
complex: they can have their own constructor, destructor, operators or can
be basic C type like the C type 'int'. This makes it possible to construct
fully recursive objects (container-of[...]-container-of-type-T), without
erasing type information (typically using void pointers or resorting to C
macro to access the container).
'';
homepage = "https://github.com/P-p-H-d/mlib";
changelog = "https://github.com/P-p-H-d/mlib/releases/tag/${src.rev}";
license = licenses.bsd2;
maintainers = with maintainers; [ azahi ];
platforms = platforms.unix;
};
}
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config, file
, cmake
, libev, nghttp3, quictls
, cunit, ncurses
, withJemalloc ? false, jemalloc
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ autoreconfHook pkg-config file ];
nativeBuildInputs = [ cmake ];
buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
checkInputs = [ cunit ncurses ];
preConfigure = ''
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
'';
cmakeFlags = [
"-DENABLE_STATIC_LIB=OFF"
];
doCheck = true;
enableParallelBuilding = true;
+7 -4
View File
@@ -2,6 +2,8 @@
, gn, ninja, python3, glib, pkg-config, icu
, xcbuild, darwin
, fetchpatch
, llvmPackages
, symlinkJoin
}:
# Use update.sh to update all checksums.
@@ -106,6 +108,8 @@ stdenv.mkDerivation rec {
touch build/config/gclient_args.gni
'';
llvmCcAndBintools = symlinkJoin { name = "llvmCcAndBintools"; paths = [ stdenv.cc llvmPackages.llvm ]; };
gnFlags = [
"use_custom_libcxx=false"
"is_clang=${lib.boolToString stdenv.cc.isClang}"
@@ -123,7 +127,8 @@ stdenv.mkDerivation rec {
# ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
''host_toolchain="//build/toolchain/linux/unbundle:default"''
''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"''
++ lib.optional stdenv.isDarwin ''use_lld=false'';
NIX_CFLAGS_COMPILE = "-O2";
FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";
@@ -135,7 +140,7 @@ stdenv.mkDerivation rec {
python3
] ++ lib.optionals stdenv.isDarwin [
xcbuild
darwin.DarwinTools
llvmPackages.llvm
python3.pkgs.setuptools
];
buildInputs = [ glib icu ];
@@ -166,7 +171,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
platforms = platforms.unix;
license = licenses.bsd3;
# Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076
broken = stdenv.isDarwin;
};
}
@@ -153,7 +153,7 @@ buildLuarocksPackage {
}) {};
busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, luasystem, lua-term, luassert, mediator_lua, say, dkjson, penlight, luafilesystem, lua, lua_cliargs
, fetchgit, penlight, luafilesystem, dkjson, lua_cliargs, lua, say, mediator_lua, luasystem, lua-term, luassert
}:
buildLuarocksPackage {
pname = "busted";
@@ -176,7 +176,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ luasystem lua-term luassert mediator_lua say dkjson penlight luafilesystem lua lua_cliargs ];
propagatedBuildInputs = [ penlight luafilesystem dkjson lua_cliargs lua say mediator_lua luasystem lua-term luassert ];
meta = {
homepage = "https://lunarmodules.github.io/busted/";
@@ -186,7 +186,7 @@ buildLuarocksPackage {
}) {};
cassowary = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, penlight
, fetchgit, penlight, lua
}:
buildLuarocksPackage {
pname = "cassowary";
@@ -209,7 +209,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua penlight ];
propagatedBuildInputs = [ penlight lua ];
meta = {
homepage = "https://github.com/sile-typesetter/cassowary.lua";
@@ -220,7 +220,7 @@ buildLuarocksPackage {
}) {};
cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, penlight
, fetchgit, penlight, lua
}:
buildLuarocksPackage {
pname = "cldr";
@@ -243,7 +243,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua penlight ];
propagatedBuildInputs = [ penlight lua ];
meta = {
homepage = "https://github.com/alerque/cldr-lua";
@@ -399,7 +399,7 @@ buildLuarocksPackage {
}) {};
digestif = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, lpeg
, fetchgit, lpeg, lua
}:
buildLuarocksPackage {
pname = "digestif";
@@ -419,7 +419,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.3");
propagatedBuildInputs = [ lua lpeg ];
propagatedBuildInputs = [ lpeg lua ];
meta = {
homepage = "https://github.com/astoff/digestif/";
@@ -478,7 +478,7 @@ buildLuarocksPackage {
}) {};
fluent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, luaepnf, cldr, lua, penlight
, fetchgit, penlight, cldr, luaepnf, lua
}:
buildLuarocksPackage {
pname = "fluent";
@@ -501,7 +501,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ luaepnf cldr lua penlight ];
propagatedBuildInputs = [ penlight cldr luaepnf lua ];
meta = {
homepage = "https://github.com/alerque/fluent-lua";
@@ -542,7 +542,7 @@ buildLuarocksPackage {
}) {};
http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchzip, luaossl, cqueues, compat53, lpeg, fifo, binaryheap, lpeg_patterns, basexx, bit32, lua
, fetchzip, basexx, lpeg_patterns, compat53, bit32, fifo, lua, binaryheap, cqueues, lpeg, luaossl
}:
buildLuarocksPackage {
pname = "http";
@@ -557,7 +557,7 @@ buildLuarocksPackage {
};
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ luaossl cqueues compat53 lpeg fifo binaryheap lpeg_patterns basexx bit32 lua ];
propagatedBuildInputs = [ basexx lpeg_patterns compat53 bit32 fifo lua binaryheap cqueues lpeg luaossl ];
meta = {
homepage = "https://github.com/daurnimator/lua-http";
@@ -626,7 +626,7 @@ buildLuarocksPackage {
}) {};
ldoc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, markdown, penlight
, fetchgit, penlight, markdown
}:
buildLuarocksPackage {
pname = "ldoc";
@@ -645,7 +645,7 @@ buildLuarocksPackage {
}
'') ["date" "path"]) ;
propagatedBuildInputs = [ markdown penlight ];
propagatedBuildInputs = [ penlight markdown ];
meta = {
homepage = "https://github.com/lunarmodules/LDoc";
@@ -847,7 +847,7 @@ buildLuarocksPackage {
}) {};
lpeg_patterns = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchzip, lpeg, lua
, fetchzip, lua, lpeg
}:
buildLuarocksPackage {
pname = "lpeg_patterns";
@@ -861,7 +861,7 @@ buildLuarocksPackage {
sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6";
};
propagatedBuildInputs = [ lpeg lua ];
propagatedBuildInputs = [ lua lpeg ];
meta = {
homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
@@ -1112,7 +1112,7 @@ buildLuarocksPackage {
}) {};
lua-lsp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, dkjson, inspect, lua, lpeglabel
, fetchgit, lua, inspect, lpeglabel, dkjson
}:
buildLuarocksPackage {
pname = "lua-lsp";
@@ -1135,7 +1135,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ dkjson inspect lua lpeglabel ];
propagatedBuildInputs = [ lua inspect lpeglabel dkjson ];
meta = {
homepage = "https://github.com/Alloyed/lua-lsp";
@@ -1237,7 +1237,7 @@ buildLuarocksPackage {
}) {};
lua-resty-jwt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua-resty-openssl, lua
, fetchgit, lua, lua-resty-openssl
}:
buildLuarocksPackage {
pname = "lua-resty-jwt";
@@ -1260,7 +1260,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua-resty-openssl lua ];
propagatedBuildInputs = [ lua lua-resty-openssl ];
meta = {
homepage = "https://github.com/cdbattags/lua-resty-jwt";
@@ -1270,7 +1270,7 @@ buildLuarocksPackage {
}) {};
lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua-resty-session, lua-resty-jwt, lua-resty-http, lua
, fetchgit, lua-resty-http, lua-resty-jwt, lua-resty-session, lua
}:
buildLuarocksPackage {
pname = "lua-resty-openidc";
@@ -1293,7 +1293,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua-resty-session lua-resty-jwt lua-resty-http lua ];
propagatedBuildInputs = [ lua-resty-http lua-resty-jwt lua-resty-session lua ];
meta = {
homepage = "https://github.com/zmartzone/lua-resty-openidc";
@@ -1572,7 +1572,7 @@ buildLuarocksPackage {
}) {};
luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, argparse, luafilesystem, lua
, fetchgit, lua, luafilesystem, argparse
}:
buildLuarocksPackage {
pname = "luacheck";
@@ -1595,7 +1595,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ argparse luafilesystem lua ];
propagatedBuildInputs = [ lua luafilesystem argparse ];
meta = {
homepage = "https://github.com/lunarmodules/luacheck";
@@ -1671,7 +1671,7 @@ buildLuarocksPackage {
}) {};
luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, luadbi, lua
, fetchgit, lua, luadbi
}:
buildLuarocksPackage {
pname = "luadbi-mysql";
@@ -1694,7 +1694,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ luadbi lua ];
propagatedBuildInputs = [ lua luadbi ];
meta = {
homepage = "https://github.com/mwild1/luadbi";
@@ -1704,7 +1704,7 @@ buildLuarocksPackage {
}) {};
luadbi-postgresql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, luadbi
, fetchgit, luadbi, lua
}:
buildLuarocksPackage {
pname = "luadbi-postgresql";
@@ -1727,7 +1727,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua luadbi ];
propagatedBuildInputs = [ luadbi lua ];
meta = {
homepage = "https://github.com/mwild1/luadbi";
@@ -1985,7 +1985,7 @@ buildLuarocksPackage {
}) {};
luaposix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchzip, bit32, lua
, fetchzip, lua, bit32
}:
buildLuarocksPackage {
pname = "luaposix";
@@ -2000,7 +2000,7 @@ buildLuarocksPackage {
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ bit32 lua ];
propagatedBuildInputs = [ lua bit32 ];
meta = {
homepage = "http://github.com/luaposix/luaposix/";
@@ -2036,7 +2036,7 @@ buildLuarocksPackage {
}) {};
luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, luasocket, lua
, fetchgit, lua, luasocket
}:
buildLuarocksPackage {
pname = "luasec";
@@ -2059,7 +2059,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ luasocket lua ];
propagatedBuildInputs = [ lua luasocket ];
meta = {
homepage = "https://github.com/brunoos/luasec/wiki";
@@ -2304,6 +2304,38 @@ buildLuarocksPackage {
};
}) {};
lush-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua
, moonscript}:
buildLuarocksPackage {
pname = "lush.nvim";
version = "scm-1";
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/rktjmp/lush.nvim",
"rev": "6b9f399245de7bea8dac2c3bf91096ffdedfcbb7",
"date": "2022-08-10T01:43:55+10:00",
"path": "/nix/store/ljfhbz8s6pjnngbixk3m6ivpb7nx1gv0-lush.nvim",
"sha256": "0rb77rwmbm438bmbjfk5hwrrcn5sihsa1413bdpc27rw3rrn8v8z",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua ];
checkInputs = [ moonscript ];
meta = {
homepage = "https://github.com/rktjmp/lush.nvim";
description = "Define Neovim themes as a DSL in lua, with real-time feedback.";
maintainers = with lib.maintainers; [ teto ];
license.fullName = "MIT/X11";
};
}) {};
luuid = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchurl, lua
}:
@@ -2440,7 +2472,7 @@ buildLuarocksPackage {
}) {};
moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, luafilesystem, argparse, lpeg
, fetchgit, lua, luafilesystem, lpeg, argparse
}:
buildLuarocksPackage {
pname = "moonscript";
@@ -2460,7 +2492,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua luafilesystem argparse lpeg ];
propagatedBuildInputs = [ lua luafilesystem lpeg argparse ];
meta = {
homepage = "http://moonscript.org";
@@ -2493,7 +2525,7 @@ buildLuarocksPackage {
}) {};
nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchurl, luv, mpack, lua, coxpcall
, fetchurl, coxpcall, luv, mpack, lua
}:
buildLuarocksPackage {
pname = "nvim-client";
@@ -2505,7 +2537,7 @@ buildLuarocksPackage {
};
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ luv mpack lua coxpcall ];
propagatedBuildInputs = [ coxpcall luv mpack lua ];
meta = {
homepage = "https://github.com/neovim/lua-client";
@@ -2514,8 +2546,33 @@ buildLuarocksPackage {
};
}) {};
nvim-cmp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchzip, lua
}:
buildLuarocksPackage {
pname = "nvim-cmp";
version = "0.0.1-2";
knownRockspec = (fetchurl {
url = "mirror://luarocks/nvim-cmp-0.0.1-2.rockspec";
sha256 = "0jx4i2rnc7zmy1bbqp6fqymlklc7xvqyv35prjl3ld05c4dpg7nq";
}).outPath;
src = fetchzip {
url = "http://github.com/hrsh7th/nvim-cmp/archive/v0.0.1.zip";
sha256 = "0649n476jd6dqd79fmywmigz19sb0s344ablwr25gr23fp46hzaz";
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/hrsh7th/nvim-cmp";
description = "A completion plugin for neovim";
license.fullName = "MIT";
};
}) {};
penlight = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua, luafilesystem
, fetchgit, luafilesystem, lua
, busted}:
buildLuarocksPackage {
pname = "penlight";
@@ -2535,7 +2592,7 @@ buildLuarocksPackage {
'') ["date" "path"]) ;
disabled = with lua; (luaOlder "5.1");
propagatedBuildInputs = [ lua luafilesystem ];
propagatedBuildInputs = [ luafilesystem lua ];
checkInputs = [ busted ];
meta = {
@@ -2632,6 +2689,31 @@ buildLuarocksPackage {
};
}) {};
rest-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchzip, lua, plenary-nvim
}:
buildLuarocksPackage {
pname = "rest.nvim";
version = "0.1-2";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rest.nvim-0.1-2.rockspec";
sha256 = "0l8k91483nz75ijgnyfb8r7mynsaps7ikvjkziimf62bv7aks3qh";
}).outPath;
src = fetchzip {
url = "http://github.com/rest-nvim/rest.nvim/archive/0.1.zip";
sha256 = "0yf1a1cjrrzw0wmjgg48g3qn9kfxn7hv38yx88l1sc1r1nsfijrq";
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua plenary-nvim ];
meta = {
homepage = "https://github.com/rest-nvim/rest.nvim";
description = "A fast Neovim http client written in Lua";
license.fullName = "MIT";
};
}) {};
say = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua
, busted}:
@@ -2817,7 +2899,7 @@ buildLuarocksPackage {
}) {};
tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, argparse, compat53, luafilesystem
, fetchgit, compat53, luafilesystem, argparse
, dkjson}:
buildLuarocksPackage {
pname = "tl";
@@ -2839,7 +2921,7 @@ buildLuarocksPackage {
}
'') ["date" "path"]) ;
propagatedBuildInputs = [ argparse compat53 luafilesystem ];
propagatedBuildInputs = [ compat53 luafilesystem argparse ];
checkInputs = [ dkjson ];
meta = {
@@ -94,6 +94,10 @@ with prev;
];
});
lush-nvim = prev.lib.overrideLuarocks prev.lush-nvim (drv: rec {
doCheck = false;
});
ljsyscall = prev.lib.overrideLuarocks prev.ljsyscall (drv: rec {
version = "unstable-20180515";
# package hasn't seen any release for a long time
@@ -0,0 +1,31 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, earley
, timed
}:
buildDunePackage rec {
pname = "bindlib";
version = "6.0.0";
minimalOCamlVersion = "4.07";
src = fetchFromGitHub {
owner = "rlepigre";
repo = "ocaml-${pname}";
rev = version;
hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4=";
};
checkInputs = [ earley timed ];
doCheck = true;
meta = with lib; {
homepage = "https://rlepigre.github.io/ocaml-bindlib";
description = "Efficient binder representation in Ocaml";
license = licenses.gpl3;
changelog = "https://github.com/rlepigre/ocaml-bindlib/raw/${version}/CHANGELOG.md";
maintainers = with maintainers; [ bcdarwin ];
};
}
@@ -0,0 +1,33 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, cmdliner_1_1
, menhir
}:
buildDunePackage rec {
pname = "dedukti";
version = "2.7";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "Deducteam";
repo = pname;
rev = "v${version}";
hash = "sha256-SFxbgq2znO+OCEFzuekVquvtOEuCQanseKy+iZAeWbc=";
};
nativeBuildInputs = [ menhir ];
buildInputs = [ cmdliner_1_1 ];
doCheck = false; # requires `tezt`
meta = with lib; {
homepage = "https://deducteam.github.io";
description = "Logical framework based on the λΠ-calculus modulo rewriting";
license = licenses.cecill-b;
changelog = "https://github.com/Deducteam/Dedukti/raw/${version}/CHANGELOG.md";
maintainers = with maintainers; [ bcdarwin ];
};
}
@@ -0,0 +1,46 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, alcotest
, dedukti
, bindlib
, camlp-streams
, cmdliner_1_1
, menhir
, pratter
, sedlex
, stdlib-shims
, timed
, why3
, yojson
}:
buildDunePackage rec {
pname = "lambdapi";
version = "2.2.1";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "Deducteam";
repo = pname;
rev = version;
hash = "sha256-p2ZjSfiZwkf8X4fSNJx7bAVpTFl4UBHIEANIWF7NGCs=";
};
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [
bindlib camlp-streams cmdliner_1_1 pratter sedlex stdlib-shims timed why3 yojson
];
checkInputs = [ alcotest dedukti ];
doCheck = false; # "Error: Unbound module Cmd"
meta = with lib; {
homepage = "https://github.com/Deducteam/lambdapi";
description = "Proof assistant based on the λΠ-calculus modulo rewriting";
license = licenses.cecill21;
changelog = "https://github.com/Deducteam/lambdapi/raw/${version}/CHANGES.md";
maintainers = with maintainers; [ bcdarwin ];
};
}
@@ -0,0 +1,35 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, camlp-streams
, alcotest
, qcheck
, qcheck-alcotest
}:
buildDunePackage rec {
version = "2.0.0";
pname = "pratter";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "gabrielhdt";
repo = "pratter";
rev = version;
hash = "sha256-QEq8Zt2pfsRT04Zd+ugGKcHdzkqYcDDUg/iAFMMDdEE=";
};
propagatedBuildInputs = [ camlp-streams ];
checkInputs = [ alcotest qcheck qcheck-alcotest ];
doCheck = true;
meta = with lib; {
description = "An extended Pratt parser";
homepage = "https://github.com/gabrielhdt/pratter";
license = licenses.bsd3;
changelog = "https://github.com/gabrielhdt/pratter/raw/${version}/CHANGELOG.md";
maintainers = with maintainers; [ bcdarwin ];
};
}
@@ -0,0 +1,28 @@
{ lib
, fetchFromGitHub
, ocaml
, buildDunePackage
}:
buildDunePackage rec {
version = "1.1";
pname = "timed";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "rlepigre";
repo = "ocaml-${pname}";
rev = version;
sha256 = "sha256-wUoI9j/j0IGYW2NfJHmyR2XEYfYejyoYLWnKsuWdFas=";
};
doCheck = true;
meta = with lib; {
description = "Timed references for imperative state";
homepage = "https://github.com/rlepigre/ocaml-timed";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}
@@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchpatch, fetchPypi, makeWrapper, isPy3k
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
, python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic
, python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs
, boto3, moto, mock, lz4, setuptoolsTrial
@@ -32,11 +32,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "3.5.0";
version = "3.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-woGHdCan5qTp00toNkWa821EgVQMrPK+OWXoqFcgIDQ=";
sha256 = "sha256-C8KXh+4bsf0zE8PCTwK3H/0pMP762I26quQiyHVkr2A=";
};
propagatedBuildInputs = [
@@ -78,11 +78,6 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
(fetchpatch{
url = "https://github.com/buildbot/buildbot/commit/54b8f62902122b0091319a96d0f9edd4195ab4c6.patch";
stripLen = 1;
sha256 = "sha256-OqW3ZQK0bfqPG3YlrBbrSEEKsM/XqY2NO862ZD/DgHs=";
})
];
postPatch = ''
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CYbMixfZZ1xypV0J7TW54n/fja9RGMlWiF7StJYFnqM=";
sha256 = "sha256-+48r7VUl7r8u3aWE0+Uwk28DMhdwz02iqq76M7MgY+k=";
};
postPatch = ''
@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-boa/MWi/HAhNU3/n96i0fuoQ+jT5I+dWoe1Zd7f/Yvs=";
sha256 = "sha256-ivdjwZYHsovZu1HQ5tc+k7ScB4OdonOcTSuMXKKeU10=";
};
# Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NUDTwgkQuasOlJxNTlvfIm99LNVCrRIdBmgeJnwkSU8=";
sha256 = "sha256-SebskFsLZUHTi9lS9DbG8ZKQqjls+e25xvqqK7LZaMw=";
};
buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EmiIDCG4iFIwFnwii8fjII7C7wsBifzeZeW7HyY04dE=";
sha256 = "sha256-HWhKEzjzAYJZsd31701NuHOvImwnxFM8dLvE7fqpIRM=";
};
buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QcS8QJ17uzDvkynTczj05LojuIT6feGiQNCwCESbVLw=";
sha256 = "sha256-jGBdrVcxNpWdFT9aXO/KX/ZG/oXlWmlvpIFFSrVQ9pk=";
};
buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-U9ecRxpDowzjD4GsrW4FUHcbNaWeAFGKDlqMrbIoTrQ=";
sha256 = "sha256-8dvhVKbwTug78+14FGFyRj7AX3QpbveC4PHzc1yk03w=";
};
buildInputs = [ buildbot-pkg ];
@@ -28,7 +28,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HZH3TdH5dhr3f6ev25O3SgPPNbiFGMmAp9DHwcb/2MA=";
sha256 = "sha256-WTvap1dx7OMim4UIZrfZVxrAWxPBwbRH6qdfO038bts=";
};
postPatch = ''
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "discogs-client";
version = "2.3.15";
version = "2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "joalla";
repo = "discogs_client";
rev = "refs/tags/v${version}";
sha256 = "sha256-teI0sbvluwVFmEOL/V1zLNGFVbeM7QzZ9rCOl3+A+aY=";
sha256 = "sha256-gGAtRhAg/W0dREhCOmif1XlQ4gldIGQ2hIC8gzifRu8=";
};
propagatedBuildInputs = [
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "discord.py";
version = "2.0.0";
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Rapptz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BhxXsNRgs/ihnlTxNwYTjRwPvneyDF8Q0wS3qr2BG9Q=";
sha256 = "sha256-DX9AmVhwP7XgzUApY8d+UB6LGqymErsaSzaisuKAOB0=";
};
propagatedBuildInputs = [
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "django-extensions";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-jibske9cnOn4FPAGNs2EU1w1huF4dNxHAnOzuKSj3/E=";
sha256 = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI=";
};
postPatch = ''
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "fastavro";
version = "1.6.0";
version = "1.6.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-n9/M/blE+fvknUvlIlTWLqOhxo2Su3lj548enUf1DUg=";
sha256 = "sha256-2BtJQiDPMMIxbO0FdOQT/jzsaiPMTdmf8S21ezmQRLQ=";
};
preBuild = ''
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.5.25";
version = "1.5.26";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-wlwpw6ELRsORQDs/TC+J3vIR84Te8FE9qec3NLyhFY8=";
sha256 = "sha256-WA6EgdyZ6zQGCzeQsHUD304WMCarjhGEpqXXBhBsxNw=";
};
propagatedBuildInputs = [
@@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "FireflyAlgorithm";
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "firefly-cpp";
repo = pname;
rev = version;
sha256 = "sha256-IlOIoP2aANE8y3+Qtb/H6w/+REnPWiUUQGRiAfxOpcM=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
numpy
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"fireflyalgorithm"
];
meta = with lib; {
description = "An implementation of the stochastic nature-inspired algorithm for optimization";
homepage = "https://github.com/firefly-cpp/FireflyAlgorithm";
license = licenses.mit;
maintainers = with maintainers; [ firefly-cpp ];
};
}
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.19";
version = "0.2.20";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-H3N0hAJsjBX3pQ2i03r4MRBQQLCXjLhftokZQx0bF80=";
sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE=";
};
checkInputs = [
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
version = "5.0.0";
version = "5.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-d8RG/PSWPHvQy7o9tPLPGrEp0r/Y3JWwWoT3cS4iR38=";
hash = "sha256-fJoV/mNImdcTpJC6c2zmYWZCXlBWLOP+5W5Hsmw2yOQ=";
};
# Module has no tests
@@ -17,7 +17,7 @@
let nbclient = buildPythonPackage rec {
pname = "nbclient";
version = "0.6.6";
version = "0.6.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ let nbclient = buildPythonPackage rec {
owner = "jupyter";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Rs4Jk4OtexB/NKM1Jo4cV87hBxXDlnX9X+4KO+pGb0E=";
hash = "sha256-+GQkEGWReo9y8bgcysslQdzJUcvQiZkQTQiwmWJ1mx8=";
};
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nextcord";
version = "2.1.0";
version = "2.2.0";
format = "setuptools";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "nextcord";
repo = "nextcord";
rev = "refs/tags/v${version}";
hash = "sha256-/M7Wyb1GW6LPWm41jVnhWA6+dyTrdLyJ6pfsMozw5xI=";
hash = "sha256-2VlmcldbW+BfQRzOjCsh6r29qzwD+SG8H8arbTDg94k=";
};
patches = [
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.10.0";
version = "5.13.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-eybcT7pdc0QED3HrHN+jnxZLXoExEZZUEHSoFmhlsHQ=";
hash = "sha256-Xkf/7V1p98yy5UJnDZgnLMp/8BGLVYINWMommRrqdXk=";
};
sourceRoot = "${src.name}/sdk/python";
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pycep-parser";
version = "0.3.8";
version = "0.3.9";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gruebel";
repo = "pycep";
rev = "refs/tags/${version}";
hash = "sha256-y6npvFh6/QykOAKK8ihTHDcv5dFd4lLU64UXPIhBELA=";
hash = "sha256-CghTNdZZJJOakMySNPRCTYx+1aEY8ROUvS9loc9JcPo=";
};
nativeBuildInputs = [
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pyintesishome";
version = "1.8.1";
version = "1.8.3";
src = fetchFromGitHub {
owner = "jnimmo";
repo = "pyIntesisHome";
rev = version;
sha256 = "sha256-+bad3VIoP0sVw0blK9YIot2GfK5de4HTXv5/ipV2Nds=";
rev = "refs/tags/${version}";
sha256 = "sha256-PMRTRQYckqD8GRatyj7IMAiFPbi91HvX19Jwe28rIPg=";
};
propagatedBuildInputs = [
@@ -2,8 +2,6 @@
, fetchFromGitLab
, buildPythonPackage
, pillow
, setuptools-scm
, setuptools-scm-git-archive
, tesseract
, cuneiform
, isPy3k
@@ -13,7 +11,7 @@
buildPythonPackage rec {
pname = "pyocr";
version = "0.7.2";
version = "0.8.3";
disabled = !isPy3k;
# Don't fetch from PYPI because it doesn't contain tests.
@@ -23,7 +21,7 @@ buildPythonPackage rec {
owner = "OpenPaperwork";
repo = "pyocr";
rev = version;
sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il";
sha256 = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w=";
};
patches = [
@@ -33,9 +31,11 @@ buildPythonPackage rec {
})
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
buildInputs = [ setuptools-scm setuptools-scm-git-archive ];
# see the logic in setup.py
ENABLE_SETUPTOOLS_SCM = "0";
preConfigure = ''
echo 'version = "${version}"' > src/pyocr/_version.py
'';
propagatedBuildInputs = [ pillow ];
@@ -45,6 +45,6 @@ buildPythonPackage rec {
inherit (src.meta) homepage;
description = "A Python wrapper for Tesseract and Cuneiform";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ symphorien ];
};
}
@@ -1,3 +1,9 @@
commit c4bac00441363fcaeb074682d8226ca523614ea2
Author: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat Aug 20 17:48:01 2022 +0200
Fix finding tesseract and cuneiform
diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py
index 2e5b717..35647e2 100644
--- a/src/pyocr/cuneiform.py
@@ -19,7 +25,7 @@ index 2e5b717..35647e2 100644
LANGUAGES_LINE_PREFIX = "Supported languages: "
LANGUAGES_SPLIT_RE = re.compile("[^a-z]")
diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
index a068e73..9ebea5c 100644
index 2002614..9ebea5c 100644
--- a/src/pyocr/libtesseract/tesseract_raw.py
+++ b/src/pyocr/libtesseract/tesseract_raw.py
@@ -2,7 +2,6 @@ import ctypes
@@ -30,7 +36,7 @@ index a068e73..9ebea5c 100644
from ..error import TesseractError
@@ -10,48 +9,16 @@ from ..error import TesseractError
@@ -10,51 +9,16 @@ from ..error import TesseractError
logger = logging.getLogger(__name__)
TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None)
@@ -57,7 +63,7 @@ index a068e73..9ebea5c 100644
- )
- )
- else:
- TESSDATA_PREFIX = tessdata
- TESSDATA_PREFIX = os.path.join(tessdata, "tessdata")
-
-
-if sys.platform[:3] == "win": # pragma: no cover
@@ -77,15 +83,18 @@ index a068e73..9ebea5c 100644
- ]
-else:
- libnames += [
- "libtesseract.so.5",
- "libtesseract.so.4",
- "libtesseract.so.3",
- "libtesseract.5.dylib",
- "libtesseract.4.dylib",
- ]
-
+libnames = [ "@tesseract@/lib/libtesseract.so" ]
g_libtesseract = None
@@ -364,12 +331,12 @@ def init(lang=None):
@@ -367,12 +331,12 @@ def init(lang=None):
try:
if lang:
lang = lang.encode("utf-8")
@@ -103,7 +112,7 @@ index a068e73..9ebea5c 100644
)
g_libtesseract.TessBaseAPISetVariable(
diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
index 7c30852..44e8446 100644
index 0fe0d20..c1fdd27 100644
--- a/src/pyocr/tesseract.py
+++ b/src/pyocr/tesseract.py
@@ -28,8 +28,7 @@ from .builders import DigitBuilder # backward compatibility
@@ -193,7 +202,7 @@ index 45b7f6a..95f55c6 100644
stderr=subprocess.STDOUT
)
diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py
index ad7fdc9..57e7a60 100644
index a5d46d8..8b9e315 100644
--- a/tests/tests_libtesseract.py
+++ b/tests/tests_libtesseract.py
@@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest):
@@ -217,7 +226,7 @@ index ad7fdc9..57e7a60 100644
self.assertEqual(
diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py
index 1a55567..a24d96f 100644
index 18d01ef..593cf94 100644
--- a/tests/tests_tesseract.py
+++ b/tests/tests_tesseract.py
@@ -36,7 +36,7 @@ class TestTesseract(BaseTest):
@@ -229,7 +238,7 @@ index 1a55567..a24d96f 100644
@patch("subprocess.Popen")
def test_version_error(self, popen):
@@ -156,7 +156,7 @@ class TestTesseract(BaseTest):
@@ -162,7 +162,7 @@ class TestTesseract(BaseTest):
for lang in ("eng", "fra", "jpn", "osd"):
self.assertIn(lang, langs)
popen.assert_called_once_with(
@@ -238,7 +247,7 @@ index 1a55567..a24d96f 100644
startupinfo=None, creationflags=0,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT
)
@@ -171,7 +171,7 @@ class TestTesseract(BaseTest):
@@ -177,7 +177,7 @@ class TestTesseract(BaseTest):
self.assertEqual(te.exception.status, 1)
self.assertEqual("unable to get languages", te.exception.message)
popen.assert_called_once_with(
@@ -247,7 +256,7 @@ index 1a55567..a24d96f 100644
startupinfo=None, creationflags=0,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT
)
@@ -248,7 +248,7 @@ class TestTesseract(BaseTest):
@@ -254,7 +254,7 @@ class TestTesseract(BaseTest):
self.assertEqual(status, 0)
self.assertEqual(error, message)
popen.assert_called_once_with(
@@ -256,7 +265,7 @@ index 1a55567..a24d96f 100644
cwd=tmpdir,
startupinfo=None,
creationflags=0,
@@ -271,7 +271,7 @@ class TestTesseract(BaseTest):
@@ -277,7 +277,7 @@ class TestTesseract(BaseTest):
self.assertEqual(status, 0)
self.assertEqual(error, message)
popen.assert_called_with(
@@ -265,7 +274,7 @@ index 1a55567..a24d96f 100644
cwd=tmpdir,
startupinfo=None,
creationflags=0,
@@ -302,7 +302,7 @@ class TestTesseract(BaseTest):
@@ -308,7 +308,7 @@ class TestTesseract(BaseTest):
self.assertEqual(result["angle"], 90)
self.assertEqual(result["confidence"], 9.30)
popen.assert_called_once_with(
@@ -274,7 +283,7 @@ index 1a55567..a24d96f 100644
stdin=subprocess.PIPE,
shell=False,
startupinfo=None,
@@ -338,7 +338,7 @@ class TestTesseract(BaseTest):
@@ -344,7 +344,7 @@ class TestTesseract(BaseTest):
self.assertEqual(result["angle"], 90)
self.assertEqual(result["confidence"], 9.30)
popen.assert_called_once_with(
@@ -283,7 +292,7 @@ index 1a55567..a24d96f 100644
stdin=subprocess.PIPE,
shell=False,
startupinfo=None,
@@ -371,7 +371,7 @@ class TestTesseract(BaseTest):
@@ -377,7 +377,7 @@ class TestTesseract(BaseTest):
self.assertEqual(result["angle"], 90)
self.assertEqual(result["confidence"], 9.30)
popen.assert_called_once_with(
@@ -292,7 +301,7 @@ index 1a55567..a24d96f 100644
"--psm", "0", "-l", "osd"],
stdin=subprocess.PIPE,
shell=False,
@@ -399,7 +399,7 @@ class TestTesseract(BaseTest):
@@ -405,7 +405,7 @@ class TestTesseract(BaseTest):
with self.assertRaises(tesseract.TesseractError) as te:
tesseract.detect_orientation(self.image)
popen.assert_called_once_with(
@@ -301,7 +310,7 @@ index 1a55567..a24d96f 100644
stdin=subprocess.PIPE,
shell=False,
startupinfo=None,
@@ -433,7 +433,7 @@ class TestTesseract(BaseTest):
@@ -439,7 +439,7 @@ class TestTesseract(BaseTest):
with self.assertRaises(tesseract.TesseractError) as te:
tesseract.detect_orientation(self.image)
popen.assert_called_once_with(
@@ -310,7 +319,7 @@ index 1a55567..a24d96f 100644
stdin=subprocess.PIPE,
shell=False,
startupinfo=None,
@@ -467,7 +467,7 @@ class TestTesseract(BaseTest):
@@ -473,7 +473,7 @@ class TestTesseract(BaseTest):
self.assertEqual(result["angle"], 90)
self.assertEqual(result["confidence"], 9.30)
popen.assert_called_once_with(
@@ -319,7 +328,7 @@ index 1a55567..a24d96f 100644
stdin=subprocess.PIPE,
shell=False,
startupinfo=None,
@@ -500,7 +500,7 @@ class TestTesseract(BaseTest):
@@ -506,7 +506,7 @@ class TestTesseract(BaseTest):
self.assertEqual(result["angle"], 90)
self.assertEqual(result["confidence"], 9.30)
popen.assert_called_once_with(
@@ -328,7 +337,7 @@ index 1a55567..a24d96f 100644
stdin=subprocess.PIPE,
shell=False,
startupinfo=None,
@@ -527,7 +527,7 @@ class TestTesseract(BaseTest):
@@ -533,7 +533,7 @@ class TestTesseract(BaseTest):
with self.assertRaises(tesseract.TesseractError) as te:
tesseract.detect_orientation(self.image)
popen.assert_called_once_with(
@@ -337,7 +346,7 @@ index 1a55567..a24d96f 100644
stdin=subprocess.PIPE,
shell=False,
startupinfo=None,
@@ -561,7 +561,7 @@ class TestTesseract(BaseTest):
@@ -567,7 +567,7 @@ class TestTesseract(BaseTest):
with self.assertRaises(tesseract.TesseractError) as te:
tesseract.detect_orientation(self.image)
popen.assert_called_once_with(
@@ -54,7 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for testing asyncio code with pytest";
homepage = "https://github.com/pytest-dev/pytest-asyncio";
changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.rev}/CHANGELOG.rst";
changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/v${version}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pytest-pylint";
version = "0.18.0";
version = "0.19.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27";
sha256 = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI=";
};
nativeBuildInputs = [ pytest-runner ];
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pytest-testmon";
version = "1.3.5";
version = "1.3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ncgNO76j2Z3766ojYydUoYZzRoTb2XxhR6FkKFzjyhI=";
hash = "sha256-KcDVOKAuQ5iVKgK3o1Vnc+LUVsI1izTnkOmByiyCJ1E=";
};
buildInputs = [
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.20";
version = "0.15.21";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hHZzMK7ge2Hs7tzHo4LV3rumEoEoL2OODRQRM60Vlz0=";
sha256 = "sha256-1wHV1+xrGFJWLoMIaG5jc01FfC7mV0+ArhPmWS5yG04=";
};
nativeBuildInputs = [ pkg-config ];
@@ -11,8 +11,6 @@
, qiskit-terra
, scikit-learn
, sparse
# Optional inputs
, withTorch ? true
, torch
# Check Inputs
, pytestCheckHook
@@ -38,10 +36,11 @@ buildPythonPackage rec {
fastdtw
numpy
psutil
torch
qiskit-terra
scikit-learn
sparse
] ++ lib.optional withTorch torch;
];
doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue?
checkInputs = [
@@ -3,7 +3,6 @@
, isPy27
, fetchFromGitHub
, pytestCheckHook
, pytest-cov
, dill
, numpy
, torch
@@ -25,7 +24,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ];
checkInputs = [ dill pytest-cov pytestCheckHook ];
checkInputs = [ dill pytestCheckHook ];
disabledTests = [ "test_affine" ]; # deprecated division operator '/'
@@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "tatsu";
version = "5.8.2";
version = "5.8.3";
# upstream only supports 3.10+
disabled = pythonOlder "3.10";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
owner = "neogeny";
repo = "TatSu";
rev = "refs/tags/v${version}";
sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI=";
sha256 = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro=";
};
nativeBuildInputs = [ pytest-runner ];
@@ -1,8 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pytest-runner
, pythonOlder
, pytestCheckHook
, torch
}:
@@ -11,7 +10,7 @@ buildPythonPackage rec {
pname = "torchgpipe";
version = "0.0.7";
disabled = isPy27;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kakaobrain";
@@ -20,9 +19,14 @@ buildPythonPackage rec {
sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55";
};
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'" ""
'';
propagatedBuildInputs = [ torch ];
checkInputs = [ pytest-runner pytestCheckHook ];
checkInputs = [ pytestCheckHook ];
disabledTests = [
"test_inplace_on_requires_grad"
"test_input_requiring_grad"
@@ -15,7 +15,7 @@
let
pname = "torchmetrics";
version = "0.9.2";
version = "0.9.3";
in
buildPythonPackage {
inherit pname version;
@@ -24,7 +24,7 @@ buildPythonPackage {
owner = "PyTorchLightning";
repo = "metrics";
rev = "refs/tags/v${version}";
hash = "sha256-zkdmWxaTPTMyLe7P/zVfgKSYDCec3uh0eqCtahByMlY=";
hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY=";
};
propagatedBuildInputs = [

Some files were not shown because too many files have changed in this diff Show More