Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
4acff2bbde
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
|
|
@ -233,6 +233,7 @@
|
|||
/pkgs/applications/blockchains @mmahut @RaghavSood
|
||||
|
||||
# Go
|
||||
/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq
|
||||
/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
|
||||
/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
|
||||
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ pet = buildGoModule rec {
|
|||
|
||||
vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j";
|
||||
|
||||
runVend = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple command-line snippet manager, written in Go";
|
||||
homepage = "https://github.com/knqyf263/pet";
|
||||
|
|
|
|||
|
|
@ -8657,7 +8657,7 @@
|
|||
};
|
||||
noreferences = {
|
||||
email = "norkus@norkus.net";
|
||||
github = "noreferences";
|
||||
github = "jozuas";
|
||||
githubId = 13085275;
|
||||
name = "Juozas Norkus";
|
||||
};
|
||||
|
|
@ -11634,6 +11634,12 @@
|
|||
githubId = 280235;
|
||||
name = "Terje Larsen";
|
||||
};
|
||||
terrorjack = {
|
||||
email = "astrohavoc@gmail.com";
|
||||
github = "TerrorJack";
|
||||
githubId = 3889585;
|
||||
name = "Cheng Shao";
|
||||
};
|
||||
tesq0 = {
|
||||
email = "mikolaj.galkowski@gmail.com";
|
||||
github = "tesq0";
|
||||
|
|
|
|||
|
|
@ -81,6 +81,14 @@
|
|||
<link xlink:href="options.html#opt-services.maddy.enable">services.maddy</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://tetrd.app">tetrd</link>, share your
|
||||
internet connection from your device to your PC and vice versa
|
||||
through a USB cable. Available at
|
||||
<link linkend="opt-services.tetrd.enable">services.tetrd</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-incompatibilities">
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable).
|
||||
|
||||
- [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
|
||||
|
||||
- `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.
|
||||
|
|
|
|||
|
|
@ -563,7 +563,6 @@
|
|||
./services/misc/mediatomb.nix
|
||||
./services/misc/metabase.nix
|
||||
./services/misc/moonraker.nix
|
||||
./services/misc/mwlib.nix
|
||||
./services/misc/mx-puppet-discord.nix
|
||||
./services/misc/n8n.nix
|
||||
./services/misc/nitter.nix
|
||||
|
|
@ -739,7 +738,6 @@
|
|||
./services/networking/eternal-terminal.nix
|
||||
./services/networking/fakeroute.nix
|
||||
./services/networking/ferm.nix
|
||||
./services/networking/firefox/sync-server.nix
|
||||
./services/networking/fireqos.nix
|
||||
./services/networking/firewall.nix
|
||||
./services/networking/flannel.nix
|
||||
|
|
@ -1034,7 +1032,6 @@
|
|||
./services/web-apps/sogo.nix
|
||||
./services/web-apps/rss-bridge.nix
|
||||
./services/web-apps/tt-rss.nix
|
||||
./services/web-apps/trac.nix
|
||||
./services/web-apps/trilium.nix
|
||||
./services/web-apps/selfoss.nix
|
||||
./services/web-apps/shiori.nix
|
||||
|
|
|
|||
|
|
@ -74,8 +74,10 @@ in {
|
|||
</para>
|
||||
<para>
|
||||
You will get file collisions if you put the actual application binary in
|
||||
the global environment and applications started via .desktop files are
|
||||
not wrapped if they specify the absolute path to the binary.
|
||||
the global environment (such as by adding the application package to
|
||||
<code>environment.systemPackages</code>), and applications started via
|
||||
.desktop files are not wrapped if they specify the absolute path to the
|
||||
binary.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@ with lib;
|
|||
(mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs")
|
||||
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
|
||||
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
|
||||
(mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
|
||||
|
|
@ -38,6 +37,7 @@ with lib;
|
|||
(mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
|
||||
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
|
||||
(mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''
|
||||
|
|
|
|||
|
|
@ -1,264 +0,0 @@
|
|||
{ config, lib, options, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.mwlib;
|
||||
opt = options.services.mwlib;
|
||||
pypkgs = pkgs.python27Packages;
|
||||
|
||||
inherit (pypkgs) python mwlib;
|
||||
|
||||
user = mkOption {
|
||||
default = "nobody";
|
||||
type = types.str;
|
||||
description = "User to run as.";
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
options.services.mwlib = {
|
||||
|
||||
nserve = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to enable nserve. Nserve is a HTTP
|
||||
server. The Collection extension is talking to
|
||||
that program directly. Nserve uses at least
|
||||
one qserve instance in order to distribute
|
||||
and manage jobs.
|
||||
'';
|
||||
}; # nserve.enable
|
||||
|
||||
port = mkOption {
|
||||
default = 8899;
|
||||
type = types.port;
|
||||
description = "Specify port to listen on.";
|
||||
}; # nserve.port
|
||||
|
||||
address = mkOption {
|
||||
default = "127.0.0.1";
|
||||
type = types.str;
|
||||
description = "Specify network interface to listen on.";
|
||||
}; # nserve.address
|
||||
|
||||
qserve = mkOption {
|
||||
default = [ "${cfg.qserve.address}:${toString cfg.qserve.port}" ];
|
||||
defaultText = literalExpression ''
|
||||
[ "''${config.${opt.qserve.address}}:''${toString config.${opt.qserve.port}}"
|
||||
]'';
|
||||
type = types.listOf types.str;
|
||||
description = "Register qserve instance.";
|
||||
}; # nserve.qserve
|
||||
|
||||
inherit user;
|
||||
}; # nserve
|
||||
|
||||
qserve = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
A job queue server used to distribute and manage
|
||||
jobs. You should start one qserve instance
|
||||
for each machine that is supposed to render pdf
|
||||
files. Unless you’re operating the Wikipedia
|
||||
installation, one machine should suffice.
|
||||
'';
|
||||
}; # qserve.enable
|
||||
|
||||
port = mkOption {
|
||||
default = 14311;
|
||||
type = types.port;
|
||||
description = "Specify port to listen on.";
|
||||
}; # qserve.port
|
||||
|
||||
address = mkOption {
|
||||
default = "127.0.0.1";
|
||||
type = types.str;
|
||||
description = "Specify network interface to listen on.";
|
||||
}; # qserve.address
|
||||
|
||||
datadir = mkOption {
|
||||
default = "/var/lib/mwlib-qserve";
|
||||
type = types.path;
|
||||
description = "qserve data directory (FIXME: unused?)";
|
||||
}; # qserve.datadir
|
||||
|
||||
allow = mkOption {
|
||||
default = [ "127.0.0.1" ];
|
||||
type = types.listOf types.str;
|
||||
description = "List of allowed client IPs. Empty means any.";
|
||||
}; # qserve.allow
|
||||
|
||||
inherit user;
|
||||
}; # qserve
|
||||
|
||||
nslave = {
|
||||
enable = mkOption {
|
||||
default = cfg.qserve.enable;
|
||||
defaultText = literalExpression "config.${opt.qserve.enable}";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Pulls new jobs from exactly one qserve instance
|
||||
and calls the zip and render programs
|
||||
in order to download article collections and
|
||||
convert them to different output formats. Nslave
|
||||
uses a cache directory to store the generated
|
||||
documents. Nslave also starts an internal http
|
||||
server serving the content of the cache directory.
|
||||
'';
|
||||
}; # nslave.enable
|
||||
|
||||
cachedir = mkOption {
|
||||
default = "/var/cache/mwlib-nslave";
|
||||
type = types.path;
|
||||
description = "Directory to store generated documents.";
|
||||
}; # nslave.cachedir
|
||||
|
||||
numprocs = mkOption {
|
||||
default = 10;
|
||||
type = types.int;
|
||||
description = "Number of parallel jobs to be executed.";
|
||||
}; # nslave.numprocs
|
||||
|
||||
http = mkOption {
|
||||
default = {};
|
||||
description = ''
|
||||
Internal http server serving the content of the cache directory.
|
||||
You have to enable it, or use your own way for serving files
|
||||
and set the http.url option accordingly.
|
||||
'';
|
||||
type = types.submodule ({ config, options, ... }: {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
description = "Enable internal http server.";
|
||||
}; # nslave.http.enable
|
||||
|
||||
port = mkOption {
|
||||
default = 8898;
|
||||
type = types.port;
|
||||
description = "Port to listen to when serving files from cache.";
|
||||
}; # nslave.http.port
|
||||
|
||||
address = mkOption {
|
||||
default = "127.0.0.1";
|
||||
type = types.str;
|
||||
description = "Specify network interface to listen on.";
|
||||
}; # nslave.http.address
|
||||
|
||||
url = mkOption {
|
||||
default = "http://localhost:${toString config.port}/cache";
|
||||
defaultText = literalExpression ''"http://localhost:''${toString config.${options.port}}/cache"'';
|
||||
type = types.str;
|
||||
description = ''
|
||||
Specify URL for accessing generated files from cache.
|
||||
The Collection extension of Mediawiki won't be able to
|
||||
download files without it.
|
||||
'';
|
||||
}; # nslave.http.url
|
||||
};
|
||||
}); # types.submodule
|
||||
}; # nslave.http
|
||||
|
||||
inherit user;
|
||||
}; # nslave
|
||||
|
||||
}; # options.services
|
||||
|
||||
config = {
|
||||
|
||||
systemd.services.mwlib-nserve = mkIf cfg.nserve.enable
|
||||
{
|
||||
description = "mwlib network interface";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" "mwlib-qserve.service" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = concatStringsSep " " (
|
||||
[
|
||||
"${mwlib}/bin/nserve"
|
||||
"--port ${toString cfg.nserve.port}"
|
||||
"--interface ${cfg.nserve.address}"
|
||||
] ++ cfg.nserve.qserve
|
||||
);
|
||||
User = cfg.nserve.user;
|
||||
};
|
||||
}; # systemd.services.mwlib-nserve
|
||||
|
||||
systemd.services.mwlib-qserve = mkIf cfg.qserve.enable
|
||||
{
|
||||
description = "mwlib job queue server";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
preStart = ''
|
||||
mkdir -pv '${cfg.qserve.datadir}'
|
||||
chown -Rc ${cfg.qserve.user}:`id -ng ${cfg.qserve.user}` '${cfg.qserve.datadir}'
|
||||
chmod -Rc u=rwX,go= '${cfg.qserve.datadir}'
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = concatStringsSep " " (
|
||||
[
|
||||
"${mwlib}/bin/mw-qserve"
|
||||
"-p ${toString cfg.qserve.port}"
|
||||
"-i ${cfg.qserve.address}"
|
||||
"-d ${cfg.qserve.datadir}"
|
||||
] ++ map (a: "-a ${a}") cfg.qserve.allow
|
||||
);
|
||||
User = cfg.qserve.user;
|
||||
PermissionsStartOnly = true;
|
||||
};
|
||||
}; # systemd.services.mwlib-qserve
|
||||
|
||||
systemd.services.mwlib-nslave = mkIf cfg.nslave.enable
|
||||
{
|
||||
description = "mwlib worker";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
preStart = ''
|
||||
mkdir -pv '${cfg.nslave.cachedir}'
|
||||
chown -Rc ${cfg.nslave.user}:`id -ng ${cfg.nslave.user}` '${cfg.nslave.cachedir}'
|
||||
chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}'
|
||||
'';
|
||||
|
||||
path = with pkgs; [ imagemagick pdftk ];
|
||||
environment = {
|
||||
PYTHONPATH = concatMapStringsSep ":"
|
||||
(m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")
|
||||
[ "mwlib-rl" "mwlib-ext" "pygments" "pyfribidi" ];
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = concatStringsSep " " (
|
||||
[
|
||||
"${mwlib}/bin/nslave"
|
||||
"--cachedir ${cfg.nslave.cachedir}"
|
||||
"--numprocs ${toString cfg.nslave.numprocs}"
|
||||
"--url ${cfg.nslave.http.url}"
|
||||
] ++ (
|
||||
if cfg.nslave.http.enable then
|
||||
[
|
||||
"--serve-files-port ${toString cfg.nslave.http.port}"
|
||||
"--serve-files-address ${cfg.nslave.http.address}"
|
||||
] else
|
||||
[
|
||||
"--no-serve-files"
|
||||
]
|
||||
));
|
||||
User = cfg.nslave.user;
|
||||
PermissionsStartOnly = true;
|
||||
};
|
||||
}; # systemd.services.mwlib-nslave
|
||||
|
||||
}; # config
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ in
|
|||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "noaccess";
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
|
|
|
|||
|
|
@ -1,183 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.firefox.syncserver;
|
||||
|
||||
defaultDbLocation = "/var/db/firefox-sync-server/firefox-sync-server.db";
|
||||
defaultSqlUri = "sqlite:///${defaultDbLocation}";
|
||||
|
||||
syncServerIni = pkgs.writeText "syncserver.ini" ''
|
||||
[DEFAULT]
|
||||
overrides = ${cfg.privateConfig}
|
||||
|
||||
[server:main]
|
||||
use = egg:gunicorn
|
||||
host = ${cfg.listen.address}
|
||||
port = ${toString cfg.listen.port}
|
||||
|
||||
[app:main]
|
||||
use = egg:syncserver
|
||||
|
||||
[syncserver]
|
||||
public_url = ${cfg.publicUrl}
|
||||
${optionalString (cfg.sqlUri != "") "sqluri = ${cfg.sqlUri}"}
|
||||
allow_new_users = ${boolToString cfg.allowNewUsers}
|
||||
|
||||
[browserid]
|
||||
backend = tokenserver.verifiers.LocalVerifier
|
||||
audiences = ${removeSuffix "/" cfg.publicUrl}
|
||||
'';
|
||||
|
||||
user = "syncserver";
|
||||
group = "syncserver";
|
||||
in
|
||||
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ nadrieril ];
|
||||
|
||||
options = {
|
||||
services.firefox.syncserver = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable a Firefox Sync Server, this give the opportunity to
|
||||
Firefox users to store all synchronized data on their own server. To use this
|
||||
server, Firefox users should visit the <option>about:config</option>, and
|
||||
replicate the following change
|
||||
|
||||
<screen>
|
||||
services.sync.tokenServerURI: http://localhost:5000/token/1.0/sync/1.5
|
||||
</screen>
|
||||
|
||||
where <option>http://localhost:5000/</option> corresponds to the
|
||||
public url of the server.
|
||||
'';
|
||||
};
|
||||
|
||||
listen.address = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
example = "0.0.0.0";
|
||||
description = ''
|
||||
Address on which the sync server listen to.
|
||||
'';
|
||||
};
|
||||
|
||||
listen.port = mkOption {
|
||||
type = types.port;
|
||||
default = 5000;
|
||||
description = ''
|
||||
Port on which the sync server listen to.
|
||||
'';
|
||||
};
|
||||
|
||||
publicUrl = mkOption {
|
||||
type = types.str;
|
||||
default = "http://localhost:5000/";
|
||||
example = "http://sync.example.com/";
|
||||
description = ''
|
||||
Public URL with which firefox users can use to access the sync server.
|
||||
'';
|
||||
};
|
||||
|
||||
allowNewUsers = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to allow new-user signups on the server. Only request by
|
||||
existing accounts will be honored.
|
||||
'';
|
||||
};
|
||||
|
||||
sqlUri = mkOption {
|
||||
type = types.str;
|
||||
default = defaultSqlUri;
|
||||
example = "postgresql://scott:tiger@localhost/test";
|
||||
description = ''
|
||||
The location of the database. This URL is composed of
|
||||
<option>dialect[+driver]://user:password@host/dbname[?key=value..]</option>,
|
||||
where <option>dialect</option> is a database name such as
|
||||
<option>mysql</option>, <option>oracle</option>, <option>postgresql</option>,
|
||||
etc., and <option>driver</option> the name of a DBAPI, such as
|
||||
<option>psycopg2</option>, <option>pyodbc</option>, <option>cx_oracle</option>,
|
||||
etc. The <link
|
||||
xlink:href="http://docs.sqlalchemy.org/en/rel_0_9/core/engines.html#database-urls">
|
||||
SQLAlchemy documentation</link> provides more examples and describe the syntax of
|
||||
the expected URL.
|
||||
'';
|
||||
};
|
||||
|
||||
privateConfig = mkOption {
|
||||
type = types.str;
|
||||
default = "/etc/firefox/syncserver-secret.ini";
|
||||
description = ''
|
||||
The private config file is used to extend the generated config with confidential
|
||||
information, such as the <option>syncserver.sqlUri</option> setting if it contains a
|
||||
password, and the <option>syncserver.secret</option> setting is used by the server to
|
||||
generate cryptographically-signed authentication tokens.
|
||||
|
||||
If this file does not exist, then it is created with a generated
|
||||
<option>syncserver.secret</option> settings.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.syncserver = {
|
||||
after = [ "network.target" ];
|
||||
description = "Firefox Sync Server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [
|
||||
pkgs.coreutils
|
||||
(pkgs.python.withPackages (ps: [ pkgs.syncserver ps.gunicorn ]))
|
||||
];
|
||||
|
||||
serviceConfig = {
|
||||
User = user;
|
||||
Group = group;
|
||||
PermissionsStartOnly = true;
|
||||
};
|
||||
|
||||
preStart = ''
|
||||
if ! test -e ${cfg.privateConfig}; then
|
||||
mkdir -p $(dirname ${cfg.privateConfig})
|
||||
echo > ${cfg.privateConfig} '[syncserver]'
|
||||
chmod 600 ${cfg.privateConfig}
|
||||
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
|
||||
fi
|
||||
chmod 600 ${cfg.privateConfig}
|
||||
chmod 755 $(dirname ${cfg.privateConfig})
|
||||
chown ${user}:${group} ${cfg.privateConfig}
|
||||
|
||||
'' + optionalString (cfg.sqlUri == defaultSqlUri) ''
|
||||
if ! test -e $(dirname ${defaultDbLocation}); then
|
||||
mkdir -m 700 -p $(dirname ${defaultDbLocation})
|
||||
chown ${user}:${group} $(dirname ${defaultDbLocation})
|
||||
fi
|
||||
|
||||
# Move previous database file if it exists
|
||||
oldDb="/var/db/firefox-sync-server.db"
|
||||
if test -f $oldDb; then
|
||||
mv $oldDb ${defaultDbLocation}
|
||||
chown ${user}:${group} ${defaultDbLocation}
|
||||
fi
|
||||
'';
|
||||
|
||||
script = ''
|
||||
gunicorn --paste ${syncServerIni}
|
||||
'';
|
||||
};
|
||||
|
||||
users.users.${user} = {
|
||||
inherit group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
users.groups.${group} = {};
|
||||
};
|
||||
}
|
||||
|
|
@ -224,7 +224,7 @@ let
|
|||
|
||||
i2pdSh = pkgs.writeScriptBin "i2pd" ''
|
||||
#!/bin/sh
|
||||
exec ${pkgs.i2pd}/bin/i2pd \
|
||||
exec ${cfg.package}/bin/i2pd \
|
||||
${if cfg.address == null then "" else "--host="+cfg.address} \
|
||||
--service \
|
||||
--conf=${i2pdConf} \
|
||||
|
|
@ -253,6 +253,15 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.i2pd;
|
||||
defaultText = literalExpression "pkgs.i2pd";
|
||||
description = ''
|
||||
i2pd package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.enum ["debug" "info" "warn" "error"];
|
||||
default = "error";
|
||||
|
|
|
|||
96
nixos/modules/services/networking/tetrd.nix
Normal file
96
nixos/modules/services/networking/tetrd.nix
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
options.services.tetrd.enable = lib.mkEnableOption pkgs.tetrd.meta.description;
|
||||
|
||||
config = lib.mkIf config.services.tetrd.enable {
|
||||
environment = {
|
||||
systemPackages = [ pkgs.tetrd ];
|
||||
etc."resolv.conf".source = "/etc/tetrd/resolv.conf";
|
||||
};
|
||||
|
||||
systemd = {
|
||||
tmpfiles.rules = [ "f /etc/tetrd/resolv.conf - - -" ];
|
||||
|
||||
services.tetrd = {
|
||||
description = pkgs.tetrd.meta.description;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.tetrd}/opt/Tetrd/bin/tetrd";
|
||||
Restart = "always";
|
||||
RuntimeDirectory = "tetrd";
|
||||
RootDirectory = "/run/tetrd";
|
||||
DynamicUser = true;
|
||||
UMask = "006";
|
||||
DeviceAllow = "usb_device";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateMounts = true;
|
||||
PrivateNetwork = lib.mkDefault false;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = lib.mkDefault false;
|
||||
ProtectClock = lib.mkDefault false;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@aio"
|
||||
"~@chown"
|
||||
"~@clock"
|
||||
"~@cpu-emulation"
|
||||
"~@debug"
|
||||
"~@keyring"
|
||||
"~@memlock"
|
||||
"~@module"
|
||||
"~@mount"
|
||||
"~@obsolete"
|
||||
"~@pkey"
|
||||
"~@raw-io"
|
||||
"~@reboot"
|
||||
"~@swap"
|
||||
"~@sync"
|
||||
];
|
||||
|
||||
BindReadOnlyPaths = [
|
||||
builtins.storeDir
|
||||
"/etc/ssl"
|
||||
"/etc/static/ssl"
|
||||
"${pkgs.nettools}/bin/route:/usr/bin/route"
|
||||
"${pkgs.nettools}/bin/ifconfig:/usr/bin/ifconfig"
|
||||
];
|
||||
|
||||
BindPaths = [
|
||||
"/etc/tetrd/resolv.conf:/etc/resolv.conf"
|
||||
"/run"
|
||||
"/var/log"
|
||||
];
|
||||
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_DAC_OVERRIDE"
|
||||
"CAP_NET_ADMIN"
|
||||
];
|
||||
|
||||
AmbientCapabilities = [
|
||||
"CAP_DAC_OVERRIDE"
|
||||
"CAP_NET_ADMIN"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.trac;
|
||||
|
||||
inherit (lib) mkEnableOption mkIf mkOption types;
|
||||
|
||||
in {
|
||||
|
||||
options = {
|
||||
|
||||
services.trac = {
|
||||
enable = mkEnableOption "Trac service";
|
||||
|
||||
listen = {
|
||||
ip = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
description = ''
|
||||
IP address that Trac should listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8000;
|
||||
description = ''
|
||||
Listen port for Trac.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
default = "/var/lib/trac";
|
||||
type = types.path;
|
||||
description = ''
|
||||
The directory for storing the Trac data.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open ports in the firewall for Trac.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.trac = {
|
||||
description = "Trac server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
StateDirectory = baseNameOf cfg.dataDir;
|
||||
ExecStart = ''
|
||||
${pkgs.trac}/bin/tracd -s \
|
||||
-b ${toString cfg.listen.ip} \
|
||||
-p ${toString cfg.listen.port} \
|
||||
${cfg.dataDir}
|
||||
'';
|
||||
};
|
||||
preStart = ''
|
||||
if [ ! -e ${cfg.dataDir}/VERSION ]; then
|
||||
${pkgs.trac}/bin/trac-admin ${cfg.dataDir} initenv Trac "sqlite:db/trac.db"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ cfg.listen.port ];
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
@ -317,7 +317,7 @@ let
|
|||
${optionalString (hasSSL && vhost.sslTrustedCertificate != null) ''
|
||||
ssl_trusted_certificate ${vhost.sslTrustedCertificate};
|
||||
''}
|
||||
${optionalString (hasSSL && vhost.rejectSSL) ''
|
||||
${optionalString vhost.rejectSSL ''
|
||||
ssl_reject_handshake on;
|
||||
''}
|
||||
${optionalString (hasSSL && vhost.kTLS) ''
|
||||
|
|
|
|||
|
|
@ -476,7 +476,6 @@ in
|
|||
tinc = handleTest ./tinc {};
|
||||
tinydns = handleTest ./tinydns.nix {};
|
||||
tor = handleTest ./tor.nix {};
|
||||
trac = handleTest ./trac.nix {};
|
||||
# traefik test relies on docker-containers
|
||||
traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
|
||||
trafficserver = handleTest ./trafficserver.nix {};
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "trac";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ mmahut ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
machine = { ... }: {
|
||||
services.trac.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("trac.service")
|
||||
machine.wait_for_open_port(8000)
|
||||
machine.wait_until_succeeds("curl -fL http://localhost:8000/ | grep 'Trac Powered'")
|
||||
'';
|
||||
})
|
||||
|
|
@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "carla";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "falkTX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WxhG9X6jVcu10bl5p0f61+SYZmJw4W7DYvezbpAlNjg=";
|
||||
sha256 = "sha256-faVLPHPQ4voR/RHiPpUwnZK+5Jx0u4rJWuH5zlydzwY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://kxstudio.sf.net/carla";
|
||||
homepage = "https://kx.studio/Applications:Carla";
|
||||
description = "An audio plugin host";
|
||||
longDescription = ''
|
||||
It currently supports LADSPA (including LRDF), DSSI, LV2, VST2/3
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ stdenv.mkDerivation rec {
|
|||
"-Denable_rtmidi=true"
|
||||
"-Denable_rtaudio=true"
|
||||
"-Denable_sdl=true"
|
||||
"-Dcarla=enabled"
|
||||
"-Dmanpage=true"
|
||||
# "-Duser_manual=true" # needs sphinx-intl
|
||||
"-Dlsp_dsp=disabled"
|
||||
|
|
|
|||
45
pkgs/applications/editors/xedit/default.nix
Normal file
45
pkgs/applications/editors/xedit/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, utilmacros
|
||||
, libX11
|
||||
, libXaw
|
||||
, libXmu
|
||||
, libXt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xedit";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "xorg/app";
|
||||
repo = "xedit";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0b5ic13aasv6zh20v2k7zyxsqbnsxfq5rs3w8nwzl1gklmgrjxa3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ];
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXaw
|
||||
libXmu
|
||||
libXt
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-lispdir=$out/share/X11/xedit/lisp"
|
||||
"--with-appdefaultdir=$out/share/X11/app-defaults"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple graphical text editor using Athena Widgets (Xaw)";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/xedit";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ shamilton ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,31 +1,117 @@
|
|||
{ lib, stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook
|
||||
, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
|
||||
, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
|
||||
, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt
|
||||
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome
|
||||
, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages, gmic, libavif, icu
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, libsoup
|
||||
, graphicsmagick
|
||||
, json-glib
|
||||
, wrapGAppsHook
|
||||
, cairo
|
||||
, cmake
|
||||
, ninja
|
||||
, curl
|
||||
, perl
|
||||
, llvm_13
|
||||
, desktop-file-utils
|
||||
, exiv2
|
||||
, glib
|
||||
, ilmbase
|
||||
, gtk3
|
||||
, intltool
|
||||
, lcms2
|
||||
, lensfun
|
||||
, libX11
|
||||
, libexif
|
||||
, libgphoto2
|
||||
, libjpeg
|
||||
, libpng
|
||||
, librsvg
|
||||
, libtiff
|
||||
, openexr_3
|
||||
, osm-gps-map
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, libxslt
|
||||
, openjpeg
|
||||
, pugixml
|
||||
, colord
|
||||
, colord-gtk
|
||||
, libwebp
|
||||
, libsecret
|
||||
, gnome
|
||||
, SDL2
|
||||
, ocl-icd
|
||||
, pcre
|
||||
, gtk-mac-integration
|
||||
, isocodes
|
||||
, llvmPackages
|
||||
, gmic
|
||||
, libavif
|
||||
, icu
|
||||
, jasper
|
||||
, libheif
|
||||
, libaom
|
||||
, portmidi
|
||||
, fetchpatch
|
||||
, lua5_4
|
||||
, ...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.6.1";
|
||||
version = "3.8.0";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "sha256-or/HwQO4JJRUV6m/7Z5S8Af6HQMPnbyz/wMnhRvkLRQ=";
|
||||
sha256 = "01gp9dg5wr2rg1k8cqs0l3s7ism8a4q8qypgwccd4jh7ip3wfr9f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif
|
||||
libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
|
||||
libsoup graphicsmagick json-glib openjpeg lua pugixml
|
||||
libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes gmic libavif icu
|
||||
cairo
|
||||
curl
|
||||
exiv2
|
||||
glib
|
||||
gtk3
|
||||
ilmbase
|
||||
lcms2
|
||||
lensfun
|
||||
libexif
|
||||
libgphoto2
|
||||
libjpeg
|
||||
libpng
|
||||
librsvg
|
||||
libtiff
|
||||
openexr_3
|
||||
sqlite
|
||||
libxslt
|
||||
libsoup
|
||||
graphicsmagick
|
||||
json-glib
|
||||
openjpeg
|
||||
pugixml
|
||||
libwebp
|
||||
libsecret
|
||||
SDL2
|
||||
gnome.adwaita-icon-theme
|
||||
osm-gps-map
|
||||
pcre
|
||||
isocodes
|
||||
gmic
|
||||
libavif
|
||||
icu
|
||||
jasper
|
||||
libheif
|
||||
libaom
|
||||
portmidi
|
||||
lua5_4
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
colord colord-gtk libX11 ocl-icd
|
||||
colord
|
||||
colord-gtk
|
||||
libX11
|
||||
ocl-icd
|
||||
] ++ lib.optional stdenv.isDarwin gtk-mac-integration
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_USERMANUAL=False"
|
||||
|
|
@ -34,29 +120,39 @@ stdenv.mkDerivation rec {
|
|||
"-DUSE_KWALLET=OFF"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# This is merged in darktable master and will hopefully be in 3.8.1
|
||||
name = "cmake-fix.patch";
|
||||
url = "https://github.com/darktable-org/darktable/commit/58d247f7ebea76c55fa2525beb9f5ce092c6670d.patch";
|
||||
sha256 = "11fn6d2mwlapbf1zbyv6bhgv29kxcwrs7cnbway0rnl9nj8wimf2";
|
||||
})
|
||||
];
|
||||
|
||||
# darktable changed its rpath handling in commit
|
||||
# 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
|
||||
# binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in
|
||||
# the wrappers:
|
||||
preFixup = let
|
||||
libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||
libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib";
|
||||
in ''
|
||||
for f in $out/share/darktable/kernels/*.cl; do
|
||||
sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f"
|
||||
done
|
||||
preFixup =
|
||||
let
|
||||
libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||
libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib";
|
||||
in
|
||||
''
|
||||
for f in $out/share/darktable/kernels/*.cl; do
|
||||
sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f"
|
||||
done
|
||||
|
||||
gappsWrapperArgs+=(
|
||||
--prefix ${libPathEnvVar} ":" "${libPathPrefix}"
|
||||
)
|
||||
'';
|
||||
gappsWrapperArgs+=(
|
||||
--prefix ${libPathEnvVar} ":" "${libPathPrefix}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Virtual lighttable and darkroom for photographers";
|
||||
homepage = "https://www.darktable.org";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ goibhniu flosse mrVanDalo ];
|
||||
maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
37
pkgs/applications/misc/HentaiAtHome/default.nix
Normal file
37
pkgs/applications/misc/HentaiAtHome/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ buildGraalvmNativeImage, fetchzip, graalvm17-ce, lib }:
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "HentaiAtHome";
|
||||
version = "1.6.1";
|
||||
src = fetchzip {
|
||||
url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}.zip";
|
||||
hash =
|
||||
"sha512-nGGCuVovj4NJGrihKKYXnh0Ic9YD36o7r6wv9zSivZn22zm8lBYVXP85LnOw2z9DiJARivOctQGl48YFD7vxOQ==";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
jar = "${src}/HentaiAtHome.jar";
|
||||
dontUnpack = true;
|
||||
|
||||
graalvm = graalvm17-ce;
|
||||
extraNativeImageBuildArgs = [
|
||||
"--enable-url-protocols=http,https"
|
||||
"--install-exit-handlers"
|
||||
"--no-fallback"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
pushd $(mktemp -d)
|
||||
$out/bin/HentaiAtHome
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ehwiki.org/wiki/Hentai@Home";
|
||||
description =
|
||||
"Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ terrorjack ];
|
||||
};
|
||||
}
|
||||
|
|
@ -27,20 +27,25 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "calibre";
|
||||
version = "5.33.2";
|
||||
version = "5.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-wtt3ucCaFq9wLk79CeCz20tMM6AbLtZ4Ln6TxOx0dvI=";
|
||||
hash = "sha256-1NQB7vrcU0hR308/8keUn/rHhdvJk5Ab0pOMPyiU1+M=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/5.33.2+dfsg-1
|
||||
# https://sources.debian.org/patches/calibre/${version}+dfsg-1
|
||||
patches = [
|
||||
# allow for plugin update check, but no calibre version check
|
||||
(fetchpatch {
|
||||
name = "0001-only-plugin-update.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch";
|
||||
sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA=";
|
||||
sha256 = "sha256:1h2hl4z9qm17crms4d1lq2cq44cnxbga1dv6qckhxvcg6pawxg3l";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0007-Hardening-Qt-code.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch";
|
||||
sha256 = "sha256:18wps7fn0cpzb7gf78f15pmbaff4vlygc9g00hq7zynfa4pcgfdg";
|
||||
})
|
||||
]
|
||||
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "ddcui";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockowitz";
|
||||
repo = "ddcui";
|
||||
rev = "v${version}";
|
||||
sha256 = "0myma1zw6dlygv3xbin662d91zcnwss10syf12q2fppkrd8qdgqf";
|
||||
sha256 = "sha256-dp6D5GHpo0PJILnzZDKLnEPgQQ7980dI/6RV5ws3RTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.2";
|
||||
version = "2.4.5";
|
||||
pname = "makeself";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "makeself";
|
||||
rev = "release-${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
|
||||
sha256 = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g=";
|
||||
};
|
||||
|
||||
postPatch = "patchShebangs test";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "4.2.8";
|
||||
version = "4.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
sha256 = "sha256-bbGFSy2ZuUtFWyAgje6s+RSQ6S7NZGAhjvZMbIWfYhE=";
|
||||
sha256 = "sha256-YxUozMrsR65A7+xeerMaYxkGALobG1wLguWGZnoQYcU=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "urlscan";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecat53";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Wg1QecSMyifID9uIvVWrmkHax4FbbwEcoXIZ8V8P3FU=";
|
||||
sha256 = "sha256-KQXEiDg5KRCMFFyDlR8D6CQTxRdIZx4/U1csTFCr0sU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -52,14 +52,44 @@ let
|
|||
automated-providers = lib.mapAttrs (_: attrs: mkProvider attrs) list;
|
||||
|
||||
# These are the providers that don't fall in line with the default model
|
||||
special-providers = {
|
||||
special-providers = let archived = throw "the provider has been archived by upsteam"; in {
|
||||
# Packages that don't fit the default model
|
||||
gandi = callPackage ./gandi { };
|
||||
libvirt = callPackage ./libvirt { };
|
||||
teleport = callPackage ./teleport { };
|
||||
vpsadmin = callPackage ./vpsadmin { };
|
||||
} // (lib.optionalAttrs (config.allowAliases or false) {
|
||||
arukas = archived; # added 2022/01
|
||||
bitbucket = archived; # added 2022/01
|
||||
chef = archived; # added 2022/01
|
||||
cherryservers = archived; # added 2022/01
|
||||
clc = archived; # added 2022/01
|
||||
cobbler = archived; # added 2022/01
|
||||
cohesity = archived; # added 2022/01
|
||||
dyn = archived; # added 2022/01
|
||||
genymotion = archived; # added 2022/01
|
||||
hedvig = archived; # added 2022/01
|
||||
ignition = archived; # added 2022/01
|
||||
incapsula = archived; # added 2022/01
|
||||
influxdb = archived; # added 2022/01
|
||||
jdcloud = archived; # added 2022/01
|
||||
kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";
|
||||
librato = archived; # added 2022/01
|
||||
logentries = archived; # added 2022/01
|
||||
metalcloud = archived; # added 2022/01
|
||||
mysql = archived; # added 2022/01
|
||||
nixos = archived; # added 2022/01
|
||||
oneandone = archived; # added 2022/01
|
||||
packet = archived; # added 2022/01
|
||||
profitbricks = archived; # added 2022/01
|
||||
pureport = archived; # added 2022/01
|
||||
rancher = archived; # added 2022/01
|
||||
rightscale = archived; # added 2022/01
|
||||
runscope = archived; # added 2022/01
|
||||
softlayer = archived; # added 2022/01
|
||||
telefonicaopencloud = archived; # added 2022/01
|
||||
terraform = archived; # added 2022/01
|
||||
ultradns = archived; # added 2022/01
|
||||
});
|
||||
in
|
||||
automated-providers // special-providers // { inherit mkProvider; }
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p jq
|
||||
#! nix-shell -I nixpkgs=../../../../.. -i bash -p jq
|
||||
# shellcheck shell=bash
|
||||
|
||||
# Update all providers which have specified provider source address
|
||||
|
|
@ -14,9 +14,9 @@ providers=$(
|
|||
)
|
||||
|
||||
echo "Will update providers:"
|
||||
echo "$providers"
|
||||
echo "${providers}"
|
||||
|
||||
for provider in $providers; do
|
||||
echo "Updating $provider"
|
||||
./update-provider "$provider"
|
||||
for provider in ${providers}; do
|
||||
echo "Updating ${provider}"
|
||||
./update-provider "${provider}"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix
|
||||
#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix nix-prefetch
|
||||
# shellcheck shell=bash
|
||||
# vim: ft=sh
|
||||
#
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
# provider source address.
|
||||
#
|
||||
set -euo pipefail
|
||||
shopt -s inherit_errexit
|
||||
|
||||
show_usage() {
|
||||
cat <<DOC
|
||||
|
|
@ -57,36 +58,37 @@ while [[ $# -gt 0 ]]; do
|
|||
shift 2
|
||||
;;
|
||||
*)
|
||||
if [[ -n "$provider" ]]; then
|
||||
echo "ERROR: provider name was passed two times: '$provider' and '$1'"
|
||||
if [[ -n ${provider} ]]; then
|
||||
echo "ERROR: provider name was passed two times: '${provider}' and '$1'"
|
||||
echo "Use --help for more info"
|
||||
exit 1
|
||||
fi
|
||||
provider=$1
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -z "$provider" ]]; then
|
||||
if [[ -z ${provider} ]]; then
|
||||
echo "ERROR: No providers specified!"
|
||||
echo
|
||||
show_usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
provider_name=$(basename "$provider")
|
||||
provider_name=$(basename "${provider}")
|
||||
|
||||
# Usage: read_attr <key>
|
||||
read_attr() {
|
||||
jq -r ".\"$provider_name\".\"$1\"" providers.json
|
||||
jq -r ".\"${provider_name}\".\"$1\"" providers.json
|
||||
}
|
||||
|
||||
# Usage: update_attr <key> <value>
|
||||
update_attr() {
|
||||
if [[ "$2" == "null" ]]; then
|
||||
jq -S ".\"$provider_name\".\"$1\" = null" providers.json | sponge providers.json
|
||||
if [[ $2 == "null" ]]; then
|
||||
jq -S ".\"${provider_name}\".\"$1\" = null" providers.json | sponge providers.json
|
||||
else
|
||||
jq -S ".\"$provider_name\".\"$1\" = \"$2\"" providers.json | sponge providers.json
|
||||
jq -S ".\"${provider_name}\".\"$1\" = \"$2\"" providers.json | sponge providers.json
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -96,23 +98,23 @@ prefetch_github() {
|
|||
local owner=$1
|
||||
local repo=$2
|
||||
local rev=$3
|
||||
nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"
|
||||
nix-prefetch-url --unpack "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"
|
||||
}
|
||||
|
||||
old_source_address="$(read_attr provider-source-address)"
|
||||
old_vendor_sha256=$(read_attr vendorSha256)
|
||||
old_version=$(read_attr version)
|
||||
|
||||
if [[ $provider =~ ^[^/]+/[^/]+$ ]]; then
|
||||
source_address=registry.terraform.io/$provider
|
||||
if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then
|
||||
source_address=registry.terraform.io/${provider}
|
||||
else
|
||||
source_address=$old_source_address
|
||||
source_address=${old_source_address}
|
||||
fi
|
||||
if [[ "$source_address" == "null" ]]; then
|
||||
echo "Could not find the source address for provider: $provider"
|
||||
if [[ ${source_address} == "null" ]]; then
|
||||
echo "Could not find the source address for provider: ${provider}"
|
||||
exit 1
|
||||
fi
|
||||
update_attr "provider-source-address" "$source_address"
|
||||
update_attr "provider-source-address" "${source_address}"
|
||||
|
||||
# The provider source address (used inside Terraform `required_providers` block) is
|
||||
# used to compute the registry API endpoint
|
||||
|
|
@ -122,58 +124,43 @@ update_attr "provider-source-address" "$source_address"
|
|||
# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API)
|
||||
registry_response=$(curl -s https://"${source_address/\///v1/providers/}")
|
||||
|
||||
version="$(jq -r '.version' <<< "$registry_response")"
|
||||
if [[ "$old_version" = "$version" && "$force" != 1 && -z "$vendorSha256" && "$old_vendor_sha256" != "$vendorSha256" ]]; then
|
||||
echo "$provider_name is already at version $version"
|
||||
version="$(jq -r '.version' <<<"${registry_response}")"
|
||||
if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then
|
||||
echo "${provider_name} is already at version ${version}"
|
||||
exit
|
||||
fi
|
||||
update_attr version "$version"
|
||||
update_attr version "${version}"
|
||||
|
||||
provider_source_url="$(jq -r '.source' <<< "$registry_response")"
|
||||
provider_source_url="$(jq -r '.source' <<<"${registry_response}")"
|
||||
|
||||
org="$(echo "$provider_source_url" | cut -d '/' -f 4)"
|
||||
update_attr owner "$org"
|
||||
repo="$(echo "$provider_source_url" | cut -d '/' -f 5)"
|
||||
update_attr repo "$repo"
|
||||
rev="$(jq -r '.tag' <<< "$registry_response")"
|
||||
update_attr rev "$rev"
|
||||
sha256=$(prefetch_github "$org" "$repo" "$rev")
|
||||
update_attr sha256 "$sha256"
|
||||
org="$(echo "${provider_source_url}" | cut -d '/' -f 4)"
|
||||
update_attr owner "${org}"
|
||||
repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)"
|
||||
update_attr repo "${repo}"
|
||||
rev="$(jq -r '.tag' <<<"${registry_response}")"
|
||||
update_attr rev "${rev}"
|
||||
sha256=$(prefetch_github "${org}" "${repo}" "${rev}")
|
||||
update_attr sha256 "${sha256}"
|
||||
|
||||
repo_root=$(git rev-parse --show-toplevel)
|
||||
|
||||
if [[ -z "$vendorSha256" ]]; then
|
||||
if [[ "$old_vendor_sha256" == null ]]; then
|
||||
if [[ -z ${vendorSha256} ]]; then
|
||||
if [[ ${old_vendor_sha256} == null ]]; then
|
||||
vendorSha256=null
|
||||
elif [[ -n "$old_vendor_sha256" || "$vendor" = 1 ]]; then
|
||||
elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then
|
||||
echo "=== Calculating vendorSha256 ==="
|
||||
update_attr vendorSha256 "0000000000000000000000000000000000000000000000000000000000000000"
|
||||
# Hackish way to find out the desired sha256. First build, then extract the
|
||||
# error message from the logs.
|
||||
set +e
|
||||
nix-build --no-out-link "$repo_root" -A "terraform-providers.$provider_name.go-modules" 2>vendor_log.txt
|
||||
set -e
|
||||
logs=$(< vendor_log.txt)
|
||||
if ! [[ $logs =~ got:\ +([^\ ]+) ]]; then
|
||||
echo "ERROR: could not find new hash in output:"
|
||||
cat vendor_log.txt
|
||||
rm -f vendor_log.txt
|
||||
exit 1
|
||||
fi
|
||||
rm -f vendor_log.txt
|
||||
# trim the results in case it they have a sha256: prefix or contain more than one line
|
||||
vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1)
|
||||
vendorSha256=$(nix-prefetch "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")
|
||||
# Deal with nix unstable
|
||||
if [[ $vendorSha256 = sha256-* ]]; then
|
||||
vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "$vendorSha256")
|
||||
if [[ ${vendorSha256} == sha256-* ]]; then
|
||||
vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}")
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n "$vendorSha256" ]]; then
|
||||
update_attr vendorSha256 "$vendorSha256"
|
||||
if [[ -n ${vendorSha256} ]]; then
|
||||
update_attr vendorSha256 "${vendorSha256}"
|
||||
fi
|
||||
|
||||
# Check that the provider builds
|
||||
echo "=== Building terraform-providers.$provider_name ==="
|
||||
nix-build "$repo_root" -A "terraform-providers.$provider_name"
|
||||
echo "=== Building terraform-providers.${provider_name} ==="
|
||||
nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.9.7",
|
||||
"version": "1.9.8",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
@ -52,9 +52,10 @@
|
|||
"@types/auto-launch": "^5.0.1",
|
||||
"@types/counterpart": "^0.18.1",
|
||||
"@types/minimist": "^1.2.1",
|
||||
"@typescript-eslint/eslint-plugin": "^4.17.0",
|
||||
"@typescript-eslint/parser": "^4.17.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.6.0",
|
||||
"@typescript-eslint/parser": "^5.6.0",
|
||||
"allchange": "^1.0.6",
|
||||
"app-builder-lib": "^22.14.10",
|
||||
"asar": "^2.0.1",
|
||||
"chokidar": "^3.5.2",
|
||||
"electron": "13.5",
|
||||
|
|
@ -75,7 +76,7 @@
|
|||
"pacote": "^11.3.5",
|
||||
"rimraf": "^3.0.2",
|
||||
"tar": "^6.1.2",
|
||||
"typescript": "^4.1.3"
|
||||
"typescript": "^4.5.3"
|
||||
},
|
||||
"hakDependencies": {
|
||||
"matrix-seshat": "^2.3.0",
|
||||
|
|
@ -83,7 +84,6 @@
|
|||
},
|
||||
"build": {
|
||||
"appId": "im.riot.app",
|
||||
"electronVersion": "13.5.2",
|
||||
"files": [
|
||||
"package.json",
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.9.7",
|
||||
"desktopSrcHash": "bUzIIPNVgK2whQJoEZOaoa+jsJx4No+xji6hXK6wxFY=",
|
||||
"desktopYarnHash": "1n9dqpvq31k94mx5s1dgqavaxdd0jrzcwdx106c5dnq6xnxs941p",
|
||||
"webHash": "1fx1nznqbwvs84kpc239ms9kpzy9p72hrz3qqbzay8p9x4gc1ws3"
|
||||
"version": "1.9.8",
|
||||
"desktopSrcHash": "o6SICu7QDdBv9WXDconkypQRj3TbrU4ZAxayO9yemvc=",
|
||||
"desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18",
|
||||
"webHash": "141fqvh4d5lwm692yc8mfwrlvqnfixvc7vlbfis86qi557vq6ljq"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ in
|
|||
mkFranzDerivation' rec {
|
||||
pname = "ferdi";
|
||||
name = "Ferdi";
|
||||
version = "5.6.4";
|
||||
version = "5.6.5";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
||||
sha256 = "sha256-y3kuhSWoGysGkvDTV+bze6LSXVO4uDfDOos64eSYFf0=";
|
||||
sha256 = "sha256-JeFPvU4xXHcv6/ApCDkejYWfA8lqsxwoFXnqIiOQ0+Y=";
|
||||
};
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "psi-plus";
|
||||
version = "1.5.1582";
|
||||
version = "1.5.1596";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "psi-plus-snapshots";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZMJxGxwDuY2fW+W68JiH0X+FpowdAPm70EQ9pHNnrG4=";
|
||||
sha256 = "sha256-8GnENdoFgFa+pDN8C+W5qoFxsCE7tl3dUHf5TBipo5g=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
85
pkgs/applications/networking/tetrd/default.nix
Normal file
85
pkgs/applications/networking/tetrd/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, c-ares
|
||||
, ffmpeg
|
||||
, libevent
|
||||
, libvpx
|
||||
, libxslt
|
||||
, xorg
|
||||
, minizip
|
||||
, nss
|
||||
, re2
|
||||
, snappy
|
||||
, libnotify
|
||||
, libappindicator-gtk3
|
||||
, libappindicator
|
||||
, udev
|
||||
, mesa # required for libgbm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tetrd";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20211130190525/https://download.tetrd.app/files/tetrd.linux_amd64.pkg.tar.xz";
|
||||
sha256 = "1bxp7rg2dm9nnvkgg48xd156d0jgdf35flaw0bwzkkh3zz9ysry2";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
c-ares
|
||||
ffmpeg
|
||||
libevent
|
||||
libvpx
|
||||
libxslt
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXdamage
|
||||
xorg.libXtst
|
||||
minizip
|
||||
nss
|
||||
re2
|
||||
snappy
|
||||
libnotify
|
||||
libappindicator-gtk3
|
||||
libappindicator
|
||||
udev
|
||||
mesa
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt
|
||||
cp -r $sourceRoot/opt/Tetrd $out/opt
|
||||
cp -r $sourceRoot/usr/share $out
|
||||
|
||||
wrapProgram $out/opt/Tetrd/tetrd \
|
||||
--prefix LD_LIBRARY_PATH ":" ${lib.makeLibraryPath buildInputs}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/share/applications/tetrd.desktop --replace /opt $out/opt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Share your internet connection from your device to your PC and vice versa through a USB cable";
|
||||
homepage = "https://tetrd.app";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ Madouura ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tqsl";
|
||||
version = "2.5.7";
|
||||
version = "2.5.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-0QlTUNwKeuuR+n8eT04kiywAsY3hrPGPYH1A84MmxIs=";
|
||||
sha256 = "sha256-flv7tI/SYAxxJsHFa3QUgnO0glAAQF87EgP4wyTWnNU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stacks";
|
||||
version = "2.59";
|
||||
version = "2.60";
|
||||
src = fetchurl {
|
||||
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-pVFwb4EPba9wL9kDGN2gi7aeH+sPhDG/XLyHxqG4zd4=";
|
||||
sha256 = "sha256-ppKG7Z1TyLwUyqRnGYk3QWPJqKeNcW04GMW7myPFSNM=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{buildPythonPackage, lib, fetchFromGitHub, statistics}:
|
||||
{ python3, lib, fetchFromGitHub }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "xenomapper";
|
||||
version = "1.0.2";
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ statistics ];
|
||||
propagatedBuildInputs = with python3.pkgs; [ statistics ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/genomematt/xenomapper";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, which }:
|
||||
{ lib, stdenv, fetchurl, which, enableHO ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eprover";
|
||||
|
|
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--exec-prefix=$(out)"
|
||||
"--man-prefix=$(out)/share/man"
|
||||
] ++ lib.optionals enableHO [
|
||||
"--enable-ho"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, veriT, rlwrap, makeDesktopItem }:
|
||||
{ lib, stdenv, fetchurl, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }:
|
||||
# nettools needed for hostname
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl polyml z3 veriT ]
|
||||
buildInputs = [ polyml z3 veriT vampire eprover-ho ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
|
||||
|
||||
sourceRoot = dirname;
|
||||
|
|
@ -37,6 +36,17 @@ stdenv.mkDerivation rec {
|
|||
ISABELLE_VERIT=${veriT}/bin/veriT
|
||||
EOF
|
||||
|
||||
cat >contrib/e-*/etc/settings <<EOF
|
||||
E_HOME=${eprover-ho}/bin
|
||||
E_VERSION=${eprover-ho.version}
|
||||
EOF
|
||||
|
||||
cat >contrib/vampire-*/etc/settings <<EOF
|
||||
VAMPIRE_HOME=${vampire}/bin
|
||||
VAMPIRE_VERSION=${vampire.version}
|
||||
VAMPIRE_EXTRA_OPTIONS="--mode casc"
|
||||
EOF
|
||||
|
||||
cat >contrib/polyml-*/etc/settings <<EOF
|
||||
ML_SYSTEM_64=true
|
||||
ML_SYSTEM=${polyml.name}
|
||||
|
|
@ -56,12 +66,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
|
||||
|
||||
for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-*; do
|
||||
for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do
|
||||
rm -rf $comp/x86*
|
||||
done
|
||||
'' + (if ! stdenv.isLinux then "" else ''
|
||||
arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"}
|
||||
for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do
|
||||
for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS}; do
|
||||
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"
|
||||
done
|
||||
'');
|
||||
|
|
|
|||
|
|
@ -2,23 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpoly";
|
||||
version = "0.1.10";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SRI-CSL";
|
||||
repo = "libpoly";
|
||||
# they've pushed to the release branch, use explicit tag
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-22Y4L5NFnCzKwZt0A/ChMuGPU4Dk1Qyke6mdvfN063w=";
|
||||
sha256 = "sha256-vrYB6RQYShipZ0c0j1KcSTJR1h0rQKAAeJvODMar1GM=";
|
||||
};
|
||||
|
||||
# https://github.com/SRI-CSL/libpoly/pull/52
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/CMakeLists.txt --replace \
|
||||
'"utils/open_memstream.c ''${poly_SOURCES}"' \
|
||||
'utils/open_memstream.c ''${poly_SOURCES}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ gmp python3 ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vampire";
|
||||
version = "4.5.1";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vprover";
|
||||
repo = "vampire";
|
||||
rev = version;
|
||||
sha256 = "0q9gqyq96amdnhxgwjyv0r2sxakikp3jvmizgj2h0spfz643p8db";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z71nxjak3ibp842r8iv37w1x3cbkrmjs88lpvxqb4sgrbyk38zd";
|
||||
};
|
||||
|
||||
buildInputs = [ z3 zlib ];
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://vprover.github.io/";
|
||||
description = "The Vampire Theorem Prover";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.unfree;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "yices";
|
||||
# We never want X.Y.${odd} versions as they are moving development tags.
|
||||
version = "2.6.2";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SRI-CSL";
|
||||
repo = "yices2";
|
||||
rev = "Yices-${version}";
|
||||
sha256 = "1jx3854zxvfhxrdshbipxfgyq1yxb9ll9agjc2n0cj4vxkjyh9mn";
|
||||
sha256 = "sha256-qdxh86CkKdm65oHcRgaafTG9GUOoIgTDjeWmRofIpNE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, ocaml ? null
|
||||
, findlib ? null
|
||||
, zarith ? null
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
assert javaBindings -> jdk != null;
|
||||
|
|
@ -19,13 +20,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "z3";
|
||||
version = "4.8.12";
|
||||
version = "4.8.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Z3Prover";
|
||||
repo = pname;
|
||||
rev = "z3-${version}";
|
||||
sha256 = "1wbcdc7h3mag8infspvxxja2hiz4igjwxzvss2kqar1rjj4ivfx0";
|
||||
sha256 = "jPSTVSndp/T7n+VxZ/g9Rjco00Up+9xeDIVkeLl1MTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
|
@ -67,6 +68,23 @@ stdenv.mkDerivation rec {
|
|||
++ optional javaBindings "java"
|
||||
++ optional ocamlBindings "ocaml";
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update-z3" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl jq
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
# Expect tags in format
|
||||
# [{name: "Nightly", ..., {name: "z3-vv.vv.vv", ...].
|
||||
# Below we extract frst "z3-vv.vv" and drop "z3-" prefix.
|
||||
newVersion="$(curl -s https://api.github.com/repos/Z3Prover/z3/releases |
|
||||
jq 'first(.[].name|select(startswith("z3-"))|ltrimstr("z3-"))' --raw-output
|
||||
)"
|
||||
update-source-version ${pname} "$newVersion"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-performance theorem prover and SMT solver";
|
||||
homepage = "https://github.com/Z3Prover/z3";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20211204-082213-a66c61ee9";
|
||||
version = "20220101-133340-7edc5b5a";
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
|||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-QKtnOpAW4exDQEFSN0b04hA6TYuC+/C5nIYHCNzfuso=";
|
||||
sha256 = "sha256-UZCvKbZdZ7K4RtvVLmr44M612tqd4rkrjF2tys0JHNM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
|||
rm -r wezterm-ssh/tests
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-qSThjV6oBD6joDM0Eppo7z0SL8GHV5SaCaAwXmUIT3I=";
|
||||
cargoSha256 = "1imil15n9mf1r71qdp4cb4q7kzrrc2cspml0d54825yqaq8vjhsc";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.15.7";
|
||||
version = "1.15.9";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-Ckg8XKCPnyp4a0kXJrqju2jAJvD4tzjomaeJxlFwYzg=";
|
||||
sha256 = "sha256-DzPgAy7Curypc/66c1NqYSHFgtovpY5qEq/Le+0VYk4=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ assert !withQT -> default != "qt5";
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avidemux";
|
||||
version = "2.7.8";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
|
||||
sha256 = "sha256-YopAT1If8oEnYHAK4+KqeOWBaw/z+2/QWsPnUkjZdAE=";
|
||||
sha256 = "sha256-0exvUnflEijs8O4cqJ+uJMWR9SD4fOlvq+yIGNBN4zs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-hdhomerun";
|
||||
namespace = "pvr.hdhomerun";
|
||||
version = "19.0.1";
|
||||
version = "19.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hdhomerun";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-WeokXU4HY22SzL1djORzru5Hju58Ix0+InwZDr++FC8=";
|
||||
sha256 = "sha256-iFAOoQvZAdvJvN8FBg2w+oZWtr8mYdBQ3QX58HLmBho=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ jsoncpp libhdhomerun ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-hts";
|
||||
namespace = "pvr.hts";
|
||||
version = "19.0.3";
|
||||
version = "19.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hts";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-kO+wRFt4MudYP9UOTaruRCWs/QMla+BYTRfSUdlVpR8=";
|
||||
sha256 = "sha256-WP/eaE3qO0NqN23dHkFOiOjoeKIglbbHofqnUsfxSfI=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "19.0.2";
|
||||
version = "19.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-WPLXESP5QvjroCygzMQc3+QKbsA05ri0oKvsqBQv8w0=";
|
||||
sha256 = "sha256-LQP+yPHPOjgvW7LQmqrp15NWFBVdnrGOSGm37N8AsHg=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
|
||||
{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
|
|
@ -23,6 +23,15 @@ buildKodiAddon rec {
|
|||
};
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch can be removed once https://github.com/anxdpanic/plugin.video.youtube/pull/260 has been merged.
|
||||
(fetchpatch {
|
||||
name = "fix-addon-path";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/anxdpanic/plugin.video.youtube/pull/260.patch";
|
||||
sha256 = "11c9sfwl5kvfll2jws5b4i46s60v6gkfns4al13p4m5ch9rk06hs";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/anxdpanic/plugin.video.youtube";
|
||||
description = "YouTube is one of the biggest video-sharing websites of the world";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ toKodiAddon (stdenv.mkDerivation ({
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cd $src/$sourceDir
|
||||
cd ./$sourceDir
|
||||
d=$out${addonDir}/${namespace}
|
||||
mkdir -p $d
|
||||
sauce="."
|
||||
|
|
|
|||
|
|
@ -47,13 +47,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkvtoolnix";
|
||||
version = "63.0.0";
|
||||
version = "64.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0jniy2kkg4fkrgyw2k8jcpq872qzkrxkbpbc7ksadm2rdygsa3xh";
|
||||
sha256 = "sha256-tg9rjTbprcVkzUUVWCKqF1dzIjFKjzIqrVADtuUU9Fk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "21.7.0";
|
||||
version = "21.10.0";
|
||||
pname = "smtube";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-d+R3eM2BPdrsY7XX+6IWpz6cKIy/L2x0iLZH0mTgfcc=";
|
||||
sha256 = "sha256-ZQIUAi/YC+zsYHVhlprZ5K6NGvT6LojmdQ1Z+WCg1lU=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-RzAQnuOjT8eMH+rJm+/JrF96PZbCgzDVNPQYUeXPWnY=";
|
||||
|
||||
ldflags = ["-X github.com/docker/compose/v2/internal.Version=${version}"];
|
||||
|
||||
doCheck = false;
|
||||
installPhase = ''
|
||||
install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
|
||||
, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio
|
||||
, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2, SDL2_image
|
||||
, jackSupport ? !stdenv.isDarwin && !nixosTestRunner, libjack2
|
||||
, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook
|
||||
, vncSupport ? !nixosTestRunner, libjpeg, libpng
|
||||
, smartcardSupport ? !nixosTestRunner, libcacard
|
||||
|
|
@ -35,7 +36,8 @@
|
|||
let
|
||||
audio = lib.optionalString alsaSupport "alsa,"
|
||||
+ lib.optionalString pulseSupport "pa,"
|
||||
+ lib.optionalString sdlSupport "sdl,";
|
||||
+ lib.optionalString sdlSupport "sdl,"
|
||||
+ lib.optionalString jackSupport "jack,";
|
||||
|
||||
in
|
||||
|
||||
|
|
@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals alsaSupport [ alsa-lib ]
|
||||
++ lib.optionals pulseSupport [ libpulseaudio ]
|
||||
++ lib.optionals sdlSupport [ SDL2 SDL2_image ]
|
||||
++ lib.optionals jackSupport [ libjack2 ]
|
||||
++ lib.optionals gtkSupport [ gtk3 gettext vte ]
|
||||
++ lib.optionals vncSupport [ libjpeg libpng ]
|
||||
++ lib.optionals smartcardSupport [ libcacard ]
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ args @ {
|
|||
, extraInstallCommands ? ""
|
||||
, meta ? {}
|
||||
, passthru ? {}
|
||||
, extraBwrapArgs ? []
|
||||
, unshareUser ? true
|
||||
, unshareIpc ? true
|
||||
, unsharePid ? true
|
||||
|
|
@ -23,7 +24,7 @@ let
|
|||
buildFHSEnv = callPackage ./env.nix { };
|
||||
|
||||
env = buildFHSEnv (removeAttrs args [
|
||||
"runScript" "extraInstallCommands" "meta" "passthru" "dieWithParent"
|
||||
"runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
|
||||
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
|
||||
]);
|
||||
|
||||
|
|
@ -169,6 +170,7 @@ let
|
|||
"''${ro_mounts[@]}"
|
||||
"''${symlinks[@]}"
|
||||
"''${auto_mounts[@]}"
|
||||
${concatStringsSep "\n " extraBwrapArgs}
|
||||
${init runScript}/bin/${name}-init ${initArgs}
|
||||
)
|
||||
exec "''${cmd[@]}"
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ stdenvNoCC.mkDerivation {
|
|||
# New-style output content requirements.
|
||||
inherit (hash_) outputHashAlgo outputHash;
|
||||
|
||||
SSL_CERT_FILE = if hash_.outputHash == ""
|
||||
SSL_CERT_FILE = if (hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash)
|
||||
then "${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
else "/no-cert-file.crt";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unicode-character-database";
|
||||
version = "13.0.0";
|
||||
version = "14.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
|
||||
sha256 = "0ld97ppkb5f8d5b3mlkxfwnr6f3inijyqias9xc4bbin9lxrfxig";
|
||||
sha256 = "sha256-AzpSdrXXr4hEWJ+ONILzl3qDhecdEH03UFVGUXjCNgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pix";
|
||||
version = "2.8.0";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-m508pkbiSVuIaEx7EznOd5QTkpM66TBbpM5HRkjKRQA=";
|
||||
sha256 = "sha256-yB8nLGvJZOViD+i4IkKN0yCDl5wRCvEbjzPDs7ZRMNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "adoptopenjdk-icedtea-web";
|
||||
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdoptOpenJDK";
|
||||
repo = "IcedTea-Web";
|
||||
rev = "icedtea-web-${version}";
|
||||
sha256 = "sha256-XY6S1IvDqPxkYgFs7kB9AR0zQ4n3COVbS2lUT5mhTVc=";
|
||||
sha256 = "sha256-hpEVWG9ltNDL/0EFJjgQRRce+BLcCO4ZERULYZxyC1o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config bc ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aspectj";
|
||||
version = "1.9.6";
|
||||
version = "1.9.7";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = let
|
||||
versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
|
||||
in fetchurl {
|
||||
url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
|
||||
sha256 = "02jh66l3vw57k9a4dxlga3qh3487r36gyi6k2z2mmqxbpqajslja";
|
||||
sha256 = "sha256-xrg88nLOcagaAsFSnnYChhlv6EKhdBqkJJTDzhUBvTo=";
|
||||
};
|
||||
|
||||
inherit jre;
|
||||
|
|
|
|||
|
|
@ -78,6 +78,8 @@ in stdenv.mkDerivation rec {
|
|||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling
|
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
|
||||
configurePlatforms = [];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -92,6 +92,8 @@ stdenv.mkDerivation rec {
|
|||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling
|
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
|
||||
configurePlatforms = [ ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
|
|||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling
|
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
|
||||
configurePlatforms = [ ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
# Remove unnecessary static lib
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, glib, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3";
|
||||
pname = "libsmf";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz";
|
||||
sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stump";
|
||||
repo = "libsmf";
|
||||
rev = "libsmf-${version}";
|
||||
sha256 = "sha256-OJXJkXvbM2GQNInZXU2ldObquKHhqkdu1zqUDnVZN0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lvtk";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lvtk/lvtk/archive/${version}.tar.gz";
|
||||
sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lvtk";
|
||||
repo = "lvtk";
|
||||
rev = version;
|
||||
sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config python2 wafHook ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
{ lib, stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut, libX11, xorgproto
|
||||
, libXi, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "box2d";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/erincatto/box2d/archive/v${version}.tar.gz";
|
||||
sha256 = "0p03ngsmyz0r5kbpiaq10ns4fxwkjvvawi8k6pfall46b93wizsq";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erincatto";
|
||||
repo = "box2d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs=";
|
||||
};
|
||||
|
||||
sourceRoot = "box2d-${version}/Box2D";
|
||||
sourceRoot = "source/Box2D";
|
||||
|
||||
nativeBuildInputs = [ cmake unzip pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "capstone";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
|
||||
sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquynh";
|
||||
repo = "capstone";
|
||||
rev = version;
|
||||
sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g=";
|
||||
};
|
||||
|
||||
# replace faulty macos detection
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libdrm, libva }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmrt";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/intel/cmrt/archive/${version}.tar.gz";
|
||||
sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na";
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "cmrt";
|
||||
rev = version;
|
||||
sha256 = "sha256-W6MQI41J9CKeM1eILCkvmW34cbCC8YeEF2mE+Ci8o7s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
{ mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }:
|
||||
{ mkDerivation, lib, fetchFromGitHub, qtbase, qtscript, cmake }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "grantlee";
|
||||
version = "5.2.0";
|
||||
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
|
||||
sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk";
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
src = fetchFromGitHub {
|
||||
owner = "steveire";
|
||||
repo = "grantlee";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtscript ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libamqpcpp";
|
||||
version = "4.3.12";
|
||||
version = "4.3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CopernicaMarketingSoftware";
|
||||
repo = "AMQP-CPP";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-veiD2RrJ08HYZ1Jy8EUe6ct2qh7a2xZCn3TTM+Hvu+0=";
|
||||
sha256 = "sha256-S2/ecWC78Q4ihVLtDQ6DD8/qX1cDslnTjqd5IkKCjc4=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -1,40 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, imlib2
|
||||
, libX11
|
||||
, libXext
|
||||
, ncurses
|
||||
, pkg-config
|
||||
, x11Support ? !stdenv.isDarwin
|
||||
, zlib
|
||||
, x11Support ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcaca";
|
||||
version = "0.99.beta19";
|
||||
version = "0.99.beta20";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://fossies.org/linux/privat/${pname}-${version}.tar.gz"
|
||||
"http://caca.zoy.org/files/libcaca/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cacalabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
configureFlags = [
|
||||
(if x11Support then "--enable-x11" else "--disable-x11")
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
zlib
|
||||
|
|
@ -44,6 +36,14 @@ stdenv.mkDerivation rec {
|
|||
libXext
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
configureFlags = [
|
||||
(if x11Support then "--enable-x11" else "--disable-x11")
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/bin
|
||||
mv $bin/bin/caca-config $dev/bin/caca-config
|
||||
|
|
|
|||
|
|
@ -2,17 +2,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblcf";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EasyRPG";
|
||||
repo = "liblcf";
|
||||
rev = version;
|
||||
sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c";
|
||||
sha256 = "sha256-69cYZ8hJ92gK39gueaEoUM0K7BDWIQ/0NvcQ/6e3Sg8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
propagatedBuildInputs = [ expat icu ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3Packages
|
||||
, glib, jansson }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, python3
|
||||
, glib
|
||||
, jansson
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2.0";
|
||||
|
|
@ -12,9 +19,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = with python3Packages; [ python simplejson ];
|
||||
propagatedBuildInputs = [ glib jansson ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
jansson
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/haiwen/libsearpc";
|
||||
|
|
|
|||
|
|
@ -1,141 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, fetchgit
|
||||
, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch
|
||||
, coreutils, libxml2, gnutls, perl, python2, attr
|
||||
, iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
|
||||
, libtasn1, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
|
||||
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
|
||||
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc
|
||||
, enableXen ? false, xen ? null
|
||||
, enableIscsi ? false, openiscsi
|
||||
, enableCeph ? false, ceph
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||
let
|
||||
buildFromTarball = stdenv.isDarwin;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libvirt";
|
||||
version = "5.9.0";
|
||||
|
||||
src =
|
||||
if buildFromTarball then
|
||||
fetchurl {
|
||||
url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
|
||||
sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il";
|
||||
}
|
||||
else
|
||||
fetchgit {
|
||||
url = "git://libvirt.org/libvirt.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config rpcsvc-proto ];
|
||||
buildInputs = [
|
||||
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
|
||||
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
|
||||
] ++ optionals (!buildFromTarball) [
|
||||
libtool autoconf automake
|
||||
] ++ optionals stdenv.isLinux [
|
||||
libpciaccess lvm2 util-linux systemd libnl numad zfs
|
||||
libapparmor libcap_ng numactl attr parted libtirpc
|
||||
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
|
||||
xen
|
||||
] ++ optionals enableIscsi [
|
||||
openiscsi
|
||||
] ++ optionals enableCeph [
|
||||
ceph
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
libiconv gmp
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
|
||||
PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
|
||||
# the path to qemu-kvm will be stored in VM's .xml and .save files
|
||||
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
|
||||
substituteInPlace src/lxc/lxc_conf.c \
|
||||
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
|
||||
patchShebangs . # fixes /usr/bin/python references
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/var/lib"
|
||||
"--with-libpcap"
|
||||
"--with-qemu"
|
||||
"--with-vmware"
|
||||
"--with-vbox"
|
||||
"--with-test"
|
||||
"--with-esx"
|
||||
"--with-remote"
|
||||
] ++ optionals stdenv.isLinux [
|
||||
"QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
|
||||
"QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
|
||||
"CFLAGS=-I${libtirpc.dev}/include/tirpc"
|
||||
"--with-attr"
|
||||
"--with-apparmor"
|
||||
"--with-secdriver-apparmor"
|
||||
"--with-numad"
|
||||
"--with-macvtap"
|
||||
"--with-virtualport"
|
||||
"--with-storage-disk"
|
||||
] ++ optionals (stdenv.isLinux && zfs != null) [
|
||||
"--with-storage-zfs"
|
||||
] ++ optionals enableIscsi [
|
||||
"--with-storage-iscsi"
|
||||
] ++ optionals enableCeph [
|
||||
"--with-storage-rbd"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"--with-init-script=none"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"localstatedir=$(TMPDIR)/var"
|
||||
"sysconfdir=$(out)/var/lib"
|
||||
];
|
||||
|
||||
|
||||
postInstall = let
|
||||
binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
|
||||
in ''
|
||||
substituteInPlace $out/libexec/libvirt-guests.sh \
|
||||
--replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \
|
||||
--replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
|
||||
--replace "$out/bin" '${gettext}/bin' \
|
||||
--replace 'lock/subsys' 'lock' \
|
||||
--replace 'gettext.sh' 'gettext.sh
|
||||
# Added in nixpkgs:
|
||||
gettext() { "${gettext}/bin/gettext" "$@"; }
|
||||
'
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
|
||||
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
|
||||
wrapProgram $out/sbin/libvirtd \
|
||||
--prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
|
||||
|
||||
meta = {
|
||||
homepage = "http://libvirt.org/";
|
||||
repositories.git = "git://libvirt.org/libvirt.git";
|
||||
description = ''
|
||||
A toolkit to interact with the virtualization capabilities of recent
|
||||
versions of Linux (and other OSes)
|
||||
'';
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
knownVulnerabilities = [
|
||||
"https://security.libvirt.org/2019/0008.html"
|
||||
"https://security.libvirt.org/2019/0009.html"
|
||||
"https://security.libvirt.org/2020/0001.html"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwpe";
|
||||
version = "1.10.1";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-oyez/88jVtvoFIwdtLvcU1nX5xY9F39nVRqDk7FErfA=";
|
||||
sha256 = "sha256-6O7KIoprTDYpTPtj99O6mtpHpDCQSlqXOzyZyWpEwYw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{stdenv, lib, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
|
||||
{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openbabel";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
|
||||
sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbabel";
|
||||
repo = "openbabel";
|
||||
rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "sha256-+pXsWMzex7rB1mm6dnTHzAcyw9jImgx1OZuLeCvbeJ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proj";
|
||||
version = "8.1.1";
|
||||
version = "8.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w=";
|
||||
sha256 = "sha256-YXZ3txBWW5vUcdYLISJPxdFGCQpKi1vvJlX8rntujg8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "range-v3";
|
||||
|
|
@ -13,13 +13,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./gcc10.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ericniebler/range-v3/commit/66e847d4e14be3a369b7e26a03a172b20e62c003.patch";
|
||||
sha256 = "sha256-JOQptVqNicdMhcDhBrWQRf7MfskBv56cICwvMA8g88Y=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# Building the tests currently fails on AArch64 due to internal compiler
|
||||
# errors (with GCC 9.2):
|
||||
cmakeFlags = lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
|
||||
cmakeFlags = [ "-DRANGES_ENABLE_WERROR=OFF" ]
|
||||
++ lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF";
|
||||
|
||||
doCheck = !stdenv.isAarch64;
|
||||
checkTarget = "test";
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reproc";
|
||||
version = "14.2.3";
|
||||
version = "14.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DaanDeMeyer";
|
||||
repo = "reproc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bdZ7czkeoSl5znGit0AYQ9D4K8qE2Co+F2Z4jLJuQok=";
|
||||
sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
|
||||
{ lib, stdenv, fetchFromGitHub, expat, libiconv, libjpeg, libpng, libtiff, zlib
|
||||
# darwin only attributes
|
||||
, derez, rez, setfile
|
||||
, AGL, Cocoa, Kernel, WebKit
|
||||
|
|
@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
|
|||
version = "3.0.5.1";
|
||||
pname = "wxmac";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
|
||||
sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxWidgets";
|
||||
repo = "wxWidgets";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
fetchNimble {
|
||||
pname = "flatty";
|
||||
version = "0.2.1";
|
||||
hash = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0=";
|
||||
version = "0.2.3";
|
||||
hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
fetchFromGitHub {
|
||||
owner = "Araq";
|
||||
repo = "packedjson";
|
||||
rev = "7198cc8";
|
||||
sha256 = "1ay2zd88q8hvpvigsg8h0y5vc65hk3lk0d48fy9hwg4lcng19mp1";
|
||||
rev = "d11d167";
|
||||
sha256 = "1302rn58277c3ic5sfq89c4mkn0d66bhilifh5xjf40x74ahir5x";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
fetchFromGitHub {
|
||||
owner = "zedeus";
|
||||
repo = "redis";
|
||||
rev = "94bcbf1";
|
||||
sha256 = "1p9zv4f4lqrjqa8fk98cb89b9fzlf866jc584ll9sws14904i80j";
|
||||
rev = "d0a0e6f";
|
||||
sha256 = "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
fetchFromGitHub {
|
||||
owner = "zedeus";
|
||||
repo = "redpool";
|
||||
rev = "57aeb25";
|
||||
sha256 = "0fph7qlia6fvya1zqzbgvww2hk5pd0vq1wlf9ij9jyn655mg0w3q";
|
||||
rev = "f880f49";
|
||||
sha256 = "01n73bpgfdz2a3qvcfxsq4a6gxbhabf2n5np1ilzgdqkzcd4jf9b";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
fetchFromGitHub {
|
||||
owner = "nitely";
|
||||
repo = "nim-regex";
|
||||
rev = "2e32fdc";
|
||||
sha256 = "1hrl40mwql7nh4wc7sdhmk8bj5728b93v5a93j49v660l0rn4qx8";
|
||||
rev = "eeefb4f";
|
||||
sha256 = "13gn0qhnxz07474kv94br5qlac9j8pz2555fk83538fiq83vgbm5";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
fetchNimble {
|
||||
pname = "zippy";
|
||||
version = "0.5.6";
|
||||
hash = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4=";
|
||||
version = "0.7.3";
|
||||
hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "affinity";
|
||||
version = "0.1.0";
|
||||
|
||||
# syntax error
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "control processor affinity on windows and linux";
|
||||
homepage = "http://cheeseshop.python.org/pypi/affinity";
|
||||
license = with lib.licenses; [ psfl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{ lib, buildPythonPackage, isPy3k, python
|
||||
, antlr4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "antlr4-python2-runtime";
|
||||
inherit (antlr4.runtime.cpp) version src;
|
||||
disabled = isPy3k;
|
||||
|
||||
sourceRoot = "source/runtime/Python2";
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} tests/TestTokenStreamRewriter.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Runtime for ANTLR";
|
||||
homepage = "https://www.antlr.org/";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, zope_interface, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-application";
|
||||
version = "2.8.0";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AGProjects";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "1xd2gbpmx2ghap9cnr1h6sxjai9419bdp3y9qp5lh67977m0qg30";
|
||||
};
|
||||
|
||||
buildInputs = [ zope_interface ];
|
||||
|
||||
# No tests upstream to run
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Basic building blocks for python applications";
|
||||
homepage = "https://github.com/AGProjects/python-application";
|
||||
changelog = "https://github.com/AGProjects/python-application/blob/master/ChangeLog";
|
||||
license = licenses.lgpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, simplejson, backports_functools_lru_cache
|
||||
, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytest-cov
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arrow";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil ]
|
||||
++ lib.optionals isPy27 [ backports_functools_lru_cache ];
|
||||
|
||||
checkInputs = [
|
||||
dateparser
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
pytest-mock
|
||||
pytz
|
||||
simplejson
|
||||
sphinx
|
||||
];
|
||||
|
||||
# ParserError: Could not parse timezone expression "America/Nuuk"
|
||||
disabledTests = [
|
||||
"test_parse_tz_name_zzz"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for date manipulation";
|
||||
homepage = "https://github.com/crsmithdev/arrow";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, numpy
|
||||
, scipy
|
||||
, matplotlib
|
||||
, flask
|
||||
, pillow
|
||||
, psycopg2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ase";
|
||||
version = "3.17.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
|
||||
|
||||
checkPhase = ''
|
||||
$out/bin/ase test
|
||||
'';
|
||||
|
||||
# tests just hang most likely due to something with subprocesses and cli
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Atomic Simulation Environment";
|
||||
homepage = "https://wiki.fysik.dtu.dk/ase/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{ lib, fetchPypi, buildPythonPackage
|
||||
, lazy-object-proxy, six, wrapt, enum34, singledispatch, backports_functools_lru_cache
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "astroid";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d25869fc7f44f1d9fb7d24fd7ea0639656f5355fc3089cd1f3d18c6ec6b124c7";
|
||||
};
|
||||
|
||||
# From astroid/__pkginfo__.py
|
||||
propagatedBuildInputs = [
|
||||
lazy-object-proxy
|
||||
six
|
||||
wrapt
|
||||
enum34
|
||||
singledispatch
|
||||
backports_functools_lru_cache
|
||||
];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
# test_builtin_help is broken
|
||||
pytest -k "not test_builtin_help and not test_namespace_and_file_mismatch and not test_namespace_package_pth_support and not test_nested_namespace_import" astroid
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An abstract syntax tree for Python with inference support";
|
||||
homepage = "https://github.com/PyCQA/astroid";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, xz
|
||||
, python
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
if !(pythonOlder "3.3") then null else buildPythonPackage rec {
|
||||
pname = "backports.lzma";
|
||||
version = "0.0.14";
|
||||
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "16d8b68e4d3cd4e6c9ddb059850452946da3914c8a8e197a7f2b0954559f2df4";
|
||||
};
|
||||
|
||||
buildInputs = [ xz ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} test/test_lzma.py
|
||||
'';
|
||||
|
||||
# Relative import does not seem to function.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";
|
||||
homepage = "https://github.com/peterjc/backports.lzma";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
, future
|
||||
, isPy3k
|
||||
, python
|
||||
, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.1.1";
|
||||
pname = "backports.os";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools-scm ];
|
||||
checkInputs = [ hypothesis ];
|
||||
propagatedBuildInputs = [ future ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover tests
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pjdelport/backports.os";
|
||||
description = "Backport of new features in Python's os module";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, isPyPy, cffi, pytest, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.1.7";
|
||||
pname = "bcrypt";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern password hashing for your software and your servers";
|
||||
homepage = "https://github.com/pyca/bcrypt/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, requests_oauthlib, nose, sh }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitbucket-api";
|
||||
version = "0.5.0";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b541d9d7f234074a74214505aff1846eb21e5dd6d3915139e817d4675d34f4e3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests_oauthlib nose sh ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Sheeprider/BitBucket-api";
|
||||
description = "Python library to interact with BitBucket REST API";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
|
||||
, pyudev, six, libselinux, multipath-tools, lsof, util-linux
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blivet";
|
||||
version = "0.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dwlehman";
|
||||
repo = "blivet";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's|"multipath"|"${multipath-tools}/sbin/multipath"|' \
|
||||
-e '/^def set_friendly_names/a \ return False' \
|
||||
blivet/devicelibs/mpath.py
|
||||
sed -i -e '/"wipefs"/ {
|
||||
s|wipefs|${util-linux}/sbin/wipefs|
|
||||
s/-f/--force/
|
||||
}' blivet/formats/__init__.py
|
||||
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
|
||||
sed -i -r -e 's|"(u?mount)"|"${util-linux}/bin/\1"|' blivet/util.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pykickstart pyparted pyblock pyudev libselinux
|
||||
six
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://fedoraproject.org/wiki/Blivet";
|
||||
description = "Module for management of a system's storage configuration";
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue