Merge master into staging-next
This commit is contained in:
commit
6ec60fd222
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
@ -15315,4 +15327,10 @@
|
|||
githubId = 7775707;
|
||||
name = "RB";
|
||||
};
|
||||
bpaulin = {
|
||||
email = "brunopaulin@bpaulin.net";
|
||||
github = "bpaulin";
|
||||
githubId = 115711;
|
||||
name = "bpaulin";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -492,6 +492,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
|
||||
|
|
|
@ -170,7 +170,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.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -63,7 +63,7 @@ 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"} deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ]}"
|
||||
];
|
||||
}
|
||||
|
|
39
pkgs/applications/misc/tofi/default.nix
Normal file
39
pkgs/applications/misc/tofi/default.nix
Normal 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;
|
||||
};
|
||||
}
|
24
pkgs/applications/networking/cluster/pinniped/default.nix
Normal file
24
pkgs/applications/networking/cluster/pinniped/default.nix
Normal file
|
@ -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 ];
|
||||
};
|
||||
}
|
|
@ -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 = ''
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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;
|
||||
}));
|
||||
})
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,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" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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" ];
|
||||
};
|
||||
}
|
||||
|
|
31
pkgs/development/ocaml-modules/bindlib/default.nix
Normal file
31
pkgs/development/ocaml-modules/bindlib/default.nix
Normal file
|
@ -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 ];
|
||||
};
|
||||
}
|
33
pkgs/development/ocaml-modules/dedukti/default.nix
Normal file
33
pkgs/development/ocaml-modules/dedukti/default.nix
Normal file
|
@ -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 ];
|
||||
};
|
||||
}
|
46
pkgs/development/ocaml-modules/lambdapi/default.nix
Normal file
46
pkgs/development/ocaml-modules/lambdapi/default.nix
Normal file
|
@ -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 ];
|
||||
};
|
||||
}
|
35
pkgs/development/ocaml-modules/pratter/default.nix
Normal file
35
pkgs/development/ocaml-modules/pratter/default.nix
Normal file
|
@ -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 ];
|
||||
};
|
||||
}
|
28
pkgs/development/ocaml-modules/timed/default.nix
Normal file
28
pkgs/development/ocaml-modules/timed/default.nix
Normal file
|
@ -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 = ''
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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 = [
|
||||
|
|
46
pkgs/development/python-modules/fireflyalgorithm/default.nix
Normal file
46
pkgs/development/python-modules/fireflyalgorithm/default.nix
Normal file
|
@ -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 ];
|
||||
};
|
||||
}
|
|
@ -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 ];
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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 '/'
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -640,7 +640,16 @@ in
|
|||
buildInputs = [ args.snappy ];
|
||||
};
|
||||
|
||||
sqlite3 = attrs: {
|
||||
sqlite3 = attrs: if lib.versionAtLeast attrs.version "1.5.0"
|
||||
then {
|
||||
nativeBuildInputs = [ pkg-config sqlite.dev ];
|
||||
buildInputs = [ sqlite.out ];
|
||||
buildFlags = [
|
||||
"--enable-system-libraries"
|
||||
"--with-pkg-config=${pkg-config}/bin/pkg-config"
|
||||
];
|
||||
}
|
||||
else {
|
||||
buildFlags = [
|
||||
"--with-sqlite3-include=${sqlite.dev}/include"
|
||||
"--with-sqlite3-lib=${sqlite.out}/lib"
|
||||
|
|
32
pkgs/development/tools/lightningcss/default.nix
Normal file
32
pkgs/development/tools/lightningcss/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lightningcss";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parcel-bundler";
|
||||
repo = "lightningcss";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6OitOUy5y00gOWzXxvPuVJQlvERayHG1RK7To9kx23s=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-RFI/QrUixKy+sxIw1NUTjHT8oQJFEnWNbbuAA6Rh18Y=";
|
||||
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
cargoBuildFlags = [ "--lib" "--bin=lightningcss" ];
|
||||
|
||||
cargoTestFlags = [ "--lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extremely fast CSS parser, transformer, and minifier written in Rust";
|
||||
homepage = "https://lightningcss.dev/";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ toastal ];
|
||||
};
|
||||
}
|
|
@ -4,31 +4,31 @@ let
|
|||
aarch64-darwin = {
|
||||
arch = "aarch64";
|
||||
shortName = "darwin";
|
||||
sha256 = "c82547d96125bf93ae76dafe203cae5f7cd50d041bfb1cf972f9f0232a0d1cc1";
|
||||
sha256 = "sha256-R17Ga4C6PSxfL1bz6IBjx0dYFmX93i0y8uqxG1eZKd4=";
|
||||
};
|
||||
|
||||
aarch64-linux = {
|
||||
arch = "aarch64";
|
||||
shortName = "linux";
|
||||
sha256 = "3430f3ff456ee86ddb607a46ee937c9c1a02b8e4d2546de52b4493878f66afb8";
|
||||
sha256 = "sha256-KSC4gdsJZJoPjMEs+VigVuqlUDhg4sL054WRlAbB+eA=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
arch = "x64";
|
||||
shortName = "darwin";
|
||||
sha256 = "51fb5f29b5f00207ede11c892ccf5bb3ab437b77e7420e1c18b7fc91e02e2494";
|
||||
sha256 = "sha256-CVqFPvZScNTudE2wgUctwGDgTyaMeN8dUNmLatcKo5M=";
|
||||
};
|
||||
|
||||
x86_64-linux = {
|
||||
arch = "x64";
|
||||
shortName = "linux";
|
||||
sha256 = "89fe00713a4e0e9f77d8842c5e07f771bd743271746fcb755c5d98cb5c00456e";
|
||||
sha256 = "sha256-N3hGPyp9wvb7jjpaFLJcdNIRyLvegjAe+MiV2aMS1nE=";
|
||||
};
|
||||
};
|
||||
dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "0.1.6";
|
||||
version = "0.1.11";
|
||||
pname = "bun";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, SDL, SDL2, fetchurl, gzip, libvorbis, libmad
|
||||
{ lib, stdenv, SDL, SDL2, fetchurl, gzip, libvorbis, libmad, flac, libopus, opusfile, libogg, libxmp
|
||||
, Cocoa, CoreAudio, CoreFoundation, IOKit, OpenGL
|
||||
, copyDesktopItems, makeDesktopItem
|
||||
, copyDesktopItems, makeDesktopItem, pkg-config
|
||||
, useSDL2 ? stdenv.isDarwin # TODO: CoreAudio fails to initialize with SDL 1.x for some reason.
|
||||
}:
|
||||
|
||||
|
@ -20,9 +20,14 @@ stdenv.mkDerivation rec {
|
|||
./quakespasm-darwin-makefile-improvements.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gzip libvorbis libmad (if useSDL2 then SDL2 else SDL)
|
||||
gzip libvorbis libmad flac libopus opusfile libogg libxmp
|
||||
(if useSDL2 then SDL2 else SDL)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa CoreAudio IOKit OpenGL
|
||||
] ++ lib.optionals (stdenv.isDarwin && useSDL2) [
|
||||
|
@ -35,10 +40,11 @@ stdenv.mkDerivation rec {
|
|||
"USE_CODEC_WAVE=1"
|
||||
"USE_CODEC_MP3=1"
|
||||
"USE_CODEC_VORBIS=1"
|
||||
"USE_CODEC_FLAC=0"
|
||||
"USE_CODEC_OPUS=0"
|
||||
"USE_CODEC_FLAC=1"
|
||||
"USE_CODEC_OPUS=1"
|
||||
"USE_CODEC_MIKMOD=0"
|
||||
"USE_CODEC_UMX=0"
|
||||
"USE_CODEC_XMP=1"
|
||||
"MP3LIB=mad"
|
||||
"VORBISLIB=vorbis"
|
||||
] ++ lib.optionals useSDL2 [
|
||||
|
|
|
@ -1,24 +1,26 @@
|
|||
--- a/Makefile.darwin 2021-09-12 14:42:51.000000000 +0300
|
||||
+++ b/Makefile.darwin 2021-09-12 15:09:16.000000000 +0300
|
||||
@@ -49,6 +49,7 @@
|
||||
diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin
|
||||
index 6a08e6d..4e320cd 100644
|
||||
--- a/Makefile.darwin
|
||||
+++ b/Makefile.darwin
|
||||
@@ -50,6 +50,7 @@ LINKER = $(CC)
|
||||
LIPO ?= lipo
|
||||
|
||||
STRIP ?= strip
|
||||
STRIP ?= strip -S
|
||||
+PKG_CONFIG ?= pkg-config
|
||||
|
||||
CPUFLAGS=
|
||||
LDFLAGS =
|
||||
@@ -84,9 +85,6 @@
|
||||
USE_RPATH=1
|
||||
@@ -86,9 +87,6 @@ USE_RPATH=1
|
||||
endif
|
||||
CFLAGS += $(call check_gcc,-std=gnu11,)
|
||||
CFLAGS += $(CPUFLAGS)
|
||||
-ifeq ($(USE_RPATH),1)
|
||||
-LDFLAGS+=-Wl,-rpath,@executable_path/../Frameworks
|
||||
-endif
|
||||
|
||||
ifneq ($(DEBUG),0)
|
||||
DFLAGS += -DDEBUG
|
||||
@@ -115,19 +113,14 @@
|
||||
CFLAGS += -g
|
||||
@@ -117,19 +115,14 @@ CFLAGS += -DGL_SILENCE_DEPRECATION=1
|
||||
# not relying on sdl-config command and assuming
|
||||
# /Library/Frameworks/SDL.framework is available
|
||||
SDL_CFLAGS =-D_GNU_SOURCE=1 -D_THREAD_SAFE
|
||||
|
@ -34,42 +36,49 @@
|
|||
-ifneq ($(SDL_FRAMEWORK_PATH),)
|
||||
-SDL_LIBS +=-F$(SDL_FRAMEWORK_PATH)
|
||||
-SDL_CFLAGS+=-F$(SDL_FRAMEWORK_PATH)
|
||||
+SDL_CONFIG ?= sdl2-config
|
||||
+SDL_CONFIG ?= sdl-config
|
||||
endif
|
||||
-SDL_LIBS +=-Wl,-framework,$(SDL_FRAMEWORK_NAME) -Wl,-framework,Cocoa
|
||||
+SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
|
||||
+SDL_LIBS := $(shell $(SDL_CONFIG) --libs)
|
||||
+SDL_LIBS += -Wl,-framework,Cocoa
|
||||
+SDL_LIBS += -Wl,-framework,Cocoa
|
||||
|
||||
NET_LIBS :=
|
||||
|
||||
@@ -164,38 +157,26 @@
|
||||
@@ -165,45 +158,31 @@ ifeq ($(USE_CODEC_WAVE),1)
|
||||
CFLAGS+= -DUSE_CODEC_WAVE
|
||||
endif
|
||||
ifeq ($(USE_CODEC_FLAC),1)
|
||||
CFLAGS+= -DUSE_CODEC_FLAC
|
||||
-CFLAGS+= -DUSE_CODEC_FLAC
|
||||
-CODEC_INC = -I../MacOSX/codecs/include
|
||||
-CODEC_LINK= -L../MacOSX/codecs/lib
|
||||
CODECLIBS+= -lFLAC
|
||||
-CODECLIBS+= -lFLAC
|
||||
+CFLAGS+= -DUSE_CODEC_FLAC $(shell $(PKG_CONFIG) --cflags flac)
|
||||
+CODECLIBS+= $(shell $(PKG_CONFIG) --libs flac)
|
||||
endif
|
||||
ifeq ($(USE_CODEC_OPUS),1)
|
||||
-CFLAGS+= -DUSE_CODEC_OPUS
|
||||
-CODEC_INC = -I../MacOSX/codecs/include
|
||||
-CODEC_LINK= -L../MacOSX/codecs/lib
|
||||
-CODECLIBS+= -lopusfile -lopus -logg
|
||||
+CFLAGS+= -DUSE_CODEC_OPUS $(shell $(PKG_CONFIG) --cflags opusfile)
|
||||
+CODECLIBS+= $(shell $(PKG_CONFIG) --libs opusfile)
|
||||
+CFLAGS+= -DUSE_CODEC_OPUS $(shell $(PKG_CONFIG) --cflags ogg opus opusfile)
|
||||
+CODECLIBS+= $(shell $(PKG_CONFIG) --libs ogg opus opusfile)
|
||||
endif
|
||||
ifeq ($(USE_CODEC_VORBIS),1)
|
||||
CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)
|
||||
-CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)
|
||||
-CODEC_INC = -I../MacOSX/codecs/include
|
||||
-CODEC_LINK= -L../MacOSX/codecs/lib
|
||||
CODECLIBS+= $(lib_vorbisdec)
|
||||
-CODECLIBS+= $(lib_vorbisdec)
|
||||
+CFLAGS+= -DUSE_CODEC_VORBIS $(shell $(PKG_CONFIG) --cflags ogg vorbis vorbisfile)
|
||||
+CODECLIBS+= $(shell $(PKG_CONFIG) --libs ogg vorbis vorbisfile)
|
||||
endif
|
||||
ifeq ($(USE_CODEC_MP3),1)
|
||||
CFLAGS+= -DUSE_CODEC_MP3
|
||||
-CFLAGS+= -DUSE_CODEC_MP3
|
||||
-CODEC_INC = -I../MacOSX/codecs/include
|
||||
-CODEC_LINK= -L../MacOSX/codecs/lib
|
||||
CODECLIBS+= $(lib_mp3dec)
|
||||
-CODECLIBS+= $(lib_mp3dec)
|
||||
+CFLAGS+= -DUSE_CODEC_MP3 $(shell $(PKG_CONFIG) --cflags $(MP3LIB))
|
||||
+CODECLIBS+= $(shell $(PKG_CONFIG) --libs $(MP3LIB))
|
||||
endif
|
||||
ifeq ($(USE_CODEC_MIKMOD),1)
|
||||
CFLAGS+= -DUSE_CODEC_MIKMOD
|
||||
|
@ -78,15 +87,25 @@
|
|||
CODECLIBS+= -lmikmod
|
||||
endif
|
||||
ifeq ($(USE_CODEC_XMP),1)
|
||||
CFLAGS+= -DUSE_CODEC_XMP
|
||||
-CFLAGS+= -DUSE_CODEC_XMP
|
||||
-CODEC_INC = -I../MacOSX/codecs/include
|
||||
-CODEC_LINK= -L../MacOSX/codecs/lib
|
||||
CODECLIBS+= -lxmp
|
||||
-CODECLIBS+= -lxmp
|
||||
+CFLAGS+= -DUSE_CODEC_XMP $(shell $(PKG_CONFIG) --cflags libxmp)
|
||||
+CODECLIBS+= $(shell $(PKG_CONFIG) --libs libxmp)
|
||||
endif
|
||||
ifeq ($(USE_CODEC_MODPLUG),1)
|
||||
CFLAGS+= -DUSE_CODEC_MODPLUG
|
||||
-CODEC_INC = -I../MacOSX/codecs/include
|
||||
-CODEC_LINK= -L../MacOSX/codecs/lib
|
||||
CODECLIBS+= -lmodplug
|
||||
endif
|
||||
ifeq ($(USE_CODEC_UMX),1)
|
||||
@@ -332,3 +313,5 @@
|
||||
@@ -333,4 +312,7 @@ debug:
|
||||
clean:
|
||||
rm -f $(shell find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name '*.res' -o -name $(DEFAULT_TARGET) \) -print)
|
||||
$(RM) *.o *.d $(DEFAULT_TARGET)
|
||||
|
||||
+install: quakespasm
|
||||
+install: quakespasm
|
||||
+ install -D -m 755 quakespasm /usr/local/games/quake
|
||||
+
|
||||
sinclude $(OBJS:.o=.d)
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.42.0";
|
||||
version = "2.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BfHqVuTjgcObJm6bFwlXgHdcc1IalpY9opTamHqB0Zs=";
|
||||
hash = "sha256-swJzMZDBxof8RLMxVZN79zxajMO7kuxZxD8gNpgSksI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,5 +10,6 @@ buildMongoDB {
|
|||
sha256 = "sha256-ebg3R6P+tjRvizDzsl7mZzhTfqIaRJPfHBu0IfRvtS8=";
|
||||
patches = [
|
||||
./forget-build-dependencies-4-4.patch
|
||||
./fix-build-with-boost-1.79-4_4.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-4.patch ];
|
||||
}
|
||||
|
|
|
@ -21,5 +21,7 @@ buildMongoDB {
|
|||
patches = [
|
||||
./forget-build-dependencies-4-4.patch
|
||||
./asio-no-experimental-string-view-4-4.patch
|
||||
./fix-build-with-boost-1.79-5_0.patch
|
||||
./fix-gcc-Wno-exceptions-5.0.patch
|
||||
];
|
||||
}
|
||||
|
|
|
@ -0,0 +1,91 @@
|
|||
From 9a4c7b33e49cdf121ff9dee858539568d009fc27 Mon Sep 17 00:00:00 2001
|
||||
From: Et7f3 <cadeaudeelie@gmail.com>
|
||||
Date: Tue, 19 Jul 2022 22:11:11 +0200
|
||||
Subject: [PATCH] build: Upgrade boost to 1.79.0
|
||||
|
||||
We can see in src/third_party/boost-1.70.0/boost/version.hpp that vendored
|
||||
version of boost is BOOST_LIB_VERSION "1_70"
|
||||
|
||||
We can also see the doc desbribe 2 headers to use filesystems lib: One is
|
||||
src/third_party/boost/boost/filesystem/fstream.hpp that contains (175-177)
|
||||
typedef basic_ifstream<char> ifstream;
|
||||
typedef basic_ofstream<char> ofstream;
|
||||
typedef basic_fstream<char> fstream;
|
||||
|
||||
So this mean they mostly forgot to include a header and include-what-you-use
|
||||
would catch this error.
|
||||
|
||||
In upstream they fixed in a simmilar way
|
||||
https://github.com/mongodb/mongo/commit/13389dc222fc372442be8c147e09685bb9a26a3a
|
||||
---
|
||||
src/mongo/db/storage/storage_repair_observer.cpp | 1 +
|
||||
src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 1 +
|
||||
src/mongo/shell/shell_utils_extended.cpp | 1 +
|
||||
src/mongo/util/processinfo_linux.cpp | 2 +-
|
||||
src/mongo/util/stacktrace_threads.cpp | 1 +
|
||||
5 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp
|
||||
index 22b76a6a39c..453f48229cd 100644
|
||||
--- a/src/mongo/db/storage/storage_repair_observer.cpp
|
||||
+++ b/src/mongo/db/storage/storage_repair_observer.cpp
|
||||
@@ -42,6 +42,7 @@
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
|
||||
#include "mongo/db/dbhelpers.h"
|
||||
#include "mongo/db/operation_context.h"
|
||||
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
|
||||
index 85121941458..7464022fb28 100644
|
||||
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
|
||||
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
|
||||
#include "mongo/base/simple_string_data_comparator.h"
|
||||
#include "mongo/bson/bsonobjbuilder.h"
|
||||
diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp
|
||||
index 8cd7f035f1d..cd672eb513f 100644
|
||||
--- a/src/mongo/shell/shell_utils_extended.cpp
|
||||
+++ b/src/mongo/shell/shell_utils_extended.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
#include <fstream>
|
||||
|
||||
#include "mongo/bson/bson_validate.h"
|
||||
diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
|
||||
index de4b84bca5a..7fa9d5d128e 100644
|
||||
--- a/src/mongo/util/processinfo_linux.cpp
|
||||
+++ b/src/mongo/util/processinfo_linux.cpp
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#include "processinfo.h"
|
||||
|
||||
-#include <iostream>
|
||||
+#include <fstream>
|
||||
#include <malloc.h>
|
||||
#include <pcrecpp.h>
|
||||
#include <sched.h>
|
||||
diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp
|
||||
index 4667a261ab7..73a36015bd6 100644
|
||||
--- a/src/mongo/util/stacktrace_threads.cpp
|
||||
+++ b/src/mongo/util/stacktrace_threads.cpp
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <array>
|
||||
#include <atomic>
|
||||
#include <boost/filesystem.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
#include <cctype>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
--
|
||||
2.32.1 (Apple Git-133)
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
From fb846bdbd07cc3b8ada6179dccd974072c2b69da Mon Sep 17 00:00:00 2001
|
||||
From: Et7f3 <cadeaudeelie@gmail.com>
|
||||
Date: Tue, 19 Jul 2022 22:01:56 +0200
|
||||
Subject: [PATCH] build: Upgrade boost to 1.79.0
|
||||
|
||||
We can see in src/third_party/boost/boost/version.hpp that vendored version of
|
||||
boost is BOOST_LIB_VERSION "1_76"
|
||||
|
||||
We can also see the doc desbribe 2 headers to use filesystems lib: One is
|
||||
src/third_party/boost/boost/filesystem/fstream.hpp that contains (175-177)
|
||||
typedef basic_ifstream<char> ifstream;
|
||||
typedef basic_ofstream<char> ofstream;
|
||||
typedef basic_fstream<char> fstream;
|
||||
|
||||
So this mean they mostly forgot to include a header and include-what-you-use
|
||||
would catch this error.
|
||||
|
||||
In upstream they fixed in a simmilar way
|
||||
https://github.com/mongodb/mongo/commit/13389dc222fc372442be8c147e09685bb9a26a3a
|
||||
---
|
||||
src/mongo/db/storage/storage_repair_observer.cpp | 1 +
|
||||
src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 1 +
|
||||
src/mongo/shell/shell_utils_extended.cpp | 1 +
|
||||
src/mongo/util/processinfo_linux.cpp | 1 +
|
||||
src/mongo/util/stacktrace_threads.cpp | 1 +
|
||||
5 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp
|
||||
index 22b76a6a39c..453f48229cd 100644
|
||||
--- a/src/mongo/db/storage/storage_repair_observer.cpp
|
||||
+++ b/src/mongo/db/storage/storage_repair_observer.cpp
|
||||
@@ -42,6 +42,7 @@
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
|
||||
#include "mongo/db/dbhelpers.h"
|
||||
#include "mongo/db/operation_context.h"
|
||||
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
|
||||
index 07fabadd634..2924a2c74af 100644
|
||||
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
|
||||
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
|
||||
#include "mongo/base/simple_string_data_comparator.h"
|
||||
#include "mongo/bson/bsonobjbuilder.h"
|
||||
diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp
|
||||
index fbdddc1318d..e37d4c93a11 100644
|
||||
--- a/src/mongo/shell/shell_utils_extended.cpp
|
||||
+++ b/src/mongo/shell/shell_utils_extended.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
#include <fmt/format.h>
|
||||
#include <fstream>
|
||||
|
||||
diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
|
||||
index eae0e9b7764..d5cd40f6039 100644
|
||||
--- a/src/mongo/util/processinfo_linux.cpp
|
||||
+++ b/src/mongo/util/processinfo_linux.cpp
|
||||
@@ -52,6 +52,7 @@
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
#include <boost/none.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
#include <fmt/format.h>
|
||||
diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp
|
||||
index d2ee29d24b4..d485fa22367 100644
|
||||
--- a/src/mongo/util/stacktrace_threads.cpp
|
||||
+++ b/src/mongo/util/stacktrace_threads.cpp
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <array>
|
||||
#include <atomic>
|
||||
#include <boost/filesystem.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <dirent.h>
|
||||
--
|
||||
2.32.1 (Apple Git-133)
|
||||
|
44
pkgs/servers/nosql/mongodb/fix-gcc-Wno-exceptions-5.0.patch
Normal file
44
pkgs/servers/nosql/mongodb/fix-gcc-Wno-exceptions-5.0.patch
Normal file
|
@ -0,0 +1,44 @@
|
|||
From e78b2bf6eaa0c43bd76dbb841add167b443d2bb0 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Benvenuto <mark.benvenuto@mongodb.com>
|
||||
Date: Mon, 21 Jun 2021 11:36:56 -0400
|
||||
Subject: [PATCH] SERVER-57688 Fix debug gcc 11 and clang 12 builds on Fedora
|
||||
34
|
||||
|
||||
---
|
||||
SConstruct | 4 ----
|
||||
src/mongo/db/query/plan_summary_stats.h | 4 +++-
|
||||
src/mongo/util/shim_boost_assert.cpp | 1 +
|
||||
3 files changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 25fd4a248d0c..23cff6f9da53 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -3108,10 +3108,6 @@ def doConfigure(myenv):
|
||||
# harmful to capture unused variables we are suppressing for now with a plan to fix later.
|
||||
AddToCCFLAGSIfSupported(myenv, "-Wno-unused-lambda-capture")
|
||||
|
||||
- # This warning was added in clang-5 and incorrectly flags our implementation of
|
||||
- # exceptionToStatus(). See https://bugs.llvm.org/show_bug.cgi?id=34804
|
||||
- AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions")
|
||||
-
|
||||
# Enable sized deallocation support.
|
||||
AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation')
|
||||
|
||||
diff --git a/src/mongo/db/query/plan_summary_stats.h b/src/mongo/db/query/plan_summary_stats.h
|
||||
index 58677ab20d25..cfaa2053d16f 100644
|
||||
--- a/src/mongo/db/query/plan_summary_stats.h
|
||||
+++ b/src/mongo/db/query/plan_summary_stats.h
|
||||
@@ -29,9 +29,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
-#include "mongo/util/container_size_helper.h"
|
||||
+#include <optional>
|
||||
#include <string>
|
||||
|
||||
+#include "mongo/util/container_size_helper.h"
|
||||
+
|
||||
namespace mongo {
|
||||
|
||||
/**
|
|
@ -70,8 +70,16 @@ in stdenv.mkDerivation rec {
|
|||
# fix environment variable reading
|
||||
substituteInPlace SConstruct \
|
||||
--replace "env = Environment(" "env = Environment(ENV = os.environ,"
|
||||
'' + lib.optionalString (versionAtLeast version "4.4" && versionOlder version "4.6") ''
|
||||
# Fix debug gcc 11 and clang 12 builds on Fedora
|
||||
# https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch
|
||||
substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include <string>' '#include <optional>
|
||||
#include <string>'
|
||||
substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include <string>' '#include <optional>
|
||||
#include <string>'
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0
|
||||
'' + lib.optionalString (stdenv.isDarwin && versionOlder version "3.6") ''
|
||||
substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
|
||||
substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder
|
||||
substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
|
||||
let
|
||||
buildMongoDB = callPackage ./mongodb.nix {
|
||||
|
@ -12,5 +12,11 @@ in buildMongoDB {
|
|||
version = "3.6.23";
|
||||
sha256 = "sha256-EJpIerW4zcGJvHfqJ65fG8yNsLRlUnRkvYfC+jkoFJ4=";
|
||||
patches = [ ./forget-build-dependencies.patch ]
|
||||
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
name = "fix double link of isNamedError.";
|
||||
url = "https://github.com/mongodb/mongo/commit/9c6751b9765d269b667324bb2efe1ca76a916d20.patch";
|
||||
sha256 = "sha256-4mcafqhBh7039ocEI9d/gXWck51X68PqtWtz4dapwwI=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
@ -21,5 +21,11 @@ in buildMongoDB {
|
|||
sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
name = "fix double link of isNamedError.";
|
||||
url = "https://github.com/mongodb/mongo/commit/9c6751b9765d269b667324bb2efe1ca76a916d20.patch";
|
||||
sha256 = "sha256-4mcafqhBh7039ocEI9d/gXWck51X68PqtWtz4dapwwI=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
@ -16,14 +16,14 @@ let
|
|||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
hash = {
|
||||
x64-linux_hash = "sha256-VUJgf0gxOJH6RKUN5pODxoT6MM4fX43CSApRCDvPjjU=";
|
||||
arm64-linux_hash = "sha256-rZM9r9CCcB0Q468w4Q5CuTeQS6hmFPCSv/DJ/SPm4Tw=";
|
||||
x64-osx_hash = "sha256-RjeuINFgtqKcKF6I8K+l9CbYTRKagepZGT3fOLXDtJE=";
|
||||
x64-linux_hash = "sha256-t5KjzB+dJGNr80mbRRlGvzuC6NvicyScoVeCygzjKeA=";
|
||||
arm64-linux_hash = "sha256-wj1B573MgLZee3pjzbDyYsEYQ6fIyWQkYQnAbV6IW2Q=";
|
||||
x64-osx_hash = "sha256-sbaWK5FK9luSpra/8aujd02/8Z1LOKkAm5eAghT6LJk=";
|
||||
}."${arch}-${os}_hash";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "prowlarr";
|
||||
version = "0.4.4.1947";
|
||||
version = "0.4.5.1960";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
|
6
pkgs/test/coq/default.nix
Normal file
6
pkgs/test/coq/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{ lib, callPackage }:
|
||||
|
||||
lib.recurseIntoAttrs {
|
||||
overrideCoqDerivation = callPackage ./overrideCoqDerivation { };
|
||||
}
|
||||
|
40
pkgs/test/coq/overrideCoqDerivation/default.nix
Normal file
40
pkgs/test/coq/overrideCoqDerivation/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
{ lib, coq, mkCoqPackages, runCommand }:
|
||||
|
||||
let
|
||||
|
||||
# This is just coq, but with dontFilter set to true. We need to set
|
||||
# dontFilter to true here so that _all_ packages are visibile in coqPackages.
|
||||
# There may be some versions of the top-level coq and coqPackages that don't
|
||||
# build QuickChick, which is what we are using for this test below.
|
||||
coqWithAllPackages = coq // { dontFilter = true; };
|
||||
|
||||
coqPackages = mkCoqPackages coqWithAllPackages;
|
||||
|
||||
# This is the main test. This uses overrideCoqDerivation to
|
||||
# override arguments to mkCoqDerivation.
|
||||
#
|
||||
# Here, we override the defaultVersion and release arguments to
|
||||
# mkCoqDerivation.
|
||||
overriddenQuickChick =
|
||||
coqPackages.lib.overrideCoqDerivation
|
||||
{
|
||||
defaultVersion = "9999";
|
||||
release."9999".sha256 = lib.fakeSha256;
|
||||
}
|
||||
coqPackages.QuickChick;
|
||||
in
|
||||
|
||||
runCommand
|
||||
"coq-overrideCoqDerivation-test-0.1"
|
||||
{ meta.maintainers = with lib.maintainers; [cdepillabout]; }
|
||||
''
|
||||
# Confirm that the computed version number for the overridden QuickChick does
|
||||
# actually become 9999, as set above.
|
||||
if [ "${overriddenQuickChick.version}" -eq "9999" ]; then
|
||||
echo "overriddenQuickChick version was successfully set to 9999"
|
||||
touch $out
|
||||
else
|
||||
echo "ERROR: overriddenQuickChick version was supposed to be 9999, but was actually: ${overriddenQuickChick.version}"
|
||||
exit 1
|
||||
fi
|
||||
''
|
|
@ -75,6 +75,8 @@ with pkgs;
|
|||
|
||||
dhall = callPackage ./dhall { };
|
||||
|
||||
coq = callPackage ./coq {};
|
||||
|
||||
makeWrapper = callPackage ./make-wrapper { };
|
||||
makeBinaryWrapper = callPackage ./make-binary-wrapper {
|
||||
makeBinaryWrapper = pkgs.makeBinaryWrapper.override {
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.10.21";
|
||||
version = "0.10.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p9q0NVk+7jZ/DKxDjvvlfRKW9N1bk5jquxxQHmNE/3s=";
|
||||
sha256 = "sha256-9Vl4FWmKaNWl5QcfFc5KDyLWMRmAEqkBwMqwqhXkjgo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DRrf7VR1w35KRwokcDIBYr0pPmNREXiATRu4Cc+xegk=";
|
||||
vendorSha256 = "sha256-10QeWL3tIcs2E4pK9UAY8C41YYjA3LHlvIbDhWVYATE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line client for FI-TS Finance Cloud Native services";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "borgmatic";
|
||||
version = "1.6.4";
|
||||
version = "1.7.2";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2kQ+KO69RxpIQkrkD6n7l9ti9ITwdpHYK7LuXYUo3ck=";
|
||||
sha256 = "sha256-0o2tKg7BfhkNt/k8XdZ1agaSJxKO5OxB5aaRgV9IPeU=";
|
||||
};
|
||||
|
||||
checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fdupes";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrianlopezroche";
|
||||
repo = "fdupes";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w1vIZexuXoCpc509QKdKnUaD4Obs5rsjptYAE4T/T+g=";
|
||||
hash = "sha256-8GYQfnUxS790pDXw2sjnDZNB55PMDaCcO6daIa/MPMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
52
pkgs/tools/misc/tbls/default.nix
Normal file
52
pkgs/tools/misc/tbls/default.nix
Normal file
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
, tbls
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.56.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fJbdZlgegC54OIAbygKO5GzNh6UAuT4OZp7KK+XJhvI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU=";
|
||||
|
||||
CGO_CFLAGS = [ "-Wno-format-security" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/k1LoW/tbls.commit=unspecified"
|
||||
"-X github.com/k1LoW/tbls.date=unspecified"
|
||||
"-X github.com/k1LoW/tbls.version=${src.rev}"
|
||||
"-X github.com/k1LoW/tbls/version.Version=${src.rev}"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Remove tests that require additional services.
|
||||
rm -f \
|
||||
datasource/datasource_test.go \
|
||||
drivers/*/*_test.go
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = tbls;
|
||||
command = "tbls version";
|
||||
version = src.rev;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to generate documentation based on a database";
|
||||
homepage = "https://github.com/k1LoW/tbls";
|
||||
changelog = "https://github.com/k1LoW/tbls/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
};
|
||||
}
|
24
pkgs/tools/misc/tdfgo/default.nix
Normal file
24
pkgs/tools/misc/tdfgo/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tdfgo";
|
||||
version = "unstable-2022-08-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitallyserviced";
|
||||
repo = "tdfgo";
|
||||
rev = "9f0b3315eed32409639a05aca55d7a0252681193";
|
||||
sha256 = "sha256-Lr4+bXdVxYbCXKVzE+fjeLD559HuABK6lOLJ0sBBGNY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-T6PSs5NfXSXvzlq67rIDbzURyA+25df3nMMfufo0fow=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "TheDraw font parser and console text renderer.";
|
||||
longDescription = "Supports more fonts than `tdfiglet`, and packs more features.";
|
||||
homepage = "https://github.com/digitallyserviced/tdfgo";
|
||||
license = licenses.cc0;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ crinklywrappr ];
|
||||
};
|
||||
}
|
70
pkgs/tools/misc/trdl-client/default.nix
Normal file
70
pkgs/tools/misc/trdl-client/default.nix
Normal file
|
@ -0,0 +1,70 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
, trdl-client
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trdl-client";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "trdl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6bJoM0s0lIZewERCNnm5+J5O+Tkzp+Pv2l4vvOSxIz8=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/client";
|
||||
|
||||
vendorHash = "sha256-j3WekQpnwbh+XiFgJlEr/Cw+2WloIw+iELsqk5Cy69g=";
|
||||
|
||||
subPackages = [ "cmd/trdl" ];
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/werf/trdl/client/pkg/trdl.Version=${src.rev}"
|
||||
];
|
||||
|
||||
tags = [
|
||||
"dfrunmount"
|
||||
"dfssh"
|
||||
];
|
||||
|
||||
# There are no tests for cmd/trdl.
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = trdl-client;
|
||||
command = "trdl version";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
The universal solution for delivering your software updates securely from
|
||||
a trusted The Update Framework (TUF) repository
|
||||
'';
|
||||
longDescription = ''
|
||||
trdl is an Open Source solution providing a secure channel for delivering
|
||||
updates from the Git repository to the end user.
|
||||
|
||||
The project team releases new versions of the software and switches them
|
||||
in the release channels. Git acts as the single source of truth while
|
||||
Vault is used as a tool to verify operations as well as populate and
|
||||
maintain the TUF repository.
|
||||
|
||||
The user selects a release channel, continuously receives the latest
|
||||
software version from the TUF repository, and uses it.
|
||||
'';
|
||||
homepage = "https://trdl.dev";
|
||||
changelog = "https://github.com/werf/trdl/releases/tag/${src.rev}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
mainProgram = "trdl";
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "http-prompt";
|
||||
version = "1.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
repo = "http-prompt";
|
||||
owner = "eliangcs";
|
||||
sha256 = "0kngz2izcqjphbrdkg489p0xmf65xjc8ki1a2szcc8sgwc7z74xy";
|
||||
owner = "httpie";
|
||||
sha256 = "sha256-e4GyuxCeXYNsnBXyjIJz1HqSrqTGan0N3wxUFS+Hvkw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
@ -18,6 +18,7 @@ python3Packages.buildPythonApplication rec {
|
|||
(python.pkgs.callPackage ../../../development/python-modules/prompt-toolkit/1.nix {})
|
||||
pygments
|
||||
six
|
||||
pyyaml
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
}:
|
||||
mkDerivation rec {
|
||||
pname = "echidna";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crytic";
|
||||
repo = "echidna";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WmlQWgn4qfRmx3PdzY7wzT9AyU7Re2T1CWJ7yGjcVac=";
|
||||
sha256 = "sha256-ZLk3K00O6aERf+G5SagDVUk1/ba9U+9n9dqCImkczJs=";
|
||||
};
|
||||
|
||||
# NOTE: echidna is behind with aeson because of hevm, this patch updates
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass";
|
||||
version = "1.14.5";
|
||||
version = "1.14.6";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
@ -21,10 +21,10 @@ buildGoModule rec {
|
|||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MFnenWoInS2vWySa0IxKAFLYF9VHmPaL0eGM27b1wpI=";
|
||||
sha256 = "sha256-TTifpIZdv2KVsWQGHR1seYL+A8MSmngnvm/zUqrz5CM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-clJAt/SZCLlLnYf2tmR9nmsbZ0SzMj7x+1Ft9dfEdJ4=";
|
||||
vendorSha256 = "sha256-57fvb0UF90S+OhZcxi5ZFMOLXW72kKVjls5cia9pitA=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = hash;
|
||||
};
|
||||
|
||||
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
|
||||
|
||||
ADDFLAGS = with darwin.apple_sdk.frameworks;
|
||||
lib.optional stdenv.isDarwin
|
||||
"-F${IOKit}/Library/Frameworks/";
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.16.0";
|
||||
version = "5.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e2fZJ1HRoi2uMyCWgjPIXs6Q6neg8XEqtC8YcUev+60=";
|
||||
sha256 = "sha256-8YC0KUf+kSVnSt1436Ob1CdLJT/w5VYDOEHV0mDkO7E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-42hXOF/jeOc7WXqq6nBgYv5Qjypszxp9IboxchKQbN8=";
|
||||
vendorSha256 = "sha256-rppVLeX1VDOW+eUHSM77DgY2KjOrUHdyqGWRAYRIbUE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -282,7 +282,7 @@ in python3.pkgs.buildPythonApplication rec {
|
|||
fromSource
|
||||
] ++ lib.optional _enableDitaaFilter binaryBytecode;
|
||||
homepage = "https://asciidoc-py.github.io/";
|
||||
changelog = "https://github.com/asciidoc-py/asciidoc-py/blob/${src.rev}/CHANGELOG.adoc";
|
||||
changelog = "https://github.com/asciidoc-py/asciidoc-py/blob/${version}/CHANGELOG.adoc";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bjornfor dotlambda ];
|
||||
|
|
|
@ -1246,6 +1246,7 @@ mapAliases ({
|
|||
rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15
|
||||
ring-daemon = jami-daemon; # Added 2021-10-26
|
||||
rkt = throw "rkt was archived by upstream"; # Added 2020-05-16
|
||||
rls = throw "rls was discontinued upstream, use rust-analyzer instead"; # Added 2022-09-06
|
||||
rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22
|
||||
robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22
|
||||
rockbox_utility = rockbox-utility; # Added 2022-03-17
|
||||
|
|
|
@ -8043,7 +8043,9 @@ with pkgs;
|
|||
|
||||
krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
|
||||
|
||||
krunvm = callPackage ../applications/virtualization/krunvm { };
|
||||
krunvm = callPackage ../applications/virtualization/krunvm {
|
||||
inherit (darwin) sigtool;
|
||||
};
|
||||
|
||||
kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
|
||||
|
||||
|
@ -11736,6 +11738,8 @@ with pkgs;
|
|||
|
||||
trashy = callPackage ../tools/misc/trashy { };
|
||||
|
||||
trdl-client = callPackage ../tools/misc/trdl-client { };
|
||||
|
||||
trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom {
|
||||
inherit (xorg) libXxf86vm;
|
||||
};
|
||||
|
@ -12203,6 +12207,8 @@ with pkgs;
|
|||
|
||||
td = callPackage ../tools/misc/td { };
|
||||
|
||||
tdfgo = callPackage ../tools/misc/tdfgo { };
|
||||
|
||||
tftp-hpa = callPackage ../tools/networking/tftp-hpa {};
|
||||
|
||||
tigervnc = callPackage ../tools/admin/tigervnc {};
|
||||
|
@ -14663,7 +14669,6 @@ with pkgs;
|
|||
ograc = callPackage ../development/tools/rust/ograc { };
|
||||
|
||||
rhack = callPackage ../development/tools/rust/rhack { };
|
||||
inherit (rustPackages) rls;
|
||||
roogle = callPackage ../development/tools/rust/roogle { };
|
||||
rustfmt = rustPackages.rustfmt;
|
||||
rustracer = callPackage ../development/tools/rust/racer {
|
||||
|
@ -14814,9 +14819,7 @@ with pkgs;
|
|||
wasi-libc = pkgsCross.wasi32.wasilibc;
|
||||
};
|
||||
|
||||
tinyscheme = callPackage ../development/interpreters/tinyscheme {
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
tinyscheme = callPackage ../development/interpreters/tinyscheme { };
|
||||
|
||||
bupc = callPackage ../development/compilers/bupc { };
|
||||
|
||||
|
@ -16697,6 +16700,8 @@ with pkgs;
|
|||
|
||||
lenmus = callPackage ../applications/misc/lenmus { };
|
||||
|
||||
lightningcss = callPackage ../development/tools/lightningcss { };
|
||||
|
||||
libtool = libtool_2;
|
||||
|
||||
libtool_1_5 = callPackage ../development/tools/misc/libtool { };
|
||||
|
@ -24323,7 +24328,9 @@ with pkgs;
|
|||
|
||||
libcgroup = callPackage ../os-specific/linux/libcgroup { };
|
||||
|
||||
libkrun = callPackage ../development/libraries/libkrun { };
|
||||
libkrun = callPackage ../development/libraries/libkrun {
|
||||
inherit (darwin.apple_sdk.frameworks) Hypervisor;
|
||||
};
|
||||
|
||||
libkrun-sev = callPackage ../development/libraries/libkrun { sevVariant = true; };
|
||||
|
||||
|
@ -29020,6 +29027,8 @@ with pkgs;
|
|||
|
||||
ktunnel = callPackage ../applications/networking/cluster/ktunnel { };
|
||||
|
||||
pinniped = callPackage ../applications/networking/cluster/pinniped { };
|
||||
|
||||
pgo-client = callPackage ../applications/networking/cluster/pgo-client { };
|
||||
|
||||
popeye = callPackage ../applications/networking/cluster/popeye { };
|
||||
|
@ -31495,6 +31504,8 @@ with pkgs;
|
|||
|
||||
todoman = callPackage ../applications/office/todoman { };
|
||||
|
||||
tofi = callPackage ../applications/misc/tofi { };
|
||||
|
||||
topydo = callPackage ../applications/misc/topydo {};
|
||||
|
||||
torrential = callPackage ../applications/networking/p2p/torrential { };
|
||||
|
@ -33812,6 +33823,8 @@ with pkgs;
|
|||
|
||||
tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
|
||||
|
||||
tbls = callPackage ../tools/misc/tbls { };
|
||||
|
||||
tecnoballz = callPackage ../games/tecnoballz { };
|
||||
|
||||
teetertorture = callPackage ../games/teetertorture { };
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
|
||||
metaFetch = import ../build-support/coq/meta-fetch/default.nix
|
||||
{inherit lib stdenv fetchzip; };
|
||||
mkCoqDerivation = callPackage ../build-support/coq {};
|
||||
mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq {});
|
||||
|
||||
contribs = recurseIntoAttrs
|
||||
(callPackage ../development/coq-modules/contribs {});
|
||||
|
|
|
@ -78,6 +78,8 @@ let
|
|||
|
||||
bigstring = callPackage ../development/ocaml-modules/bigstring { };
|
||||
|
||||
bindlib = callPackage ../development/ocaml-modules/bindlib { };
|
||||
|
||||
biocaml = callPackage ../development/ocaml-modules/biocaml { };
|
||||
|
||||
bistro = callPackage ../development/ocaml-modules/bistro { };
|
||||
|
@ -286,6 +288,8 @@ let
|
|||
|
||||
decompress = callPackage ../development/ocaml-modules/decompress { };
|
||||
|
||||
dedukti = callPackage ../development/ocaml-modules/dedukti { };
|
||||
|
||||
diet = callPackage ../development/ocaml-modules/diet { };
|
||||
|
||||
digestif = callPackage ../development/ocaml-modules/digestif { };
|
||||
|
@ -698,6 +702,8 @@ let
|
|||
|
||||
ladspa = callPackage ../development/ocaml-modules/ladspa { };
|
||||
|
||||
lambdapi = callPackage ../development/ocaml-modules/lambdapi { };
|
||||
|
||||
lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { };
|
||||
|
||||
lambda-term = callPackage ../development/ocaml-modules/lambda-term { };
|
||||
|
@ -1177,6 +1183,8 @@ let
|
|||
|
||||
ppxlib = callPackage ../development/ocaml-modules/ppxlib { };
|
||||
|
||||
pratter = callPackage ../development/ocaml-modules/pratter { };
|
||||
|
||||
psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { };
|
||||
|
||||
psq = callPackage ../development/ocaml-modules/psq { };
|
||||
|
@ -1227,6 +1235,8 @@ let
|
|||
|
||||
tcpip = callPackage ../development/ocaml-modules/tcpip { };
|
||||
|
||||
timed = callPackage ../development/ocaml-modules/timed { };
|
||||
|
||||
tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { };
|
||||
|
||||
tsort = callPackage ../development/ocaml-modules/tsort { };
|
||||
|
|
|
@ -3252,6 +3252,8 @@ in {
|
|||
|
||||
fire = callPackage ../development/python-modules/fire { };
|
||||
|
||||
fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { };
|
||||
|
||||
firetv = callPackage ../development/python-modules/firetv { };
|
||||
|
||||
first = callPackage ../development/python-modules/first { };
|
||||
|
|
Loading…
Reference in a new issue