gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-01-24 00:14:19 +00:00
committed by GitHub
parent a24829159b 2d99c7f729
commit d6cc3fbc74
101 changed files with 6183 additions and 2476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes/rl-2505.section.md
+4
View File
@@ -4,6 +4,10 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `services.rippled` has been removed, as `rippled` was broken and had not been updated since 2022.
- `services.rippleDataApi` has been removed, as `ripple-data-api` was broken and had not been updated since 2022.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}
nixos/modules/module-list.nix
-2
View File
@@ -864,8 +864,6 @@
./services/misc/redlib.nix
./services/misc/redmine.nix
./services/misc/renovate.nix
./services/misc/ripple-data-api.nix
./services/misc/rippled.nix
./services/misc/rmfakecloud.nix
./services/misc/rkvm.nix
./services/misc/rshim.nix
nixos/modules/rename.nix
+6
View File
@@ -295,6 +295,12 @@ in
(mkRemovedOptionModule [ "services" "tedicross" ] ''
The corresponding package was broken and removed from nixpkgs.
'')
(mkRemovedOptionModule [ "services" "rippled" ] ''
The corresponding package was broken, abandoned upstream and thus removed from nixpkgs.
'')
(mkRemovedOptionModule [ "services" "rippleDataApi" ] ''
The corresponding package was broken, abandoned upstream and thus removed from nixpkgs.
'')
# Do NOT add any option renames here, see top of the file
];
nixos/modules/services/misc/ripple-data-api.nix
-209
View File
@@ -1,209 +0,0 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.rippleDataApi;
deployment_env_config = builtins.toJSON {
production = {
port = toString cfg.port;
maxSockets = 150;
batchSize = 100;
startIndex = 32570;
rippleds = cfg.rippleds;
redis = {
enable = cfg.redis.enable;
host = cfg.redis.host;
port = cfg.redis.port;
options.auth_pass = null;
};
};
};
db_config = builtins.toJSON {
production = {
username = lib.optional (cfg.couchdb.pass != "") cfg.couchdb.user;
password = lib.optional (cfg.couchdb.pass != "") cfg.couchdb.pass;
host = cfg.couchdb.host;
port = cfg.couchdb.port;
database = cfg.couchdb.db;
protocol = "http";
};
};
in
{
options = {
services.rippleDataApi = {
enable = lib.mkEnableOption "ripple data api";
port = lib.mkOption {
description = "Ripple data api port";
default = 5993;
type = lib.types.port;
};
importMode = lib.mkOption {
description = "Ripple data api import mode.";
default = "liveOnly";
type = lib.types.enum [
"live"
"liveOnly"
];
};
minLedger = lib.mkOption {
description = "Ripple data api minimal ledger to fetch.";
default = null;
type = lib.types.nullOr lib.types.int;
};
maxLedger = lib.mkOption {
description = "Ripple data api maximal ledger to fetch.";
default = null;
type = lib.types.nullOr lib.types.int;
};
redis = {
enable = lib.mkOption {
description = "Whether to enable caching of ripple data to redis.";
default = true;
type = lib.types.bool;
};
host = lib.mkOption {
description = "Ripple data api redis host.";
default = "localhost";
type = lib.types.str;
};
port = lib.mkOption {
description = "Ripple data api redis port.";
default = 5984;
type = lib.types.port;
};
};
couchdb = {
host = lib.mkOption {
description = "Ripple data api couchdb host.";
default = "localhost";
type = lib.types.str;
};
port = lib.mkOption {
description = "Ripple data api couchdb port.";
default = 5984;
type = lib.types.port;
};
db = lib.mkOption {
description = "Ripple data api couchdb database.";
default = "rippled";
type = lib.types.str;
};
user = lib.mkOption {
description = "Ripple data api couchdb username.";
default = "rippled";
type = lib.types.str;
};
pass = lib.mkOption {
description = "Ripple data api couchdb password.";
default = "";
type = lib.types.str;
};
create = lib.mkOption {
description = "Whether to create couchdb database needed by ripple data api.";
type = lib.types.bool;
default = true;
};
};
rippleds = lib.mkOption {
description = "List of rippleds to be used by ripple data api.";
default = [
"http://s_east.ripple.com:51234"
"http://s_west.ripple.com:51234"
];
type = lib.types.listOf lib.types.str;
};
};
};
config = lib.mkIf (cfg.enable) {
services.couchdb.enable = lib.mkDefault true;
services.couchdb.bindAddress = lib.mkDefault "0.0.0.0";
services.redis.enable = lib.mkDefault true;
systemd.services.ripple-data-api = {
after = [
"couchdb.service"
"redis.service"
"ripple-data-api-importer.service"
];
wantedBy = [ "multi-user.target" ];
environment = {
NODE_ENV = "production";
DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config;
DB_CONFIG = pkgs.writeText "db.config.json" db_config;
};
serviceConfig = {
ExecStart = "${pkgs.ripple-data-api}/bin/api";
Restart = "always";
User = "ripple-data-api";
};
};
systemd.services.ripple-data-importer = {
after = [ "couchdb.service" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.curl ];
environment = {
NODE_ENV = "production";
DEPLOYMENT_ENVS_CONFIG = pkgs.writeText "deployment.environment.json" deployment_env_config;
DB_CONFIG = pkgs.writeText "db.config.json" db_config;
LOG_FILE = "/dev/null";
};
serviceConfig =
let
importMode =
if cfg.minLedger != null && cfg.maxLedger != null then
"${toString cfg.minLedger} ${toString cfg.maxLedger}"
else
cfg.importMode;
in
{
ExecStart = "${pkgs.ripple-data-api}/bin/importer ${importMode} debug";
Restart = "always";
User = "ripple-data-api";
};
preStart = lib.mkMerge [
(lib.mkIf (cfg.couchdb.create) ''
HOST="http://${
lib.optionalString (cfg.couchdb.pass != "") "${cfg.couchdb.user}:${cfg.couchdb.pass}@"
}${cfg.couchdb.host}:${toString cfg.couchdb.port}"
curl -X PUT $HOST/${cfg.couchdb.db} || true
'')
"${pkgs.ripple-data-api}/bin/update-views"
];
};
users.users.ripple-data-api = {
description = "Ripple data api user";
isSystemUser = true;
group = "ripple-data-api";
};
users.groups.ripple-data-api = { };
};
}
nixos/modules/services/misc/rippled.nix
-463
View File
@@ -1,463 +0,0 @@
{
config,
lib,
options,
pkgs,
...
}:
let
cfg = config.services.rippled;
opt = options.services.rippled;
b2i = val: if val then "1" else "0";
dbCfg = db: ''
type=${db.type}
path=${db.path}
${lib.optionalString (db.compression != null) ("compression=${b2i db.compression}")}
${lib.optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")}
${lib.optionalString (db.advisoryDelete != null) ("advisory_delete=${b2i db.advisoryDelete}")}
${db.extraOpts}
'';
rippledCfg =
''
[server]
${lib.concatMapStringsSep "\n" (n: "port_${n}") (lib.attrNames cfg.ports)}
${lib.concatMapStrings (p: ''
[port_${p.name}]
ip=${p.ip}
port=${toString p.port}
protocol=${lib.concatStringsSep "," p.protocol}
${lib.optionalString (p.user != "") "user=${p.user}"}
${lib.optionalString (p.password != "") "user=${p.password}"}
admin=${lib.concatStringsSep "," p.admin}
${lib.optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"}
${lib.optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"}
${lib.optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"}
'') (lib.attrValues cfg.ports)}
[database_path]
${cfg.databasePath}
[node_db]
${dbCfg cfg.nodeDb}
${lib.optionalString (cfg.tempDb != null) ''
[temp_db]
${dbCfg cfg.tempDb}''}
${lib.optionalString (cfg.importDb != null) ''
[import_db]
${dbCfg cfg.importDb}''}
[ips]
${lib.concatStringsSep "\n" cfg.ips}
[ips_fixed]
${lib.concatStringsSep "\n" cfg.ipsFixed}
[validators]
${lib.concatStringsSep "\n" cfg.validators}
[node_size]
${cfg.nodeSize}
[ledger_history]
${toString cfg.ledgerHistory}
[fetch_depth]
${toString cfg.fetchDepth}
[validation_quorum]
${toString cfg.validationQuorum}
[sntp_servers]
${lib.concatStringsSep "\n" cfg.sntpServers}
${lib.optionalString cfg.statsd.enable ''
[insight]
server=statsd
address=${cfg.statsd.address}
prefix=${cfg.statsd.prefix}
''}
[rpc_startup]
{ "command": "log_level", "severity": "${cfg.logLevel}" }
''
+ cfg.extraConfig;
portOptions =
{ name, ... }:
{
options = {
name = lib.mkOption {
internal = true;
default = name;
};
ip = lib.mkOption {
default = "127.0.0.1";
description = "Ip where rippled listens.";
type = lib.types.str;
};
port = lib.mkOption {
description = "Port where rippled listens.";
type = lib.types.port;
};
protocol = lib.mkOption {
description = "Protocols expose by rippled.";
type = lib.types.listOf (
lib.types.enum [
"http"
"https"
"ws"
"wss"
"peer"
]
);
};
user = lib.mkOption {
description = "When set, these credentials will be required on HTTP/S requests.";
type = lib.types.str;
default = "";
};
password = lib.mkOption {
description = "When set, these credentials will be required on HTTP/S requests.";
type = lib.types.str;
default = "";
};
admin = lib.mkOption {
description = "A comma-separated list of admin IP addresses.";
type = lib.types.listOf lib.types.str;
default = [ "127.0.0.1" ];
};
ssl = {
key = lib.mkOption {
description = ''
Specifies the filename holding the SSL key in PEM format.
'';
default = null;
type = lib.types.nullOr lib.types.path;
};
cert = lib.mkOption {
description = ''
Specifies the path to the SSL certificate file in PEM format.
This is not needed if the chain includes it.
'';
default = null;
type = lib.types.nullOr lib.types.path;
};
chain = lib.mkOption {
description = ''
If you need a certificate chain, specify the path to the
certificate chain here. The chain may include the end certificate.
'';
default = null;
type = lib.types.nullOr lib.types.path;
};
};
};
};
dbOptions = {
options = {
type = lib.mkOption {
description = "Rippled database type.";
type = lib.types.enum [
"rocksdb"
"nudb"
];
default = "rocksdb";
};
path = lib.mkOption {
description = "Location to store the database.";
type = lib.types.path;
default = cfg.databasePath;
defaultText = lib.literalExpression "config.${opt.databasePath}";
};
compression = lib.mkOption {
description = "Whether to enable snappy compression.";
type = lib.types.nullOr lib.types.bool;
default = null;
};
onlineDelete = lib.mkOption {
description = "Enable automatic purging of older ledger information.";
type = lib.types.nullOr (lib.types.addCheck lib.types.int (v: v > 256));
default = cfg.ledgerHistory;
defaultText = lib.literalExpression "config.${opt.ledgerHistory}";
};
advisoryDelete = lib.mkOption {
description = ''
If set, then require administrative RPC call "can_delete"
to enable online deletion of ledger records.
'';
type = lib.types.nullOr lib.types.bool;
default = null;
};
extraOpts = lib.mkOption {
description = "Extra database options.";
type = lib.types.lines;
default = "";
};
};
};
in
{
###### interface
options = {
services.rippled = {
enable = lib.mkEnableOption "rippled, a decentralized cryptocurrency blockchain daemon implementing the XRP Ledger protocol in C++";
package = lib.mkPackageOption pkgs "rippled" { };
ports = lib.mkOption {
description = "Ports exposed by rippled";
type = with lib.types; attrsOf (submodule portOptions);
default = {
rpc = {
port = 5005;
admin = [ "127.0.0.1" ];
protocol = [ "http" ];
};
peer = {
port = 51235;
ip = "0.0.0.0";
protocol = [ "peer" ];
};
ws_public = {
port = 5006;
ip = "0.0.0.0";
protocol = [
"ws"
"wss"
];
};
};
};
nodeDb = lib.mkOption {
description = "Rippled main database options.";
type = with lib.types; nullOr (submodule dbOptions);
default = {
type = "rocksdb";
extraOpts = ''
open_files=2000
filter_bits=12
cache_mb=256
file_size_pb=8
file_size_mult=2;
'';
};
};
tempDb = lib.mkOption {
description = "Rippled temporary database options.";
type = with lib.types; nullOr (submodule dbOptions);
default = null;
};
importDb = lib.mkOption {
description = "Settings for performing a one-time import.";
type = with lib.types; nullOr (submodule dbOptions);
default = null;
};
nodeSize = lib.mkOption {
description = ''
Rippled size of the node you are running.
"tiny", "small", "medium", "large", and "huge"
'';
type = lib.types.enum [
"tiny"
"small"
"medium"
"large"
"huge"
];
default = "small";
};
ips = lib.mkOption {
description = ''
List of hostnames or ips where the Ripple protocol is served.
For a starter list, you can either copy entries from:
https://ripple.com/ripple.txt or if you prefer you can let it
default to r.ripple.com 51235
A port may optionally be specified after adding a space to the
address. By convention, if known, IPs are listed in from most
to least trusted.
'';
type = lib.types.listOf lib.types.str;
default = [ "r.ripple.com 51235" ];
};
ipsFixed = lib.mkOption {
description = ''
List of IP addresses or hostnames to which rippled should always
attempt to maintain peer connections with. This is useful for
manually forming private networks, for example to configure a
validation server that connects to the Ripple network through a
public-facing server, or for building a set of cluster peers.
A port may optionally be specified after adding a space to the address
'';
type = lib.types.listOf lib.types.str;
default = [ ];
};
validators = lib.mkOption {
description = ''
List of nodes to always accept as validators. Nodes are specified by domain
or public key.
'';
type = lib.types.listOf lib.types.str;
default = [
"n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1"
"n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2"
"n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C RL3"
"n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS RL4"
"n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA RL5"
];
};
databasePath = lib.mkOption {
description = ''
Path to the ripple database.
'';
type = lib.types.path;
default = "/var/lib/rippled";
};
validationQuorum = lib.mkOption {
description = ''
The minimum number of trusted validations a ledger must have before
the server considers it fully validated.
'';
type = lib.types.int;
default = 3;
};
ledgerHistory = lib.mkOption {
description = ''
The number of past ledgers to acquire on server startup and the minimum
to maintain while running.
'';
type = lib.types.either lib.types.int (lib.types.enum [ "full" ]);
default = 1296000; # 1 month
};
fetchDepth = lib.mkOption {
description = ''
The number of past ledgers to serve to other peers that request historical
ledger data (or "full" for no limit).
'';
type = lib.types.either lib.types.int (lib.types.enum [ "full" ]);
default = "full";
};
sntpServers = lib.mkOption {
description = ''
IP address or domain of NTP servers to use for time synchronization.;
'';
type = lib.types.listOf lib.types.str;
default = [
"time.windows.com"
"time.apple.com"
"time.nist.gov"
"pool.ntp.org"
];
};
logLevel = lib.mkOption {
description = "Logging verbosity.";
type = lib.types.enum [
"debug"
"error"
"info"
];
default = "error";
};
statsd = {
enable = lib.mkEnableOption "statsd monitoring for rippled";
address = lib.mkOption {
description = "The UDP address and port of the listening StatsD server.";
default = "127.0.0.1:8125";
type = lib.types.str;
};
prefix = lib.mkOption {
description = "A string prepended to each collected metric.";
default = "";
type = lib.types.str;
};
};
extraConfig = lib.mkOption {
default = "";
type = lib.types.lines;
description = ''
Extra lines to be added verbatim to the rippled.cfg configuration file.
'';
};
config = lib.mkOption {
internal = true;
default = pkgs.writeText "rippled.conf" rippledCfg;
defaultText = lib.literalMD "generated config file";
};
};
};
###### implementation
config = lib.mkIf cfg.enable {
users.users.rippled = {
description = "Ripple server user";
isSystemUser = true;
group = "rippled";
home = cfg.databasePath;
createHome = true;
};
users.groups.rippled = { };
systemd.services.rippled = {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/rippled --fg --conf ${cfg.config}";
User = "rippled";
Restart = "on-failure";
LimitNOFILE = 10000;
};
};
environment.systemPackages = [ cfg.package ];
};
}
pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"version": "1.14.14",
"version": "1.15.34",
"linux-x64": {
"hash": "sha256-kblLJbiDSYC9uVhzKLgcdck1TJZa4vI6Rwvc9ZNSDEg=",
"hash": "sha256-QoITLhgIYcoYpYzDqvss+aSh0/ZQc9V6+QSSBRGg1wc=",
"binaries": [
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller",
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost",
@@ -10,7 +10,7 @@
]
},
"linux-arm64": {
"hash": "sha256-yvmcAtb1t1jq3zLsvIrSZLBIGAy/OkOy8LabFgbl04o=",
"hash": "sha256-aluG7CfqG5CNKG7FZqdp5vNa9bZ+OYQa5y7JoVvCSh0=",
"binaries": [
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller",
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost",
@@ -19,7 +19,7 @@
]
},
"darwin-x64": {
"hash": "sha256-CABphtcOMxCFYUfzRBcBx3tgL5aKTtEiZj4dikIni50=",
"hash": "sha256-nm3qEpVfzpVhZCrCtrjYSYNDCSGmmIE/uufh/n6yZ+M=",
"binaries": [
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller",
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost",
@@ -28,7 +28,7 @@
]
},
"darwin-arm64": {
"hash": "sha256-dGoLB9bmEUsbF18Mp7DZfMp18BHBKmyVAGFjjKm9J58=",
"hash": "sha256-1AHY13x77au2MjUEKbzuIyukKXLwmEYZwh4sFyApcbI=",
"binaries": [
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller",
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost",
pkgs/applications/networking/browsers/chromium/info.json
+14 -14
View File
@@ -1,9 +1,9 @@
{
"chromium": {
"version": "132.0.6834.83",
"version": "132.0.6834.110",
"chromedriver": {
"hash_darwin": "sha256-gLpWPzuJXnYatvRFDdssgB7rMSUCFv2GIPaV+YRNiZ0=",
"hash_darwin_aarch64": "sha256-8uhDySh2cWogVFX6LzCRTTHTUHTk+vxdbVxyOIHHLxA="
"hash_darwin": "sha256-TEy3go3cMHlv8+XRUWJhPVlLSgk+2DifW1LNStqh+nU=",
"hash_darwin_aarch64": "sha256-gpqA5zYbhrdVoaAH1m6xHmH0k7jiC7sGicqpKhVaytw="
},
"deps": {
"depot_tools": {
@@ -19,8 +19,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c",
"hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=",
"rev": "df453a35f099772fdb954e33551388add2ca3cde",
"hash": "sha256-deLCukHvNv6mUp33hHHFgeKD45SQs517xoRfCfReLAA=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -760,13 +760,13 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c",
"hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU="
"rev": "625e932f21c984db3f9fba8b56b9afa4e977994c",
"hash": "sha256-19uEppABiuh+zHjgwAj/BPee/ClB/FKfzHxLKrdNhOE="
}
}
},
"ungoogled-chromium": {
"version": "132.0.6834.83",
"version": "132.0.6834.110",
"deps": {
"depot_tools": {
"rev": "41d43a2a2290450aeab946883542f8049b155c87",
@@ -777,16 +777,16 @@
"hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg="
},
"ungoogled-patches": {
"rev": "132.0.6834.83-1",
"hash": "sha256-yL7eMNTL1FDoqXcwuHx5BzjjESjzsIfdzHCTZW9jXUo="
"rev": "132.0.6834.110-1",
"hash": "sha256-pFuRsGnOXAECat5B0fUi9aw8Wdqbu1EBwyHNCBMoOpw="
},
"npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c",
"hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=",
"rev": "df453a35f099772fdb954e33551388add2ca3cde",
"hash": "sha256-deLCukHvNv6mUp33hHHFgeKD45SQs517xoRfCfReLAA=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -1526,8 +1526,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c",
"hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU="
"rev": "625e932f21c984db3f9fba8b56b9afa4e977994c",
"hash": "sha256-19uEppABiuh+zHjgwAj/BPee/ClB/FKfzHxLKrdNhOE="
}
}
}
pkgs/applications/networking/cluster/krane/Gemfile.lock
+36 -26
View File
@@ -1,8 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.2.1)
activesupport (8.0.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
@@ -12,30 +13,35 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
bigdecimal (3.1.8)
benchmark (0.4.0)
bigdecimal (3.1.9)
colorize (0.8.1)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
domain_name (0.6.20240107)
drb (2.2.1)
ejson (1.4.1)
faraday (2.11.0)
faraday-net_http (>= 2.0, < 3.4)
ejson (1.5.3)
faraday (2.12.2)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.3.0)
net-http
ffi (1.17.0)
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
ffi (1.17.1)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
rake
google-cloud-env (2.2.0)
google-cloud-env (2.2.1)
faraday (>= 1.0, < 3.a)
googleauth (1.11.0)
google-logging-utils (0.1.0)
googleauth (1.12.2)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
@@ -47,16 +53,17 @@ GEM
http-form_data (~> 2.2)
llhttp-ffi (~> 0.5.0)
http-accept (1.7.0)
http-cookie (1.0.7)
http-cookie (1.0.8)
domain_name (~> 0.5)
http-form_data (2.3.0)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.9.1)
jsonpath (1.1.5)
multi_json
jwt (2.8.2)
jwt (2.10.1)
base64
krane (3.6.2)
krane (3.7.0)
activesupport (>= 5.0)
colorize (~> 0.8)
concurrent-ruby (~> 1.1)
@@ -75,25 +82,28 @@ GEM
llhttp-ffi (0.5.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
logger (1.6.1)
mime-types (3.5.2)
logger (1.6.5)
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0903)
minitest (5.25.1)
mime-types-data (3.2025.0107)
minitest (5.25.4)
multi_json (1.15.0)
net-http (0.4.1)
net-http (0.6.0)
uri
netrc (0.11.0)
os (1.1.4)
ostruct (0.6.1)
public_suffix (6.0.1)
rake (13.2.1)
recursive-open-struct (1.2.2)
recursive-open-struct (1.3.1)
ostruct
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
securerandom (0.3.1)
securerandom (0.4.1)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
@@ -103,7 +113,7 @@ GEM
thor (1.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uri (0.13.1)
uri (1.0.2)
PLATFORMS
ruby
@@ -112,4 +122,4 @@ DEPENDENCIES
krane
BUNDLED WITH
2.5.16
2.5.22
pkgs/applications/networking/cluster/krane/gemset.nix
+93 -45
View File
@@ -2,6 +2,7 @@
activesupport = {
dependencies = [
"base64"
"benchmark"
"bigdecimal"
"concurrent-ruby"
"connection_pool"
@@ -11,15 +12,16 @@
"minitest"
"securerandom"
"tzinfo"
"uri"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm";
sha256 = "0drfj44a16r86clrrqz3vqmg93qri6bqghjm21ac6jn2853cfnzx";
type = "gem";
};
version = "7.2.1";
version = "8.0.1";
};
addressable = {
dependencies = [ "public_suffix" ];
@@ -42,15 +44,25 @@
};
version = "0.2.0";
};
benchmark = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
type = "gem";
};
version = "0.4.0";
};
bigdecimal = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
type = "gem";
};
version = "3.1.8";
version = "3.1.9";
};
colorize = {
groups = [ "default" ];
@@ -67,20 +79,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
type = "gem";
};
version = "1.3.4";
version = "1.3.5";
};
connection_pool = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
type = "gem";
};
version = "2.4.1";
version = "2.5.0";
};
domain_name = {
groups = [ "default" ];
@@ -107,24 +119,25 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bpry4i9ajh2h8fyljp0cb17iy03ar36yc9mpfxflmdznl7dwsjf";
sha256 = "07ar8rhfinn965danfj6bqqsx0vr9gbl8jxyc0c6r10bcmf97wip";
type = "gem";
};
version = "1.4.1";
version = "1.5.3";
};
faraday = {
dependencies = [
"faraday-net_http"
"json"
"logger"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6";
sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
type = "gem";
};
version = "2.11.0";
version = "2.12.2";
};
faraday-net_http = {
dependencies = [ "net-http" ];
@@ -132,20 +145,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk";
sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
type = "gem";
};
version = "3.3.0";
version = "3.4.0";
};
ffi = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
type = "gem";
};
version = "1.17.0";
version = "1.17.1";
};
ffi-compiler = {
dependencies = [
@@ -167,15 +180,26 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vlwifnhih8nq5441pfbnzc7w4z8rmy7j54pfixpm9yvlq11428j";
sha256 = "1ks9yv21d8bl9cw0sz5gy6npll1ig3m2bq9w7yw67j5mw2p64q1w";
type = "gem";
};
version = "2.2.0";
version = "2.2.1";
};
google-logging-utils = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1mgw0n97prlvgvd81dci8rx93xranr3xnyhn5v7p6hii94g0p5bh";
type = "gem";
};
version = "0.1.0";
};
googleauth = {
dependencies = [
"faraday"
"google-cloud-env"
"google-logging-utils"
"jwt"
"multi_json"
"os"
@@ -185,10 +209,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "15knmk2fcyqxdpppc3wb5lc6xapbx5hax4lma0iclc2p55aa2kkl";
sha256 = "0zynv2s6s6i5d8x84p1axin21bfgmgy92ai2jb7a7aaknaqpfc9x";
type = "gem";
};
version = "1.11.0";
version = "1.12.2";
};
http = {
dependencies = [
@@ -223,10 +247,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb";
sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
type = "gem";
};
version = "1.0.7";
version = "1.0.8";
};
http-form_data = {
groups = [ "default" ];
@@ -244,10 +268,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
version = "1.14.5";
version = "1.14.6";
};
json = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj";
type = "gem";
};
version = "2.9.1";
};
jsonpath = {
dependencies = [ "multi_json" ];
@@ -266,10 +300,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04mw326i9vsdcqwm4bf0zvnqw237f8l7022nhlbmak92bqqpg62s";
sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
type = "gem";
};
version = "2.8.2";
version = "2.10.1";
};
krane = {
dependencies = [
@@ -288,10 +322,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07f87rzlr0yamji5ns2isf5f554jal5b9v62lijhsafmq9545f42";
sha256 = "032b8fk23jpmmslnhn351as9irykpa40sjz6yxibjpglj4w7wnqz";
type = "gem";
};
version = "3.6.2";
version = "3.7.0";
};
kubeclient = {
dependencies = [
@@ -328,41 +362,44 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3";
type = "gem";
};
version = "1.6.1";
version = "1.6.5";
};
mime-types = {
dependencies = [ "mime-types-data" ];
dependencies = [
"logger"
"mime-types-data"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1";
sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
type = "gem";
};
version = "3.5.2";
version = "3.6.0";
};
mime-types-data = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs";
sha256 = "1jixfirdang1lx9iqkcw03mz43pi4vxlfpb8ha4sbz4cqry4jai3";
type = "gem";
};
version = "3.2024.0903";
version = "3.2025.0107";
};
minitest = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
type = "gem";
};
version = "5.25.1";
version = "5.25.4";
};
multi_json = {
groups = [ "default" ];
@@ -380,10 +417,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9";
sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
type = "gem";
};
version = "0.4.1";
version = "0.6.0";
};
netrc = {
groups = [ "default" ];
@@ -405,6 +442,16 @@
};
version = "1.1.4";
};
ostruct = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
type = "gem";
};
version = "0.6.1";
};
public_suffix = {
groups = [ "default" ];
platforms = [ ];
@@ -426,14 +473,15 @@
version = "13.2.1";
};
recursive-open-struct = {
dependencies = [ "ostruct" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rjs8804zn5v39mklmqy65xwdji7iq598lkw876zspclziy4h2c3";
sha256 = "0847mn846fddfmm6vpdpz4ds9azbbcdxnnjw4zs31fqpi2f4l6ql";
type = "gem";
};
version = "1.2.2";
version = "1.3.1";
};
rest-client = {
dependencies = [
@@ -456,10 +504,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
type = "gem";
};
version = "0.3.1";
version = "0.4.1";
};
signet = {
dependencies = [
@@ -513,9 +561,9 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz";
sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk";
type = "gem";
};
version = "0.13.1";
version = "1.0.2";
};
}
pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
+2 -2
View File
@@ -7,14 +7,14 @@
}:
buildLua (finalAttrs: {
pname = "modernx-zydezu";
version = "0.4.0";
version = "0.4.1";
scriptPath = "modernx.lua";
src = fetchFromGitHub {
owner = "zydezu";
repo = "ModernX";
rev = finalAttrs.version;
hash = "sha256-EIsvaOH9QiswGYZKa5g1Xvpbnep2V0Q0RhDqWCX5ZeI=";
hash = "sha256-tm1vsHEFX2YnQ1w3DcLd/zHASetkqQ4wYcYT9w8HVok=";
};
postInstall = ''
pkgs/by-name/ac/actionlint/package.nix
+5 -8
View File
@@ -9,23 +9,20 @@
shellcheck,
}:
let
version = "1.7.6";
in
buildGoModule {
buildGoModule rec {
pname = "actionlint";
inherit version;
version = "1.7.7";
subPackages = [ "cmd/actionlint" ];
src = fetchFromGitHub {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
hash = "sha256-NHmz+r7xO84eSQFBNwaI+ctzIgd014rRQtqvi8hOWPE=";
tag = "v${version}";
hash = "sha256-dmd6AWL96sG+Cb+CVtCUhaStfsx8qRnvpcB2OjfLenU=";
};
vendorHash = "sha256-4hBIDrFOADGo3gsTRW8hjBYzmWRo/5yyoM7Ylv3KJBk=";
vendorHash = "sha256-4SkhMRDXHKYxKK3POqtti/esj2cqx0Dl92q/qzzaqH0=";
nativeBuildInputs = [
makeWrapper
pkgs/by-name/ca/cabinpkg/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cabinpkg";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "cabinpkg";
repo = "cabin";
tag = version;
sha256 = "sha256-LIP99Shxu/lOdZ31KVA8RYawZ6dRLtXEGKZs1mUFCus=";
sha256 = "sha256-qMmfViu3ol8+Tpyy8hn0j5r+bql0SFeKPVVj/ox4AGQ=";
};
strictDeps = true;
pkgs/by-name/cl/clifm/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "clifm";
version = "1.22";
version = "1.23";
src = fetchFromGitHub {
owner = "leo-arch";
repo = pname;
rev = "v${version}";
hash = "sha256-keoQUfRQA77+1ArVRKYiWGACXAi505jLXSVXUpuMlMc=";
hash = "sha256-FtlLz77yy/QfRyAhJSh5juCSPCZ921sTGhuYJzCusus=";
};
buildInputs = [
pkgs/by-name/co/codeium/package.nix
+5 -5
View File
@@ -23,10 +23,10 @@ let
hash =
{
x86_64-linux = "sha256-/VkobDCai9+Lac0TCzm9gg/pNFDA1T2OJiad3qdz/2o=";
aarch64-linux = "sha256-glJRQIFSs5D7b3BVblaL0o8Rndh3QuCup45AfRWymG0=";
x86_64-darwin = "sha256-TBCgbaJ5Yyp+I8VCljYf3tlNnVaLkfwusJMlfY+Rggo=";
aarch64-darwin = "sha256-MfJ/zIfmKJN4Fe6a50NwAqvetxB/W+BriQ+5mEIhWMg=";
x86_64-linux = "sha256-+u1WLD/EPkbFcpjMhJqAMzsh4DaaykfPUIzH7D0OLS8=";
aarch64-linux = "sha256-7gbevNNvvf03oVy1wcnD8b1hj5ccPyyMDfPEZyL6cdM=";
x86_64-darwin = "sha256-aQdOaenIv5+7dqRPvChU5UeWwll75/qQXwP7mbZxFXg=";
aarch64-darwin = "sha256-xKqKHEc4DSymmZ12dcs1dqhVhyYB97tdUX1pQFyJpuE=";
}
.${system} or throwSystem;
@@ -35,7 +35,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "codeium";
version = "1.30.18";
version = "1.32.1";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
pkgs/by-name/cu/cunicu/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
}:
buildGoModule rec {
pname = "cunicu";
version = "0.10.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "cunicu";
repo = "cunicu";
rev = "v${version}";
hash = "sha256-rUUJMvT3JkIehoWLOtruUSU8YbKd6mS7Wp2TXwn9aVE=";
hash = "sha256-1y9olRSPu2akvE728oXBr70Pt03xj65R2GaOlZ/7RTg=";
};
vendorHash = "sha256-yFpkYI6ue5LXwRCj4EqWDBaO3TYzZ3Ov/39PRQWMWzk=";
pkgs/by-name/da/dayon/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dayon";
version = "15.0.1";
version = "15.0.2";
src = fetchFromGitHub {
owner = "RetGal";
repo = "dayon";
rev = "v${finalAttrs.version}";
hash = "sha256-3/A8aAWnaPg0sgzWJKU4Ys/R3nXYQj8aFuEVMgzauqQ=";
hash = "sha256-5gpST5c3UGutrGuysBEHWqbj9O5+XagA6fTZ7D/R7Oo=";
};
nativeBuildInputs = [
pkgs/by-name/de/debootstrap/package.nix
+2 -2
View File
@@ -43,14 +43,14 @@ let
in
stdenv.mkDerivation rec {
pname = "debootstrap";
version = "1.0.140";
version = "1.0.140_bpo12+1";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "debootstrap";
rev = "refs/tags/${version}";
hash = "sha256-kusY42HwyMFuzwJimdVzuwx9XGjKssGAR7guB4E0TbQ=";
hash = "sha256-4vINaMRo6IrZ6e2/DAJ06ODy2BWm4COR1JDSY52upUc=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/ds/dsda-launcher/package.nix
+14 -12
View File
@@ -3,16 +3,17 @@
stdenv,
fetchFromGitHub,
qt6,
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dsda-launcher";
version = "1.3.1-hotfix";
version = "1.4";
src = fetchFromGitHub {
owner = "Pedro-Beirao";
repo = "dsda-launcher";
rev = "v${version}";
hash = "sha256-V6VLUl148L47LjKnPe5MZCuhZSMtI0wd18i8b+7jCvk=";
tag = "v${finalAttrs.version}";
hash = "sha256-OMgxhb+9GdLK00nl/df9QiYYewr+YEjdX2KjQWvu1mk=";
};
nativeBuildInputs = [ qt6.wrapQtAppsHook ];
@@ -24,8 +25,8 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
mkdir -p "./dsda-launcher/build"
cd "./dsda-launcher/build"
mkdir -p "./src/build"
cd "./src/build"
qmake6 ..
make
runHook postBuild
@@ -35,18 +36,19 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/bin
cp ./dsda-launcher $out/bin
install -Dm444 ../icons/dsda-Launcher.desktop $out/share/applications/dsda-Launcher.desktop
install -Dm444 ../icons/dsda-launcher.png $out/share/pixmaps/dsda-launcher.png
runHook postInstall
'';
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/Pedro-Beirao/dsda-launcher";
description = "This is a launcher GUI for the dsda-doom source port";
mainProgram = "dsda-launcher";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.Gliczy ];
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ Gliczy ];
};
}
})
pkgs/by-name/fu/fulcio/package.nix
+3 -3
View File
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "fulcio";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
hash = "sha256-TCWZrTqNXTcTsLqTnwnJPXN+kMYVVwLm2J3Y6gd2CV8=";
hash = "sha256-CfkHGHxeDUxHWX98FgmA4RNCVlgi9XA9eYkb+G5cZTA=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -33,7 +33,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-3E2Y0UlJMjTiM4ILEiaNqVmt4fWMvCRAqzm//CvRIl4=";
vendorHash = "sha256-qQsaX/xaqD1qb9wH6riohm+NU49cN3EkO012oz9n4tw=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ge/gerbera/package.nix
+2 -2
View File
@@ -121,13 +121,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gerbera";
version = "2.3.0";
version = "2.4.1";
src = fetchFromGitHub {
repo = "gerbera";
owner = "gerbera";
rev = "v${version}";
sha256 = "sha256-SUMXnVCmrxoEbKKuzh+b7uvIanxilvpDDiH5ihjAm38=";
sha256 = "sha256-bqqD6juae0+plX6kEtHhWYgMd0KDz/1N7jJf7F6dMgQ=";
};
postPatch =
pkgs/by-name/gn/gnu-shepherd/package.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnu-shepherd";
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz";
hash = "sha256-6OavM7AnkMwKVIDXWaQhGobRQdBzrNPJNGtM8BDtnnw=";
hash = "sha256-iV0AUeHMRzsfefY5E3d7TRX4nxbQpyN3QXbaEC4nEMU=";
};
configureFlags = [ "--localstatedir=/" ];
pkgs/by-name/gu/guile-hoot/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "guile-hoot";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitLab {
owner = "spritely";
repo = "guile-hoot";
rev = "v${version}";
hash = "sha256-n8u0xK2qDLGySxiYWH882/tkL8ggu3hivHn3qdDO9eI=";
hash = "sha256-xPU4uLyh3gd2ubyGednCqB3uzKrabhXQhs6vBc8z0ps=";
};
nativeBuildInputs = [
pkgs/by-name/ha/hawkthorne-journey/package.nix
+96
View File
@@ -0,0 +1,96 @@
{
lib,
stdenv,
fetchFromGitHub,
love,
lua,
zip,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
tmx2lua,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hawkthorne-journey";
version = "1.1.0";
src = fetchFromGitHub {
owner = "hawkthorne";
repo = "hawkthorne-journey";
tag = "v${finalAttrs.version}";
hash = "sha256-RhxI2ChkFCBu2FaW2/eHT1KTTjKP++aHDktT+qQ5ooQ=";
};
nativeBuildInputs = [
zip
makeWrapper
copyDesktopItems
];
buildInputs = [
love
lua
tmx2lua
];
buildPhase = ''
runHook preBuild
# Convert TMX maps to Lua
for tmxfile in src/maps/*.tmx; do
tmx2lua "$tmxfile"
done
# Create the .love file
cd src
zip -X -r ../hawkthorne.love . \
-x ".*" \
-x "*.DS_Store" \
-x "psds/*" \
-x "test/*" \
-x "*.tmx" \
-x "maps/test-level.lua" \
-x "*/full_soundtrack.ogg" \
-x "*.bak"
runHook postBuild
'';
installPhase = ''
runHook preInstall
cd ..
mkdir -p $out/share/games/hawkthorne
cp hawkthorne.love $out/share/games/hawkthorne/
mkdir -p $out/bin
makeWrapper ${love}/bin/love $out/bin/hawkthorne \
--add-flags "$out/share/games/hawkthorne/hawkthorne.love"
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "hawkthorne";
exec = "hawkthorne";
icon = "hawkthorne";
desktopName = "Journey to the Center of Hawkthorne";
genericName = "Platform Game";
categories = [
"Game"
"ArcadeGame"
];
})
];
meta = {
description = "Journey to the Center of Hawkthorne - Community Fan Game";
homepage = "https://projecthawkthorne.com";
changelog = "https://github.com/hawkthorne/hawkthorne-journey/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ liberodark ];
mainProgram = "hawkthorne";
};
})
pkgs/by-name/he/hermitcli/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hermit";
version = "0.41.0";
version = "0.42.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "cashapp";
repo = "hermit";
hash = "sha256-pHhGMVlBJAZ9pCv5IsayLw9g1LPIHLmvRczvDPgwj/A=";
hash = "sha256-OaYZMqe1bU5CKfs9IfFmTb3LUvJTFDAkU2uojZ9aRmw=";
};
vendorHash = "sha256-+phwbG2ODhzfzqOJ6IuT/XDzTevPrdOfJH6PKLKeJlM=";
vendorHash = "sha256-GPIJ3IvTM2da962M1FLHKn8OitHDPZ9zp8nSLaeRq10=";
subPackages = [ "cmd/hermit" ];
pkgs/by-name/he/heroku/package.nix
+3 -3
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation {
pname = "heroku";
version = "10.0.0";
version = "10.0.2";
src = fetchzip {
url = "https://cli-assets.heroku.com/versions/10.0.0/b084308/heroku-v10.0.0-b084308-linux-x64.tar.xz";
hash = "sha256-dwFwzOe0t+bXw53Fx96uS/MW25tubT0FDhMSmnzEqEY=";
url = "https://cli-assets.heroku.com/versions/10.0.2/7947ef4/heroku-v10.0.2-7947ef4-linux-x64.tar.xz";
hash = "sha256-+z+oP4KUhlQuhmvXJ8cxkrDJzllww1gybJCst7RIph0=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/ic/icloudpd/package.nix
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication rec {
pname = "icloudpd";
version = "1.26.0";
version = "1.26.1";
pyproject = true;
src = fetchFromGitHub {
owner = "icloud-photos-downloader";
repo = "icloud_photos_downloader";
rev = "v${version}";
hash = "sha256-tythfDw053UjxbiZsT0AqUA9ckzHy5XgJD3Q8B5QRDM=";
hash = "sha256-VCDGOxW4kSfPoSOana94QRPxiGMKdbTY3ZTLcoScJbk=";
};
pythonRelaxDeps = true;
pkgs/by-name/ka/kalamine/package.nix
+4 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "kalamine";
version = "0.22";
version = "0.38";
pyproject = true;
src = fetchFromGitHub {
owner = "OneDeadKey";
repo = "kalamine";
rev = "v${version}";
hash = "sha256-SPXVFeysVF/6RqjhXmlPc+3m5vnVndJb7LQshQZBeg8=";
hash = "sha256-eDOwoI7S0l48oOWWDaBbDlC0A8RtPEA+FDCHpPur0OQ=";
};
nativeBuildInputs = [
@@ -22,7 +22,9 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
click
livereload
lxml
progress
pyyaml
tomli
];
pkgs/by-name/la/lazyjournal/package.nix
+3 -3
View File
@@ -5,7 +5,7 @@
nix-update-script,
}:
let
version = "0.6.0";
version = "0.7.1";
in
buildGoModule {
pname = "lazyjournal";
@@ -15,10 +15,10 @@ buildGoModule {
owner = "Lifailon";
repo = "lazyjournal";
tag = version;
hash = "sha256-6ui9DZKFWX/p0qD2U79+HKNAY6Wy4OtzIm64W1PzPR4=";
hash = "sha256-FFPwifOLikuU7OEDglNFpBtME+3lWjzYMpE8uKz5umQ=";
};
vendorHash = "sha256-jh99+zlhr4ogig4Z2FFO6SZ2qTBkOUuiXo5iNk0VTi0=";
vendorHash = "sha256-1tQ0ZFww9VCnoRzmOQw9RaiRJmTRErAio13uAAKtgTw=";
ldflags = [
"-s"
pkgs/by-name/le/level-zero/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "level-zero";
version = "1.19.2";
version = "1.20.0";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "level-zero";
tag = "v${version}";
hash = "sha256-MnTPu7jsjHR+PDHzj/zJiBKi9Ou/cjJvrf87yMdSnz0=";
hash = "sha256-dn/1EZlEBbmu4p7/5fn6LhQXOEUvI/gtAdHnCnosGEs=";
};
nativeBuildInputs = [
pkgs/by-name/li/liboqs/package.nix
+5 -2
View File
@@ -6,17 +6,18 @@
openssl,
fetchpatch,
enableStatic ? stdenv.hostPlatform.isStatic,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "liboqs";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "open-quantum-safe";
repo = "liboqs";
rev = finalAttrs.version;
hash = "sha256-+Gx1JPrJoeMix9DIF0rJQTivxN1lgaCIYFvJ1pnYZzM=";
hash = "sha256-ngjN1JdmnvMn+UXJeCiBwF1Uf7kTOjHVBL99xzoZVFY=";
};
patches = [
@@ -46,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "C library for prototyping and experimenting with quantum-resistant cryptography";
homepage = "https://openquantumsafe.org";
pkgs/by-name/li/libremidi/package.nix
+6 -2
View File
@@ -17,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "libremidi";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitHub {
owner = "jcelerier";
repo = "libremidi";
rev = "v${finalAttrs.version}";
hash = "sha256-raVBJ75/UmM3P69s8VNUXRE/2jV4WqPIfI4eXaf6UEg=";
hash = "sha256-JwXOIBq+pmPIR4y/Zv5whEyCfpLHmbllzdH2WLZmWLw=";
};
nativeBuildInputs = [
@@ -44,6 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
# Bug: set this as true breaks obs-studio-plugins.advanced-scene-switcher
strictDeps = false;
# PipeWire support currently disabled. Enabling it requires packaging:
# https://github.com/cameron314/readerwriterqueue
cmakeFlags = [ "-DLIBREMIDI_NO_PIPEWIRE=ON" ];
postInstall = ''
cp -r $src/include $out
'';
pkgs/by-name/li/livekit/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "livekit";
version = "1.8.0";
version = "1.8.3";
src = fetchFromGitHub {
owner = "livekit";
repo = "livekit";
rev = "v${version}";
hash = "sha256-KfUhpA5bhomPU5OC4aCQ5WQIC4ICkaLxQO0tunpkIPI=";
hash = "sha256-YzyrALWFdrnP6iAT0zTYKzhf16I3Xf39WsgLXz8rDCw=";
};
vendorHash = "sha256-z5h/r2xC/nEeHk2PLIN+oaGHa8l/xjws79OaDZh9jqE=";
vendorHash = "sha256-v+K4+BbwYKQD4q5egJaxLYozK8tbTra6c22ZzSlwvPE=";
subPackages = [ "cmd/server" ];
pkgs/by-name/li/livi/package.nix
+2 -2
View File
@@ -16,14 +16,14 @@
stdenv.mkDerivation rec {
pname = "livi";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitLab {
owner = "guidog";
repo = "livi";
domain = "gitlab.gnome.org";
rev = "v${version}";
hash = "sha256-4CWH8TWxuDGYlOilxyCa/HL/vtO6A9u/x39s1OLDODo";
hash = "sha256-13hvpYlMDfB6Y0yH2MaowuylKUk1AGv6R7j4E156YpI=";
};
nativeBuildInputs = [
meson
pkgs/by-name/ll/llama-cpp/package.nix
+4 -1
View File
@@ -30,6 +30,7 @@
metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport,
vulkanSupport ? false,
rpcSupport ? false,
curl,
shaderc,
vulkan-headers,
vulkan-loader,
@@ -130,13 +131,15 @@ effectiveStdenv.mkDerivation (finalAttrs: {
++ optionals openclSupport [ clblast ]
++ optionals rocmSupport rocmBuildInputs
++ optionals blasSupport [ blas ]
++ optionals vulkanSupport vulkanBuildInputs;
++ optionals vulkanSupport vulkanBuildInputs
++ [ curl ];
cmakeFlags =
[
# -march=native is non-deterministic; override with platform-specific flags if needed
(cmakeBool "GGML_NATIVE" false)
(cmakeBool "LLAMA_BUILD_SERVER" true)
(cmakeBool "LLAMA_CURL" true)
(cmakeBool "BUILD_SHARED_LIBS" true)
(cmakeBool "GGML_BLAS" blasSupport)
(cmakeBool "GGML_CLBLAST" openclSupport)
pkgs/by-name/ma/matrix-hookshot/package.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"name": "matrix-hookshot",
"version": "6.0.1",
"version": "6.0.2",
"description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
"main": "lib/app.js",
"repository": "https://github.com/matrix-org/matrix-hookshot",
@@ -31,9 +31,9 @@
"start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js",
"start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js",
"start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js",
"test": "mocha -r ts-node/register tests/init.ts 'tests/*.ts' 'tests/**/*.ts'",
"test:e2e": "tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)",
"test:cover": "nyc --reporter=lcov --reporter=text yarn test",
"test": "NODE_OPTIONS=--no-experimental-strip-types mocha -r ts-node/register tests/init.ts 'tests/*.ts' 'tests/**/*.ts'",
"test:e2e": "NODE_OPTIONS=--no-experimental-strip-types tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)",
"test:cover": "NODE_OPTIONS=--no-experimental-strip-types nyc --reporter=lcov --reporter=text yarn test",
"lint": "yarn run lint:js && yarn run lint:rs",
"lint:js": "eslint",
"lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings",
pkgs/by-name/ma/matrix-hookshot/pin.json
+3 -3
View File
@@ -1,6 +1,6 @@
{
"version": "6.0.1",
"srcHash": "sha256-rs4jIRdGriZ2L02gSTqIYuwLE4Xu3avS5+nyHuSyJ/c=",
"version": "6.0.2",
"srcHash": "sha256-uqbKpmqiy0rU8ByMRUqyjGmEdZgAhYiMrh0VEwwcbK8=",
"yarnHash": "0sjc333cl115pm3w69aknf20n85r8nisrdjx1231101zrz01nhhh",
"cargoHash": "sha256-lcY0Eq64oPH0CtL4WhVx6L/Ix/m8mHqum/oLQhu6cNc="
"cargoHash": "sha256-UlPT/ko9d4bUvv3kutNPEISXEbKtegWo2OVKEmUlKrg="
}
pkgs/applications/office/mmex/default.nix → pkgs/by-name/mm/mmex/package.nix
+17 -14
View File
@@ -15,7 +15,8 @@
sqlite,
wxGTK32,
gtk3,
darwin,
lua,
wxsqlite3,
}:
stdenv.mkDerivation rec {
@@ -39,9 +40,9 @@ stdenv.mkDerivation rec {
})
];
postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64) ''
substituteInPlace 3rd/CMakeLists.txt \
--replace "-msse4.2 -maes" ""
postPatch = ''
substituteInPlace src/dbwrapper.cpp src/model/Model_Report.cpp \
--replace-fail "sqlite3mc_amalgamation.h" "sqlite3.h"
'';
nativeBuildInputs =
@@ -59,19 +60,21 @@ stdenv.mkDerivation rec {
lsb-release
];
buildInputs =
[
curl
sqlite
wxGTK32
gtk3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libobjc
];
buildInputs = [
curl
sqlite
wxGTK32
gtk3
lua
wxsqlite3
];
strictDeps = true;
cmakeFlags = [
"-DWXSQLITE3_HAVE_CODEC=1"
];
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isClang [
"-Wno-deprecated-copy"
pkgs/by-name/mp/mpris-timer/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "mpris-timer";
version = "2.0.5";
version = "2.1.1";
src = fetchFromGitHub {
owner = "efogdev";
repo = "mpris-timer";
tag = version;
hash = "sha256-LNaf+nTQHpHOvUXdNzKexXGa0petWp+26UeLqfmjpZw=";
hash = "sha256-uFQJSKQ9k0fiOhzydJ7frs2kns9pSdZGILPGCW3QA1w=";
};
vendorHash = "sha256-vCzQiQsljNyI7nBYvq+C/dv0T186Lsj7rOq5xHMs3c0=";
pkgs/by-name/nu/numcpp/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "numcpp";
version = "2.12.1";
version = "2.13.0";
src = fetchFromGitHub {
owner = "dpilger26";
repo = "NumCpp";
rev = "Version_${finalAttrs.version}";
hash = "sha256-1LGyDvT+PiGRXn7NorcYUjSPzNuRv/YXhQWIaOa7xdo=";
hash = "sha256-+2xd8GNMSKPz801lfMAcHIkmidKd+xM8YblkdFj3HZk=";
};
nativeCheckInputs = [
pkgs/by-name/nz/nzbhydra2/package.nix
+2 -2
View File
@@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
pname = "nzbhydra2";
version = "7.11.3";
version = "7.12.1";
src = fetchzip {
url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
hash = "sha256-OR0Yk0tVajfMtMHisWqBbLeCScgenjyYTmNWTcMG/KE=";
hash = "sha256-QCMsAFRU6THmKiIFvnfUHzmv91gcC1pAztNYg9RymzU=";
stripRoot = false;
};
pkgs/by-name/ok/okteto/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "okteto";
version = "3.3.0";
version = "3.3.1";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
hash = "sha256-0CMCP2ib0MEYJlbDPrbyKYw0yEzxnSx3WlO0iL+D3M0=";
hash = "sha256-9EGtcSOCRtt1Jw/e6EyZ5i4vTpof2fjV+XhF87IrUPU=";
};
vendorHash = "sha256-4fw3Qc1VPrPFVtQNtCRW6RqPqV7aF+t9GQDL/sCqNvw=";
pkgs/by-name/ov/ovn/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "ovn";
version = "24.09.1";
version = "24.09.2";
src = fetchFromGitHub {
owner = "ovn-org";
repo = "ovn";
tag = "v${version}";
hash = "sha256-Fz/YNEbMZ2mB4Fv1nKE3H3XrihehYP7j0N3clnTJ5x8=";
hash = "sha256-MKwta7XRIFpcNWu6duuNaLarlWm0B8+gph1R0qS29wI=";
fetchSubmodules = true;
};
pkgs/by-name/pa/pandoc/package.nix
+6
View File
@@ -39,6 +39,12 @@ in
remove-references-to \
-t ${pandoc-cli.scope.pandoc} \
$out/bin/pandoc
''
# https://github.com/jgm/typst-hs/commit/9707b74ce60d71c2ba0f35249ffbd01dea197a6e
+ lib.optionalString (lib.versionAtLeast pandoc-cli.scope.typst.version "0.6.1") ''
remove-references-to \
-t ${pandoc-cli.scope.typst} \
$out/bin/pandoc
'' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
mkdir -p $out/share/bash-completion/completions
$out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc
pkgs/by-name/pg/pgrok/package.nix
+5 -5
View File
@@ -9,12 +9,12 @@
let
pname = "pgrok";
version = "1.4.1";
version = "1.4.4";
src = fetchFromGitHub {
owner = "pgrok";
repo = "pgrok";
rev = "v${version}";
hash = "sha256-P36rpFi5J+dF6FrVaPhqupG00h4kwr0qumt4ehL/7vU=";
tag = "v${version}";
hash = "sha256-1T3PUMgtEfjbCFmUKwKVofHPCCE0Hw1F18iC0mfh4KQ=";
};
in
@@ -31,12 +31,12 @@ buildGoModule {
pnpm_9.configHook
];
pnpmDeps = pnpm_9.fetchDeps {
env.pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE=";
};
vendorHash = "sha256-X5FjzliIJdfJnNaUXBjv1uq5tyjMVjBbnLCBH/P0LFM=";
vendorHash = "sha256-1s8PPP/Q5bSJleCPZ6P4BwLEan/lelohRKX/0RStdvY=";
ldflags = [
"-s"
pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "plasma-panel-spacer-extended";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "luisbocanegra";
repo = "plasma-panel-spacer-extended";
tag = "v${finalAttrs.version}";
hash = "sha256-3ediynClboG6/dBQTih6jJPGjsTBZhZKOPQAjGLRNmk=";
hash = "sha256-Rr80bI+9xnrlj8JNTL+vGqOw9/98R0ub0pQfHQmEWNM=";
};
nativeBuildInputs = [
pkgs/by-name/po/polarity/Cargo.lock
Generated
+29 -40
View File
@@ -133,7 +133,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -171,7 +171,6 @@ dependencies = [
name = "ast"
version = "0.1.0"
dependencies = [
"codespan",
"derivative",
"fxhash",
"miette",
@@ -329,7 +328,7 @@ checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -346,7 +345,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -556,7 +555,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -565,14 +564,6 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
[[package]]
name = "codespan"
version = "0.11.1"
source = "git+https://github.com/polarity-lang/codespan.git?rev=91e4f64801cee923661097eb35e05a782996d8ea#91e4f64801cee923661097eb35e05a782996d8ea"
dependencies = [
"url",
]
[[package]]
name = "colorchoice"
version = "1.0.3"
@@ -748,7 +739,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -782,11 +773,12 @@ dependencies = [
"ast",
"async-trait",
"backend",
"codespan",
"elaborator",
"log",
"lowering",
"lsp-types",
"miette",
"miette_util",
"parser",
"printer",
"ropey",
@@ -807,7 +799,6 @@ name = "elaborator"
version = "0.1.0"
dependencies = [
"ast",
"codespan",
"derivative",
"log",
"miette",
@@ -1059,7 +1050,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -1436,7 +1427,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -1702,7 +1693,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex-syntax 0.8.5",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -1719,12 +1710,12 @@ name = "lowering"
version = "0.1.0"
dependencies = [
"ast",
"codespan",
"log",
"miette",
"miette_util",
"num-bigint",
"parser",
"printer",
"thiserror",
"url",
]
@@ -1762,7 +1753,6 @@ version = "0.1.0"
dependencies = [
"ast",
"async-lock 2.8.0",
"codespan",
"driver",
"miette",
"miette_util",
@@ -1843,14 +1833,13 @@ checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
name = "miette_util"
version = "0.1.0"
dependencies = [
"codespan",
"miette",
]
@@ -2036,7 +2025,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -2105,13 +2094,13 @@ dependencies = [
name = "parser"
version = "0.1.0"
dependencies = [
"codespan",
"derivative",
"lalrpop 0.19.12",
"lalrpop 0.20.2",
"lalrpop-util 0.20.2",
"logos",
"miette",
"miette_util",
"num-bigint",
"thiserror",
"url",
@@ -2646,7 +2635,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -2669,7 +2658,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -2798,9 +2787,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.94"
version = "2.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
dependencies = [
"proc-macro2",
"quote",
@@ -2824,7 +2813,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -3047,7 +3036,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -3206,7 +3195,7 @@ source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc39
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -3234,7 +3223,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -3251,9 +3240,9 @@ name = "transformations"
version = "0.1.0"
dependencies = [
"ast",
"codespan",
"derivative",
"miette",
"miette_util",
"thiserror",
"url",
]
@@ -3430,7 +3419,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
"wasm-bindgen-shared",
]
@@ -3466,7 +3455,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3681,7 +3670,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
"synstructure",
]
@@ -3703,7 +3692,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
[[package]]
@@ -3723,7 +3712,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
"synstructure",
]
@@ -3752,5 +3741,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
"syn 2.0.95",
]
pkgs/by-name/po/polarity/package.nix
+3 -4
View File
@@ -7,19 +7,18 @@
rustPlatform.buildRustPackage rec {
pname = "polarity";
version = "latest-unstable-2025-01-08";
version = "latest-unstable-2025-01-23";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "bbc91efbc25f77f505d244e96cc566f63f6dc858";
hash = "sha256-3wKMFX4ubp8bLNhdLoMkZlsP2vfu0wcNpEZrs95xwAY=";
rev = "b5449d485a86fec9d88621cc38fcdfd9b4c3c2d1";
hash = "sha256-MFem+/7LegSXJXlIQkaVLbTfxvuG46V10TI06NohQ9A=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"codespan-0.11.1" = "sha256-0cUndjWQ44X5zXVfg7YX/asBByWq/hFV1n9tHPBTcfY=";
"tower-lsp-0.20.0" = "sha256-f3S2CyFFX6yylaxMoXhB1/bfizVsLfNldLM+dXl5Y8k=";
};
};
pkgs/by-name/pr/proxychains-ng/package.nix
+19 -2
View File
@@ -2,6 +2,9 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
# "dlsym" for OSX version < 12
darwinHookMethod ? "dyld",
}:
stdenv.mkDerivation rec {
@@ -18,6 +21,16 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/NixOS/nixpkgs/issues/136093
./swap-priority-4-and-5-in-get_config_path.patch
# The fix is not present in v4.17; remove the patch next version update.
# https://github.com/rofl0r/proxychains-ng/issues/557
(fetchpatch {
url = "https://github.com/rofl0r/proxychains-ng/commit/fffd2532ad34bdf7bf430b128e4c68d1164833c6.patch";
hash = "sha256-l3qSFUDMUfVDW1Iw+R2aW/wRz4CxvpR4eOwx9KzuAAo=";
})
];
configureFlags = lib.optionals stdenv.isDarwin [
"--hookmethod=${darwinHookMethod}"
];
installFlags = [
@@ -29,7 +42,11 @@ stdenv.mkDerivation rec {
description = "Preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies";
homepage = "https://github.com/rofl0r/proxychains-ng";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ zenithal ];
platforms = platforms.linux ++ [ "aarch64-darwin" ];
maintainers = with maintainers; [
zenithal
usertam
];
platforms = platforms.unix;
mainProgram = "proxychains4";
};
}
pkgs/by-name/py/pyrosimple/package.nix
+2 -2
View File
@@ -11,14 +11,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "pyrosimple";
version = "2.14.1";
version = "2.14.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "kannibalox";
repo = pname;
tag = "v${version}";
hash = "sha256-vYwdlFHfh59P62aYbaQSJJfkFC0WtX2UYmww3k30j08=";
hash = "sha256-qER73B6wuRczwV23A+NwfDL4oymvSwmauA0uf2AE+kY=";
};
pythonRelaxDeps = [
pkgs/by-name/qu/quarkus/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "quarkus-cli";
version = "3.17.5";
version = "3.17.7";
src = fetchurl {
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
hash = "sha256-EFSL1FDbpZ7uue+MHeeKp+2+Hp4Hi7lCOIBww4/k9yE=";
hash = "sha256-9crGXv5q7VKnOAgH3UPo5EayaZDDwRKpw275JaKnWoE=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/ro/rocksndiamonds/package.nix
+2 -2
View File
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "rocksndiamonds";
version = "4.4.0.0";
version = "4.4.0.2";
src = fetchurl {
url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz";
hash = "sha256-aKHHD/v+zqxCsOYp06nqB2TShlwCwE1JaU0adO4T4Cw=";
hash = "sha256-qE78cJIEwWN6b54VhJwqFKLXvTgHdL1+Upy1DJnfWD8=";
};
desktopItem = makeDesktopItem {
pkgs/by-name/ru/ruff/package.nix
+4 -4
View File
@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
tag = version;
hash = "sha256-DKDSjiN7Ve/1mHWXoYOIdJ67MRoJYDR59VuVmfwYJHs=";
hash = "sha256-V05GUo5nA6RhVWD7mn94GF3/93In3cnljd2G3hPeBZ0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-eIiR7pvSOZdB1lTPLtdriO9lkufFY/gX5d2ku53g2vE=";
cargoHash = "sha256-FpybUZZ5qjo87fYbUAnK+w4cUPx4UWGzexL92cEnIFU=";
nativeBuildInputs = [ installShellFiles ];
@@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec {
};
meta = {
description = "Extremely fast Python linter";
description = "Extremely fast Python linter and code formatter";
homepage = "https://github.com/astral-sh/ruff";
changelog = "https://github.com/astral-sh/ruff/releases/tag/${version}";
license = lib.licenses.mit;
pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+3 -3
View File
@@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2025-01-08";
cargoHash = "sha256-5PRfmjDamboKf77oeCOG1EPlsDvqjQzRZavFyN3gLK8=";
version = "2025-01-20";
cargoHash = "sha256-z4HT3m1nSWsptA4+kduT1HGhn6S81x/ztat+1xnzKeQ=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
hash = "sha256-dzslslI/5YEppCztz4FZ1VwXnb4SbuXWbSvDuWs0KKI=";
hash = "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I=";
};
cargoBuildFlags = [
pkgs/by-name/sc/scap-security-guide/package.nix
Executable
+84
View File
@@ -0,0 +1,84 @@
{
ansible-lint,
bats,
cmake-lint,
cmake,
fetchFromGitHub,
lib,
libxml2,
libxslt,
linkchecker,
openscap,
python3Packages,
stdenv,
shellcheck,
yamllint,
}:
stdenv.mkDerivation rec {
pname = "scap-security-guide";
version = "0.1.75";
src = fetchFromGitHub {
owner = "ComplianceAsCode";
repo = "content";
tag = "v${version}";
hash = "sha256-fS0zvWIKyGAhqgBzFuELA/1iJa4N0whsnc9h/uwA3Ao=";
};
postPatch = ''
substituteInPlace build-scripts/generate_guides.py \
--replace-fail "XCCDF_GUIDE_XSL = None" "XCCDF_GUIDE_XSL = \"${openscap}/share/openscap/xsl/xccdf-guide.xsl\""
'';
nativeBuildInputs =
with python3Packages;
[
sphinx
sphinxcontrib-jinjadomain
sphinx-rtd-theme
sphinx-jinja
]
++ [
cmake-lint
cmake
];
buildInputs =
with python3Packages;
[
ansible
jinja2
json2html
myst-parser
mypy
openpyxl
pcre2-py
pygithub
pyyaml
pandas
pycompliance
prometheus-async
ruamel-yaml
voluptuous-stubs
yamllint
]
++ [
ansible-lint
bats
libxslt
libxml2
linkchecker
openscap
shellcheck
yamllint
];
meta = {
description = "Security automation content in SCAP, Bash, Ansible, and other formats";
homepage = "https://github.com/ComplianceAsCode/content";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ tochiaha ];
platforms = lib.platforms.all;
};
}
pkgs/by-name/se/sesh/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "sesh";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "joshmedeski";
repo = "sesh";
rev = "v${version}";
hash = "sha256-wMYur/IRlJRIkCFAhjWcWMu4ApQD81SCRCsS/1GvxLQ=";
hash = "sha256-ndHi7GSdc+BJ7eYRt9ZE+eabZbFlYKJ9AqTY6Xs53QI=";
};
vendorHash = "sha256-a45P6yt93l0CnL5mrOotQmE/1r0unjoToXqSJ+spimg=";
vendorHash = "sha256-3wNp1meUoUFPa2CEgKjuWcu4I6sxta3FPFvCb9QMQhQ=";
ldflags = [ "-s" "-w" ];
pkgs/by-name/sh/shader-slang/package.nix
+2 -2
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2025.2";
version = "2025.3";
src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-H/ePYu6o926M22zussW1f15iYRJCq29TeNJzBD0eAao=";
hash = "sha256-kEW36pAo10xm3qY47hXTAjiXF74qa5rfDlQ6/gcGHqs=";
fetchSubmodules = true;
};
pkgs/by-name/si/sirikali/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "sirikali";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "sirikali";
rev = version;
hash = "sha256-zEiX0eAsmfWDXehxetkqXbdXhB53DE5LDyglMBijckI=";
hash = "sha256-YGMmDatTKjhORTisX9kTVrpIWo6j0YkxZsDLJXga6ho=";
};
buildInputs =
pkgs/by-name/sp/spirit/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "spirit";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "cashapp";
repo = "spirit";
rev = "v${version}-prerelease";
hash = "sha256-mI4nO/yQdCrqxCDyOYQPQ905EVreYPEiupe+F4RjIqw=";
hash = "sha256-qC27kkUWELRFEVhZT7R6ickpAfDbL/AtYx2gRkDTvrI=";
};
vendorHash = "sha256-es1PGgLoE3DklnQziRjWmY7f6NNVd24L2JiuLkol6HI=";
vendorHash = "sha256-Dq7UeAH7FvY12rEYkpcKpEUzMMrGfubt0WadnZYt8dk=";
subPackages = [ "cmd/spirit" ];
pkgs/by-name/st/storj-uplink/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.119.15";
version = "1.120.4";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-XKTsgSkcVZ/2iYnEP0eeLjLEM4c2w9+XhvBqRFQAW+U=";
hash = "sha256-Ze3eQCySw3S6sKXwJCW6M+UV1FWp47syCWxIQdKttOs=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-eYFdoc5gtY7u9LFT7EAnooxrOC1y9fIA0ESTP+rPpCc=";
vendorHash = "sha256-kLXrKFJ/g2xenYTZ13loaZ7XAgRhmo2Iwen7P4esBIs=";
ldflags = [
"-s"
pkgs/by-name/sv/svelte-language-server/package-lock.json
Generated
+19 -19
View File
@@ -1,12 +1,12 @@
{
"name": "svelte-language-server",
"version": "0.17.8",
"version": "0.17.10",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "svelte-language-server",
"version": "0.17.8",
"version": "0.17.10",
"license": "MIT",
"dependencies": {
"@jridgewell/trace-mapping": "^0.3.25",
@@ -20,7 +20,7 @@
"prettier-plugin-svelte": "^3.3.0",
"svelte": "^4.2.19",
"svelte2tsx": "~0.7.25",
"typescript": "~5.6.3",
"typescript": "^5.7.2",
"typescript-auto-import-cache": "^0.3.5",
"vscode-css-languageservice": "~6.3.0",
"vscode-html-languageservice": "~5.3.0",
@@ -239,9 +239,9 @@
"license": "MIT"
},
"node_modules/@types/lodash": {
"version": "4.17.13",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
"integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
"version": "4.17.14",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.14.tgz",
"integrity": "sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==",
"dev": true,
"license": "MIT"
},
@@ -253,9 +253,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "18.19.68",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.68.tgz",
"integrity": "sha512-QGtpFH1vB99ZmTa63K4/FU8twThj4fuVSBkGddTp7uIL/cuoLWIUSL2RcOaigBhfR+hg5pgGkBnkoOxrTVBMKw==",
"version": "18.19.70",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.70.tgz",
"integrity": "sha512-RE+K0+KZoEpDUbGGctnGdkrLFwi1eYKTlIHNl2Um98mUkGsm1u2Ff6Ltd0e8DktTtC98uy7rSj+hO8t/QuLoVQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1480,12 +1480,12 @@
}
},
"node_modules/readdirp": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
"integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.1.tgz",
"integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==",
"license": "MIT",
"engines": {
"node": ">= 14.16.0"
"node": ">= 14.18.0"
},
"funding": {
"type": "individual",
@@ -1708,9 +1708,9 @@
}
},
"node_modules/svelte2tsx": {
"version": "0.7.31",
"resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.31.tgz",
"integrity": "sha512-exrN1o9mdCLAA7hTCudz731FIxomH/0SN9ZIX+WrY/XnlLuno/NNC1PF6JXPZVqp/4sMMDKteqyKoG44hliljQ==",
"version": "0.7.34",
"resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.34.tgz",
"integrity": "sha512-WTMhpNhFf8/h3SMtR5dkdSy2qfveomkhYei/QW9gSPccb0/b82tjHvLop6vT303ZkGswU/da1s6XvrLgthQPCw==",
"license": "MIT",
"dependencies": {
"dedent-js": "^1.0.1",
@@ -1805,9 +1805,9 @@
}
},
"node_modules/typescript": {
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
"integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
"version": "5.7.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
"integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
"license": "Apache-2.0",
"bin": {
"tsc": "bin/tsc",
pkgs/by-name/sv/svelte-language-server/package.nix
+3 -3
View File
@@ -4,7 +4,7 @@
fetchurl,
}:
let
version = "0.17.8";
version = "0.17.10";
in
buildNpmPackage {
pname = "svelte-language-server";
@@ -12,10 +12,10 @@ buildNpmPackage {
src = fetchurl {
url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
hash = "sha256-IbLjoXLN8sdnGy5SmoEeJUl1BzCulptMFtbJc+IRH70=";
hash = "sha256-KGsiYv57EnY5Atynuv1Qk0i/vq07FCbHuI9OOkyxOvE=";
};
npmDepsHash = "sha256-2rCgzEkwht03jxusPCdemA8EOabwRsHeDxiV4Uf4K8g=";
npmDepsHash = "sha256-Gph0papxZnN0BKbzhwyOeNQwtYI1QkWupG6RRaUiv8U=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
pkgs/by-name/sw/swiftlint/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "swiftlint";
version = "0.58.0";
version = "0.58.2";
src = fetchurl {
url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip";
hash = "sha256-Mp8S0f/xn3XHF4/doLF5s/kvhE+X6KiswY+3lZ/J4wc=";
hash = "sha256-rQcdWjbX9Ddt/pLX7Z9LrvizvedbdRMdwofPNPEDU6U=";
};
dontPatch = true;
pkgs/by-name/ta/taler-wallet-core/package.nix
+4 -4
View File
@@ -7,7 +7,7 @@
fetchgit,
srcOnly,
removeReferencesTo,
nodejs,
nodejs_20,
pnpm_9,
python3,
git,
@@ -15,7 +15,7 @@
zip,
}:
let
nodeSources = srcOnly nodejs;
nodeSources = srcOnly nodejs_20;
esbuild' = esbuild.override {
buildGoModule =
args:
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
customPython
nodejs
nodejs_20
pnpm_9.configHook
git
jq
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-BVVmv0VVvQ2YhL0zOKiM1oVKJKvqwMGNR47DkcCj874=";
};
buildInputs = [ nodejs ];
buildInputs = [ nodejs_20 ];
# Make a fake git repo with a commit.
# Without this, the package does not build.
pkgs/by-name/ti/tinty/package.nix
+3 -3
View File
@@ -6,7 +6,7 @@
nix-update-script,
}:
let
version = "0.24.0";
version = "0.26.0";
in
rustPlatform.buildRustPackage {
pname = "tinty";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
owner = "tinted-theming";
repo = "tinty";
tag = "v${version}";
hash = "sha256-Yvwls9bh8YN8/jKC889soCSotLSBU9hJWz95szOdJ2k=";
hash = "sha256-tQW8z0Gtxh0cnMwm9oN3PyOQW7YFVXG2LDkljudMDp0=";
};
cargoHash = "sha256-jSKhKcBcURjizUZlqZmL5UT19gvNzHinD4rMQ3jMgVw=";
cargoHash = "sha256-R4mY/jo8uP0aPQy2+u2vtjibRMNJrWvgbCH4kptrO4U=";
# Pretty much all tests require internet access
doCheck = false;
pkgs/by-name/tm/tmx2lua/package.nix
+28
View File
@@ -0,0 +1,28 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "tmx2lua";
version = "1.0.1";
src = fetchFromGitHub {
owner = "hawkthorne";
repo = "tmx2lua";
tag = "v${version}";
hash = "sha256-vORmsr1hcdPzZYZZJ9GTOJ5B/fT2sp47Kc1dzbgDW9M=";
};
vendorHash = "sha256-Vfr5/lhpb+Qdhi4Z/yCbUUyd5DvI3z8UfUfxx+975iQ=";
meta = {
description = "Convert TMX files to Lua for LÖVE";
homepage = "https://github.com/hawkthorne/tmx2lua";
changelog = "https://github.com/hawkthorne/tmx2lua/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ liberodark ];
mainProgram = "tmx2lua";
};
}
pkgs/by-name/ug/ugs/package.nix
+2 -2
View File
@@ -19,11 +19,11 @@ let
in
stdenv.mkDerivation rec {
pname = "ugs";
version = "2.1.9";
version = "2.1.12";
src = fetchzip {
url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip";
hash = "sha256-cZlBIafz+SZHP5xY6PupoCrbCng9lx9mbixBWiV6ufQ=";
hash = "sha256-HJMJ9bPo7YGQOrI5eM0MRPDoPawyWcr0YY2CBBkijpA=";
};
dontUnpack = true;
pkgs/by-name/va/vale/package.nix
+3 -3
View File
@@ -11,7 +11,7 @@
buildGoModule rec {
pname = "vale";
version = "3.9.3";
version = "3.9.4";
subPackages = [ "cmd/vale" ];
@@ -19,10 +19,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
hash = "sha256-2IvVF/x8n1zvVXHAJLAFuDrw0Oi/RuQDa851SBlyRIk=";
hash = "sha256-F677sYL49U7egbseDdcWtMRomMkZV7NBeOvEKmz2LwE=";
};
vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";
vendorHash = "sha256-zjJICe3T3fmyqf3HJbUOaOXOb2GdhAufSFiJTjxauZY=";
ldflags = [
"-s"
pkgs/by-name/vi/vikunja/nodejs-22.12-tailwindcss-update.patch
+3060
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/vi/vikunja/package.nix
+5 -1
View File
@@ -23,16 +23,20 @@ let
pname = "vikunja-frontend";
inherit version src;
patches = [
./nodejs-22.12-tailwindcss-update.patch
];
sourceRoot = "${finalAttrs.src.name}/frontend";
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs)
pname
version
patches
src
sourceRoot
;
hash = "sha256-D2dOyYsdsNV1ZSQdjpy6rfoix7yBACEHj/2XyHb7HWE=";
hash = "sha256-94ZlywOZYmW/NsvE0dtEA81MeBWGUrJsBXTUauuOmZM=";
};
nativeBuildInputs = [
pkgs/by-name/vt/vttest/package.nix
+2 -2
View File
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "vttest";
version = "20241204";
version = "20241208";
src = fetchurl {
urls = [
"https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz"
"ftp://ftp.invisible-island.net/vttest/vttest-${version}.tgz"
];
sha256 = "sha256-cBDDK2Qllo7NfuxD2J8sbGdElPc7Isjnxm2t8hwjG/8=";
sha256 = "sha256-j+47rH6H1KpKIXvSs4q5kQw7jPmmBbRQx2zMCtKmUZ0=";
};
meta = with lib; {
pkgs/by-name/wa/walker/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
buildGoModule rec {
pname = "walker";
version = "0.11.19";
version = "0.12.10";
src = fetchFromGitHub {
owner = "abenz1267";
repo = "walker";
rev = "v${version}";
hash = "sha256-dt6dGl/1KGmnG8g9iv+EL7xYXVVy48tizg9aGunh1QU=";
hash = "sha256-nrt/uHHAtnQbOwzXCfNrdk/ywRUWWLLpy9PO2VkGwkQ=";
};
vendorHash = "sha256-urAtl2aSuNw7UVnuacSACUE8PCwAsrRQbuMb7xItjao=";
pkgs/by-name/wa/waytrogen/package.nix
+59
View File
@@ -0,0 +1,59 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
wrapGAppsHook4,
glib,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "waytrogen";
version = "0.5.8";
src = fetchFromGitHub {
owner = "nikolaizombie1";
repo = "waytrogen";
tag = version;
hash = "sha256-tq5cC0Z0kmrYopOGbdoAERBHQXrAw799zWdQP06rTYw=";
};
cargoHash = "sha256-05YfQBezDbQ8KfNvl/4Av5vf/rxJU3Ej6RDgSnSfjtM=";
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
];
buildInputs = [
glib
];
postBuild = ''
install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas
glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
'';
postInstall = ''
install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop
install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Lightning fast wallpaper setter for Wayland";
longDescription = ''
A GUI wallpaper setter for Wayland that is a spiritual successor
for the minimalistic wallpaper changer for X11 nitrogen. Written purely
in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers.
'';
homepage = "https://github.com/nikolaizombie1/waytrogen";
changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "waytrogen";
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ze/zed-editor/package.nix
+3 -3
View File
@@ -95,7 +95,7 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "zed-editor";
version = "0.170.1";
version = "0.170.2";
outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
@@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec {
owner = "zed-industries";
repo = "zed";
tag = "v${version}";
hash = "sha256-prRBByJGzwwLowFX9P/k1QvjMvYk8yrvkSToK1RYJPQ=";
hash = "sha256-E9p/JHHIQ2nQ6LeFob1tDf6UopeEWL/Z7INstehvfEI=";
};
patches = [
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-40Pif9JYN9uKqXTmaTMriYEvZ7DkcbNCif5h7YdiceY=";
cargoHash = "sha256-A9sTR5MCLXskhvJHVGRQ/rSLwOKqhfgJi5zaGsgglL0=";
nativeBuildInputs =
[
pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
+3 -18
View File
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
testers,
cmake,
@@ -32,7 +31,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-app-launch";
version = "0.1.9";
version = "0.1.11";
outputs =
[
@@ -46,25 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-app-launch";
rev = finalAttrs.version;
hash = "sha256-vuu6tZ5eDJN2rraOpmrDddSl1cIFFBSrILKMJqcUDVc=";
tag = finalAttrs.version;
hash = "sha256-5/8RCtDvCBtxyb65WhT63jL4TryMvJfHTSieb/vTs9I=";
};
patches = [
# Remove when version > 0.1.9
(fetchpatch {
name = "0001-lomiri-app-launch-Fix-typelib-gir-dependency.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/8466e77914e73801499df224fcd4a53c4a0eab25.patch";
hash = "sha256-11pEhFi39Cvqb9Hg47kT8+5hq+bz6WmySqaIdwt1MVk=";
})
# Remove when version > 0.1.9
(fetchpatch {
name = "0002-lomiri-app-launch-Fix-parallel-access-to-_iconFinders.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/74da7db2d59e91d95129dcaa5f6d8960fbc32eca.patch";
hash = "sha256-3r12eS9uLJIoBqSiKE2xnkfrJ7uPhyvYxXsxXs0cykg=";
})
# Use /run/current-system/sw/bin fallback for desktop file Exec= lookups, propagate to launched applications
./2001-Inject-current-system-PATH.patch
];
pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
+13 -21
View File
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
cmake,
dbus,
@@ -15,35 +14,27 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-notifications";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-notifications";
rev = finalAttrs.version;
hash = "sha256-EGslfTgfADrmVGhNLG7HWqcDKhu52H/r41j7fxoliko=";
tag = finalAttrs.version;
hash = "sha256-d3fJiYGAYF5e6XPuZ26Lrjj8tUiquunMLDLs9PdAYcA=";
};
patches = [
# Drop use of deprecated qt5_use_modules
# Remove when https://gitlab.com/ubports/development/core/lomiri-notifications/-/merge_requests/11 merged & in release
(fetchpatch {
url = "https://gitlab.com/OPNA2608/lomiri-notifications/-/commit/5d164d6d8d68efe1d14154eca4d0d736ce2a1265.patch";
hash = "sha256-nUg0zUft1n4AlotOaZgDqWbiVDvWvMizdlClavwygoI=";
})
];
postPatch =
''
substituteInPlace CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
# Need to replace prefix to not try to install into lomiri-api prefix
substituteInPlace src/CMakeLists.txt \
--replace '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir'
--replace-fail '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir'
''
+ lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
sed -i CMakeLists.txt -e '/add_subdirectory(test)/d'
substituteInPlace CMakeLists.txt \
--replace-fail 'add_subdirectory(test)' ""
'';
strictDeps = true;
@@ -71,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
# In case anything still depends on deprecated hints
"-DENABLE_UBUNTU_COMPAT=ON"
(lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -85,11 +76,12 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = gitUpdater { };
meta = with lib; {
meta = {
description = "Free Desktop Notification server QML implementation for Lomiri";
homepage = "https://gitlab.com/ubports/development/core/lomiri-notifications";
license = licenses.gpl3Only;
maintainers = teams.lomiri.members;
platforms = platforms.linux;
changelog = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;
};
})
pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
+9 -14
View File
@@ -34,13 +34,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-indicator-network";
version = "1.0.2";
version = "1.1.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-indicator-network";
rev = finalAttrs.version;
hash = "sha256-9AQCWCZFbt4XcmKsjoTXJlWOm02/kBhpPxbHRtftNFM=";
tag = finalAttrs.version;
hash = "sha256-pN5M5VKRyo6csmI/vrmp/bonnap3oEdPuHAUJ1PjdOs=";
};
outputs = [
@@ -49,21 +49,16 @@ stdenv.mkDerivation (finalAttrs: {
"doc"
];
patches = [
# Move to new lomiri-indicators target
# Remove when version > 1.0.2
(fetchpatch {
name = "0001-lomiri-indicator-network-lomiri-indicators-target.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/commit/b1e1f7da4b298964eba3caea37b1dace7a6182e9.patch";
hash = "sha256-pZKpEn2OJtB1pG/U+6IjtPGiOchRDhdbBHEZbTW7Lx0=";
})
];
postPatch = ''
# Override original prefixes
substituteInPlace data/CMakeLists.txt \
--replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
# Fix typo
# Remove when https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/merge_requests/131 merged & in release
substituteInPlace src/indicator/nmofono/wwan/modem.cpp \
--replace-fail 'if (m_isManaged = managed)' 'if (m_isManaged == managed)'
'';
strictDeps = true;
@@ -115,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \
--replace '/bin/false' '${lib.getExe' coreutils "false"}'
--replace-fail '/bin/false' '${lib.getExe' coreutils "false"}'
'';
passthru = {
pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch
+25
View File
@@ -0,0 +1,25 @@
From e8893fcae7e732c9e15ccd6d54a62b5b3862e445 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 16 Jan 2025 17:12:36 +0100
Subject: [PATCH 1/5] doc/liblomiri-thumbnailer-qt: Honour CMAKE_INSTALL_DOCDIR
---
doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
index 91e12a0..3e96f80 100644
--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
@@ -28,7 +28,7 @@ add_doxygen(
)
install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html
- DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc/liblomiri-thumbnailer-qt)
+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
add_subdirectory(examples)
--
2.47.0
pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch
+97
View File
@@ -0,0 +1,97 @@
From 37687a195052186432923276bc2c2358b3622ab1 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 16 Jan 2025 17:12:44 +0100
Subject: [PATCH 2/5] Re-enable documentation
---
CMakeLists.txt | 6 +++++-
debian/liblomiri-thumbnailer-qt-doc.install | 1 +
...lomiri-thumbnailer-qt-doc.install.disabled | 1 -
doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 21 ++++++++-----------
4 files changed, 15 insertions(+), 14 deletions(-)
create mode 100644 debian/liblomiri-thumbnailer-qt-doc.install
delete mode 100644 debian/liblomiri-thumbnailer-qt-doc.install.disabled
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 464ac70..cade10f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,11 @@ if (${BUILD_TESTING})
endif()
add_subdirectory(include)
add_subdirectory(man)
-#add_subdirectory(doc)
+
+option(ENABLE_DOC "Build documentation" ON)
+if(ENABLE_DOC)
+ add_subdirectory(doc)
+endif()
#enable_coverage_report(
# TARGETS
diff --git a/debian/liblomiri-thumbnailer-qt-doc.install b/debian/liblomiri-thumbnailer-qt-doc.install
new file mode 100644
index 0000000..ff56aee
--- /dev/null
+++ b/debian/liblomiri-thumbnailer-qt-doc.install
@@ -0,0 +1 @@
+usr/share/doc/lomiri-thumbnailer/*
diff --git a/debian/liblomiri-thumbnailer-qt-doc.install.disabled b/debian/liblomiri-thumbnailer-qt-doc.install.disabled
deleted file mode 100644
index db055cf..0000000
--- a/debian/liblomiri-thumbnailer-qt-doc.install.disabled
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/liblomiri-thumbnailer-qt/*
diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
index 3e96f80..fe98e4c 100644
--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
@@ -1,35 +1,32 @@
-include(UseDoxygen OPTIONAL)
+find_package(DoxygenBuilder REQUIRED)
file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/lomiri/thumbnailer/qt/*.h")
add_doxygen(
liblomiri-thumbnailer-qt-doc
+ PROJECT_NAME
+ "Thumbnailer Qt API"
INPUT
${CMAKE_CURRENT_SOURCE_DIR}/tutorial.dox
${libthumbnailer_headers}
- OUTPUT_DIRECTORY
- ${CMAKE_BINARY_DIR}/doc/liblomiri-thumbnailer-qt
+ EXAMPLE_PATH
+ ${CMAKE_CURRENT_SOURCE_DIR}
STRIP_FROM_PATH
"${CMAKE_SOURCE_DIR}/src"
STRIP_FROM_INC_PATH
"${CMAKE_SOURCE_DIR}/include"
+ DOXYFILE_IN
+ ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
EXCLUDE_PATTERNS
*/internal/*
EXCLUDE_SYMBOLS
*::internal*
*::Priv
- EXAMPLE_PATH
- ${CMAKE_CURRENT_SOURCE_DIR}
- DOXYFILE_IN
- ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
- PROJECT_NAME
- "Thumbnailer Qt API"
+ INSTALL
+ ${CMAKE_INSTALL_DOCDIR}
ALL
)
-install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
add_subdirectory(examples)
list(APPEND UNIT_TEST_TARGETS qt_example_test)
--
2.47.0
pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch
+25
View File
@@ -0,0 +1,25 @@
From 010d19f85f4f8d73f96f054e5d293951fae1f9de Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 16 Jan 2025 17:12:45 +0100
Subject: [PATCH 3/5] doc/liblomiri-thumbnailer-qt/examples: Drop
qt5_use_modules usage
Leftover from a0d81863f3f48717507cfa181030a8ffb0c4e881
---
doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
index db8139f..825a821 100644
--- a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
+++ b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
@@ -1,6 +1,5 @@
include_directories(${CMAKE_BINARY_DIR}/tests ${CMAKE_SOURCE_DIR}/tests)
add_executable(qt_example_test qt_example_test.cpp)
-qt5_use_modules(qt_example_test Core Gui Network Test)
target_link_libraries(qt_example_test
gtest
Qt5::Core
--
2.47.0
pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch
+131
View File
@@ -0,0 +1,131 @@
From ffec02835aa44e93c96c48b7a33be3f51a3571a1 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 16 Jan 2025 17:12:46 +0100
Subject: [PATCH 4/5] Re-enable coverge reporting
---
CMakeLists.txt | 51 +++++++++++++--------
doc/CMakeLists.txt | 6 ++-
doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 8 ++--
tests/CMakeLists.txt | 2 -
4 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cade10f..cbfd9c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,14 @@ endif()
include(CTest)
-#include(EnableCoverageReport)
+if (cmake_build_type_lower MATCHES coverage)
+ find_package(CoverageReport REQUIRED)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -coverage" )
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -coverage" )
+endif()
+
include(cmake/UseGSettings.cmake)
@@ -169,6 +176,8 @@ include_directories(${TAGLIB_DEPS_INCLUDE_DIRS})
include_directories(include)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+set(UNIT_TEST_TARGETS "")
+
add_subdirectory(src)
add_subdirectory(data)
add_subdirectory(plugins/Lomiri/Thumbnailer.0.1)
@@ -190,22 +199,24 @@ if(ENABLE_DOC)
add_subdirectory(doc)
endif()
-#enable_coverage_report(
-# TARGETS
-# recovery_test # Need to turn on coverage for this, to get the helper template instrumented.
-# testutils
-# test-seq
-# thumbnailer-admin
-# thumbnailer-qml
-# thumbnailer-qml-static
-# lomiri-thumbnailer-qt
-# thumbnailer-service
-# thumbnailer-static
-# vs-thumb
-# vs-thumb-static
-# FILTER
-# ${CMAKE_SOURCE_DIR}/tests/*
-# ${CMAKE_BINARY_DIR}/*
-# TESTS
-# ${UNIT_TEST_TARGETS}
-#)
+if (cmake_build_type_lower MATCHES coverage)
+ enable_coverage_report(
+ TARGETS
+ recovery_test # Need to turn on coverage for this, to get the helper template instrumented.
+ testutils
+ test-seq
+ lomiri-thumbnailer-admin
+ LomiriThumbnailer-qml
+ thumbnailer-qml-static
+ lomiri-thumbnailer-qt
+ thumbnailer-service
+ thumbnailer-static
+ vs-thumb
+ vs-thumb-static
+ FILTER
+ ${CMAKE_SOURCE_DIR}/tests/*
+ ${CMAKE_BINARY_DIR}/*
+ TESTS
+ ${UNIT_TEST_TARGETS}
+ )
+endif()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 11f4449..249f5e0 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,6 @@
add_subdirectory(liblomiri-thumbnailer-qt)
-list(APPEND UNIT_TEST_TARGETS qt_example_test)
-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
+if(BUILD_TESTING)
+ list(APPEND UNIT_TEST_TARGETS qt_example_test)
+ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
+endif()
diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
index fe98e4c..078be07 100644
--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
@@ -27,7 +27,9 @@ add_doxygen(
ALL
)
-add_subdirectory(examples)
+if(BUILD_TESTING)
+ add_subdirectory(examples)
-list(APPEND UNIT_TEST_TARGETS qt_example_test)
-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
+ list(APPEND UNIT_TEST_TARGETS qt_example_test)
+ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
+endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 03a4900..97cb3a1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -42,8 +42,6 @@ set(slow_test_dirs
stress
)
-set(UNIT_TEST_TARGETS "")
-
foreach(dir ${unit_test_dirs})
add_subdirectory(${dir})
list(APPEND UNIT_TEST_TARGETS "${dir}_test")
--
2.47.0
pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch
+38
View File
@@ -0,0 +1,38 @@
From d9152f5e1f77a6c3bbc759eec58811410de7b85a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 16 Jan 2025 17:12:49 +0100
Subject: [PATCH 5/5] Make GTest available to example test
---
CMakeLists.txt | 2 ++
tests/CMakeLists.txt | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbfd9c0..0663b44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,6 +189,8 @@ if (${BUILD_TESTING})
find_package(Qt5QuickTest REQUIRED)
find_package(Qt5Network REQUIRED)
+ find_package(GMock REQUIRED)
+
add_subdirectory(tests)
endif()
add_subdirectory(include)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 97cb3a1..92eae14 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,7 +3,6 @@
set(old_cxx_flags ${CMAKE_CXX_FLAGS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers")
-find_package(GMock)
set(CMAKE_CXX_FLAGS ${old_cxx_flags})
set(TESTDATADIR ${CMAKE_CURRENT_SOURCE_DIR}/media)
--
2.47.0
pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
+18 -58
View File
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
testers,
boost,
@@ -32,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-thumbnailer";
version = "3.0.3";
version = "3.0.4";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-thumbnailer";
rev = finalAttrs.version;
hash = "sha256-BE/U4CT4z4WzEJXrVhX8ME/x9q7w8wNnJKTbfVku2VQ=";
tag = finalAttrs.version;
hash = "sha256-pf/bzpooCcoIGb5JtSnowePcobcfVSzHyBaEkb51IOg=";
};
outputs = [
@@ -48,74 +47,35 @@ stdenv.mkDerivation (finalAttrs: {
];
patches = [
# Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/19 merged & in release
(fetchpatch {
name = "0001-lomiri-thumbnailer-Add-more-better-GNUInstallDirs-variables-usage.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/0b9795a6313fd025d5646f2628a2cbb3104b0ebc.patch";
hash = "sha256-br99n2nDLjUfnjbjhOsWlvP62VmVjYeZ6yPs1dhPN/s=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/22 merged & in release
(fetchpatch {
name = "0002-lomiri-thumbnailer-Make-tests-optional.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/df7a3d1689f875d207a90067b957e888160491b9.patch";
hash = "sha256-gVxigpSL/3fXNdJBjh8Ex3/TYmQUiwRji/NmLW/uhE4=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release
(fetchpatch {
name = "0003-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DOCDIR.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/930a3b57e899f6eb65a96d096edaea6a6f6b242a.patch";
hash = "sha256-klYycUoQqA+Dfk/4fRQgdS4/G4o0sC1k98mbtl0iHkE=";
})
(fetchpatch {
name = "0004-lomiri-thumbnailer-Re-enable-documentation.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/2f9186f71fdd25e8a0852073f1da59ba6169cf3f.patch";
hash = "sha256-youaJfCeYVpLmruHMupuUdl0c/bSDPWqKPLgu5plBrw=";
})
(fetchpatch {
name = "0005-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_modules-usage.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/9e5cf09de626e73e6b8f180cbc1160ebd2f169e7.patch";
hash = "sha256-vfNCN7tqq6ngzNmb3qqHDHaDx/kI8/UXyyv7LqUWya0=";
})
(fetchpatch {
name = "0006-lomiri-thumbnailer-Re-enable-coverge-reporting.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/6a48831f042cd3ad34200f32800393d4eec2f84b.patch";
hash = "sha256-HZd4K0R1W6adOjKy7tODfQAD+9IKPcK0DnH1uKNd/Ak=";
})
(fetchpatch {
name = "0007-lomiri-thumbnailer-Make-GTest-available-to-example-test.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/657be3bd1aeb227edc04e26b597b2fe97b2dc51a.patch";
hash = "sha256-XEvdWV3JJujG16+87iewYor0jFK7NTeE5459iT96SkU=";
})
(fetchpatch {
name = "0008-fix-googletest-1-13.patch";
url = "https://salsa.debian.org/ubports-team/lomiri-thumbnailer/-/raw/debian/3.0.3-1/debian/patches/0001_fix_googletest_1_13.patch";
hash = "sha256-oBcdspQMhCxh4L/XotG9NRp/Ij2YzIjpC8xg/jdiptw=";
})
./1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch
./1002-Re-enable-documentation.patch
./1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch
./1004-Re-enable-coverge-reporting.patch
./1005-Make-GTest-available-to-example-test.patch
];
postPatch = ''
patchShebangs tools/{parse-settings.py,run-xvfb.sh} tests/{headers,whitespace,server}/*.py
substituteInPlace tests/thumbnailer-admin/thumbnailer-admin_test.cpp \
--replace '/usr/bin/test' 'test'
--replace-fail '/usr/bin/test' 'test'
substituteInPlace plugins/*/Thumbnailer*/CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
# I think this variable fails to be populated because of our toolchain, while upstream uses Debian / Ubuntu where this works fine
# https://cmake.org/cmake/help/v3.26/variable/CMAKE_LIBRARY_ARCHITECTURE.html
# > If the <LANG> compiler passes to the linker an architecture-specific system library search directory such as
# > <prefix>/lib/<arch> this variable contains the <arch> name if/as detected by CMake.
substituteInPlace tests/qml/CMakeLists.txt \
--replace 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \
--replace 'powerpc-linux-gnu' 'ppc' \
--replace 's390x-linux-gnu' 's390x'
--replace-fail 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \
--replace-fail 'powerpc-linux-gnu' 'ppc' \
--replace-fail 's390x-linux-gnu' 's390x'
# Tests run in parallel to other builds, don't suck up cores
substituteInPlace tests/headers/compile_headers.py \
--replace 'max_workers=multiprocessing.cpu_count()' "max_workers=1"
--replace-fail 'max_workers=multiprocessing.cpu_count()' "max_workers=1"
'';
strictDeps = true;
@@ -213,17 +173,17 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = gitUpdater { };
};
meta = with lib; {
meta = {
description = "D-Bus service for out of process thumbnailing";
mainProgram = "lomiri-thumbnailer-admin";
homepage = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer";
changelog = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/blob/${finalAttrs.version}/ChangeLog";
license = with licenses; [
license = with lib.licenses; [
gpl3Only
lgpl3Only
];
maintainers = teams.lomiri.members;
platforms = platforms.linux;
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;
pkgConfigModules = [
"liblomiri-thumbnailer-qt"
];
pkgs/development/haskell-modules/configuration-common.nix
+6 -1
View File
@@ -2004,17 +2004,22 @@ self: super: {
# https://github.com/NixOS/nixpkgs/pull/349683
pandoc-cli_3_6 = super.pandoc-cli_3_6.overrideScope (
self: super: {
commonmark-extensions = self.commonmark-extensions_0_2_5_6;
commonmark-pandoc = self.commonmark-pandoc_0_2_2_3;
doclayout = self.doclayout_0_5;
hslua-module-doclayout = self.hslua-module-doclayout_1_2_0;
lpeg = self.lpeg_1_1_0;
pandoc = self.pandoc_3_6;
pandoc-lua-engine = self.pandoc-lua-engine_0_4;
pandoc-lua-marshal = self.pandoc-lua-marshal_0_3_0;
pandoc-server = self.pandoc-server_0_1_0_10;
skylighting = self.skylighting_0_14_5;
skylighting-core = self.skylighting-core_0_14_5;
texmath = self.texmath_0_12_8_12;
tls = self.tls_2_0_6;
toml-parser = self.toml-parser_2_0_1_0;
typst = self.typst_0_6_1;
typst-symbols = self.typst-symbols_0_1_6;
typst-symbols = self.typst-symbols_0_1_7;
}
);
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
-1
View File
@@ -116,7 +116,6 @@ extra-packages:
- tls < 2.1.0 # 2024-07-19: requested by darcs == 2.18.3
- extensions == 0.1.0.2 # 2024-10-20: for GHC 9.10/Cabal 3.12
- network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.*
- typst-symbols >=0.1.6 && <0.1.7 # 2024-11-20: for pandoc 3.5 and quarto
- ghc-source-gen < 0.4.6.0 # 2024-12-31: support GHC < 9.0
package-maintainers:
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+1 -12
View File
@@ -260442,6 +260442,7 @@ self: {
description = "Anonymous extensible records";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"rawstring-qm" = callPackage
@@ -323218,18 +323219,6 @@ self: {
license = lib.licenses.mit;
}) {};
"typst-symbols_0_1_6" = callPackage
({ mkDerivation, base, text }:
mkDerivation {
pname = "typst-symbols";
version = "0.1.6";
sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl";
libraryHaskellDepends = [ base text ];
description = "Symbol and emoji lookup for typst language";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"typst-symbols_0_1_7" = callPackage
({ mkDerivation, base, text }:
mkDerivation {
pkgs/development/python-modules/eheimdigital/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "eheimdigital";
version = "1.0.3";
version = "1.0.5";
pyproject = true;
src = fetchFromGitHub {
owner = "autinerd";
repo = "eheimdigital";
tag = version;
hash = "sha256-oWMlQIj8q2UVpW0xyPnoblT+ryHwCn9PCk2vugXyh2c=";
hash = "sha256-fzvQrguwZoaQCoJlXzFCF7WUZpBe0EMQNcyKnmhQ4l8=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/gcp-storage-emulator/default.nix
+9 -11
View File
@@ -3,14 +3,11 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
wheel,
flake8,
fs,
google-cloud-storage,
google-crc32c,
pytest,
pytestCheckHook,
pytest-cov,
pytest-cov-stub,
requests,
}:
@@ -22,23 +19,23 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "oittaa";
repo = "gcp-storage-emulator";
rev = "v${version}";
tag = "v${version}";
hash = "sha256-Lp9Wvod0wSE2+cnvLXguhagT30ax9TivyR8gC/kB7w0=";
};
build-system = [
setuptools
wheel
];
dependencies = [
fs
google-crc32c
];
nativeCheckInputs = [
flake8
fs
google-cloud-storage
google-crc32c
pytest
pytest-cov-stub
pytestCheckHook
pytest-cov
requests
];
@@ -51,5 +48,6 @@ buildPythonPackage rec {
homepage = "https://github.com/oittaa/gcp-storage-emulator";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "gcp-storage-emulator";
};
}
pkgs/development/python-modules/highdicom/default.nix
+27 -4
View File
@@ -10,6 +10,7 @@
pydicom,
pylibjpeg,
pylibjpeg-libjpeg,
setuptools,
}:
let
@@ -22,19 +23,23 @@ let
in
buildPythonPackage rec {
pname = "highdicom";
version = "0.22.0";
version = "0.23.1";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "MGHComputationalPathology";
repo = "highdicom";
tag = "v${version}";
hash = "sha256-KHSJWEnm8u0xHkeeLF/U7MY4FfiWb6Q0GQQy2w1mnKw=";
hash = "sha256-LrsG85/bpqIEP++LgvyaVyw4tMsuUTtHNwWl7apuToM=";
};
propagatedBuildInputs = [
build-system = [
setuptools
];
dependencies = [
numpy
pillow
pillow-jpls
@@ -49,6 +54,10 @@ buildPythonPackage rec {
];
};
pythonRemoveDeps = [
"pyjpegls" # not directly used
];
nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.libjpeg;
preCheck = ''
export HOME=$TMP/test-home
@@ -56,6 +65,20 @@ buildPythonPackage rec {
ln -s ${test_data}/data_store/data $HOME/.pydicom/data
'';
disabledTests = [
# require pyjpegls
"test_jpegls_monochrome"
"test_jpegls_rgb"
"test_jpeglsnearlossless_monochrome"
"test_jpeglsnearlossless_rgb"
"test_multi_frame_sm_image_ushort_encapsulated_jpegls"
"test_monochrome_jpegls"
"test_monochrome_jpegls_near_lossless"
"test_rgb_jpegls"
"test_construction_autotile"
"test_pixel_types_fractional"
];
pythonImportsCheck = [
"highdicom"
"highdicom.legacy"
pkgs/development/python-modules/pylink-square/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pylink-square";
version = "1.3.0";
version = "1.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "square";
repo = "pylink";
tag = "v${version}";
hash = "sha256-4tdtyb0AjsAmFOPdkxbbro8PH3akC5uihN59lgijhkc=";
hash = "sha256-Fjulh2wmcVO+/608uTO10orRz8Pq0I+ZhJ8zMa3YFC0=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/ray/default.nix
+13 -10
View File
@@ -21,7 +21,7 @@
watchfiles,
# optional-dependencies
# adag
# cgraph
cupy,
# client
grpcio,
@@ -41,6 +41,7 @@
smart-open,
virtualenv,
# observability
memray,
opentelemetry-api,
opentelemetry-sdk,
opentelemetry-exporter-otlp,
@@ -48,7 +49,7 @@
dm-tree,
gymnasium,
lz4,
scikit-image,
# ormsgpack,
scipy,
typer,
rich,
@@ -64,7 +65,7 @@
let
pname = "ray";
version = "2.40.0";
version = "2.41.0";
in
buildPythonPackage rec {
inherit pname version;
@@ -76,9 +77,9 @@ buildPythonPackage rec {
let
pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}";
binary-hashes = {
cp310 = "sha256-9uqxHchJD4jnjgaqZFkFslnN4foDsV6EJhVcR4K6C74=";
cp311 = "sha256-cXEcvywVYhP9SbD5zJMYCnukJBEAcKNL3qPcCVJ/Md8=";
cp312 = "sha256-Z0dVgU9WkjBsVUytvCQBWvgj3AUW40ve8kzKydemVuM=";
cp310 = "sha256-OTLW2zqJgsUZbbCM9W4u0L9QuFaFCM/khr6N5jui2V0=";
cp311 = "sha256-//XpzFpTgV07WGomHjS9D+8cMkss3tTJuOeQ4ePcOZc=";
cp312 = "sha256-PXassHD6i9Tr2wEazfoiu4m9vps1+3iuxZgdt26sK2A=";
};
in
fetchPypi {
@@ -109,11 +110,12 @@ buildPythonPackage rec {
];
optional-dependencies = rec {
adag = [
cupy
];
adag = cgraph;
air = lib.unique (data ++ serve ++ tune ++ train);
all = lib.flatten (builtins.attrValues optional-dependencies);
cgraph = [
cupy
];
client = [ grpcio ];
data = [
fsspec
@@ -135,6 +137,7 @@ buildPythonPackage rec {
virtualenv
];
observability = [
memray
opentelemetry-api
opentelemetry-sdk
opentelemetry-exporter-otlp
@@ -143,8 +146,8 @@ buildPythonPackage rec {
dm-tree
gymnasium
lz4
# ormsgpack
pyyaml
scikit-image
scipy
typer
rich
pkgs/development/tools/infisical/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ let
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
# the version of infisical
version = "0.33.1";
version = "0.34.1";
# the platform-specific, statically linked binary
src =
pkgs/development/tools/infisical/hashes.json
+4 -4
View File
@@ -1,6 +1,6 @@
{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
, "x86_64-linux": "sha256-Pa4Tm8rHlYz6u5/xLgHlVFoLABMusmKgM2ssJv5jTh4="
, "x86_64-darwin": "sha256-lM76sOH9dIhp4txSbGVCqjTAD2eLI4u0X2gRN/40QzY="
, "aarch64-linux": "sha256-s/XwcjPzQjrLD4D2m0PkzcVRpxcTRY4MDB9oloKpP68="
, "aarch64-darwin": "sha256-q6ctHlgG5MfLxEg+5cPej7aLphCgHzl1OKhu0qCGL3k="
, "x86_64-linux": "sha256-+Juy/znuRkRNLTNYTh56BEPjPghmjwN2X4PXlulLMlg="
, "x86_64-darwin": "sha256-GUlSnkq07rrxmAQUJzkXpPpTs9bUMLzNm6VCEZ3eDFI="
, "aarch64-linux": "sha256-kkgt63caEiCAj5o7rueCHcWlst0i8D/uiLTUdw/JFK0="
, "aarch64-darwin": "sha256-FbN3tvCclDokK6dWg6U6zQ9NWTZ4x6U/bn8kNznCL1k="
}
pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix
+23 -14
View File
@@ -27,6 +27,25 @@ lib.makeOverridable (
stdenvLibcMinimal
else
stdenv;
machineMap = {
aarch64 = "arm64";
armv7l = "armv7";
i486 = "i386";
i586 = "i386";
i686 = "i386";
x86_64 = "amd64";
};
archMap = {
aarch64 = "aarch64";
armv7l = "arm";
i486 = "i386";
i586 = "i386";
i686 = "i386";
x86_64 = "amd64";
};
in
stdenv'.mkDerivation (
rec {
@@ -57,22 +76,12 @@ lib.makeOverridable (
HOST_SH = stdenv'.shell;
MACHINE_ARCH =
{
# amd64 not x86_64 for this on unlike NetBSD
x86_64 = "amd64";
aarch64 = "arm64";
i486 = "i386";
i586 = "i386";
i686 = "i386";
}
.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name;
MACHINE = MACHINE_ARCH;
MACHINE = machineMap.${stdenv'.hostPlatform.parsed.cpu.name};
MACHINE_ARCH = archMap.${stdenv'.hostPlatform.parsed.cpu.name};
MACHINE_CPU = MACHINE_ARCH;
MACHINE_CPUARCH = MACHINE_ARCH;
TARGET_MACHINE_ARCH = archMap.${stdenv'.targetPlatform.parsed.cpu.name};
TARGET_MACHINE_CPU = TARGET_MACHINE_ARCH;
COMPONENT_PATH = attrs.path or null;
pkgs/os-specific/linux/kernel/kernels-org.json
+8 -8
View File
@@ -4,12 +4,12 @@
"hash": "sha256:12c9bd0ikppkdpqmvg7g2062s60ks9p0qxx1jis29wl9swr74120"
},
"6.1": {
"version": "6.1.126",
"hash": "sha256:140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9"
"version": "6.1.127",
"hash": "sha256:0xkqpwhvz6qhaxzg1j993lv1iyvb2zydgq6d8mhdbfkz38fx9c0q"
},
"5.15": {
"version": "5.15.176",
"hash": "sha256:1cfk55469swywnf4r6pl7b3njxws8w3np81r99f0wnlaihrbajm8"
"version": "5.15.177",
"hash": "sha256:1q56w3lqwi3ynny6z7siqzv3h8nryksyw70r3fhghca2il4bi7pa"
},
"5.10": {
"version": "5.10.233",
@@ -20,16 +20,16 @@
"hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy"
},
"6.6": {
"version": "6.6.72",
"hash": "sha256:0fggpba886340xi8gkxc6hmzplcm69nliddql3d6hn8djcafbfgy"
"version": "6.6.74",
"hash": "sha256:0ka9snxl0y57fajy8vszwa4ggn48pid8m1879d4vl3mbicd2nppi"
},
"6.11": {
"version": "6.11.11",
"hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
},
"6.12": {
"version": "6.12.10",
"hash": "sha256:15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa"
"version": "6.12.11",
"hash": "sha256:0jgczvy1kr55s4bs8n2vmxnxnfvp5rkm4yd54gqm78c7ppyp4la7"
},
"6.13": {
"version": "6.13",
pkgs/os-specific/linux/universal-pidff/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "universal-pidff";
version = "0.0.10";
version = "0.0.12";
src = fetchFromGitHub {
owner = "JacKeTUs";
repo = "universal-pidff";
tag = version;
hash = "sha256-BViobWl+9ypTcQJWtZ9pbeU4cmHcFNZWlsmQUOO64Vc=";
rev = "23ec6488eddaa9f5b370b53b0198ba7b656ffa3d";
hash = "sha256-aA1iRXoVgJ1wVQMxFZm7/GqB7G/IjcLXifAk6B8odCs=";
};
postPatch = ''
pkgs/tools/admin/meshcentral/default.nix
+4 -4
View File
@@ -8,11 +8,11 @@
}:
yarn2nix-moretea.mkYarnPackage {
version = "1.1.35";
version = "1.1.38";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.35.tgz";
sha256 = "0y0c6r8bijkz2pwc9mgkkg3fi7sbaawcarvcjf47xa5zkl65a2qf";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.38.tgz";
sha256 = "1g87r4z6xh4hz1xsq64q2ryjr9pa7z2ym3gi9rdx4ch0qn0brsj0";
};
patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-wK3w5y0Ic9g6iBOUG7KseA1lPW2wzPMbJqb0YWiZJTM=";
hash = "sha256-wlIVi1ucxXTzVhTqwKRAkfIhuVy/aXAJgFQFChGtmeU=";
};
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
pkgs/tools/admin/meshcentral/package.json
+10 -8
View File
@@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.35",
"version": "1.1.38",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@@ -41,9 +41,9 @@
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"compression": "1.7.5",
"cookie-session": "2.1.0",
"express": "4.21.1",
"express": "4.21.2",
"express-handlebars": "7.1.3",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
@@ -72,12 +72,13 @@
"jwt-simple": "*",
"openid-client": "5.7.1",
"passport-saml": "*",
"@duosecurity/duo_universal": "*",
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"compression": "1.7.5",
"cookie-session": "2.1.0",
"express": "4.21.1",
"express": "4.21.2",
"express-handlebars": "7.1.3",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
@@ -109,16 +110,17 @@
"semver": "7.5.4",
"https-proxy-agent": "7.0.2",
"mongojs": "3.1.0",
"nodemailer": "6.9.15",
"nodemailer": "6.9.16",
"@sendgrid/mail": "*",
"jsdom": "22.1.0",
"esprima": "4.0.1",
"html-minifier": "4.0.0",
"@crowdsec/express-bouncer": "0.1.0",
"prom-client": "*",
"archiver-zip-encrypted": "2.0.0",
"googleapis": "128.0.0",
"webdav": "4.11.4",
"minio": "8.0.1",
"minio": "8.0.2",
"wildleek": "2.0.0",
"yubikeyotp": "0.2.0",
"otplib": "10.2.3",
@@ -132,7 +134,7 @@
"node-pushover": "1.0.0",
"zulip": "0.1.0",
"web-push": "3.6.6",
"node-xcs": "0.1.8",
"firebase-admin": "12.7.0",
"modern-syslog": "1.2.0",
"syslog": "0.1.1-1",
"heapdump": "0.3.15"
pkgs/tools/admin/meshcentral/update.sh
+1 -1
View File
@@ -22,7 +22,7 @@ cd package
awk <meshcentral.js "
BEGIN { RS=\"[\n;]\" }
match(\$0, /(modules|passport) = (\[.*\])$/, a) { print a[2] }
match(\$0, /(modules|passport).push\(('[^']+')\)/, a) { print a[2] }
match(\$0, /(modules|passport).push\(('[^)]+')\)/, a) { print \"[\" a[2] \"]\" }
" |
tr \' \" |
jq --slurp '[if type == "array" then .[] else . end] | flatten' |
pkgs/tools/admin/meshcentral/yarn.lock
+1969 -1282
View File
File diff suppressed because it is too large Load Diff
pkgs/tools/filesystems/mtools/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mtools";
version = "4.0.46";
version = "4.0.47";
src = fetchurl {
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
hash = "sha256-mq2N2Fn4j7d4eSTsR1kBktOr97rWyEBQnIVCkNa8FsA=";
hash = "sha256-MaoGB4zD9QWRuV5xqQnFbdF52H6cvcB79DXllb18x/8=";
};
patches = lib.optional stdenv.hostPlatform.isDarwin ./UNUSED-darwin.patch;

Some files were not shown because too many files have changed in this diff Show More