Merge master into staging-next
This commit is contained in:
@@ -9757,6 +9757,12 @@
|
||||
githubId = 39689;
|
||||
name = "Hugo Tavares Reis";
|
||||
};
|
||||
httprafa = {
|
||||
email = "rafael.kienitz@gmail.com";
|
||||
github = "HttpRafa";
|
||||
githubId = 60099368;
|
||||
name = "Rafael Kienitz";
|
||||
};
|
||||
huantian = {
|
||||
name = "David Li";
|
||||
email = "davidtianli@gmail.com";
|
||||
|
||||
@@ -120,6 +120,18 @@ in
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
UMask = "0077";
|
||||
CapabilityBoundingSet = "";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
ProtectClock = true;
|
||||
ProtectProc = "invisible";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -10,9 +10,11 @@ let
|
||||
certificateFile = lib.mkOption {
|
||||
type = with lib.types; nullOr path;
|
||||
description = ''
|
||||
Cert.pem file.
|
||||
Account certificate file, necessary to create, delete and manage tunnels. It can be obtained by running `cloudflared login`.
|
||||
|
||||
See [Cert.pem](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#certpem).
|
||||
Note that this is **necessary** for a fully declarative set up, as routes can not otherwise be created outside of the Cloudflare interface.
|
||||
|
||||
See [Cert.pem](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#certpem) for information about the file, and [Tunnel permissions](https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/do-more-with-tunnels/local-management/tunnel-permissions/) for a comparison between the account certificate and the tunnel credentials file.
|
||||
'';
|
||||
default = null;
|
||||
};
|
||||
@@ -301,12 +303,6 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = lib.mapAttrsToList (name: tunnel: {
|
||||
assertion =
|
||||
tunnel.ingress == { } || (cfg.certificateFile != null || tunnel.certificateFile != null);
|
||||
message = "Cloudflare Tunnel ${name} has a declarative configuration, but no certificate file was defined.";
|
||||
}) cfg.tunnels;
|
||||
|
||||
systemd.targets = lib.mapAttrs' (
|
||||
name: tunnel:
|
||||
lib.nameValuePair "cloudflared-tunnel-${name}" {
|
||||
|
||||
@@ -914,11 +914,26 @@ in {
|
||||
phosh = handleTest ./phosh.nix {};
|
||||
photonvision = handleTest ./photonvision.nix {};
|
||||
photoprism = handleTest ./photoprism.nix {};
|
||||
php = handleTest ./php {};
|
||||
php81 = handleTest ./php { php = pkgs.php81; };
|
||||
php82 = handleTest ./php { php = pkgs.php82; };
|
||||
php83 = handleTest ./php { php = pkgs.php83; };
|
||||
php84 = handleTest ./php { php = pkgs.php84; };
|
||||
php = import ./php/default.nix {
|
||||
inherit runTest;
|
||||
php = pkgs.php;
|
||||
};
|
||||
php81 = import ./php/default.nix {
|
||||
inherit runTest;
|
||||
php = pkgs.php81;
|
||||
};
|
||||
php82 = import ./php/default.nix {
|
||||
inherit runTest;
|
||||
php = pkgs.php82;
|
||||
};
|
||||
php83 = import ./php/default.nix {
|
||||
inherit runTest;
|
||||
php = pkgs.php83;
|
||||
};
|
||||
php84 = import ./php/default.nix {
|
||||
inherit runTest;
|
||||
php = pkgs.php84;
|
||||
};
|
||||
phylactery = handleTest ./web-apps/phylactery.nix {};
|
||||
pict-rs = handleTest ./pict-rs.nix {};
|
||||
pingvin-share = handleTest ./pingvin-share.nix {} ;
|
||||
|
||||
+11
-13
@@ -1,8 +1,6 @@
|
||||
{
|
||||
system ? builtins.currentSystem,
|
||||
config ? { },
|
||||
pkgs ? import ../../.. { inherit system config; },
|
||||
php ? pkgs.php,
|
||||
runTest,
|
||||
php,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -11,16 +9,16 @@ let
|
||||
};
|
||||
in
|
||||
{
|
||||
fpm = import ./fpm.nix {
|
||||
inherit system pkgs;
|
||||
php = php';
|
||||
fpm = runTest {
|
||||
imports = [ ./fpm.nix ];
|
||||
_module.args.php = php';
|
||||
};
|
||||
httpd = import ./httpd.nix {
|
||||
inherit system pkgs;
|
||||
php = php';
|
||||
httpd = runTest {
|
||||
imports = [ ./httpd.nix ];
|
||||
_module.args.php = php';
|
||||
};
|
||||
pcre = import ./pcre.nix {
|
||||
inherit system pkgs;
|
||||
php = php';
|
||||
pcre = runTest {
|
||||
imports = [ ./pcre.nix ];
|
||||
_module.args.php = php';
|
||||
};
|
||||
}
|
||||
|
||||
+53
-48
@@ -1,59 +1,64 @@
|
||||
import ../make-test-python.nix ({ pkgs, lib, php, ... }: {
|
||||
{ lib, php, ... }:
|
||||
{
|
||||
name = "php-${php.version}-fpm-nginx-test";
|
||||
meta.maintainers = lib.teams.php.members;
|
||||
|
||||
nodes.machine = { config, lib, pkgs, ... }: {
|
||||
environment.systemPackages = [ php ];
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ php ];
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
|
||||
virtualHosts."phpfpm" =
|
||||
let
|
||||
testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();";
|
||||
in
|
||||
{
|
||||
root = "${testdir}/web";
|
||||
locations."~ \\.php$".extraConfig = ''
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket};
|
||||
fastcgi_index index.php;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||
'';
|
||||
locations."/" = {
|
||||
tryFiles = "$uri $uri/ index.php";
|
||||
index = "index.php index.html index.htm";
|
||||
virtualHosts."phpfpm" =
|
||||
let
|
||||
testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();";
|
||||
in
|
||||
{
|
||||
root = "${testdir}/web";
|
||||
locations."~ \\.php$".extraConfig = ''
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket};
|
||||
fastcgi_index index.php;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||
'';
|
||||
locations."/" = {
|
||||
tryFiles = "$uri $uri/ index.php";
|
||||
index = "index.php index.html index.htm";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.phpfpm.pools."foobar" = {
|
||||
user = "nginx";
|
||||
phpPackage = php;
|
||||
settings = {
|
||||
"listen.group" = "nginx";
|
||||
"listen.mode" = "0600";
|
||||
"listen.owner" = "nginx";
|
||||
"pm" = "dynamic";
|
||||
"pm.max_children" = 5;
|
||||
"pm.max_requests" = 500;
|
||||
"pm.max_spare_servers" = 3;
|
||||
"pm.min_spare_servers" = 1;
|
||||
"pm.start_servers" = 2;
|
||||
services.phpfpm.pools."foobar" = {
|
||||
user = "nginx";
|
||||
phpPackage = php;
|
||||
settings = {
|
||||
"listen.group" = "nginx";
|
||||
"listen.mode" = "0600";
|
||||
"listen.owner" = "nginx";
|
||||
"pm" = "dynamic";
|
||||
"pm.max_children" = 5;
|
||||
"pm.max_requests" = 500;
|
||||
"pm.max_spare_servers" = 3;
|
||||
"pm.min_spare_servers" = 1;
|
||||
"pm.start_servers" = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
testScript = { ... }: ''
|
||||
machine.wait_for_unit("nginx.service")
|
||||
machine.wait_for_unit("phpfpm-foobar.service")
|
||||
testScript =
|
||||
{ ... }:
|
||||
''
|
||||
machine.wait_for_unit("nginx.service")
|
||||
machine.wait_for_unit("phpfpm-foobar.service")
|
||||
|
||||
# Check so we get an evaluated PHP back
|
||||
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
|
||||
assert "PHP Version ${php.version}" in response, "PHP version not detected"
|
||||
# Check so we get an evaluated PHP back
|
||||
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
|
||||
assert "PHP Version ${php.version}" in response, "PHP version not detected"
|
||||
|
||||
# Check so we have database and some other extensions loaded
|
||||
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "apcu"]:
|
||||
assert ext in response, f"Missing {ext} extension"
|
||||
machine.succeed(f'test -n "$(php -m | grep -i {ext})"')
|
||||
'';
|
||||
})
|
||||
# Check so we have database and some other extensions loaded
|
||||
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "apcu"]:
|
||||
assert ext in response, f"Missing {ext} extension"
|
||||
machine.succeed(f'test -n "$(php -m | grep -i {ext})"')
|
||||
'';
|
||||
}
|
||||
|
||||
+42
-46
@@ -1,51 +1,47 @@
|
||||
import ../make-test-python.nix (
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
php,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "php-${php.version}-httpd-test";
|
||||
meta.maintainers = lib.teams.php.members;
|
||||
{
|
||||
lib,
|
||||
php,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "php-${php.version}-httpd-test";
|
||||
meta.maintainers = lib.teams.php.members;
|
||||
|
||||
nodes.machine =
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
services.httpd = {
|
||||
enable = true;
|
||||
adminAddr = "admin@phpfpm";
|
||||
virtualHosts."phpfpm" =
|
||||
let
|
||||
testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();";
|
||||
in
|
||||
{
|
||||
documentRoot = "${testdir}/web";
|
||||
locations."/" = {
|
||||
index = "index.php index.html";
|
||||
};
|
||||
nodes.machine =
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
services.httpd = {
|
||||
enable = true;
|
||||
adminAddr = "admin@phpfpm";
|
||||
virtualHosts."phpfpm" =
|
||||
let
|
||||
testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();";
|
||||
in
|
||||
{
|
||||
documentRoot = "${testdir}/web";
|
||||
locations."/" = {
|
||||
index = "index.php index.html";
|
||||
};
|
||||
phpPackage = php;
|
||||
enablePHP = true;
|
||||
};
|
||||
};
|
||||
phpPackage = php;
|
||||
enablePHP = true;
|
||||
};
|
||||
testScript =
|
||||
{ ... }:
|
||||
''
|
||||
machine.wait_for_unit("httpd.service")
|
||||
};
|
||||
testScript =
|
||||
{ ... }:
|
||||
''
|
||||
machine.wait_for_unit("httpd.service")
|
||||
|
||||
# Check so we get an evaluated PHP back
|
||||
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
|
||||
assert "PHP Version ${php.version}" in response, "PHP version not detected"
|
||||
# Check so we get an evaluated PHP back
|
||||
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
|
||||
assert "PHP Version ${php.version}" in response, "PHP version not detected"
|
||||
|
||||
# Check so we have database and some other extensions loaded
|
||||
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
|
||||
assert ext in response, f"Missing {ext} extension"
|
||||
'';
|
||||
}
|
||||
)
|
||||
# Check so we have database and some other extensions loaded
|
||||
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
|
||||
assert ext in response, f"Missing {ext} extension"
|
||||
'';
|
||||
}
|
||||
|
||||
+54
-56
@@ -1,63 +1,61 @@
|
||||
let
|
||||
testString = "can-use-subgroups";
|
||||
in
|
||||
import ../make-test-python.nix (
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
php,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "php-${php.version}-httpd-pcre-jit-test";
|
||||
meta.maintainers = lib.teams.php.members;
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
php,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "php-${php.version}-httpd-pcre-jit-test";
|
||||
meta.maintainers = lib.teams.php.members;
|
||||
|
||||
nodes.machine =
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
time.timeZone = "UTC";
|
||||
services.httpd = {
|
||||
enable = true;
|
||||
adminAddr = "please@dont.contact";
|
||||
phpPackage = php;
|
||||
enablePHP = true;
|
||||
phpOptions = "pcre.jit = true";
|
||||
extraConfig =
|
||||
let
|
||||
testRoot = pkgs.writeText "index.php" ''
|
||||
<?php
|
||||
preg_match('/(${testString})/', '${testString}', $result);
|
||||
var_dump($result);
|
||||
'';
|
||||
in
|
||||
''
|
||||
Alias / ${testRoot}/
|
||||
|
||||
<Directory ${testRoot}>
|
||||
Require all granted
|
||||
</Directory>
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
time.timeZone = "UTC";
|
||||
services.httpd = {
|
||||
enable = true;
|
||||
adminAddr = "please@dont.contact";
|
||||
phpPackage = php;
|
||||
enablePHP = true;
|
||||
phpOptions = "pcre.jit = true";
|
||||
extraConfig =
|
||||
let
|
||||
testRoot = pkgs.writeText "index.php" ''
|
||||
<?php
|
||||
preg_match('/(${testString})/', '${testString}', $result);
|
||||
var_dump($result);
|
||||
'';
|
||||
};
|
||||
in
|
||||
''
|
||||
Alias / ${testRoot}/
|
||||
|
||||
<Directory ${testRoot}>
|
||||
Require all granted
|
||||
</Directory>
|
||||
'';
|
||||
};
|
||||
testScript =
|
||||
let
|
||||
# PCRE JIT SEAlloc feature does not play well with fork()
|
||||
# The feature needs to either be disabled or PHP configured correctly
|
||||
# More information in https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
|
||||
pcreJitSeallocForkIssue = pkgs.writeText "pcre-jit-sealloc-issue.php" ''
|
||||
<?php
|
||||
preg_match('/nixos/', 'nixos');
|
||||
$pid = pcntl_fork();
|
||||
pcntl_wait($pid);
|
||||
'';
|
||||
in
|
||||
''
|
||||
machine.wait_for_unit("httpd.service")
|
||||
# Ensure php evaluation by matching on the var_dump syntax
|
||||
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/index.php")
|
||||
expected = 'string(${toString (builtins.stringLength testString)}) "${testString}"'
|
||||
assert expected in response, "Does not appear to be able to use subgroups."
|
||||
machine.succeed("${php}/bin/php -f ${pcreJitSeallocForkIssue}")
|
||||
};
|
||||
testScript =
|
||||
let
|
||||
# PCRE JIT SEAlloc feature does not play well with fork()
|
||||
# The feature needs to either be disabled or PHP configured correctly
|
||||
# More information in https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
|
||||
pcreJitSeallocForkIssue = pkgs.writeText "pcre-jit-sealloc-issue.php" ''
|
||||
<?php
|
||||
preg_match('/nixos/', 'nixos');
|
||||
$pid = pcntl_fork();
|
||||
pcntl_wait($pid);
|
||||
'';
|
||||
}
|
||||
)
|
||||
in
|
||||
''
|
||||
machine.wait_for_unit("httpd.service")
|
||||
# Ensure php evaluation by matching on the var_dump syntax
|
||||
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/index.php")
|
||||
expected = 'string(${toString (builtins.stringLength testString)}) "${testString}"'
|
||||
assert expected in response, "Does not appear to be able to use subgroups."
|
||||
machine.succeed("${php}/bin/php -f ${pcreJitSeallocForkIssue}")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lighthouse";
|
||||
version = "5.3.0";
|
||||
version = "6.0.1";
|
||||
|
||||
# lighthouse/common/deposit_contract/build.rs
|
||||
depositContractSpecVersion = "0.12.1";
|
||||
@@ -29,15 +29,14 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "sigp";
|
||||
repo = "lighthouse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wIj+YabyUrgLjWCfjCAH/Xb8jUG6ss+5SwnE2M82a+4=";
|
||||
hash = "sha256-8jHNm/MGpHGOt52rLMXLMWIVn8AXqnpAr+Wvk7DH6gc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-system-sqlite.patch
|
||||
./fix-dep-lazy_static.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-v/gOTbkzcwmqV8XCzkLzAl6LyshVBWxUclZxx1mr53o=";
|
||||
cargoHash = "sha256-Opkz3EVKw0M4LeWMsn1NlSw/Fg7cWVqnDJRRTPYYlLo=";
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
buildFeatures = [ "modern" "gnosis" ];
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
diff --git a/common/lighthouse_metrics/Cargo.toml b/common/lighthouse_metrics/Cargo.toml
|
||||
index fe966f4a9..f4153fec2 100644
|
||||
--- a/common/lighthouse_metrics/Cargo.toml
|
||||
+++ b/common/lighthouse_metrics/Cargo.toml
|
||||
@@ -8,3 +8,6 @@ edition = { workspace = true }
|
||||
|
||||
[dependencies]
|
||||
prometheus = "0.13.0"
|
||||
+
|
||||
+[dev-dependencies]
|
||||
+lazy_static.workspace = true
|
||||
@@ -17,8 +17,8 @@ let
|
||||
sha256Hash = "sha256-gi7kaB4cPnnYqHJcoeKdQ6+InIzW1kaX5kBuKR48u+Q=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2024.3.2.7"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 7"
|
||||
sha256Hash = "sha256-RENjqoPdq3iYrF1q8QcjrXVBG8xNQrV+Vq9dj0Z/Im8=";
|
||||
version = "2024.3.2.8"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 8"
|
||||
sha256Hash = "sha256-bJlkZ3ydfgVVubDlmngOvBIU62ncChuBWQ+QrZYBZcU=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@@ -2105,8 +2105,8 @@ let
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
|
||||
version = "1.279.1416"; # compatible with vscode ^1.97
|
||||
hash = "sha256-t6d+YkOElpeggwZ86VDftVz2bjDx5Rl/yOn5L5+1R/g=";
|
||||
version = "1.284.0";
|
||||
hash = "sha256-SoagiauSRbBjYouW1QDC9ZNgMl9lDH+UwtuITKsZAz8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -90,13 +90,13 @@
|
||||
"vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-s+Aa4XWY0fubJy5iPgCs8bZX0UZbyOUEus0HRz2j4do=",
|
||||
"hash": "sha256-5HiSoU3wxUtu2nsrq7h5cbqIenRMH2MpRfGJNqk8guI=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.13.1",
|
||||
"rev": "v1.14.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-KfoyGSA9viZRxOG9KVd+U0up66u6ivdG/iVIWh1RCLk="
|
||||
"vendorHash": "sha256-gD5HWmmy5P5yQH7UfzehDpxjB47aPfiUFDlQSY4BsVM="
|
||||
},
|
||||
"avi": {
|
||||
"hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=",
|
||||
@@ -543,11 +543,11 @@
|
||||
"vendorHash": "sha256-GFH2w4bdqYWl0eFBo1r6YL1pA0l5QMwrXQ9BvK3DmEI="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-YE7o8HwHUo6zI2umRv2lXY7voyg1fX5h1UitH89fBXc=",
|
||||
"hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
|
||||
"owner": "gridscale",
|
||||
"repo": "terraform-provider-gridscale",
|
||||
"rev": "v2.1.0",
|
||||
"rev": "v2.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -777,13 +777,13 @@
|
||||
"vendorHash": "sha256-t5kQxSjd90mglgMvlMnhWBQlz1r+ZI5BKBD3dqty5lk="
|
||||
},
|
||||
"lxd": {
|
||||
"hash": "sha256-PTpvB+FO94k/wnYQuex+zlpqcwwJSYl3OYRSA1gI7VM=",
|
||||
"hash": "sha256-ToK0Zua7e4CPm+8ZLIVw+dpt4bbahqWvvCKhjrAeW7s=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
|
||||
"owner": "terraform-lxd",
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v2.4.0",
|
||||
"rev": "v2.5.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-JIFYDh3EzsCNwY8Hg8aVnUIuhP+MJpygbmwTyRryM0w="
|
||||
"vendorHash": "sha256-zGHbDQhr1UjF6jcK4NHw90eTVrC+R76G8Fg7vJht20c="
|
||||
},
|
||||
"mailgun": {
|
||||
"hash": "sha256-fuJnzloJa0S1r3/22Wecbq1oF8oRQP2nrrmwCONHITA=",
|
||||
@@ -985,11 +985,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ovh": {
|
||||
"hash": "sha256-haKmmNAHBmB5bpzlqkhvntUlZmyvz5brBgD3bxT40kI=",
|
||||
"hash": "sha256-wcLzFLoMpmYJDjgkxJeZkAsdxri3s3Sg/JsP7hI0giI=",
|
||||
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
|
||||
"owner": "ovh",
|
||||
"repo": "terraform-provider-ovh",
|
||||
"rev": "v1.6.0",
|
||||
"rev": "v2.0.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calcmysky";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "10110111";
|
||||
repo = "CalcMySky";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-18ZNnLK2zMT7P0MDXS6Z38LffE8EqXKBH89TPPxVWlo=";
|
||||
hash = "sha256-r0F70ouRvUGRo7Zc7BOTe9ujRA5FN+1BdFPDtwIPly4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "albert";
|
||||
version = "0.26.13";
|
||||
version = "0.27.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albertlauncher";
|
||||
repo = "albert";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-p/8kCj9dN9x7gEvXnHGABL9Ab5zUJP5jI2L6AvCT8Qs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rdBNh9TICeOpglaJ5OJbE/f4W/UPqCkhp8H/H2OBTRM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd-autopilot";
|
||||
version = "0.4.18";
|
||||
version = "0.4.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj-labs";
|
||||
repo = "argocd-autopilot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vG2m0HhT9Pd9qzOAE2BbFf8zluH7btAVexznBCETvxA=";
|
||||
sha256 = "sha256-ZJVlmZX/eQnOM2mlAe7DOyvykjgi5DHMqHoPAHPZlXM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gyjxZiccaB5ZfEzxrYYYFx7Z6lhszzNL4ugltAMsfag=";
|
||||
vendorHash = "sha256-GzSkA8JO0LEVeGIRKkr1Ff1P8WhNIEvRmry91agYJRo=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, gfortran, blas, lapack, eigen
|
||||
, useMpi ? false
|
||||
, mpi
|
||||
, openssh
|
||||
, mpiCheckPhaseHook
|
||||
, igraph
|
||||
, useAccel ? false #use Accelerate framework on darwin
|
||||
}:
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
blas lapack
|
||||
]) ++ lib.optional useMpi mpi;
|
||||
|
||||
nativeCheckInputs = lib.optional useMpi openssh;
|
||||
nativeCheckInputs = lib.optional useMpi mpiCheckPhaseHook;
|
||||
checkInputs =
|
||||
# work around for `ld: file not found: @rpath/libquadmath.0.dylib`
|
||||
# which occurs due to an mpi test linking with `-flat_namespace`
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# a couple tests fail when run in parallel
|
||||
doCheck = true;
|
||||
enableParallelChecking = false;
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
env = lib.optionalAttrs useAccel {
|
||||
# Without these flags some tests will fail / segfault when using Accelerate
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "do-agent";
|
||||
version = "3.16.11";
|
||||
version = "3.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitalocean";
|
||||
repo = "do-agent";
|
||||
rev = version;
|
||||
sha256 = "sha256-BQFL/h9bXtbS7YeImrXjLExakfecza6wJsppgmwkRGg=";
|
||||
sha256 = "sha256-UMS8OqU4wMZ6Y384pe+QixLlrNN30jk6XtdeqRN282w=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.203.0";
|
||||
version = "0.205.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hBHWj1Brn4qbtOLZjxlr6tBuipItCFwbL9bm2wlfL80=";
|
||||
hash = "sha256-MAD+Z5hXquwuTnr87UU1IBTmbJ80exK64UbHgNyBhRI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IFi9FhsiWWg9joPAGnEnZfq4PzBjR6bJ5MWvFIPyfJo=";
|
||||
vendorHash = "sha256-CpNHVqhdrxtGnYaWfFNRTuEi1WyBMxSV7RbfqtYpcmw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "errands";
|
||||
version = "46.2.7";
|
||||
version = "46.2.8";
|
||||
|
||||
pyproject = false;
|
||||
|
||||
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "mrvladus";
|
||||
repo = "Errands";
|
||||
tag = version;
|
||||
hash = "sha256-kPF6BS7qDFstCGadSB8MSvBy+T4PkG/wRisYAaIU6rY=";
|
||||
hash = "sha256-zFI3+U40zzQL3lPPYwL/ekWA1ugOkORlJui4QT6pgQI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
appstream,
|
||||
blueprint-compiler,
|
||||
desktop-file-utils,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapGAppsHook4,
|
||||
gettext,
|
||||
gtk4,
|
||||
json-glib,
|
||||
libadwaita,
|
||||
libbacktrace,
|
||||
libsoup_3,
|
||||
libxml2,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "extension-manager";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjakeman";
|
||||
repo = "extension-manager";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0AK7wU04gQCS/3FvoAwAEmaP/jC23EduOSRncLjt4l8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
blueprint-compiler
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
gtk4
|
||||
json-glib
|
||||
libadwaita
|
||||
libbacktrace
|
||||
libsoup_3
|
||||
libxml2
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Utility for browsing and installing GNOME Shell Extensions";
|
||||
homepage = "https://github.com/mjakeman/extension-manager";
|
||||
changelog = "https://github.com/mjakeman/extension-manager/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
mainProgram = "extension-manager";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
+26
-19
@@ -1,40 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
colorlog,
|
||||
jinja2,
|
||||
lxml,
|
||||
pygments,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
tomli,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "gcovr";
|
||||
version = "8.2";
|
||||
version = "8.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = python3Packages.pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mh3d1FhdE+x3VV211rajHugVh+pvxgT/n80jLLB4LfU=";
|
||||
hash = "sha256-+qNx+cSn94yYANplUQfU+Z8EtxjRwNn0jK/cvvAEkHk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ python3Packages.hatchling ];
|
||||
|
||||
dependencies = [
|
||||
colorlog
|
||||
jinja2
|
||||
lxml
|
||||
pygments
|
||||
] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
|
||||
# pythonRelaxDeps do not work on pyproject.toml
|
||||
preBuild = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "hatchling==1.26.1" "hatchling"
|
||||
'';
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
(
|
||||
[
|
||||
colorlog
|
||||
jinja2
|
||||
lxml
|
||||
pygments
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [ tomli ]
|
||||
);
|
||||
|
||||
# There are no unit tests in the pypi tarball. Most of the unit tests on the
|
||||
# github repository currently only work with gcc5, so we just disable them.
|
||||
# See also: https://github.com/gcovr/gcovr/issues/206
|
||||
# Despite the CI passing many GCC version, ~300 tests are failing on nixos
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "harper";
|
||||
version = "0.22.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Automattic";
|
||||
repo = "harper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MwShWO1XXV2Ln70+w5KGPDChtnAOhsa2fENTNql3bo4=";
|
||||
hash = "sha256-nH1DyWGJMYiisdS4YRw+kUIJLX4twB9ZJ7OWH+QLlIA=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "harper-ls";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-+rtFGD/go5W+RCpE0+3Tkb2TbwzH8J2nl0/VkipSjI0=";
|
||||
cargoHash = "sha256-C5+5cxsnyM6cZ724C2czuoCfmIE0nQJXCwYCjfW7sgE=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "jjui";
|
||||
version = "0.5";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+1KVKevY7aWkAbbHQi06whh3keibdSVEykYDItSMi4I=";
|
||||
hash = "sha256-y93ANgIlHafwZJ1jOIzGxt81G6YbHO7/PFqYovgGBMc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MxTwe0S2wvkIy8VJl1p8utTX98zfcwpNgCdnpFAMxO0=";
|
||||
vendorHash = "sha256-84VMhT+Zbub9sw+lAKEZba1aXcRaTIbnYhJ7zJt118Y=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -11,23 +11,27 @@
|
||||
mimalloc,
|
||||
mpv,
|
||||
mpv-unwrapped,
|
||||
runCommand,
|
||||
yq,
|
||||
kazumi,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "kazumi";
|
||||
version = "1.5.4";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
tag = version;
|
||||
hash = "sha256-OVMJnSaIL0mm+Uf8tnGkbszYcQxf4vl9B+RwQVvzHbA=";
|
||||
hash = "sha256-UBylNN6UViYuUn70eV0VSsnfN6/kGAFIaa9GU/OV9Zo=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
webkitgtk_4_1
|
||||
@@ -89,25 +93,44 @@ flutter327.buildFlutterApplication rec {
|
||||
};
|
||||
};
|
||||
|
||||
gitHashes = {
|
||||
desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
|
||||
webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=";
|
||||
media_kit = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
media_kit_libs_android_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
media_kit_libs_ios_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
media_kit_libs_linux = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
media_kit_libs_macos_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
media_kit_libs_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
media_kit_libs_windows_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
media_kit_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
|
||||
};
|
||||
gitHashes =
|
||||
let
|
||||
media_kit-hash = "sha256-6V4ZTRsExm8TidznnvAZRXGbkxTLDs7YFNutNh7tLK8=";
|
||||
in
|
||||
{
|
||||
desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
|
||||
webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=";
|
||||
media_kit = media_kit-hash;
|
||||
media_kit_libs_android_video = media_kit-hash;
|
||||
media_kit_libs_ios_video = media_kit-hash;
|
||||
media_kit_libs_linux = media_kit-hash;
|
||||
media_kit_libs_macos_video = media_kit-hash;
|
||||
media_kit_libs_video = media_kit-hash;
|
||||
media_kit_libs_windows_video = media_kit-hash;
|
||||
media_kit_video = media_kit-hash;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop
|
||||
install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
|
||||
ln -snf ${mpv}/lib/libmpv.so.2 $out/app/kazumi/lib/libmpv.so.2
|
||||
install -Dm0644 assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop
|
||||
install -Dm0644 assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru = {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
nativeBuildInputs = [ yq ];
|
||||
inherit (kazumi) src;
|
||||
}
|
||||
''
|
||||
cat $src/pubspec.lock | yq > $out
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater { })
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "kazumi.pubspecSource" ./pubspec.lock.json)
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Watch Animes online with danmaku support";
|
||||
|
||||
@@ -36,6 +36,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.3"
|
||||
},
|
||||
"antlr4": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "antlr4",
|
||||
"sha256": "752b4a6e4ad97953652a2b2bbf5377f46c94b579d3372b50080c7e5858234a05",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.13.2"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1565,16 +1575,6 @@
|
||||
"source": "hosted",
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"styled_text": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "styled_text",
|
||||
"sha256": "fd624172cf629751b4f171dd0ecf9acf02a06df3f8a81bb56c0caa4f1df706c3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.1.0"
|
||||
},
|
||||
"synchronized": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1956,16 +1956,6 @@
|
||||
"source": "hosted",
|
||||
"version": "6.5.0"
|
||||
},
|
||||
"xmlstream": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "xmlstream",
|
||||
"sha256": "cfc14e3f256997897df9481ae630d94c2d85ada5187ebeb868bb1aabc2c977b4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.1"
|
||||
},
|
||||
"xpath_selector": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1999,6 +1989,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.5.0 <4.0.0",
|
||||
"flutter": ">=3.27.3"
|
||||
"flutter": ">=3.27.4"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq yq nixVersions.latest bash coreutils nix-update
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/Predidit/Kazumi/releases/latest | jq --raw-output .tag_name)
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; kazumi.version or (lib.getVersion kazumi)" | tr -d '"')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "package is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
nix-update kazumi
|
||||
|
||||
curl https://raw.githubusercontent.com/Predidit/Kazumi/${latestVersion}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kine";
|
||||
version = "0.13.10";
|
||||
version = "0.13.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k3s-io";
|
||||
repo = "kine";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5GA5W5K0Zp14400XQtlsv8BfFQ91/UnNIFwBfyrBshY=";
|
||||
hash = "sha256-Fb73warUgPX/FQT/zDnn3r7SP2tw142Npg2rhK8BEqI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-I/b4MVvqZN9eI57wPmWrP61alo9F6N1xjdx/HsNAdPQ=";
|
||||
vendorHash = "sha256-RyyDtKdEaXhrIHTA4IxtuWhOnuRWbCF2vUCkDr9lhUg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.71.0";
|
||||
version = "1.72.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Y5mqSXV0a16pZVOgOjIeOrpMh8a53qLRmraLfIhKTVI=";
|
||||
hash = "sha256-Kdt4nEWdxfZB7rmPbCegbj4abfv1nMSvAAC6mmUcv44=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "labymod-launcher";
|
||||
version = "2.1.10";
|
||||
|
||||
src = fetchurl {
|
||||
name = "labymod-launcher";
|
||||
url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
|
||||
hash = "sha256-yRzk1bish/KBe15rnnbaft3358zSv7WaejdvXAdpEC4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -Dm444 ${appimageContents}/labymodlauncher.desktop $out/share/applications/labymod-launcher.desktop
|
||||
install -Dm444 ${appimageContents}/resources/icons/icon.png $out/share/pixmaps/labymod-launcher.png
|
||||
substituteInPlace $out/share/applications/labymod-launcher.desktop \
|
||||
--replace-fail 'Exec=labymodlauncher' 'Exec=labymod-launcher' \
|
||||
--replace-fail 'Icon=labymodlauncher' 'Icon=labymod-launcher'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Minecraft modification that enhances gameplay with features like in-game TeamSpeak integration, custom animations, and additional settings";
|
||||
homepage = "https://www.labymod.net/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ httprafa ];
|
||||
mainProgram = "labymod-launcher";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -11,13 +11,13 @@ telegram-desktop.override {
|
||||
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
|
||||
finalAttrs: previousAttrs: {
|
||||
pname = "materialgram-unwrapped";
|
||||
version = "5.11.1.1";
|
||||
version = "5.12.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kukuruzka165";
|
||||
repo = "materialgram";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-vloirkfA+BXTOSMgg7epcn5CM798HI3ATQHCf/i99TE=";
|
||||
hash = "sha256-l6pVqmz8rfNhta2nCJISLl/nZqoSDBD3QrskmmhoQM4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdsh";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zimbatm";
|
||||
repo = "mdsh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vN8nFhbZgJIhFuFET9IOmdxT7uBKq/9X+TO9lZsDw6g=";
|
||||
hash = "sha256-MCudMeiqEbzOL9m50hccvogAUBaUeILm/Hu4nH04GXU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-kNe0WzW/9kcocRHR1FMKKIMnyZceqzShWQ9Cf7mAx0c=";
|
||||
cargoHash = "sha256-73wlW8Zat3/crJIcfqZ/9mCPxGDXH+A+3jvYZBHDjUk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Markdown shell pre-processor";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2025-02-21T16-00-46Z";
|
||||
version = "2025-03-12T17-29-24Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-SZtYYIIuN/tSb/5LtD5tURVBaeakm25kx9rr7+2q70w=";
|
||||
sha256 = "sha256-8n/qjM+FBrjbSLcd9iVioh3iEAkMNrIo5fG/ZQkAmBo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uwSsfiZjjDTwJhlmDl1kXoPjvs8ezz1yXhHs1b6/+3A=";
|
||||
vendorHash = "sha256-P7W8xgHc+2ksZnY0iuuPKjwsxSqjhPdiUfNMe18ldL0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -1,37 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
darwin,
|
||||
pkg-config,
|
||||
libiconv,
|
||||
fetchFromGitHub,
|
||||
enableLTO ? true,
|
||||
nrxAlias ? true,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nrr";
|
||||
version = "0.10.0";
|
||||
__structuredAttrs = true;
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryanccn";
|
||||
repo = "nrr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aS3X7Mbb1nXPTk4LCrXM5Vg/vo4IakR7QbVGTKb3ziE=";
|
||||
hash = "sha256-9QoYkYuN9kbcjgjn+7CuqKOKrVaPu8U2W/4KB+M04hg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-6enwskIbVcUhn5T3Fan4Cs/JsfnMX7diQp+9PSa96SM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
libiconv
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
cargoHash = "sha256-ZAGR7Slpt3uUWO7g4GFr7tn8/fYeAxPYZivKAhLkar4=";
|
||||
|
||||
env = lib.optionalAttrs enableLTO {
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyenv";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyenv";
|
||||
repo = "pyenv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YCCkt1lHDK91qXQXCafy1PFLr+wZgTe/9qM9gR0Xzk0=";
|
||||
hash = "sha256-8+e4kZoJ/dvx5X/JSlvtEzXiGZJmbtxSnWC1Z0YHtic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,85 +1,73 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchFromGitea,
|
||||
fetchNpmDeps,
|
||||
installShellFiles,
|
||||
libsodium,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
rustPlatform,
|
||||
fetchYarnDeps,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
npmHooks,
|
||||
stdenv,
|
||||
nodejs_20,
|
||||
nodejs,
|
||||
udev,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ratman";
|
||||
version = "0.4.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.irde.st";
|
||||
owner = "we";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "irdest";
|
||||
repo = "irdest";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-ZZ7idZ67xvQFmQJqIFU/l77YU+yDQOqNthX5NR/l4k8=";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-OuKUZSvIUekhbe1LoEFBL8+sU2KLXBsp1JCEEuxkUlk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-YfELSorpW5qWKrkW+oHwMarTo5oZcBRp13wzmFnacg4=";
|
||||
cargoHash = "sha256-H1XE+khN6sU9WTM87foEQRTK0u5fgDZvoG3//hvd464=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [ udev ];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--all-features"
|
||||
"-p"
|
||||
"ratman"
|
||||
"ratmand"
|
||||
"-p"
|
||||
"ratman-tools"
|
||||
];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/man/ratmand.1
|
||||
'';
|
||||
|
||||
SODIUM_USE_PKG_CONFIG = 1;
|
||||
|
||||
dashboard = stdenv.mkDerivation rec {
|
||||
pname = "ratman-dashboard";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/ratman/dashboard";
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/ratman/dashboard/yarn.lock";
|
||||
sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${pname}-${version}-npm-deps";
|
||||
src = "${src}/ratman/dashboard";
|
||||
hash = "sha256-47L4V/Vf8DK3q63MYw3x22+rzIN3UPD0N/REmXh5h3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs_20
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
npmHooks.npmBuildHook
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dist"
|
||||
];
|
||||
npmBuildScript = "build";
|
||||
|
||||
installPhase = ''
|
||||
cp -R . $out
|
||||
|
||||
mv $out/dist $dist
|
||||
ln -s $dist $out/dist
|
||||
mkdir $out
|
||||
cp -r dist/* $out/
|
||||
'';
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
cp -r ${dashboard.dist} ratman/dashboard/dist
|
||||
cp -r ${dashboard} ratman/dashboard/dist
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "release-plz";
|
||||
version = "0.3.120";
|
||||
version = "0.3.125";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MarcoIeni";
|
||||
repo = "release-plz";
|
||||
rev = "release-plz-v${version}";
|
||||
hash = "sha256-5e00l84xKZVqOIDr+Jx0kLFaWEs/oe+EEnDp/obvwWM=";
|
||||
hash = "sha256-mtoXs9AyRzI4lOFHAaR+mqZn72y8ljhVMxZHs5GbD2o=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-3sTeWE/qMOIR+TxGjL813bPpHou/8Zjt7i0+hEOep1c=";
|
||||
cargoHash = "sha256-e0Yoqu1oX8kI6QC42g1YrkSo7NIitGjQ4kf9VrvKaY4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -53,17 +53,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rio";
|
||||
version = "0.2.8";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphamorim";
|
||||
repo = "rio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1sX2V00irRhxiBoAu/Xx98YWDwkqMxXyEAFLboDxUo8=";
|
||||
hash = "sha256-zDik7uHbg177Np9ukX3yZnQSYbuyif7fh+gxCoeeDvU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-HDG3JokPcOds2wGjTelhUSE33dpcp4k5yZyRMZZQJEc=";
|
||||
cargoHash = "sha256-N2CyZBKfpLT9vkTtIhhJy/PeMT6Iic5WJYc8yYWZbEs=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sequoia-chameleon-gnupg";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
repo = "sequoia-chameleon-gnupg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2EJDpiNYrNh8Ojhs6jSsaLV5zKExShiIor3/Tjue+y8=";
|
||||
hash = "sha256-K8IFuc+ykXKnx5NiWeLzCkVpgvi4apbJl6AKrBvVIaA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-DKMz8unxxH4crjN8X1Ulh61jBtFSTVNrzFBkEs0RnGM=";
|
||||
cargoHash = "sha256-lFeE/orMcb5an2MFlh94RaCh0fVEP8EP97CYNW56O4o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
lz4,
|
||||
libxml2,
|
||||
libX11,
|
||||
spirv-headers,
|
||||
glslang,
|
||||
llvmPackages_13,
|
||||
versionCheckHook,
|
||||
@@ -28,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2025.4";
|
||||
version = "2025.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-odZEWiE8SQrfPlRjkI6HkB+sHUhj5ySyBQCKQua7CKA=";
|
||||
hash = "sha256-yNPAJX7OxxQLXDm3s7Hx5QA9fxy1qbAMp4LKYVqxMVM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -76,21 +75,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
miniz
|
||||
lz4
|
||||
libxml2
|
||||
spirv-headers
|
||||
]
|
||||
++ (lib.optionals stdenv.hostPlatform.isLinux [
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
])
|
||||
++ (lib.optionals withLLVM [
|
||||
]
|
||||
++ lib.optionals withLLVM [
|
||||
# Slang only supports LLVM 13:
|
||||
# https://github.com/shader-slang/slang/blob/master/docs/building.md#llvm-support
|
||||
llvmPackages_13.llvm
|
||||
llvmPackages_13.libclang
|
||||
])
|
||||
++ (lib.optionals withGlslang [
|
||||
]
|
||||
++ lib.optionals withGlslang [
|
||||
# SPIRV-tools is included in glslang.
|
||||
glslang
|
||||
]);
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -125,16 +123,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DSLANG_ENABLE_SLANG_RHI=OFF"
|
||||
"-DSLANG_USE_SYSTEM_MINIZ=ON"
|
||||
"-DSLANG_USE_SYSTEM_LZ4=ON"
|
||||
"-DSLANG_SPIRV_HEADERS_INCLUDE_DIR=${spirv-headers}/include"
|
||||
"-DSLANG_SLANG_LLVM_FLAVOR=${if withLLVM then "USE_SYSTEM_LLVM" else "DISABLE"}"
|
||||
]
|
||||
# Currently depends on unreleased op type `SpvOpTypeNodePayloadArrayAMDX`,
|
||||
# which will be included in next release >1.3.296
|
||||
++ lib.optional (lib.versionAtLeast spirv-headers.version "1.3.297.0") "-DSLANG_USE_SYSTEM_SPIRV_HEADERS=ON"
|
||||
++ (lib.optionals withGlslang [
|
||||
++ lib.optionals withGlslang [
|
||||
"-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON"
|
||||
"-DSLANG_USE_SYSTEM_GLSLANG=ON"
|
||||
])
|
||||
]
|
||||
++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -13,20 +13,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "super-productivity";
|
||||
version = "12.0.0";
|
||||
version = "12.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johannesjo";
|
||||
repo = "super-productivity";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Bb7LjYP116+Ce6BAknCSQpnddlIC/BoMJ2r2qJRBxas=";
|
||||
hash = "sha256-s+j9TPdyA5OBGv+fxwz9Ze4SzME9m2nusbwrEsntvQc=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} -r $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-peDRx7tNl5GXDRzj8TZter2dXzfoEPSPunzAmDOUcSM=";
|
||||
npmDepsHash = "sha256-uPdfUiFEb9MLdgfLXo5g7EEs2RUJpCxwKR02kqlD7P8=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-firmware";
|
||||
# Check Makefile when updating, make sure postInstall matches make install
|
||||
version = "1.0.69";
|
||||
version = "1.0.70";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "system76-firmware";
|
||||
rev = version;
|
||||
sha256 = "sha256-+0I4XZ9qpDIz3Yv83//JnPDfw6zHcT6UrZEeqUhc7TI=";
|
||||
sha256 = "sha256-6c2OTHCTIYl/ezkWjmyb60FAdasOrV9hjd0inDc44wI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-j3Gw46nK3fe6CKboyi9FFHnc8IytVJP9wnJ2iwEblP8=";
|
||||
cargoHash = "sha256-mLk4EhaRaJvZk27BmjuvNy7PWbqYjUZ9uDikWmBEaz8=";
|
||||
|
||||
# Purposefully don't install systemd unit file, that's for NixOS
|
||||
postInstall = ''
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdo";
|
||||
version = "8.3.0.73";
|
||||
version = "8.3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dm-vdo";
|
||||
repo = "vdo";
|
||||
rev = version;
|
||||
hash = "sha256-JowaGWh9LXEixxeVn3RmXTfKjVBOZLYQpF7pum79kUE=";
|
||||
hash = "sha256-6oX3ngsBPhE6XsMfliWw5Qzu3UosnsIFIAFRCqckU7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo124Module,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
@@ -9,19 +9,19 @@
|
||||
}:
|
||||
let
|
||||
pname = "workout-tracker";
|
||||
version = "2.0.3";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jovandeginste";
|
||||
repo = "workout-tracker";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DJOYjKujb6mmqJcYhzPLv1uYgAIWW4hdH/gILlqkJXQ=";
|
||||
hash = "sha256-J2Pu8SR1kS9rpbq6uvZncU+oGvB4Ijfrajw2EtakluA=";
|
||||
};
|
||||
|
||||
assets = buildNpmPackage {
|
||||
pname = "${pname}-assets";
|
||||
inherit version src;
|
||||
npmDepsHash = "sha256-/OBIRiLwUtXVmmg44FYqV0BptxQTg8bDuNMTj8IYwG0=";
|
||||
npmDepsHash = "sha256-LB9YPhz+1FLqf7G4LRdm6OMyIsEQCd23frl5wb5pG/Q=";
|
||||
dontNpmBuild = true;
|
||||
makeCacheWritable = true;
|
||||
postPatch = ''
|
||||
@@ -34,7 +34,7 @@ let
|
||||
'';
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
buildGo124Module {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "platformio";
|
||||
version = "6.1.17";
|
||||
version = "6.1.18";
|
||||
pyproject = true;
|
||||
|
||||
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||
@@ -20,7 +20,7 @@ buildPythonApplication rec {
|
||||
owner = "platformio";
|
||||
repo = "platformio-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OQEbEAVLS4DdbdBf4S9KS1RVHCC91vFtX6lz2u6Xouc=";
|
||||
hash = "sha256-h9/xDWXCoGHQ9r2f/ZzAtwTAs4qzDrvVAQ2kuLS9Lk8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -207,7 +207,7 @@ buildPythonApplication rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/platformio/platformio-core/releases/tag/v${version}";
|
||||
changelog = "https://github.com/platformio/platformio-core/releases/tag/${src.tag}";
|
||||
description = "Open source ecosystem for IoT development";
|
||||
downloadPage = "https://github.com/platformio/platformio-core";
|
||||
homepage = "https://platformio.org";
|
||||
|
||||
@@ -521,22 +521,22 @@ self: super: {
|
||||
|
||||
# Manually maintained
|
||||
cachix-api = overrideCabal (drv: {
|
||||
version = "1.7.6";
|
||||
version = "1.7.7";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.7.6";
|
||||
hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=";
|
||||
rev = "v1.7.7";
|
||||
hash = "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
|
||||
}) super.cachix-api;
|
||||
cachix = (overrideCabal (drv: {
|
||||
version = "1.7.6";
|
||||
version = "1.7.7";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.7.6";
|
||||
hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=";
|
||||
rev = "v1.7.7";
|
||||
hash = "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix";
|
||||
}) (lib.pipe
|
||||
|
||||
@@ -100,9 +100,9 @@ in {
|
||||
major = "3";
|
||||
minor = "14";
|
||||
patch = "0";
|
||||
suffix = "a5";
|
||||
suffix = "a6";
|
||||
};
|
||||
hash = "sha256-dOg/Jt4eT7nu8bVkks/5JQiDS7cawT9cWAQ4zp8JNoI=";
|
||||
hash = "sha256-jWGB5TMdmizWykBa4SMOiFiaBD9HaOu0Q9OInUXBw1w=";
|
||||
inherit passthruFun;
|
||||
};
|
||||
# Minimal versions of Python (built without optional dependencies)
|
||||
|
||||
+9
-2
@@ -3,6 +3,8 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
babel,
|
||||
gitpython,
|
||||
mkdocs,
|
||||
@@ -13,7 +15,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-git-revision-date-localized-plugin";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -24,7 +26,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-Z0a/V8wyo15E7bTumLRM+0QxMGXlxVc1Sx9uXlDbg+8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
babel
|
||||
gitpython
|
||||
mkdocs
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-plugin-dns";
|
||||
version = "1.1.7";
|
||||
version = "1.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peteeckel";
|
||||
repo = "netbox-plugin-dns";
|
||||
tag = version;
|
||||
hash = "sha256-wrVTsVKjGPJCIoSo6uuWtorJBjn4Kh2kYkBXxM88kCo";
|
||||
hash = "sha256-sRhFTbQjt4K0myel9MxpJKm/4iRQm6O5IL8k/MZIf4A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-qrcode";
|
||||
version = "0.0.16";
|
||||
version = "0.0.17";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = "netbox-qrcode";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3d2UugM08qGW5YnpxYVp9FfgMTevJaExAnTpaKwxcUw=";
|
||||
hash = "sha256-uJMGO9LXvaByfvrjNaPyY89Uaf71k1ku+/bfqc4npiQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
tabulate,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "pyfunctional";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EntilZha";
|
||||
repo = "PyFunctional";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-utUmHQw7Y5pQJkwuy8CbPnCrAd/esaf0n1Exr/trcRg=";
|
||||
rev = "6ed2e9a8a73d97141a8a7edab25e1aefadc256a3"; # missing tag
|
||||
hash = "sha256-u7gcZEeg1exb98aVUOorVhxUHqjX50aPTpE5gR6sONI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -3,18 +3,16 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
poetry-core,
|
||||
isPy3k,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rubymarshal";
|
||||
version = "1.2.8";
|
||||
version = "1.2.9";
|
||||
pyproject = true;
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8+8KxCjsawlFXd1Bgq/8jY0TSB9l8UHaNMkcqfoz7hs=";
|
||||
hash = "sha256-OqTbHV2duO4SmP6O9+tfaSD7fKOJ/PmzX5dUW9eoBBg=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -25,9 +23,9 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "rubymarshal" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/d9pouces/RubyMarshal/";
|
||||
description = "Read and write Ruby-marshalled data";
|
||||
homepage = "https://github.com/d9pouces/RubyMarshal/";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = [ maintainers.ryantm ];
|
||||
maintainers = with maintainers; [ ryantm ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
sphinx,
|
||||
cairosvg,
|
||||
inkscape,
|
||||
librsvg,
|
||||
fetchPypi,
|
||||
|
||||
withCairosvg ? false,
|
||||
withInkscape ? false,
|
||||
withLibrsvg ? true,
|
||||
}:
|
||||
|
||||
assert (withCairosvg || withInkscape || withLibrsvg);
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-svg2pdfconverter";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "sphinxcontrib_svg2pdfconverter";
|
||||
hash = "sha256-ZBGkzC9X7tlqDXu/oTn2jL55gwGIgeHm18RgU81pkR8=";
|
||||
};
|
||||
|
||||
# for enabled modules: provide the full path to the binary
|
||||
postPatch =
|
||||
lib.optionalString withLibrsvg ''
|
||||
substituteInPlace sphinxcontrib/rsvgconverter.py \
|
||||
--replace-fail "'rsvg_converter_bin', 'rsvg-convert'" "'rsvg_converter_bin', '${lib.getExe' librsvg "rsvg-convert"}'"
|
||||
''
|
||||
+ lib.optionalString withInkscape ''
|
||||
substituteInPlace sphinxcontrib/inkscapeconverter.py \
|
||||
--replace-fail "'inkscape_converter_bin', 'inkscape'" "'inkscape_converter_bin', '${lib.getExe inkscape}'"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ sphinx ] ++ lib.optional withCairosvg cairosvg;
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
pythonImportsCheck =
|
||||
lib.optional withCairosvg "sphinxcontrib.cairosvgconverter"
|
||||
++ lib.optional withInkscape "sphinxcontrib.inkscapeconverter"
|
||||
++ lib.optional withLibrsvg "sphinxcontrib.rsvgconverter";
|
||||
|
||||
pythonNamespaces = [ "sphinxcontrib" ];
|
||||
|
||||
meta = {
|
||||
description = "Sphinx SVG to PDF converter extension";
|
||||
homepage = "https://github.com/missinglinkelectronics/sphinxcontrib-svg2pdfconverter";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ dansbandit ];
|
||||
};
|
||||
}
|
||||
@@ -20,27 +20,26 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "surepy";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benleb";
|
||||
repo = pname;
|
||||
repo = "surepy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ETgpXSUUsV1xoZjdnL2bzn4HwDjKC2t13yXwf28OBqI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'aiohttp = {extras = ["speedups"], version = "^3.7.4"}' 'aiohttp = {extras = ["speedups"], version = ">=3.7.4"}' \
|
||||
--replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' \
|
||||
--replace 'rich = "^10.1.0"' 'rich = ">=10.1.0"'
|
||||
'';
|
||||
pythonRelaxDeps = [
|
||||
"aiohttp"
|
||||
"async-timeout"
|
||||
"rich"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiodns
|
||||
aiohttp
|
||||
async-timeout
|
||||
@@ -61,9 +60,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to interact with the Sure Petcare API";
|
||||
mainProgram = "surepy";
|
||||
homepage = "https://github.com/benleb/surepy";
|
||||
license = with licenses; [ mit ];
|
||||
changelog = "https://github.com/benleb/surepy/releases/tag/v${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "surepy";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "symspellpy";
|
||||
version = "6.7.8";
|
||||
version = "6.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mammothb";
|
||||
repo = "symspellpy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZnkZE7v4o0o6iPdkjCycDgVdLhsE3Vn1uuGT7o0F86I=";
|
||||
hash = "sha256-isxANYSiwN8pQ7/XfMtO7cyoGdTyrXYOZ6C5rDJsJIs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python port of SymSpell v6.7.1, which provides much higher speed and lower memory consumption";
|
||||
homepage = "https://github.com/mammothb/symspellpy";
|
||||
changelog = "https://github.com/mammothb/symspellpy/releases/tag/v${version}";
|
||||
changelog = "https://github.com/mammothb/symspellpy/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ vizid ];
|
||||
};
|
||||
|
||||
@@ -62,6 +62,8 @@ mkKdeDerivation {
|
||||
gpsd
|
||||
];
|
||||
|
||||
qtWrapperArgs = [ "--inherit-argv0" ];
|
||||
|
||||
# Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
|
||||
@@ -18,13 +18,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "t-rec";
|
||||
version = "0.7.8";
|
||||
version = "0.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sassman";
|
||||
repo = "t-rec-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-111zbUDmp/Yyvx0uXMzqEnk/Jr2hfxtNNX6f0Ti3Brg=";
|
||||
sha256 = "sha256-aQX+JJ2MwzzxJkA1vsE8JqvYpWtqyycvycPc2pyFU7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-f//1/mLciJ3EDfHkZtg1c2W8qtfUY2DF4x31qqDExMI=";
|
||||
cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly-exporter";
|
||||
version = "9.0.1";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "fastly-exporter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tlaKjJmk+ZxeQ5KQ9Ai4XGKYqiLWwAlzkRuFjKLSaog=";
|
||||
hash = "sha256-1xgTAMsUw+eYeHD6NEo2Zw3fL1Hdm6fxQWfgp/VQaXc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-e1+T4+TgSB5pR4YiwtOuNztAXxWfCokFczbZcUNF7iI=";
|
||||
vendorHash = "sha256-NbMvDaD4E6mYypPRSqNBjToCffldJzh33wuq83hWM9A=";
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests.prometheus-exporters) fastly;
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snac2";
|
||||
version = "2.72";
|
||||
version = "2.73";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rAdbTzgjd6sZSx8TQrBQbhFjRY/4eSStrEwwCbrHefo=";
|
||||
hash = "sha256-5LKDwp5f5BWhm+9uVBlv3mJpLLQ+ETP9lcRXlfD579Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -55,7 +55,7 @@ let
|
||||
konversation korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker
|
||||
kshisen ksquares ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch
|
||||
kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited
|
||||
marble merkuro milou minuet okular oxygen oxygen-icons5 picmi
|
||||
marble merkuro milou minuet okular oxygen picmi
|
||||
plasma-browser-integration plasma-desktop plasma-integration plasma-nano
|
||||
plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt
|
||||
plasma-vault plasma-workspace plasma-workspace-wallpapers
|
||||
@@ -1156,6 +1156,14 @@ mapAliases {
|
||||
OSCAR = oscar; # Added 2024-06-12
|
||||
osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
|
||||
ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
|
||||
oxygen-icons5 = throw ''
|
||||
The top-level oxygen-icons5 alias has been removed.
|
||||
|
||||
Please explicitly use kdePackages.oxygen-icons for the latest Qt 6-based version,
|
||||
or libsForQt5.oxygen-icons5 for the deprecated Qt 5 version.
|
||||
|
||||
Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
|
||||
''; # Added 2025-03-15;
|
||||
oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23
|
||||
|
||||
### P ###
|
||||
|
||||
@@ -1187,7 +1187,9 @@ with pkgs;
|
||||
|
||||
datalad-gooey = with python3Packages; toPythonApplication datalad-gooey;
|
||||
|
||||
forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
|
||||
forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix {
|
||||
buildGoModule = buildGo123Module;
|
||||
};
|
||||
|
||||
gfold = callPackage ../applications/version-management/gfold { };
|
||||
|
||||
@@ -8776,8 +8778,6 @@ with pkgs;
|
||||
protobuf = protobuf_21;
|
||||
};
|
||||
|
||||
gcovr = with python3Packages; toPythonApplication gcovr;
|
||||
|
||||
gcr = callPackage ../development/libraries/gcr { };
|
||||
|
||||
gcr_4 = callPackage ../development/libraries/gcr/4.nix { };
|
||||
|
||||
@@ -5186,8 +5186,6 @@ self: super: with self; {
|
||||
|
||||
gcodepy = callPackage ../development/python-modules/gcodepy { };
|
||||
|
||||
gcovr = callPackage ../development/python-modules/gcovr { };
|
||||
|
||||
gcp-storage-emulator = callPackage ../development/python-modules/gcp-storage-emulator { };
|
||||
|
||||
gcsa = callPackage ../development/python-modules/gcsa { };
|
||||
@@ -15726,6 +15724,8 @@ self: super: with self; {
|
||||
|
||||
sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { };
|
||||
|
||||
sphinxcontrib-svg2pdfconverter = callPackage ../development/python-modules/sphinxcontrib-svg2pdfconverter { };
|
||||
|
||||
sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz { };
|
||||
|
||||
sphinxcontrib-wavedrom = callPackage ../development/python-modules/sphinxcontrib-wavedrom { };
|
||||
|
||||
Reference in New Issue
Block a user