Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
610ef47b20
@ -2289,6 +2289,12 @@
|
||||
fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
|
||||
}];
|
||||
};
|
||||
d-xo = {
|
||||
email = "hi@d-xo.org";
|
||||
github = "d-xo";
|
||||
githubId = 6689924;
|
||||
name = "David Terry";
|
||||
};
|
||||
dadada = {
|
||||
name = "dadada";
|
||||
email = "dadada@dadada.li";
|
||||
@ -3243,6 +3249,12 @@
|
||||
fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02";
|
||||
}];
|
||||
};
|
||||
ereslibre = {
|
||||
email = "ereslibre@ereslibre.es";
|
||||
github = "ereslibre";
|
||||
githubId = 8706;
|
||||
name = "Rafael Fernández López";
|
||||
};
|
||||
ericbmerritt = {
|
||||
email = "eric@afiniate.com";
|
||||
github = "ericbmerritt";
|
||||
@ -11710,12 +11722,6 @@
|
||||
githubId = 1962985;
|
||||
name = "Vincenzo Mantova";
|
||||
};
|
||||
xwvvvvwx = {
|
||||
email = "davidterry@posteo.de";
|
||||
github = "xwvvvvwx";
|
||||
githubId = 6689924;
|
||||
name = "David Terry";
|
||||
};
|
||||
xzfc = {
|
||||
email = "xzfcpw@gmail.com";
|
||||
github = "xzfc";
|
||||
|
||||
@ -841,6 +841,15 @@
|
||||
version of zfs.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Nginx will use the value of
|
||||
<literal>sslTrustedCertificate</literal> if provided for a
|
||||
virtual host, even if <literal>enableACME</literal> is set.
|
||||
This is useful for providers not using the same certificate to
|
||||
sign OCSP responses and server certificates.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -213,3 +213,5 @@ pt-services.clipcat.enable).
|
||||
- The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up.
|
||||
|
||||
- Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs.
|
||||
|
||||
- Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates.
|
||||
|
||||
@ -21,15 +21,51 @@ let
|
||||
# The Group can vary depending on what the user has specified in
|
||||
# security.acme.certs.<cert>.group on some of the services.
|
||||
commonServiceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "acme";
|
||||
Group = mkDefault "acme";
|
||||
UMask = 0022;
|
||||
StateDirectoryMode = 750;
|
||||
ProtectSystem = "full";
|
||||
PrivateTmp = true;
|
||||
Type = "oneshot";
|
||||
User = "acme";
|
||||
Group = mkDefault "acme";
|
||||
UMask = 0022;
|
||||
StateDirectoryMode = 750;
|
||||
ProtectSystem = "strict";
|
||||
ReadWritePaths = [
|
||||
"/var/lib/acme"
|
||||
];
|
||||
PrivateTmp = true;
|
||||
|
||||
WorkingDirectory = "/tmp";
|
||||
WorkingDirectory = "/tmp";
|
||||
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
ProtectClock = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
# 1. allow a reasonable set of syscalls
|
||||
"@system-service"
|
||||
# 2. and deny unreasonable ones
|
||||
"~@privileged @resources"
|
||||
# 3. then allow the required subset within denied groups
|
||||
"@chown"
|
||||
];
|
||||
};
|
||||
|
||||
# In order to avoid race conditions creating the CA for selfsigned certs,
|
||||
|
||||
@ -96,8 +96,10 @@ in
|
||||
users.users.polkituser = {
|
||||
description = "PolKit daemon";
|
||||
uid = config.ids.uids.polkituser;
|
||||
group = "polkituser";
|
||||
};
|
||||
|
||||
users.groups.polkituser = {};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -220,7 +220,7 @@ with lib;
|
||||
after = [ "network.target" ];
|
||||
|
||||
preStart = ''
|
||||
mkdir -p /var/spool/nullmailer/{queue,tmp}
|
||||
mkdir -p /var/spool/nullmailer/{queue,tmp,failed}
|
||||
rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
|
||||
'';
|
||||
|
||||
|
||||
@ -312,6 +312,31 @@ in
|
||||
AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
|
||||
Restart = "on-failure";
|
||||
RestartSec = "5s";
|
||||
# Hardening
|
||||
CapabilityBoundingSet = if (cfg.server.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];
|
||||
DeviceAllow = [ "" ];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateDevices = true;
|
||||
# A private user cannot have process capabilities on the host's user
|
||||
# namespace and thus CAP_NET_BIND_SERVICE has no effect.
|
||||
PrivateUsers = (cfg.server.port >= 1024);
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@ with lib;
|
||||
default = false;
|
||||
description = ''
|
||||
This option enables Mullvad VPN daemon.
|
||||
This sets <option>networking.firewall.checkReversePath</option> to "loose", which might be undesirable for security.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -18,6 +19,9 @@ with lib;
|
||||
# mullvad-daemon writes to /etc/iproute2/rt_tables
|
||||
networking.iproute2.enable = true;
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/113589
|
||||
networking.firewall.checkReversePath = "loose";
|
||||
|
||||
systemd.services.mullvad-daemon = {
|
||||
description = "Mullvad VPN daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
@ -42,5 +46,5 @@ with lib;
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ maintainers.xfix ];
|
||||
meta.maintainers = with maintainers; [ ymarkus ];
|
||||
}
|
||||
|
||||
@ -81,17 +81,26 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
initstepslew = mkOption {
|
||||
type = types.attrsOf (types.either types.bool types.int);
|
||||
default = {
|
||||
enabled = true;
|
||||
threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s)
|
||||
initstepslew = {
|
||||
enabled = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Allow chronyd to make a rapid measurement of the system clock error
|
||||
at boot time, and to correct the system clock by stepping before
|
||||
normal operation begins.
|
||||
'';
|
||||
};
|
||||
|
||||
threshold = mkOption {
|
||||
type = types.either types.float types.int;
|
||||
default = 1000; # by default, same threshold as 'ntpd -g' (1000s)
|
||||
description = ''
|
||||
The threshold of system clock error (in seconds) above which the
|
||||
clock will be stepped. If the correction required is less than the
|
||||
threshold, a slew is used instead.
|
||||
'';
|
||||
};
|
||||
description = ''
|
||||
Allow chronyd to make a rapid measurement of the system clock error at
|
||||
boot time, and to correct the system clock by stepping before normal
|
||||
operation begins.
|
||||
'';
|
||||
};
|
||||
|
||||
directory = mkOption {
|
||||
|
||||
@ -427,9 +427,12 @@ in
|
||||
nameValuePair ("tinc.${network}") ({
|
||||
description = "Tinc daemon user for ${network}";
|
||||
isSystemUser = true;
|
||||
group = "tinc.${network}";
|
||||
})
|
||||
);
|
||||
|
||||
users.groups = flip mapAttrs' cfg.networks (network: _:
|
||||
nameValuePair "tinc.${network}" {}
|
||||
);
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ minijackson ];
|
||||
|
||||
@ -22,7 +22,9 @@ let
|
||||
} // (optionalAttrs (vhostConfig.enableACME || vhostConfig.useACMEHost != null) {
|
||||
sslCertificate = "${certs.${certName}.directory}/fullchain.pem";
|
||||
sslCertificateKey = "${certs.${certName}.directory}/key.pem";
|
||||
sslTrustedCertificate = "${certs.${certName}.directory}/chain.pem";
|
||||
sslTrustedCertificate = if vhostConfig.sslTrustedCertificate != null
|
||||
then vhostConfig.sslTrustedCertificate
|
||||
else "${certs.${certName}.directory}/chain.pem";
|
||||
})
|
||||
) cfg.virtualHosts;
|
||||
enableIPv6 = config.networking.enableIPv6;
|
||||
|
||||
@ -145,7 +145,7 @@ with lib;
|
||||
sslTrustedCertificate = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/var/root.cert";
|
||||
example = "\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
description = "Path to root SSL certificate for stapling and client certificates.";
|
||||
};
|
||||
|
||||
|
||||
@ -1128,6 +1128,7 @@ in
|
||||
|
||||
users.groups.systemd-journal.gid = config.ids.gids.systemd-journal;
|
||||
users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway;
|
||||
users.users.systemd-journal-gateway.group = "systemd-journal-gateway";
|
||||
users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway;
|
||||
|
||||
# Generate timer units for all services that have a ‘startAt’ value.
|
||||
|
||||
@ -86,6 +86,7 @@ in
|
||||
|
||||
StateDirectory = "containerd";
|
||||
RuntimeDirectory = "containerd";
|
||||
RuntimeDirectoryPreserve = "yes";
|
||||
};
|
||||
unitConfig = {
|
||||
StartLimitBurst = "16";
|
||||
|
||||
@ -105,9 +105,9 @@ in import ./make-test-python.nix ({ lib, ... }: {
|
||||
security.acme.certs."a.example.test".keyType = "ec384";
|
||||
security.acme.certs."a.example.test".postRun = ''
|
||||
set -euo pipefail
|
||||
touch test
|
||||
chown root:root test
|
||||
echo testing > test
|
||||
touch /home/test
|
||||
chown root:root /home/test
|
||||
echo testing > /home/test
|
||||
'';
|
||||
};
|
||||
|
||||
@ -383,7 +383,7 @@ in import ./make-test-python.nix ({ lib, ... }: {
|
||||
switch_to(webserver, "cert-change")
|
||||
webserver.wait_for_unit("acme-finished-a.example.test.target")
|
||||
check_connection_key_bits(client, "a.example.test", "384")
|
||||
webserver.succeed("grep testing /var/lib/acme/a.example.test/test")
|
||||
webserver.succeed("grep testing /home/test")
|
||||
# Clean to remove the testing file (and anything else messy we did)
|
||||
webserver.succeed("systemctl clean acme-a.example.test.service --what=state")
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
in
|
||||
{
|
||||
name = "bazarr";
|
||||
meta.maintainers = with maintainers; [ xwvvvvwx ];
|
||||
meta.maintainers = with maintainers; [ d-xo ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
|
||||
@ -6,11 +6,13 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
nodes.machine = {
|
||||
services.nitter.enable = true;
|
||||
# Test CAP_NET_BIND_SERVICE
|
||||
services.nitter.server.port = 80;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("nitter.service")
|
||||
machine.wait_for_open_port("8080")
|
||||
machine.succeed("curl --fail http://localhost:8080/")
|
||||
machine.wait_for_open_port("80")
|
||||
machine.succeed("curl --fail http://localhost:80/")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
{
|
||||
name = "wg-quick";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ xwvvvvwx ];
|
||||
maintainers = [ d-xo ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boops";
|
||||
version = "1.6.0";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = "BOops";
|
||||
rev = version;
|
||||
sha256 = "sha256-7eNvt8PxIZCp83Y5XX5fBolBon4j+HPtu8wrgG8Miok=";
|
||||
sha256 = "sha256-rljUb0fj231MQh+7jTpjAsZm1QkNzfdSpcI1cS5fs/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -13,17 +13,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "helvum";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "ryuukyu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A=";
|
||||
sha256 = "sha256-AlHCK4pWaoNjR0eflxHBsuVaaily/RvCbgJv/ByQZK4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU=";
|
||||
cargoSha256 = "sha256-mAhh12rGvQjs2xtm+OrtVv0fgG6qni/QM/oRYoFR7U8=";
|
||||
|
||||
nativeBuildInputs = [ clang copyDesktopItems pkg-config ];
|
||||
buildInputs = [ glib gtk4 pipewire ];
|
||||
|
||||
@ -18,7 +18,7 @@ buildGoPackage rec {
|
||||
description = "Generate QRCode to connect apps to lnd Resources";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/LN-Zap/lndconnect";
|
||||
maintainers = [ maintainers.xwvvvvwx ];
|
||||
maintainers = [ maintainers.d-xo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,6 +25,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/ledgerwatch/turbo-geth/";
|
||||
description = "Ethereum node and geth fork focused on scalability and modularity";
|
||||
license = with licenses; [ lgpl3Plus gpl3Plus ];
|
||||
maintainers = with maintainers; [ xwvvvvwx ];
|
||||
maintainers = with maintainers; [ d-xo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.22.1";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
sha256 = "sha256-fl/3mdVNqnoGfOEMOBWHGhtw9rEBUcrboS7hUNPGO8I=";
|
||||
sha256 = "sha256-Oci1y6//45Gep4IS6Ym+v9MPCP5mOswAiWPkXqd+zR0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cherrytree";
|
||||
version = "0.99.39";
|
||||
version = "0.99.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giuspen";
|
||||
repo = "cherrytree";
|
||||
rev = version;
|
||||
sha256 = "sha256-QSRYtnZxLAaq42PvPd5+LxSzq/Hd/Cz5bquBTiGWnAE=";
|
||||
sha256 = "sha256-K1rf8/7kEpfLOPYJGh5U2eTnr5XCDhuc+seoUAKW7aE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -29,13 +29,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elogind";
|
||||
version = "246.9.2";
|
||||
version = "246.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elogind";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EsW19D6eoEO4RJO+jwMA/SMFus+cxq9Fcy2zrcn9pd8=";
|
||||
sha256 = "sha256-+Nv6FL9Yjmfxs24+2mUTP//wbjzGUq4ftgJLfuEqBJg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,17 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zola";
|
||||
version = "unstable-2021-07-14";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getzola";
|
||||
repo = pname;
|
||||
# unstable because the latest release fails to build
|
||||
rev = "312ffcb04c06c5f157b9fd2b944b858703238592";
|
||||
sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mvin6pfqhsfhaifivbdi6qcn0dsa98w83m1n51q807gh4l1k2yj";
|
||||
};
|
||||
|
||||
cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8";
|
||||
cargoSha256 = "02bk399c7x15a5rkaz7ik65yihkfbjn1q46gx7l8hycqq7xb0xmg";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles];
|
||||
buildInputs = [ openssl oniguruma ]
|
||||
@ -30,6 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A fast static site generator with everything built-in";
|
||||
homepage = "https://www.getzola.org/";
|
||||
changelog = "https://github.com/getzola/zola/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dandellion dywedir _0x4A6F ];
|
||||
# set because of unstable-* version
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
, nix-update-script
|
||||
, cmake
|
||||
, pkg-config
|
||||
, fribidi
|
||||
, harfbuzz
|
||||
, libunistring
|
||||
, mpg123
|
||||
, openssl
|
||||
@ -15,27 +17,36 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.5.2";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI=";
|
||||
sha256 = "sha256-YTWVBQt0X12UDFJv/rPBqlIBC4iXSvpdYi/HIl+BPxc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm -r lib/fribidi lib/harfbuzz
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ]
|
||||
buildInputs = [ fribidi harfbuzz libunistring mpg123 openssl pcre SDL2 zlib ]
|
||||
++ lib.optional stdenv.isDarwin AppKit;
|
||||
|
||||
hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";
|
||||
|
||||
installPhase = if stdenv.isDarwin then ''
|
||||
cmakeFlags = [
|
||||
"-DENABLE_HARFBUZZ_MINIMAL:BOOL=OFF"
|
||||
"-DENABLE_FRIBIDI_BUILD:BOOL=OFF"
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv Lagrange.app $out/Applications
|
||||
'' else null;
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
|
||||
41
pkgs/applications/science/misc/cwltool/default.nix
Normal file
41
pkgs/applications/science/misc/cwltool/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "cwltool";
|
||||
version = "3.1.20210628163208";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "21b885f725420413d2f87eadc5e81c08a9c91beceda89b35d1a702ec4df47e52";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'prov == 1.5.1' 'prov'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
argcomplete
|
||||
bagit
|
||||
coloredlogs
|
||||
mypy-extensions
|
||||
prov
|
||||
psutil
|
||||
pydot
|
||||
schema-salad
|
||||
shellescape
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
doCheck = false; # hard to setup
|
||||
pythonImportsCheck = [ "cwltool" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.commonwl.org";
|
||||
license = with licenses; [ asl20 ];
|
||||
description = "Common Workflow Language reference implementation";
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchzip
|
||||
, fetchFromGitea
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, runCommandNoCC
|
||||
@ -94,8 +94,11 @@ stdenv.mkDerivation rec {
|
||||
pname = "foot";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h";
|
||||
};
|
||||
|
||||
@ -147,8 +150,9 @@ stdenv.mkDerivation rec {
|
||||
export AR="${ar}"
|
||||
'';
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype=release"
|
||||
"-Db_lto=true"
|
||||
"-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo"
|
||||
];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghq";
|
||||
version = "1.1.7";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x-motemen";
|
||||
repo = "ghq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kEs844gj1/PW7Kkpn1tvxfruznRIh2pjHCoSWGF1upQ=";
|
||||
sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI=";
|
||||
|
||||
@ -58,7 +58,7 @@ appimageTools.wrapType2 {
|
||||
description = "A decentralized app for code collaboration";
|
||||
homepage = "https://radicle.xyz/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xwvvvvwx ];
|
||||
maintainers = with maintainers; [ d-xo ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }:
|
||||
buildKodiAddon rec {
|
||||
pname = "requests-cache";
|
||||
namespace = "script.module.requests-cache";
|
||||
version = "0.5.2+matrix.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "0fgl4jayq6hbhqxg16nfy9qizwf54c8nvg0icv93knaj13zfzkz8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
passthru = {
|
||||
pythonPath = "lib";
|
||||
updateScript = addonUpdateScript {
|
||||
attrPath = "kodi.packages.requests-cache";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/reclosedev/requests-cache";
|
||||
description = "Persistent cache for requests library";
|
||||
license = licenses.bsd2;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
25
pkgs/applications/video/kodi-packages/routing/default.nix
Normal file
25
pkgs/applications/video/kodi-packages/routing/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
|
||||
buildKodiAddon rec {
|
||||
pname = "routing";
|
||||
namespace = "script.module.routing";
|
||||
version = "0.2.3+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "1qhp40xd8mbcvzwlamqw1j5l224ry086593948g24drpqiiyc8x6";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
pythonPath = "lib";
|
||||
updateScript = addonUpdateScript {
|
||||
attrPath = "kodi.packages.routing";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tamland/kodi-plugin-routing";
|
||||
description = "A routing module for kodi plugins";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
{ lib, buildKodiAddon, fetchFromGitHub, requests, requests-cache, routing }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "steam-library";
|
||||
namespace = "plugin.program.steam.library";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aanderse";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
sha256 = "1d8n8zkprjql0nw5ff752yr994hw2ikd0ny3m9hjr90s4kdykjzr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
requests-cache
|
||||
routing
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/aanderse/plugin.program.steam.library";
|
||||
description = "View your entire Steam library right from Kodi";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "orchis-theme";
|
||||
version = "2021-06-09";
|
||||
version = "2021-06-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "Orchis-theme";
|
||||
owner = "vinceliuice";
|
||||
rev = version;
|
||||
sha256 = "sha256-YlrocFDk3da2eqxbJ5lPUUxHHvJZx19LOa0MSljWY8Q=";
|
||||
sha256 = "sha256-j0nsw1yR1yOckXiIMtzhC3w6kvfzxQQHgwdY6l0OuXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 sassc ];
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-gsconnect";
|
||||
version = "46";
|
||||
version = "47";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "andyholmes";
|
||||
repo = "gnome-shell-extension-gsconnect";
|
||||
rev = "v${version}";
|
||||
sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw";
|
||||
sha256 = "sha256-cpyB7ufjKTj7YVbPlQFJ4qaL6Rb/aBReKxCYzErT4+Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, llvm_meta, src, cmake, libxml2, libllvm, version, python3
|
||||
{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3
|
||||
, buildLlvmTools
|
||||
, fixDarwinDylibNames
|
||||
, enableManpages ? false
|
||||
@ -37,6 +37,10 @@ let
|
||||
./purity.patch
|
||||
# https://reviews.llvm.org/D51899
|
||||
./gnu-install-dirs.patch
|
||||
(substituteAll {
|
||||
src = ../../clang-11-12-LLVMgold-path.patch;
|
||||
libllvmLibdir = "${libllvm.lib}/lib";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -52,12 +56,7 @@ let
|
||||
|
||||
outputs = [ "out" "lib" "dev" "python" ];
|
||||
|
||||
# Clang expects to find LLVMgold in its own prefix
|
||||
postInstall = ''
|
||||
if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then
|
||||
ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib
|
||||
fi
|
||||
|
||||
ln -sv $out/bin/clang $out/bin/cpp
|
||||
|
||||
# Move libclang to 'lib' output
|
||||
|
||||
@ -2,9 +2,7 @@ diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
|
||||
index 3a66dd9c3fb..7efc85d9f9f 100644
|
||||
--- a/lib/builtins/CMakeLists.txt
|
||||
+++ b/lib/builtins/CMakeLists.txt
|
||||
@@ -301,6 +301,10 @@ if (NOT MSVC)
|
||||
i386/umoddi3.S
|
||||
)
|
||||
@@ -345,4 +345,8 @@ if (NOT MSVC)
|
||||
|
||||
+ set(i486_SOURCES ${i386_SOURCES})
|
||||
+ set(i586_SOURCES ${i386_SOURCES})
|
||||
|
||||
@ -0,0 +1,71 @@
|
||||
diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp
|
||||
--- a/lib/sanitizer_common/sanitizer_mac.cpp
|
||||
+++ b/lib/sanitizer_common/sanitizer_mac.cpp
|
||||
@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {
|
||||
// Offset example:
|
||||
// XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4
|
||||
constexpr u16 GetOSMajorKernelOffset() {
|
||||
- if (TARGET_OS_OSX) return 4;
|
||||
- if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
|
||||
- if (TARGET_OS_WATCH) return 13;
|
||||
+#if TARGET_OS_OSX
|
||||
+ return 4;
|
||||
+#endif
|
||||
+#if TARGET_OS_IOS || TARGET_OS_TV
|
||||
+ return 6;
|
||||
+#endif
|
||||
+#if TARGET_OS_WATCH
|
||||
+ return 13;
|
||||
+#endif
|
||||
}
|
||||
|
||||
using VersStr = char[64];
|
||||
@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {
|
||||
u16 os_major = kernel_major - offset;
|
||||
|
||||
const char *format = "%d.0";
|
||||
- if (TARGET_OS_OSX) {
|
||||
- if (os_major >= 16) { // macOS 11+
|
||||
- os_major -= 5;
|
||||
- } else { // macOS 10.15 and below
|
||||
- format = "10.%d";
|
||||
- }
|
||||
+#if TARGET_OS_OSX
|
||||
+ if (os_major >= 16) { // macOS 11+
|
||||
+ os_major -= 5;
|
||||
+ } else { // macOS 10.15 and below
|
||||
+ format = "10.%d";
|
||||
}
|
||||
+#endif
|
||||
return internal_snprintf(vers, sizeof(VersStr), format, os_major);
|
||||
}
|
||||
|
||||
@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {
|
||||
// Aligned versions example:
|
||||
// macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6
|
||||
static void MapToMacos(u16 *major, u16 *minor) {
|
||||
- if (TARGET_OS_OSX)
|
||||
- return;
|
||||
-
|
||||
- if (TARGET_OS_IOS || TARGET_OS_TV)
|
||||
+#if !TARGET_OS_OSX
|
||||
+#if TARGET_OS_IOS || TARGET_OS_TV
|
||||
*major += 2;
|
||||
- else if (TARGET_OS_WATCH)
|
||||
+#elif TARGET_OS_WATCH
|
||||
*major += 9;
|
||||
- else
|
||||
+#else
|
||||
UNREACHABLE("unsupported platform");
|
||||
+#endif
|
||||
|
||||
if (*major >= 16) { // macOS 11+
|
||||
*major -= 5;
|
||||
@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {
|
||||
*minor = *major;
|
||||
*major = 10;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
static MacosVersion GetMacosAlignedVersionInternal() {
|
||||
@ -60,6 +60,8 @@ stdenv.mkDerivation {
|
||||
# extra `/`.
|
||||
./normalize-var.patch
|
||||
]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
|
||||
# Prevent a compilation error on darwin
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
|
||||
++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
|
||||
|
||||
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, lit
|
||||
, makeWrapper
|
||||
, enableManpages ? false
|
||||
}:
|
||||
|
||||
@ -42,7 +43,7 @@ stdenv.mkDerivation (rec {
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake python3 which swig lit
|
||||
cmake python3 which swig lit makeWrapper
|
||||
] ++ lib.optionals enableManpages [
|
||||
python3.pkgs.sphinx python3.pkgs.recommonmark
|
||||
];
|
||||
@ -84,7 +85,15 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
installCheckPhase = ''
|
||||
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
|
||||
return 1;
|
||||
fi
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
|
||||
|
||||
# Editor support
|
||||
# vscode:
|
||||
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
|
||||
|
||||
@ -63,3 +63,29 @@ index 734167e51bc5..f95761b5df58 100644
|
||||
install(TARGETS lldbIntelFeatures
|
||||
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
||||
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
|
||||
index 752113b..010f187 100644
|
||||
--- a/cmake/modules/LLDBStandalone.cmake
|
||||
+++ b/cmake/modules/LLDBStandalone.cmake
|
||||
@@ -62,7 +62,7 @@ endif()
|
||||
|
||||
# They are used as destination of target generators.
|
||||
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
|
||||
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
|
||||
+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
||||
if(WIN32 OR CYGWIN)
|
||||
# DLL platform -- put DLLs into bin.
|
||||
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b5633e2..86e4738 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON)
|
||||
if(LLDB_BUILD_FRAMEWORK)
|
||||
set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
|
||||
else()
|
||||
- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
|
||||
+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")
|
||||
endif()
|
||||
get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)
|
||||
finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dqlite";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d";
|
||||
sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "entt";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skypjack";
|
||||
repo = "entt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gieft0sErTr3aB6mZLdALSx+RkmCQuE9lopAwJbOXnA=";
|
||||
sha256 = "sha256-vg2tpGyZZM8c97Qko88JMP5YNPZx5kI5qRkkRclvZtA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,15 +1,23 @@
|
||||
{ stdenv, lib, fetchzip, pkg-config, meson, ninja, scdoc
|
||||
{ stdenv, lib, fetchFromGitea, pkg-config, meson, ninja, scdoc
|
||||
, freetype, fontconfig, pixman, tllist, check
|
||||
, withHarfBuzz ? true
|
||||
, harfbuzz
|
||||
}:
|
||||
|
||||
let
|
||||
# Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54
|
||||
mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "2.4.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fcft";
|
||||
rev = version;
|
||||
sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57";
|
||||
};
|
||||
|
||||
@ -19,15 +27,16 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional withHarfBuzz harfbuzz;
|
||||
checkInputs = [ check ];
|
||||
|
||||
mesonBuildType = "release";
|
||||
mesonFlags = [
|
||||
"--buildtype=release"
|
||||
"-Dtext-shaping=${if withHarfBuzz then "enabled" else "disabled"}"
|
||||
(mesonFeatureFlag "text-shaping" withHarfBuzz)
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/dnkl/fcft";
|
||||
changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}";
|
||||
description = "Simple library for font loading and glyph rasterization";
|
||||
maintainers = with maintainers; [
|
||||
fionera
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.20";
|
||||
version = "1.21";
|
||||
pname = "commons-compress";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
|
||||
sha256 = "0zx1sc0rw3vzjan69vxr2qw82y9b0hqdzp4plcahc3c1y0vkz3fg";
|
||||
sha256 = "sha256-sWF0K5MSOSXUxBLC9+1/RF5ST4tIzVKGnKQvStuVLvM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/Microsoft/GSL";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ];
|
||||
maintainers = with maintainers; [ thoughtpolice yuriaisaka ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raft-canonical";
|
||||
version = "0.10.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "raft";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q4m0CCIArgsobhmhqLvkr7fK40SX/qBk6K5Qu0eRLaI=";
|
||||
sha256 = "050dwy34jh8dihfwfm0r1by2i3sy9crapipp9idw32idm79y4izb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
buildInputs = [ libuv ];
|
||||
buildInputs = [ libuv lz4 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://github.com/canonical/raft";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ wucke13 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}";
|
||||
license = licenses.boost;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ primeos xwvvvvwx ];
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocksdb";
|
||||
version = "6.17.3";
|
||||
version = "6.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM=";
|
||||
sha256 = "0ivdcc012c35f2wcc5qzic2jlrwp4whyz5sbz1nyfyrnv0xf5djw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
@ -60,7 +60,9 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://rocksdb.org";
|
||||
description = "A library that provides an embeddable, persistent key-value store for fast storage";
|
||||
changelog = "https://github.com/facebook/rocksdb/raw/v${version}/HISTORY.md";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ adev magenbluten ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, fetchFromGitea
|
||||
, meson
|
||||
, ninja
|
||||
}:
|
||||
@ -9,18 +9,23 @@ stdenv.mkDerivation rec {
|
||||
pname = "tllist";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/dnkl/tllist.git";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "tllist";
|
||||
rev = version;
|
||||
sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/dnkl/tllist";
|
||||
changelog = "https://codeberg.org/dnkl/tllist/releases/tag/${version}";
|
||||
description = "C header file only implementation of a typed linked list";
|
||||
longDescription = ''
|
||||
Most C implementations of linked list are untyped. That is, their data
|
||||
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation {
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
phases="installPhase fixupPhase";
|
||||
dontUnpack = true;
|
||||
|
||||
ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}";
|
||||
|
||||
|
||||
@ -77,6 +77,7 @@
|
||||
, "create-react-native-app"
|
||||
, "csslint"
|
||||
, "dat"
|
||||
, "degit"
|
||||
, "dhcp"
|
||||
, "diagnostic-languageserver"
|
||||
, "dockerfile-language-server-nodejs"
|
||||
|
||||
2238
pkgs/development/node-packages/node-packages.nix
generated
2238
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml,
|
||||
{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml,
|
||||
lwt_react,
|
||||
opaline, ppx_deriving, findlib
|
||||
, ocaml-migrate-parsetree
|
||||
@ -7,34 +7,24 @@
|
||||
, js_of_ocaml-lwt
|
||||
, js_of_ocaml-tyxml
|
||||
, lwt_ppx
|
||||
, ocamlnet
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
then throw "eliom is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
pname = "eliom";
|
||||
version = "6.12.4";
|
||||
version = "8.6.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
|
||||
sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz";
|
||||
sha256 = "0s1hpawwhqp4qcy8w1067n8c6zg8jcjpzplc39bjbb1ycqw667j9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Compatibility with js_of_ocaml >= 3.9.0, remove at next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch";
|
||||
sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild
|
||||
ocaml-migrate-parsetree
|
||||
js_of_ocaml-ppx_deriving_json opaline
|
||||
ppx_tools_versioned
|
||||
ocamlnet
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,46 +1,55 @@
|
||||
{ stdenv, lib, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl
|
||||
, lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr
|
||||
{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl
|
||||
, bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs
|
||||
, cohttp, cohttp-lwt-unix, hmap
|
||||
, lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr
|
||||
, pgocaml, camlzip, ocaml_sqlite3
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.06.1"
|
||||
then throw "ocsigenserver is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let mkpath = p: n:
|
||||
"${p}/lib/ocaml/${ocaml.version}/site-lib/${n}";
|
||||
let mkpath = p:
|
||||
"${p}/lib/ocaml/${ocaml.version}/site-lib/stublibs";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.18.0";
|
||||
let caml_ld_library_path =
|
||||
lib.concatMapStringsSep ":" mkpath [
|
||||
bigstringaf lwt ssl cstruct mirage-crypto zarith mirage-crypto-ec ptime mirage-crypto-rng mtime ca-certs cryptokit ocaml_pcre
|
||||
]
|
||||
; in
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "4.0.1";
|
||||
pname = "ocsigenserver";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
repo = "ocsigenserver";
|
||||
rev = version;
|
||||
sha256 = "0c61wkq8ddy3qxb2x1jz04rz0722hk92r6jl1zvgikh74m5p5ipp";
|
||||
sha256 = "0pid4irkmdmx1d6n2rvcvx5mnljl3hazzdqc3bql72by35izfac6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ];
|
||||
nativeBuildInputs = [ makeWrapper which ];
|
||||
buildInputs = [ lwt_react pgocaml camlzip ocaml_sqlite3 ];
|
||||
|
||||
propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet
|
||||
ocaml_pcre tyxml xml-light
|
||||
propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl
|
||||
ocaml_pcre xml-light
|
||||
];
|
||||
|
||||
configureFlags = [ "--root $(out)" "--prefix /" ];
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
createFindlibDestdir = true;
|
||||
postConfigure = ''
|
||||
make -C src confs
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
''
|
||||
rm -rf $out/var/run
|
||||
wrapProgram $out/bin/ocsigenserver \
|
||||
--suffix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}"
|
||||
--suffix CAML_LD_LIBRARY_PATH : "${caml_ld_library_path}"
|
||||
'';
|
||||
|
||||
dontPatchShebangs = true;
|
||||
@ -51,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
longDescription =''
|
||||
A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
|
||||
'';
|
||||
license = lib.licenses.lgpl21;
|
||||
license = lib.licenses.lgpl21Only;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
maintainers = [ lib.maintainers.gal_bolle ];
|
||||
};
|
||||
|
||||
@ -1,37 +1,36 @@
|
||||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
|
||||
, cohttp-lwt-unix
|
||||
, resource-pooling
|
||||
, ocamlnet
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ocsigen-start-${version}";
|
||||
version = "2.18.0";
|
||||
version = "4.3.0";
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];
|
||||
propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];
|
||||
|
||||
patches = [ ./templates-dir.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "src/os_db.ml" --replace "citext" "text"
|
||||
'';
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
repo = "ocsigen-start";
|
||||
rev = version;
|
||||
sha256 = "0wvh4c26g6qd6i1fryilcqz9giz7v6pnhc90sknhxh6jmwrbjl50";
|
||||
sha256 = "0lkl59dwzyqq2lyr46fyjr27ms0fp9h59xfsn37faaavdd7v0h98";
|
||||
};
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $OCAMLFIND_DESTDIR
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://ocsigen.org/ocsigen-start";
|
||||
description = "Eliom application skeleton";
|
||||
longDescription =''
|
||||
An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
|
||||
'';
|
||||
license = lib.licenses.lgpl21;
|
||||
license = lib.licenses.lgpl21Only;
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [ lib.maintainers.gal_bolle ];
|
||||
};
|
||||
|
||||
@ -42,9 +42,6 @@ buildPythonPackage rec {
|
||||
postPatch = ''
|
||||
substituteInPlace lib/ansible/executor/task_executor.py \
|
||||
--replace "[python," "["
|
||||
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
39
pkgs/development/python-modules/bagit/default.nix
Normal file
39
pkgs/development/python-modules/bagit/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, coverage
|
||||
, gettext
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bagit";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibraryOfCongress";
|
||||
repo = "bagit-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t01P7MPWgOrktuW2zF0TIzt6u/jkLmrpD2OnqawhJaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext setuptools-scm ];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
pytestFlagsArray = [ "test.py" ];
|
||||
pythonImportsCheck = [ "bagit" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library and command line utility for working with BagIt style packages";
|
||||
homepage = "https://libraryofcongress.github.io/bagit-python/";
|
||||
license = with licenses; [ publicDomain ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
@ -36,6 +36,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/LedgerHQ/ledgerctl";
|
||||
description = "A library to control Ledger devices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xwvvvvwx ];
|
||||
maintainers = with maintainers; [ d-xo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -301,6 +301,11 @@ in buildPythonPackage rec {
|
||||
# Builds in 2+h with 2 cores, and ~15m with a big-parallel builder.
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
passthru = {
|
||||
inherit cudaSupport;
|
||||
cudaArchList = final_cudaArchList;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source, prototype-to-production deep learning platform";
|
||||
homepage = "https://pytorch.org/";
|
||||
|
||||
@ -7,13 +7,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "resolvelib";
|
||||
version = "0.7.1";
|
||||
# Currently this package is only used by Ansible and breaking changes
|
||||
# are frequently introduced, so when upgrading ensure the new version
|
||||
# is compatible with Ansible
|
||||
# https://github.com/NixOS/nixpkgs/pull/128636
|
||||
# https://github.com/ansible/ansible/blob/devel/requirements.txt
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarugaku";
|
||||
repo = "resolvelib";
|
||||
rev = version;
|
||||
sha256 = "1fqz75riagizihvf4j7wc3zjw6kmg1dd8sf49aszyml105kb33n8";
|
||||
sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
45
pkgs/development/python-modules/schema-salad/default.nix
Normal file
45
pkgs/development/python-modules/schema-salad/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cachecontrol
|
||||
, lockfile
|
||||
, mistune
|
||||
, rdflib
|
||||
, rdflib-jsonld
|
||||
, ruamel_yaml
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schema-salad";
|
||||
version = "8.1.20210716111910";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3f851b385d044c58d359285ba471298b6199478a4978f892a83b15cbfb282f25";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cachecontrol
|
||||
lockfile
|
||||
mistune
|
||||
rdflib
|
||||
rdflib-jsonld
|
||||
ruamel_yaml
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
disabledTests = [
|
||||
# setup for these tests requires network access
|
||||
"test_secondaryFiles"
|
||||
"test_outputBinding"
|
||||
];
|
||||
pythonImportsCheck = [ "schema_salad" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Semantic Annotations for Linked Avro Data";
|
||||
homepage = "https://github.com/common-workflow-language/schema_salad";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
27
pkgs/development/python-modules/shellescape/default.nix
Normal file
27
pkgs/development/python-modules/shellescape/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shellescape";
|
||||
version = "3.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrissimpkins";
|
||||
repo = "shellescape";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HAe3Qf3lLeVWw/tVkW0J+CfoxSoOnCcWDR2nEWZn7HM=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "shellescape" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Shell escape a string to safely use it as a token in a shell command (backport of Python shlex.quote)";
|
||||
homepage = "https://github.com/chrissimpkins/shellescape";
|
||||
license = with licenses; [ mit psfl ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, symlinkJoin
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ninja
|
||||
@ -10,9 +11,18 @@
|
||||
, pillow
|
||||
, pytorch
|
||||
, pytest
|
||||
, cudatoolkit
|
||||
, cudnn
|
||||
, cudaSupport ? pytorch.cudaSupport or false # by default uses the value from pytorch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
paths = [ cudatoolkit.out cudatoolkit.lib ];
|
||||
};
|
||||
cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;
|
||||
in buildPythonPackage rec {
|
||||
pname = "torchvision";
|
||||
version = "0.10.0";
|
||||
|
||||
@ -23,15 +33,22 @@ buildPythonPackage rec {
|
||||
sha256 = "13j04ij0jmi58nhav1p69xrm8dg7jisg23268i3n6lnms37n02kc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libpng ninja which ];
|
||||
nativeBuildInputs = [ libpng ninja which ]
|
||||
++ lib.optionals cudaSupport [ cudatoolkit_joined ];
|
||||
|
||||
TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/";
|
||||
TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/";
|
||||
|
||||
buildInputs = [ libjpeg_turbo libpng ];
|
||||
buildInputs = [ libjpeg_turbo libpng ]
|
||||
++ lib.optionals cudaSupport [ cudnn ];
|
||||
|
||||
propagatedBuildInputs = [ numpy pillow pytorch scipy ];
|
||||
|
||||
preBuild = lib.optionalString cudaSupport ''
|
||||
export TORCH_CUDA_ARCH_LIST="${cudaArchStr}"
|
||||
export FORCE_CUDA=1
|
||||
'';
|
||||
|
||||
# tries to download many datasets for tests
|
||||
doCheck = false;
|
||||
|
||||
@ -45,6 +62,7 @@ buildPythonPackage rec {
|
||||
description = "PyTorch vision library";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
@ -7,7 +8,8 @@
|
||||
, pandas
|
||||
, pyyaml
|
||||
, matplotlib
|
||||
, pytest
|
||||
, numba
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -28,25 +30,18 @@ buildPythonPackage rec {
|
||||
pandas
|
||||
pyyaml
|
||||
matplotlib
|
||||
numba
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
${lib.optionalString (stdenv.isDarwin) ''
|
||||
preCheck = lib.optionalString stdenv.isDarwin ''
|
||||
# specifically needed for darwin
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p $HOME/.matplotlib
|
||||
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
|
||||
''}
|
||||
|
||||
pytest trackpy --ignore trackpy/tests/test_motion.py \
|
||||
--ignore trackpy/tests/test_feature_saving.py \
|
||||
--ignore trackpy/tests/test_feature.py \
|
||||
--ignore trackpy/tests/test_plots.py \
|
||||
--ignore trackpy/tests/test_legacy_linking.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -54,6 +49,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/soft-matter/trackpy";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
broken = true; # not compatible with latest pandas
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0xdn8xakywms8gcacmjvx0ivv37i3vj1d41c8sjlnf1s13q3zv7k";
|
||||
sha256 = "1aas07r5x2f7byzslfdqxi5dr0gwg5dy2qznnrs7w83ziqw6lxkm";
|
||||
};
|
||||
|
||||
vendorSha256 = "18w0wz3raysba99cxcc8pk4md9j438g4y2d2v2pk2l6qri9apscw";
|
||||
vendorSha256 = "10b6ny1fq6iwvhgq5293cdvd55mq3xgr2sc9kqshvjznwimfnb5z";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.12.18";
|
||||
version = "0.12.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sq5gdsrcakghd71+nXrtI980mlA6+GZW36tJkJkaJ2U=";
|
||||
sha256 = "sha256-keYKYSWQOiO3d38qrMicYWRZ0jpkzhdZhqOr5JcbA4M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fission";
|
||||
version = "1.13.1";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fission";
|
||||
repo = "fission";
|
||||
rev = version;
|
||||
sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI=";
|
||||
sha256 = "sha256-U/UV5NZXmycDp8+g5XV6P2b+4SutR51rVHdPp9HdPjM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg=";
|
||||
vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s=";
|
||||
|
||||
buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}";
|
||||
|
||||
|
||||
@ -10,20 +10,19 @@ buildGoModule rec {
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3mvGHAPKDUmrQkBKwlxnF6PG0ZpZDqlM9SMkCyC5ytE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "cmd/crane" "cmd/gcrane" ];
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags=-s -w -X github.com/google/go-containerregistry/cmd/crane/cmd.Version=${version} -X github.com/google/go-containerregistry/pkg/v1/remote/transport.Version=${version}"
|
||||
];
|
||||
ldflags =
|
||||
let t = "github.com/google/go-containerregistry"; in
|
||||
[ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ];
|
||||
|
||||
# NOTE: no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for interacting with remote images and registries";
|
||||
description = "Tools for interacting with remote images and registries including crane and gcrane";
|
||||
homepage = "https://github.com/google/go-containerregistry";
|
||||
license = licenses.apsl20;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.21.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zXlsvuc778z1sxnv02mFJXQzkEEft0BdubWecvcytYg=";
|
||||
sha256 = "sha256-fKekn930nOGYUhkQus9p4sKcsuUks+KfO4+X5C/3nWg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorSha256 = "sha256-QdTD6xeVNswaaMms82rFYb5jLDhxL+wQgaLVXqROSFs=";
|
||||
vendorSha256 = "sha256-yPRtqJTmYDqzwHyBmVV4HxOmMe7FuSZ/lsQj8PInhFg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.15149";
|
||||
version = "0.1.15663";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pmLDCNgCQv4fetl/q6ZokH1qF6pSqsR0DUWbzGeEtaw=";
|
||||
sha256 = "sha256-r5528iMy3RRSSRbTOTilnF1FkWBr5VOUWvAZQU/OBjc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
|
||||
vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -51,6 +51,9 @@ build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
|
||||
jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
|
||||
>"$build_deps/package.json.new"
|
||||
|
||||
# FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195
|
||||
sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new"
|
||||
|
||||
if cmp --quiet "$build_deps"/package.json{.new,}; then
|
||||
echo "package.json not changed, skip updating nodePackages"
|
||||
rm "$build_deps"/package.json.new
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stylua";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnnymorganz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "03w976fghqs2kswab5bridpr2p6hgldjyfd3l4kz0p5h98f3wzvf";
|
||||
sha256 = "12vflwk1h5ahamxiiaznx3k1ldi8il0adwb2rl58swmvfzbcm7y9";
|
||||
};
|
||||
|
||||
cargoSha256 = "1311ly02r6c2rqx0ssd6hpbw3sp0ffrf37bzdm66chxnh8cr83sj";
|
||||
cargoSha256 = "1glkfxz9apmsqbyl8fy5gwywbr6k7cv0l47w2nfimg92qn9xzgks";
|
||||
|
||||
cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]
|
||||
++ lib.optionals luauSupport [ "--features" "luau" ];
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
"eslint": "^7.30.0",
|
||||
"glob": "^7.1.6",
|
||||
"mocha": "^9.0.2",
|
||||
"rollup": "^2.51.1",
|
||||
"rollup": "=2.51.1",
|
||||
"tslib": "^2.3.0",
|
||||
"typescript": "^4.3.5",
|
||||
"typescript-formatter": "^7.2.2",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre
|
||||
{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre
|
||||
, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -6,18 +6,19 @@ stdenv.mkDerivation rec {
|
||||
version = "20.11.00";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
|
||||
url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
|
||||
sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci" "${pciutils}/bin/lspci"
|
||||
substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode"
|
||||
substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl" "${iasl}/bin/iasl"
|
||||
substituteInPlace src/lib/include/fwts_binpaths.h \
|
||||
--replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \
|
||||
--replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
|
||||
--replace "/usr/bin/iasl" "${iasl}/bin/iasl"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Subtitle manager for Sonarr and Radarr";
|
||||
homepage = "https://www.bazarr.media/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ xwvvvvwx ];
|
||||
maintainers = with maintainers; [ d-xo ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BzQp466Zlp7n56n4SUH4cDRTt8EUWGw3q1dxIBB3TBM=";
|
||||
sha256 = "sha256-F2e+peM7DBihmos/oPar36UDHkibmlzIknCjMauOph8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ak7fWcAXbyVAiyaJZBGMoe2i2nDh4vc/gCC9nbjadJ0=";
|
||||
vendorSha256 = "sha256-M6mnFO+SInZNvtwMa02TvHIg14Ve7swlGcYfsQFioxQ=";
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dendrite;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "headscale";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juanfont";
|
||||
repo = "headscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CYqtGTKOuQDpPOWwixRaczBOkIrYE1tdIieaxuvyqQo=";
|
||||
sha256 = "sha256-AclIH2Gd8U/Hfy24KOFic/np4qAWELlIMfsPCSkdjog=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UIBH6Pf2mmXBsdFW0RRvedLQhonNsrl4j2fxxRtum4M=";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jackett";
|
||||
version = "0.18.459";
|
||||
version = "0.18.531";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
|
||||
sha256 = "sha256-KOdUMJ29bqJ7WyE4BxMDRsPdIKwZNRfrbIItdoeexUk=";
|
||||
sha256 = "sha256-ZykgYzE86bt5SNeHng995TQuE15ajWhThgqt2fJFizc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -18,11 +18,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "15.0.0";
|
||||
version = "15.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
sha256 = "sha256-DOqqf4RWA2eo4m60tzs4HgKktci0fIV7CiJekDcjCXE=";
|
||||
sha256 = "sha256-levWTIO64or3jPejiJzyU0YQqMap5bK6w1EIMmfthD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "SpamAssassin";
|
||||
version = "3.4.5";
|
||||
version = "3.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2";
|
||||
sha256 = "0qsl18p2swdbq4zizvs9ahl2bkilpcyzq817lk16jj5g4rqzivb7";
|
||||
sha256 = "044ng2aazqy8g0m17q0a4939ck1ca4x230q2q7q7jndvwkrpaj5w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, nixosTests
|
||||
, fetchFromGitHub
|
||||
, nim
|
||||
, libsass
|
||||
@ -120,6 +121,10 @@ in stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) nitter;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Alternative Twitter front-end";
|
||||
homepage = "https://github.com/zedeus/nitter";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "influxdb";
|
||||
version = "1.8.6";
|
||||
version = "1.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v58druwTVeUOItbBUNr8lNsFlam9v0sxXlTeHlM0g6A=";
|
||||
sha256 = "sha256-LavOnVREu7uLWcdM9zIonqoYPJBdY2j5eKMeVNXa1dk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-t7uwrsrF4LYdRjOhwdsCouDJXvD9364Ma5gvKezvi5o=";
|
||||
vendorSha256 = "sha256-jgAbEWXL1LYRN7ud9ij0Z1KBGHPZ0sRq78tsK92ob8k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "0.24.1";
|
||||
version = "0.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidata-inc";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-z2F6ru2LNATiI4rSImbvwgxqKxuj8kwzjhwSbsPDBEs=";
|
||||
sha256 = "sha256-Px2b0s10N5uDYsz95/1cT2tfS/NfhRfKmCdXIaMb5Po=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
|
||||
vendorSha256 = "sha256-JO2hGrKbt+5Eh7v7LCZrPBK84Q9gjquchlZ5MfMY3uY=";
|
||||
vendorSha256 = "sha256-6KjSmxNLY0msMqpPZR7LUZV63Pj6JGhGVRWTKbbnDtk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
unixtools, dnsutils, coreutils, gnugrep, gnused }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acme.sh";
|
||||
version = "2.9.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Neilpang";
|
||||
repo = "acme.sh";
|
||||
rev = version;
|
||||
sha256 = "sha256-BSKqfj8idpE4OV8/EJkCFo5i1vq/aEde/moqJcwuDvk=";
|
||||
sha256 = "sha256-KWSDAHzvNl8Iao13OV/ExRoKqkc9nouWim+bAN1V+Jo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -19,13 +19,13 @@ let
|
||||
in
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "4.16";
|
||||
version = "4.17";
|
||||
|
||||
goPackagePath = "github.com/lxc/lxd";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
|
||||
sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r";
|
||||
sha256 = "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -72,7 +72,7 @@ buildGoPackage rec {
|
||||
description = "Daemon based on liblxc offering a REST API to manage containers";
|
||||
homepage = "https://linuxcontainers.org/lxd/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fpletz wucke13 ];
|
||||
maintainers = with maintainers; [ fpletz wucke13 marsam ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "czkawka";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qarmin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LtGgpfToQUNKM1hmMPW7UrS/n7iyI+dz2vbSo+GOcRg=";
|
||||
sha256 = "sha256-OBe6nk5C3kO5Lkas9+G+VY3xAzY7SWx8W5CkSbaYJ9Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ZbyoCo1n4GRBkb5SClby5V51rLN1PnvCHD30TiJU2gY=";
|
||||
cargoSha256 = "sha256-Jghkf1mX5ic7zB2KmtOZbSxgF8C6KjRdGG1Yt+dzylI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "grc";
|
||||
version = "1.12";
|
||||
version = "1.13";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "garabik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA=";
|
||||
sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eggdrop";
|
||||
version = "1.8.4";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eggheads";
|
||||
repo = "eggdrop";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xqdrv4ydxw72a740lkmpg3fs7ldicaf08b0sfqdyaj7cq8l5x5l";
|
||||
sha256 = "sha256-vh8nym7aYeTRUQ7FBZRy4ToG2ajwRDhzi4jNiJQOEyQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "frp";
|
||||
version = "0.36.1";
|
||||
version = "0.37.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatedier";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oOq5Y/6n7VHU9WPjnt+moVWZgo8mQl6Jd8daLJ2/pSQ=";
|
||||
sha256 = "sha256-TEVSxTzMgoIPcIUmhtRnFSp3xClJmOsIUjpKEr5sId8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM=";
|
||||
vendorSha256 = "sha256-4vvIobj1I7FbPVJJG4NZogwv4BMo7GRa5Fo5gO2Daws=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, python3, wirelesstools
|
||||
, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools
|
||||
, hcxdumptool, pyrit, which }:
|
||||
, hcxdumptool, pyrit, which, bully }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
version = "2.5.5";
|
||||
version = "2.5.7";
|
||||
pname = "wifite2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimocoder";
|
||||
repo = "wifite2";
|
||||
rev = version;
|
||||
sha256 = "0rh54gj471dn8442imxwasjrrwzsx4m40nylkw3y6p8rbjmb92h4";
|
||||
sha256 = "sha256-dJ+UOSIR48m8nGoci/6iblLsX296ZGL1hZ74RUsa9lw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
wirelesstools
|
||||
pyrit
|
||||
which
|
||||
bully
|
||||
];
|
||||
|
||||
postFixup = let
|
||||
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
|
||||
homepage = "https://www.wireguard.com/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ];
|
||||
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 d-xo ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gpg-tui";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "gpg-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ti49b03Ta/MVDNIzW1WhWxJqHNVW9EALUcbElcZvurQ=";
|
||||
sha256 = "sha256-PJLiP8o4HMkaHMrsnObpUdGtKLxIuXZhxva34U26i40=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jF1Ozo5q5cKG9KjR1scbCCofG3FT3Fv98Cj0iOl18+c=";
|
||||
cargoSha256 = "sha256-6fHMchoJO5Tss6kFTulDmI4aXS3YF5k6RqEWQbh5mNc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gpgme # for gpgme-config
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epubcheck";
|
||||
version = "4.2.4";
|
||||
version = "4.2.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
|
||||
sha256 = "02iy62b9wa5shxggflx99kv2q9xkilcsq94s0gbfq4m2aqjgzfwx";
|
||||
sha256 = "sha256-f4r0ODKvZrl+YBcP2T9Z+zEuCyvQm9W7GNiLTr4p278=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
26
pkgs/tools/virtualization/reg/default.nix
Normal file
26
pkgs/tools/virtualization/reg/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "reg";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "genuinetools";
|
||||
repo = "reg";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jlza1czfssssi3y9zi6kr8k9msfa7vp215ibhwbz4h97av5xw5m";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Docker registry v2 command line client and repo listing generator with security checks";
|
||||
homepage = "https://github.com/genuinetools/reg";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ereslibre ];
|
||||
};
|
||||
}
|
||||
@ -10,19 +10,6 @@ res: pkgs: super:
|
||||
|
||||
with pkgs;
|
||||
|
||||
let
|
||||
self =
|
||||
builtins.trace ''
|
||||
It seems that you are using a patched Nixpkgs that references the self
|
||||
variable in pkgs/top-level/all-packages.nix. This variable was incorrectly
|
||||
named, so its usage needs attention. Please use pkgs for packages or super
|
||||
for functions.
|
||||
''
|
||||
res; # Do *NOT* use res in your fork. It will be removed.
|
||||
|
||||
# TODO: turn self into an error
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
# A stdenv capable of building 32-bit binaries. On x86_64-linux,
|
||||
@ -3261,6 +3248,8 @@ in
|
||||
|
||||
psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
|
||||
|
||||
reg = callPackage ../tools/virtualization/reg { };
|
||||
|
||||
river = callPackage ../applications/window-managers/river { };
|
||||
|
||||
rmapi = callPackage ../applications/misc/remarkable/rmapi { };
|
||||
@ -13550,6 +13539,8 @@ in
|
||||
inherit (llvmPackages_11) llvm libclang;
|
||||
};
|
||||
|
||||
cwltool = callPackage ../applications/science/misc/cwltool { };
|
||||
|
||||
dprint = callPackage ../development/tools/dprint { };
|
||||
|
||||
libcxx = llvmPackages.libcxx;
|
||||
@ -28695,9 +28686,6 @@ in
|
||||
|
||||
zola = callPackage ../applications/misc/zola {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
# Version 0.13.0 has the lexical_core 0.7.4 dependency that doesn't build
|
||||
# with rust 1.53. This should be fixed in the next version.
|
||||
rustPlatform = rustPackages_1_45.rustPlatform;
|
||||
};
|
||||
|
||||
zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
|
||||
|
||||
@ -80,6 +80,8 @@ let self = rec {
|
||||
|
||||
steam-launcher = callPackage ../applications/video/kodi-packages/steam-launcher { };
|
||||
|
||||
steam-library = callPackage ../applications/video/kodi-packages/steam-library { };
|
||||
|
||||
pdfreader = callPackage ../applications/video/kodi-packages/pdfreader { };
|
||||
|
||||
pvr-hts = callPackage ../applications/video/kodi-packages/pvr-hts { };
|
||||
@ -120,6 +122,10 @@ let self = rec {
|
||||
|
||||
requests = callPackage ../applications/video/kodi-packages/requests { };
|
||||
|
||||
requests-cache = callPackage ../applications/video/kodi-packages/requests-cache { };
|
||||
|
||||
routing = callPackage ../applications/video/kodi-packages/routing { };
|
||||
|
||||
signals = callPackage ../applications/video/kodi-packages/signals { };
|
||||
|
||||
six = callPackage ../applications/video/kodi-packages/six { };
|
||||
|
||||
@ -995,6 +995,8 @@ in {
|
||||
|
||||
bacpypes = callPackage ../development/python-modules/bacpypes { };
|
||||
|
||||
bagit = callPackage ../development/python-modules/bagit { };
|
||||
|
||||
banal = callPackage ../development/python-modules/banal { };
|
||||
|
||||
bandit = callPackage ../development/python-modules/bandit { };
|
||||
@ -7864,6 +7866,8 @@ in {
|
||||
|
||||
schema = callPackage ../development/python-modules/schema { };
|
||||
|
||||
schema-salad = callPackage ../development/python-modules/schema-salad { };
|
||||
|
||||
schiene = callPackage ../development/python-modules/schiene { };
|
||||
|
||||
scikit-bio = callPackage ../development/python-modules/scikit-bio { };
|
||||
@ -8007,6 +8011,8 @@ in {
|
||||
|
||||
sh = callPackage ../development/python-modules/sh { };
|
||||
|
||||
shellescape = callPackage ../development/python-modules/shellescape { };
|
||||
|
||||
shellingham = callPackage ../development/python-modules/shellingham { };
|
||||
|
||||
shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user