Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
b10e8be3a5
@ -6,6 +6,23 @@ This contains instructions on how to package javascript applications. For instru
|
||||
|
||||
The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given.
|
||||
|
||||
## Getting unstuck / finding code examples
|
||||
|
||||
If you find you are lacking inspiration for packing javascript applications, the links below might prove useful.
|
||||
Searching online for prior art can be helpful if you are running into solved problems.
|
||||
|
||||
### Github
|
||||
|
||||
- Searching Nix files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+language%3ANix&type=code>
|
||||
|
||||
- Searching just `flake.nix` files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+filename%3Aflake.nix&type=code>
|
||||
|
||||
### Gitlab
|
||||
|
||||
- Searching Nix files for `mkYarnPackage`: <https://gitlab.com/search?scope=blobs&search=mkYarnPackage+extension%3Anix>
|
||||
|
||||
- Searching just `flake.nix` files for `mkYarnPackage`: <https://gitlab.com/search?scope=blobs&search=mkYarnPackage+filename%3Aflake.nix>
|
||||
|
||||
## Tools overview {#javascript-tools-overview}
|
||||
|
||||
## General principles {#javascript-general-principles}
|
||||
@ -32,7 +49,7 @@ Using a different tool forces to commit a lock file to the repository. Those fil
|
||||
|
||||
Exceptions to this rule are:
|
||||
|
||||
- when you encounter one of the bugs from a nix tool. In each of the tool specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to recreate a lock file and commit it to nixpkgs. In general yarn2nix has less known problems and so a simple search in nixpkgs will reveal many yarn.lock files commited
|
||||
- when you encounter one of the bugs from a nix tool. In each of the tool specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to recreate a lock file and commit it to nixpkgs. In general yarn2nix has less known problems and so a simple search in nixpkgs will reveal many yarn.lock files committed
|
||||
- Some lock files contain particular version of a package that has been pulled off npm for some reason. In that case, you can recreate upstream lock (by removing the original and `npm install`, `yarn`, ...) and commit this to nixpkgs.
|
||||
- The only tool that supports workspaces (a feature of npm that helps manage sub-directories with different package.json from a single top level package.json) is yarn2nix. If upstream has workspaces you should try yarn2nix.
|
||||
|
||||
@ -106,15 +123,15 @@ requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blo
|
||||
|
||||
To add a package from NPM to nixpkgs:
|
||||
|
||||
1. Modify `pkgs/development/node-packages/node-packages.json` to add, update
|
||||
1. Modify `pkgs/development/node-packages/node-packages.json` to add, update
|
||||
or remove package entries to have it included in `nodePackages` and
|
||||
`nodePackages_latest`.
|
||||
2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
|
||||
3. Build your new package to test your changes:
|
||||
2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
|
||||
3. Build your new package to test your changes:
|
||||
`cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
|
||||
To build against the latest stable Current Node.js version (e.g. 14.x):
|
||||
`nix-build -A nodePackages_latest.<new-or-updated-package>`
|
||||
4. Add and commit all modified and generated files.
|
||||
4. Add and commit all modified and generated files.
|
||||
|
||||
For more information about the generation process, consult the
|
||||
[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
|
||||
@ -132,7 +149,7 @@ you will need to generate a nix expression for the dependencies
|
||||
- Most probably you will need the `--development` to include the `devDependencies`
|
||||
|
||||
so the command will most likely be
|
||||
`node2nix --developmennt -l package-lock.json`
|
||||
`node2nix --development -l package-lock.json`
|
||||
|
||||
[link to the doc in the repo](https://github.com/svanderburg/node2nix)
|
||||
|
||||
@ -153,7 +170,7 @@ you will need at least a yarn.lock and yarn.nix file
|
||||
|
||||
#### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage}
|
||||
|
||||
this will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitely override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use
|
||||
this will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitly override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use
|
||||
|
||||
```nix
|
||||
buildPhase = ''
|
||||
@ -178,17 +195,53 @@ configurePhase = "ln -s $node_modules node_modules";
|
||||
|
||||
this will generate a derivation including the node_modules. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. [Plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39) offers a good example of how to do this.
|
||||
|
||||
#### Overriding dependency behavior
|
||||
|
||||
In the `mkYarnPackage` record the property `pkgConfig` can be used to override packages when you encounter problems building.
|
||||
|
||||
For instance, say your package is throwing errors when trying to invoke node-sass: `ENOENT: no such file or directory, scandir '/build/source/node_modules/node-sass/vendor'`
|
||||
|
||||
To fix this we will specify different versions of build inputs to use, as well as some post install steps to get the software built the way we want:
|
||||
|
||||
```nix
|
||||
mkYarnPackage rec {
|
||||
pkgConfig = {
|
||||
node-sass = {
|
||||
buildInputs = with final;[ python libsass pkg-config ];
|
||||
postInstall = ''
|
||||
LIBSASS_EXT=auto yarn --offline run build
|
||||
rm build/config.gypi
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
#### Pitfalls {#javascript-yarn2nix-pitfalls}
|
||||
|
||||
- if version is missing from upstream package.json, yarn will silently install nothing. In that case, you will need to override package.json as shown in the [package.json section](#javascript-upstream-package-json)
|
||||
|
||||
- having trouble with node-gyp? Try adding these lines to the `yarnPreBuild` steps:
|
||||
|
||||
```nix
|
||||
yarnPreBuild = ''
|
||||
mkdir -p $HOME/.node-gyp/${nodejs.version}
|
||||
echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
|
||||
ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
|
||||
export npm_config_nodedir=${nodejs}
|
||||
'';
|
||||
```
|
||||
|
||||
- The `echo 9` steps comes from this answer: <https://stackoverflow.com/a/49139496>
|
||||
- Exporting the headers in `npm_config_nodedir` comes from this issue: <https://github.com/nodejs/node-gyp/issues/1191#issuecomment-301243919>
|
||||
|
||||
## Outside of nixpkgs {#javascript-outside-nixpkgs}
|
||||
|
||||
There are some other options available that can't be used inside nixpkgs. Those other options are written in nix. Importing them in nixpkgs will require moving the source code into nixpkgs. Using [Import From Derivation](https://nixos.wiki/wiki/Import_From_Derivation) is not allowed in hydra at present. If you are packaging something outside nixpkgs, those can be considered
|
||||
|
||||
### npmlock2nix {#javascript-npmlock2nix}
|
||||
|
||||
[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might be suject to change.
|
||||
[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might be subject to change.
|
||||
|
||||
#### Pitfalls {#javascript-npmlock2nix-pitfalls}
|
||||
|
||||
|
||||
@ -11355,6 +11355,12 @@
|
||||
githubId = 335406;
|
||||
name = "David Asabina";
|
||||
};
|
||||
vidister = {
|
||||
email = "v@vidister.de";
|
||||
github = "vidister";
|
||||
githubId = 11413574;
|
||||
name = "Fiona Weber";
|
||||
};
|
||||
vifino = {
|
||||
email = "vifino@tty.sh";
|
||||
github = "vifino";
|
||||
|
||||
@ -182,7 +182,7 @@
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://docs.fluidd.xyz/">fluidd</link>, a
|
||||
@ -191,6 +191,22 @@
|
||||
<link linkend="opt-services.fluidd.enable">fluidd</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/earnestly/sx">sx</link>,
|
||||
a simple alternative to both xinit and startx for starting a
|
||||
Xorg server. Available as
|
||||
<link linkend="opt-services.xserver.displayManager.sx.enable">services.xserver.displayManager.sx</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://postfixadmin.sourceforge.io/">postfixadmin</link>,
|
||||
a web based virtual user administration interface for Postfix
|
||||
mail servers. Available as
|
||||
<link linkend="opt-services.postfixadmin.enable">postfixadmin</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-incompatibilities">
|
||||
|
||||
@ -58,6 +58,10 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
|
||||
|
||||
- [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable).
|
||||
|
||||
- [sx](https://github.com/earnestly/sx), a simple alternative to both xinit and startx for starting a Xorg server. Available as [services.xserver.displayManager.sx](#opt-services.xserver.displayManager.sx.enable)
|
||||
|
||||
- [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers. Available as [postfixadmin](#opt-services.postfixadmin.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
|
||||
|
||||
- The `paperless` module and package have been removed. All users should migrate to the
|
||||
|
||||
@ -460,6 +460,7 @@
|
||||
./services/mail/opensmtpd.nix
|
||||
./services/mail/pfix-srsd.nix
|
||||
./services/mail/postfix.nix
|
||||
./services/mail/postfixadmin.nix
|
||||
./services/mail/postsrsd.nix
|
||||
./services/mail/postgrey.nix
|
||||
./services/mail/spamassassin.nix
|
||||
@ -1036,6 +1037,7 @@
|
||||
./services/x11/display-managers/sddm.nix
|
||||
./services/x11/display-managers/slim.nix
|
||||
./services/x11/display-managers/startx.nix
|
||||
./services/x11/display-managers/sx.nix
|
||||
./services/x11/display-managers/xpra.nix
|
||||
./services/x11/fractalart.nix
|
||||
./services/x11/hardware/libinput.nix
|
||||
|
||||
@ -98,6 +98,14 @@ in
|
||||
'';
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
description = ''
|
||||
Which github-runner derivation to use.
|
||||
'';
|
||||
default = pkgs.github-runner;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
@ -131,7 +139,7 @@ in
|
||||
] ++ cfg.extraPackages;
|
||||
|
||||
serviceConfig = rec {
|
||||
ExecStart = "${pkgs.github-runner}/bin/runsvc.sh";
|
||||
ExecStart = "${cfg.package}/bin/runsvc.sh";
|
||||
|
||||
# Does the following, sequentially:
|
||||
# - Copy the current and the previous `tokenFile` to the $RUNTIME_DIRECTORY
|
||||
@ -208,7 +216,7 @@ in
|
||||
if [[ -z "$empty" ]]; then
|
||||
echo "Configuring GitHub Actions Runner"
|
||||
token=$(< "$RUNTIME_DIRECTORY"/${newConfigTokenFilename})
|
||||
RUNNER_ROOT="$STATE_DIRECTORY" ${pkgs.github-runner}/bin/config.sh \
|
||||
RUNNER_ROOT="$STATE_DIRECTORY" ${cfg.package}/bin/config.sh \
|
||||
--unattended \
|
||||
--work "$RUNTIME_DIRECTORY" \
|
||||
--url ${escapeShellArg cfg.url} \
|
||||
|
||||
199
nixos/modules/services/mail/postfixadmin.nix
Normal file
199
nixos/modules/services/mail/postfixadmin.nix
Normal file
@ -0,0 +1,199 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.postfixadmin;
|
||||
fpm = config.services.phpfpm.pools.postfixadmin;
|
||||
localDB = cfg.database.host == "localhost";
|
||||
user = if localDB then cfg.database.username else "nginx";
|
||||
in
|
||||
{
|
||||
options.services.postfixadmin = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable postfixadmin.
|
||||
|
||||
Also enables nginx virtual host management.
|
||||
Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.<name></literal>.
|
||||
See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.
|
||||
'';
|
||||
};
|
||||
|
||||
hostName = mkOption {
|
||||
type = types.str;
|
||||
example = "postfixadmin.example.com";
|
||||
description = "Hostname to use for the nginx vhost";
|
||||
};
|
||||
|
||||
adminEmail = mkOption {
|
||||
type = types.str;
|
||||
example = "postmaster@example.com";
|
||||
description = ''
|
||||
Defines the Site Admin's email address.
|
||||
This will be used to send emails from to create mailboxes and
|
||||
from Send Email / Broadcast message pages.
|
||||
'';
|
||||
};
|
||||
|
||||
setupPasswordFile = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
Password file for the admin.
|
||||
Generate with <literal>php -r "echo password_hash('some password here', PASSWORD_DEFAULT);"</literal>
|
||||
'';
|
||||
};
|
||||
|
||||
database = {
|
||||
username = mkOption {
|
||||
type = types.str;
|
||||
default = "postfixadmin";
|
||||
description = ''
|
||||
Username for the postgresql connection.
|
||||
If <literal>database.host</literal> is set to <literal>localhost</literal>, a unix user and group of the same name will be created as well.
|
||||
'';
|
||||
};
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
description = ''
|
||||
Host of the postgresql server. If this is not set to
|
||||
<literal>localhost</literal>, you have to create the
|
||||
postgresql user and database yourself, with appropriate
|
||||
permissions.
|
||||
'';
|
||||
};
|
||||
passwordFile = mkOption {
|
||||
type = types.path;
|
||||
description = "Password file for the postgresql connection. Must be readable by user <literal>nginx</literal>.";
|
||||
};
|
||||
dbname = mkOption {
|
||||
type = types.str;
|
||||
default = "postfixadmin";
|
||||
description = "Name of the postgresql database";
|
||||
};
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = "Extra configuration for the postfixadmin instance, see postfixadmin's config.inc.php for available options.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.etc."postfixadmin/config.local.php".text = ''
|
||||
<?php
|
||||
|
||||
$CONF['setup_password'] = file_get_contents('${cfg.setupPasswordFile}');
|
||||
|
||||
$CONF['database_type'] = 'pgsql';
|
||||
$CONF['database_host'] = ${if localDB then "null" else "'${cfg.database.host}'"};
|
||||
${optionalString localDB "$CONF['database_user'] = '${cfg.database.username}';"}
|
||||
$CONF['database_password'] = ${if localDB then "'dummy'" else "file_get_contents('${cfg.database.passwordFile}')"};
|
||||
$CONF['database_name'] = '${cfg.database.dbname}';
|
||||
$CONF['configured'] = true;
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
systemd.tmpfiles.rules = [ "d /var/cache/postfixadmin/templates_c 700 ${user} ${user}" ];
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
${cfg.hostName} = {
|
||||
forceSSL = mkDefault true;
|
||||
enableACME = mkDefault true;
|
||||
locations."/" = {
|
||||
root = "${pkgs.postfixadmin}/public";
|
||||
index = "index.php";
|
||||
extraConfig = ''
|
||||
location ~* \.php$ {
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.postgresql = mkIf localDB {
|
||||
enable = true;
|
||||
ensureUsers = [ {
|
||||
name = cfg.database.username;
|
||||
} ];
|
||||
};
|
||||
# The postgresql module doesn't currently support concepts like
|
||||
# objects owners and extensions; for now we tack on what's needed
|
||||
# here.
|
||||
systemd.services.postfixadmin-postgres = let pgsql = config.services.postgresql; in mkIf localDB {
|
||||
after = [ "postgresql.service" ];
|
||||
bindsTo = [ "postgresql.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [
|
||||
pgsql.package
|
||||
pkgs.util-linux
|
||||
];
|
||||
script = ''
|
||||
set -eu
|
||||
|
||||
PSQL() {
|
||||
psql --port=${toString pgsql.port} "$@"
|
||||
}
|
||||
|
||||
PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.database.dbname}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.database.dbname}" OWNER "${cfg.database.username}"'
|
||||
current_owner=$(PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.database.dbname}'")
|
||||
if [[ "$current_owner" != "${cfg.database.username}" ]]; then
|
||||
PSQL -tAc 'ALTER DATABASE "${cfg.database.dbname}" OWNER TO "${cfg.database.username}"'
|
||||
if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.database.dbname}" ]]; then
|
||||
echo "Reassigning ownership of database ${cfg.database.dbname} to user ${cfg.database.username} failed on last boot. Failing..."
|
||||
exit 1
|
||||
fi
|
||||
touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.database.dbname}"
|
||||
PSQL "${cfg.database.dbname}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.database.username}\""
|
||||
rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.database.dbname}"
|
||||
fi
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
User = pgsql.superUser;
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
};
|
||||
|
||||
users.users.${user} = mkIf localDB {
|
||||
group = user;
|
||||
isSystemUser = true;
|
||||
createHome = false;
|
||||
};
|
||||
users.groups.${user} = mkIf localDB {};
|
||||
|
||||
services.phpfpm.pools.postfixadmin = {
|
||||
user = user;
|
||||
phpPackage = pkgs.php74;
|
||||
phpOptions = ''
|
||||
error_log = 'stderr'
|
||||
log_errors = on
|
||||
'';
|
||||
settings = mapAttrs (name: mkDefault) {
|
||||
"listen.owner" = "nginx";
|
||||
"listen.group" = "nginx";
|
||||
"listen.mode" = "0660";
|
||||
"pm" = "dynamic";
|
||||
"pm.max_children" = 75;
|
||||
"pm.start_servers" = 2;
|
||||
"pm.min_spare_servers" = 1;
|
||||
"pm.max_spare_servers" = 20;
|
||||
"pm.max_requests" = 500;
|
||||
"catch_workers_output" = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -285,6 +285,7 @@ in {
|
||||
"alarmdecoder"
|
||||
"arduino"
|
||||
"blackbird"
|
||||
"deconz"
|
||||
"dsmr"
|
||||
"edl21"
|
||||
"elkm1"
|
||||
|
||||
37
nixos/modules/services/x11/display-managers/sx.nix
Normal file
37
nixos/modules/services/x11/display-managers/sx.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.services.xserver.displayManager.sx;
|
||||
|
||||
in {
|
||||
options = {
|
||||
services.xserver.displayManager.sx = {
|
||||
enable = mkEnableOption "sx pseudo-display manager" // {
|
||||
description = ''
|
||||
Whether to enable the "sx" pseudo-display manager, which allows users
|
||||
to start manually via the "sx" command from a vt shell. The X server
|
||||
runs under the user's id, not as root. The user must provide a
|
||||
~/.config/sx/sxrc file containing session startup commands, see
|
||||
sx(1). This is not automatically generated from the desktopManager
|
||||
and windowManager settings. sx doesn't have a way to directly set
|
||||
X server flags, but it can be done by overriding its xorgserver
|
||||
dependency.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.sx ];
|
||||
services.xserver = {
|
||||
exportConfiguration = true;
|
||||
displayManager = {
|
||||
job.execCmd = "";
|
||||
lightdm.enable = mkForce false;
|
||||
};
|
||||
logFile = mkDefault null;
|
||||
};
|
||||
systemd.services.display-manager.enable = false;
|
||||
};
|
||||
}
|
||||
@ -8,6 +8,7 @@ with lib;
|
||||
let
|
||||
|
||||
cfgZfs = config.boot.zfs;
|
||||
cfgExpandOnBoot = config.services.zfs.expandOnBoot;
|
||||
cfgSnapshots = config.services.zfs.autoSnapshot;
|
||||
cfgSnapFlags = cfgSnapshots.flags;
|
||||
cfgScrub = config.services.zfs.autoScrub;
|
||||
@ -200,7 +201,6 @@ in
|
||||
an interactive prompt (keylocation=prompt) and from a file (keylocation=file://).
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
services.zfs.autoSnapshot = {
|
||||
@ -327,6 +327,23 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
services.zfs.expandOnBoot = mkOption {
|
||||
type = types.either (types.enum [ "disabled" "all" ]) (types.listOf types.str);
|
||||
default = "disabled";
|
||||
example = [ "tank" "dozer" ];
|
||||
description = ''
|
||||
After importing, expand each device in the specified pools.
|
||||
|
||||
Set the value to the plain string "all" to expand all pools on boot:
|
||||
|
||||
services.zfs.expandOnBoot = "all";
|
||||
|
||||
or set the value to a list of pools to expand the disks of specific pools:
|
||||
|
||||
services.zfs.expandOnBoot = [ "tank" "dozer" ];
|
||||
'';
|
||||
};
|
||||
|
||||
services.zfs.zed = {
|
||||
enableMail = mkEnableOption "ZED's ability to send emails" // {
|
||||
default = cfgZfs.package.enableMail;
|
||||
@ -586,6 +603,7 @@ in
|
||||
${cfgZfs.package}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
|
||||
'';
|
||||
};
|
||||
|
||||
createZfsService = serv:
|
||||
nameValuePair serv {
|
||||
after = [ "systemd-modules-load.service" ];
|
||||
@ -609,6 +627,86 @@ in
|
||||
systemd.targets.zfs.wantedBy = [ "multi-user.target" ];
|
||||
})
|
||||
|
||||
(mkIf (cfgZfs.enabled && cfgExpandOnBoot != "disabled") {
|
||||
systemd.services."zpool-expand@" = {
|
||||
description = "Expand ZFS pools";
|
||||
after = [ "zfs.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
|
||||
scriptArgs = "%i";
|
||||
path = [ pkgs.gawk cfgZfs.package ];
|
||||
|
||||
# ZFS has no way of enumerating just devices in a pool in a way
|
||||
# that 'zpool online -e' supports. Thus, we've implemented a
|
||||
# bit of a strange approach of highlighting just devices.
|
||||
# See: https://github.com/openzfs/zfs/issues/12505
|
||||
script = let
|
||||
# This UUID has been chosen at random and is to provide a
|
||||
# collision-proof, predictable token to search for
|
||||
magicIdentifier = "NIXOS-ZFS-ZPOOL-DEVICE-IDENTIFIER-37108bec-aff6-4b58-9e5e-53c7c9766f05";
|
||||
zpoolScripts = pkgs.writeShellScriptBin "device-highlighter" ''
|
||||
echo "${magicIdentifier}"
|
||||
'';
|
||||
in ''
|
||||
pool=$1
|
||||
|
||||
echo "Expanding all devices for $pool."
|
||||
|
||||
# Put our device-highlighter script it to the PATH
|
||||
export ZPOOL_SCRIPTS_PATH=${zpoolScripts}/bin
|
||||
|
||||
# Enable running our precisely specified zpool script as root
|
||||
export ZPOOL_SCRIPTS_AS_ROOT=1
|
||||
|
||||
devices() (
|
||||
zpool status -c device-highlighter "$pool" \
|
||||
| awk '($2 == "ONLINE" && $6 == "${magicIdentifier}") { print $1; }'
|
||||
)
|
||||
|
||||
for device in $(devices); do
|
||||
echo "Attempting to expand $device of $pool..."
|
||||
if ! zpool online -e "$pool" "$device"; then
|
||||
echo "Failed to expand '$device' of '$pool'."
|
||||
fi
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services."zpool-expand-pools" =
|
||||
let
|
||||
# Create a string, to be interpolated in a bash script
|
||||
# which enumerates all of the pools to expand.
|
||||
# If the `pools` option is `true`, we want to dynamically
|
||||
# expand every pool. Otherwise we want to enumerate
|
||||
# just the specifically provided list of pools.
|
||||
poolListProvider = if cfgExpandOnBoot == "all"
|
||||
then "$(zpool list -H | awk '{print $1}')"
|
||||
else lib.escapeShellArgs cfgExpandOnBoot;
|
||||
in
|
||||
{
|
||||
description = "Expand specified ZFS pools";
|
||||
wantedBy = [ "default.target" ];
|
||||
after = [ "zfs.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
|
||||
path = [ pkgs.gawk cfgZfs.package ];
|
||||
|
||||
script = ''
|
||||
for pool in ${poolListProvider}; do
|
||||
systemctl start --no-block "zpool-expand@$pool"
|
||||
done
|
||||
'';
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf (cfgZfs.enabled && cfgSnapshots.enable) {
|
||||
systemd.services = let
|
||||
descr = name: if name == "frequent" then "15 mins"
|
||||
|
||||
@ -356,6 +356,7 @@ in
|
||||
pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};
|
||||
postfix = handleTest ./postfix.nix {};
|
||||
postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};
|
||||
postfixadmin = handleTest ./postfixadmin.nix {};
|
||||
postgis = handleTest ./postgis.nix {};
|
||||
postgresql = handleTest ./postgresql.nix {};
|
||||
postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};
|
||||
|
||||
31
nixos/tests/postfixadmin.nix
Normal file
31
nixos/tests/postfixadmin.nix
Normal file
@ -0,0 +1,31 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "postfixadmin";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ globin ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
postfixadmin = { config, pkgs, ... }: {
|
||||
services.postfixadmin = {
|
||||
enable = true;
|
||||
hostName = "postfixadmin";
|
||||
setupPasswordFile = pkgs.writeText "insecure-test-setup-pw-file" "$2y$10$r0p63YCjd9rb9nHrV9UtVuFgGTmPDLKu.0UIJoQTkWCZZze2iuB1m";
|
||||
};
|
||||
services.nginx.virtualHosts.postfixadmin = {
|
||||
forceSSL = false;
|
||||
enableACME = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
postfixadmin.start
|
||||
postfixadmin.wait_for_unit("postgresql.service")
|
||||
postfixadmin.wait_for_unit("phpfpm-postfixadmin.service")
|
||||
postfixadmin.wait_for_unit("nginx.service")
|
||||
postfixadmin.succeed(
|
||||
"curl -sSfL http://postfixadmin/setup.php -X POST -F 'setup_password=not production'"
|
||||
)
|
||||
postfixadmin.succeed("curl -sSfL http://postfixadmin/ | grep 'Mail admins login here'")
|
||||
'';
|
||||
})
|
||||
@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "carla";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "falkTX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-en3eQtRUd2schpIccnuD42+wTYOAG9zsD6yNRA73bKE=";
|
||||
sha256 = "sha256-WxhG9X6jVcu10bl5p0f61+SYZmJw4W7DYvezbpAlNjg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
|
||||
description = "TUI display manager";
|
||||
license = licenses.wtfpl;
|
||||
homepage = "https://github.com/cylgom/ly";
|
||||
maintainers = [ maintainers.spacekookie ];
|
||||
maintainers = [ maintainers.vidister ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,36 +1,43 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, capstone
|
||||
, jansson
|
||||
, wxGTK30
|
||||
, darwin
|
||||
, lua5_3
|
||||
, wxGTK31
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, IOKit
|
||||
, libicns
|
||||
, wxmac
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.3.1";
|
||||
version = "0.3.91";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1yj9a63j7534mmz8cl1ifg2wmgkxmk6z75jd8lkmc2sfrjbick32";
|
||||
sha256 = "sha256-lemak/sGff346IOzOnMB4L4TkDRA/1L3KV3VNdWxIFA=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.osx --replace 'iconutil -c icns -o $@ $(ICONSET)' \
|
||||
'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optionals (stdenv.isDarwin) [ libicns ];
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [ libicns ];
|
||||
|
||||
buildInputs = [ capstone jansson ]
|
||||
++ (lib.optionals (!stdenv.isDarwin) [ wxGTK30 ])
|
||||
++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ]));
|
||||
buildInputs = [ capstone jansson lua5_3 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ] ++ (lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]);
|
||||
makeFlags = [ "prefix=$(out)" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reverse Engineers' Hex Editor";
|
||||
|
||||
@ -24,7 +24,7 @@ let
|
||||
six
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.16.9";
|
||||
version = "3.16.10";
|
||||
pname = "qgis";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
@ -32,7 +32,7 @@ in mkDerivation rec {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-Y9WVgKEMOSMaXxfC9EQ8yqBYEj4XNL7YdMp8vjV55d0=";
|
||||
sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zola";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getzola";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1mvin6pfqhsfhaifivbdi6qcn0dsa98w83m1n51q807gh4l1k2yj";
|
||||
sha256 = "1cvvxiginwf1rldijzwk9gh63qc0ls5d7j3j8ri7yhk21pz9f6bi";
|
||||
};
|
||||
|
||||
cargoSha256 = "02bk399c7x15a5rkaz7ik65yihkfbjn1q46gx7l8hycqq7xb0xmg";
|
||||
cargoSha256 = "1hg8j9a8c6c3ap24jd96y07rlp4f0s2mkyx5034nlnkm3lj4q42n";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles];
|
||||
buildInputs = [ openssl oniguruma ]
|
||||
|
||||
@ -18,9 +18,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "93.0.4577.51",
|
||||
"sha256": "0b3mx5ns4pbrwc7s2iz8ffv8lhay6p9gj0dnsd1qzxgqwgrv37h5",
|
||||
"sha256bin64": "1b8ypv14c5ky789dm17czv4yf7v21lwhnf2ygkdzryvd3i056nsz",
|
||||
"version": "93.0.4577.58",
|
||||
"sha256": "1i9ygy99lg9h0qyl46c02id9d1ig3brkvr8va0blpf7h8pg9251s",
|
||||
"sha256bin64": "16cyn74sxz8lwdyb7x3z115czk9xvs67bb2bbnhrhnaszhhrzs4j",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-07-08",
|
||||
|
||||
@ -5,7 +5,7 @@ let
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
sha256 = "sha256-/uD0hxtTJSr+2tZcwzOIQcEbikHOshWukEBSaK3FiP4=";
|
||||
sha256 = "05khmpbv42wjpkdb4n51pnq678la6hjfhkyy49d0j2kcnvfd1m5p";
|
||||
stripRoot = false;
|
||||
};
|
||||
in
|
||||
@ -55,7 +55,6 @@ buildGoModule rec {
|
||||
'';
|
||||
homepage = "https://fluxcd.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jlesquembre ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ jlesquembre superherointj ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "helm-secrets";
|
||||
version = "3.8.1";
|
||||
version = "3.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jkroepke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UZu3jChEK59UrtUR2ze68Kkc6MkHRtTsfTOS/B96sLM=";
|
||||
hash = "sha256-FpF/d+e5T6nb0OENaYLY+3ATZ+qcAeih5/yKI+AtfKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -40,20 +40,18 @@ let
|
||||
in
|
||||
py.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
pname = "paperless-ng";
|
||||
version = "1.4.5";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "2PJb8j3oimlfiJ3gqjK6uTemzFdtAP2Mlm5RH09bx/E=";
|
||||
sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
# Make bind address configurable
|
||||
# Fix tests with Pillow 8.3.1: https://github.com/jonaswinkler/paperless-ng/pull/1183
|
||||
prePatch = ''
|
||||
postPatch = ''
|
||||
substituteInPlace gunicorn.conf.py --replace "bind = '0.0.0.0:8000'" ""
|
||||
substituteInPlace src/paperless_tesseract/parsers.py --replace "return x" "return round(x)"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with py.pkgs.pythonPackages; [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.25.7";
|
||||
version = "2.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "sha256-3A6DDT6Dje4rT0qhyWMfs6TD7Jgt6N/lFF/HSBBMcUY=";
|
||||
sha256 = "sha256-sz/7MtcCJlUlrNy16W1YB/zXMhYeLLbQOIOdzNsGW7w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stacks";
|
||||
version = "2.55";
|
||||
version = "2.59";
|
||||
src = fetchurl {
|
||||
url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-p8L0F3A+GdNsPgTQNn9Em5EjFCc9f7gUvyLIRCTd05c=";
|
||||
sha256 = "sha256-pVFwb4EPba9wL9kDGN2gi7aeH+sPhDG/XLyHxqG4zd4=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lean";
|
||||
version = "3.31.0";
|
||||
version = "3.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover-community";
|
||||
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||
# from. this is then used to check whether an olean file should be
|
||||
# rebuilt. don't use a tag as rev because this will get replaced into
|
||||
# src/githash.h.in in preConfigure.
|
||||
rev = "333783350cd3fe38f25fed1da7d6a433d8f85b77";
|
||||
sha256 = "sha256-N8Ju7pSGssvt84/0e1o6G/p7fWM1c0Mzw+ftL1/++J4=";
|
||||
rev = "35b3a9c4e2d35cccb5ed220ea2f2909a4ed2ca90";
|
||||
sha256 = "0s69smknsvycvydbk2f3vcqj1z3jrbv3k048z2r46391dai5iwhf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,24 +4,18 @@
|
||||
, fetchFromGitHub
|
||||
, ncurses
|
||||
, pkg-config
|
||||
, fontconfig
|
||||
, python3
|
||||
, fontconfig
|
||||
, openssl
|
||||
, perl
|
||||
, dbus
|
||||
, libGL
|
||||
, libX11
|
||||
, xcbutil
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, xcbutil
|
||||
, xcbutilimage
|
||||
, xcbutilkeysyms
|
||||
, xcbutilwm # contains xcb-ewmh among others
|
||||
, libxkbcommon
|
||||
, libglvnd # libEGL.so.1
|
||||
, egl-wayland
|
||||
, xcbutilwm
|
||||
, wayland
|
||||
, libGLU
|
||||
, libGL
|
||||
, freetype
|
||||
, zlib
|
||||
# Apple frameworks
|
||||
, CoreGraphics
|
||||
@ -29,48 +23,21 @@
|
||||
, Foundation
|
||||
, libiconv
|
||||
}:
|
||||
let
|
||||
runtimeDeps = [
|
||||
zlib
|
||||
fontconfig
|
||||
freetype
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libX11
|
||||
xcbutil
|
||||
libxcb
|
||||
xcbutilimage
|
||||
xcbutilkeysyms
|
||||
xcbutilwm
|
||||
libxkbcommon
|
||||
dbus
|
||||
libglvnd
|
||||
egl-wayland
|
||||
wayland
|
||||
libGLU
|
||||
libGL
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Foundation
|
||||
CoreGraphics
|
||||
Cocoa
|
||||
libiconv
|
||||
];
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20210814-124438-54e29167";
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
postPatch = ''
|
||||
echo ${version} > .tag
|
||||
'';
|
||||
@ -80,11 +47,28 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
perl
|
||||
ncurses
|
||||
ncurses # tic for terminfo
|
||||
];
|
||||
|
||||
buildInputs = runtimeDeps;
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libX11
|
||||
libxcb
|
||||
libxkbcommon
|
||||
openssl
|
||||
wayland
|
||||
xcbutil
|
||||
xcbutilimage
|
||||
xcbutilkeysyms
|
||||
xcbutilwm # contains xcb-ewmh among others
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
CoreGraphics
|
||||
Foundation
|
||||
libiconv
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# terminfo
|
||||
@ -102,9 +86,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
|
||||
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
|
||||
done
|
||||
patchelf --add-needed "${libGL}/lib/libEGL.so.1" $out/bin/wezterm-gui
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p "$out/Applications"
|
||||
OUT_APP="$out/Applications/WezTerm.app"
|
||||
@ -114,14 +96,11 @@ rustPlatform.buildRustPackage rec {
|
||||
ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
|
||||
'';
|
||||
|
||||
# prevent further changes to the RPATH
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
|
||||
homepage = "https://wezfurlong.org/wezterm";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ steveej SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "1.14.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JCuJliBr1IPdwGG9T0Bx5DhtHw8tJ45mteRLxRbkyio=";
|
||||
sha256 = "sha256-TjBUVP9/hMB8yFnupSxwHDr5bmtiMFwsDi1axsD5ykA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6H56jf4QV+DdsiCetyhpXp6NHc86Hzo+CuqF06dL26A=";
|
||||
vendorSha256 = "sha256-ZsMzLJ+eHAKNxhVFpQxRyTv/rcWvxA/luKPjXT+Zt4Y=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vpcs";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GNS3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kqy4bd3ns8nzn7fa72izn7a08sfrasy1rn7fd8ajah2wv8d2cak";
|
||||
sha256 = "sha256-joEXRMtNZMQumkYDX1gdpGAV+XdNKiAMj3dh1GZxeqc=";
|
||||
};
|
||||
|
||||
buildPhase = ''(
|
||||
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -43,9 +43,9 @@
|
||||
|
||||
"http://ftp.nluug.nl/pub/gnu/"
|
||||
"http://mirrors.kernel.org/gnu/"
|
||||
"ftp://mirror.cict.fr/gnu/"
|
||||
"ftp://ftp.cs.tu-berlin.de/pub/gnu/"
|
||||
"ftp://ftp.chg.ru/pub/gnu/"
|
||||
"http://mirror.ibcp.fr/pub/gnu/"
|
||||
"http://mirror.dogado.de/gnu/"
|
||||
"http://mirror.tochlab.net/pub/gnu/"
|
||||
"ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/"
|
||||
|
||||
# This one is the master repository, and thus it's always up-to-date.
|
||||
@ -66,7 +66,6 @@
|
||||
gnupg = [
|
||||
"https://gnupg.org/ftp/gcrypt/"
|
||||
"http://www.ring.gr.jp/pub/net/"
|
||||
"http://gd.tuwien.ac.at/privacy/"
|
||||
"http://mirrors.dotsrc.org/gcrypt/"
|
||||
"http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
|
||||
"http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/"
|
||||
@ -75,14 +74,13 @@
|
||||
# kernel.org's /pub (/pub/{linux,software}) tree.
|
||||
kernel = [
|
||||
"http://cdn.kernel.org/pub/"
|
||||
"http://www.all.kernel.org/pub/"
|
||||
"http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/"
|
||||
"http://linux-kernel.uio.no/pub/"
|
||||
"http://kernel.osuosl.org/pub/"
|
||||
"ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/"
|
||||
];
|
||||
|
||||
# Mirrors from https://download.kde.org/extra/download-mirrors.html
|
||||
# Mirrors from https://download.kde.org/ls-lR.mirrorlist
|
||||
kde = [
|
||||
"https://download.kde.org/download.php?url="
|
||||
"https://ftp.gwdg.de/pub/linux/kde/"
|
||||
@ -90,7 +88,6 @@
|
||||
"http://mirrors.mit.edu/kde/"
|
||||
"https://mirrors.ustc.edu.cn/kde/"
|
||||
"http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
|
||||
"ftp://ftp.kde.org/pub/kde/"
|
||||
];
|
||||
|
||||
# Gentoo files.
|
||||
@ -113,15 +110,12 @@
|
||||
"http://ftp.cc.uoc.gr/mirrors/nongnu.org/"
|
||||
"http://nongnu.uib.no/"
|
||||
"http://mirrors.fe.up.pt/pub/nongnu/"
|
||||
"http://mirror.lihnidos.org/GNU/savannah/"
|
||||
"http://savannah.mirror.si/"
|
||||
"http://ftp.acc.umu.se/mirror/gnu.org/savannah/"
|
||||
"http://ftp.twaren.net/Unix/NonGNU/"
|
||||
"http://ftp.yzu.edu.tw/pub/nongnu/"
|
||||
"http://mirror.rackdc.com/savannah/"
|
||||
"http://savannah-nongnu-org.ip-connect.vn.ua/"
|
||||
"http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/"
|
||||
"http://savannah.spinellicreations.com/"
|
||||
"http://gnu.mirrors.pair.com/savannah/savannah/"
|
||||
"ftp://mirror.easyname.at/nongnu/"
|
||||
"ftp://mirror2.klaus-uwe.me/nongnu/"
|
||||
@ -129,11 +123,9 @@
|
||||
"ftp://mirror.csclub.uwaterloo.ca/nongnu/"
|
||||
"ftp://mirror.cedia.org.ec/nongnu"
|
||||
"ftp://ftp.igh.cnrs.fr/pub/nongnu/"
|
||||
"ftp://mirror6.layerjet.com/nongnu/"
|
||||
"ftp://mirror.netcologne.de/savannah/"
|
||||
"ftp://nongnu.uib.no/pub/nongnu/"
|
||||
"ftp://mirrors.fe.up.pt/pub/nongnu/"
|
||||
"ftp://savannah.mirror.si/savannah/"
|
||||
"ftp://ftp.twaren.net/Unix/NonGNU/"
|
||||
"ftp://ftp.yzu.edu.tw/pub/nongnu/"
|
||||
"ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/"
|
||||
@ -149,8 +141,6 @@
|
||||
# BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .
|
||||
bitlbee = [
|
||||
"http://get.bitlbee.org/"
|
||||
"http://get.bitlbee.be/"
|
||||
"http://get.us.bitlbee.org/"
|
||||
"http://ftp.snt.utwente.nl/pub/software/bitlbee/"
|
||||
"http://bitlbee.intergenia.de/"
|
||||
];
|
||||
@ -165,8 +155,6 @@
|
||||
"ftp://ftp.imagemagick.org/pub/ImageMagick/"
|
||||
"http://ftp.fifi.org/ImageMagick/"
|
||||
"ftp://ftp.fifi.org/ImageMagick/"
|
||||
"http://imagemagick.mirrorcatalogs.com/"
|
||||
"ftp://imagemagick.mirrorcatalogs.com/imagemagick"
|
||||
];
|
||||
|
||||
# CPAN mirrors.
|
||||
@ -185,7 +173,6 @@
|
||||
"http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/"
|
||||
"http://mirrors.aliyun.com/centos-vault/"
|
||||
"https://mirror.chpc.utah.edu/pub/vault.centos.org/"
|
||||
"https://mirror.its.sfu.ca/mirror/CentOS-vault/"
|
||||
"https://mirror.math.princeton.edu/pub/centos-vault/"
|
||||
"https://mirrors.tripadvisor.com/centos-vault/"
|
||||
];
|
||||
@ -193,14 +180,10 @@
|
||||
# Debian.
|
||||
debian = [
|
||||
"http://httpredir.debian.org/debian/"
|
||||
"ftp://ftp.au.debian.org/debian/"
|
||||
"ftp://ftp.de.debian.org/debian/"
|
||||
"ftp://ftp.es.debian.org/debian/"
|
||||
"ftp://ftp.fr.debian.org/debian/"
|
||||
"ftp://ftp.it.debian.org/debian/"
|
||||
"ftp://ftp.nl.debian.org/debian/"
|
||||
"ftp://ftp.ru.debian.org/debian/"
|
||||
"ftp://ftp.debian.org/debian/"
|
||||
"http://ftp.debian.org/debian/"
|
||||
"http://archive.debian.org/debian-archive/debian/"
|
||||
"ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/"
|
||||
@ -229,13 +212,6 @@
|
||||
"http://archives.fedoraproject.org/pub/archive/fedora/"
|
||||
];
|
||||
|
||||
# Old SUSE distributions. Unfortunately there is no master site,
|
||||
# since SUSE actually delete their old distributions (see
|
||||
# ftp://ftp.suse.com/pub/suse/discontinued/deleted-20070817/README.txt).
|
||||
oldsuse = [
|
||||
"ftp://ftp.gmd.de/ftp.suse.com-discontinued/"
|
||||
];
|
||||
|
||||
# openSUSE.
|
||||
opensuse = [
|
||||
"http://opensuse.hro.nl/opensuse/distribution/"
|
||||
@ -257,10 +233,8 @@
|
||||
"http://ftp.unina.it/pub/linux/GNOME/"
|
||||
"http://fr2.rpmfind.net/linux/gnome.org/"
|
||||
"ftp://ftp.dit.upm.es/pub/GNOME/"
|
||||
"ftp://ftp.no.gnome.org/pub/GNOME/"
|
||||
"http://ftp.acc.umu.se/pub/GNOME/"
|
||||
"http://ftp.belnet.be/mirror/ftp.gnome.org/"
|
||||
"http://ftp.df.lth.se/pub/gnome/"
|
||||
"http://linorg.usp.br/gnome/"
|
||||
"http://mirror.aarnet.edu.au/pub/GNOME/"
|
||||
"ftp://ftp.cse.buffalo.edu/pub/Gnome/"
|
||||
@ -290,7 +264,7 @@
|
||||
# Apache mirrors (see http://www.apache.org/mirrors/).
|
||||
apache = [
|
||||
"https://www-eu.apache.org/dist/"
|
||||
"https://www-us.apache.org/dist/"
|
||||
"https://ftp.wayne.edu/apache/"
|
||||
"http://www.eu.apache.org/dist/"
|
||||
"ftp://ftp.fu-berlin.de/unix/www/apache/"
|
||||
"http://ftp.tudelft.nl/apache/"
|
||||
@ -305,13 +279,11 @@
|
||||
postgresql = [
|
||||
"http://ftp.postgresql.org/pub/"
|
||||
"ftp://ftp.postgresql.org/pub/"
|
||||
"ftp://ftp-archives.postgresql.org/pub/"
|
||||
];
|
||||
|
||||
metalab = [
|
||||
"ftp://mirrors.kernel.org/metalab/"
|
||||
"ftp://ftp.gwdg.de/pub/linux/metalab/"
|
||||
"ftp://ftp.xemacs.org/sites/metalab.unc.edu/"
|
||||
"ftp://ftp.metalab.unc.edu/pub/linux/"
|
||||
];
|
||||
|
||||
# Bioconductor mirrors (from http://bioconductor.org/about/mirrors)
|
||||
@ -325,7 +297,6 @@
|
||||
# http://watson.nci.nih.gov/bioc_mirror/
|
||||
"http://bioconductor.jp/packages/"
|
||||
"http://bioconductor.statistik.tu-dortmund.de/packages/"
|
||||
"http://mirrors.ebi.ac.uk/bioconductor/packages/"
|
||||
"http://mirrors.ustc.edu.cn/bioc/"
|
||||
];
|
||||
|
||||
@ -340,14 +311,12 @@
|
||||
# Roy marples mirrors
|
||||
roy = [
|
||||
"http://roy.marples.name/downloads/"
|
||||
"http://roy.aydogan.net/"
|
||||
"http://cflags.cc/roy/"
|
||||
];
|
||||
|
||||
# Sage mirrors (http://www.sagemath.org/mirrors.html)
|
||||
sageupstream = [
|
||||
# Africa
|
||||
"http://sagemath.polytechnic.edu.na/spkg/upstream/"
|
||||
"ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"
|
||||
"http://sagemath.mirror.ac.za/spkg/upstream/"
|
||||
"https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/"
|
||||
@ -366,7 +335,6 @@
|
||||
"http://linorg.usp.br/sage/spkg/upstream"
|
||||
|
||||
# Asia
|
||||
"http://sage.asis.io/spkg/upstream/"
|
||||
"http://mirror.hust.edu.cn/sagemath/spkg/upstream/"
|
||||
"https://ftp.iitm.ac.in/sage/spkg/upstream/"
|
||||
"http://ftp.kaist.ac.kr/sage/spkg/upstream/"
|
||||
@ -378,11 +346,10 @@
|
||||
"https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/"
|
||||
|
||||
# Australia
|
||||
"http://echidna.maths.usyd.edu.au/sage/spkg/upstream/"
|
||||
"http://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"
|
||||
|
||||
# Europe
|
||||
"http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"
|
||||
"http://sunsite.rediris.es/mirror/sagemath/spkg/upstream/"
|
||||
"http://mirror.switch.ch/mirror/sagemath/spkg/upstream/"
|
||||
"http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"
|
||||
"http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"
|
||||
@ -399,8 +366,6 @@
|
||||
"http://ftp.openbsd.org/pub/OpenBSD/"
|
||||
"ftp://ftp.nluug.nl/pub/OpenBSD/"
|
||||
"ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/"
|
||||
"ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/"
|
||||
"ftp://mirror.switch.ch/pub/OpenBSD/"
|
||||
];
|
||||
|
||||
# Steam Runtime mirrors
|
||||
@ -439,6 +404,5 @@
|
||||
"ftp://ftp.alsa-project.org/pub/"
|
||||
"http://alsa.cybermirror.org/"
|
||||
"http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/"
|
||||
"http://alsa.mirror.fr/"
|
||||
];
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "matcha-gtk-theme";
|
||||
version = "2021-08-02";
|
||||
version = "2021-08-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-vvWRHtE0Fgz41Aa5kaxNfbupodaWNc8gRJ1qW7vIyuc=";
|
||||
sha256 = "sha256-gemDiGcr7xLv247w9J1CMOSKg2tWp8ADKpG16qa3hZQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ gdk-pixbuf librsvg ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-8//FEWXXcp/COHj10l4jysaLobzZIl65RCYz/HgL+kc=";
|
||||
sha256 = "sha256-6TMWWXAgt4e+De1ebmqQhaqcia1ZXT8IXn9fTGsr3qY=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tiledb";
|
||||
version = "2.2.4";
|
||||
version = "2.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TileDB-Inc";
|
||||
repo = "TileDB";
|
||||
rev = version;
|
||||
sha256 = "sha256-xzzWB20vhnneiqJqZAeSUjZouqhPPg2bGaot1IQDMEo=";
|
||||
sha256 = "sha256-kiidUvSff0drmIl6sXdqj2pjoFZL+ReCDOTtMEW3P3g=";
|
||||
};
|
||||
|
||||
# (bundled) blosc headers have a warning on some archs that it will be using
|
||||
|
||||
@ -297,6 +297,7 @@
|
||||
, "wring"
|
||||
, "write-good"
|
||||
, "yaml-language-server"
|
||||
, "yalc"
|
||||
, "yarn"
|
||||
, "yo"
|
||||
, "zx"
|
||||
|
||||
3550
pkgs/development/node-packages/node-packages.nix
generated
3550
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -18,7 +18,7 @@ buildDunePackage rec {
|
||||
owner = "tezos";
|
||||
repo = "tezos";
|
||||
rev = "v${version}";
|
||||
sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk";
|
||||
sha256 = "1ykhz5m5sb2hq04nspbsbq8wspkhimagb5g6yi65hpdbn8f4zr6h";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.0.8";
|
||||
|
||||
@ -17,17 +17,17 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "torch";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LaurentMazare";
|
||||
repo = "ocaml-${pname}";
|
||||
rev = version;
|
||||
sha256 = "0nl6hd2rivhgkc3sdkdmrk3j0ij3xjx1clhqm8m5iznir4g77g91";
|
||||
sha256 = "0528h1mkrqbmbf7hy91dsnxcg0k55m3jgharr71c652xyd847yz7";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
@ -56,6 +56,5 @@ buildDunePackage rec {
|
||||
description = "Ocaml bindings to Pytorch";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
license = licenses.asl20;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "6.1.0";
|
||||
version = "7.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C799JoW58mmwHeoXLMJ5pYg8hjaZqVBqrbxBXpmF/mQ=";
|
||||
sha256 = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
version = "2.2.1";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MbQNcWofBkLqnidBwpt1YpkHXbLh0evnUOPiwUafWJ0=";
|
||||
sha256 = "sha256-QgPNtE136zCnReZXbIK34zaB8TSzOBBSVvd+cdvTMN0=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
let
|
||||
withPlugins = plugins: buildPythonPackage {
|
||||
name = "${package.name}-with-plugins";
|
||||
phases = [ "installPhase" "fixupPhase" ];
|
||||
dontUnpack = true;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
propagatedBuildInputs = plugins ++ package.propagatedBuildInputs;
|
||||
|
||||
|
||||
@ -1,23 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "catalogue";
|
||||
version = "2.0.4";
|
||||
version = "2.0.6";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ntNF0ShVrzFfFxVYNhKya4YhorCi4775dNxdcS95g6o=";
|
||||
sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "catalogue" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tiny library for adding function or object registries";
|
||||
homepage = "https://github.com/explosion/catalogue";
|
||||
|
||||
@ -2,33 +2,41 @@
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, importlib-metadata
|
||||
, parameterized
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-mock
|
||||
, responses
|
||||
, rich
|
||||
, types-requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "censys";
|
||||
version = "2.0.3";
|
||||
version = "2.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "censys";
|
||||
repo = "censys-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ga5f6xv6rylfvalnl3cflr0w30r771gb05n5cjhxisb8an0qcb6";
|
||||
sha256 = "sha256-/vMDNHNUY3mpK9jSDPVhuA050rwZF8O6IjTCLqQZIWc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
requests
|
||||
rich
|
||||
types-requests
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -39,9 +47,10 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "rich==10.3.0" "rich" \
|
||||
--replace "types-requests==0.1.11" "types-requests"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'backoff = "^1.11.1"' 'backoff = "*"' \
|
||||
--replace 'requests = ">=2.26.0"' 'requests = "*"' \
|
||||
--replace 'rich = "^10.6.0"' 'rich = "*"'
|
||||
substituteInPlace pytest.ini --replace \
|
||||
" --cov -rs -p no:warnings" ""
|
||||
'';
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dependency-injector";
|
||||
version = "4.34.0";
|
||||
version = "4.35.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ets-labs";
|
||||
repo = "python-dependency-injector";
|
||||
rev = version;
|
||||
sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0=";
|
||||
sha256 = "sha256-2qe4A2T3EagNCh1zSbPWblVN7p9NH8rNwQQVyESJTdk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "emcee";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dfm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1x9y4zwlv6hl7jms2knpa2qrh89ywsl847yb7d93n94gyx2s16p0";
|
||||
sha256 = "0q9dj7mihjjkcy6famzwhz1xcxxzzvm00n01w4bbm66ax9zvis52";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "envisage";
|
||||
version = "5.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zrxlq4v3091727vf10ngc8418sp26raxa8q83i4h0sydfkh2dic";
|
||||
sha256 = "8864c29aa344f7ac26eeb94788798f2d0cc791dcf95c632da8d79ebc580e114c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ traits apptools setuptools ];
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi";
|
||||
version = "0.68.0";
|
||||
version = "0.68.1";
|
||||
format = "flit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tiangolo";
|
||||
repo = "fastapi";
|
||||
rev = version;
|
||||
sha256 = "00cjkc90h0qlca30g981zvwlxh2wc3rfipw25v667jdl9x5gxv9p";
|
||||
sha256 = "sha256-zwfopyig4ImMbkx89l8SsLW8PzoVcDN5KSd7a7fOnms=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "forecast-solar";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "forecast_solar";
|
||||
rev = version;
|
||||
sha256 = "12d9bb3q7gp0yy152x0rcbi727wrg3w9458asp2nhnqlb8nm6j4d";
|
||||
sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "haversine";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapado";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1PXPsZd/4pN42TU0lhXWsmyX7uGP1n/xna2cVZPczB4=";
|
||||
sha256 = "sha256-Q38oeSy1ilXWc2r/GW8EWQHH2Ty+DyTxxrDX3OcOwKc=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
52
pkgs/development/python-modules/hy/default.nix
Normal file
52
pkgs/development/python-modules/hy/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, astor
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, funcparserlib
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rply
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hy";
|
||||
version = "1.0a3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hylang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1dqw24rvsps2nab1pbjjm1c81vrs34r4kkk691h3xdyxnv9hb84b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
funcparserlib
|
||||
rply
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
astor
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Don't test the binary
|
||||
"test_bin_hy"
|
||||
"test_hystartup"
|
||||
"est_hy2py_import"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "hy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python to/from Lisp layer";
|
||||
homepage = "https://github.com/hylang/hy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat";
|
||||
version = "0.7.8";
|
||||
version = "0.7.9";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "executablebooks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0zvgz2c517ig31hcrf05gv4h68zpqk56asnmwx072ld8gk2ff8ag";
|
||||
sha256 = "sha256-qGRZCDo/ACSXtJa4omepjaR0KNWeR4vvvUUbQpKlrtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
38
pkgs/development/python-modules/mutf8/default.nix
Normal file
38
pkgs/development/python-modules/mutf8/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mutf8";
|
||||
version = "1.0.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TkTech";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0p9xczkhrf9d3n44k6kxbnk9sm831k5gkiagk6vm75vcmzm7zdqc";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
# Using pytestCheckHook results in test failures
|
||||
pytest
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "mutf8" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast MUTF-8 encoder & decoder";
|
||||
homepage = "https://github.com/TkTech/mutf8";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } :
|
||||
buildPythonPackage rec {
|
||||
pname = "OWSLib";
|
||||
version = "0.24.1";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4973c2ba65ec850a3fcc1fb94cefe5ed2fed83aaf2a5e2135c78810ad2a8f0e1";
|
||||
sha256 = "20d79bce0be10277caa36f3134826bd0065325df0301a55b2c8b1c338d8d8f0a";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pooch";
|
||||
version = "1.4.0";
|
||||
version = "1.5.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f827e79ab51b21a8964a4b1ea8972aa4a1079cb9c1ff8e9ec61893eb7dab50cb";
|
||||
sha256 = "57ab0c43e9c5bd81227b08b9931435d71c118cd53339cc5925123a740f40b312";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pname = "portalocker";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0k08c0qg21mwz3iqbd20ab22nq705q7cal4a1qr8qnd6ga03v4af";
|
||||
sha256 = "5ff2e494eccd3ff1cbaba8e4defd45bc7edb8eea3908c74f6de5d40641a1ed92";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyTelegramBotAPI";
|
||||
version = "3.7.9";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7774314ff429852d423d5dfebe8fc1011dca93a028f1ccb0c56db6817245b752";
|
||||
sha256 = "cf83c652b88b4b1535a306a9b0c2f34bf6c390cebb9553ef34369e6290fc9496";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -1,26 +1,28 @@
|
||||
{ buildPythonPackage, isPy3k, lib, fetchPypi, six, pytest }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybase64";
|
||||
version = "1.1.4";
|
||||
version = "1.2.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f0e0db1dee2a2cbf35e6710ea138594ecc1e0f491ff9103f136de83d8f159315";
|
||||
sha256 = "9e310fcf5cfa2cbf7d1d7eb503b6066bec785216bcd1d8c0a736f59d5ec21b0b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
pythonImportsCheck = [ "pybase64" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.python.org/pypi/pybase64";
|
||||
description = "Fast Base64 encoding/decoding";
|
||||
homepage = "https://github.com/mayeut/pybase64";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
};
|
||||
|
||||
39
pkgs/development/python-modules/pydmd/default.nix
Normal file
39
pkgs/development/python-modules/pydmd/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, python
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, future
|
||||
, numpy
|
||||
, scipy
|
||||
, matplotlib
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydmd";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mathLab";
|
||||
repo = "PyDMD";
|
||||
rev = "v${version}";
|
||||
sha256 = "1516dhmpwi12v9ly9jj18wpz9k696q5k6aamlrbby8wp8smajgrv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future numpy scipy matplotlib ];
|
||||
checkInputs = [ nose ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} test.py
|
||||
'';
|
||||
pythonImportsCheck = [ "pydmd" ];
|
||||
|
||||
meta = {
|
||||
description = "Python Dynamic Mode Decomposition";
|
||||
homepage = "https://mathlab.github.io/PyDMD/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yl3dy ];
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
}
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyezviz";
|
||||
version = "0.1.9.1";
|
||||
version = "0.1.9.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baqs";
|
||||
repo = "pyEzviz";
|
||||
rev = version;
|
||||
sha256 = "sha256-KsdJC09KugvAgkRZ5H5zrIJ5hC5Vt4QwGWML8kNnR7Y=";
|
||||
sha256 = "sha256-t5b2PuHC+ZY2uh+ryS+bjTS7kReZi0Rvlvkr98JFyH4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyftdi";
|
||||
version = "0.53.2";
|
||||
version = "0.53.3";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eblot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6cTQlYG/z8ZulMZLggGQ+PhuOOclWM0/+cfy0SF6dls=";
|
||||
sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyusb pyserial ];
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymyq";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arraylabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DvwnbZa1/Y08rrxdXgffkjaGAVdRkPmYCD+Xkv0h7OE=";
|
||||
sha256 = "sha256-V2u2wUSPwiF6o6OWhQVKiHtzhn0/rzyM6e2+a+D7UNA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -21,7 +21,7 @@ let
|
||||
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
|
||||
in buildPythonPackage rec {
|
||||
pname = "pyopencl";
|
||||
version = "2021.2.2";
|
||||
version = "2021.2.6";
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
|
||||
@ -30,7 +30,7 @@ in buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "50876f16624bc623fa2eff98a91259761b51471e186f535d4d4e7bce58292f0c";
|
||||
sha256 = "df208546d28a3274ba7b554d50643ed1e393b8f3f75a43b24b83d3ee76597587";
|
||||
};
|
||||
|
||||
# py.test is not needed during runtime, so remove it from `install_requires`
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysyncthru";
|
||||
version = "0.7.5";
|
||||
version = "0.7.7";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "nielstron";
|
||||
repo = "pysyncthru";
|
||||
rev = "release-${version}";
|
||||
sha256 = "122zxwqwx03vaxbhmp3cjibjnkirayz0w68gvslsdr7n9nqv3pgz";
|
||||
sha256 = "1449lbg9dx13p03v6fl2ap0xk5i5wrmy6amx1pl0rgz712p5jmq7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-mpl";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4a223909e5148c99bd18891848c7871457729322c752c9c470bd8dd6bdf9f940";
|
||||
sha256 = "582db6e14315f9b08cbd2df39b136dc344bfe8a27c2f05b995460fb0969ec19e";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, poetry
|
||||
, poetry-core
|
||||
, docopt-ng
|
||||
, easywatch
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
, pytest-check
|
||||
, pythonOlder
|
||||
, markdown
|
||||
, testVersion
|
||||
, tomlkit
|
||||
, staticjinja
|
||||
}:
|
||||
|
||||
@ -17,6 +19,8 @@ buildPythonPackage rec {
|
||||
version = "4.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# No tests in pypi
|
||||
src = fetchFromGitHub {
|
||||
owner = "staticjinja";
|
||||
@ -26,7 +30,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -39,6 +43,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
pytest-check
|
||||
markdown
|
||||
tomlkit
|
||||
];
|
||||
|
||||
# The tests need to find and call the installed staticjinja executable
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tinydb";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
format = "pyproject";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "msiemens";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rJVJfsPhGTQpE6p0kzN6GDR0r9M71ADa67Oi5jLgeWY=";
|
||||
sha256 = "1p0whrljjh7cpigr1glszssxsi6adi4cj7y3976q8sj9z47bdx8a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
, pytestCheckHook
|
||||
, pytest-xdist
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typecode";
|
||||
version = "21.6.1";
|
||||
@ -40,6 +41,10 @@ buildPythonPackage rec {
|
||||
pytest-xdist
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"TestFileTypesDataDriven"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"typecode"
|
||||
];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.6.4";
|
||||
version = "1.7.0";
|
||||
pname = "xmlschema";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0KVGu163t3stCgx7aWW/Ggf6CUW2ZhOOnPU6FfGHfKA=";
|
||||
sha256 = "0vf0gj1sbv9f7gjm3zbyl0b8pkrn00yzx57ddff0h2kazv8jlpwi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ elementpath ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yara-python";
|
||||
version = "4.1.0";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = "yara-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w48skmjbb5529g8fyzdjj9jkmavqiq6wh1dr004xdp3nhlqn9y7";
|
||||
sha256 = "1sg7ghb43qajziiym1y584rk0wfflyfc9fx507wrh4iahq5xp622";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yeelight";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "stavros";
|
||||
repo = "python-yeelight";
|
||||
rev = "v${version}";
|
||||
sha256 = "06pg5q50dw5a0h6jnln8419asi8nahzvlk0s65ymykqq0jxac31y";
|
||||
sha256 = "sha256-sdSzriAgY3LSOeyPB2Pe1k9iamStZ1OlYXJZviRa+TY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zarr";
|
||||
version = "2.8.3";
|
||||
version = "2.9.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8aece33269ba3ee2af9320aa528d5fe93f76c30e4ad7fdbfb604b1db3f0d779f";
|
||||
sha256 = "688afec069e0f85b87c1ef4572766f998309c64ab7bea1884cec60e92d109544";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,8 +27,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# FIXME: how to keep this up-to-date
|
||||
# https://github.com/radareorg/vector35-arch-arm64/
|
||||
# FIXME: Compare revision with https://github.com/radareorg/radare2/blob/master/libr/asm/arch/arm/v35arm64/Makefile#L20
|
||||
arm64 = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "vector35-arch-arm64";
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "vaultenv";
|
||||
version = "0.13.1";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
|
||||
sha256 = "0ycf5skxjns77sgbm8faq9ps9rs2hqznsbzrd51hdkpak56k42cp";
|
||||
sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48=";
|
||||
};
|
||||
|
||||
buildTools = [ hpack ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kafkacat";
|
||||
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edenhill";
|
||||
repo = "kafkacat";
|
||||
rev = version;
|
||||
sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs";
|
||||
sha256 = "sha256-koDhj/RQc9fhfqjrJylhURw6tppPELhLlBGbNVJsii8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2021-08-16";
|
||||
cargoSha256 = "sha256-nTO6NmY0pqVud7kpOltHBOkaLlwfIdCrchV0o93FeVk=";
|
||||
version = "2021-08-23";
|
||||
cargoSha256 = "sha256-FMOLYR8cyimAA71SlxcT370wpeNH4f8vwv+oAhUd8zc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-analyzer";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-FD1AwRiSTbj10+ielHBRkDTC7wyBBSatAlzyEow5CNE=";
|
||||
sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
|
||||
@ -17,15 +17,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5/n4DpTWPwCVfTk0rqxPhKaKXu3KqotgiYCj8tRAqaM=";
|
||||
sha256 = "sha256-qAUQOTqVNTUSmKXoCwId4Bm6ashLLpY0QEWr8gyXxR4=";
|
||||
};
|
||||
cargoSha256 = "sha256-FY8qXqVDKxai4VwdruJ7aBNTdXK5taOuvTr6gTgU8BM=";
|
||||
cargoSha256 = "sha256-pwP5XbWuK0g45zmamWUO9kiY8gzoNqk7nC7aGTCFhyY=";
|
||||
|
||||
# Install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rust-analyzer",
|
||||
"version": "0.2.710",
|
||||
"version": "0.2.718",
|
||||
"dependencies": {
|
||||
"https-proxy-agent": "^5.0.0",
|
||||
"node-fetch": "^2.6.1",
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acpi-call";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
name = "${pname}-${version}-${kernel.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "acpi_call";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg";
|
||||
sha256 = "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
@ -8,12 +8,12 @@ let
|
||||
_kernel = kernel;
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ six ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "2.14.2";
|
||||
version = "2.15.1";
|
||||
pname = "openvswitch";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-ZfQg+VTiUNiV+y2yKhMuHLVgvF4rkFHoNFETSBCOWXo=";
|
||||
sha256 = "0vgijwycf3wvzv9v811jrfr5rlwmihlxwpf16spl6k9n6zaswysw";
|
||||
};
|
||||
|
||||
kernel = optional (_kernel != null) _kernel.dev;
|
||||
|
||||
@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
inherit (wireguard-tools.meta) homepage license maintainers;
|
||||
description = "Kernel module for the WireGuard secure network tunnel";
|
||||
longDescription = ''
|
||||
Backport of WireGuard for kernels 3.10 to 5.5, as an out of tree module.
|
||||
(as WireGuard was merged into the Linux kernel for 5.6)
|
||||
'';
|
||||
downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -24,6 +24,18 @@ let
|
||||
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
|
||||
(mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270")
|
||||
|
||||
(self: super: {
|
||||
async-upnp-client = super.async-upnp-client.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.19.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "1v8d2lvxihqasn7866zssys16s0lgxkk6ri2dp4rr7wr8g9ixvdr";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# Pinned due to API changes in iaqualink>=2.0, remove after
|
||||
# https://github.com/home-assistant/core/pull/48137 was merged
|
||||
(self: super: {
|
||||
|
||||
@ -12,11 +12,11 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.40.0";
|
||||
version = "1.41.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU=";
|
||||
sha256 = "sha256-KLsTr8dKp8k7TcrC598ApDib7P0m9evmfdl8jbsZLdc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
28
pkgs/servers/postfixadmin/default.nix
Normal file
28
pkgs/servers/postfixadmin/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ fetchFromGitHub, stdenv, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postfixadmin";
|
||||
version = "3.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0xck6df96r4z8k2j8x20b8h2qvmzyrfsya82s4i7hfhrxii92d3w";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r * $out/
|
||||
ln -sf /etc/postfixadmin/config.local.php $out/
|
||||
ln -sf /var/cache/postfixadmin/templates_c $out/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Web based virtual user administration interface for Postfix mail servers";
|
||||
homepage = "https://postfixadmin.sourceforge.io/";
|
||||
maintainers = with lib.maintainers; [ globin ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -2,20 +2,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.12.3";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jjxO35PaxEI9n0qsawTPt3mHNC0PjWfmEA4NkIAwyTY=";
|
||||
sha256 = "sha256-FlPb7PtX/q34I7DZBLB9RIlg9tjKqktwn7N8Pv02hYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
vendorSha256 = "sha256-2MPenTV0fgvXbf8WkoPd9uApPSDLPyHtCq9o3CHB/D0=";
|
||||
vendorSha256 = "sha256-em6443czDMak9RxLq7Dj9miknqg29vf0a0N82LmNrHk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,25 +1,49 @@
|
||||
{ python3Packages, fetchFromGitHub , tarsnap }:
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, tarsnap
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "tarsnapper-${version}";
|
||||
pname = "tarsnapper";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miracle2k";
|
||||
repo = "tarsnapper";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03db49188f4v1946c8mqqj30ah10x68hbg3a58js0syai32v12pm";
|
||||
};
|
||||
|
||||
checkInputs = with python3Packages; [ nose pytest ];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyyaml
|
||||
python-dateutil
|
||||
pexpect
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
nose
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Remove standard module argparse from requirements
|
||||
./remove-argparse.patch
|
||||
];
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tarsnap ]}" ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test .
|
||||
runHook preCheck
|
||||
nosetests tests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ pyyaml python-dateutil pexpect ];
|
||||
pythonImportsCheck = [ "tarsnapper" ];
|
||||
|
||||
patches = [ ./remove-argparse.patch ];
|
||||
|
||||
makeWrapperArgs = ["--prefix PATH : ${tarsnap}/bin"];
|
||||
meta = with lib; {
|
||||
description = "Wrapper which expires backups using a gfs-scheme";
|
||||
homepage = "https://github.com/miracle2k/tarsnapper";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "resvg";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RazrFalcon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FjL/7SC1XtQyI+vlkDbQR2848vhV4Lvx3htSN3RSohw=";
|
||||
sha256 = "sha256-A54KTToi69l0/Nrz4K8EqFpCodbomYUI/zTP++Y4FF0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-FfTkturHQqnTAzkEHDn/M/UiLMH1L/+Kv/zov8n8sek=";
|
||||
cargoSha256 = "sha256-RbgLZvNZSNjYImVm8Ax5cAL3R0XqlVz5ApPYKj93GEE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zMmQxg+Qdb4pu+gzouz/lpIu6/u+GaYPhIet7xAgTIk=";
|
||||
sha256 = "sha256-6BzocbG7I3ZHlPGZ2GRY/n9ezRF2OER9BFaoIq0yBro=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y=";
|
||||
vendorSha256 = "sha256-i20Zt1ZP1ij1Qp4moNZqUTQOHPlchonFF7ag5qjMoqg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpufetch";
|
||||
version = "0.98";
|
||||
version = "1.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dr-Noob";
|
||||
repo = "cpufetch";
|
||||
rev = "v${version}";
|
||||
sha256 = "060hmkwmb5ybcrj9jfx9681zk92489kq71nl6nacn8nfqrcn3qdb";
|
||||
sha256 = "sha256-2Iar7RwL3T4DrFbqKJFys/R+VENRg2lmYFkslEaZeVE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "disfetch";
|
||||
version = "2.13";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "q60";
|
||||
repo = "disfetch";
|
||||
rev = version;
|
||||
sha256 = "sha256-+0WWhf7VYqPWgt1IwKQ74HLCLfhXsstA7Eh9VU/BKhg=";
|
||||
sha256 = "sha256-T6FepZBlB1ZZMVFS7zXqSDFCsHbbVNkJNwIHpQ5Ex68=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tendermint";
|
||||
version = "0.34.8";
|
||||
version = "0.34.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tendermint";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:03k44w23167az2kk6ccp3139kykzkhack4w2vy0wvs2lb67xiqd9";
|
||||
sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0Y9QDBVNYE2x3nY3loRKTCtYWXRnK7v+drRVvTMY4Dg=";
|
||||
vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI=";
|
||||
|
||||
subPackages = [ "cmd/tendermint" ];
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
|
||||
url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz";
|
||||
sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg=";
|
||||
};
|
||||
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, openssl, expat, libevent, swig, pythonPackages }:
|
||||
{ lib, stdenv, unbound, openssl, expat, libevent, swig, pythonPackages }:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) python;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyunbound";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz";
|
||||
sha256 = "sha256-ChO1R/O5KgJrXr0EI/VMmR5XGAN/2fckRYF/agQOGoM=";
|
||||
};
|
||||
inherit (unbound) version src;
|
||||
|
||||
nativeBuildInputs = [ swig ];
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sun, 5 Jan 2020 15:35:15 +0100
|
||||
Subject: [PATCH] Fix darwin build
|
||||
|
||||
---
|
||||
rwcancel/select_default.go | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go
|
||||
index dd23cda..03f3452 100644
|
||||
--- a/rwcancel/select_default.go
|
||||
+++ b/rwcancel/select_default.go
|
||||
@@ -9,6 +9,7 @@ package rwcancel
|
||||
|
||||
import "golang.org/x/sys/unix"
|
||||
|
||||
-func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error {
|
||||
- return unix.Select(nfd, r, w, e, timeout)
|
||||
+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) {
|
||||
+ _, err = unix.Select(nfd, r, w, e, timeout)
|
||||
+ return
|
||||
}
|
||||
--
|
||||
2.23.1
|
||||
|
||||
@ -2,17 +2,15 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "wireguard-go";
|
||||
version = "0.0.20200320";
|
||||
version = "0.0.20210424";
|
||||
|
||||
goPackagePath = "golang.zx2c4.com/wireguard";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
|
||||
sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r";
|
||||
sha256 = "RUUueSsfEi1H+ckrnPKqbVlWONhCplMMftlyAmwK+ss=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Fix-darwin-build.patch ];
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
@ -21,10 +19,12 @@ buildGoPackage rec {
|
||||
mv $out/bin/wireguard $out/bin/wireguard-go
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Userspace Go implementation of WireGuard";
|
||||
homepage = "https://git.zx2c4.com/wireguard-go/about/";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ];
|
||||
};
|
||||
}
|
||||
|
||||
1774
pkgs/tools/networking/wireguard-go/deps.nix
generated
1774
pkgs/tools/networking/wireguard-go/deps.nix
generated
File diff suppressed because it is too large
Load Diff
@ -53,6 +53,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for the WireGuard secure network tunnel";
|
||||
longDescription = ''
|
||||
Supplies the main userspace tooling for using and configuring WireGuard tunnels, including the wg(8) and wg-quick(8) utilities.
|
||||
- wg : the configuration utility for getting and setting the configuration of WireGuard tunnel interfaces. The interfaces
|
||||
themselves can be added and removed using ip-link(8) and their IP addresses and routing tables can be set using ip-address(8)
|
||||
and ip-route(8). The wg utility provides a series of sub-commands for changing WireGuard-specific aspects of WireGuard interfaces.
|
||||
- wg-quick : an extremely simple script for easily bringing up a WireGuard interface, suitable for a few common use cases.
|
||||
'';
|
||||
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
|
||||
homepage = "https://www.wireguard.com/";
|
||||
license = licenses.gpl2;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "enum4linux-ng";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cddmp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0dhg8cwbdn0vlnchhscx31ay4mgj5p6rf73wzgs8nvqg0shsawmy";
|
||||
sha256 = "1j6qrhrzc4f9crbii4dpgxipngjh5icrhljxf26a7662dd4f7l8q";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-08-21";
|
||||
version = "2021-08-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3XSk6a8gaCF8X1Plyfyi1Jtfp2sDLgbstv67hvlM3Gk=";
|
||||
sha256 = "sha256-+tmSnPICX8CoD7YBsph2k0AfEg/IhCyYMHkXyVTYaIQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -5,17 +5,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "otpauth";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dim13";
|
||||
repo = "otpauth";
|
||||
rev = "v${version}";
|
||||
sha256 = "199kh544kx4cbsczc9anmciczi738gdc5g518ybb05h49vlb51dp";
|
||||
sha256 = "sha256-Jr1cZbXKZa6M7tIex67SjDPkWSYHWSZ7vRYd8us7Oek=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "1762cchqydgsf94y05dwxcrajvjr64ayi5xk1svn1xissyc7vgpv";
|
||||
vendorSha256 = "sha256-s0pcm3fO50cuMEJ6Pp7qay6BGGa+FCiBegUbQlB0OnY=";
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
35
pkgs/tools/security/regexploit/default.nix
Normal file
35
pkgs/tools/security/regexploit/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "regexploit";
|
||||
version = "1.0.0";
|
||||
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doyensec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0z3fghsyw0ll36in7ihc0qi3gy7mqi6cw1mi8m8c8xb1nlwpfr0y";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyyaml
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "regexploit" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to find regular expressions which are vulnerable to ReDoS";
|
||||
homepage = "https://github.com/doyensec/regexploit";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -14,14 +14,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
pname = "yara";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = "yara";
|
||||
rev = "v${version}";
|
||||
sha256 = "185j7firn7i5506rcp0va7sxdbminwrm06jsm4c70jf98qxmv522";
|
||||
sha256 = "0n716snh0h5pk00kps6xvfi8z16xw12h1a8cd7w02cj2537xzj3m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mark";
|
||||
version = "6.0";
|
||||
version = "6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovetskiy";
|
||||
repo = "mark";
|
||||
rev = version;
|
||||
sha256 = "sha256-zap6YE6Pi/Db0mY4jagJXB1JXhs7q3y3BNw9EucJkAM=";
|
||||
sha256 = "sha256-Nk7DbZdz8BbsZO/Sx36ALNXRtSUju3X6S8M0yFs+Yz0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0=";
|
||||
|
||||
@ -5532,7 +5532,10 @@ with pkgs;
|
||||
google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk {
|
||||
python = python3;
|
||||
};
|
||||
google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; };
|
||||
google-cloud-sdk-gce = google-cloud-sdk.override {
|
||||
python = python38;
|
||||
with-gce = true;
|
||||
};
|
||||
|
||||
google-fonts = callPackage ../data/fonts/google-fonts { };
|
||||
|
||||
@ -8339,7 +8342,9 @@ with pkgs;
|
||||
|
||||
remarshal = callPackage ../development/tools/remarshal { };
|
||||
|
||||
rehex = callPackage ../applications/editors/rehex { };
|
||||
rehex = callPackage ../applications/editors/rehex {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
|
||||
};
|
||||
|
||||
rig = callPackage ../tools/misc/rig {
|
||||
stdenv = gccStdenv;
|
||||
@ -12930,6 +12935,8 @@ with pkgs;
|
||||
|
||||
red = callPackage ../development/interpreters/red { };
|
||||
|
||||
regexploit = callPackage ../tools/security/regexploit { };
|
||||
|
||||
regextester = callPackage ../applications/misc/regextester { };
|
||||
|
||||
regina = callPackage ../development/interpreters/regina { };
|
||||
@ -20096,6 +20103,8 @@ with pkgs;
|
||||
|
||||
postfix = callPackage ../servers/mail/postfix { };
|
||||
|
||||
postfixadmin = callPackage ../servers/postfixadmin { };
|
||||
|
||||
postsrsd = callPackage ../servers/mail/postsrsd { };
|
||||
|
||||
rspamd = callPackage ../servers/mail/rspamd { };
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user