Merge master into staging-nixos
This commit is contained in:
@@ -235,13 +235,24 @@ One would think that `localSystem` and `crossSystem` overlap horribly with the t
|
||||
|
||||
### Implementation of dependencies {#ssec-cross-dependency-implementation}
|
||||
|
||||
The categories of dependencies developed in [](#ssec-cross-dependency-categorization) are specified as lists of derivations given to `mkDerivation`, as documented in [](#ssec-stdenv-dependencies). In short, each list of dependencies for `host → target` is called `deps<host><target>` (where `host`, and `target` values are either `build`, `host`, or `target`), with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `deps<host><target>` is automatically taken from `pkgs<host><target>`. (These `pkgs<host><target>`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.gcc` should be used at run-time.
|
||||
The categories of dependencies developed in [](#ssec-cross-dependency-categorization) are specified as lists of derivations given to `mkDerivation`, as documented in [](#ssec-stdenv-dependencies). In short, each list of dependencies for `host → target` is called `deps<theirHost><theirTarget>` (where `theirHost`, and `theirTarget` values are either `build`, `host`, or `target`), with exceptions for backwards compatibility that `depsBuildHost` is instead called `nativeBuildInputs` and `depsHostTarget` is instead called `buildInputs`. Nixpkgs is now structured so that each `deps<theirHost><theirTarget>` is automatically taken from `pkgs<theirHost><theirTarget>`. (These `pkgs<theirHost><theirTarget>`s are quite new, so there is no special case for `nativeBuildInputs` and `buildInputs`.) For example, `pkgsBuildHost.gcc` should be used at build-time, while `pkgsHostTarget.openssl` should be used at run-time.
|
||||
|
||||
Now, for most of Nixpkgs's history, there were no `pkgs<host><target>` attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just `buildPackages`, `pkgs`, and `targetPackages`. Those are now redefined as aliases to `pkgsBuildHost`, `pkgsHostTarget`, and `pkgsTargetTarget`. It is acceptable, even recommended, to use them for libraries to show that the host platform is irrelevant.
|
||||
Adjacent package sets are defined as `pkgs<theirHost><theirTarget>` attributes, where "their" represents the new attribute set, and "our" represents the "current" package set. Below is a table of adjacent stages and their aliases. See [](#variables-specifying-dependencies) for usage examples.
|
||||
|
||||
But before that, there was just `pkgs`, even though both `buildInputs` and `nativeBuildInputs` existed. \[Cross barely worked, and those were implemented with some hacks on `mkDerivation` to override dependencies.\] What this means is the vast majority of packages do not use any explicit package set to populate their dependencies, just using whatever `callPackage` gives them even if they do correctly sort their dependencies into the multiple lists described above. And indeed, asking that users both sort their dependencies, _and_ take them from the right attribute set, is both too onerous and redundant, so the recommended approach (for now) is to continue just categorizing by list and not using an explicit package set.
|
||||
| Adjacent package set | Their host platform | Their target platform |
|
||||
|----------------------------------------|---------------------|-----------------------|
|
||||
| `pkgsBuildBuild` | Our build platform | Our build platform |
|
||||
| `pkgsBuildHost` or `buildPackages` | Our build platform | Our host platform |
|
||||
| `pkgsBuildTarget` | Our build platform | Our target platform |
|
||||
| `pkgsHostHost` | Our host platform | Our host platform |
|
||||
| `pkgsHostTarget` or `pkgs` | Our host platform | Our target platform |
|
||||
| `pkgsTargetTarget` or `targetPackages` | Our target platform | Our target platform |
|
||||
|
||||
To make this work, we "splice" together the six `pkgsFooBar` package sets and have `callPackage` actually take its arguments from that. This is currently implemented in `pkgs/top-level/splice.nix`. `mkDerivation` then, for each dependency attribute, pulls the right derivation out from the splice. This splicing can be skipped when not cross-compiling as the package sets are the same, but still is a bit slow for cross-compiling. We'd like to do something better, but haven't come up with anything yet.
|
||||
Now, for most of Nixpkgs's history, there were no `pkgs<theirHost><theirTarget>` attributes, and most packages have not been refactored to use it explicitly. Prior to those, there were just `buildPackages`, `pkgs`, and `targetPackages`. Those are now redefined as aliases to `pkgsBuildHost`, `pkgsHostTarget`, and `pkgsTargetTarget`. It is acceptable, even recommended, to use them to show that only their host platform matters. That is, use `buildPackages` where any of `pkgsBuild*` would do, and `targetPackages` when any of `pkgsTarget*` would do (if we had more than just `pkgsTargetTarget`).
|
||||
|
||||
But before that, there was just `pkgs`, even though both `buildInputs` and `nativeBuildInputs` existed. (Cross barely worked, and those were implemented with some hacks on `mkDerivation` to override dependencies.) What this means is the vast majority of packages do not use any explicit package set to populate their dependencies, just using whatever `callPackage` gives them even if they do correctly sort their dependencies into the multiple lists described above. And indeed, asking that users both sort their dependencies, _and_ take them from the right attribute set, is both too onerous and redundant, so the recommended approach (for now) is to continue just categorizing by list and not using an explicit package set.
|
||||
|
||||
To make this work, we "splice" together the six `pkgs<theirHost><theirTarget>` package sets and have `callPackage` actually take its arguments from that. This is currently implemented in `pkgs/top-level/splice.nix`. `mkDerivation` then, for each dependency attribute, pulls the right derivation out from the splice. This splicing can be skipped when not cross-compiling as the package sets are the same, but still is a bit slow for cross-compiling. We'd like to do something better, but haven't come up with anything yet.
|
||||
|
||||
### Bootstrapping {#ssec-bootstrapping}
|
||||
|
||||
|
||||
@@ -431,7 +431,7 @@ Overall, the unifying theme here is that propagation shouldn’t be introducing
|
||||
|
||||
##### `depsBuildBuild` {#var-stdenv-depsBuildBuild}
|
||||
|
||||
A list of dependencies whose host and target platforms are the new derivation’s build platform. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
|
||||
A list of dependencies whose host and target platforms are the new derivation’s build platform. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc` (the compiler for `buildPackages`, which means that it's from the package set `buildPackages.buildPackages = pkgsBuildBuild`), the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
|
||||
|
||||
Since these packages are able to be run at build-time, they are always added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
let
|
||||
inherit (lib)
|
||||
any
|
||||
filterAttrs
|
||||
attrNames
|
||||
filter
|
||||
foldl
|
||||
hasInfix
|
||||
isAttrs
|
||||
isFunction
|
||||
isList
|
||||
mapAttrs
|
||||
optional
|
||||
@@ -43,9 +43,8 @@ let
|
||||
*/
|
||||
equals =
|
||||
let
|
||||
# perf: avoid lib.isFunction because system attrs are never __functor-style attrsets.
|
||||
removeFunctions =
|
||||
a: removeAttrs a (builtins.filter (n: builtins.isFunction a.${n}) (builtins.attrNames a));
|
||||
# System attrs are never __functor-style attrsets, so builtins.isFunction suffices.
|
||||
removeFunctions = a: removeAttrs a (filter (n: builtins.isFunction a.${n}) (attrNames a));
|
||||
in
|
||||
a: b: removeFunctions a == removeFunctions b;
|
||||
|
||||
|
||||
@@ -2985,6 +2985,12 @@
|
||||
githubId = 127523;
|
||||
name = "Herman Fries";
|
||||
};
|
||||
barrettruth = {
|
||||
email = "br@barrettruth.com";
|
||||
github = "barrettruth";
|
||||
githubId = 62671086;
|
||||
name = "Barrett Ruth";
|
||||
};
|
||||
BarrOff = {
|
||||
name = "BarrOff";
|
||||
github = "BarrOff";
|
||||
@@ -29229,6 +29235,12 @@
|
||||
githubId = 42300264;
|
||||
name = "wishfort36";
|
||||
};
|
||||
wishstudio = {
|
||||
email = "wishstudio@gmail.com";
|
||||
github = "wishstudio";
|
||||
githubId = 946459;
|
||||
name = "Xiangyan Sun";
|
||||
};
|
||||
witchof0x20 = {
|
||||
name = "Jade";
|
||||
email = "jade@witchof.space";
|
||||
|
||||
@@ -518,6 +518,12 @@ let
|
||||
default = null;
|
||||
};
|
||||
|
||||
nodeExternalIP = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = "IPv4/IPv6 external addresses to advertise for node.";
|
||||
default = null;
|
||||
};
|
||||
|
||||
selinux = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
description = "Enable SELinux in containerd.";
|
||||
@@ -826,8 +832,8 @@ let
|
||||
"${name}: token, tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'"
|
||||
)
|
||||
++ (lib.optional (
|
||||
cfg.role == "agent" && !(cfg.agentTokenFile != null || cfg.agentToken != "")
|
||||
) "${name}: agentToken and agentToken should not be set if role is 'agent'");
|
||||
cfg.role == "agent" && (cfg.agentTokenFile != null || cfg.agentToken != "")
|
||||
) "${name}: agentToken and agentTokenFile should not be set if role is 'agent'");
|
||||
|
||||
environment.systemPackages = [ config.services.${name}.package ];
|
||||
|
||||
@@ -936,6 +942,7 @@ let
|
||||
++ (lib.optionals (cfg.nodeLabel != [ ]) (map (l: "--node-label=${l}") cfg.nodeLabel))
|
||||
++ (lib.optionals (cfg.nodeTaint != [ ]) (map (t: "--node-taint=${t}") cfg.nodeTaint))
|
||||
++ (lib.optional (cfg.nodeIP != null) "--node-ip=${cfg.nodeIP}")
|
||||
++ (lib.optional (cfg.nodeExternalIP != null) "--node-external-ip=${cfg.nodeExternalIP}")
|
||||
++ (lib.optional cfg.selinux "--selinux")
|
||||
++ (lib.optional (kubeletParams != { }) "--kubelet-arg=config=${kubeletConfig}")
|
||||
++ (lib.optional (cfg.extraKubeProxyConfig != { }) "--kube-proxy-arg=config=${kubeProxyConfig}")
|
||||
|
||||
@@ -115,23 +115,24 @@ in
|
||||
# implementation
|
||||
|
||||
config = lib.mkIf cfg.enable (
|
||||
lib.recursiveUpdate baseModule.config {
|
||||
warnings = (
|
||||
lib.optional (
|
||||
cfg.disableAgent && cfg.images != [ ]
|
||||
) "k3s: Images are only imported on nodes with an enabled agent, they will be ignored by this node."
|
||||
);
|
||||
lib.mkMerge [
|
||||
baseModule.config
|
||||
{
|
||||
warnings =
|
||||
lib.optional (cfg.disableAgent && cfg.images != [ ])
|
||||
"k3s: Images are only imported on nodes with an enabled agent, they will be ignored by this node.";
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.role == "agent" -> !cfg.disableAgent;
|
||||
message = "k3s: disableAgent must be false if role is 'agent'";
|
||||
}
|
||||
{
|
||||
assertion = cfg.role == "agent" -> !cfg.clusterInit;
|
||||
message = "k3s: clusterInit must be false if role is 'agent'";
|
||||
}
|
||||
];
|
||||
}
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.role == "agent" -> !cfg.disableAgent;
|
||||
message = "k3s: disableAgent must be false if role is 'agent'";
|
||||
}
|
||||
{
|
||||
assertion = cfg.role == "agent" -> !cfg.clusterInit;
|
||||
message = "k3s: clusterInit must be false if role is 'agent'";
|
||||
}
|
||||
];
|
||||
}
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
@@ -121,40 +121,41 @@ in
|
||||
# implementation
|
||||
|
||||
config = lib.mkIf cfg.enable (
|
||||
lib.recursiveUpdate baseModule.config {
|
||||
warnings = (
|
||||
lib.optional (
|
||||
lib.mkMerge [
|
||||
baseModule.config
|
||||
{
|
||||
warnings = lib.optional (
|
||||
cfg.role == "agent" && cfg.cni != null
|
||||
) "rke2: cni should not be set if role is 'agent'"
|
||||
);
|
||||
) "rke2: cni should not be set if role is 'agent'";
|
||||
|
||||
# Configure NetworkManager to ignore CNI network interfaces.
|
||||
# See: https://docs.rke2.io/known_issues#networkmanager
|
||||
environment.etc."NetworkManager/conf.d/rke2-canal.conf" = {
|
||||
enable = config.networking.networkmanager.enable;
|
||||
text = ''
|
||||
[keyfile]
|
||||
unmanaged-devices=interface-name:flannel*;interface-name:cali*;interface-name:tunl*;interface-name:vxlan.calico;interface-name:vxlan-v6.calico;interface-name:wireguard.cali;interface-name:wg-v6.cali
|
||||
'';
|
||||
};
|
||||
|
||||
# CIS hardening
|
||||
# https://docs.rke2.io/security/hardening_guide#kernel-parameters
|
||||
# https://github.com/rancher/rke2/blob/ef0fc7aa9d3bbaa95ce9b1895972488cbd92e302/bundle/share/rke2/rke2-cis-sysctl.conf
|
||||
boot.kernel.sysctl = {
|
||||
"vm.panic_on_oom" = 0;
|
||||
"vm.overcommit_memory" = 1;
|
||||
"kernel.panic" = 10;
|
||||
"kernel.panic_on_oops" = 1;
|
||||
};
|
||||
# https://docs.rke2.io/security/hardening_guide#etcd-is-configured-properly
|
||||
users = lib.mkIf cfg.cisHardening {
|
||||
users.etcd = {
|
||||
isSystemUser = true;
|
||||
group = "etcd";
|
||||
# Configure NetworkManager to ignore CNI network interfaces.
|
||||
# See: https://docs.rke2.io/known_issues#networkmanager
|
||||
environment.etc."NetworkManager/conf.d/rke2-canal.conf" = {
|
||||
enable = config.networking.networkmanager.enable;
|
||||
text = ''
|
||||
[keyfile]
|
||||
unmanaged-devices=interface-name:flannel*;interface-name:cali*;interface-name:tunl*;interface-name:vxlan.calico;interface-name:vxlan-v6.calico;interface-name:wireguard.cali;interface-name:wg-v6.cali
|
||||
'';
|
||||
};
|
||||
groups.etcd = { };
|
||||
};
|
||||
}
|
||||
|
||||
# CIS hardening
|
||||
# https://docs.rke2.io/security/hardening_guide#kernel-parameters
|
||||
# https://github.com/rancher/rke2/blob/ef0fc7aa9d3bbaa95ce9b1895972488cbd92e302/bundle/share/rke2/rke2-cis-sysctl.conf
|
||||
boot.kernel.sysctl = {
|
||||
"vm.panic_on_oom" = 0;
|
||||
"vm.overcommit_memory" = 1;
|
||||
"kernel.panic" = 10;
|
||||
"kernel.panic_on_oops" = 1;
|
||||
};
|
||||
# https://docs.rke2.io/security/hardening_guide#etcd-is-configured-properly
|
||||
users = lib.mkIf cfg.cisHardening {
|
||||
users.etcd = {
|
||||
isSystemUser = true;
|
||||
group = "etcd";
|
||||
};
|
||||
groups.etcd = { };
|
||||
};
|
||||
}
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
@@ -300,7 +300,7 @@ in
|
||||
lib.mapAttrsToList (name: cfg: {
|
||||
${cfg.nginx.virtualHost} = {
|
||||
locations =
|
||||
(genAttrs' [ "cgit.css" "cgit.png" "favicon.ico" "robots.txt" ] (
|
||||
(genAttrs' [ "cgit.css" "cgit.js" "cgit.png" "favicon.ico" "robots.txt" ] (
|
||||
fileName:
|
||||
lib.nameValuePair "= ${stripLocation cfg}/${fileName}" {
|
||||
alias = lib.mkDefault "${cfg.package}/cgit/${fileName}";
|
||||
|
||||
@@ -13,6 +13,7 @@ let
|
||||
configFile = pkgs.writeText "cgitrc" ''
|
||||
# default paths to static assets
|
||||
css=${pathPrefix}/cgit.css
|
||||
js=${pathPrefix}/cgit.js
|
||||
logo=${pathPrefix}/cgit.png
|
||||
favicon=${pathPrefix}/favicon.ico
|
||||
|
||||
@@ -82,6 +83,7 @@ in
|
||||
)
|
||||
alias.url = (
|
||||
"${pathPrefix}/cgit.css" => "${pkgs.cgit}/cgit/cgit.css",
|
||||
"${pathPrefix}/cgit.js" => "${pkgs.cgit}/cgit/cgit.js",
|
||||
"${pathPrefix}/cgit.png" => "${pkgs.cgit}/cgit/cgit.png",
|
||||
"${pathPrefix}" => "${pkgs.cgit}/cgit/cgit.cgi"
|
||||
)
|
||||
|
||||
+77
-48
@@ -1,4 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
dbPath = "/var/lib/grafana/data/grafana.db";
|
||||
socketPath = "/run/litestream/litestream.sock";
|
||||
in
|
||||
{
|
||||
name = "litestream";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
@@ -11,38 +15,53 @@
|
||||
services.litestream = {
|
||||
enable = true;
|
||||
settings = {
|
||||
socket = {
|
||||
enabled = true;
|
||||
path = socketPath;
|
||||
};
|
||||
dbs = [
|
||||
{
|
||||
path = "/var/lib/grafana/data/grafana.db";
|
||||
path = dbPath;
|
||||
replicas = [
|
||||
{
|
||||
url = "sftp://foo:bar@127.0.0.1:22/home/foo/grafana";
|
||||
auto-recover = true;
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
systemd.services.grafana.serviceConfig.ExecStartPost =
|
||||
"+"
|
||||
+ pkgs.writeShellScript "grant-grafana-permissions" ''
|
||||
timeout=10
|
||||
|
||||
while [ ! -f /var/lib/grafana/data/grafana.db ];
|
||||
do
|
||||
if [ "$timeout" == 0 ]; then
|
||||
echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
|
||||
((timeout--))
|
||||
done
|
||||
|
||||
find /var/lib/grafana -type d -exec chmod -v 775 {} \;
|
||||
find /var/lib/grafana -type f -exec chmod -v 660 {} \;
|
||||
'';
|
||||
# Litestream 0.5.x writes to the database (_litestream_seq table),
|
||||
# so grafana's data directory must be group-writable.
|
||||
systemd.tmpfiles.settings."10-litestream" = {
|
||||
"/var/lib/grafana".d = {
|
||||
mode = "0750";
|
||||
user = "grafana";
|
||||
group = "grafana";
|
||||
};
|
||||
"/var/lib/grafana/data".d = {
|
||||
mode = "2770";
|
||||
user = "grafana";
|
||||
group = "grafana";
|
||||
};
|
||||
};
|
||||
systemd.services.grafana.serviceConfig = {
|
||||
ExecStartPre = lib.mkAfter "+${pkgs.sqlite}/bin/sqlite3 ${dbPath} 'PRAGMA journal_mode=WAL;'";
|
||||
UMask = lib.mkForce "0007";
|
||||
};
|
||||
systemd.services.litestream = {
|
||||
after = [
|
||||
"grafana.service"
|
||||
"sshd.service"
|
||||
];
|
||||
requires = [ "grafana.service" ];
|
||||
wants = [ "sshd.service" ];
|
||||
serviceConfig = {
|
||||
RuntimeDirectory = "litestream";
|
||||
ExecStartPre = "+/bin/sh -c 'chmod g+rw ${dbPath}*'";
|
||||
};
|
||||
};
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
allowSFTP = true;
|
||||
@@ -59,6 +78,7 @@
|
||||
security = {
|
||||
admin_user = "admin";
|
||||
admin_password = "admin";
|
||||
secret_key = "SW2YcwTIb9zpOOhoPsMm";
|
||||
};
|
||||
|
||||
server = {
|
||||
@@ -68,7 +88,7 @@
|
||||
|
||||
database = {
|
||||
type = "sqlite3";
|
||||
path = "/var/lib/grafana/data/grafana.db";
|
||||
path = dbPath;
|
||||
wal = true;
|
||||
};
|
||||
};
|
||||
@@ -78,35 +98,44 @@
|
||||
password = "bar";
|
||||
};
|
||||
users.users.litestream.extraGroups = [ "grafana" ];
|
||||
environment.systemPackages = [ pkgs.sqlite ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_until_succeeds("test -d /home/foo/grafana")
|
||||
machine.wait_for_open_port(3000)
|
||||
machine.succeed("""
|
||||
curl -sSfN -X PUT -H "Content-Type: application/json" -d '{
|
||||
"oldPassword": "admin",
|
||||
"newPassword": "newpass",
|
||||
"confirmNew": "newpass"
|
||||
}' http://admin:admin@127.0.0.1:3000/api/user/password
|
||||
""")
|
||||
# https://litestream.io/guides/systemd/#simulating-a-disaster
|
||||
machine.systemctl("stop litestream.service")
|
||||
machine.succeed(
|
||||
"rm -f /var/lib/grafana/data/grafana.db "
|
||||
"/var/lib/grafana/data/grafana.db-shm "
|
||||
"/var/lib/grafana/data/grafana.db-wal"
|
||||
)
|
||||
machine.succeed(
|
||||
"litestream restore /var/lib/grafana/data/grafana.db "
|
||||
"&& chown grafana:grafana /var/lib/grafana/data/grafana.db "
|
||||
"&& chmod 660 /var/lib/grafana/data/grafana.db"
|
||||
)
|
||||
machine.systemctl("restart grafana.service")
|
||||
machine.wait_for_open_port(3000)
|
||||
machine.succeed(
|
||||
"curl -sSfN -u admin:newpass http://127.0.0.1:3000/api/org/users | grep admin\@localhost"
|
||||
)
|
||||
with subtest("Verify litestream replicates changes"):
|
||||
machine.succeed("""
|
||||
curl -sSfN -X PUT --json '{
|
||||
"name": "LitestreamTest",
|
||||
"login": "admin",
|
||||
"email": "admin@localhost"
|
||||
}' http://admin:admin@127.0.0.1:3000/api/user
|
||||
""")
|
||||
machine.succeed("litestream sync -wait -socket ${socketPath} ${dbPath}")
|
||||
machine.succeed(
|
||||
"litestream restore -o /tmp/restored.db ${dbPath} && "
|
||||
"sqlite3 /tmp/restored.db '.dump' | grep -q LitestreamTest"
|
||||
)
|
||||
|
||||
with subtest("Simulate disaster recovery"):
|
||||
# https://litestream.io/guides/systemd/#simulating-a-disaster
|
||||
machine.systemctl("stop litestream.service grafana.service")
|
||||
machine.succeed(
|
||||
"rm -f ${dbPath} "
|
||||
"${dbPath}-shm "
|
||||
"${dbPath}-wal"
|
||||
)
|
||||
machine.succeed(
|
||||
"litestream restore ${dbPath} "
|
||||
"&& chown grafana:grafana ${dbPath} "
|
||||
"&& chmod 660 ${dbPath}"
|
||||
)
|
||||
machine.systemctl("restart grafana.service litestream.service")
|
||||
machine.wait_for_open_port(3000)
|
||||
machine.wait_for_unit("litestream.service")
|
||||
machine.succeed(
|
||||
"curl -sSfN -u admin:admin http://127.0.0.1:3000/api/user | grep LitestreamTest"
|
||||
)
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -378,6 +378,10 @@ assertNoAdditions {
|
||||
"catppuccin.groups.integrations.noice"
|
||||
"catppuccin.groups.integrations.feline"
|
||||
"catppuccin.lib.vim.init"
|
||||
|
||||
# TODO(@mrcjkb): re-enable when https://github.com/catppuccin/nvim/pull/995
|
||||
# has been merged and released.
|
||||
"catppuccin.lib.detect_integrations"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -4458,8 +4458,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-stylelint";
|
||||
publisher = "stylelint";
|
||||
version = "2.2.0";
|
||||
hash = "sha256-N23nzAI0cBNeX7txsgxKXhSUrcOGM9rjnMIJNK4OYFY=";
|
||||
version = "2.2.1";
|
||||
hash = "sha256-VnJ2OZe2KPo/QfZquxDZ3SMQncRWnAHBTTtfdJVBlpo=";
|
||||
};
|
||||
meta = {
|
||||
description = "Official Stylelint extension for Visual Studio Code";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-03-28";
|
||||
version = "0-unstable-2026-04-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "7290e95232faacb0c31b0b12cb0884bb9f6e8cfc";
|
||||
hash = "sha256-vYryEUrYauVGGjmePCUnGdCpOGKUFxSI4tkFCt7wKs8=";
|
||||
rev = "f659af2c3bec122d3e628e1e1634e746e67005e4";
|
||||
hash = "sha256-cK2c611fBEDcRK1I7VMLL+Ih76FMWlEGhmhg53KampU=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "hatari";
|
||||
version = "0-unstable-2024-10-21";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "hatari";
|
||||
rev = "7008194d3f951a157997f67a820578f56f7feee0";
|
||||
hash = "sha256-ZPzwUBaxs2ivE9n9cb5XB5mhixY9b6qIlq7OiVSLbqg=";
|
||||
rev = "00af13a379e7839399ff2939807f050b7fc49a0e";
|
||||
hash = "sha256-mPe9+RX9DsrJkmydXqEBrR7EMwijhjj/yJPB2QlK3/U=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ which ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame";
|
||||
version = "0-unstable-2026-03-26";
|
||||
version = "0-unstable-2026-04-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame";
|
||||
rev = "a10380b436c2103cad06826d64e10ca90692a08b";
|
||||
hash = "sha256-M9/GTOiXcZc5J2SxSDzDEYDMBC1zMR/zAhvbgZEwBlk=";
|
||||
rev = "4162ead798f816b4f08b1af9eafefe3d022331bf";
|
||||
hash = "sha256-doujon1GCXrmgYRWf3aGIpOFyOtj2U1DoaClGpaS1L0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "meteor";
|
||||
version = "0-unstable-2020-12-28";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "meteor-libretro";
|
||||
rev = "e533d300d0561564451bde55a2b73119c768453c";
|
||||
hash = "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=";
|
||||
rev = "13ac21ccdb81c8a99fddebf5b29482f19194ec88";
|
||||
hash = "sha256-AUn8gTtlFaosKTlcmJCmwdDeEvXwRjkkvht+JXkM36U=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "neocd";
|
||||
version = "0-unstable-2024-10-21";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "neocd_libretro";
|
||||
rev = "5eca2c8fd567b5261251c65ecafa8cf5b179d1d2";
|
||||
hash = "sha256-72tmPCb7AXsamaQsMAPiYpgDR8DER2GTz4hcbN8wy7g=";
|
||||
rev = "9216ca226f24e01e77fc2670035e97da154f3de4";
|
||||
hash = "sha256-Mq9UOuPwmG2Di68jWUgCbBvG3jUCEMON8Kfly/aCdH4=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -959,13 +959,13 @@
|
||||
"vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
|
||||
},
|
||||
"newrelic_newrelic": {
|
||||
"hash": "sha256-ZBxkDXXeYgvoOzDqJH6iy/yz7lXDt8fEsvEMnU+EgkQ=",
|
||||
"hash": "sha256-W5eEK39KkKOTfZb6KOOTwvRD1nrZkY4FuZt+9Imu9nw=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.82.0",
|
||||
"rev": "v3.84.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-BjBzWdCU/gNZOsh5gp76LuGUgwiUc/TlOTJ6vjP8tyI="
|
||||
"vendorHash": "sha256-CQVlU/V25pDz5shBpCztA3w/FVfGjLjLDHf7ky9LQHc="
|
||||
},
|
||||
"ns1-terraform_ns1": {
|
||||
"hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=",
|
||||
|
||||
@@ -25,19 +25,19 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cgit";
|
||||
version = "1.2.3";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz";
|
||||
sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss";
|
||||
url = "https://git.zx2c4.com/cgit/snapshot/cgit-1.3.tar.xz";
|
||||
sha256 = "836b6edbc7f99e11037a8b928d609ce346ed77a55545e17fff8cea59b5b7aa42";
|
||||
};
|
||||
|
||||
# cgit is tightly coupled with git and needs a git source tree to build.
|
||||
# IMPORTANT: Remember to check which git version cgit needs on every version
|
||||
# bump (look for "GIT_VER" in the top-level Makefile).
|
||||
gitSrc = fetchurl {
|
||||
url = "mirror://kernel/software/scm/git/git-2.25.1.tar.xz";
|
||||
sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
|
||||
url = "mirror://kernel/software/scm/git/git-2.53.0.tar.xz";
|
||||
hash = "sha256-WBi9fYCwYbu9/sikM9YJ3IgYoFmR9zH/xKVh4soYxlM=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
@@ -92,15 +92,9 @@ stdenv.mkDerivation {
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
];
|
||||
|
||||
# Install manpage.
|
||||
postInstall = ''
|
||||
# xmllint fails:
|
||||
#make install-man
|
||||
|
||||
# bypassing xmllint works:
|
||||
a2x --no-xmllint -f manpage cgitrc.5.txt
|
||||
mkdir -p "$out/share/man/man5"
|
||||
cp cgitrc.5 "$out/share/man/man5"
|
||||
# Install manpage.
|
||||
make install-man $makeFlags
|
||||
|
||||
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out ''${pythonPath[*]}"
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
namespace = "plugin.video.youtube";
|
||||
version = "7.4.1.1";
|
||||
version = "7.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anxdpanic";
|
||||
repo = "plugin.video.youtube";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fut9FTs87/EXpZ2PjIvhHL4001k3+i519m9ccMR1o+I=";
|
||||
hash = "sha256-o+HaYVUvulHzthnP/PUJ0qTe0e901djw3l9sVpUcD08=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-v44QWIpFTfUD7gOaQGwJ12MvtO4rMS69rCZr4Hv/e3k=";
|
||||
hash = "sha256-Ykq7UkpGy9w3VQ2LcGsdREN0na0F7Mj9RxVu8iLr96s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "anytone-emu";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmr-tools";
|
||||
repo = "anytone-emu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kaXD4mIoEikl9HoS/FfIX0oRAKkZHiwIfNWj0CLazPc=";
|
||||
hash = "sha256-RTYLtVCKP2TW7Ery51POEZuCtyRhkgKhoDhJPe18y80=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "argonaut";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darksworm";
|
||||
repo = "argonaut";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LDw2/8l/jipCVIMYeco08LukIfx3Kk1ROXkvU69SK5g=";
|
||||
hash = "sha256-F67DyH0aJ4SmlCIj1i65yB5rFXZB0j5BREssS3V3WZQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xln/WmZbi0+rHqMMHRgt0ar/EaBDNscCsd/NckJZnMw=";
|
||||
vendorHash = "sha256-4AmciHL4CGtEwDAs7eAtjfWlzjoCLXAN2HEatev8gZg=";
|
||||
proxyVendor = true;
|
||||
subPackages = [ "cmd/app" ];
|
||||
ldflags = [
|
||||
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "atlauncher";
|
||||
version = "3.4.40.3";
|
||||
version = "3.4.40.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ATLauncher";
|
||||
repo = "ATLauncher";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QFPdEH3V9Krwy/cWCbY+IMtW0ydVCqKr/OZfttZGCss=";
|
||||
hash = "sha256-pRYXzFUbVXYwD7edhBoVcVo/QDo6QSJJQd58Hf3rBGo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.124";
|
||||
version = "2.0.125";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-B7cfrO3Kz1xS9htjZXXLQaFvbc0g4fowParTVvXdqA8=";
|
||||
sha256 = "sha256-YYI0ISLaOcKZu2AFf08DmriApTLKdUUgLF5AhEhGf04=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YQV5e9/iTvx76ch6D/iNGgWJaa3rAr6dN8mlEXtatDs=";
|
||||
cargoHash = "sha256-jhsW33xDTDBDi2ySSwePjjNmIFKKm6ZnP5xklvB4+Iw=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "aw-watcher-window-wayland";
|
||||
version = "0-unstable-2025-12-31";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ActivityWatch";
|
||||
repo = "aw-watcher-window-wayland";
|
||||
rev = "aea9aca029bd33d373bf53946a16dc05ef81e0b3";
|
||||
hash = "sha256-3o3IVf2YeZ1qGokezPvuLnUaqiA/uzm4wCXvgNHIMW4=";
|
||||
rev = "c14e6fbaf1b811a46ec6b5c27d8656f0976a1850";
|
||||
hash = "sha256-U1tFdglzO5YcGPfzVAprol8bdQ1mO7OP1Q6gShG/fbk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WWT8tOrHPf5x3bXsVPt32VKut4qK+K8gickBfEc0zmk=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aws-lambda-runtime-interface-emulator";
|
||||
version = "1.33";
|
||||
version = "1.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-lambda-runtime-interface-emulator";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-p3Tw5wpMiFL46FyX6NKaKv47jjFnlS27/Q4pc2nzdzs=";
|
||||
sha256 = "sha256-tO7ru3sdCWbdALcOmxQny7ak96utgABUvIaGThZRedw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+7BuDaN1ns63cQOMKuRMjBo9GnLrmsubx/KppUsyheY=";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bazel-watcher";
|
||||
version = "0.28.1";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-watcher";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4pM7z1GAhLxvCLwtHBcteRMQwtdvOFtRu8eF+H6UJBE=";
|
||||
hash = "sha256-ssG2BFd2utB9xu9zYdcvZYLq+XF9ZOctxNGtpbrhLG8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-diet";
|
||||
version = "1.2.7";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-lean-crate";
|
||||
repo = "cargo-diet";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ=";
|
||||
hash = "sha256-YjUO8UUXWZvZZZ2Y0py5LQdVBpq8jjwvGimVAWC8Gr8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-crdRRlRi3H8j/ojGH+oqmaeSS8ee8dUALorZPWE/j1Y=";
|
||||
cargoHash = "sha256-CnaeS7mh+QDPcQgeKzNV5Vey3zsiD10NdlfdQ1kcDB8=";
|
||||
|
||||
meta = {
|
||||
description = "Help computing optimal include directives for your Cargo.toml manifest";
|
||||
|
||||
@@ -2,26 +2,30 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-vet";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "cargo-vet";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HSEhFCcdC79OA8MP73De+iLIjcr1XMHxfJ9a1Q3JJYI=";
|
||||
hash = "sha256-sdjvCMLM8ThWXbotjRIsbLYucDzGvFOktqo6OKB//RI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+X6DLxWPWMcGzJMVZAj3C5P5MyywIb4ml0Jsyo9/uAE=";
|
||||
cargoHash = "sha256-3pfOq2VfHbtohdgv73TT480bjCjdNKPJE+m4SHeXfGA=";
|
||||
|
||||
# the test_project tests require internet access
|
||||
checkFlags = [ "--skip=test_project" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Tool to help projects ensure that third-party Rust dependencies have been audited by a trusted source";
|
||||
changelog = "https://github.com/mozilla/cargo-vet/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "cargo-vet";
|
||||
homepage = "https://mozilla.github.io/cargo-vet";
|
||||
license = with lib.licenses; [
|
||||
@@ -31,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
jk
|
||||
matthiasbeyer
|
||||
ilkecan
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "coc-markdownlint";
|
||||
version = "0-unstable-2026-03-04";
|
||||
version = "0-unstable-2026-04-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-markdownlint";
|
||||
rev = "4f3410753308b8bf5c45518b6f39aee6d29a8bbd";
|
||||
hash = "sha256-9S3mXE70PqBJIaRRycluwQ8rdQ+9KMUfY10170ek//w=";
|
||||
rev = "9a92eef6adbd6ba7b1afe50bd9a3c82b94902c51";
|
||||
hash = "sha256-5pfsaZFA1OYwREB3FqyUQY4D47dKH22pQV8dBgPiipo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-XXOW5gekzDOl02JNuIQD71Ufm9W+zOIeUO1IrJ7fx5Y=";
|
||||
npmDepsHash = "sha256-J6gYA3eP2PWK3kesJDL5tqHOY/j2PoC+uhVxpeYVnsk=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "0-unstable-2026-03-01";
|
||||
version = "0-unstable-2026-04-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-rust-analyzer";
|
||||
rev = "6086cb2075cf0c95fe41f225231b0d6e10bdeab7";
|
||||
hash = "sha256-o3skzvjnAjdd7uS1UboLbZBXY7qgrwr7XYnVlf+PUpc=";
|
||||
rev = "569c6c56e815ae29ad7873b472ebb750c19d0d38";
|
||||
hash = "sha256-4IZhCQl+iKChGaT0ghn5MnB+h6U5DJSa7YgPDoObiBg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-39pOjwZuos4yfOrTZjGyKgB6pTJXO/Oi5jTJzXs0xKg=";
|
||||
npmDepsHash = "sha256-B/EBAhwEEqLgGshK3Fw7nG7Mv9kk0v4ClLglLhooYBM=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.24.3";
|
||||
version = "2.25.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-Em/KkKUMq9IDZR/g6DTD8TZTZ70FBon4ZXCeQp6BAPg=";
|
||||
hash = "sha256-obChRLyt6gZDVkuNgeJFRIpNGdHeaKC/6a0oVku9EZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,6 +19,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-BQg2rVYe1wJOX7YnvgDVpmN6hwBJZKH0fxm+8HC8bvY=";
|
||||
};
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'FIND_PACKAGE(Boost REQUIRED COMPONENTS system filesystem iostreams program_options unit_test_framework)' \
|
||||
'FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem iostreams program_options unit_test_framework)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "copybara";
|
||||
version = "20260323";
|
||||
version = "20260330";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
|
||||
hash = "sha256-FkJZm0MgN/HRfomjvFXq2M8FICHk7Uo1cI3C6WcZC8o=";
|
||||
hash = "sha256-O/H5eeais4xKAWshC8nZfLqeIYdjVxLVZ5d1sUFnF1w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coroot-node-agent";
|
||||
version = "1.30.0";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot-node-agent";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-vuUVRGehkzJEwQzvEOI/hNnEG1Wk8UqkTCMY47mY3BI=";
|
||||
hash = "sha256-vS1nf20G++VKA/2WBhXvWjyGyVMPhshw+jUcPRxPcIw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OOd3OctfklHzpMVDCnnb8HYPYqWQgBe+8HfbSm7dXzg=";
|
||||
vendorHash = "sha256-5+PwysNT3ZZ6epFDrH6BhIn0ERaxntO+ekqaBxc+qkA=";
|
||||
|
||||
buildInputs = [ systemdLibs ];
|
||||
|
||||
|
||||
@@ -27,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2.2)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem system program_options)' \
|
||||
'list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem program_options)'
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
@@ -7,23 +7,28 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "cwltool";
|
||||
version = "3.1.20251031082601";
|
||||
version = "3.1.20260315121657";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-workflow-language";
|
||||
repo = "cwltool";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-avRNOdL4Ig2cYQWh8SqX/KWfgXyVg0TVfVFrlqzUCLA=";
|
||||
hash = "sha256-0cd64fkaCMX+eaZ4maZW8sE+ZX7bTFy1DDY5leqf9B0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "PYTEST_RUNNER + " ""
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "mypy==1.18.2" "mypy"
|
||||
--replace-fail "mypy==1.19.1" "mypy"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"prov"
|
||||
"rdflib"
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@@ -60,11 +65,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"prov"
|
||||
"rdflib"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_content_types"
|
||||
"test_env_filtering"
|
||||
@@ -75,6 +75,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
disabledTestPaths = [
|
||||
"tests/test_udocker.py"
|
||||
"tests/test_provenance.py"
|
||||
"tests/test_examples.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cyme";
|
||||
version = "2.2.11";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuna-f1sh";
|
||||
repo = "cyme";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DRlK7QsZvydC05kHIWLR1a01/Cc+9TZN0Z4hUCfShjQ=";
|
||||
hash = "sha256-Jgm/IIrtsoUQQ6WmS3Ol20rc+oQJsfpOyHqP06jcPfM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vh7VUTI+FKWtwYmcpEeADq/OF69M38yekPySXkFJ5ZA=";
|
||||
cargoHash = "sha256-0CeyrHoqKdt5cy9F+LpZAsCR2nXMtXvyk1Dr+f9SS44=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ddns-go";
|
||||
version = "6.16.2";
|
||||
version = "6.16.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeessy2";
|
||||
repo = "ddns-go";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-a4Dtdw7MPFQaFB5QYGFAZt2GGCHR6SlRem7ZXUmdhAo=";
|
||||
hash = "sha256-0Fcm1KC6hFjjXGdoiFMm19M8Uc7et0F3LeD7pxFQM4s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oOhqr0D/K9FITCbz2jt+We6gyv85ipL3enbr8YDDSIg=";
|
||||
vendorHash = "sha256-phMBGjXARuY6qreNy5o06unouyew1Rbj4zo3nK4Xvnw=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "doc2go";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abhinav";
|
||||
repo = "doc2go";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gJQ0cs8R1fbGpFd9k2L53khnQ9M5U18DOtS2bn0lGig=";
|
||||
hash = "sha256-q3er94/WLCqXIOQaj7Kdty7yIuaLO7qXt6GiGxIxrPQ=";
|
||||
};
|
||||
vendorHash = "sha256-lMoEbNeSQFrMG8hCMaFRvyzt6kaPVP7Kse0i7NJY10I=";
|
||||
vendorHash = "sha256-4s9gVjx+qiBRmL4abBN3FPuH4iMUapIQr1nwN40VmRQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "doctl";
|
||||
version = "1.153.0";
|
||||
version = "1.154.0";
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Oc0TIuOCXef45j2SSIeCvvJkie8VcH4B8W7Cd/ux618=";
|
||||
hash = "sha256-+CqkkWpy1bzMBgjml4Tztyz2t/fUFkyYVNh4gXpJjiw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dolibarr";
|
||||
version = "23.0.0";
|
||||
version = "23.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oAzmp6tWUPvLC2AJz/A56p/njunZMTmkZVYaydTL/Ks=";
|
||||
hash = "sha256-WfMMikTmC+13HxI0YCKwJTrn57CJreU3GsEyrOjr/hg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -20,20 +20,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# the Equicord repository. Dates as tags (and automatic releases) were the compromise
|
||||
# we came to with upstream. Please do not change the version schema (e.g., to semver)
|
||||
# unless upstream changes the tag schema from dates.
|
||||
version = "2026-03-11";
|
||||
version = "2026-04-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Equicord";
|
||||
repo = "Equicord";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bx0zXbkXBzxB56yvR9Svuwm0Ci8NBdT+7kS5idOD4E4=";
|
||||
hash = "sha256-3wFmi+SzInP+1PH3pwBquTrU757I8z6PmvPxuyygIwU=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-jG9A/nIU8pU8c5JT/fLJn3M6EJf2vB+pm5LdrvAr22M=";
|
||||
hash = "sha256-9DNn38JdFQMQh48UEJo5d6CUMbjlzs5LEma6095o508=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "f3d";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals withManual [ "man" ];
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "f3d-app";
|
||||
repo = "f3d";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2Kcy9CF0K9jBfVc944i289jbMQdQWXW+gOiaHHchF6U=";
|
||||
hash = "sha256-j8OSG3MNWAlCIZcjhWCMeskbcv+4pTn4ktRZXKYmBkc=";
|
||||
fetchLFS = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "feishin";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffvli";
|
||||
repo = "feishin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LcSe7aEtTDs4JIk50zI0IFgN4ZCSJ6NClfk02uO2Sg8=";
|
||||
hash = "sha256-pQCcj0YBytmDQnOxWpErU8xApE0hGQA39G5XivR82Co=";
|
||||
};
|
||||
|
||||
electron = electron_39;
|
||||
@@ -43,7 +43,7 @@ buildNpmPackage {
|
||||
;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-XhBcZRa66QdkjXxbefzsBUdvPIEshorq1uqzoWMXuTc=";
|
||||
hash = "sha256-2fLqqCbbCIPoW/wGzsZOpZd5tnvyrLYlrVhbFWixlDM=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
@@ -24,6 +24,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
sed -i '1i #include <algorithm>' src/fileshelter/ui/ShareCreateFormView.cpp
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'find_package(Boost REQUIRED COMPONENTS system program_options)' \
|
||||
'find_package(Boost REQUIRED COMPONENTS program_options)'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gcfflasher";
|
||||
version = "4.12.0";
|
||||
version = "4.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dresden-elektronik";
|
||||
repo = "gcfflasher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wuIyvyRVXhp9SGRybfgaouij2UrPNDD7Oy+ODNTCFRY=";
|
||||
hash = "sha256-L0BelCcwYmPDfWPCjXQQ0Lmk/C1BHuQKk3dLRfo2OMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gibo";
|
||||
version = "3.0.17";
|
||||
version = "3.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonwhitaker";
|
||||
repo = "gibo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-sjfG1oQLik5rTgiqGI0MUuoajay6wSqF+6gTQoplGrY=";
|
||||
sha256 = "sha256-u2e0YwtK3MnzIYvXNVc2a4zsoxISAcS3U+6WpgBsYUM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DnOAVZYFXX8982HvQmNpYrvDHfrNvJu+ner5YRfx754=";
|
||||
vendorHash = "sha256-YVs6S3x0u2dypb5h+pNCUkmfVK+0erzoGZzONipL49o=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-cola";
|
||||
version = "4.17.1";
|
||||
version = "4.18.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-cola";
|
||||
repo = "git-cola";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aBVtyPgkmSYCDlPcmJKFKqUwKMbxVVy8AVsKBdPNkXI=";
|
||||
hash = "sha256-oUh9XVj2FGRow3l5wBUGW+BN01ykLvsQH0uC/No22Do=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitnr";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reemus-dev";
|
||||
repo = "gitnr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM=";
|
||||
hash = "sha256-rt82Pb//OAM20BtaT/n1grL4GTTsW2iBziSVn/OI78c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DlYV92ZbkeUieVmyaxVuCslkwAgWrULu4HerLFXZZtE=";
|
||||
cargoHash = "sha256-ej5lFiTkynW9ZXRkZtnKqWxaqHETHtYfbLi1L1I4KiM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -15,13 +15,13 @@ in
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-containerregistry";
|
||||
version = "0.21.3";
|
||||
version = "0.21.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "go-containerregistry";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-BfKiBjfL5th1TPpw6hpno04MffLnXmOVq7BsGUCkPT0=";
|
||||
sha256 = "sha256-TODosgMYXR1StkRC/h5rn84I2R+e0dHnGJxmCisYDNk=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-ios";
|
||||
version = "1.0.204";
|
||||
version = "1.0.206";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielpaulus";
|
||||
repo = "go-ios";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-G/CFG+glZ5DGIux3FJSe2wdfRl++GFr3JB8bHLOq+KY=";
|
||||
sha256 = "sha256-/dQknNs+fLBJvfiDOaGc26a+bRo8NdhT1B/QPxJmmro=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -44,6 +44,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace \
|
||||
src/general/CMakeLists.txt \
|
||||
src/test/CMakeLists.txt \
|
||||
src/gripgen/CMakeLists.txt \
|
||||
src/grip/CMakeLists.txt \
|
||||
--replace-fail ' system' ""
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -37,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 2.8)' 'cmake_minimum_required(VERSION 3.10)'
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace libgrive/CMakeLists.txt --replace-fail \
|
||||
'find_package(Boost 1.40.0 COMPONENTS program_options filesystem unit_test_framework regex system REQUIRED)' \
|
||||
'find_package(Boost 1.40.0 COMPONENTS program_options filesystem unit_test_framework regex REQUIRED)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hacompanion";
|
||||
version = "1.0.25";
|
||||
version = "1.0.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobias-kuendig";
|
||||
repo = "hacompanion";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CkJ648rYlSzWH0K7vGcxYKiVEsVj+y+p+2bsV7VOi6I=";
|
||||
hash = "sha256-gpBu7HsohL8/Rfy3uWtYF7llX59nJXDDR//YE3MYje8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-y2eSuMCDZTGdCs70zYdA8NKbuPPN5xmnRfMNK+AE/q8=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hcdiag";
|
||||
version = "0.5.11";
|
||||
version = "0.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "hcdiag";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vfW1HXhSK3B6MCkypzUXOBBLLA8uqBw9ipTnW5duhoQ=";
|
||||
hash = "sha256-SXP5Poa4mjlvp4AQzSekHBCc07+a3bWVOPJWxfOuB/Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mUqXnUAnN052RMsMtiUpOTlDVb59Xh3+++E/BtEEQGk=";
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.85.1";
|
||||
version = "1.87.2";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-GdX38JTFn3p2rqDygulYut2mCYZY41xm0q2n2/EIiOw=";
|
||||
hash = "sha256-6O6ksa0mCUoAfXW8jzh1n7zAfLZTA45va9o6J2ghKgU=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hextazy";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xfalafel";
|
||||
repo = "hextazy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Q7gTupoyxioxMibiqhhgnvy38EgnAw+ceSuXzElyga8=";
|
||||
hash = "sha256-pQhSel/DgdosvH2H90PIc51GEYhWx31WWkvOPKcUp1I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MzshiOBMi5eJiRogfwygybQc6MEW58ZMpKAinmpBp1E=";
|
||||
cargoHash = "sha256-0uEiL85ypKr/9r0okrm4pqLRZOYDIUFxmobqK7Jm1Jw=";
|
||||
|
||||
meta = {
|
||||
description = "TUI hexeditor in Rust with colored bytes";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hysteria";
|
||||
version = "2.7.1";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apernet";
|
||||
repo = "hysteria";
|
||||
rev = "app/v${finalAttrs.version}";
|
||||
hash = "sha256-EqDwCb8hd0bRTCqG762DZvSw7PGCD13SXxW/W5f6HVs=";
|
||||
hash = "sha256-KxCf9btvEbwP+oWL6A6rWpQsRJPifohFLDIdr+0XwzM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CeAbWgDwGMKtqYXwXe1SDwDT+VY+2U6fztNHqUk4i84=";
|
||||
vendorHash = "sha256-NXBxrKptXTZzEXZ5hYHtC3wbFIYgL9avJay6DJHRMLU=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags =
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
}:
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
version = "3.1.665";
|
||||
version = "3.1.668";
|
||||
pname = "ipsw";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blacktop";
|
||||
repo = "ipsw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Oxf+hpNo/Li/S0kVjekp2RArGrYQP7voNBSTz3/Gr+Q=";
|
||||
hash = "sha256-SsFj5/a9Xk7I4H07kdfVnbIF6sTE61ztqYMSFt5tpPY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rzOw51n8G9H5Sxr2rCevrmG6z2SqKZOjluYwJzYiY70=";
|
||||
vendorHash = "sha256-jvZSO3aLRI+7Nl/U4dmyhKrXkRV97tmkkU+uSHR8+Co=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "jawiki-all-titles-in-ns0";
|
||||
version = "0-unstable-2026-03-01";
|
||||
version = "0-unstable-2026-04-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musjj";
|
||||
repo = "jawiki-archive";
|
||||
rev = "f653315af9ae4f25ea5020f4fc6a8b5f311cbbf5";
|
||||
hash = "sha256-aLmGHTOkRCHr+vwQYLYm3qKCONUBpdMsZadTNmHwOGA=";
|
||||
rev = "d8dff4562d79e33fbd1292cb4f5a857402735d21";
|
||||
hash = "sha256-/0D0+txyR6wTJjW9xLevKUReM8y1bhUAJSdgkLMVjYI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "jp-zip-code";
|
||||
version = "0-unstable-2026-03-01";
|
||||
version = "0-unstable-2026-04-01";
|
||||
|
||||
# This package uses a mirror as the source because the
|
||||
# original provider uses the same URL for updated content.
|
||||
src = fetchFromGitHub {
|
||||
owner = "musjj";
|
||||
repo = "jp-zip-codes";
|
||||
rev = "ac744cf265a65b8568636ad3456d79abfa607549";
|
||||
hash = "sha256-afs8SEn575lspvKZSxh4hNZ/5+OpeFCYY5E2jyY8hDY=";
|
||||
rev = "5404779eb05849c61c70c4489d117bcb36ea19ab";
|
||||
hash = "sha256-pysW1hAj8acTFOytYw/ZXknUlRP+JUvh4Ia2I2CwA6A=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kaminpar";
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KaHIP";
|
||||
repo = "KaMinPar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yuceZE3o5dvK7Q8y8nbq7DLMx51GLk2lRh2hMTLdbRc=";
|
||||
hash = "sha256-YjETyYnVcWzZqEv3z4xaBcdlWhSmsKC4PyFvUOZFBYA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubevela";
|
||||
version = "1.10.7";
|
||||
version = "1.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevela";
|
||||
repo = "kubevela";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-JjogTZShCTeFWyhrT9qWDGB0zk+mU6op1oC2Z50OF3c=";
|
||||
hash = "sha256-RD3EOlVTXMY+FLs7U5jEE3w6Wzs026ohu3LZ3oHgcvg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MUfULgycZn8hFfWmtNeoFf21+g3gGpeKoBvL8qB/m80=";
|
||||
|
||||
@@ -13,14 +13,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kurve";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
dontWrapQtApps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luisbocanegra";
|
||||
repo = "kurve";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gzL99vDDEbs37uNW4Z1fUTwmq7UqwZsxYk6wljNt8G0=";
|
||||
hash = "sha256-EEOKf/0Ti/PyhxUs4n56jRvDFBLVwsZx2icO5PzBIrQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lacy";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timothebot";
|
||||
repo = "lacy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3LFJpzuL2ULnStFwW165gH/S8Hjh49QE4R6c0NyKRSI=";
|
||||
hash = "sha256-YX/iXlQ3uhmxNr4fpPtxIPhFwXGUJZF8rYe9mU+9Hos=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
cargoHash = "sha256-OJW29CopdO7lbkr0F2KVnfbRGEGIf8J8Vu8YChjeElY=";
|
||||
cargoHash = "sha256-3K8g/AGpSXFUhgEBg/AzUYsH3vOvsRzAYnrOAZNVS4g=";
|
||||
|
||||
meta = {
|
||||
description = "Fast magical cd alternative for lacy terminal navigators";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ladybugdb";
|
||||
version = "0.15.1";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LadybugDB";
|
||||
repo = "ladybug";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wqvX6yPhh1CbviPgcRW4XOmNjLe5s9FaqHYDFs7GQOg=";
|
||||
hash = "sha256-Hf0oLaAQzvYQ6CrSzvsD7V1SA2oGGiIqIhrcjpRevAc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -27,6 +27,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2.2)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace \
|
||||
curl/CMakeLists.txt \
|
||||
dynamic_library/CMakeLists.txt \
|
||||
execution/CMakeLists.txt \
|
||||
file_util/CMakeLists.txt \
|
||||
locale/CMakeLists.txt \
|
||||
logging/CMakeLists.txt \
|
||||
ruby/CMakeLists.txt \
|
||||
util/CMakeLists.txt \
|
||||
windows/CMakeLists.txt \
|
||||
--replace-fail ' system' ""
|
||||
substituteInPlace tests/CMakeLists.txt --replace-fail 'system ' ""
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
@@ -25,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2.2)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'list(APPEND BOOST_COMPONENTS filesystem regex system thread)' \
|
||||
'list(APPEND BOOST_COMPONENTS filesystem regex thread)'
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lilex";
|
||||
version = "2.621";
|
||||
version = "2.700";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
|
||||
hash = "sha256-TsLJ96SZpokW3354/yt0Re4ZtFXqYK/46iyZXdPKhoE=";
|
||||
hash = "sha256-NDEO20unSfdy1CuI4+7EpjGFJ+dc7qqWz8VW7jU2b7w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lisette";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ivov";
|
||||
repo = "lisette";
|
||||
tag = "lisette-v${finalAttrs.version}";
|
||||
hash = "sha256-wUd4LjwbsW5hS2VAbzzq9oDDPLbdXie6JmkuOEBsjmA=";
|
||||
hash = "sha256-vepiowHDu0l7BCT42ceIEOVaoUd9ttrE21N6D9+zPgo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-E+8eFfftyrIGNfddQqDmmfPpv1FyYg2u00+KKru+B0Y=";
|
||||
cargoHash = "sha256-N7Y0BHaVcF8ejKnFrci0KHoy0SLuiTmJpgAPOV8hkAg=";
|
||||
|
||||
preCheck = ''
|
||||
export NO_COLOR=true
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
diff --git a/cmd/litestream/main.go b/cmd/litestream/main.go
|
||||
index 1234567..abcdefg 100644
|
||||
--- a/cmd/litestream/main.go
|
||||
+++ b/cmd/litestream/main.go
|
||||
@@ -362,6 +362,7 @@ type ReplicaConfig struct {
|
||||
Host string `yaml:"host"`
|
||||
User string `yaml:"user"`
|
||||
Password string `yaml:"password"`
|
||||
KeyPath string `yaml:"key-path"`
|
||||
+ HostKeyPath string `yaml:"host-key-path"`
|
||||
|
||||
// Encryption identities and recipients
|
||||
@@ -664,6 +665,7 @@ func NewReplicaFromConfig(c *ReplicaConfig, dbc *DBConfig) (_ litestream.Replic
|
||||
client.Password = password
|
||||
client.Path = path
|
||||
client.KeyPath = c.KeyPath
|
||||
+ client.HostKeyPath = c.HostKeyPath
|
||||
return client, nil
|
||||
}
|
||||
|
||||
diff --git a/sftp/replica_client.go b/sftp/replica_client.go
|
||||
index 30d8fa87..8b651e97 100644
|
||||
--- a/sftp/replica_client.go
|
||||
+++ b/sftp/replica_client.go
|
||||
@@ -41,6 +41,7 @@ type ReplicaClient struct {
|
||||
Password string
|
||||
Path string
|
||||
KeyPath string
|
||||
+ HostKeyPath string
|
||||
DialTimeout time.Duration
|
||||
}
|
||||
|
||||
@@ -71,14 +72,28 @@ func (c *ReplicaClient) Init(ctx context.Context) (_ *sftp.Client, err error) {
|
||||
|
||||
// Build SSH configuration & auth methods
|
||||
config := &ssh.ClientConfig{
|
||||
- User: c.User,
|
||||
- HostKeyCallback: ssh.InsecureIgnoreHostKey(),
|
||||
- BannerCallback: ssh.BannerDisplayStderr(),
|
||||
+ User: c.User,
|
||||
+ BannerCallback: ssh.BannerDisplayStderr(),
|
||||
}
|
||||
if c.Password != "" {
|
||||
config.Auth = append(config.Auth, ssh.Password(c.Password))
|
||||
}
|
||||
|
||||
+ if c.HostKeyPath == "" {
|
||||
+ config.HostKeyCallback = ssh.InsecureIgnoreHostKey()
|
||||
+ } else {
|
||||
+ buf, err := os.ReadFile(c.HostKeyPath)
|
||||
+ if err != nil {
|
||||
+ return nil, fmt.Errorf("cannot read sftp host key path: %w", err)
|
||||
+ }
|
||||
+
|
||||
+ key, _, _, _, err := ssh.ParseAuthorizedKey(buf)
|
||||
+ if err != nil {
|
||||
+ return nil, fmt.Errorf("cannot parse sftp host key path: path=%s len=%d err=%w", c.HostKeyPath, len(buf), err)
|
||||
+ }
|
||||
+ config.HostKeyCallback = ssh.FixedHostKey(key)
|
||||
+ }
|
||||
+
|
||||
if c.KeyPath != "" {
|
||||
buf, err := os.ReadFile(c.KeyPath)
|
||||
if err != nil {
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "litestream";
|
||||
version = "0.3.14";
|
||||
version = "0.5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benbjohnson";
|
||||
repo = "litestream";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-rTPw1BnZPtcWzhwR9mCzoE4LXdlaFfRCIDMHlN/SRzk=";
|
||||
hash = "sha256-xp1Ic7sF3yzpR4FgMOfx/uRp/jv/qzTgSlItOIrl2pI=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -21,9 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-sYIY3Z3VrCqbjEbQtEY7q6Jljg8jMoa2qWEB/IkDjzM=";
|
||||
|
||||
patches = [ ./fix-cve-2024-41254.patch ];
|
||||
vendorHash = "sha256-e2fsgK/fZNIos5W/Gc3u72uzoT2igs6BgzYtz1PyI10=";
|
||||
|
||||
passthru.tests = { inherit (nixosTests) litestream; };
|
||||
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
{
|
||||
fetchzip,
|
||||
lib,
|
||||
gmp,
|
||||
cudaPackages,
|
||||
autoPatchelfHook,
|
||||
}:
|
||||
let
|
||||
inherit (cudaPackages) backendStdenv;
|
||||
in
|
||||
backendStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llrCUDA";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://jpenne.free.fr/llr4/llrcuda${
|
||||
builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version
|
||||
}srcgpu12.zip";
|
||||
hash = "sha256-/v89jsTKCpkmCMKp9nUf7VAnSobE8pDdwLw5n3Hz9dw=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Disable _chdir in lprime.cu to prevent segmentation fault when fopen returns NULL
|
||||
postPatch = ''
|
||||
substituteInPlace lprime.cu \
|
||||
--replace-fail "_chdir (buf)" "0/* _chdir (buf) */"
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "/usr/local/cuda" "${cudaPackages.cuda_nvcc}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.libcufft
|
||||
cudaPackages.cuda_cccl
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_LDFLAGS = lib.concatStringsSep " " [
|
||||
"-L${lib.getLib gmp}/lib"
|
||||
"-L${lib.getLib cudaPackages.cuda_cudart}/lib"
|
||||
];
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 dllrCUDA $out/bin/llrCUDA
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GPU version of the LLR program";
|
||||
longDescription = ''
|
||||
Primality proving program for numbers of the form N = k*b^n +/- 1, (k < b^n),
|
||||
or numbers which can be rewritten in this form, like
|
||||
Gaussian-Mersenne norms or b^n-b^m +/- 1 with n>m (new feature).
|
||||
The identity Phi(3,-X) = X^2-X+1 is now used with X=b^n to search for
|
||||
Generalized Unique Primes.
|
||||
'';
|
||||
homepage = "http://jpenne.free.fr/index2.html";
|
||||
maintainers = with lib.maintainers; [ dstremur ];
|
||||
license = lib.licenses.unfree;
|
||||
# Restricted by GWNUM terms and CUDA dependencies.
|
||||
# Its CUDA code is based on GWNUM.
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "llrCUDA";
|
||||
};
|
||||
})
|
||||
@@ -54,6 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace ./CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" \
|
||||
"cmake_minimum_required(VERSION 4.0)"
|
||||
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace CMakeLists.txt --replace-fail ' system' ""
|
||||
'';
|
||||
|
||||
# causes redefinition of _FORTIFY_SOURCE
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
version = "1.29.4";
|
||||
hash = "sha256-QNTXl49WgmixaWGHhjVcMJwj/AA3agwqlPRC3/Nnfsg=";
|
||||
npmDepsHash = "sha256-lVbNT2CEEMS2DpJhUMd/ID8yu8PuRbWrciJ/h391czs=";
|
||||
vendorHash = "sha256-ypFnKykiDFs8JxMkOnQYwJU5FfFhRrCSrhEgsfN1TVc=";
|
||||
version = "1.29.6";
|
||||
hash = "sha256-jkWrh2pQ4LBQMTb3r1kgbSmYRBCWPXIVC8ywM5yYnQg=";
|
||||
npmDepsHash = "sha256-vt28b02zDkrNWR4nTD2IH87gqGlhxxaF7L0N5jSS76k=";
|
||||
vendorHash = "sha256-k07JTSQ67ZVOiCUkRRW9u6V+E75gtfKpZ6zNa4eHH/Y=";
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mas";
|
||||
version = "5.1.0";
|
||||
version = "6.0.1";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -19,11 +19,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
{
|
||||
x86_64-darwin = {
|
||||
arch = "x86_64";
|
||||
hash = "sha256-G7o0nHsf6Ay2k3quMs45KH9h4yEpbvyGPm/u86naWcM=";
|
||||
hash = "sha256-7+iDBr4GG5bdTuAlAmMQkEkIzVgLo2+DEdravClaLtQ=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "arm64";
|
||||
hash = "sha256-XZM0YeFLHYhoEqQLaG1Jz3OWcT9DILqFEcgqI3yvDk8=";
|
||||
hash = "sha256-BZ9UE8H28kjqiMNdLDUUyC9madR4rBV1mLUGyj6ol3Y=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system}
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "matrix-alertmanager-receiver";
|
||||
version = "2026.3.25";
|
||||
version = "2026.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metio";
|
||||
repo = "matrix-alertmanager-receiver";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jb15SstA+5WeQe6QiKuNX/HHCuKAs38TTrjM85UQxyQ=";
|
||||
hash = "sha256-2ULM0hjKWbFaZvVgkAST4+EvGF4U/xUbJf03NwFs34s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-szUkKri3Rx1i3681r85xrOLqXV5u7s9DUemQHeh+qJw=";
|
||||
vendorHash = "sha256-Cw6zU+jwHNPpDenP/KxEdMuLYempyc6mUJ5nmV728DU=";
|
||||
|
||||
env.CGO_ENABLED = "0";
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libwebp,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -10,18 +11,18 @@ let
|
||||
basis_universal = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "basis_universal";
|
||||
rev = "8903f6d69849fd782b72a551a4dd04a264434e20";
|
||||
hash = "sha256-o3dCxAAkpMoNkvkM7qD75cPn/obDc/fJ8u7KLPm1G6g=";
|
||||
rev = "88e813c46b3ff42e56ef947b3fa11eeee7a504b0";
|
||||
hash = "sha256-8SQhORPPLBeynlRWjpkXxleo5pgkNmEIjcXbptuo8es=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "meshoptimizer";
|
||||
version = "1.0.1";
|
||||
version = "1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeux";
|
||||
repo = "meshoptimizer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-t5cWeGf9YI9oG919c6mdXE+qnK2rkTLW0GJ52vw/HrI=";
|
||||
hash = "sha256-tvVMg3RO1T1/Ub/uue1UQwYeSwqq9OQ1F3PKlF3YOrk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -34,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMESHOPT_BUILD_GLTFPACK=ON"
|
||||
"-DMESHOPT_BASISU_PATH=${basis_universal}"
|
||||
"-DMESHOPT_GLTFPACK_BASISU_PATH=${basis_universal}"
|
||||
"-DMESHOPT_GLTFPACK_LIBWEBP_PATH=${libwebp.src}"
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isStatic) "-DMESHOPT_BUILD_SHARED_LIBS:BOOL=ON";
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "millisecond";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gaheldev";
|
||||
repo = "Millisecond";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SMGcSlbOfBX5gAwB7CaHRthf9EN5QWAN9ZzrcbQXtm8=";
|
||||
hash = "sha256-2jGmL/bNta84x7/U5iX+sIlZyzqlcT62oLmfu4f8fiA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mpls";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhersson";
|
||||
repo = "mpls";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SdCWtz/BmuOBLuwQiif5YnnNctaOQpb6iHqDT6j35ZM=";
|
||||
hash = "sha256-mhQuycz+8UfZwsc2/gRuK6X26PxedcqlFyUM0IxqQJs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pi7KBA/313cG0AYWM/mUDng2M9L2tMLkonY4LI5XiW0=";
|
||||
vendorHash = "sha256-w0YBeIaARC16BFp4uxJO8X8b1ozTbWFNUg7VQQa5iFw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "mqtt-randompub";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabaff";
|
||||
repo = "mqtt-randompub";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-X9gITmzyUNtYW8IMTcBiubPscBEO5OGjdxot9wRD/BY=";
|
||||
hash = "sha256-6R40dEJSi3i2UxJNXLk+GWA/iykzbGVLFccF8ncymKw=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
build-system = with python3.pkgs; [ hatchling ];
|
||||
|
||||
dependencies = with python3.pkgs; [ paho-mqtt ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.491";
|
||||
version = "0.0.493";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hNxfWsWs3WVQoworX58qOd7l6Jy/f1qyGZeqQMsBIxU=";
|
||||
hash = "sha256-PMF4bpJ5+XtJrhQMsr33wdEDuufn2d+xcGddWzAR/bs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yn/oeWUERZvNaChFWvtzvp29AcI5dBu7OkACvFPKD+U=";
|
||||
vendorHash = "sha256-03QhO7oIUB9zoL5bfzWezkJ0zDY4buuXWLYhwxvnoig=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/nsc"
|
||||
|
||||
@@ -1,24 +1,22 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
unzip,
|
||||
go_1_25,
|
||||
stdenv,
|
||||
vulkan-loader,
|
||||
zlib,
|
||||
|
||||
# Feature flags (all enabled by default, set slim = true to disable all optional deps)
|
||||
slim ? false,
|
||||
enableCuda ? !slim && stdenv.hostPlatform.isLinux,
|
||||
enableFfmpeg ? !slim && stdenv.hostPlatform.isLinux,
|
||||
enableCuda ? !slim && stdenv.hostPlatform.isLinux && config.cudaSupport,
|
||||
enableVulkan ? !slim && stdenv.hostPlatform.isLinux,
|
||||
|
||||
# Optional dependencies
|
||||
cudaPackages,
|
||||
ffmpeg_4,
|
||||
gfortran,
|
||||
pcre2,
|
||||
darwinMinVersionHook,
|
||||
@@ -30,7 +28,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
bridgeVersion = "v1.0.45-rc1";
|
||||
bridgeVersion = "1.0.45-rc1";
|
||||
|
||||
bridge = fetchurl {
|
||||
url =
|
||||
@@ -41,19 +39,19 @@ let
|
||||
aarch64-linux = "linux_arm64";
|
||||
aarch64-darwin = "macos_arm64";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
"https://nexa-model-hub-bucket.s3.us-west-1.amazonaws.com/public/nexasdk/${bridgeVersion}/${platformDir}/nexasdk-bridge.zip";
|
||||
"https://nexa-model-hub-bucket.s3.us-west-1.amazonaws.com/public/nexasdk/v${bridgeVersion}/${platformDir}/nexasdk-bridge.zip";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-bvULCeGXNd8Alu7V32M5Me23Rh6of6L7hdPYrkOlxB0=";
|
||||
aarch64-linux = "sha256-KaHNmq776FtE4tF8jROV43QIyUNaYz/V1kkgMwwjcBo=";
|
||||
aarch64-darwin = "sha256-QVh5HutaB/BfCYRgwXdtMVWtDcYzfL9N9qW2GhcK2aY=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
in
|
||||
(buildGoModule.override { go = go_1_25; }) (finalAttrs: {
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "nexa";
|
||||
version = "0.2.73";
|
||||
|
||||
@@ -88,9 +86,6 @@ in
|
||||
++ lib.optionals enableVulkan [
|
||||
vulkan-loader
|
||||
]
|
||||
++ lib.optionals enableFfmpeg [
|
||||
ffmpeg_4.lib
|
||||
]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.libcublas
|
||||
@@ -106,7 +101,7 @@ in
|
||||
"libcublas.so.12"
|
||||
"libcublasLt.so.12"
|
||||
]
|
||||
++ lib.optionals (!enableFfmpeg) [
|
||||
++ [
|
||||
"libavformat.so.58"
|
||||
"libavfilter.so.7"
|
||||
"libavcodec.so.58"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opengamepadui";
|
||||
version = "0.44.3";
|
||||
version = "0.45.0";
|
||||
|
||||
buildType = if withDebug then "debug" else "release";
|
||||
|
||||
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ShadowBlip";
|
||||
repo = "OpenGamepadUI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pjg5zIgytS7YxNWAJg46aOYhRG88TbK1906UK5fM3pM=";
|
||||
hash = "sha256-B3s9fJzOUNKqvdz1CuJQKJTcQKBUsn8cEV0F6e9Pjr0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src cargoRoot;
|
||||
hash = "sha256-ZccqPWyyhVMenF8tLXQlwC5uKg5o66E5qkeNGAbSs1w=";
|
||||
hash = "sha256-aykBD6cyhLL3I2oCrxXEFotmULrhOlte9zNON9liQx4=";
|
||||
};
|
||||
cargoRoot = "extensions";
|
||||
|
||||
|
||||
@@ -114,6 +114,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.enableFeature cudaSupport "mca-dso")
|
||||
(lib.enableFeature fortranSupport "mpi-fortran")
|
||||
(lib.withFeatureAs stdenv.hostPlatform.isLinux "libnl" (lib.getDev libnl))
|
||||
# From some reason, without this the darwin build fails with cyclic
|
||||
# references between $dev and $out
|
||||
"--with-pmix=${lib.getDev pmix}"
|
||||
"--with-pmix-libdir=${lib.getLib pmix}/lib"
|
||||
# Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables
|
||||
|
||||
@@ -34,10 +34,17 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-2fQQL0JoV8YukU+VW2iWS4DpBi1j361SfiXRHRmocRg=";
|
||||
};
|
||||
|
||||
postPatch = lib.optional (stdenv.cc.isClang && (lib.versionAtLeast stdenv.cc.version "9")) ''
|
||||
substituteInPlace cmake_configure.cmake \
|
||||
--replace-fail 'target_link_libraries(rw_interface INTERFACE "stdc++fs")' ""
|
||||
'';
|
||||
postPatch =
|
||||
lib.optionalString (stdenv.cc.isClang && (lib.versionAtLeast stdenv.cc.version "9")) ''
|
||||
substituteInPlace cmake_configure.cmake \
|
||||
--replace-fail 'target_link_libraries(rw_interface INTERFACE "stdc++fs")' ""
|
||||
''
|
||||
+ ''
|
||||
# boost 1.89 removed the boost_system stub library
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'find_package(Boost COMPONENTS program_options system REQUIRED)' \
|
||||
'find_package(Boost COMPONENTS program_options REQUIRED)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
cacert,
|
||||
gitMinimal,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "openshell";
|
||||
version = "0.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "OpenShell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-98wmBhj1Bqkod9DWh4qhkT3287c56ZKRDf/Z3QCYf4Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lzS8V8e+wMX8KUfgrftNLdbyivoj0wtRWOThBRS1IdM=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
cacert
|
||||
gitMinimal
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# fill in package version to Cargo
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"'
|
||||
# only build openshell-cli crate
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail 'members = ["crates/*"]' 'members = ["crates/openshell-cli"]'
|
||||
'';
|
||||
|
||||
env = {
|
||||
# docker image tag baked in at compile time, must match binary version
|
||||
OPENSHELL_IMAGE_TAG = finalAttrs.version;
|
||||
};
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/NVIDIA/OpenShell/releases/tag/v${finalAttrs.version}";
|
||||
description = "The safe, private runtime for autonomous AI agents.";
|
||||
homepage = "https://docs.nvidia.com/openshell/index.html";
|
||||
license = lib.licenses.asl20;
|
||||
longDescription = ''
|
||||
NVIDIA OpenShell is an open source runtime to build and deploy autonomous,
|
||||
self-evolving agents more safely. OpenShell sits between your agent and
|
||||
your infrastructure to govern how the agent executes, what the agent can
|
||||
see and do, and where inference goes. It enables claws to run in isolated
|
||||
sandboxes, with fine-grained control over privacy and security.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ wishstudio ];
|
||||
mainProgram = "openshell";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "opnborg";
|
||||
version = "0.1.80";
|
||||
version = "0.1.81";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paepckehh";
|
||||
repo = "opnborg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DpGwCcBbm3tfKOlxb7qiPJhRTLo36wMXS0QabqWEfes=";
|
||||
hash = "sha256-lPPOGvWoeMkA5B488saJWFU7yG/RcjJ+e1p1O/ssW00=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uSdMb4uTF9YV77bAz4sRJT3ApIeYtlxa4ba7X+Lg7pw=";
|
||||
vendorHash = "sha256-B1fZsgb2h3Po4Zy9jUD6OOFAGr+Yw6vNBK+IurjzMSo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oscar64";
|
||||
version = "1.32.268";
|
||||
version = "1.32.270";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drmortalwombat";
|
||||
repo = "oscar64";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZpXC8G7PUWCW5m9JnEuq2jt2YeMK/t9XzWqjZAjOqqc=";
|
||||
hash = "sha256-KOXX+utLRhU9Zls28uXdbmBRMJ3AVM1sjyLq+wLrls8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -44,13 +44,13 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ossia-score";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ossia";
|
||||
repo = "score";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fwJXXkIOQNeImYP0H73x4GRlwFxzogdGh+OAn/LVS/8=";
|
||||
hash = "sha256-9G7B8soBYoGA3vjSgaCIGT3qbzeDlqTouOsYEkxNqG0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "owocr";
|
||||
version = "1.26.7";
|
||||
version = "1.26.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AuroraWright";
|
||||
repo = "owocr";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OdGYxyJiIfkDxz6RyR9IrdO8ILCNHqb8CjSaUylauZA=";
|
||||
hash = "sha256-bdkhuEH2OJspJ9gBmQQAzCimN1Iuj5D6Cdzr0dO0HEc=";
|
||||
};
|
||||
|
||||
# we use pystray directly to avoid making a new package
|
||||
|
||||
@@ -179,6 +179,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
"gotenberg-client"
|
||||
"redis"
|
||||
"scikit-learn"
|
||||
"tika-client"
|
||||
# requested by maintainer
|
||||
"ocrmypdf"
|
||||
];
|
||||
|
||||
@@ -6,22 +6,20 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "past-time";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabaff";
|
||||
repo = "past-time";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NSuU33vuHbgJ+cG0FrGYLizIrG7jSz+veptt3D4UegY=";
|
||||
hash = "sha256-1t43GAcA3Dd5F2xO0JMmq8f5cbmmcO2I7TIGaVa1ebw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
click
|
||||
dependencies = with python3.pkgs; [
|
||||
cyclopts
|
||||
tqdm
|
||||
];
|
||||
|
||||
@@ -30,15 +28,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"past_time"
|
||||
];
|
||||
pythonImportsCheck = [ "past_time" ];
|
||||
|
||||
meta = {
|
||||
description = "Tool to visualize the progress of the year based on the past days";
|
||||
homepage = "https://github.com/fabaff/past-time";
|
||||
changelog = "https://github.com/fabaff/past-time/releases/tag/${finalAttrs.version}";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "past-time";
|
||||
};
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pencil2d";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pencil2d";
|
||||
repo = "pencil";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rgoi7WvE2lnGeHA2DzROREDa0iAI4nj9VTRlSmFuh4E=";
|
||||
hash = "sha256-OZlDx+L3kIIp9c2iXvfxLKEJntOA6sji5ugwZXnUqRA=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
# Obtain the last commit ID and its timestamp, then zap .git for reproducibility
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pineapple-pictures";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BLumia";
|
||||
repo = "pineapple-pictures";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Eiljopa2DF8KIzekGlwMF+MzJboo7E/BjJ0/KFEyOYc=";
|
||||
hash = "sha256-4vxD4UN5/MwIzmmQZOj7nmDwbIeGTuj+fLPgCEPLzrw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "poutine";
|
||||
version = "1.0.8";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boostsecurityio";
|
||||
repo = "poutine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YctbFSFSbq/LZiS5WDv7a0NYRjDU/He0OMRG6h1gaqE=";
|
||||
hash = "sha256-DyxV8GlNbU/g6GMdOEt++oXFDq7+K4FeWTVJPUAFKk8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qp3Ko+01kk9AH0oCT2Si/si+74gT5KFtPFslwih/IBE=";
|
||||
vendorHash = "sha256-Ktsk01YqBHVZDOu+Xp1p3sVDwqozl35iLYbVavpiWq0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zfs_exporter";
|
||||
version = "2.3.11";
|
||||
version = "2.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdf";
|
||||
repo = pname;
|
||||
rev = "v" + version;
|
||||
hash = "sha256-aFieYRF81NUOgfxwR8ifX0sInDH6iM+FXuv0Oe4nzBY=";
|
||||
hash = "sha256-4nuZhPqBqGOR5zM1yyxPD0M4bVZNaIm72uSus6CvCrU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8AUo6sfdKME5x89CvabMDxBOzq3f/+//du/+N+cvpWA=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pyroscope";
|
||||
version = "pyroscope-1.18.1";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "pyroscope";
|
||||
rev = "v1.18.0";
|
||||
hash = "sha256-f+C9kXAbJIAw/6rKdBtdZy9H0dmEQnHM3VEx70i5XnE=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UPxGimkzXLFACqmAM1hNQIoNjN6OquVibwVmNvP00+s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gRuo2xKRC6iiX8wbI1B3rQtk4xJBq3eLM/H49DTtt3U=";
|
||||
vendorHash = "sha256-O8ZKIl5d2gvmtCqJOJJ5SU+qhNRyWj2kH0xHZzfLN5Y=";
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user