Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts:
	pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
	pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
	pkgs/by-name/ce/cedar/package.nix
	pkgs/by-name/gn/gnome-podcasts/package.nix
	pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
	pkgs/by-name/sy/systemctl-tui/package.nix
	pkgs/by-name/ti/tinty/package.nix
This commit is contained in:
Alyssa Ross
2025-01-24 16:40:22 +01:00
332 changed files with 10157 additions and 3577 deletions
+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}
+19
View File
@@ -14701,6 +14701,14 @@
githubId = 8263431;
name = "Matt Miemiec";
};
mel = {
email = "mel@rnrd.eu";
github = "melnary";
githubId = 10659529;
matrix = "@mel:rnrd.eu";
name = "Mel G.";
keys = [ { fingerprint = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; } ];
};
melchips = {
email = "truphemus.francois@gmail.com";
github = "melchips";
@@ -24536,6 +24544,17 @@
github = "waynr";
githubId = 1441126;
};
wbondanza_devoteam = {
name = "Wilson Bondanza";
email = "wilson.bondanza@devoteam.com";
github = "wbondanza-devoteam";
githubId = 195292349;
keys = [
{
fingerprint = "61F3 9F46 606D 655F 4E8D 6C82 B623 05E6 1563 8A9E";
}
];
};
wchresta = {
email = "wchresta.nix@chrummibei.ch";
github = "wchresta";
-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
+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
];
@@ -100,13 +100,13 @@ in
lomiri-session # wrappers to properly launch the session
lomiri-sounds
lomiri-system-settings
lomiri-telephony-service
lomiri-terminal-app
lomiri-thumbnailer
lomiri-url-dispatcher
mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target
morph-browser
qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
telephony-service
teleports
]);
};
@@ -152,7 +152,7 @@ in
)
++ (
with pkgs.lomiri;
[ telephony-service ]
[ lomiri-telephony-service ]
++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ]
);
};
@@ -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 = { };
};
}
-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 ];
};
}
@@ -1,21 +1,35 @@
{ lib, pkgs, ... }:
{
lib,
config,
pkgs,
...
}:
let
preSwitchCheckScript =
set:
lib.concatLines (
lib.mapAttrsToList (name: text: ''
# pre-switch check ${name}
(
${text}
)
if [[ $? != 0 ]]; then
echo "Pre-switch check '${name}' failed"
exit 1
fi
'') set
);
preSwitchCheckScript = lib.concatLines (
lib.mapAttrsToList (name: text: ''
# pre-switch check ${name}
if ! (
${text}
) >&2 ; then
echo "Pre-switch check '${name}' failed" >&2
exit 1
fi
'') config.system.preSwitchChecks
);
in
{
options.system.preSwitchChecksScript = lib.mkOption {
type = lib.types.pathInStore;
internal = true;
readOnly = true;
default = lib.getExe (
pkgs.writeShellApplication {
name = "pre-switch-checks";
text = preSwitchCheckScript;
}
);
};
options.system.preSwitchChecks = lib.mkOption {
default = { };
example = lib.literalExpression ''
@@ -33,12 +47,5 @@ in
'';
type = lib.types.attrsOf lib.types.str;
apply =
set:
set
// {
script = pkgs.writeShellScript "pre-switch-checks" (preSwitchCheckScript set);
};
};
}
@@ -61,7 +61,7 @@ in
--subst-var-by coreutils "${pkgs.coreutils}" \
--subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \
--subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \
--subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecks.script} \
--subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecksScript} \
--subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \
--subst-var-by perl "${perlWrapped}" \
--subst-var-by shell "${pkgs.bash}/bin/sh" \
@@ -94,7 +94,7 @@ in
--set TOPLEVEL ''${!toplevelVar} \
--set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \
--set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \
--set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecks.script} \
--set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \
--set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \
--set SYSTEMD ${config.systemd.package}
)
@@ -343,7 +343,7 @@ in
perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]);
# End if legacy environment variables
preSwitchCheck = config.system.preSwitchChecks.script;
preSwitchCheck = config.system.preSwitchChecksScript;
# Not actually used in the builder. `passedChecks` is just here to create
# the build dependencies. Checks are similar to build dependencies in the
+1 -1
View File
@@ -43,7 +43,7 @@ in
]
++ (with pkgs.lomiri; [
lomiri-indicator-network
telephony-service
lomiri-telephony-service
]);
};
+1
View File
@@ -734,6 +734,7 @@ let
texinfo
unionfs-fuse
xorg.lndir
shellcheck-minimal
# add curl so that rather than seeing the test attempt to download
# curl's tarball, we see what it's trying to download
+4
View File
@@ -611,6 +611,10 @@ in {
other = {
system.switch.enable = true;
users.mutableUsers = true;
system.preSwitchChecks.succeeds = ''
echo this will succeed
true
'';
specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = ''
echo this will fail
false
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
if isStereo then
"2.77" # stereo
else
"2.76"; # normal
"2.77"; # normal
src = fetchurl {
url = "mirror://sourceforge/goattracker2/GoatTracker_${finalAttrs.version}${lib.optionalString isStereo "_Stereo"}.zip";
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
if isStereo then
"1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo
else
"0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal
"sha256-lsK9amqzrKL1uxixx2SsbqaawkXK4UACpyzYfFVFYe8="; # normal
};
sourceRoot = "src";
@@ -13,12 +13,12 @@ let
sha256Hash = "sha256-t/4e1KeVm9rKeo/VdGHbv5ogXrI8whjtgo7YjouZjLU=";
};
betaVersion = {
version = "2024.2.2.12"; # "Android Studio Ladybug Feature Drop | 2024.2.2 RC 2"
sha256Hash = "sha256-zfiTjyD2bMIJ+GVQyg7qUT7306roqYsdRkPECZ/Rdnc=";
version = "2024.3.1.10"; # "Android Studio Meerkat | 2024.3.1 Beta 1"
sha256Hash = "sha256-UxxofUCJGhQTLMwHGaSdNDqWnjkpRVwm2oqLLp3jR8E=";
};
latestVersion = {
version = "2024.3.1.8"; # "Android Studio Meerkat | 2024.3.1 Canary 8"
sha256Hash = "sha256-ujxVxTO7rbCPEjzO2cPwdxipAgPW+urYNFHDGJOfRQg=";
version = "2024.3.2.1"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 1"
sha256Hash = "sha256-qJKkuB8v4wOqEQwnDyMegLbRLzxVwCq/hS1TQ3lhBKk=";
};
in {
# Attributes are named by their corresponding release channels
@@ -5219,6 +5219,18 @@ final: prev:
meta.homepage = "https://github.com/pimalaya/himalaya-vim/";
};
hlchunk-nvim = buildVimPlugin {
pname = "hlchunk.nvim";
version = "2024-11-23";
src = fetchFromGitHub {
owner = "shellRaining";
repo = "hlchunk.nvim";
rev = "5465dd33ade8676d63f6e8493252283060cd72ca";
sha256 = "0vksi1idliaxk5l3hksfhhbps4sw6d8lk58m5ja4wrnmjxz5b5bz";
};
meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/";
};
hlint-refactor-vim = buildVimPlugin {
pname = "hlint-refactor-vim";
version = "2015-12-05";
@@ -6290,6 +6302,18 @@ final: prev:
meta.homepage = "https://github.com/smjonas/live-command.nvim/";
};
llama-vim = buildVimPlugin {
pname = "llama.vim";
version = "2025-01-24";
src = fetchFromGitHub {
owner = "ggml-org";
repo = "llama.vim";
rev = "81e6802ebd00f177a8db73d62c7eeaf14a30819a";
sha256 = "0fcg0xmdjc9z25ssjmg9pl5q0vk1h1k65ipd4dfzxchvmfzirl5j";
};
meta.homepage = "https://github.com/ggml-org/llama.vim/";
};
llm-nvim = buildVimPlugin {
pname = "llm.nvim";
version = "2025-01-09";
@@ -10458,7 +10482,7 @@ final: prev:
meta.homepage = "https://github.com/salkin-mada/openscad.nvim/";
};
orgmode = buildVimPlugin {
orgmode = buildNeovimPlugin {
pname = "orgmode";
version = "2025-01-19";
src = fetchFromGitHub {
@@ -7,12 +7,12 @@
vimUtils,
}:
let
version = "0-unstable-2024-10-27";
version = "0-unstable-2025-01-13";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
rev = "08be31c104df3b4b049607694ebb2b6ced4f928b";
sha256 = "04v1gypga9fhmkddis5yyppvmpq0b1b7zpvbfjlxfp2z498l5n2v";
rev = "ddd7383e856a7c939cb4f5143278fe041bbb8cb9";
sha256 = "sha256-pZ7AH1U95IWMmhk/uBO0Lsxx78H5H9ygPxk/HIqFFlY=";
};
spectre_oxi = rustPlatform.buildRustPackage {
@@ -9,12 +9,12 @@
vimUtils,
}:
let
version = "1.1.0-unstable-2024-12-15";
version = "1.1.0-unstable-2025-01-21";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "sg.nvim";
rev = "7c423ebeb028b3534eb20fe54972825384dbe7d6";
hash = "sha256-ALAYX/1MTk0fCA8THunoHz8QTlWkg+pgiSp2n3B4KrU=";
rev = "775f22b75a9826eabf69b0094dd1d51d619fe552";
hash = "sha256-i5g+pzxB8pAORLbr1wlYWUTsrJJmVj9UwlCg8pU3Suw=";
};
sg-nvim-rust = rustPlatform.buildRustPackage {
@@ -3822,6 +3822,7 @@ in
maintainers = with maintainers; [
marcweber
jagajaga
mel
];
platforms = platforms.unix;
};
@@ -432,6 +432,7 @@ https://github.com/RaafatTurki/hex.nvim/,HEAD,
https://github.com/Yggdroot/hiPairs/,,
https://github.com/tzachar/highlight-undo.nvim/,HEAD,
https://github.com/pimalaya/himalaya-vim/,,
https://github.com/shellRaining/hlchunk.nvim/,HEAD,
https://github.com/mpickering/hlint-refactor-vim/,,
https://github.com/calops/hmts.nvim/,,
https://github.com/edluffy/hologram.nvim/,,
@@ -521,6 +522,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,,
https://github.com/ldelossa/litee-symboltree.nvim/,,
https://github.com/ldelossa/litee.nvim/,,
https://github.com/smjonas/live-command.nvim/,HEAD,
https://github.com/ggml-org/llama.vim/,HEAD,
https://github.com/huggingface/llm.nvim/,HEAD,
https://github.com/folke/lsp-colors.nvim/,,
https://github.com/lukas-reineke/lsp-format.nvim/,HEAD,
@@ -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",
@@ -1,7 +1,7 @@
{
"version": "2.55.29",
"version": "2.61.28",
"linux-x64": {
"hash": "sha256-3RQk5VNrI2sSUBCBfRTEsxjLqZkpoTELt/v+CIp94QU=",
"hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=",
"binaries": [
".debugger/createdump",
".debugger/vsdbg",
@@ -11,7 +11,7 @@
]
},
"linux-arm64": {
"hash": "sha256-p8VbpeLtGDO3TKpjY9EuqDVyCDvZaQe9+KeAMTMulDc=",
"hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=",
"binaries": [
".debugger/createdump",
".debugger/vsdbg",
@@ -21,7 +21,7 @@
]
},
"darwin-x64": {
"hash": "sha256-r85BNsxIXuQD20kjgqBvCLzTof4ExYDfbKG0zHaR86o=",
"hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=",
"binaries": [
".debugger/x86_64/createdump",
".debugger/x86_64/vsdbg",
@@ -31,7 +31,7 @@
]
},
"darwin-arm64": {
"hash": "sha256-p56EkUDxsukTx0FCCE2OrUBk3t2zj/kU6cdUVqdpfb8=",
"hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=",
"binaries": [
".debugger/arm64/createdump",
".debugger/arm64/vsdbg",
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";
};
makeFlags = kernel.makeFlags ++ [
makeFlags = kernel.moduleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
];
+2 -2
View File
@@ -158,8 +158,8 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20240105";
hash = "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w=";
version = "20250102";
hash = "sha256-Km2vVTYsLs091cjmNTW8Kqku3vdsEA0imTtZfqZWDQo=";
owner = "Winetricks";
repo = "winetricks";
rev = version;
+2 -6
View File
@@ -14,7 +14,6 @@
, flann
, gettext
, glew
, ilmbase
, lcms2
, lensfun
, libjpeg
@@ -25,7 +24,7 @@
, libXmu
, libGLU
, libGL
, openexr_3
, openexr
, panotools
, perlPackages
, sqlite
@@ -52,7 +51,6 @@ stdenv.mkDerivation rec {
flann
gettext
glew
ilmbase
lcms2
lensfun
libjpeg
@@ -63,7 +61,7 @@ stdenv.mkDerivation rec {
libXmu
libGLU
libGL
openexr_3
openexr
panotools
sqlite
vigra
@@ -78,8 +76,6 @@ stdenv.mkDerivation rec {
# disable installation of the python scripting interface
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
postInstall = ''
for p in $out/bin/*; do
wrapProgram "$p" \
@@ -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="
}
}
}
@@ -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
@@ -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";
};
}
@@ -21,11 +21,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary [
stdenv.mkDerivation rec {
pname = "mpop";
version = "1.4.20";
version = "1.4.21";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s=";
sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU=";
};
nativeBuildInputs = [
@@ -8,7 +8,7 @@
rubber,
hevea,
emacs,
version ? "1.7.2",
version ? "1.8.0",
ideSupport ? true,
wrapGAppsHook3,
}:
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
hash =
{
"1.8.0" = "sha256-gDe4OI0AuoYmJSCg/SMRQYcgelX/SM28ClQfKhnw88E=";
"1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ=";
"1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw=";
}
@@ -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 = ''
@@ -253,6 +253,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
prefix = "${finalAttrs.finalPackage.fd}/FV/${fwPrefix}";
in
{
mergedFirmware = "${prefix}.fd";
firmware = "${prefix}_CODE.fd";
variables = "${prefix}_VARS.fd";
variablesMs =
+1 -1
View File
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
"--disable-qemu-traditional"
"--with-system-qemu"
(if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios")
(if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf")
(if withOVMF then "--with-system-ovmf=${OVMF.mergedFirmware}" else "--disable-ovmf")
(if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe")
(enableFeature withFlask "xsmpolicy")
];
+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
+4 -35
View File
@@ -28,44 +28,13 @@
stdenv.mkDerivation rec {
pname = "almanah";
version = "0.12.3";
version = "0.12.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo=";
url = "mirror://gnome/sources/almanah/${lib.versions.majorMinor version}/almanah-${version}.tar.xz";
sha256 = "DywW6Gkohf0lrX3Mw/UawrS4h2JOaOfqH2SulHkxlFI=";
};
patches = [
# Fix build with meson 0.61
# data/meson.build:2:5: ERROR: Function does not take positional arguments.
# Patch taken from https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/13
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch";
sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ=";
})
# Port to Gcr 4
# https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch";
sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY=";
})
# Port to GtkSourceView 4
# https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch";
sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE=";
})
# Add missing GtkSourceView include
# https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/23
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/533f30c7e60437cbea7ca5ae901e768922c1a710.patch";
hash = "sha256-Ekhn4nRMC+fXLn4kqNwyCAg2cZru5QUcdzR1yJbcZGc=";
})
];
nativeBuildInputs = [
desktop-file-utils
gettext
@@ -94,7 +63,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "almanah";
versionPolicy = "none"; # it is quite odd
};
};
+8 -2
View File
@@ -14,18 +14,20 @@
xdg-utils,
ollama,
vte-gtk4,
libspelling,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "alpaca";
version = "3.2.0";
version = "3.5.0";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Jeffser";
repo = "Alpaca";
tag = version;
hash = "sha256-Mh+LYslVmb4l+ZCB1Si7hxugzHPz/mULUMBNeJI12r0=";
hash = "sha256-YheyeT9KiH9LphFfExie7RU7q/qVni5pFdpz32rM8RQ=";
};
nativeBuildInputs = [
@@ -42,6 +44,7 @@ python3Packages.buildPythonApplication rec {
libadwaita
gtksourceview5
vte-gtk4
libspelling
];
dependencies = with python3Packages; [
@@ -54,6 +57,7 @@ python3Packages.buildPythonApplication rec {
pydbus
odfpy
pyicu
matplotlib
];
dontWrapGApps = true;
@@ -71,6 +75,8 @@ python3Packages.buildPythonApplication rec {
"--set FLATPAK_DEST ${placeholder "out"}"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Ollama client made with GTK4 and Adwaita";
longDescription = ''
+11 -2
View File
@@ -2,6 +2,8 @@
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
}:
rustPlatform.buildRustPackage rec {
@@ -12,10 +14,17 @@ rustPlatform.buildRustPackage rec {
owner = "bee-san";
repo = "ares";
tag = "v${version}";
hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug=";
hash = "sha256-J+q7KeBthF9Wd08MNv0aHyLHgLUKg3mzQ8ic6+ashto=";
};
cargoHash = "sha256-c50HCwWwW4Fyg6hC1JqBfKtwq6kgReSOIBYXvwm04yA=";
cargoHash = "sha256-iJ04WPViqtafINkjn3PD8cE55LVdJZQXodAl3KlxweA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
env = {
OPENSSL_NO_VENDOR = true;
};
meta = with lib; {
description = "Automated decoding of encrypted text without knowing the key or ciphers used";
+2 -2
View File
@@ -24,13 +24,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "atlauncher";
version = "3.4.38.1";
version = "3.4.38.2";
src = fetchFromGitHub {
owner = "ATLauncher";
repo = "ATLauncher";
rev = "v${finalAttrs.version}";
hash = "sha256-u9t+0MgmEyDJkdjv+89wJkK74NKBlxNEy2F+3zz7kLI=";
hash = "sha256-x8ch8BdUckweuwEvsOxYG2M5UmbW4fRjF/jJ6feIjIA=";
};
postPatch = ''
@@ -63,9 +63,9 @@
confcom = mkAzExtension rec {
pname = "confcom";
version = "1.0.0";
version = "1.2.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";
hash = "sha256-c4I+EJWKEUtKyoTDMLTevMZQxGNedMVoZ5tsMsNWQR0=";
hash = "sha256-D78WwrOKbc8RNAa9Q3wgZRjVOUy/012+KIlTtk5NeTM=";
description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ openssl_1_1 ];
+145 -5
View File
@@ -6,7 +6,9 @@ import datetime
import json
import logging
import os
import subprocess
import sys
from collections.abc import Callable
from dataclasses import asdict, dataclass, replace
from pathlib import Path
from typing import Any, Dict, Iterable, List, Optional, Set, Tuple
@@ -42,20 +44,20 @@ def _read_cached_index(path: Path) -> Tuple[datetime.datetime, Any]:
return cache_date, data
def _write_index_to_cache(data: Any, path: Path):
def _write_index_to_cache(data: Any, path: Path) -> None:
j = json.loads(data)
j["cache_date"] = datetime.datetime.now().isoformat()
with open(path, "w") as f:
json.dump(j, f, indent=2)
def _fetch_remote_index():
def _fetch_remote_index() -> Any:
r = Request(INDEX_URL)
with urlopen(r) as resp:
return resp.read()
def get_extension_index(cache_dir: Path) -> Set[Ext]:
def get_extension_index(cache_dir: Path) -> Any:
index_file = cache_dir / "index.json"
os.makedirs(cache_dir, exist_ok=True)
@@ -154,7 +156,7 @@ def _filter_invalid(o: Dict[str, Any]) -> bool:
def _filter_compatible(o: Dict[str, Any], cli_version: Version) -> bool:
minCliVersion = parse(o["metadata"]["azext.minCliCoreVersion"])
return cli_version >= minCliVersion
return bool(cli_version >= minCliVersion)
def _transform_dict_to_obj(o: Dict[str, Any]) -> Ext:
@@ -211,6 +213,93 @@ def _filter_updated(e: Tuple[Ext, Ext]) -> bool:
return prev != new
@dataclass(frozen=True)
class AttrPos:
file: str
line: int
column: int
def nix_get_value(attr_path: str) -> Optional[str]:
try:
output = (
subprocess.run(
[
"nix-instantiate",
"--eval",
"--strict",
"--json",
"-E",
f"with import ./. {{ }}; {attr_path}",
],
stdout=subprocess.PIPE,
text=True,
check=True,
)
.stdout.rstrip()
.strip('"')
)
except subprocess.CalledProcessError as e:
logger.error("failed to nix-instantiate: %s", e)
return None
return output
def nix_unsafe_get_attr_pos(attr: str, attr_path: str) -> Optional[AttrPos]:
try:
output = subprocess.run(
[
"nix-instantiate",
"--eval",
"--strict",
"--json",
"-E",
f'with import ./. {{ }}; (builtins.unsafeGetAttrPos "{attr}" {attr_path})',
],
stdout=subprocess.PIPE,
text=True,
check=True,
).stdout.rstrip()
except subprocess.CalledProcessError as e:
logger.error("failed to unsafeGetAttrPos: %s", e)
return None
if output == "null":
logger.error("failed to unsafeGetAttrPos: nix-instantiate returned 'null'")
return None
pos = json.loads(output)
return AttrPos(pos["file"], pos["line"] - 1, pos["column"])
def edit_file(file: str, rewrite: Callable[[str], str]) -> None:
with open(file, "r") as f:
lines = f.readlines()
lines = [rewrite(line) for line in lines]
with open(file, "w") as f:
f.writelines(lines)
def edit_file_at_pos(pos: AttrPos, rewrite: Callable[[str], str]) -> None:
with open(pos.file, "r") as f:
lines = f.readlines()
lines[pos.line] = rewrite(lines[pos.line])
with open(pos.file, "w") as f:
f.writelines(lines)
def read_value_at_pos(pos: AttrPos) -> str:
with open(pos.file, "r") as f:
lines = f.readlines()
return value_from_nix_line(lines[pos.line])
def value_from_nix_line(line: str) -> str:
return line.split("=")[1].strip().strip(";").strip('"')
def replace_value_in_nix_line(new: str) -> Callable[[str], str]:
return lambda line: line.replace(value_from_nix_line(line), new)
def main() -> None:
sh = logging.StreamHandler(sys.stderr)
sh.setFormatter(
@@ -247,6 +336,7 @@ def main() -> None:
help="whether to commit changes to git",
)
args = parser.parse_args()
cli_version = parse(args.cli_version)
repo = git.Repo(Path(".").resolve(), search_parent_directories=True)
# Workaround for https://github.com/gitpython-developers/GitPython/issues/1923
@@ -258,7 +348,57 @@ def main() -> None:
assert index["formatVersion"] == "1" # only support formatVersion 1
extensions_remote = index["extensions"]
cli_version = parse(args.cli_version)
if args.extension:
logger.info(f"updating extension: {args.extension}")
ext = Optional[Ext]
for _ext_name, extension in extensions_remote.items():
extension = processExtension(
extension, cli_version, args.extension, requirements=True
)
if extension:
ext = extension
break
if not ext:
logger.error(f"Extension {args.extension} not found in index")
exit(1)
version_pos = nix_unsafe_get_attr_pos(
"version", f"azure-cli-extensions.{ext.pname}"
)
if not version_pos:
logger.error(
f"no position for attribute 'version' found on attribute path {ext.pname}"
)
exit(1)
version = read_value_at_pos(version_pos)
current_version = parse(version)
if ext.version == current_version:
logger.info(
f"no update needed for {ext.pname}, latest version is {ext.version}"
)
return
logger.info("updated extensions:")
logger.info(f" {ext.pname} {current_version} -> {ext.version}")
edit_file_at_pos(version_pos, replace_value_in_nix_line(str(ext.version)))
current_hash = nix_get_value(f"azure-cli-extensions.{ext.pname}.src.outputHash")
if not current_hash:
logger.error(
f"no attribute 'src.outputHash' found on attribute path {ext.pname}"
)
exit(1)
edit_file(version_pos.file, lambda line: line.replace(current_hash, ext.hash))
if args.commit:
commit_msg = (
f"azure-cli-extensions.{ext.pname}: {current_version} -> {ext.version}"
)
_commit(repo, commit_msg, [Path(version_pos.file)], actor)
return
logger.info("updating generated extension set")
extensions_remote_filtered = set()
for _ext_name, extension in extensions_remote.items():
+17 -4
View File
@@ -54,6 +54,9 @@ let
{
format = "wheel";
src = fetchurl { inherit url hash; };
passthru = {
updateScript = extensionUpdateScript { inherit pname; };
} // args.passthru or { };
meta = {
inherit description;
inherit (azure-cli.meta) platforms maintainers;
@@ -67,13 +70,24 @@ let
"url"
"hash"
"description"
"passthru"
"meta"
])
);
# Update script for azure cli extensions. Currently only works for manual extensions.
extensionUpdateScript =
{ pname }:
[
"${lib.getExe azure-cli.extensions-tool}"
"--cli-version"
"${azure-cli.version}"
"--extension"
"${pname}"
];
extensions-generated = lib.mapAttrs (name: ext: mkAzExtension ext) (
builtins.fromJSON (builtins.readFile ./extensions-generated.json)
);
extensions-generated = lib.mapAttrs (
name: ext: mkAzExtension (ext // { passthru.updateScript = [ ]; })
) (builtins.fromJSON (builtins.readFile ./extensions-generated.json));
extensions-manual = callPackages ./extensions-manual.nix {
inherit mkAzExtension;
python3Packages = python3.pkgs;
@@ -408,7 +422,6 @@ py.pkgs.toPythonApplication (
}
''
black --check --diff $src
# mypy --strict $src
isort --profile=black --check --diff $src
install -Dm755 $src $out/bin/extensions-tool
@@ -0,0 +1,30 @@
diff --git a/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp b/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp
index 4cce7016f..25554a7cd 100644
--- a/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp
+++ b/libs/JUCE/modules/juce_audio_devices/native/juce_JackAudio_linux.cpp
@@ -291,7 +291,6 @@ public:
juce::jack_on_info_shutdown (client, infoShutdownCallback, this);
juce::jack_set_xrun_callback (client, xrunCallback, this);
juce::jack_activate (client);
- deviceIsOpen = true;
if (! inputChannels.isZero())
{
@@ -336,6 +335,7 @@ public:
}
updateActivePorts();
+ deviceIsOpen = true;
return lastError;
}
@@ -525,7 +525,8 @@ private:
static void portConnectCallback (jack_port_id_t, jack_port_id_t, int, void* arg)
{
if (JackAudioIODevice* device = static_cast<JackAudioIODevice*> (arg))
- device->mainThreadDispatcher.updateActivePorts();
+ if (device->isOpen())
+ device->mainThreadDispatcher.updateActivePorts();
}
static void threadInitCallback (void* /* callbackArgument */)
@@ -3,6 +3,8 @@
stdenv,
fetchFromGitHub,
fetchzip,
gitUpdater,
apple-sdk_11,
cmake,
pkg-config,
ninja,
@@ -11,6 +13,7 @@
alsa-lib,
alsa-tools,
freetype,
jsoncpp,
libusb1,
libX11,
libXrandr,
@@ -31,13 +34,6 @@
pcre,
mount,
zenity,
Accelerate,
Cocoa,
WebKit,
CoreServices,
CoreAudioKit,
IOBluetooth,
MetalKit,
# It is not allowed to distribute binaries with the VST2 SDK plugin without a license
# (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box.
# Read more in https://github.com/NixOS/nixpkgs/issues/145607
@@ -58,24 +54,47 @@ let
};
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "bespokesynth";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "BespokeSynth";
repo = pname;
rev = "v${version}";
hash = "sha256-vDvNm9sW9BfWloB0CA+JHTp/bfDWAP/T0hDXjoMZ3X4=";
repo = "bespokesynth";
rev = "v${finalAttrs.version}";
hash = "sha256-ad8wdLos3jM0gRMpcfRKeaiUxJsPGqWd/7XeDz87ToQ=";
fetchSubmodules = true;
};
patches = [
# Fix compatibility with pipewire's JACK emulation
# https://github.com/BespokeSynth/BespokeSynth/issues/1405#issuecomment-1721437868
./2001-bespokesynth-fix-pipewire-jack.patch
];
# Linux builds are sandboxed properly, this always returns "localhost" there.
# Darwin builds doesn't have the same amount of sandboxing by default, and the builder's hostname is returned.
# In case this ever gets embedded into VersionInfoBld.cpp, hardcode it to the Linux value
postPatch = ''
substituteInPlace Source/cmake/versiontools.cmake \
--replace-fail 'cmake_host_system_information(RESULT BESPOKE_BUILD_FQDN QUERY FQDN)' 'set(BESPOKE_BUILD_FQDN "localhost")'
'';
cmakeBuildType = "Release";
cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ];
cmakeFlags =
[
(lib.cmakeBool "BESPOKE_SYSTEM_PYBIND11" true)
(lib.cmakeBool "BESPOKE_SYSTEM_JSONCPP" true)
]
++ lib.optionals enableVST2 [
(lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK")
];
strictDeps = true;
nativeBuildInputs = [
python3
python3 # interpreter
makeWrapper
cmake
pkg-config
@@ -83,7 +102,16 @@ stdenv.mkDerivation rec {
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
[
jsoncpp
# library & headers
(python3.withPackages (
ps: with ps; [
pybind11
]
))
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml
libX11
libXrandr
@@ -110,25 +138,14 @@ stdenv.mkDerivation rec {
mount
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Accelerate
Cocoa
WebKit
CoreServices
CoreAudioKit
IOBluetooth
MetalKit
apple-sdk_11
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
# Fails to find fp.h on its own
"-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"
]);
postInstall =
if stdenv.hostPlatform.isDarwin then
''
mkdir -p $out/{Applications,bin}
mv Source/BespokeSynth_artefacts/${cmakeBuildType}/BespokeSynth.app $out/Applications/
mv Source/BespokeSynth_artefacts/${finalAttrs.cmakeBuildType}/BespokeSynth.app $out/Applications/
# Symlinking confuses the resource finding about the actual location of the binary
# Resources are looked up relative to the executed file's location
makeWrapper $out/{Applications/BespokeSynth.app/Contents/MacOS,bin}/BespokeSynth
@@ -158,24 +175,29 @@ stdenv.mkDerivation rec {
libXScrnSaver
])
}";
dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath
meta = with lib; {
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = {
description = "Software modular synth with controllers support, scripting and VST";
homepage = "https://www.bespokesynth.com/";
license =
with licenses;
with lib.licenses;
[
gpl3Plus
]
++ lib.optional enableVST2 unfree;
maintainers = with maintainers; [
maintainers = with lib.maintainers; [
astro
tobiasBora
OPNA2608
PowerUser64
];
mainProgram = "BespokeSynth";
platforms = platforms.all;
platforms = lib.platforms.all;
};
}
})
+9 -1
View File
@@ -16,6 +16,7 @@
openssl,
curl,
portmidi,
autoPatchelfHook,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'live365_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,'
'';
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
autoPatchelfHook
pkg-config
];
buildInputs = [
fltk13
@@ -54,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: {
portmidi
];
runtimeDependencies = [
fdk_aac
];
postInstall = ''
cp -r usr/share $out/
'';
+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;
+3 -3
View File
@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "cedar";
version = "4.2.2";
version = "4.3.0";
src = fetchFromGitHub {
owner = "cedar-policy";
repo = "cedar";
tag = "v${version}";
hash = "sha256-p8idQx3HGO/ikL0pDTPXx5+rD2sRpXANqs/g51BL554=";
hash = "sha256-E3x+FfjLNUpfu00D+UALc73STodNW2Kvfo/4x6hORiY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-puVPSPPpKAlawN4OXrehIdqlJ6gmZxP/tiFzn1V/o4A=";
cargoHash = "sha256-vkJjUmzuYwR/GI/7h0S2AOXJ8Im074a7QzXDs23rIak=";
passthru = {
tests.version = testers.testVersion { package = cedar; };
+2 -2
View File
@@ -19,12 +19,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.101.0";
version = "1.102.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
hash = "sha256-4pGdb7CZTYjaGgrwRwI9mtmqJaFY7AwGk36PLASUDFU=";
hash = "sha256-hnmQR9Buu+2z1UkeStVFazbl/czUhV8E7sZrkcPGKFo=";
fetchSubmodules = true;
};
+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 = [
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnquery";
version = "11.36.0";
version = "11.37.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
tag = "v${version}";
hash = "sha256-LISy9xMAv9Wal+iRF9qoCLrQnq0r4HOqCir/w0uTrAA=";
hash = "sha256-H8qilsIlXA9NdPrdJYmkX+Ccc5fJHcEZThzPUo6Vi4M=";
};
subPackages = [ "apps/cnquery" ];
vendorHash = "sha256-JweIdmjnybaOyL5GOxCmP8TpyMYTG9qD5aFbabAJ4h8=";
vendorHash = "sha256-rqWGaENzFoC4+VhH1FRX9veLOXxXEAxdhcvrd2OoZY8=";
ldflags = [
"-w"
+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";
+8
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
autoconf,
automake,
intltool,
@@ -37,6 +38,13 @@ stdenv.mkDerivation rec {
connman
];
patches = [
(fetchpatch {
url = "https://salsa.debian.org/nickm/connman-gtk/-/raw/ef01b52fa02c5cca199b2e47c0cf360691266fd8/debian/patches/incompatible-pointer-type";
hash = "sha256-T+N9FfDyROBA4/HLK+l/fpnju2imDU4y6nGSbF+JDiA=";
})
];
preConfigure = ''
# m4/intltool.m4 is an invalid symbolic link
rm m4/intltool.m4
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "cue";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "cue-lang";
repo = "cue";
rev = "v${version}";
hash = "sha256-CLWPRVrfFQUwoLbZttetuq1T/Gb7vVEcrD7dxMzfgjA=";
hash = "sha256-OSsDgwjtjQw5YRuXi1K/HQtHyLh1aHtYDlQDAtdYeZM=";
};
vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI=";
+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=";
+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 = [
+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 ];
+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 ];
};
}
})
+3 -3
View File
@@ -11,18 +11,18 @@
rustPlatform.buildRustPackage rec {
pname = "easytier";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "EasyTier";
repo = "EasyTier";
tag = "v${version}";
hash = "sha256-qWICiY2g/wXT0Bt7lrCg7GgL1futOhelViB59UCLPro=";
hash = "sha256-iY4HluL5TlYuKDBrz0fvLwJg/aX9lKiCyFs4V5WhQZs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-SpGW/RAbQUFdxqEKRPrTp5MXng7BLiSnofoJG8NsjsU=";
cargoHash = "sha256-KV7CdSEbmR7HIfKsS1sKsPqMz9Ku/rfbV8WmFkMC9oI=";
nativeBuildInputs = [ protobuf ];
+9 -2
View File
@@ -16,18 +16,19 @@
mariadb,
openssl,
bash,
zsh,
nix-update-script,
}:
buildGoModule rec {
pname = "ecapture";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "gojue";
repo = "ecapture";
tag = "v${version}";
hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0=";
hash = "sha256-nqNFbZrmCleWcRM2HsbgmCHqsar3KmiGYxt55ZqhY+U=";
fetchSubmodules = true;
};
@@ -73,6 +74,12 @@ buildGoModule rec {
substituteInPlace user/config/config_nspr_linux.go \
--replace-fail '/usr/lib/firefox/libnspr4.so' '${lib.getLib nspr}/lib/libnspr4.so'
substituteInPlace user/config/config_zsh.go \
--replace-fail '/bin/zsh' '${lib.getExe zsh}'
substituteInPlace user/module/probe_zsh.go \
--replace-fail '/bin/zsh' '${lib.getExe zsh}'
substituteInPlace cli/cmd/postgres.go \
--replace-fail '/usr/bin/postgres' '${postgresql}/bin/postgres'
@@ -14,14 +14,14 @@ let
hashes = {
linux-aarch64-unknown-linux-gnu = "sha256-Fte7oZD5+aFph5xGrKtbSimb3aHewkjsJRXB+64IW5A=";
linux-x86_64-unknown-linux-gnu = "sha256-GFf1YybZRyZ3D6ZnLf+op6KRPYbwBHSPh1groxdNZks=";
linux-x86_64-unknown-linux-gnu = "sha256-slnXUEtHJjq6wRQTt1EwqlOO/2zIGmGwa/HCi3F0YMA=";
macos-aarch64-apple-darwin = "sha256-3K3sPizBR/+DJIX67GsYqm2X5k7kq3kBRg8P2WALTZs=";
macos-x86_64-apple-darwin = "sha256-j+AVmLfe/yCvKvYhL5ikhXA1g+zQ1CDlMl1FYO6q1yA=";
};
in
stdenv.mkDerivation rec {
pname = "erlang-language-platform";
version = "2024-12-09";
version = "2025-01-21";
src = fetchurl {
url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz";
+3 -3
View File
@@ -22,19 +22,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flare";
version = "0.15.6";
version = "0.15.7";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "schmiddi-on-mobile";
repo = "flare";
rev = finalAttrs.version;
hash = "sha256-xpjxOaCN5UVBBIB6WMLCMspRWkzz4DQEcjiSL8uM2RQ=";
hash = "sha256-KFxBdWNN7LYQ5jiDZhAs4pqX2cRLvEGaAhYabaQh1n0=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-iuK68GLU/4wsOLQz+7pGVDZwCuc6cwcUKn6teFuYJco=";
hash = "sha256-bZL9/0MYGxXefrj9whG+N7iMaBpaZSeBVAWR0AKKEvo=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "fly";
version = "7.12.0";
version = "7.12.1";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
hash = "sha256-lAx9TZVRkPMa5swB74zI0xJ7pbRDApZoens747XcuJk=";
hash = "sha256-3RsFtU2C3XxBddyW5liAwia9I7Fc8f2+TsziiJy6rHg=";
};
vendorHash = "sha256-dXjee2rZn1lVEmL8Cy8rrdpSX1OpS9GHKZo53ur3kew=";
vendorHash = "sha256-up77TV/A/C39LjgQ+1uQExWfMlbruLhY3H6820cRnt0=";
subPackages = [ "fly" ];
+5
View File
@@ -1,5 +1,6 @@
{
buildNpmPackage,
frigate,
src,
version,
}:
@@ -28,7 +29,11 @@ buildNpmPackage {
npmDepsHash = "sha256-PLs3oCWQjK38eHgdQt2Qkj7YqkfanC8JnLMpzMjNfxU=";
env.NODE_OPTIONS = "--no-experimental-require-module";
installPhase = ''
cp -rv dist/ $out
'';
inherit (frigate) meta;
}
+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 ];
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gcli";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "herrhotzenplotz";
repo = "gcli";
rev = "v${version}";
hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis=";
hash = "sha256-pAnDxcQLRF97OzO7/P7eRXv/BUJwbuEveEVUBQuNJBE=";
};
nativeBuildInputs = [
+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 =
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "getmail6";
version = "6.19.05";
version = "6.19.06";
pyproject = true;
src = fetchFromGitHub {
owner = "getmail6";
repo = "getmail6";
tag = "v${version}";
hash = "sha256-GjB53bl2gh3SA+kqC9rrQ9I4rP0z69G/bamInmq8W+I=";
hash = "sha256-F4FS6d8XDPlJ7ysShFRb45hZainKljKRg+q4yA18HaI=";
};
build-system = with python3.pkgs; [
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "gh-dash";
version = "4.9.0";
version = "4.9.1";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${version}";
hash = "sha256-25Ik5VsTYLssI9u235pBWD1XNABvWCzbXma04pJX2nQ=";
hash = "sha256-n0+I1URuIOKqBj+BSE6bD3wOxpaKWM9t1X3PkPhawKY=";
};
vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";
+3 -5
View File
@@ -155,11 +155,9 @@ stdenv.mkDerivation (finalAttrs: {
gpl2
];
homepage = "https://gitlab.gnome.org/Archive/glom";
maintainers =
lib.teams.gnome.members
++ (with lib.maintainers; [
bot-wxt1221
]);
maintainers = with lib.maintainers; [
bot-wxt1221
];
platforms = lib.platforms.linux;
};
})
@@ -74,11 +74,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-control-center";
version = "47.2";
version = "47.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
hash = "sha256-Q0oyLcN0OFi4nYFl2J+J3AWWi2t740AJRM7UJxJQ0+k=";
hash = "sha256-eDgdWn8dWyl8mhlhEUXuXgWE8GrFde0IrQcKDAe76qI=";
};
patches = [
+3 -3
View File
@@ -25,19 +25,19 @@
stdenv.mkDerivation rec {
pname = "gnome-podcasts";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "podcasts";
rev = version;
hash = "sha256-KCjHT/4AeJ+RXCtawkhs6f4D8NCJotYIPk3tGr5YG9M=";
hash = "sha256-xPB1ieOgnHe2R5ORK0Hl61V+iDZ7WsJEnsAJGZvQUVI=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-L9/PCYanv8AgxD/fkEsNXQA1Zyz2+ia88lVahg9IOdA=";
hash = "sha256-Nzfsr1OFw7DnxrNol00BI9WIe1Tau3z/R4zdF0PaBOk=";
};
nativeBuildInputs = [
@@ -31,11 +31,11 @@
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
version = "47.2";
version = "47.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
hash = "sha256-k1HdjDns5wUMlny9zr4WYrwmuP2pJPioCpsqMS0H9HE=";
hash = "sha256-QE2wiHLmkDlD4nUam2Myf2NZcKnKodL2dTCcpEV8+cI=";
};
nativeBuildInputs = [
@@ -15,11 +15,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extensions";
version = "47.2";
version = "47.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
hash = "sha256-3XdKApFYSRer3oi7xOzPkkQXjjwmnOBhjQSVF3wSZS0=";
hash = "sha256-GpFCpOhdeit9xbrTfjTfnuuzjoSW9JOL4teys1iD0Tk=";
};
patches = [
+3 -5
View File
@@ -24,7 +24,6 @@
librsvg,
webp-pixbuf-loader,
geoclue2,
perl,
desktop-file-utils,
libpulseaudio,
libical,
@@ -70,7 +69,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell";
version = "47.2";
version = "47.3";
outputs = [
"out"
@@ -79,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
hash = "sha256-QYTQGhq4LLQh0couK8zgKSzrRsTHSeYbC95LdQBNLgA=";
hash = "sha256-eD3rmghlEeSlPbEFdL+7ppVXb2mAeCGMpsgMse/sKT4=";
};
patches = [
@@ -117,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
gettext
gi-docgen
perl
wrapGAppsHook4
sassc
desktop-file-utils
@@ -185,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
patchShebangs src/data-to-c.pl
patchShebangs src/data-to-c.py
# We can generate it ourselves.
rm -f man/gnome-shell.1
+2 -2
View File
@@ -48,11 +48,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-software";
version = "47.2";
version = "47.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
hash = "sha256-ESM4+KmOflEl3j9XIphzU0IVt37u830/1CYvAhUcfOo=";
hash = "sha256-coHFS5t0jWai55LrjgMxyJec44+vrfct482ZnYDpe08=";
};
patches = [
+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=/" ];
+5 -5
View File
@@ -171,11 +171,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "132.0.6834.83";
version = "132.0.6834.110";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg=";
hash = "sha256-4mtVCiKXKnjmHlyYgnDneX9hOmYgafwZ230iFfH48Tc=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -274,11 +274,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "132.0.6834.84";
version = "132.0.6834.111";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg";
hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo=";
url = "http://dl.google.com/release2/chrome/acuc7atz5smv6q4nvkuutofbz6uq_132.0.6834.111/GoogleChrome-132.0.6834.111.dmg";
hash = "sha256-kC4MA57eeapnzCgyBuLNq9NBTFdcECMtoNwMzWd0KEg=";
};
dontPatch = true;
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "grype";
version = "0.86.1";
version = "0.87.0";
src = fetchFromGitHub {
owner = "anchore";
repo = "grype";
tag = "v${version}";
hash = "sha256-k4Faw7DqN5H2bGxKEqeUA4+sMZOdbW1139GcqbU56Hk=";
hash = "sha256-El7cegeHMb6fhO1Vr6FK0E3Mlk/dbU0Dv4lUYNu0Gcc=";
# 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;
@@ -30,7 +30,7 @@ buildGoModule rec {
proxyVendor = true;
vendorHash = "sha256-qrMgc5/ukuri8Oabgq84SCqy26vVWgzlE2UkTd67ss8=";
vendorHash = "sha256-SbKvDAzWq58O0e/+1r5oI3rxfdsnPenMPwqNRTOe7AI=";
nativeBuildInputs = [ installShellFiles ];
+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 = [
+5 -5
View File
@@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "gupnp-av";
version = "0.14.1";
version = "0.14.3";
outputs = [
"out"
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "t5zgzEsMZtnFS8Ihg6EOVwmgAR0q8nICWUjvyrM6Pk8=";
url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor version}/gupnp-av-${version}.tar.xz";
sha256 = "q+IEYEPmapUpNl2JBZvhIhnCGk7eDEdDcDsP2arxe7Q=";
};
nativeBuildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_412
];
buildInputs = [
propagatedBuildInputs = [
glib
libxml2
];
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "gupnp-av";
versionPolicy = "odd-unstable";
};
};
@@ -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";
};
})
+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" ];
+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 ];
+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;
+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
];
+3 -3
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "1.4.5";
hash = "sha256-0nn/ZyjkLXWXBZasNhbeEynEN52cmZQAcgg3hLmRpdo=";
cargoHash = "sha256-9ZB9PwVnqoCRMFXOY7ejh76hmOg7cjVpnjgJfh8aXGI=";
version = "1.4.6";
hash = "sha256-pjJyq52wO5p34LN2Jmt0npgWBDcWin8gIX4skZ7Ff8E=";
cargoHash = "sha256-XyyvXxZOvaxSzH8Jd23IxE4Wyd/6h5N3HRVEvdQ8RtY=";
patchDir = ./patches/1_4;
}
+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"
+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 = [
+1 -1
View File
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Easy Publish and Consume Library";
homepage = "https://gitlab.gnome.org/Archive/libepc";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
maintainers = [ maintainers.bot-wxt1221 ];
platforms = platforms.linux;
};
})
+3 -3
View File
@@ -4,7 +4,7 @@
fetchurl,
pkg-config,
glibmm,
libgda,
libgda5,
libxml2,
gnome,
mysqlSupport ? false,
@@ -12,7 +12,7 @@
}:
let
gda = libgda.override {
gda = libgda5.override {
inherit mysqlSupport postgresSupport;
};
in
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
description = "C++ bindings for libgda";
homepage = "https://www.gnome-db.org/";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
maintainers = [ maintainers.bot-wxt1221 ];
platforms = platforms.linux;
};
}
+2 -2
View File
@@ -12,7 +12,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libgee";
version = "0.20.6";
version = "0.20.8";
outputs = [
"out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libgee/${lib.versions.majorMinor finalAttrs.version}/libgee-${finalAttrs.version}.tar.xz";
sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0=";
sha256 = "GJgVrBQ9iYZxk7DFK33DHzqhCKFfBNa13KK2rfrQsO4=";
};
nativeBuildInputs = [
+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";
+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
'';
+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" ];
+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
+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)
+2 -2
View File
@@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "loupe";
version = "47.2";
version = "47.4";
src = fetchurl {
url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
hash = "sha256-bgRu/k965X7idI1S0dBzVsdEnSBKPTHQtCNnqAGXShU=";
hash = "sha256-jckmgpqcM4gAyPQytaNHJG5ty9mtLdGiTEmOr90+ias=";
};
patches = [
+20 -23
View File
@@ -4,25 +4,25 @@
fetchFromGitHub,
fetchpatch,
cmake,
boost,
boost186,
gtest,
zlib,
}:
stdenv.mkDerivation rec {
pname = "lucene++";
version = "3.0.8";
version = "3.0.9";
src = fetchFromGitHub {
owner = "luceneplusplus";
repo = "LucenePlusPlus";
rev = "rel_${version}";
sha256 = "12v7r62f7pqh5h210pb74sfx6h70lj4pgfpva8ya2d55fn0qxrr2";
hash = "sha256-VxEV45OXHRldFdIt2OC6O7ey5u98VQzlzeOb9ZiKfd8=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
boost
boost186
gtest
zlib
];
@@ -30,32 +30,33 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
patches = [
(fetchpatch {
name = "pkgconfig_use_correct_LIBDIR_for_destination_library";
url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch";
sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo";
})
(fetchpatch {
name = "fix-visibility-on-mac.patch";
url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch";
sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4=";
})
(fetchpatch {
name = "fix-build-with-boost-1_85_0.patch";
url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/76dc90f2b65d81be018c499714ff11e121ba5585.patch";
sha256 = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q=";
hash = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q=";
})
(fetchpatch {
name = "fix-install-path-for-liblucene_pc.patch";
url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/f40f59c6e169b4e16b7a6439ecb26a629c6540d1.patch";
hash = "sha256-YtZMqh/cnkGikatcgRjOWXj570M5ZOnCqgW8/K0/nVo=";
})
(fetchpatch {
name = "migrate-to-boost_asio_io_context.patch";
url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/e6a376836e5c891577eae6369263152106b9bc02.patch";
hash = "sha256-0mdVvrS0nTxSJXRzVdx2Zb/vm9aVxGfARG/QliRx7tA=";
})
];
# Don't use the built in gtest - but the nixpkgs one requires C++14.
postPatch = ''
substituteInPlace src/test/CMakeLists.txt \
--replace "add_subdirectory(gtest)" ""
--replace-fail "add_subdirectory(gtest)" ""
substituteInPlace CMakeLists.txt \
--replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)"
--replace-fail "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)"
'';
doCheck = true;
# FIXME: Stuck for several hours after passing 1472 tests
doCheck = false;
checkPhase = ''
runHook preCheck
@@ -64,11 +65,6 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
postInstall = ''
mv $out/include/pkgconfig $out/lib/
cp $src/src/contrib/include/*h $out/include/lucene++/
'';
meta = {
description = "C++ port of the popular Java Lucene search engine";
homepage = "https://github.com/luceneplusplus/LucenePlusPlus";
@@ -77,5 +73,6 @@ stdenv.mkDerivation rec {
lgpl3Plus
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ rewine ];
};
}
+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",
+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="
}
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2024-11-21T17-21-54Z";
version = "2025-01-17T23-25-50Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-z6ixa5nrKcrvaBC1V6/iXCeHFO4xOkFf/yJ8HLQQcaY=";
sha256 = "sha256-ezc5SMJfebvaSrpUeA6dIPS5l9rfkvSMVyGLTDPiWxE=";
};
vendorHash = "sha256-teG+GrzmUgJ6QhcxDSbWXP32hRuCgoCvH2BoNL8ddUc=";
vendorHash = "sha256-Z0dpb6E+wTCmTLBIZzvjRM5RPUsIjAhTj+V+Q3CHwv0=";
subPackages = [ "." ];

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