Merge staging-next into staging
This commit is contained in:
@@ -10421,12 +10421,6 @@
|
||||
githubId = 2192042;
|
||||
name = "Colin King";
|
||||
};
|
||||
hamburger1984 = {
|
||||
email = "hamburger1984@gmail.com";
|
||||
github = "hamburger1984";
|
||||
githubId = 438976;
|
||||
name = "Andreas Krohn";
|
||||
};
|
||||
hamhut1066 = {
|
||||
email = "github@hamhut1066.com";
|
||||
github = "moredhel";
|
||||
@@ -14310,6 +14304,11 @@
|
||||
githubId = 148352;
|
||||
name = "Jim Fowler";
|
||||
};
|
||||
kitlangton = {
|
||||
github = "kitlangton";
|
||||
githubId = 7587245;
|
||||
name = "Kit Langton";
|
||||
};
|
||||
kitsunoff = {
|
||||
github = "kitsunoff";
|
||||
githubId = 58953114;
|
||||
@@ -22476,6 +22475,14 @@
|
||||
github = "QuiNzX";
|
||||
githubId = 76129478;
|
||||
};
|
||||
quio = {
|
||||
name = "Dominik Schwaiger";
|
||||
email = "mail@dominik-schwaiger.ch";
|
||||
matrix = "@quio:matrix.dominik-schwaiger.ch";
|
||||
github = "quiode";
|
||||
githubId = 51075975;
|
||||
keys = [ { fingerprint = "D9FE 655C CD52 8F80 3D27 8F75 F7E7 E19B C69F 7DF5"; } ];
|
||||
};
|
||||
quodlibetor = {
|
||||
email = "quodlibetor@gmail.com";
|
||||
github = "quodlibetor";
|
||||
|
||||
@@ -350,6 +350,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
|
||||
- `xfsprogs` was updated to version 6.18.0, which enables parent pointers and exchange-range by default. Upstream recommends not to use these features with kernels older than 6.18.
|
||||
GRUB2 is likely unable to boot from filesystems with these features enabled.
|
||||
|
||||
- `services.xtreemfs` has been removed as the `xtreemfs` package was broken and unmaintained upstream.
|
||||
|
||||
- `lunarvim` package has been removed, as it was abandoned upstream and relied on an old version of `neovim` to work properly.
|
||||
|
||||
- `opengfw` package and `services.opengfw` module have been removed as the upstream GitHub repository and website have been shut down.
|
||||
|
||||
@@ -250,7 +250,7 @@ in
|
||||
namecoin = 208;
|
||||
#lxd = 210; # unused
|
||||
#kibana = 211;# dynamically allocated as of 2021-09-03
|
||||
xtreemfs = 212;
|
||||
# xtreemfs = 212; # dropped in 26.05
|
||||
calibre-server = 213;
|
||||
#heapster = 214; #dynamically allocated as of 2021-09-17
|
||||
bepasty = 215;
|
||||
@@ -585,7 +585,7 @@ in
|
||||
#gateone = 207; #removed 2025-08-21
|
||||
namecoin = 208;
|
||||
#kibana = 211;
|
||||
xtreemfs = 212;
|
||||
# xtreemfs = 212; # dropped in 26.05
|
||||
calibre-server = 213;
|
||||
bepasty = 215;
|
||||
# pumpio = 216; # unused, removed 2018-02-24
|
||||
|
||||
@@ -1116,7 +1116,6 @@
|
||||
./services/network-filesystems/u9fs.nix
|
||||
./services/network-filesystems/webdav-server-rs.nix
|
||||
./services/network-filesystems/webdav.nix
|
||||
./services/network-filesystems/xtreemfs.nix
|
||||
./services/network-filesystems/yandex-disk.nix
|
||||
./services/networking/3proxy.nix
|
||||
./services/networking/acme-dns.nix
|
||||
|
||||
@@ -507,6 +507,9 @@ in
|
||||
(mkRemovedOptionModule [ "services" "pyload" ] ''
|
||||
services.pyload has been removed since the pyload-ng package had vulnerabilities and was unmaintained in nixpkgs.
|
||||
'')
|
||||
(mkRemovedOptionModule [ "services" "xtreemfs" ] ''
|
||||
services.xtreemfs has been removed as it was broken and unmaintained upstream
|
||||
'')
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,516 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
||||
cfg = config.services.xtreemfs;
|
||||
|
||||
xtreemfs = pkgs.xtreemfs;
|
||||
|
||||
home = cfg.homeDir;
|
||||
|
||||
startupScript =
|
||||
class: configPath:
|
||||
pkgs.writeScript "xtreemfs-osd.sh" ''
|
||||
#! ${pkgs.runtimeShell}
|
||||
JAVA_HOME="${pkgs.jdk}"
|
||||
JAVADIR="${xtreemfs}/share/java"
|
||||
JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar"
|
||||
$JAVA_CALL ${class} ${configPath}
|
||||
'';
|
||||
|
||||
dirReplicationConfig = pkgs.writeText "xtreemfs-dir-replication-plugin.properties" ''
|
||||
babudb.repl.backupDir = ${home}/server-repl-dir
|
||||
plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar
|
||||
babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar
|
||||
|
||||
${cfg.dir.replication.extraConfig}
|
||||
'';
|
||||
|
||||
dirConfig = pkgs.writeText "xtreemfs-dir-config.properties" ''
|
||||
uuid = ${cfg.dir.uuid}
|
||||
listen.port = ${toString cfg.dir.port}
|
||||
${lib.optionalString (cfg.dir.address != "") "listen.address = ${cfg.dir.address}"}
|
||||
http_port = ${toString cfg.dir.httpPort}
|
||||
babudb.baseDir = ${home}/dir/database
|
||||
babudb.logDir = ${home}/dir/db-log
|
||||
babudb.sync = ${if cfg.dir.replication.enable then "FDATASYNC" else cfg.dir.syncMode}
|
||||
|
||||
${lib.optionalString cfg.dir.replication.enable "babudb.plugin.0 = ${dirReplicationConfig}"}
|
||||
|
||||
${cfg.dir.extraConfig}
|
||||
'';
|
||||
|
||||
mrcReplicationConfig = pkgs.writeText "xtreemfs-mrc-replication-plugin.properties" ''
|
||||
babudb.repl.backupDir = ${home}/server-repl-mrc
|
||||
plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar
|
||||
babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar
|
||||
|
||||
${cfg.mrc.replication.extraConfig}
|
||||
'';
|
||||
|
||||
mrcConfig = pkgs.writeText "xtreemfs-mrc-config.properties" ''
|
||||
uuid = ${cfg.mrc.uuid}
|
||||
listen.port = ${toString cfg.mrc.port}
|
||||
${lib.optionalString (cfg.mrc.address != "") "listen.address = ${cfg.mrc.address}"}
|
||||
http_port = ${toString cfg.mrc.httpPort}
|
||||
babudb.baseDir = ${home}/mrc/database
|
||||
babudb.logDir = ${home}/mrc/db-log
|
||||
babudb.sync = ${if cfg.mrc.replication.enable then "FDATASYNC" else cfg.mrc.syncMode}
|
||||
|
||||
${lib.optionalString cfg.mrc.replication.enable "babudb.plugin.0 = ${mrcReplicationConfig}"}
|
||||
|
||||
${cfg.mrc.extraConfig}
|
||||
'';
|
||||
|
||||
osdConfig = pkgs.writeText "xtreemfs-osd-config.properties" ''
|
||||
uuid = ${cfg.osd.uuid}
|
||||
listen.port = ${toString cfg.osd.port}
|
||||
${lib.optionalString (cfg.osd.address != "") "listen.address = ${cfg.osd.address}"}
|
||||
http_port = ${toString cfg.osd.httpPort}
|
||||
object_dir = ${home}/osd/
|
||||
|
||||
${cfg.osd.extraConfig}
|
||||
'';
|
||||
|
||||
optionalDir = lib.optionals cfg.dir.enable [ "xtreemfs-dir.service" ];
|
||||
|
||||
systemdOptionalDependencies = {
|
||||
after = [ "network.target" ] ++ optionalDir;
|
||||
wantedBy = [ "multi-user.target" ] ++ optionalDir;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.xtreemfs = {
|
||||
|
||||
enable = lib.mkEnableOption "XtreemFS";
|
||||
|
||||
homeDir = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = "/var/lib/xtreemfs";
|
||||
description = ''
|
||||
XtreemFS home dir for the xtreemfs user.
|
||||
'';
|
||||
};
|
||||
|
||||
dir = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable XtreemFS DIR service.
|
||||
'';
|
||||
};
|
||||
|
||||
uuid = lib.mkOption {
|
||||
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
Must be set to a unique identifier, preferably a UUID according to
|
||||
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
|
||||
the `util-linux` package.
|
||||
'';
|
||||
};
|
||||
port = lib.mkOption {
|
||||
default = 32638;
|
||||
type = lib.types.port;
|
||||
description = ''
|
||||
The port to listen on for incoming connections (TCP).
|
||||
'';
|
||||
};
|
||||
address = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "127.0.0.1";
|
||||
default = "";
|
||||
description = ''
|
||||
If specified, it defines the interface to listen on. If not
|
||||
specified, the service will listen on all interfaces (any).
|
||||
'';
|
||||
};
|
||||
httpPort = lib.mkOption {
|
||||
default = 30638;
|
||||
type = lib.types.port;
|
||||
description = ''
|
||||
Specifies the listen port for the HTTP service that returns the
|
||||
status page.
|
||||
'';
|
||||
};
|
||||
syncMode = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"ASYNC"
|
||||
"SYNC_WRITE_METADATA"
|
||||
"SYNC_WRITE"
|
||||
"FDATASYNC"
|
||||
"FSYNC"
|
||||
];
|
||||
default = "FSYNC";
|
||||
example = "FDATASYNC";
|
||||
description = ''
|
||||
The sync mode influences how operations are committed to the disk
|
||||
log before the operation is acknowledged to the caller.
|
||||
|
||||
-ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure.
|
||||
-SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model.
|
||||
-SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode.
|
||||
-FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk.
|
||||
-FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk.
|
||||
|
||||
For best throughput use ASYNC, for maximum data safety use FSYNC.
|
||||
|
||||
(If xtreemfs.dir.replication.enable is true then FDATASYNC is forced)
|
||||
'';
|
||||
};
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
# specify whether SSL is required
|
||||
ssl.enabled = true
|
||||
ssl.service_creds.pw = passphrase
|
||||
ssl.service_creds.container = pkcs12
|
||||
ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/dir.p12
|
||||
ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
|
||||
ssl.trusted_certs.pw = jks_passphrase
|
||||
ssl.trusted_certs.container = jks
|
||||
'';
|
||||
description = ''
|
||||
Configuration of XtreemFS DIR service.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
|
||||
'';
|
||||
};
|
||||
replication = {
|
||||
enable = lib.mkEnableOption "XtreemFS DIR replication plugin";
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
example = ''
|
||||
# participants of the replication including this replica
|
||||
babudb.repl.participant.0 = 192.168.0.10
|
||||
babudb.repl.participant.0.port = 35676
|
||||
babudb.repl.participant.1 = 192.168.0.11
|
||||
babudb.repl.participant.1.port = 35676
|
||||
babudb.repl.participant.2 = 192.168.0.12
|
||||
babudb.repl.participant.2.port = 35676
|
||||
|
||||
# number of servers that at least have to be up to date
|
||||
# To have a fault-tolerant system, this value has to be set to the
|
||||
# majority of nodes i.e., if you have three replicas, set this to 2
|
||||
# Please note that a setup with two nodes provides no fault-tolerance.
|
||||
babudb.repl.sync.n = 2
|
||||
|
||||
# specify whether SSL is required
|
||||
babudb.ssl.enabled = true
|
||||
|
||||
babudb.ssl.protocol = tlsv12
|
||||
|
||||
# server credentials for SSL handshakes
|
||||
babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12
|
||||
babudb.ssl.service_creds.pw = passphrase
|
||||
babudb.ssl.service_creds.container = pkcs12
|
||||
|
||||
# trusted certificates for SSL handshakes
|
||||
babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
|
||||
babudb.ssl.trusted_certs.pw = jks_passphrase
|
||||
babudb.ssl.trusted_certs.container = jks
|
||||
|
||||
babudb.ssl.authenticationWithoutEncryption = false
|
||||
'';
|
||||
description = ''
|
||||
Configuration of XtreemFS DIR replication plugin.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
mrc = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable XtreemFS MRC service.
|
||||
'';
|
||||
};
|
||||
|
||||
uuid = lib.mkOption {
|
||||
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
Must be set to a unique identifier, preferably a UUID according to
|
||||
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
|
||||
the `util-linux` package.
|
||||
'';
|
||||
};
|
||||
port = lib.mkOption {
|
||||
default = 32636;
|
||||
type = lib.types.port;
|
||||
description = ''
|
||||
The port to listen on for incoming connections (TCP).
|
||||
'';
|
||||
};
|
||||
address = lib.mkOption {
|
||||
example = "127.0.0.1";
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
If specified, it defines the interface to listen on. If not
|
||||
specified, the service will listen on all interfaces (any).
|
||||
'';
|
||||
};
|
||||
httpPort = lib.mkOption {
|
||||
default = 30636;
|
||||
type = lib.types.port;
|
||||
description = ''
|
||||
Specifies the listen port for the HTTP service that returns the
|
||||
status page.
|
||||
'';
|
||||
};
|
||||
syncMode = lib.mkOption {
|
||||
default = "FSYNC";
|
||||
type = lib.types.enum [
|
||||
"ASYNC"
|
||||
"SYNC_WRITE_METADATA"
|
||||
"SYNC_WRITE"
|
||||
"FDATASYNC"
|
||||
"FSYNC"
|
||||
];
|
||||
example = "FDATASYNC";
|
||||
description = ''
|
||||
The sync mode influences how operations are committed to the disk
|
||||
log before the operation is acknowledged to the caller.
|
||||
|
||||
-ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure.
|
||||
-SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model.
|
||||
-SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode.
|
||||
-FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk.
|
||||
-FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk.
|
||||
|
||||
For best throughput use ASYNC, for maximum data safety use FSYNC.
|
||||
|
||||
(If xtreemfs.mrc.replication.enable is true then FDATASYNC is forced)
|
||||
'';
|
||||
};
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
example = ''
|
||||
osd_check_interval = 300
|
||||
no_atime = true
|
||||
local_clock_renewal = 0
|
||||
remote_time_sync = 30000
|
||||
authentication_provider = org.xtreemfs.common.auth.NullAuthProvider
|
||||
|
||||
# shared secret between the MRC and all OSDs
|
||||
capability_secret = iNG8UuQJrJ6XVDTe
|
||||
|
||||
dir_service.host = 192.168.0.10
|
||||
dir_service.port = 32638
|
||||
|
||||
# if replication is enabled
|
||||
dir_service.1.host = 192.168.0.11
|
||||
dir_service.1.port = 32638
|
||||
dir_service.2.host = 192.168.0.12
|
||||
dir_service.2.port = 32638
|
||||
|
||||
# specify whether SSL is required
|
||||
ssl.enabled = true
|
||||
ssl.protocol = tlsv12
|
||||
ssl.service_creds.pw = passphrase
|
||||
ssl.service_creds.container = pkcs12
|
||||
ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/mrc.p12
|
||||
ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
|
||||
ssl.trusted_certs.pw = jks_passphrase
|
||||
ssl.trusted_certs.container = jks
|
||||
'';
|
||||
description = ''
|
||||
Configuration of XtreemFS MRC service.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
|
||||
'';
|
||||
};
|
||||
replication = {
|
||||
enable = lib.mkEnableOption "XtreemFS MRC replication plugin";
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
example = ''
|
||||
# participants of the replication including this replica
|
||||
babudb.repl.participant.0 = 192.168.0.10
|
||||
babudb.repl.participant.0.port = 35678
|
||||
babudb.repl.participant.1 = 192.168.0.11
|
||||
babudb.repl.participant.1.port = 35678
|
||||
babudb.repl.participant.2 = 192.168.0.12
|
||||
babudb.repl.participant.2.port = 35678
|
||||
|
||||
# number of servers that at least have to be up to date
|
||||
# To have a fault-tolerant system, this value has to be set to the
|
||||
# majority of nodes i.e., if you have three replicas, set this to 2
|
||||
# Please note that a setup with two nodes provides no fault-tolerance.
|
||||
babudb.repl.sync.n = 2
|
||||
|
||||
# specify whether SSL is required
|
||||
babudb.ssl.enabled = true
|
||||
|
||||
babudb.ssl.protocol = tlsv12
|
||||
|
||||
# server credentials for SSL handshakes
|
||||
babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12
|
||||
babudb.ssl.service_creds.pw = passphrase
|
||||
babudb.ssl.service_creds.container = pkcs12
|
||||
|
||||
# trusted certificates for SSL handshakes
|
||||
babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
|
||||
babudb.ssl.trusted_certs.pw = jks_passphrase
|
||||
babudb.ssl.trusted_certs.container = jks
|
||||
|
||||
babudb.ssl.authenticationWithoutEncryption = false
|
||||
'';
|
||||
description = ''
|
||||
Configuration of XtreemFS MRC replication plugin.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
osd = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable XtreemFS OSD service.
|
||||
'';
|
||||
};
|
||||
|
||||
uuid = lib.mkOption {
|
||||
example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
Must be set to a unique identifier, preferably a UUID according to
|
||||
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
|
||||
the `util-linux` package.
|
||||
'';
|
||||
};
|
||||
port = lib.mkOption {
|
||||
default = 32640;
|
||||
type = lib.types.port;
|
||||
description = ''
|
||||
The port to listen on for incoming connections (TCP and UDP).
|
||||
'';
|
||||
};
|
||||
address = lib.mkOption {
|
||||
example = "127.0.0.1";
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
If specified, it defines the interface to listen on. If not
|
||||
specified, the service will listen on all interfaces (any).
|
||||
'';
|
||||
};
|
||||
httpPort = lib.mkOption {
|
||||
default = 30640;
|
||||
type = lib.types.port;
|
||||
description = ''
|
||||
Specifies the listen port for the HTTP service that returns the
|
||||
status page.
|
||||
'';
|
||||
};
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
example = ''
|
||||
local_clock_renewal = 0
|
||||
remote_time_sync = 30000
|
||||
report_free_space = true
|
||||
capability_secret = iNG8UuQJrJ6XVDTe
|
||||
|
||||
dir_service.host = 192.168.0.10
|
||||
dir_service.port = 32638
|
||||
|
||||
# if replication is used
|
||||
dir_service.1.host = 192.168.0.11
|
||||
dir_service.1.port = 32638
|
||||
dir_service.2.host = 192.168.0.12
|
||||
dir_service.2.port = 32638
|
||||
|
||||
# specify whether SSL is required
|
||||
ssl.enabled = true
|
||||
ssl.service_creds.pw = passphrase
|
||||
ssl.service_creds.container = pkcs12
|
||||
ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12
|
||||
ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks
|
||||
ssl.trusted_certs.pw = jks_passphrase
|
||||
ssl.trusted_certs.container = jks
|
||||
'';
|
||||
description = ''
|
||||
Configuration of XtreemFS OSD service.
|
||||
WARNING: configuration is saved as plaintext inside nix store.
|
||||
For more options: <https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html>
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ xtreemfs ];
|
||||
|
||||
users.users.xtreemfs = {
|
||||
uid = config.ids.uids.xtreemfs;
|
||||
description = "XtreemFS user";
|
||||
createHome = true;
|
||||
home = home;
|
||||
};
|
||||
|
||||
users.groups.xtreemfs = {
|
||||
gid = config.ids.gids.xtreemfs;
|
||||
};
|
||||
|
||||
systemd.services.xtreemfs-dir = lib.mkIf cfg.dir.enable {
|
||||
description = "XtreemFS-DIR Server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "xtreemfs";
|
||||
ExecStart = "${startupScript "org.xtreemfs.dir.DIR" dirConfig}";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.xtreemfs-mrc = lib.mkIf cfg.mrc.enable (
|
||||
{
|
||||
description = "XtreemFS-MRC Server";
|
||||
serviceConfig = {
|
||||
User = "xtreemfs";
|
||||
ExecStart = "${startupScript "org.xtreemfs.mrc.MRC" mrcConfig}";
|
||||
};
|
||||
}
|
||||
// systemdOptionalDependencies
|
||||
);
|
||||
|
||||
systemd.services.xtreemfs-osd = lib.mkIf cfg.osd.enable (
|
||||
{
|
||||
description = "XtreemFS-OSD Server";
|
||||
serviceConfig = {
|
||||
User = "xtreemfs";
|
||||
ExecStart = "${startupScript "org.xtreemfs.osd.OSD" osdConfig}";
|
||||
};
|
||||
}
|
||||
// systemdOptionalDependencies
|
||||
);
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@@ -393,7 +393,7 @@ in
|
||||
${lib.concatStringsSep " " cfg.gunicornArgs}
|
||||
'';
|
||||
PrivateTmp = true;
|
||||
TimeoutStartSec = lib.mkDefault "5min";
|
||||
TimeoutStartSec = lib.mkDefault "10min";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -11948,14 +11948,14 @@ final: prev: {
|
||||
|
||||
nordic-nvim = buildVimPlugin {
|
||||
pname = "nordic.nvim";
|
||||
version = "0-unstable-2024-06-16";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andersevenrud";
|
||||
owner = "alexvzyl";
|
||||
repo = "nordic.nvim";
|
||||
rev = "c88388b2a5f6e621df2718c316b856d4971bb89d";
|
||||
hash = "sha256-ipmt0xD2zTfoh8fyYG4+09uVL2ef98FE9VwWpWJtQks=";
|
||||
tag = "0.2.0";
|
||||
hash = "sha256-kjr4SsRbKfVgNjAFWybkRQ8/QDOPLm7lbysi6Gblpfg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
|
||||
meta.homepage = "https://github.com/alexvzyl/nordic.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
@@ -25838,7 +25838,7 @@ final: prev: {
|
||||
hash = "sha256-I+nPSItC/0M8QTs1mVX7F+KjtezYpq9GFpUdsFl6bTE=";
|
||||
};
|
||||
meta.homepage = "https://codeberg.org/ziglang/zig.vim/";
|
||||
meta.license = lib.licenses.unfree;
|
||||
meta.license = unfree;
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
|
||||
@@ -851,7 +851,7 @@ https://github.com/folke/noice.nvim/,,
|
||||
https://github.com/nvimtools/none-ls.nvim/,,
|
||||
https://github.com/nordtheme/vim/,,nord-vim
|
||||
https://github.com/shaunsingh/nord.nvim/,,
|
||||
https://github.com/andersevenrud/nordic.nvim/,,
|
||||
https://github.com/alexvzyl/nordic.nvim/,,
|
||||
https://github.com/vigoux/notifier.nvim/,,
|
||||
https://github.com/jlesquembre/nterm.nvim/,,
|
||||
https://github.com/jose-elias-alvarez/null-ls.nvim/,,
|
||||
|
||||
@@ -1998,8 +1998,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlab-workflow";
|
||||
publisher = "gitlab";
|
||||
version = "6.75.1";
|
||||
hash = "sha256-C6PqrgpQyiG5neVB12bpHMmxFRWXCPQuG0QeyVf5BKs=";
|
||||
version = "6.75.3";
|
||||
hash = "sha256-UrcrHL46ZtQl6Zazec/2rkZLtnPK9BsmyT+9nhTncsA=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitLab extension for Visual Studio Code";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "google";
|
||||
name = "colab";
|
||||
version = "0.8.0";
|
||||
hash = "sha256-bkZCDBWiHdj3bKEdj2bVNUY84SkAMHi7PwZuUnhyR+0=";
|
||||
version = "0.8.1";
|
||||
hash = "sha256-QKGE6heSrSCm7X0YSOQy6SQeD50AZPS28UYWSWYdJxs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "windows-ai-studio";
|
||||
publisher = "ms-windows-ai-studio";
|
||||
version = "1.0.0";
|
||||
hash = "sha256-bpq4q/ZEk75NBiwP1VUtTCV2xHed38+CiSKNkT/ClWk=";
|
||||
version = "1.0.1";
|
||||
hash = "sha256-85bFomfGcFiXJuTUv46B47PEtzFP6H7rggCZzf5/fK8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -12,7 +12,7 @@ currentVersion=$(nix eval --raw -f . vscode.version)
|
||||
if [[ -n "$version" ]]; then
|
||||
latestVersion="$version"
|
||||
else
|
||||
latestVersion=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases | jq --raw-output 'map(select(.prerelease==false)) | .[].tag_name' | sort -V | tail -n1)
|
||||
latestVersion=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases | jq --raw-output 'map(select(.prerelease==false)) | .[].tag_name' | grep -E '^[0-9]+\.[0-9]+(\.[0-9]+)?$' | sort -V | tail -n1)
|
||||
if ! [[ "$latestVersion" =~ ^[0-9]+\.[0-9]+(\.[0-9]+)?$ ]]; then
|
||||
echo "Error: Invalid version from GitHub API: $latestVersion"
|
||||
exit 1
|
||||
|
||||
@@ -35,17 +35,17 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-zoe2E9xlpAME4QD8IagicbAj71g3cA9XlymQQQMFJLo=";
|
||||
x86_64-darwin = "sha256-gKpy6+wkcO+znxLdkGMOetpVyhs3SViQyRtCc6yc5XY=";
|
||||
aarch64-linux = "sha256-KQR6zD+3m+OgeICSs3LkWo7kC2OxqF6Xax8BRTa6QYQ=";
|
||||
aarch64-darwin = "sha256-VZufcJ/g1LPtlQruUwI8Pe5c8LNiAIUHY5+gNnyaPTQ=";
|
||||
armv7l-linux = "sha256-0TxKXKQppxcURimXgC40wmqMgiX3DBMJAMc+qjMQCck=";
|
||||
x86_64-linux = "sha256-YF0zu0aqZpGGGaf5uNqaVaL1sMQuEVIzZ1Mczuwnfq4=";
|
||||
x86_64-darwin = "sha256-zv6Ryr1wTR9+osEhtAHO4viXAI4pc7Yk47dex622ymg=";
|
||||
aarch64-linux = "sha256-Mym9ijieF7jVAyZJ/3sO0Wp5JJ4c+/8psCjxrlEH/ok=";
|
||||
aarch64-darwin = "sha256-qLshyr9jGyx5dxUGnf5GftlTSoA1OeAWtIvK1aDxqCQ=";
|
||||
armv7l-linux = "sha256-JdyQ+65gJCU8Ye2darRV4Hi0//0imkX56bvc52MNLcM=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.116.0";
|
||||
version = "1.118.1";
|
||||
|
||||
# The update server (update.code.visualstudio.com) expects the version path
|
||||
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
|
||||
@@ -53,7 +53,7 @@ let
|
||||
downloadVersion = lib.versions.pad 3 version;
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "560a9dba96f961efea7b1612916f89e5d5d4d679";
|
||||
rev = "034f571df509819cc10b0c8129f66ef77a542f0e";
|
||||
in
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -86,7 +86,7 @@ buildVscode {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-HqcaLktkhw3BoEgyFwnMmP7/vuSl1OXZygrQreKeHnM=";
|
||||
hash = "sha256-is+djb3G/Lchc4+rqNgjW5xH6vD+OuHDKH7MBKPAJoA=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "flycast";
|
||||
version = "0-unstable-2026-04-17";
|
||||
version = "0-unstable-2026-05-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "ae5416a5cb1df362382279172818ac4bb692dc97";
|
||||
hash = "sha256-3eFkirJm3tBLvJrM0rcTX1tFnKnWag8s3eUL17nQc9w=";
|
||||
rev = "744e9e4aa560d785000a2653ee3d291716aa2c0a";
|
||||
hash = "sha256-gCFX8mWWWsSogaBDtbVx4hL/GiNk5YlsT2HP3LNY0zs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "prboom";
|
||||
version = "0-unstable-2026-04-11";
|
||||
version = "0-unstable-2026-05-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-prboom";
|
||||
rev = "c834221f61e4efa43525392cf778b6475467f236";
|
||||
hash = "sha256-mESKZiiCIbbAzn7tFeofWARHSZ+MyEYTIa04FGxOMlA=";
|
||||
rev = "01b7411dab3ba8da6cdbc4fa83ac207f038f524d";
|
||||
hash = "sha256-wNVUflrVAwwMvCfRk94k9SyANvVeHB3noN3yb5TpJpc=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -200,11 +200,11 @@
|
||||
"vendorHash": "sha256-59bhibkok4w7dLTf96jZGk2di6TpR6IAqp0i3xmtlyI="
|
||||
},
|
||||
"cloudflare_cloudflare": {
|
||||
"hash": "sha256-2hlL7N6jP7or3l0HczbRhnAmMYJ0XQTXl0f+sIFdlZc=",
|
||||
"hash": "sha256-1qgPmsk6lSTuESBy/kSrm2f/BnvTcrKqj+IphsKfqEw=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
|
||||
"owner": "cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v5.19.0",
|
||||
"rev": "v5.19.1",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-Gkb493fesB/jOdvnQrwt4MrNKO+YlR3+9Mu5TiaG084="
|
||||
},
|
||||
@@ -1004,11 +1004,11 @@
|
||||
"vendorHash": "sha256-/4mktOn7qjWIkpyqeEW4vzY0w0pG+0qx7KRYBkE1IkQ="
|
||||
},
|
||||
"okta_okta": {
|
||||
"hash": "sha256-Ub41ML88NKsMC6q1C67DCBTrG9qD0cBhAkizZdIRRBc=",
|
||||
"hash": "sha256-Skp7GSfQSTBLOFoGlU3/TmzMqyZ8j7qYzlyuBYzBiB4=",
|
||||
"homepage": "https://registry.terraform.io/providers/okta/okta",
|
||||
"owner": "okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v6.9.0",
|
||||
"rev": "v6.10.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-0NaqVCibwiK7WY6hIFGd2kB/okyh6ZsZ+BAe5mGP38A="
|
||||
},
|
||||
@@ -1130,13 +1130,13 @@
|
||||
"vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
|
||||
},
|
||||
"rootlyhq_rootly": {
|
||||
"hash": "sha256-eu7GuDGBP0/08Ro7nCkMEjnhzKQ6IBZxyrX+SZr0fAk=",
|
||||
"hash": "sha256-+rGnQRYkRm+2SrsT63jtKtLsWaMOAanYAaL3ryI+cqU=",
|
||||
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
||||
"owner": "rootlyhq",
|
||||
"repo": "terraform-provider-rootly",
|
||||
"rev": "v5.11.1",
|
||||
"rev": "v5.13.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-l/i6y+IX6xZOzQiFeC3nrW3ZjsxaVLfIyCMOLtnstMY="
|
||||
"vendorHash": "sha256-E4hNi4xGV7xPoidkwo8L4q9bZeZ4WCVx/zHakPs5PCk="
|
||||
},
|
||||
"rundeck_rundeck": {
|
||||
"hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
|
||||
|
||||
@@ -19,6 +19,10 @@ buildDunePackage {
|
||||
hash = "sha256-6QZZ77C1G3x/GOJsUEQMrCatVsyyxNjq36ez/TgeHSY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cli/dune --replace-warn 'notty notty.lwt' 'notty-community.lwt'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ppx_sexp_conv
|
||||
ppx_deriving
|
||||
@@ -35,7 +39,7 @@ buildDunePackage {
|
||||
otr
|
||||
astring
|
||||
ptime
|
||||
notty
|
||||
notty-community
|
||||
sexplib
|
||||
hex
|
||||
uchar
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -12,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolassv";
|
||||
repo = "bartib";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk=";
|
||||
};
|
||||
|
||||
@@ -22,13 +24,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd bartib --bash misc/bartibCompletion.sh
|
||||
installShellCompletion --cmd bartib --fish misc/bartib.fish
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Simple timetracker for the command line";
|
||||
homepage = "https://github.com/nikolassv/bartib";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.progrm_jarvis ];
|
||||
mainProgram = "bartib";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "basalt";
|
||||
version = "0.11.0";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erikjuhani";
|
||||
repo = "basalt";
|
||||
tag = "basalt/v${finalAttrs.version}";
|
||||
hash = "sha256-+bkONCG4PSa266r0am2sjtz2WJXdhwijfJ8Uz3iEk68=";
|
||||
hash = "sha256-fijpPGPeF3f81WMWj1tIc0ht8hUIubAe19ja3iBNOh0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7jkeDZhGoufY1lHnhc2yKz2ulBf/nlV4ngY2XRSHF+4=";
|
||||
cargoHash = "sha256-jY3EDM+jYwCsMpd5cA5WKzmhdS4rVCLz3h5gfshzhOQ=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
let
|
||||
bigpemu-unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "BigPEmu";
|
||||
version = "1.21";
|
||||
version = "1.22";
|
||||
src = fetchurl {
|
||||
url = "https://www.richwhitehouse.com/jaguar/builds/BigPEmu_Linux64_v${
|
||||
builtins.replaceStrings [ "." ] [ "" ] version
|
||||
}.tar.gz";
|
||||
hash = "sha256-DCHgGZMmi2R0PFhAgxNh/jzuT1ONjrofFgO04cgacrA=";
|
||||
hash = "sha256-z1r04qdZ6LNqGb3HwpCMeyKP6vYJz2hAVsIyHAfJsbU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "borgmatic";
|
||||
version = "2.1.3";
|
||||
version = "2.1.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mWZQBoQUd+cwOV3QU62XyTCFdFpnBz2BsyImzVAozJE=";
|
||||
hash = "sha256-T0+E6opyfr7zxfP44OlNuhqsdQyi7OdIXiE5r310LaU=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -31,13 +31,19 @@ python3Packages.buildPythonApplication rec {
|
||||
flexmock
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
pytest-timeout
|
||||
]
|
||||
++ optional-dependencies.apprise;
|
||||
|
||||
# - test_borgmatic_version_matches_news_version
|
||||
# The file NEWS not available on the pypi source, and this test is useless
|
||||
# NEWS file not available on the pypi source
|
||||
# - test_log_outputs_includes_error_output_in_exception
|
||||
# TOCTOU race in log_outputs(): process.poll() returns None in
|
||||
# raise_for_process_errors but non-None in the while-loop exit check,
|
||||
# so the error is never raised. Timing-dependent; fails on x86_64-darwin.
|
||||
disabledTests = [
|
||||
"test_borgmatic_version_matches_news_version"
|
||||
"test_log_outputs_includes_error_output_in_exception"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -121,7 +121,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sed "/^Environment=\"BRLTTY_EXECUTABLE_ARGUMENTS.*/a Environment=\"BRLTTY_EXECUTABLE_PATH=$out/bin/brltty\"" -i systemd/system/brltty@.service
|
||||
substituteInPlace systemd/system/brltty-device@.service \
|
||||
--replace '/usr/bin/true' '${coreutils}/bin/true'
|
||||
substituteInPlace udev/rules.d/90-brltty-uinput.rules \
|
||||
substituteInPlace udev/rules.d/90-brltty-beeper.rules \
|
||||
--replace '/usr/bin/setfacl' '${acl}/bin/setfacl'
|
||||
substituteInPlace udev/rules.d/90-brltty-uinput.rules \
|
||||
--replace '/usr/bin/setfacl' '${acl}/bin/setfacl'
|
||||
substituteInPlace udev/rules.d/90-brltty-hid.rules \
|
||||
--replace '/usr/bin/setfacl' '${acl}/bin/setfacl'
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildkite-agent-metrics";
|
||||
version = "5.10.0";
|
||||
version = "5.12.2";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -18,10 +18,13 @@ buildGoModule (finalAttrs: {
|
||||
owner = "buildkite";
|
||||
repo = "buildkite-agent-metrics";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QE4IY1yU8X1zG+jf7eBWiSjN3HvDqr2Avhs3Bub+xB0=";
|
||||
hash = "sha256-O/6YGxX7sJEaqmMMzOPxkiIWJs1VRa+tgZ2w8UjfoKk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r088XQKYx0D0OVfz/nqhWL0LLCf4X13WqYikJKlLr3c=";
|
||||
vendorHash = "sha256-2os2V1iyw1k6XwX2wLz0abMnu+X5p+Aqau7ajC3JIRc=";
|
||||
|
||||
# This is a Google Cloud Function and is not needed for compiling the binary
|
||||
excludedPackages = [ "./cloud_function" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $lambda/bin
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-typify";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxidecomputer";
|
||||
repo = "typify";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tsZY+Ygh+9xOOAKcNh2U2k47o+uNAC2zguL+qW/wiqg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ym3xPMn36+Y8dnImmuegjwrARPzozhwI+qhDCXmFsHg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-K5Fj261Jh+NVipR71cYo5CqHx31czfgs6kr6uifHvaw=";
|
||||
cargoHash = "sha256-3hh4M5cqwLDHcHI+YGKXQOeTXGcVTec+xk+mZcVp0IU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustfmt
|
||||
@@ -46,13 +46,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--set RUSTFMT "${lib.getExe rustfmt}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "JSON Schema to Rust type converter";
|
||||
mainProgram = "cargo-typify";
|
||||
homepage = "https://github.com/oxidecomputer/typify";
|
||||
changelog = "https://github.com/oxidecomputer/typify/blob/${finalAttrs.src.tag}/CHANGELOG.adoc";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iamanaws ];
|
||||
mainProgram = "cargo-typify";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,12 +12,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "kobzol";
|
||||
repo = "cargo-wizard";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WLGE2ZuytjSridZwfUTtNQF5woeBbx5ZoHfB9eyvedI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vRakgwZRyYkk3xFfZzl197tgRmx+/g2b8eaDunwrCzM=";
|
||||
|
||||
# cargo-wizard still suggests lld for aarch64-linux on Rust 1.90+, so the
|
||||
# nightly integration test must expect both rustflags there.
|
||||
postPatch = ''
|
||||
substituteInPlace tests/integration/dialog.rs \
|
||||
--replace-fail 'if rustversion::cfg!(before(1.90.0)) {' \
|
||||
'if rustversion::cfg!(before(1.90.0)) || cfg!(all(target_os = "linux", target_arch = "aarch64")) {'
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType
|
||||
'';
|
||||
@@ -25,9 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
meta = {
|
||||
description = "Cargo subcommand for configuring Cargo profile for best performance";
|
||||
homepage = "https://github.com/kobzol/cargo-wizard";
|
||||
changelog = "https://github.com/kobzol/cargo-wizard/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/kobzol/cargo-wizard/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iamanaws ];
|
||||
mainProgram = "cargo-wizard";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
fixup-yarn-lock,
|
||||
go,
|
||||
makeWrapper,
|
||||
nodejs_20,
|
||||
nodejs_22,
|
||||
nix-update-script,
|
||||
patchelf,
|
||||
removeReferencesTo,
|
||||
@@ -19,18 +19,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdktn-cli";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-constructs";
|
||||
repo = "cdk-terrain";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KgDRQ76ePLJEdULMCTJTouMaWu0SCeV4NwNW2WpoaNY=";
|
||||
hash = "sha256-yBCLxp7w/M2y7vDEI1ceAAJbyYpPT4mN4hZ3FKpaiJ0=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-0aOwRdfCTiQHmWzOk+ExLX+/EAryxheyILe7L7oyd4w=";
|
||||
hash = "sha256-c5WQXZLbOuvy6Jj6TchV00HThFIePMdsGW1rWAUKnvo=";
|
||||
};
|
||||
|
||||
hcl2json-go-modules =
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fixup-yarn-lock
|
||||
go
|
||||
makeWrapper
|
||||
nodejs_20
|
||||
nodejs_22
|
||||
patchelf
|
||||
removeReferencesTo
|
||||
yarn
|
||||
@@ -129,7 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p "$out/lib/node_modules/cdktn-cli"
|
||||
cp -rL node_modules packages/cdktn-cli/bundle packages/cdktn-cli/package.json "$out/lib/node_modules/cdktn-cli/"
|
||||
|
||||
makeWrapper "${lib.getExe nodejs_20}" "$out/bin/cdktn" \
|
||||
makeWrapper "${lib.getExe nodejs_22}" "$out/bin/cdktn" \
|
||||
--add-flags "--no-warnings=DEP0040" \
|
||||
--add-flags "$out/lib/node_modules/cdktn-cli/bundle/bin/cdktn.js"
|
||||
|
||||
runHook postInstall
|
||||
@@ -160,5 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "cdktn";
|
||||
maintainers = with lib.maintainers; [ deejayem ];
|
||||
platforms = lib.platforms.unix;
|
||||
# Uses @cdktf/node-pty-prebuilt-multiarch which is not yet available for node 22 on aarch64-linux
|
||||
broken = stdenv.hostPlatform.system == "aarch64-linux";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
|
||||
let
|
||||
pname = "chatzone-desktop";
|
||||
version = "5.6.1";
|
||||
version = "5.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.6.1/1159/chatzone-desktop-linux-5.6.1.AppImage";
|
||||
hash = "sha256-fLwkroco9cwNoDXPB+9Qu0qRXDE36zaF8MPjHonRbfk=";
|
||||
url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.6.2/1175/chatzone-desktop-linux-5.6.2.AppImage";
|
||||
hash = "sha256-2t3mp0snHn2NxVFCcU1XQ5h3rUCb4gXjKbF43p9W8ZU=";
|
||||
};
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cmctl";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cert-manager";
|
||||
repo = "cmctl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UsVXCOOX+/2KdZuF9p+3TByASfOyL+tUP4oYi0Ec4eU=";
|
||||
hash = "sha256-TFVGyb09+QDcRy1y6ilQ0A2IJ13ZQOZJ+X+habgAG6U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TE3GIFGmqigcyLLfLKTu//l+G4mVthnCaK9fMyHKpzM=";
|
||||
vendorHash = "sha256-u7r+RIYleY7Ymtc/ZnQSkGADxBmjqHdQV2M0myV+UUg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "copilot-language-server";
|
||||
version = "1.477.0";
|
||||
version = "1.480.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
|
||||
hash = "sha256-Z3ZMlZrAktNqHpuJhCG9Twng+tIc47NhHQr1DwF2h80=";
|
||||
hash = "sha256-+w9ENFkOLV1Q5wsgaDNYIn4cRM/W86GDzafeSz47x8o=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dbmate";
|
||||
version = "2.32.0";
|
||||
version = "2.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amacneil";
|
||||
repo = "dbmate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ORS3naMqkY4VroRd/0cIgNJq+HVRs+DVpBVw3MVU1+k=";
|
||||
hash = "sha256-qdW7hutxjdhT8ypQOmVrcTMzuySy0zkS8SeTbvaGVK4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z871KKwB+tWS+ssbXE0kJsIi/sg0r1lFN8CGXm7Gopk=";
|
||||
vendorHash = "sha256-kKj3KOWq1IeQcR2/QJYsKZh6Kxryj0y687CKzyeO4ZM=";
|
||||
|
||||
tags = [ "fts5" ];
|
||||
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
applyPatches,
|
||||
gitMinimal,
|
||||
makeBinaryWrapper,
|
||||
installShellFiles,
|
||||
@@ -18,6 +16,7 @@
|
||||
pkg-config,
|
||||
glibcLocalesUtf8,
|
||||
boehmgc,
|
||||
libghostty-vt,
|
||||
llvmPackages,
|
||||
nixd,
|
||||
bash,
|
||||
@@ -25,27 +24,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.6";
|
||||
devenvNixVersion = "2.32";
|
||||
devenvNixRev = "e127c1c94cefe02d8ca4cca79ef66be4c527510e";
|
||||
version = "2.1.0";
|
||||
devenvNixVersion = "2.34";
|
||||
devenvNixRev = "42d4b7de21c15f28c568410f4383fa06a8458a40";
|
||||
|
||||
devenvNixSrc = applyPatches {
|
||||
devenvNixSrc = fetchFromGitHub {
|
||||
name = "devenv-nix-${devenvNixVersion}-source";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "nix";
|
||||
rev = devenvNixRev;
|
||||
hash = "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=";
|
||||
};
|
||||
patches = [
|
||||
# Lowdown 3.0 compatibility; devenv's nix fork (2.32-based) predates
|
||||
# the upstream fix.
|
||||
(fetchpatch {
|
||||
name = "nix-lowdown-3.0-support.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/472c35c561bd9e8db1465e0677f1efe2cb88c568.patch";
|
||||
hash = "sha256-ZCQgI/euBN8t9rgdCsGRgrcEWG3T5MUc+bQc4tIcHuI=";
|
||||
})
|
||||
];
|
||||
owner = "cachix";
|
||||
repo = "nix";
|
||||
rev = devenvNixRev;
|
||||
hash = "sha256-g2KEBuHpc3a56c+jPcg0+w6LSuIj6f+zzdztLCOyIhc=";
|
||||
};
|
||||
|
||||
nix_components = (nixVersions.nixComponents_git.overrideSource devenvNixSrc).overrideScope (
|
||||
@@ -61,16 +49,11 @@ rustPlatform.buildRustPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "devenv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i1G6n/7Z5fO9RhplzXQSTiLyh1Cs0GhoCoEStFLARtA=";
|
||||
tag = "v2.1";
|
||||
hash = "sha256-U7rb9FufadyCBLLsxVY6AJfy6TN24+uwaBBh8JVOP8s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-p5kI7HlG6RVxCCEb/J0L2gh36jkm/atAV98ny3h4vqo=";
|
||||
|
||||
# Upstream tagged v2.0.6 with Cargo.toml already bumped to 2.0.7
|
||||
postPatch = ''
|
||||
substituteInPlace Cargo.toml --replace-fail 'version = "2.0.7"' 'version = "${version}"'
|
||||
'';
|
||||
cargoHash = "sha256-aONHe6r+lvXC45y6QeJ/tnVSHAYhy2IGuGWCrz+KVWc=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "--cfg tracing_unstable";
|
||||
@@ -97,6 +80,7 @@ rustPlatform.buildRustPackage {
|
||||
openssl
|
||||
sqlite
|
||||
dbus
|
||||
libghostty-vt
|
||||
llvmPackages.clang-unwrapped
|
||||
nix_components.nix-expr-c
|
||||
nix_components.nix-store-c
|
||||
|
||||
@@ -1,20 +1,8 @@
|
||||
diff --git a/bin/dune b/bin/dune
|
||||
index e0ddc1f..a4e8523 100644
|
||||
--- a/bin/dune
|
||||
+++ b/bin/dune
|
||||
@@ -47,6 +47,7 @@
|
||||
notty
|
||||
notty.unix
|
||||
nottui
|
||||
+ nottui-unix
|
||||
lwd
|
||||
oseq
|
||||
eio
|
||||
diff --git a/bin/ui_base.ml b/bin/ui_base.ml
|
||||
index f56ee8d..8d8ed70 100644
|
||||
diff --git a/bin/UI_base.ml b/bin/UI_base.ml
|
||||
index efb1d14..ce6a2a4 100644
|
||||
--- a/bin/UI_base.ml
|
||||
+++ b/bin/UI_base.ml
|
||||
@@ -587,7 +587,7 @@ let ui_loop ~quit ~term root =
|
||||
@@ -787,7 +787,7 @@ let ui_loop ~quit ~term root =
|
||||
if term_width <> prev_term_width || term_height <> prev_term_height then (
|
||||
Lwd.set Vars.term_width_height (term_width, term_height)
|
||||
);
|
||||
@@ -23,3 +11,20 @@ index f56ee8d..8d8ed70 100644
|
||||
~process_event:true
|
||||
~timeout:0.05
|
||||
~renderer
|
||||
diff --git a/bin/dune b/bin/dune
|
||||
index c4905a4..7c7b55d 100644
|
||||
--- a/bin/dune
|
||||
+++ b/bin/dune
|
||||
@@ -44,9 +44,10 @@
|
||||
containers.unix
|
||||
cmdliner
|
||||
fmt
|
||||
- notty
|
||||
- notty.unix
|
||||
+ notty-community
|
||||
+ notty-community.unix
|
||||
nottui
|
||||
+ nottui-unix
|
||||
lwd
|
||||
oseq
|
||||
eio
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
ocamlPackages,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python3,
|
||||
dune,
|
||||
makeWrapper,
|
||||
@@ -25,8 +26,16 @@ ocamlPackages.buildDunePackage rec {
|
||||
hash = "sha256-d7c72jXadwBtUqarfdGnEDo9yFwCAeEX0GGVqCe70Ak=";
|
||||
};
|
||||
|
||||
# Compatibility with nottui ≥ 0.4
|
||||
patches = [ ./nottui-unix.patch ];
|
||||
patches = [
|
||||
# Compatibility with nottui ≥ 0.4
|
||||
./nottui-unix.patch
|
||||
# Compatibility with lwd ≥ 0.5
|
||||
(fetchpatch {
|
||||
url = "https://github.com/darrenldl/docfd/commit/439ff57e80778f684cf8526b3b33c745a02da2a7.patch";
|
||||
includes = [ "*.ml" ];
|
||||
hash = "sha256-bB+zta2VcrDd42FUD9ExBui787LmtN3PMyb/MJQO7u0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
@@ -44,7 +53,7 @@ ocamlPackages.buildDunePackage rec {
|
||||
lwd
|
||||
nottui
|
||||
nottui-unix
|
||||
notty
|
||||
notty-community
|
||||
ocaml_sqlite3
|
||||
ocolor
|
||||
oseq
|
||||
|
||||
@@ -9,16 +9,24 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dockerfmt";
|
||||
version = "0.3.9";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reteps";
|
||||
repo = "dockerfmt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eTsYL2UAVW2M1aQGc5X1gT5cXpXKgshLmN+U5Qro/Qw=";
|
||||
hash = "sha256-WfwrFe3E+CzfZ0ITSjMD8h4yrG+mnC6y0L+7OSYjMsw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fLGgvAxSAiVSrsnF7r7EpPKCOOD9jzUsXxVQNWjYq80=";
|
||||
vendorHash = "sha256-r8vmbZ4oyplqIU6R/6hhcyjoR3E/mOFrB69TrfPYxRI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/reteps/dockerfmt/cmd.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -17,12 +19,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-CpVci0nw/6Y6uyQX6iRV9E7uXzdZ2fzYIelYxsc+tI0=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Npm scripts runner written in Rust";
|
||||
mainProgram = "dum";
|
||||
homepage = "https://github.com/egoist/dum";
|
||||
changelog = "https://github.com/egoist/dum/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.progrm_jarvis ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dysk";
|
||||
version = "3.6.0b";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "dysk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XkZ21dy6mIStRVqkqESSO6apD6SEeuyYDSsjBdY2+Mg=";
|
||||
hash = "sha256-6yjLIioul6wEocv3pzghPMWLKd5kDqCb7ezh4oFcdmU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PGHcQZCGwy/yzMrLbz1eO7zlvJI0vrRMKtj3ap13fD0=";
|
||||
cargoHash = "sha256-vpSel0bHQ40kMRfvi3YKf6oAl0f/sjK5GHxAEt6of8Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -7,20 +7,20 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ecspresso";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kayac";
|
||||
repo = "ecspresso";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TW7ccNYdCAySH9QwlKskjsutiUPHfTlmTSTCpOqPdfY=";
|
||||
hash = "sha256-ljiYcOw5tvDYyPfgICidMiJElHls/dvgyIJW0wukIws=";
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
"cmd/ecspresso"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-vdj0QIqnci6P+4zWrhcxrFwvyu+hF9r6RrqtBGbVToA=";
|
||||
vendorHash = "sha256-7WUnP5OpLHjjDUt9LMASQrefhGMk5RPpsmWne1eZpjQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "edlin";
|
||||
version = "2.21";
|
||||
version = "2.24";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
in
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/freedos-edlin/freedos-edlin/${version}/edlin-${version}.tar.bz2";
|
||||
hash = "sha256-lQ/tw8dvEKV81k5GV05o49glOmfYcEeJBmgPUmL3S2I=";
|
||||
hash = "sha256-zj5kCDdEkjzDiun/5xL8yX2SVsnZc3hrzIAYUo4Vj+c=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/edlin-${finalAttrs.version}/
|
||||
cp AUTHORS ChangeLog README TODO edlin.htm $out/share/doc/edlin-${finalAttrs.version}/
|
||||
cp AUTHORS ChangeLog README TODO edlin.html $out/share/doc/edlin-${finalAttrs.version}/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,32 +6,29 @@
|
||||
git,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "entire";
|
||||
version = "0.4.7";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "entireio";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5ZVn6ocFmOAoIOF6RFIOKWyUwRyI1mK8JHCZ9AguNQM=";
|
||||
hash = "sha256-bedr0HldXTQJvyXXIsbJb6hMKzqDTz6dv4x0Lwjk13E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r8+mXHN0OwhO4D/DdZIKWOYaszflmrrjIZVj20Am9gw=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod --replace-fail "go 1.25.6" "go 1.25.5"
|
||||
'';
|
||||
vendorHash = "sha256-iG8Xc6y9gJ1DawTKYSpVlY7H97lZ9OsmvaOX6r0ATXo=";
|
||||
|
||||
subPackages = [ "cmd/entire" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Version=${finalAttrs.version}"
|
||||
"-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Commit=${finalAttrs.src.rev}"
|
||||
"-X=github.com/entireio/cli/cmd/entire/cli/versioninfo.Version=${finalAttrs.version}"
|
||||
"-X=github.com/entireio/cli/cmd/entire/cli/versioninfo.Commit=${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -48,6 +45,8 @@ buildGoModule (finalAttrs: {
|
||||
--zsh <($out/bin/entire completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "CLI tool that captures AI agent sessions alongside git commits";
|
||||
longDescription = ''
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "evolution-ews";
|
||||
version = "3.58.2";
|
||||
version = "3.58.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-ews/${lib.versions.majorMinor finalAttrs.version}/evolution-ews-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-+m/A39F+9hpjCtM8ZFuDWMQmZ2YSbxcWs8ef79KQyPs=";
|
||||
hash = "sha256-P274u2OJAT6EPiWM4dwxeokaNPh9eXgMmu8E0nQavJI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,17 +10,16 @@
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "filius";
|
||||
version = "2.9.4";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "filius1";
|
||||
repo = "filius";
|
||||
# they seem to have stopped using the "v" prefix since 2.9.3
|
||||
tag = version;
|
||||
hash = "sha256-nQyDPLDQe5kFH3PhCmLqAt8kVnitPwX5K3xLnyntF5k=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-q6A+S50n09DgwayylAWbUFQ/sqfCVEkIoWCRtZT80M8=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-6Qq/7vgA9bWQK+k66qORNwvLKMR1U5yb95DJMWaDq/k=";
|
||||
mvnHash = "sha256-R14EtImJJEC/DhKm7MKWzq9XEOqDGNPtLIaK3OKbyiQ=";
|
||||
mvnParameters = "-Plinux";
|
||||
|
||||
# tests want to create an X11 window which isn't often feasible
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "flexget";
|
||||
version = "3.19.14";
|
||||
version = "3.19.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mwg1Ty6saEc/41Rm9mw2f9TiyoJaUlPZfDBu6kklcz8=";
|
||||
hash = "sha256-FZq3DhdrgHFUVC7OJ97ZwYuFE7LnI0tBdiFduKEkmC8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fut";
|
||||
version = "3.2.13";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fusionlanguage";
|
||||
repo = "fut";
|
||||
tag = "fut-${finalAttrs.version}";
|
||||
hash = "sha256-raYlY3HDL5+lv68IRVUXrpypmXfDkgWzHv/qZVECFhs=";
|
||||
hash = "sha256-IsGe8dGfE8npOZs3A/Y9gIRxkve93V7Aq/YuDBjVNb8=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = false;
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Fusion programming language";
|
||||
@@ -48,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://fusion-lang.org";
|
||||
changelog = "https://github.com/fusionlanguage/fut/releases/tag/fut-${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin; # require macos-26
|
||||
maintainers = with lib.maintainers; [ chillcicada ];
|
||||
mainProgram = "fut";
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.43.6";
|
||||
version = "0.43.7";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "geesefs";
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "yandex-cloud";
|
||||
repo = "geesefs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FZIq58Liew5v7SGnLWmFj7nB822FAgFyCVLE9+oN9BA=";
|
||||
hash = "sha256-D9ZFjsmM4x1TVHRGcu6uredWjhwEsNjTr+kwQDmpyGE=";
|
||||
};
|
||||
|
||||
# hashes differ per architecture otherwise.
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
bun,
|
||||
gh,
|
||||
git,
|
||||
nodejs,
|
||||
nix-update-script,
|
||||
runtimeShell,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "ghui";
|
||||
version = "0.4.6";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kitlangton";
|
||||
repo = "ghui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jMi2Pc2VTpj0cZ2zXqtunG0FxcglCNEt9WzWnwxq+Js=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
fetcherVersion = finalAttrs.npmDepsFetcherVersion;
|
||||
hash = "sha256-GYGegGw80M5T2wETreP95OrCn7F7XxlZcZWy9TjbCHY=";
|
||||
nativeBuildInputs = [ nodejs ];
|
||||
prePatch = ''
|
||||
export HOME=$TMPDIR
|
||||
npm pkg set 'dependencies.@ghui/keymap=file:packages/keymap'
|
||||
npm pkg delete 'devDependencies.@ghui/keymap'
|
||||
npm install --package-lock-only --ignore-scripts --no-audit --no-fund
|
||||
'';
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
export HOME=$TMPDIR
|
||||
# prefetch-npm-deps --map-cache reads npmDeps from the process environment.
|
||||
export npmDeps
|
||||
npm pkg set 'dependencies.@ghui/keymap=file:packages/keymap'
|
||||
npm pkg delete 'devDependencies.@ghui/keymap'
|
||||
cp ${finalAttrs.npmDeps}/package-lock.json package-lock.json
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ bun ];
|
||||
|
||||
npmDepsFetcherVersion = 3;
|
||||
|
||||
npmFlags = [
|
||||
"--no-audit"
|
||||
"--no-fund"
|
||||
];
|
||||
|
||||
npmBuildScript = "build:cli";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
postInstallCheck = ''
|
||||
cd $out/lib/ghui
|
||||
${lib.getExe bun} -e '
|
||||
await import("@effect/atom-react")
|
||||
await import("@ghui/keymap")
|
||||
await import("@opentui/core")
|
||||
await import("@opentui/react")
|
||||
await import("effect")
|
||||
await import("react")
|
||||
await import("scheduler")
|
||||
'
|
||||
'';
|
||||
|
||||
# The bundled CLI runs on Bun and resolves runtime dependencies from the
|
||||
# installed node_modules tree. gh is kept on PATH for GitHub API operations.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
npm prune --omit=dev --no-save --no-audit --no-fund
|
||||
|
||||
mkdir -p $out/lib/ghui $out/bin
|
||||
cp -r dist node_modules packages package.json README.md LICENSE .env.example $out/lib/ghui/
|
||||
rm -f $out/lib/ghui/node_modules/.bin/ghui
|
||||
|
||||
cat > $out/bin/ghui <<'EOF'
|
||||
#!@runtimeShell@
|
||||
case "''${1-}" in
|
||||
-v|--version|version)
|
||||
echo @version@
|
||||
exit 0
|
||||
;;
|
||||
-h|--help|help)
|
||||
printf '%s\n' \
|
||||
"ghui @version@" \
|
||||
"" \
|
||||
"Terminal UI for GitHub pull requests." \
|
||||
"" \
|
||||
"Usage:" \
|
||||
" ghui Start the TUI" \
|
||||
" ghui -v, --version" \
|
||||
" Print the installed version" \
|
||||
" ghui -h, --help Show this help message"
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
export PATH=@path@:$PATH
|
||||
exec @bun@ "@out@/lib/ghui/dist/index.js" "$@"
|
||||
EOF
|
||||
substituteInPlace $out/bin/ghui \
|
||||
--replace-fail @runtimeShell@ ${runtimeShell} \
|
||||
--replace-fail @version@ ${finalAttrs.version} \
|
||||
--replace-fail @path@ ${
|
||||
lib.makeBinPath [
|
||||
gh
|
||||
git
|
||||
]
|
||||
} \
|
||||
--replace-fail @bun@ ${lib.getExe bun} \
|
||||
--replace-fail @out@ $out
|
||||
chmod +x $out/bin/ghui
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Terminal UI for GitHub pull requests";
|
||||
homepage = "https://github.com/kitlangton/ghui";
|
||||
changelog = "https://github.com/kitlangton/ghui/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kitlangton ];
|
||||
mainProgram = "ghui";
|
||||
platforms = bun.meta.platforms;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-runner";
|
||||
version = "18.11.1";
|
||||
version = "18.11.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O/vaodFMt1HgGi4OVjVIfhie0j0bhbRQl1iEMrYfmn0=";
|
||||
hash = "sha256-TWpIu6LxFX5ssijlYQA/dmAiPrB0nrHtlS2MWEk6C30=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE=";
|
||||
|
||||
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
description = "Statically typed language for the Erlang VM";
|
||||
mainProgram = "gleam";
|
||||
homepage = "https://gleam.run/";
|
||||
changelog = "https://github.com/gleam-lang/gleam/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/gleam-lang/gleam/blob/v${finalAttrs.version}/changelog/v${lib.versions.majorMinor finalAttrs.version}.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
philtaken
|
||||
|
||||
@@ -12,16 +12,19 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "glpaper";
|
||||
version = "unstable-2022-05-15";
|
||||
version = "unstable-2024-08-07";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~scoopta";
|
||||
repo = "glpaper";
|
||||
vc = "hg";
|
||||
rev = "f89e60b7941fb60f1069ed51af9c5bb4917aab35";
|
||||
sha256 = "sha256-E7FKjt3NL0aAEibfaq+YS2IVvpjNjInA+Rs8SU63/3M=";
|
||||
rev = "af9827d20bfe1956dd88fb2202b38ed0de705305";
|
||||
sha256 = "sha256-zgvnWqsw243jZ9e6fG6L0hDfRRHwzmIdsxwnnWhimu0=";
|
||||
};
|
||||
|
||||
# nop() is used as a typed Wayland callback stub, which GCC 15 rejects as an error.
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "gnome-extensions-cli";
|
||||
version = "0.10.8";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "gnome_extensions_cli";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-Tnf8BbW9u7d19ZtGTdMVHa6azbKekYRGOPEPNiB+y00=";
|
||||
hash = "sha256-5OL0ma17rXA+USDATVQXO3ORWDAwoGB3x85BSIsRapY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "go-arch-lint";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fe3dback";
|
||||
repo = "go-arch-lint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AMPqMtBg1RjbqlfAHz193q1SFeqDmF7WrjvX2psqVro=";
|
||||
hash = "sha256-RHU7MJAuNcJhdHVzu25Vie6Q8e95ISsJsNB+MVTqAQc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2n7OjF4gl+qq9M5EtU0nmgWwRPZ3YvmLQDAgJ8w9S1M=";
|
||||
|
||||
@@ -184,11 +184,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "147.0.7727.137";
|
||||
version = "148.0.7778.96";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-2QKA8nk+O10cGr0gGOMSlLkxpO+WHFG1yul9a3VGq64=";
|
||||
hash = "sha256-Rmowgy0t/GJkiu28ZkXdzi5dzFxpFpzhcbZgsdFKl0c=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -302,11 +302,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "147.0.7727.138";
|
||||
version = "148.0.7778.97";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/ackheqvxll25dzx6s76qfgpa4oxa_147.0.7727.138/GoogleChrome-147.0.7727.138.dmg";
|
||||
hash = "sha256-1WOkBxAs79ByJ3quXgh+ZR64ysIE2/2wMeIhl3sYh5o=";
|
||||
url = "http://dl.google.com/release2/chrome/fqffxmazeqztj7lx2lxedj2iwy_148.0.7778.97/GoogleChrome-148.0.7778.97.dmg";
|
||||
hash = "sha256-lfmEmoovaTcgyvetQnXnlE9dOLI7FRvPu6f6Fcpc7JA=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -24,7 +24,7 @@ let
|
||||
in
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "gotenberg";
|
||||
version = "8.31.0";
|
||||
version = "8.32.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -35,10 +35,10 @@ buildGo126Module (finalAttrs: {
|
||||
owner = "gotenberg";
|
||||
repo = "gotenberg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+OTQwby2tTXGDGsuI0CW7B6RKKBvtoa/AlCyf6fdPO4=";
|
||||
hash = "sha256-o29kpKVAlKu6ER7b6ni9DMN3kGzEUnoqvHETXBNhJVs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s9lv2HzFxNh8ij3h2doQkjozpUqKEvVHnpXneEvK0/Y=";
|
||||
vendorHash = "sha256-kHNjWq53uCVOP3JGc57MK2FKjtlqZpJz7Za+wTb/F1U=";
|
||||
|
||||
postPatch = ''
|
||||
find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${finalAttrs.src}#g' {} \;
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "har-to-k6";
|
||||
version = "0.14.13";
|
||||
version = "0.14.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "har-to-k6";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RKg8ShzxxIaK6mmcmLjYT8Ofe2CM3U5/Lg/UEIRi30Q=";
|
||||
hash = "sha256-03WhzmdmncM7YqavYnivzxD3oo48MAkrn/1qTcK8w7o=";
|
||||
};
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
npmDepsHash = "sha256-Z5aq9apwz1wvm0uam2pxzX+T+hKkk/kmXPy7IyrUHFM=";
|
||||
npmDepsHash = "sha256-ZVBlHjDB5LbOWXuoz4IIQF0lqDGANxpPE1sAy9roxbo=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -80,7 +80,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hare";
|
||||
version = "0.26.0";
|
||||
version = "0.26.0.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "~sircmpwn";
|
||||
repo = "hare";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3NrhnbAR0VIyr7JkAsY8NIkW8AelPSphzIYu8QMgXsU=";
|
||||
hash = "sha256-ypu3GXO2hTGg26l0+FUzEMK/+HiylJIWQxe9UbhKXz4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
execution results and can check this differences at after.
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hamburger1984 ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "hwatch";
|
||||
};
|
||||
})
|
||||
|
||||
+348
-1033
File diff suppressed because it is too large
Load Diff
@@ -4,7 +4,7 @@
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
version = "1.16.5";
|
||||
version = "1.18.1";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "intelephense";
|
||||
@@ -12,14 +12,14 @@ buildNpmPackage {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/intelephense/-/intelephense-${version}.tgz";
|
||||
hash = "sha256-Qqc5canlBafwCeLxquT+K3MdH5SqdZVuYBZNfinAXIk=";
|
||||
hash = "sha256-GkjSPm54lAzaPb/Z31Gng+EZCuxXF8ys1YtKmRkSSpc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-BKnv65e+BgJrBKQ2J1glvfbd0Gt3BF9shgGDk9cNWcQ=";
|
||||
npmDepsHash = "sha256-U3q2Suf9FxroXnDg8NcW186hGbcpE4UQGgHqD5n6/MM=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "kiwix-apple";
|
||||
version = "3.13.0";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kiwix.org/release/kiwix-macos/kiwix-macos_${finalAttrs.version}.dmg";
|
||||
hash = "sha256-f9Un5ufiwwDiMesdw2dtnHWLM4ZtGMnFcGMuR3aIvHs=";
|
||||
hash = "sha256-rVfoJg8VTyEF6KeMGIOTUijtz8Ot0DerayrPgs6Wje8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "lean-lsp-mcp";
|
||||
version = "0.26.1";
|
||||
version = "0.26.2";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "oOo0oOo";
|
||||
repo = "lean-lsp-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OHbD6HujkXsqe8XpNr1bn+Pel2tbkX7tBapCcUe234o=";
|
||||
hash = "sha256-NWX+r6hz04WnSkERqVj57ruw47RhqOeEofYUaxuU/uM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lfk";
|
||||
version = "0.9.36";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janosmiko";
|
||||
repo = "lfk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aIWqZ90Mz6Oc554wLB4691JsX68VG0pD3+AuAOkqNis=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2YhpOg5asUYaMQxorwTt1gkyiA165wjBxDoIUJ74sro=";
|
||||
|
||||
ldflags = [ "-s" ];
|
||||
|
||||
meta = {
|
||||
description = "Lightning Fast Kubernetes navigator";
|
||||
longDescription = "LFK is a lightning-fast, keyboard-focused, yazi-inspired terminal user interface for navigating and managing Kubernetes clusters. Built for speed and efficiency, it brings a three-column Miller columns layout with an owner-based resource hierarchy to your terminal";
|
||||
homepage = "https://github.com/janosmiko/lfk";
|
||||
changelog = "https://github.com/janosmiko/lfk/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ gwg313 ];
|
||||
mainProgram = "lfk";
|
||||
};
|
||||
})
|
||||
Generated
+419
@@ -0,0 +1,419 @@
|
||||
# generated by zon2nix (https://github.com/jcollie/zon2nix)
|
||||
{
|
||||
lib,
|
||||
linkFarm,
|
||||
fetchzip,
|
||||
fetchurl,
|
||||
fetchgit,
|
||||
runCommandLocal,
|
||||
zig_0_15,
|
||||
zstd,
|
||||
name ? "zig-packages",
|
||||
}:
|
||||
let
|
||||
unpackZigArtifact =
|
||||
{ name, artifact }:
|
||||
runCommandLocal name { nativeBuildInputs = [ zig_0_15 ]; } ''
|
||||
hash="$(cd "$TMPDIR" && zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
|
||||
mv "$TMPDIR/p/$hash" "$out"
|
||||
chmod 755 "$out"
|
||||
'';
|
||||
|
||||
fetchZig =
|
||||
{
|
||||
name,
|
||||
url,
|
||||
hash,
|
||||
unpack,
|
||||
}:
|
||||
let
|
||||
artifact =
|
||||
if unpack then
|
||||
fetchzip {
|
||||
inherit url hash;
|
||||
nativeBuildInputs = [ zstd ];
|
||||
}
|
||||
else
|
||||
fetchurl { inherit url hash; };
|
||||
in
|
||||
unpackZigArtifact { inherit name artifact; };
|
||||
|
||||
fetchGitZig =
|
||||
{
|
||||
name,
|
||||
url,
|
||||
hash,
|
||||
}:
|
||||
let
|
||||
parts = lib.splitString "#" url;
|
||||
url_base = builtins.elemAt parts 0;
|
||||
url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0;
|
||||
rev_base = builtins.elemAt parts 1;
|
||||
rev =
|
||||
if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
|
||||
in
|
||||
fetchgit {
|
||||
inherit name rev hash;
|
||||
url = url_without_query;
|
||||
deepClone = false;
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
fetchZigArtifact =
|
||||
{
|
||||
name,
|
||||
url,
|
||||
hash,
|
||||
unpack,
|
||||
}:
|
||||
let
|
||||
parts = lib.splitString "://" url;
|
||||
proto = builtins.elemAt parts 0;
|
||||
path = builtins.elemAt parts 1;
|
||||
fetcher = {
|
||||
"git+http" = fetchGitZig {
|
||||
inherit name hash;
|
||||
url = "http://${path}";
|
||||
};
|
||||
"git+https" = fetchGitZig {
|
||||
inherit name hash;
|
||||
url = "https://${path}";
|
||||
};
|
||||
http = fetchZig {
|
||||
inherit name hash unpack;
|
||||
url = "http://${path}";
|
||||
};
|
||||
https = fetchZig {
|
||||
inherit name hash unpack;
|
||||
url = "https://${path}";
|
||||
};
|
||||
};
|
||||
in
|
||||
fetcher.${proto};
|
||||
in
|
||||
linkFarm name [
|
||||
{
|
||||
name = "N-V-__8AANT61wB--nJ95Gj_ctmzAtcjloZ__hRqNw5lC1Kr";
|
||||
path = fetchZigArtifact {
|
||||
name = "bindings";
|
||||
url = "https://deps.files.ghostty.org/DearBindings_v0.17_ImGui_v1.92.5-docking.tar.gz";
|
||||
hash = "sha256-i/7FAOAJJvZ5hT7iPWfMOS08MYFzPKRwRzhlHT9wuqM=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AALw2uwF_03u4JRkZwRLc3Y9hakkYV7NKRR9-RIZJ";
|
||||
path = fetchZigArtifact {
|
||||
name = "breakpad";
|
||||
url = "https://deps.files.ghostty.org/breakpad-b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz";
|
||||
hash = "sha256-bMqYlD0amQdmzvYQd8Ca/1k4Bj/heh7+EijlQSttatk=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAIrfdwARSa-zMmxWwFuwpXf1T3asIN7s5jqi9c1v";
|
||||
path = fetchZigArtifact {
|
||||
name = "fontconfig";
|
||||
url = "https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz";
|
||||
hash = "sha256-O6LdkhWHGKzsXKrxpxYEO1qgVcJ7CB2RSvPMtA3OilU=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAKLKpwC4H27Ps_0iL3bPkQb-z6ZVSrB-x_3EEkub";
|
||||
path = fetchZigArtifact {
|
||||
name = "freetype";
|
||||
url = "https://deps.files.ghostty.org/freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz";
|
||||
hash = "sha256-QnIB9dUVFnDQXB9bRb713aHy592XHvVPD+qqf/0quQw=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AADcZkgn4cMhTUpIz6mShCKyqqB-NBtf_S2bHaTC-";
|
||||
path = fetchZigArtifact {
|
||||
name = "gettext";
|
||||
url = "https://deps.files.ghostty.org/gettext-0.24.tar.gz";
|
||||
hash = "sha256-yRhQPVk9cNr0hE0XWhPYFq+stmfAb7oeydzVACwVGLc=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AABzkUgISeKGgXAzgtutgJsZc0-kkeqBBscJgMkvy";
|
||||
path = fetchZigArtifact {
|
||||
name = "glslang";
|
||||
url = "https://deps.files.ghostty.org/glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz";
|
||||
hash = "sha256-FKLtu1Ccs+UamlPj9eQ12/WXFgS0uDPmPmB26MCpl7U=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "gobject-0.3.0-Skun7ANLnwDvEfIpVmohcppXgOvg_I6YOJFmPIsKfXk-";
|
||||
path = fetchZigArtifact {
|
||||
name = "gobject";
|
||||
url = "https://deps.files.ghostty.org/gobject-2025-11-08-23-1.tar.zst";
|
||||
hash = "sha256-OxS9/XC5aMJj1KhOcFP1ZZN7PI4ADw4f7ocx6V64mOc=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AALiNBAA-_0gprYr92CjrMj1I5bqNu0TSJOnjFNSr";
|
||||
path = fetchZigArtifact {
|
||||
name = "gtk4_layer_shell";
|
||||
url = "https://deps.files.ghostty.org/gtk4-layer-shell-1.1.0.tar.gz";
|
||||
hash = "sha256-mChCgSYKXu9bT2OlXxbEv2p4ihAgptsDfssPcfozaYg=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAG02ugUcWec-Ndp-i7JTsJ0dgF8nnJRUInkGLG7G";
|
||||
path = fetchZigArtifact {
|
||||
name = "harfbuzz";
|
||||
url = "https://deps.files.ghostty.org/harfbuzz-11.0.0.tar.xz";
|
||||
hash = "sha256-8WNRuv4hRyX+LB1bWfDZPkmQWkskeJn7kNcM/5U6K5s=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAGmZhABbsPJLfbqrh6JTHsXhY6qCaLAQyx25e0XE";
|
||||
path = fetchZigArtifact {
|
||||
name = "highway";
|
||||
url = "https://deps.files.ghostty.org/highway-66486a10623fa0d72fe91260f96c892e41aceb06.tar.gz";
|
||||
hash = "sha256-h9T4iT704I8iSXNgj/6/lCaKgTgLp5wS6IQZaMgKohI=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAEbOfQBnvcFcCX2W5z7tDaN8vaNZGamEQtNOe0UI";
|
||||
path = fetchZigArtifact {
|
||||
name = "imgui";
|
||||
url = "https://github.com/ocornut/imgui/archive/refs/tags/v1.92.5-docking.tar.gz";
|
||||
hash = "sha256-yBbCDox18+Fa6Gc1DnmSVQLRpqhZOLsac7iSfl8x+cs=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAL6FAwBDPampKgDjoxlJYDIn2jv0VaINS4W6CXJN";
|
||||
path = fetchZigArtifact {
|
||||
name = "iterm2_themes";
|
||||
url = "https://deps.files.ghostty.org/ghostty-themes-release-20260323-152405-a2c7b60.tgz";
|
||||
hash = "sha256-fWgXdUXh2/dNZqERzEu9hz4xyy4nl+GUjLMpUMrsRnA=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAIC5lwAVPJJzxnCAahSvZTIlG-HhtOvnM1uh-66x";
|
||||
path = fetchZigArtifact {
|
||||
name = "jetbrains_mono";
|
||||
url = "https://deps.files.ghostty.org/JetBrainsMono-2.304.tar.gz";
|
||||
hash = "sha256-xXppHouCrQmLWWPzlZAy5AOPORCHr3cViFulkEYQXMQ=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAJrvXQCqAT8Mg9o_tk6m0yf5Fz-gCNEOKLyTSerD";
|
||||
path = fetchZigArtifact {
|
||||
name = "libpng";
|
||||
url = "https://deps.files.ghostty.org/libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz";
|
||||
hash = "sha256-/syVtGzwXo4/yKQUdQ4LparQDYnp/fF16U/wQcrxoDo=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "libxev-0.0.0-86vtc4IcEwCqEYxEYoN_3KXmc6A9VLcm22aVImfvecYs";
|
||||
path = fetchZigArtifact {
|
||||
name = "libxev";
|
||||
url = "https://deps.files.ghostty.org/libxev-34fa50878aec6e5fa8f532867001ab3c36fae23e.tar.gz";
|
||||
hash = "sha256-1B9oJExVyOWRj+Y9d9eHkOBTlOYuEkcwGBUKdlgRhkg=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAG3RoQEyRC2Vw7Qoro5SYBf62IHn3HjqtNVY6aWK";
|
||||
path = fetchZigArtifact {
|
||||
name = "libxml2";
|
||||
url = "https://deps.files.ghostty.org/libxml2-2.11.5.tar.gz";
|
||||
hash = "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO26s";
|
||||
path = fetchZigArtifact {
|
||||
name = "nerd_fonts_symbols_only";
|
||||
url = "https://deps.files.ghostty.org/NerdFontsSymbolsOnly-3.4.0.tar.gz";
|
||||
hash = "sha256-EWTRuVbUveJI17LwmYxDzJT1ICQxoVZKeTiVsec7DQQ=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAHjwMQDBXnLq3Q2QhaivE0kE2aD138vtX2Bq1g7c";
|
||||
path = fetchZigArtifact {
|
||||
name = "oniguruma";
|
||||
url = "https://deps.files.ghostty.org/oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz";
|
||||
hash = "sha256-ABqhIC54RI9MC/GkjHblVodrNvFtks4yB+zP1h2Z8qA=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AADYiAAB_80AWnH1AxXC0tql9thT-R-DYO1gBqTLc";
|
||||
path = fetchZigArtifact {
|
||||
name = "pixels";
|
||||
url = "https://deps.files.ghostty.org/pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz";
|
||||
hash = "sha256-Veg7FtCRCCUCvxSb9FfzH0IJLFmCZQ4/+657SIcb8Ro=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAKYZBAB-CFHBKs3u4JkeiT4BMvyHu3Y5aaWF3Bbs";
|
||||
path = fetchZigArtifact {
|
||||
name = "plasma_wayland_protocols";
|
||||
url = "https://deps.files.ghostty.org/plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz";
|
||||
hash = "sha256-XFi6IUrNjmvKNCbcCLAixGqN2Zeymhs+KLrfccIN9EE=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAPlZGwBEa-gxrcypGBZ2R8Bse4JYSfo_ul8i2jlG";
|
||||
path = fetchZigArtifact {
|
||||
name = "sentry";
|
||||
url = "https://deps.files.ghostty.org/sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz";
|
||||
hash = "sha256-KsZJfMjWGo0xCT5HrduMmyxFsWsHBbszSoNbZCPDGN8=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AANb6pwD7O1WG6L5nvD_rNMvnSc9Cpg1ijSlTYywv";
|
||||
path = fetchZigArtifact {
|
||||
name = "spirv_cross";
|
||||
url = "https://deps.files.ghostty.org/spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz";
|
||||
hash = "sha256-tStvz8Ref6abHwahNiwVVHNETizAmZVVaxVsU7pmV+M=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "uucode-0.1.0-ZZjBPj96QADXyt5sqwBJUnhaDYs_qBeeKijZvlRa0eqM";
|
||||
path = fetchZigArtifact {
|
||||
name = "uucode";
|
||||
url = "git+https://github.com/jacobsandlund/uucode#5f05f8f83a75caea201f12cc8ea32a2d82ea9732";
|
||||
hash = "sha256-sHPh+TQSdUGus/QTbj7KSJJkTuNTrK4VNmQDjS30Lf8=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9";
|
||||
path = fetchZigArtifact {
|
||||
name = "uucode";
|
||||
url = "https://deps.files.ghostty.org/uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9.tar.gz";
|
||||
hash = "sha256-jLrhrmCXQ1T+LQP1JTBBB3Jn+1hCZfODbC4SdlfNdKg=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "vaxis-0.5.1-BWNV_LosCQAGmCCNOLljCIw6j6-yt53tji6n6rwJ2BhS";
|
||||
path = fetchZigArtifact {
|
||||
name = "vaxis";
|
||||
url = "https://deps.files.ghostty.org/vaxis-7dbb9fd3122e4ffad262dd7c151d80d863b68558.tar.gz";
|
||||
hash = "sha256-zTyrZrIffM+GJIt973tKDeWHmOCwbn7KLDdQxSiK00Y=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAKrHGAAs2shYq8UkE6bGcR1QJtLTyOE_lcosMn6t";
|
||||
path = fetchZigArtifact {
|
||||
name = "wayland";
|
||||
url = "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz";
|
||||
hash = "sha256-6kGR1o5DdnflHzqs3ieCmBAUTpMdOXoyfcYDXiw5xQ0=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S";
|
||||
path = fetchZigArtifact {
|
||||
name = "wayland_protocols";
|
||||
url = "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz";
|
||||
hash = "sha256-XO3K3egbdeYPI+XoO13SuOtO+5+Peb16NH0UiusFMPg=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA";
|
||||
path = fetchZigArtifact {
|
||||
name = "wayland_protocols";
|
||||
url = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/1.47/wayland-protocols-1.47.tar.gz";
|
||||
hash = "sha256-3S3xSrX0EDgleq7cxLX7msDuAY8/D5SvkJcCjmDTMiM=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAAzZywE3s51XfsLbP9eyEw57ae9swYB9aGB6fCMs";
|
||||
path = fetchZigArtifact {
|
||||
name = "wuffs";
|
||||
url = "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz";
|
||||
hash = "sha256-nkzSCr6W5sTG7enDBXEIhgEm574uLD41UVR2wlC+HBM=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ";
|
||||
path = fetchZigArtifact {
|
||||
name = "z2d";
|
||||
url = "https://deps.files.ghostty.org/z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ.tar.gz";
|
||||
hash = "sha256-qD+XexnAjSanRAwr5ZIaPY1aQhNW5DFVJ4PYLwhIr2E=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zf-0.10.3-OIRy8RuJAACKA3Lohoumrt85nRbHwbpMcUaLES8vxDnh";
|
||||
path = fetchZigArtifact {
|
||||
name = "zf";
|
||||
url = "https://deps.files.ghostty.org/zf-3c52637b7e937c5ae61fd679717da3e276765b23.tar.gz";
|
||||
hash = "sha256-BfAZILill3I/nBf1oWwol77N34Jcpm4hudC+XSeMgZY=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zig_js-0.0.0-rjCAV-6GAADxFug7rDmPH-uM_XcnJ5NmuAMJCAscMjhi";
|
||||
path = fetchZigArtifact {
|
||||
name = "zig_js";
|
||||
url = "https://deps.files.ghostty.org/zig_js-04db83c617da1956ac5adc1cb9ba1e434c1cb6fd.tar.gz";
|
||||
hash = "sha256-r6GdXwrv+jTu0AkTlyN/FuO+N4X+l20gsbS59wrE7V4=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zig_objc-0.0.0-Ir_Sp5gTAQCvxxR7oVIrPXxXwsfKgVP7_wqoOQrZjFeK";
|
||||
path = fetchZigArtifact {
|
||||
name = "zig_objc";
|
||||
url = "https://deps.files.ghostty.org/zig_objc-f356ed02833f0f1b8e84d50bed9e807bf7cdc0ae.tar.gz";
|
||||
hash = "sha256-jWFQ5BrV880qqa9KypltWuRLqNSh21rDxt6Jxp0EoMM=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "wayland-0.5.0-dev-lQa1khrMAQDJDwYFKpdH3HizherB7sHo5dKMECfvxQHe";
|
||||
path = fetchZigArtifact {
|
||||
name = "zig_wayland";
|
||||
url = "https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e8ea.tar.gz";
|
||||
hash = "sha256-1wRkixysjdFMyrATxlXdukAc34MwfNj0B6ydYVn+UKw=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "zigimg-0.1.0-8_eo2vHnEwCIVW34Q14Ec-xUlzIoVg86-7FU2ypPtxms";
|
||||
path = fetchZigArtifact {
|
||||
name = "zigimg";
|
||||
url = "https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz";
|
||||
hash = "sha256-vkcTloGX+vRw7e6GYJLO9eocYaEOYjXYE0dT7jscZ4A=";
|
||||
unpack = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o";
|
||||
path = fetchZigArtifact {
|
||||
name = "zlib";
|
||||
url = "https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz";
|
||||
hash = "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw=";
|
||||
unpack = false;
|
||||
};
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,107 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
cctools,
|
||||
fetchFromGitHub,
|
||||
fixDarwinDylibNames,
|
||||
gitMinimal,
|
||||
ncurses,
|
||||
pkg-config,
|
||||
runCommand,
|
||||
xcbuild,
|
||||
zig_0_15,
|
||||
|
||||
optimize ? "ReleaseFast",
|
||||
simd ? true,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libghostty-vt";
|
||||
version = "0.1.0-unstable-2026-05-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostty-org";
|
||||
repo = "ghostty";
|
||||
rev = "1547dd667ab6d1f4ebcdc7282adc54c95752ee67";
|
||||
hash = "sha256-dZFc+8az7BUIs8+v45XqNnY5G6oXEwVfVVHZQuATSGQ=";
|
||||
};
|
||||
|
||||
# Zig's build runner computes relative paths from `cwd` to the build directory.
|
||||
# The logic is purely lexical, so if the `cwd` is a symlink that resolves to a
|
||||
# different depth during `chdir`, the computed path becomes incorrect.
|
||||
# See: https://codeberg.org/ziglang/zig/issues/32121
|
||||
# Workaround: override `linkFarm` with a copy-farm so deps are real directories.
|
||||
deps = callPackage ./deps.nix {
|
||||
name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
|
||||
linkFarm =
|
||||
name: entries:
|
||||
runCommand name { } ''
|
||||
mkdir -p $out
|
||||
${lib.concatMapStringsSep "\n" (e: ''
|
||||
cp -rL ${e.path} $out/${e.name}
|
||||
'') entries}
|
||||
'';
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gitMinimal
|
||||
ncurses
|
||||
pkg-config
|
||||
zig_0_15
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
cctools
|
||||
fixDarwinDylibNames
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
dontSetZigDefaultFlags = true;
|
||||
|
||||
zigBuildFlags = [
|
||||
"--system"
|
||||
"${finalAttrs.deps}"
|
||||
"-Dlib-version-string=${finalAttrs.version}"
|
||||
"-Dcpu=baseline"
|
||||
"-Doptimize=${optimize}"
|
||||
"-Dapp-runtime=none"
|
||||
"-Demit-lib-vt=true"
|
||||
"-Dsimd=${lib.boolToString simd}"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-Demit-xcframework=false"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$dev/lib"
|
||||
mv "$out/lib/libghostty-vt.a" "$dev/lib/"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace "$dev/share/pkgconfig/libghostty-vt-static.pc" \
|
||||
--replace-fail "$out" "$dev"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Ghostty's VT (terminal sequence) parsing library";
|
||||
homepage = "https://ghostty.org/";
|
||||
license = lib.licenses.mit;
|
||||
pkgConfigModules = [
|
||||
"libghostty-vt"
|
||||
"libghostty-vt-static"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ domenkozar ];
|
||||
platforms = zig_0_15.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "librime-lua";
|
||||
version = "0-unstable-2026-04-26";
|
||||
version = "0-unstable-2026-05-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hchunhui";
|
||||
repo = "librime-lua";
|
||||
rev = "ef17b1f5e0c3f430d6039309d8ebd27bb26bc671";
|
||||
hash = "sha256-kuNvJUiAlt+78U5ZqRbets2M/mrsVaECYxVFZRW/R40=";
|
||||
rev = "ec52e48ea18f11af37717a01c337f853215cf70b";
|
||||
hash = "sha256-ipqsYAqlt29dZlgynziCC4rHFDbXsD64KPkhXQiz8/w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "little_boxes";
|
||||
version = "1.10.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giodamelio";
|
||||
repo = "little_boxes";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Quh09K5meiA39ih/orJWF2WfkuZdymxub1dZvns/q3E=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ejFo+BYoXf889G/iLuKITwY3ephkEMS6nLtfi3PozHQ=";
|
||||
};
|
||||
|
||||
cargoVendorDir = "vendor";
|
||||
@@ -29,6 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
installShellCompletion --bash $extrasPath/little_boxes.bash
|
||||
installShellCompletion --fish $extrasPath/little_boxes.fish
|
||||
installShellCompletion --zsh $extrasPath/_little_boxes
|
||||
installShellCompletion --nushell $extrasPath/little_boxes.nu
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "loadwatch";
|
||||
version = "1.1-4-g868bd29";
|
||||
version = "1.1-unstable-2026-05-04";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~woffs";
|
||||
repo = "loadwatch";
|
||||
hash = "sha256-/4kfGdpYJWQyb7mRaVUpyQQC5VP96bDsBDfM3XhcJXw=";
|
||||
rev = finalAttrs.version;
|
||||
rev = "f79b9cfad44a9f24aaab69cfad85a9ea14252b79";
|
||||
hash = "sha256-CNf3NpTbTfFQDg0G/I7ydH7ML4YNd8TlvPv8+RVa/sI=";
|
||||
};
|
||||
|
||||
makeFlags = [ "bindir=$(out)/bin" ];
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
godot3-headless,
|
||||
godot3-export-templates,
|
||||
libglvnd,
|
||||
godot_4_6,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxext,
|
||||
@@ -18,19 +18,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "material-maker";
|
||||
version = "1.3";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RodZill4";
|
||||
repo = "material-maker";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-vyagu7xL4ITt+xyoYyCcF8qq6L9sR6Ltdl6NwfrbZdA=";
|
||||
hash = "sha256-jSbauK9eXoTW2xjZsipWcPs/8qmK8ztmT+doCgu8zrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ godot3-headless ];
|
||||
nativeBuildInputs = [ godot_4_6 ];
|
||||
|
||||
buildInputs = [
|
||||
libglvnd
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
|
||||
libxinerama
|
||||
libxcursor
|
||||
@@ -46,19 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$TMPDIR
|
||||
|
||||
# Link the export-templates to the expected location. The --export commands
|
||||
# expects the template-file at .../templates/{godot-version}.stable/linux_x11_64_release
|
||||
mkdir -p $HOME/.local/share/godot
|
||||
ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot
|
||||
|
||||
# Don't use the included export template, which might use a mismatched version of godot.
|
||||
rm ./material_maker/misc/linux/godot.x11.opt.64
|
||||
substituteInPlace ./export_presets.cfg \
|
||||
--replace-fail '"material_maker/misc/linux/godot.x11.opt.64"' '""'
|
||||
mkdir -p "$HOME/.local/share/godot"
|
||||
ln -s "${godot_4_6.export-templates-bin}/share/godot/export_templates" "$HOME/.local/share/godot/export_templates"
|
||||
|
||||
mkdir -vp build
|
||||
godot3-headless -v --export 'Linux/X11' build/material-maker
|
||||
godot4 -v --headless --export-release 'Linux/X11' build/material-maker
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@@ -17,6 +17,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
# __cpuid is safe in newer Rust; suppress lint until upstream fixes it
|
||||
env.RUSTFLAGS = "-A unused-unsafe";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
diff --git a/tools/cli/main.js b/tools/cli/main.js
|
||||
index 84f94bc..4fbda17 100644
|
||||
index 03a9633..86f37ec 100644
|
||||
--- a/tools/cli/main.js
|
||||
+++ b/tools/cli/main.js
|
||||
@@ -554,6 +554,44 @@
|
||||
}).await());
|
||||
} // Now exec; we're not coming back.
|
||||
@@ -530,6 +530,45 @@ var oldSpringboard = async function (toolsVersion) {
|
||||
// process, so that the springboarded process can reestablish it.
|
||||
await catalog.official.closePermanently();
|
||||
|
||||
+ // BEGIN HACK
|
||||
+ // patch shebang:
|
||||
@@ -44,13 +44,7 @@ index 84f94bc..4fbda17 100644
|
||||
+ patchelf("mongodb", "bin", "mongo");
|
||||
+ patchelf("mongodb", "bin", "mongod");
|
||||
+ // END HACK
|
||||
|
||||
require('kexec')(executable, newArgv);
|
||||
|
||||
@@ -1485,4 +1523,4 @@
|
||||
|
||||
process.exit(ret);
|
||||
}).run();
|
||||
-//# sourceMappingURL=main.js.map
|
||||
\ No newline at end of file
|
||||
+//# sourceMappingURL=main.js.map
|
||||
+
|
||||
// Now exec; we're not coming back.
|
||||
require('kexec')(cmd, newArgv);
|
||||
throw Error('exec failed?');
|
||||
@@ -5,23 +5,28 @@
|
||||
zlib,
|
||||
curl,
|
||||
xz,
|
||||
openssl,
|
||||
patchelf,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.7.3";
|
||||
version = "3.4";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
|
||||
sha256 = "sha256-ovsE7jUJIKf96WEoITXECUlPo+o1tEKvHzCc7Xgj614=";
|
||||
url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
|
||||
hash = "sha256-tzzRN9UAH7+BM3fs76U5H20vD0LGMpdrMDDiJtchgEg=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz";
|
||||
sha256 = "11206dbda50a680fdab7044def7ea68ea8f4a9bca948ca56df91fe1392b2ac16";
|
||||
url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz";
|
||||
hash = "sha256-Z9Had9hscEjxHch19KCYUTqN4OikYLfz1tqEpyxw2Y8=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.arm64.tar.gz";
|
||||
hash = "sha256-AT7njZTgf/WTHlvLEbF3dXKNoqyqHy8KloBQ4gsbPuM=";
|
||||
};
|
||||
};
|
||||
in
|
||||
@@ -67,23 +72,27 @@ stdenv.mkDerivation {
|
||||
chmod +x $out/bin/meteor
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
postFixup = ''
|
||||
# Remove dangling symlinks
|
||||
find $out -xtype l -ls -exec rm {} \;
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# Patch Meteor to dynamically fixup shebangs and ELF metadata where
|
||||
# necessary.
|
||||
pushd $out
|
||||
patch -p1 < ${./main.patch}
|
||||
popd
|
||||
substituteInPlace $out/tools/cli/main.js \
|
||||
--replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--replace "@RPATH@" "${
|
||||
--replace-fail "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--replace-fail "@RPATH@" "${
|
||||
lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
zlib
|
||||
curl
|
||||
stdenv.cc.cc
|
||||
xz
|
||||
zlib
|
||||
]
|
||||
}" \
|
||||
--replace "@PATCHELF@" "${patchelf}/bin/patchelf"
|
||||
--replace-fail "@PATCHELF@" "${patchelf}/bin/patchelf"
|
||||
|
||||
# Patch node.
|
||||
patchelf \
|
||||
@@ -92,15 +101,16 @@ stdenv.mkDerivation {
|
||||
$out/dev_bundle/bin/node
|
||||
|
||||
# Patch mongo.
|
||||
for p in $out/dev_bundle/mongodb/bin/mongo{,d}; do
|
||||
for p in $out/dev_bundle/mongodb/bin/mongo{d,s}; do
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "$(patchelf --print-rpath $p):${
|
||||
lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
zlib
|
||||
curl
|
||||
openssl
|
||||
stdenv.cc.cc
|
||||
xz
|
||||
zlib
|
||||
]
|
||||
}" \
|
||||
$p
|
||||
@@ -114,13 +124,15 @@ stdenv.mkDerivation {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Complete open source platform for building web and mobile apps in pure JavaScript";
|
||||
homepage = "https://www.meteor.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = builtins.attrNames srcs;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
mainProgram = "meteor";
|
||||
};
|
||||
}
|
||||
|
||||
Executable
+20
@@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash common-updater-scripts curl nix-update
|
||||
|
||||
releaseInfo=$(curl https://install.meteor.com)
|
||||
latestVersion=$(grep <<<"$releaseInfo" -oP 'RELEASE="\K[^"]+')
|
||||
currentVersion=$(nix eval --raw -f . meteor.version)
|
||||
|
||||
echo "latest version: $latestVersion"
|
||||
echo "current version: $currentVersion"
|
||||
|
||||
if [[ "$latestVersion" == "$currentVersion" ]]; then
|
||||
echo "package is up-to-date"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
systems=$(nix eval --json -f . meteor.meta.platforms | jq --raw-output '.[]')
|
||||
for system in $systems; do
|
||||
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . meteor.src.url --system "$system")))
|
||||
update-source-version meteor $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash
|
||||
done
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "mew";
|
||||
version = "1.0-unstable-2025-06-20";
|
||||
version = "1.0-unstable-2026-03-18";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "sewn";
|
||||
repo = "mew";
|
||||
rev = "af6440da8fe6683cf0b873e0a98c293bf02c3447";
|
||||
hash = "sha256-NbpYITHO81fnaDY0dtolaUBdRqQNKwHQz/lBQMOHM5c=";
|
||||
rev = "98dea211e634ccc2f75b4dae09fc2705666c6322";
|
||||
hash = "sha256-u0TBWPBOdXNYwuwn9U1xqJsUShyOz9MIP1CNozcxbzg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -41,6 +41,8 @@ stdenv.mkDerivation {
|
||||
makeFlags = [
|
||||
# The PREFIX var is hardcoded in the makefile.
|
||||
"PREFIX=$(out)"
|
||||
# Disables the incompatible-pointer-types build check.
|
||||
"CFLAGS=-Wno-error=incompatible-pointer-types"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -7,23 +7,25 @@
|
||||
libhangul,
|
||||
autoconf,
|
||||
automake,
|
||||
gettext,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nabi";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libhangul";
|
||||
repo = "nabi";
|
||||
tag = "nabi-${finalAttrs.version}";
|
||||
hash = "sha256-C6K8sXVCGf45VZtGSCB5emFzZPV21kG9JxAwBHRiFsY=";
|
||||
hash = "sha256-U3W8G7cJ+lIqso6gSixmenX1cWnKuJO6dumUz4SUWi0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoconf
|
||||
automake
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -33,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./autogen.sh
|
||||
substituteInPlace ./autogen.sh --replace-fail "autopoint" "autopoint --force"
|
||||
substituteInPlace ./autogen.sh --replace-fail "aclocal" "aclocal -I m4"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nats-server";
|
||||
version = "2.12.7";
|
||||
version = "2.12.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats-server";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7fv0Zd48eVA9zwAVG2SLs3a/9r7983PgZpUzh1GuSUw=";
|
||||
hash = "sha256-iJMF6OyfukTYOwET+wxFpJZ8R0b7/JMEZns5dAkx5DE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3+FAZSymDO1iTAWcgjrczE43Fgz6EEwLgOBEbDH4OyY=";
|
||||
vendorHash = "sha256-4idiVBtE+e2jf9uS3at+5+C3dnLxjtsLJIBC8zye5Pg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
fetchpatch2,
|
||||
plugins ? _ps: [ ],
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
@@ -16,18 +17,24 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "netbox";
|
||||
version = "4.5.7";
|
||||
version = "4.5.9";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = "netbox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8oOlDtTVeKDlaWt3JDy9wc1oUTTJPSoHd5O3YxbE50g=";
|
||||
hash = "sha256-S8/2ZLYhYKBEpz3EGTyQPAPexX4se3MnmaH5aStVEj0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./custom-static-root.patch
|
||||
# TODO: check if change is applied upstream before upgrading to NetBox v4.6
|
||||
(fetchpatch2 {
|
||||
name = "upgrade-django-tables2-v3.0.patch";
|
||||
url = "https://github.com/netbox-community/netbox/commit/d57346d9f0eef8126eafcd5033ea43864faeaf0d.patch";
|
||||
hash = "sha256-6/wdd8wDVT4eqDKMNx8tmoPTDvw8OE7atf9nzg3LZzk=";
|
||||
})
|
||||
];
|
||||
|
||||
dependencies =
|
||||
|
||||
@@ -1,32 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
catch2_3,
|
||||
cmake,
|
||||
ctestCheckHook,
|
||||
libpng,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "niftyreg";
|
||||
version = "1.3.9";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/niftyreg/nifty_reg-${finalAttrs.version}/nifty_reg-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "07v9v9s41lvw72wpb1jgh2nzanyc994779bd35p76vg8mzifmprl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "KCL-BMEIS";
|
||||
repo = "niftyreg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BtAbcxqvZ5Kt2UMqtnx0aQg73ligQNTktKZjoa+GXvk=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=narrowing" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
--replace-fail 'message(FATAL_ERROR "Git not found. Please install Git to get the version information.")' 'set(''${PROJECT_NAME}_VERSION ${finalAttrs.src.tag})'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ctestCheckHook
|
||||
catch2_3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpng
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DBUILD_TESTING=ON" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# fails due to very slight numerical tolerance issue
|
||||
ctestFlags = [ "--exclude-regex=Regression Deformation Field" ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg";
|
||||
homepage = "https://github.com/KCL-BMEIS/niftyreg";
|
||||
description = "Medical image registration software";
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@@ -8,16 +8,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nnd";
|
||||
version = "0.72";
|
||||
version = "0.73";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "al13n321";
|
||||
repo = "nnd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uwe/GZ9fox9ovazYBZZjedzGEpm5cmWreBdgpBv61uY=";
|
||||
hash = "sha256-2I4Ph5xCf6XN335+LPWo+yN2VWAOVBoMmzx3OrhynJA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QPjvCIl3CNAq+rBV8mQWY+wCmRONs2VICTMBWdNZ8pQ=";
|
||||
cargoHash = "sha256-w66JNHz6TJO1Fem4JrqlnBXX4yJC70I/OLjvICVdhMQ=";
|
||||
|
||||
meta = {
|
||||
description = "Debugger for Linux";
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.14.31";
|
||||
version = "1.14.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VHznPS2OuJ8urQqGK3K0ysQLCk+O8JV7/UCDdFyqafQ=";
|
||||
hash = "sha256-i2Ct4QC0Tf+UWNWAQoW/IPtRKrVyZSC1/FTzQNpou2g=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-f/cWCr6Oqnq21u9+UyhwE5PGqE9X5K+NtjEGbZ4ORPg=";
|
||||
outputHash = "sha256-JwkXBlXS4AG0rquzdOSE5Atzm0Hm9UVEBmDMAnTlbyg=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opl3bankeditor";
|
||||
version = "1.5.1-unstable-2026-01-03";
|
||||
version = "1.5.1-unstable-2026-05-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wohlstand";
|
||||
repo = "opl3bankeditor";
|
||||
rev = "9d0084cc7073ca911446257c7b937901267c3243";
|
||||
rev = "0155632a595897cb679c9f9c8575cee3eff2123d";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-wUHpXZ0McL6WLqogXaA+HtVpKxC/Dc5Ji4PnjCksoGE=";
|
||||
hash = "sha256-OEcfqvvEACo270kNfli/mdf/JO45XOp9QXOmKQQTpos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "owmods-cli";
|
||||
version = "0.15.4";
|
||||
version = "0.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ow-mods";
|
||||
repo = "ow-mod-man";
|
||||
rev = "cli_v${finalAttrs.version}";
|
||||
hash = "sha256-Tu7+H8RCUxKqCtdkPDzEUnK2VUq+80R+kumHRJqf7RY=";
|
||||
hash = "sha256-8ZHLb57/gC03+rWe8mHcBS0nJVNjjRMtLADwGcSZ0CI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/id7DC3W22musOI4r4b0RPqSnIQVn1yHYLZcTilShVk=";
|
||||
cargoHash = "sha256-WxfbkfOXU1NgUYagsDu3ri26k+XytG7Vy8+ofuQEwjE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/spidermonkey/js/src/jsapi.c
|
||||
+++ b/src/spidermonkey/js/src/jsapi.c
|
||||
@@ -93,7 +93,7 @@
|
||||
#ifdef HAVE_VA_LIST_AS_ARRAY
|
||||
#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(ap))
|
||||
#else
|
||||
-#define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
|
||||
+#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(&(ap)))
|
||||
#endif
|
||||
|
||||
#if defined(JS_PARANOID_REQUEST) && defined(JS_THREADSAFE)
|
||||
@@ -2,29 +2,24 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pacparser";
|
||||
version = "1.4.6";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manugarg";
|
||||
repo = "pacparser";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rHRW/zzQS2vV+rQeZBQNSp2id0Gir1yFPwN2OPMOvVo=";
|
||||
hash = "sha256-CkaRgm5xZHKiewPDSp0bzVkgAOeTbuGrY3FM4HaN97I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# jsapi.c:96:35: error: passing argument 5 of 'TryArgumentFormatter' from incompatible pointer type []
|
||||
# 96 | #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
|
||||
# suggested by https://github.com/manugarg/pacparser/issues/194#issuecomment-2262030966
|
||||
./fix-invalid-pointer-type.patch
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"NO_INTERNET=1"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"VERSION=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -36,6 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "-v";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Library to parse proxy auto-config (PAC) files";
|
||||
homepage = "https://pacparser.manugarg.com/";
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/mcmctree.c
|
||||
+++ b/src/mcmctree.c
|
||||
@@ -42,7 +42,7 @@ extern double PjumpOptimum;
|
||||
|
||||
int GetOptions(char *ctlf);
|
||||
int ReadTreeSeqs(FILE*fout);
|
||||
-int ProcessNodeAnnotation();
|
||||
+int ProcessNodeAnnotation(int* haslabel);
|
||||
int ReadBlengthGH(char infile[]);
|
||||
int GenerateBlengthGH(char infile[]);
|
||||
int GetMem(void);
|
||||
@@ -15,6 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/abacus-gene/paml/pull/78
|
||||
./fix-ProcessNodeAnnotation-declaration.patch
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_POSIX_C_SOURCE";
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -11,22 +11,23 @@
|
||||
gtk3,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "picocrypt-ng";
|
||||
version = "2.00";
|
||||
version = "2.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Picocrypt-NG";
|
||||
repo = "Picocrypt-NG";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+Ecvy4h0aC9Gra9BcN8L/vgpnflq6W7KcnYCVr8uaQQ=";
|
||||
hash = "sha256-dXIJTpoupfmHtxhnqroQaxrcTsW07G4zxSib1vs1DaA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
vendorHash = "sha256-0fEy/YuZa7dENfL3y+NN4SLWYwOLmXqHHJEiU37AkX4=";
|
||||
vendorHash = "sha256-qluJIsd7g2UNYQwsDW7ugVzh5Z0xJkHe6OlMt04d/cc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -46,12 +47,13 @@ buildGoModule (finalAttrs: {
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/Picocrypt $out/bin/picocrypt-ng-gui
|
||||
mv $out/bin/picocrypt $out/bin/picocrypt-ng-gui
|
||||
install -Dm644 $src/images/key.svg $out/share/icons/hicolor/scalable/apps/picocrypt-ng.svg
|
||||
'';
|
||||
|
||||
@@ -71,7 +73,7 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/Picocrypt-NG/Picocrypt-NG";
|
||||
changelog = "https://github.com/Picocrypt-NG/Picocrypt-NG/blob/${finalAttrs.version}/Changelog.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
mainProgram = "picocrypt-ng-gui";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"canvas_danmaku": "sha256-XbOYi66WU6hV6Q2FnMC8HxFcY1MxAhyyJr4K+gCPEX4=",
|
||||
"chat_bottom_container": "sha256-+R1MiDMO4onCMXiJ7MJtJVAwyEJcikTyONwp+HibqA0=",
|
||||
"desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
|
||||
"extended_nested_scroll_view": "sha256-ocjIy7gpCikoqRMqY4oGw/p9YaQ2v2clhon2pIzTXk4=",
|
||||
"file_picker": "sha256-4zwyrsyXb6KnCzSRGBLgypH79ifKVji8Y8lIb5AIc58=",
|
||||
"floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=",
|
||||
"flutter_smart_dialog": "sha256-sehrQraEWmYvUd9pdG4l3edbtR4yTcJOqPbuhzIrih4=",
|
||||
"flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=",
|
||||
"get": "sha256-U9uuJigocRBO1V1bonvoe7rtBRUyY187tf984a3GZ1I=",
|
||||
"get": "sha256-zQ2m29nKCEjGvresMaDBo1oYfQ6WrFVbMSitcGmxyhU=",
|
||||
"material_design_icons_flutter": "sha256-KMwjnzJJj8nemCqUCSwYafPOwTYbtoHNenxstocJtz4=",
|
||||
"media_kit": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_libs_android_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_libs_ios_video": "sha256-mB3GN5Sc4oxUaW7xOgORaRzP9hKcRpcPxhmraKs/AMg=",
|
||||
"media_kit_libs_macos_video": "sha256-mB3GN5Sc4oxUaW7xOgORaRzP9hKcRpcPxhmraKs/AMg=",
|
||||
"media_kit_libs_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_libs_windows_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_native_event_loop": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"native_device_orientation": "sha256-uJ/sGUeEDv+3PTfMBCiNsE3WlkUiNwtwjJREUZTv94I=",
|
||||
"native_device_orientation": "sha256-MCgN6HXCeONLrDAOt27Ve8kUvIrOfFRbfJtX8p92Txk=",
|
||||
"super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=",
|
||||
"webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=",
|
||||
"window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo="
|
||||
|
||||
@@ -8,12 +8,13 @@
|
||||
mpv-unwrapped,
|
||||
libplacebo,
|
||||
libappindicator,
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
let
|
||||
srcInfo = lib.importJSON ./src-info.json;
|
||||
description = "Third-party Bilibili client developed in Flutter";
|
||||
version = "2.0.4";
|
||||
version = "2.0.6";
|
||||
in
|
||||
flutter341.buildFlutterApplication {
|
||||
pname = "piliplus";
|
||||
@@ -37,6 +38,7 @@ flutter341.buildFlutterApplication {
|
||||
mpv-unwrapped
|
||||
libplacebo
|
||||
libappindicator
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
# See lib/scripts/build.sh.
|
||||
|
||||
@@ -194,11 +194,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build",
|
||||
"sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
|
||||
"sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.5"
|
||||
"version": "4.0.6"
|
||||
},
|
||||
"build_config": {
|
||||
"dependency": "transitive",
|
||||
@@ -224,11 +224,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build_runner",
|
||||
"sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
|
||||
"sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.13.1"
|
||||
"version": "2.15.0"
|
||||
},
|
||||
"built_collection": {
|
||||
"dependency": "transitive",
|
||||
@@ -362,16 +362,6 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"code_builder": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "code_builder",
|
||||
"sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.11.1"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -482,6 +472,17 @@
|
||||
"source": "hosted",
|
||||
"version": "0.7.12"
|
||||
},
|
||||
"desktop_webview_window": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "main",
|
||||
"resolved-ref": "b429f8ba6b8a99cd0f7eb5fe8d1621f325635c3d",
|
||||
"url": "https://github.com/Predidit/linux_webview_window"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "0.2.4"
|
||||
},
|
||||
"device_info_plus": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -986,7 +987,7 @@
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "version_4.7.2",
|
||||
"resolved-ref": "81b8a71982f89b46fa868b315cd71ff6a6ddf895",
|
||||
"resolved-ref": "388fcb22ef24ac0a693949148d29fa6b4922159f",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/getx.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1046,11 +1047,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "hooks",
|
||||
"sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
|
||||
"sha256": "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.2"
|
||||
"version": "1.0.3"
|
||||
},
|
||||
"html": {
|
||||
"dependency": "direct main",
|
||||
@@ -1116,11 +1117,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "image_cropper",
|
||||
"sha256": "e2c8da14ecb4c6ead02b8e1265f966ce72b43ff930da66eef3833e622185dec7",
|
||||
"sha256": "95782c9068ff09b95a5ece6a2b5fb31b18d8e544d79ebfa7bdafc08df39b3440",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "12.2.0"
|
||||
"version": "12.2.1"
|
||||
},
|
||||
"image_cropper_for_web": {
|
||||
"dependency": "transitive",
|
||||
@@ -1146,21 +1147,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "image_picker",
|
||||
"sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320",
|
||||
"sha256": "91c025426c2881c551100bce834e201c835a170151545f58d17da5180ca7d9ac",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"image_picker_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "image_picker_android",
|
||||
"sha256": "66810af8e99b2657ee98e5c6f02064f69bb63f7a70e343937f70946c5f8c6622",
|
||||
"sha256": "d5b3e1774af29c9ab00103afb0d4614070f924d2e0057ac867ec98800114793f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.8.13+16"
|
||||
"version": "0.8.13+17"
|
||||
},
|
||||
"image_picker_for_web": {
|
||||
"dependency": "transitive",
|
||||
@@ -1467,14 +1468,13 @@
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"media_kit_libs_macos_video": {
|
||||
"dependency": "direct overridden",
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"path": "libs/macos/media_kit_libs_macos_video",
|
||||
"ref": "dev",
|
||||
"resolved-ref": "547999bfb8b5cae9f9aca6125f46fd7cb500e994",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
|
||||
"name": "media_kit_libs_macos_video",
|
||||
"sha256": "f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "git",
|
||||
"source": "hosted",
|
||||
"version": "1.1.4"
|
||||
},
|
||||
"media_kit_libs_video": {
|
||||
@@ -1556,7 +1556,7 @@
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "master",
|
||||
"resolved-ref": "240534adb4b4b5c2c7e6c4578b1fc052ce98d7fd",
|
||||
"resolved-ref": "731bb77e39cca77065c86ece38902d35f5d653d2",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/flutter_native_device_orientation.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1872,6 +1872,16 @@
|
||||
"source": "hosted",
|
||||
"version": "0.0.3"
|
||||
},
|
||||
"record_use": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_use",
|
||||
"sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.0"
|
||||
},
|
||||
"rxdart": {
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
@@ -1976,11 +1986,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sentry",
|
||||
"sha256": "682360642a7b14b36daef3b5574b7269164e7763512ac92cdafd55b695bd2183",
|
||||
"sha256": "1f78300740739ff4b4920802687879231554350eab73eb229778f463aabda440",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.16.1"
|
||||
"version": "9.19.0"
|
||||
},
|
||||
"share_plus": {
|
||||
"dependency": "direct main",
|
||||
@@ -2122,11 +2132,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqflite",
|
||||
"sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
|
||||
"sha256": "564cfed0746fe53140c23b70b308e045c3b31f17778f2f326ccb7d804ea0250a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
"version": "2.4.2+1"
|
||||
},
|
||||
"sqflite_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -2142,11 +2152,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqflite_common",
|
||||
"sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
|
||||
"sha256": "5e8377564d95166761a968ed96104e0569b6b6cc611faac92a36ab8a169112c3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.5.6"
|
||||
"version": "2.5.6+1"
|
||||
},
|
||||
"sqflite_darwin": {
|
||||
"dependency": "transitive",
|
||||
@@ -2223,11 +2233,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "synchronized",
|
||||
"sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
|
||||
"sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.0"
|
||||
"version": "3.4.0+1"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
@@ -2393,11 +2403,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics",
|
||||
"sha256": "81da85e9ca8885ade47f9685b953cb098970d11be4821ac765580a6607ea4373",
|
||||
"sha256": "6409a25046024f0f8c5d8a59fec314081e81f9d436b66ca4015a8b49772bf445",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.21"
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"vector_graphics_codec": {
|
||||
"dependency": "transitive",
|
||||
@@ -2443,11 +2453,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
|
||||
"sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "15.0.2"
|
||||
"version": "15.2.0"
|
||||
},
|
||||
"wakelock_plus": {
|
||||
"dependency": "direct main",
|
||||
@@ -2463,11 +2473,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "wakelock_plus_platform_interface",
|
||||
"sha256": "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03",
|
||||
"sha256": "14b2e5b9e35c2631e656913c47adecdd71633ae92896a27a64c8f1fcfabc21cc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
"version": "1.5.0"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
@@ -2593,7 +2603,7 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.10.3 <4.0.0",
|
||||
"dart": ">=3.11.0 <4.0.0",
|
||||
"flutter": "3.41.6"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"rev": "0b4ed25891e9567c8e4d386ae72e39c677db2187",
|
||||
"revCount": 4848,
|
||||
"commitDate": 1776146399,
|
||||
"hash": "sha256-e/chUgvE7oJPdVZ4tmgIYxfLD2R2Fs57Uo2xmn4hNTk="
|
||||
"rev": "7b6d8bef994c5a50c2b476978e739dee651129df",
|
||||
"revCount": 4915,
|
||||
"commitDate": 1777542771,
|
||||
"hash": "sha256-jKF0FTTmq5xRB607iya3PtsgRFl73uXiuDA2oSGNbfs="
|
||||
}
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plus42";
|
||||
version = "1.3.14";
|
||||
version = "1.3.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://thomasokken.com/plus42/upstream/plus42-upstream-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-ndw4wI+o5eGfqOceSBGnpdQoel89MYxuv8G3CQRZ+6c=";
|
||||
hash = "sha256-qJteqxEDVdqgPdIQCOsNvdPS7S7pq/nVfavfXdOrnAQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pmbootstrap";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "postmarketOS";
|
||||
repo = "pmbootstrap";
|
||||
tag = version;
|
||||
hash = "sha256-d/yxnEDB50iM2HBxHS4IifNsW8pxYZHYXvi3eF8LvCI=";
|
||||
hash = "sha256-Dimr0Ye/u3Rbryu9cm0Qwhm1w7kgzgM5Jkcu+ffeRXU=";
|
||||
domain = "gitlab.postmarketos.org";
|
||||
};
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pocketbase";
|
||||
version = "0.37.4";
|
||||
version = "0.37.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = "pocketbase";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-d4JqA1iPPVA+wDS5Q3tJMUVnGvMFhK3JvuVLI7ZXvE0=";
|
||||
hash = "sha256-z5brZQEblcPkNNg6kNDw9C/3CwUCdMF/TPcOIFaPoKI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PB95KUhHzkTDJZPXI0dU7SsupTprVufxukQN2OSy7mQ=";
|
||||
vendorHash = "sha256-8YtDQLeStdUb6HXX/KEifDHiX//9cH7XCBu2LtHrCQM=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
diff --git a/standalone.c b/standalone.c
|
||||
index 216d937..2bce0e8 100644
|
||||
--- a/standalone.c
|
||||
+++ b/standalone.c
|
||||
@@ -108,7 +108,7 @@ int do_standalone(void)
|
||||
int main(void)
|
||||
#endif
|
||||
{
|
||||
- int true = 1;
|
||||
+ int opt = 1;
|
||||
int sock, new;
|
||||
struct sockaddr_in addr;
|
||||
socklen_t addrlen;
|
||||
@@ -123,7 +123,7 @@ int main(void)
|
||||
return log_error("socket");
|
||||
|
||||
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
|
||||
- (void *)&true, sizeof(true)))
|
||||
+ (void *)&opt, sizeof(opt)))
|
||||
return log_error("setsockopt");
|
||||
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
@@ -21,6 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./use-openssl.patch
|
||||
./use-glibc-crypt.patch
|
||||
./enable-standalone-mode.patch
|
||||
./fix-gcc15.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -0,0 +1,615 @@
|
||||
From 395bb10d470f1f225a8559cfc07e90c1d6b2a3a4 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Portnov <mrjarviscraft@gmail.com>
|
||||
Date: Fri, 24 Apr 2026 23:02:24 +0300
|
||||
Subject: [PATCH] fix: regenerate Cargo.lock
|
||||
|
||||
---
|
||||
Cargo.lock | 272 ++++++++++++++++++++++++++++++++++++++---------------
|
||||
1 file changed, 195 insertions(+), 77 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 3582359..8e2c3bd 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1,6 +1,6 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
-version = 3
|
||||
+version = 4
|
||||
|
||||
[[package]]
|
||||
name = "ab_glyph"
|
||||
@@ -100,14 +100,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "annotate-snippets"
|
||||
-version = "0.9.2"
|
||||
+version = "0.11.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
|
||||
+checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
|
||||
dependencies = [
|
||||
+ "anstyle",
|
||||
"unicode-width",
|
||||
- "yansi-term",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "anstyle"
|
||||
+version = "1.0.14"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
|
||||
+
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.68"
|
||||
@@ -127,7 +133,7 @@ dependencies = [
|
||||
"objc_id",
|
||||
"once_cell",
|
||||
"parking_lot",
|
||||
- "thiserror",
|
||||
+ "thiserror 1.0.38",
|
||||
"winapi",
|
||||
"x11rb",
|
||||
]
|
||||
@@ -181,23 +187,21 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
-version = "0.69.4"
|
||||
+version = "0.72.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
|
||||
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
|
||||
dependencies = [
|
||||
"annotate-snippets",
|
||||
"bitflags 2.5.0",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"itertools",
|
||||
- "lazy_static",
|
||||
- "lazycell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
- "syn 2.0.66",
|
||||
+ "syn 2.0.87",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -278,7 +282,7 @@ dependencies = [
|
||||
"log",
|
||||
"nix 0.25.1",
|
||||
"slotmap",
|
||||
- "thiserror",
|
||||
+ "thiserror 1.0.38",
|
||||
"vec_map",
|
||||
]
|
||||
|
||||
@@ -300,16 +304,17 @@ version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
|
||||
dependencies = [
|
||||
- "nom",
|
||||
+ "nom 7.1.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-expr"
|
||||
-version = "0.11.0"
|
||||
+version = "0.20.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
|
||||
+checksum = "3c6b04e07d8080154ed4ac03546d9a2b303cc2fe1901ba0b35b301516e289368"
|
||||
dependencies = [
|
||||
"smallvec",
|
||||
+ "target-lexicon",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -324,6 +329,12 @@ version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
|
||||
|
||||
+[[package]]
|
||||
+name = "cfg_aliases"
|
||||
+version = "0.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
||||
+
|
||||
[[package]]
|
||||
name = "cgl"
|
||||
version = "0.3.2"
|
||||
@@ -418,18 +429,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "convert_case"
|
||||
-version = "0.6.0"
|
||||
+version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
|
||||
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
|
||||
dependencies = [
|
||||
"unicode-segmentation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cookie-factory"
|
||||
-version = "0.3.2"
|
||||
+version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b"
|
||||
+checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation"
|
||||
@@ -824,6 +835,12 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "equivalent"
|
||||
+version = "1.0.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
|
||||
+
|
||||
[[package]]
|
||||
name = "error-code"
|
||||
version = "2.3.1"
|
||||
@@ -990,7 +1007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "524d807cd49a0c56a53ef9a6738cd15e7c8c4e9d37a3b7fdb3c250c1cd5bf7a3"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
- "cfg_aliases",
|
||||
+ "cfg_aliases 0.1.1",
|
||||
"cgl",
|
||||
"cocoa",
|
||||
"core-foundation",
|
||||
@@ -1035,11 +1052,17 @@ dependencies = [
|
||||
"gl_generator",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "hashbrown"
|
||||
+version = "0.17.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
|
||||
+
|
||||
[[package]]
|
||||
name = "heck"
|
||||
-version = "0.4.0"
|
||||
+version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
|
||||
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
@@ -1066,6 +1089,16 @@ dependencies = [
|
||||
"unicode-normalization",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "indexmap"
|
||||
+version = "2.14.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
|
||||
+dependencies = [
|
||||
+ "equivalent",
|
||||
+ "hashbrown",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "instant"
|
||||
version = "0.1.12"
|
||||
@@ -1103,7 +1136,7 @@ dependencies = [
|
||||
"combine",
|
||||
"jni-sys",
|
||||
"log",
|
||||
- "thiserror",
|
||||
+ "thiserror 1.0.38",
|
||||
"walkdir",
|
||||
]
|
||||
|
||||
@@ -1144,17 +1177,11 @@ version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
-[[package]]
|
||||
-name = "lazycell"
|
||||
-version = "1.3.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
-
|
||||
[[package]]
|
||||
name = "libc"
|
||||
-version = "0.2.155"
|
||||
+version = "0.2.186"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
@@ -1168,9 +1195,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libspa"
|
||||
-version = "0.8.0"
|
||||
+version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810"
|
||||
+checksum = "b6b8cfa2a7656627b4c92c6b9ef929433acd673d5ab3708cda1b18478ac00df4"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"cc",
|
||||
@@ -1178,16 +1205,16 @@ dependencies = [
|
||||
"cookie-factory",
|
||||
"libc",
|
||||
"libspa-sys",
|
||||
- "nix 0.27.1",
|
||||
- "nom",
|
||||
+ "nix 0.30.1",
|
||||
+ "nom 8.0.0",
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libspa-sys"
|
||||
-version = "0.8.0"
|
||||
+version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
|
||||
+checksum = "901049455d2eb6decf9058235d745237952f4804bc584c5fcb41412e6adcc6e0"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
"cc",
|
||||
@@ -1290,7 +1317,7 @@ dependencies = [
|
||||
"ndk-sys",
|
||||
"num_enum",
|
||||
"raw-window-handle 0.5.0",
|
||||
- "thiserror",
|
||||
+ "thiserror 1.0.38",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1364,12 +1391,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
-version = "0.27.1"
|
||||
+version = "0.30.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
|
||||
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"cfg-if",
|
||||
+ "cfg_aliases 0.2.1",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -1389,6 +1417,15 @@ dependencies = [
|
||||
"minimal-lexical",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "nom"
|
||||
+version = "8.0.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
|
||||
+dependencies = [
|
||||
+ "memchr",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "num_enum"
|
||||
version = "0.5.7"
|
||||
@@ -1532,26 +1569,26 @@ checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
|
||||
|
||||
[[package]]
|
||||
name = "pipewire"
|
||||
-version = "0.8.0"
|
||||
+version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda"
|
||||
+checksum = "9688b89abf11d756499f7c6190711d6dbe5a3acdb30c8fbf001d6596d06a8d44"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bitflags 2.5.0",
|
||||
"libc",
|
||||
"libspa",
|
||||
"libspa-sys",
|
||||
- "nix 0.27.1",
|
||||
+ "nix 0.30.1",
|
||||
"once_cell",
|
||||
"pipewire-sys",
|
||||
- "thiserror",
|
||||
+ "thiserror 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pipewire-sys"
|
||||
-version = "0.8.0"
|
||||
+version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
|
||||
+checksum = "cb028afee0d6ca17020b090e3b8fa2d7de23305aef975c7e5192a5050246ea36"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
"libspa-sys",
|
||||
@@ -1589,8 +1626,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
- "thiserror",
|
||||
- "toml",
|
||||
+ "thiserror 1.0.38",
|
||||
+ "toml 0.5.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1691,7 +1728,7 @@ checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"redox_syscall",
|
||||
- "thiserror",
|
||||
+ "thiserror 1.0.38",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1722,9 +1759,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
-version = "1.1.0"
|
||||
+version = "2.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
|
||||
|
||||
[[package]]
|
||||
name = "safe_arch"
|
||||
@@ -1770,22 +1807,41 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
-version = "1.0.152"
|
||||
+version = "1.0.228"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
|
||||
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
|
||||
+dependencies = [
|
||||
+ "serde_core",
|
||||
+ "serde_derive",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "serde_core"
|
||||
+version = "1.0.228"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
-version = "1.0.152"
|
||||
+version = "1.0.228"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
|
||||
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 1.0.107",
|
||||
+ "syn 2.0.87",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "serde_spanned"
|
||||
+version = "1.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
|
||||
+dependencies = [
|
||||
+ "serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1839,9 +1895,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
-version = "1.10.0"
|
||||
+version = "1.15.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
||||
|
||||
[[package]]
|
||||
name = "smithay-client-toolkit"
|
||||
@@ -1897,9 +1953,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
-version = "2.0.66"
|
||||
+version = "2.0.87"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
|
||||
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -1908,24 +1964,39 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "system-deps"
|
||||
-version = "6.0.3"
|
||||
+version = "7.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
|
||||
+checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7"
|
||||
dependencies = [
|
||||
"cfg-expr",
|
||||
"heck",
|
||||
"pkg-config",
|
||||
- "toml",
|
||||
+ "toml 1.1.2+spec-1.1.0",
|
||||
"version-compare",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "target-lexicon"
|
||||
+version = "0.13.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
|
||||
+
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.38"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
|
||||
dependencies = [
|
||||
- "thiserror-impl",
|
||||
+ "thiserror-impl 1.0.38",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thiserror"
|
||||
+version = "2.0.18"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
|
||||
+dependencies = [
|
||||
+ "thiserror-impl 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1939,6 +2010,17 @@ dependencies = [
|
||||
"syn 1.0.107",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "thiserror-impl"
|
||||
+version = "2.0.18"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "syn 2.0.87",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.17"
|
||||
@@ -2017,6 +2099,45 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "toml"
|
||||
+version = "1.1.2+spec-1.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
|
||||
+dependencies = [
|
||||
+ "indexmap",
|
||||
+ "serde_core",
|
||||
+ "serde_spanned",
|
||||
+ "toml_datetime",
|
||||
+ "toml_parser",
|
||||
+ "toml_writer",
|
||||
+ "winnow",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "toml_datetime"
|
||||
+version = "1.1.1+spec-1.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
|
||||
+dependencies = [
|
||||
+ "serde_core",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "toml_parser"
|
||||
+version = "1.1.2+spec-1.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
|
||||
+dependencies = [
|
||||
+ "winnow",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "toml_writer"
|
||||
+version = "1.1.1+spec-1.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
|
||||
+
|
||||
[[package]]
|
||||
name = "tracing"
|
||||
version = "0.1.37"
|
||||
@@ -2072,9 +2193,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
-version = "0.1.10"
|
||||
+version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
@@ -2095,9 +2216,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||
|
||||
[[package]]
|
||||
name = "version-compare"
|
||||
-version = "0.1.1"
|
||||
+version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
|
||||
+checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
@@ -2516,6 +2637,12 @@ dependencies = [
|
||||
"x11-dl",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "winnow"
|
||||
+version = "1.0.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
|
||||
+
|
||||
[[package]]
|
||||
name = "wio"
|
||||
version = "0.2.2"
|
||||
@@ -2564,7 +2691,7 @@ version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
|
||||
dependencies = [
|
||||
- "nom",
|
||||
+ "nom 7.1.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2572,12 +2699,3 @@ name = "xml-rs"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
|
||||
-
|
||||
-[[package]]
|
||||
-name = "yansi-term"
|
||||
-version = "0.1.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
|
||||
-dependencies = [
|
||||
- "winapi",
|
||||
-]
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@@ -18,16 +18,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pw-viz";
|
||||
version = "0.3.0";
|
||||
version = "0.3.0-2025-12-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ax9d";
|
||||
repo = "pw-viz";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA=";
|
||||
rev = "b3fb0fb05059ba12f58d2a998842e13f0636cfed";
|
||||
hash = "sha256-TQJcIvCyWaDtJYcjZwclG5NtaUpDBugQQQc1txNzu88=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jsaWrdJRKfu75Gw8qGHxx0FHK7rOEK8IEDiQ6ktZsM0=";
|
||||
cargoPatches = [
|
||||
./0001-fix-regenerate-Cargo.lock.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-q1rgoEGQjzlXYcsfRUhrJi4w716a8D0x5SGl5fWM3ig=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -57,15 +61,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
}
|
||||
'';
|
||||
|
||||
# enables pipewire API deprecated in 0.3.64
|
||||
# fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ];
|
||||
|
||||
meta = {
|
||||
description = "Simple and elegant pipewire graph editor";
|
||||
homepage = "https://github.com/ax9d/pw-viz";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.progrm_jarvis ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -42,16 +42,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rapidraw";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CyberTimon";
|
||||
repo = "RapidRAW";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-T7qBa0CEVfvc6qWxdJe0pbJAN3VNrpP9EKaX2R+PtUw=";
|
||||
hash = "sha256-CnH8EuHzHxuXbnOry2gMU/tMqpE8++ztyNPk3HHdZqE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kyJIHfrb3Tlm3IYQxU6N9mB9JxZWmMcBsPXHQmTwxAg=";
|
||||
cargoHash = "sha256-c2MK1DyonfeZKfZAVWfwVh/In5SqKq7nnFrlz2686SM=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
@@ -164,7 +164,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
homepage = "https://github.com/CyberTimon/RapidRAW";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "rapidraw";
|
||||
maintainers = with lib.maintainers; [ taciturnaxolotl ];
|
||||
maintainers = with lib.maintainers; [
|
||||
philipdb
|
||||
taciturnaxolotl
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,25 +2,20 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rsonpath";
|
||||
version = "0.9.1-unstable-2024-11-15";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsonquery";
|
||||
repo = "rsonpath";
|
||||
rev = "979e6374a68747dfba7b87b61bbe77951f749659";
|
||||
hash = "sha256-YQCbkdv7PRf5hVXAGUg6DrtaCLIyS9nUGXsl8XHpKZU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Lh58U5A4EeD+tQ3CZNE7YabwGIJ14Cv5dqbJ64JYNDk=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
tagPrefix = "v";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9pSn0f0VWsBg1z1UYGRtMb1z23htRm7qLmO80zvSjN8=";
|
||||
cargoHash = "sha256-w1AODL95+O0jhzXvNrL9I+i2+jcZX3SvJDKrLWkI7c8=";
|
||||
|
||||
cargoBuildFlags = [ "-p=rsonpath" ];
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
@@ -28,9 +23,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
meta = {
|
||||
description = "Experimental JSONPath engine for querying massive streamed datasets";
|
||||
homepage = "https://github.com/v0ldek/rsonpath";
|
||||
changelog = "https://github.com/v0ldek/rsonpath/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/v0ldek/rsonpath/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
mainProgram = "rq";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sandbox-runtime";
|
||||
version = "0.0.49";
|
||||
version = "0.0.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthropic-experimental";
|
||||
repo = "sandbox-runtime";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1QwUOtgOYcVm61nLCeQL46O/+G/LyXSv+ZnC3la2Ajc=";
|
||||
hash = "sha256-L5MscAoXXaaUh0BgiDtVyjCdFneMP/w7jbE+1LVtRo0=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/c/syscalls.c b/c/syscalls.c
|
||||
index 2be25a8..311f02b 100644
|
||||
--- a/c/syscalls.c
|
||||
+++ b/c/syscalls.c
|
||||
@@ -670,7 +670,7 @@ s48_ref_t scm_gethostname(s48_call_t call)
|
||||
{
|
||||
char hostname[MAXHOSTNAMELEN+1];
|
||||
/* different OS's declare differently, so punt the prototype. */
|
||||
- int gethostname();
|
||||
+ int gethostname(char *name, size_t size);
|
||||
int retval = gethostname(hostname, MAXHOSTNAMELEN);
|
||||
if (retval == -1) s48_os_error_2(call, "scm_gethostname", errno, 0);
|
||||
return s48_enter_byte_string_2(call, hostname);
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user