0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

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

This commit is contained in:
K900 2025-04-08 09:29:48 +03:00
commit 0842b11f2b
155 changed files with 2295 additions and 1629 deletions

View file

@ -3236,6 +3236,12 @@
githubId = 5718007; githubId = 5718007;
name = "Bastian Köcher"; name = "Bastian Köcher";
}; };
blackzeshi = {
name = "blackzeshi";
email = "sergey_zhuzhgov@mail.ru";
github = "zeshi09";
githubId = 105582686;
};
blakesmith = { blakesmith = {
name = "Blake Smith"; name = "Blake Smith";
email = "blakesmith0@gmail.com"; email = "blakesmith0@gmail.com";
@ -19961,6 +19967,14 @@
githubId = 5653911; githubId = 5653911;
name = "Rampoina"; name = "Rampoina";
}; };
rane = {
name = "Rane";
email = "rane+git@junkyard.systems";
matrix = "@rane:junkyard.systems";
github = "digitalrane";
githubId = 1829286;
keys = [ { fingerprint = "EBB6 0EE1 488F D04C D922 C039 AE96 1AF5 9D40 10B5"; } ];
};
ranfdev = { ranfdev = {
email = "ranfdev@gmail.com"; email = "ranfdev@gmail.com";
name = "Lorenzo Miglietta"; name = "Lorenzo Miglietta";

View file

@ -1183,6 +1183,7 @@ with lib.maintainers;
hehongbo hehongbo
lach lach
sigmasquadron sigmasquadron
rane
]; ];
scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem."; scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem.";
shortName = "Xen Project Hypervisor"; shortName = "Xen Project Hypervisor";

View file

@ -18,6 +18,22 @@ let
format = pkgs.formats.ini { listsAsDuplicateKeys = true; }; format = pkgs.formats.ini { listsAsDuplicateKeys = true; };
configFile = format.generate "my.cnf" cfg.settings; configFile = format.generate "my.cnf" cfg.settings;
generateClusterAddressExpr = ''
if (config.services.mysql.galeraCluster.nodeAddresses == [ ]) then
""
else
"gcomm://''${builtins.concatStringsSep \",\" config.services.mysql.galeraCluster.nodeAddresses}"
+ lib.optionalString (config.services.mysql.galeraCluster.clusterPassword != "")
"?gmcast.seg=1:''${config.services.mysql.galeraCluster.clusterPassword}"
'';
generateClusterAddress =
if (cfg.galeraCluster.nodeAddresses == [ ]) then
""
else
"gcomm://${builtins.concatStringsSep "," cfg.galeraCluster.nodeAddresses}"
+ lib.optionalString (
cfg.galeraCluster.clusterPassword != ""
) "?gmcast.seg=1:${cfg.galeraCluster.clusterPassword}";
in in
{ {
@ -378,22 +394,8 @@ in
type = lib.types.str; type = lib.types.str;
description = "Full Galera cluster connection string. If nodeAddresses is set, this will be auto-generated, but you can override it with a custom value. Format is typically 'gcomm://node1,node2,node3' with optional parameters."; description = "Full Galera cluster connection string. If nodeAddresses is set, this will be auto-generated, but you can override it with a custom value. Format is typically 'gcomm://node1,node2,node3' with optional parameters.";
example = "gcomm://10.0.0.10,10.0.0.20,10.0.0.30?gmcast.seg=1:SomePassword"; example = "gcomm://10.0.0.10,10.0.0.20,10.0.0.30?gmcast.seg=1:SomePassword";
default = default = ""; # will be evaluate by generateClusterAddress
if (cfg.galeraCluster.nodeAddresses == [ ]) then defaultText = lib.literalExpression generateClusterAddressExpr;
""
else
"gcomm://${builtins.concatStringsSep "," cfg.galeraCluster.nodeAddresses}"
+ lib.optionalString (
cfg.galeraCluster.clusterPassword != ""
) "?gmcast.seg=1:${cfg.galeraCluster.clusterPassword}";
defaultText = lib.literalExpression ''
if (config.services.mysql.galeraCluster.nodeAddresses == [ ]) then
""
else
"gcomm://''${builtins.concatStringsSep \",\" config.services.mysql.galeraCluster.nodeAddresses}"
+ lib.optionalString (config.services.mysql.galeraCluster.clusterPassword != "")
"?gmcast.seg=1:''${config.services.mysql.galeraCluster.clusterPassword}"
'';
}; };
}; };
@ -404,34 +406,30 @@ in
###### implementation ###### implementation
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
assertions = [ assertions =
{ [
assertion = !cfg.galeraCluster.enable || isMariaDB; {
message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant"; assertion = !cfg.galeraCluster.enable || isMariaDB;
} message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant";
{ }
assertion = ]
!cfg.galeraCluster.enable # galeraCluster options checks
|| ( ++ lib.optionals cfg.galeraCluster.enable [
{
assertion =
cfg.galeraCluster.localAddress != "" cfg.galeraCluster.localAddress != ""
&& (cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "") && (cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "");
); message = "mariadb galera cluster is enabled but the localAddress and (nodeAddresses or clusterAddress) are not set";
message = "mariadb galera cluster is enabled but the localAddress and (nodeAddresses or clusterAddress) are not set"; }
} {
{ assertion = cfg.galeraCluster.clusterPassword == "" || cfg.galeraCluster.clusterAddress == "";
assertion = !(cfg.galeraCluster.clusterAddress != "" && cfg.galeraCluster.clusterPassword != ""); message = "mariadb galera clusterPassword is set but overwritten by clusterAddress";
message = "mariadb galera clusterPassword is set but overwritten by clusterAddress"; }
} {
{ assertion = cfg.galeraCluster.nodeAddresses != [ ] || cfg.galeraCluster.clusterAddress != "";
assertion = message = "When services.mysql.galeraCluster.clusterAddress is set, setting services.mysql.galeraCluster.nodeAddresses is redundant and will be overwritten by clusterAddress. Choose one approach.";
!( }
cfg.galeraCluster.enable ];
&& cfg.galeraCluster.nodeAddresses != [ ]
&& cfg.galeraCluster.clusterAddress != ""
);
message = "When services.mysql.galeraCluster.clusterAddress is set, setting services.mysql.galeraCluster.nodeAddresses is redundant and will be overwritten by clusterAddress. Choose one approach.";
}
];
services.mysql.dataDir = lib.mkDefault ( services.mysql.dataDir = lib.mkDefault (
if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql" if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"
@ -475,7 +473,11 @@ in
wsrep_provider = "${cfg.galeraCluster.package}/lib/galera/libgalera_smm.so"; wsrep_provider = "${cfg.galeraCluster.package}/lib/galera/libgalera_smm.so";
wsrep_cluster_name = cfg.galeraCluster.name; wsrep_cluster_name = cfg.galeraCluster.name;
wsrep_cluster_address = cfg.galeraCluster.clusterAddress; wsrep_cluster_address =
if (cfg.galeraCluster.clusterAddress != "") then
cfg.galeraCluster.clusterAddress
else
generateClusterAddress;
wsrep_node_address = cfg.galeraCluster.localAddress; wsrep_node_address = cfg.galeraCluster.localAddress;
wsrep_node_name = "${cfg.galeraCluster.localName}"; wsrep_node_name = "${cfg.galeraCluster.localName}";

View file

@ -72,6 +72,20 @@ let
} cfg.imapdSettings; } cfg.imapdSettings;
in in
{ {
imports = [
(lib.mkRenamedOptionModule
[ "services" "cyrus-imap" "sslServerCert" ]
[ "services" "cyrus-imap" "imapdSettings" "tls_server_cert" ]
)
(lib.mkRenamedOptionModule
[ "services" "cyrus-imap" "sslServerKey" ]
[ "services" "cyrus-imap" "imapdSettings" "tls_server_key" ]
)
(lib.mkRenamedOptionModule
[ "services" "cyrus-imap" "sslCACert" ]
[ "services" "cyrus-imap" "imapdSettings" "tls_client_ca_file" ]
)
];
options.services.cyrus-imap = { options.services.cyrus-imap = {
enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server"; enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server";
debug = mkEnableOption "debugging messages for the Cyrus master process"; debug = mkEnableOption "debugging messages for the Cyrus master process";
@ -294,24 +308,6 @@ in
description = "Path to the configuration file used for Cyrus."; description = "Path to the configuration file used for Cyrus.";
apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig; apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig;
}; };
sslCACert = mkOption {
type = nullOr str;
default = null;
description = "File path which containing one or more CA certificates to use.";
};
sslServerCert = mkOption {
type = nullOr str;
default = null;
description = "File containing the global certificate used for all services (IMAP, POP3, LMTP, Sieve)";
};
sslServerKey = mkOption {
type = nullOr str;
default = null;
description = "File containing the private key belonging to the global server certificate.";
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {

View file

@ -84,6 +84,28 @@ in
description = "Whether this node is a relay."; description = "Whether this node is a relay.";
}; };
lighthouse.dns.enable = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Whether this lighthouse node should serve DNS.";
};
lighthouse.dns.host = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = ''
IP address on which nebula lighthouse should serve DNS.
'localhost' is a good default to ensure the service does not listen on public interfaces;
use a Nebula address like 10.0.0.5 to make DNS resolution available to nebula hosts only.
'';
};
lighthouse.dns.port = lib.mkOption {
type = lib.types.nullOr lib.types.port;
default = 5353;
description = "UDP port number for lighthouse DNS server.";
};
lighthouses = lib.mkOption { lighthouses = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
default = [ ]; default = [ ];
@ -172,10 +194,7 @@ in
''; '';
example = lib.literalExpression '' example = lib.literalExpression ''
{ {
lighthouse.dns = { lighthouse.interval = 15;
host = "0.0.0.0";
port = 53;
};
} }
''; '';
}; };
@ -203,6 +222,9 @@ in
lighthouse = { lighthouse = {
am_lighthouse = netCfg.isLighthouse; am_lighthouse = netCfg.isLighthouse;
hosts = netCfg.lighthouses; hosts = netCfg.lighthouses;
serve_dns = netCfg.lighthouse.dns.enable;
dns.host = netCfg.lighthouse.dns.host;
dns.port = netCfg.lighthouse.dns.port;
}; };
relay = { relay = {
am_relay = netCfg.isRelay; am_relay = netCfg.isRelay;
@ -231,6 +253,19 @@ in
'' ''
settings settings
); );
capabilities =
let
nebulaPort = if !settings.tun.disabled then settings.listen.port else 0;
dnsPort = if settings.lighthouse.serve_dns then settings.lighthouse.dns.port else 0;
in
lib.concatStringsSep " " (
# creation of tunnel interfaces
lib.optional (!settings.tun.disabled) "CAP_NET_ADMIN"
# binding to privileged ports
++ lib.optional (
nebulaPort > 0 && nebulaPort < 1024 || dnsPort > 0 && dnsPort < 1024
) "CAP_NET_BIND_SERVICE"
);
in in
{ {
# Create the systemd service for Nebula. # Create the systemd service for Nebula.
@ -248,8 +283,8 @@ in
Restart = "always"; Restart = "always";
ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}";
UMask = "0027"; UMask = "0027";
CapabilityBoundingSet = "CAP_NET_ADMIN"; CapabilityBoundingSet = capabilities;
AmbientCapabilities = "CAP_NET_ADMIN"; AmbientCapabilities = capabilities;
LockPersonality = true; LockPersonality = true;
NoNewPrivileges = true; NoNewPrivileges = true;
PrivateDevices = false; # needs access to /dev/net/tun (below) PrivateDevices = false; # needs access to /dev/net/tun (below)
@ -302,5 +337,8 @@ in
); );
}; };
meta.maintainers = with lib.maintainers; [ numinit ]; meta.maintainers = with lib.maintainers; [
numinit
siriobalmelli
];
} }

View file

@ -14,7 +14,10 @@ import ./make-test-python.nix (
lib.mkMerge [ lib.mkMerge [
{ {
# Expose nebula for doing cert signing. # Expose nebula for doing cert signing.
environment.systemPackages = [ pkgs.nebula ]; environment.systemPackages = [
pkgs.dig
pkgs.nebula
];
users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
services.openssh.enable = true; services.openssh.enable = true;
networking.firewall.enable = true; # Implicitly true, but let's make sure. networking.firewall.enable = true; # Implicitly true, but let's make sure.
@ -51,6 +54,7 @@ import ./make-test-python.nix (
lighthouse = lighthouse =
{ ... }@args: { ... }@args:
makeNebulaNode args "lighthouse" { makeNebulaNode args "lighthouse" {
networking.firewall.allowedUDPPorts = [ 53 ];
networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
{ {
address = "192.168.1.1"; address = "192.168.1.1";
@ -77,6 +81,13 @@ import ./make-test-python.nix (
} }
]; ];
}; };
lighthouse = {
dns = {
enable = true;
host = "10.0.100.1"; # bind to lighthouse interface
port = 53; # answer on standard DNS port
};
};
}; };
}; };
@ -338,6 +349,8 @@ import ./make-test-python.nix (
# allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall
allowAny.succeed("ping -c3 10.0.100.1") allowAny.succeed("ping -c3 10.0.100.1")
allowAny.fail("ping -c3 10.0.100.3") allowAny.fail("ping -c3 10.0.100.3")
# allowAny can also resolve DNS on lighthouse
allowAny.succeed("dig @10.0.100.1 allowToLighthouse | grep -E 'allowToLighthouse\.\s+[0-9]+\s+IN\s+A\s+10\.0\.100\.4'")
# allowFromLighthouse can ping the lighthouse and allowAny # allowFromLighthouse can ping the lighthouse and allowAny
allowFromLighthouse.succeed("ping -c3 10.0.100.1") allowFromLighthouse.succeed("ping -c3 10.0.100.1")

View file

@ -82,14 +82,14 @@ let
]; ];
in in
mkDerivation rec { mkDerivation rec {
version = "3.42.0"; version = "3.42.1";
pname = "qgis-unwrapped"; pname = "qgis-unwrapped";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qgis"; owner = "qgis";
repo = "QGIS"; repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-vqT6ffqY1M6/2eW08VghysC+v7ZI9Yz0Zhk9UY/izZc="; hash = "sha256-0VW/5X8C35uwIZu018Vtp7qosS0v1b+1SFUE8NSTQYE=";
}; };
passthru = { passthru = {

View file

@ -135,11 +135,11 @@
"vendorHash": null "vendorHash": null
}, },
"azurerm": { "azurerm": {
"hash": "sha256-wM/oWLOAB6EhtUVTP+gHn+hpqhrISAsd31ili2hmLyQ=", "hash": "sha256-pbXkGKym7amioTZlguwBpoFvfvYnCGOxZ7PIT8I3dxY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp", "owner": "hashicorp",
"repo": "terraform-provider-azurerm", "repo": "terraform-provider-azurerm",
"rev": "v4.24.0", "rev": "v4.26.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },
@ -913,11 +913,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
}, },
"oci": { "oci": {
"hash": "sha256-/tgZFUzJqBNTxJzmhcs9YyB55DNwC3oFr9nVyHsFGW4=", "hash": "sha256-UG2dXoHHH7sWma4+Zlvtj2aHwcvJPKgTxJFZDxqzKyc=",
"homepage": "https://registry.terraform.io/providers/oracle/oci", "homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle", "owner": "oracle",
"repo": "terraform-provider-oci", "repo": "terraform-provider-oci",
"rev": "v6.31.0", "rev": "v6.32.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },

View file

@ -13,11 +13,11 @@
mkDerivation rec { mkDerivation rec {
pname = "datovka"; pname = "datovka";
version = "4.25.0"; version = "4.26.0";
src = fetchurl { src = fetchurl {
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
sha256 = "sha256-Snm9dDtHZQsx4T82tML77auBTb1lvITUOfL+kmhY4es="; sha256 = "sha256-pEdjh/c4vhirj2R9bYDdi2FL7N9x67kTOyfXiJDzMKE=";
}; };
buildInputs = [ buildInputs = [

View file

@ -8,13 +8,13 @@
let let
pname = "mendeley"; pname = "mendeley";
version = "2.131.0"; version = "2.132.0";
executableName = "${pname}-reference-manager"; executableName = "${pname}-reference-manager";
src = fetchurl { src = fetchurl {
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
hash = "sha256-pVykRTs0yI9UArgxuE3RUKI8onv27hjyG1Dy4PXztuQ="; hash = "sha256-d4B+rVwWHKLVgY/aK3E6i6CyQKD4TsxZ/XyKbbCrQE0=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View file

@ -31,7 +31,7 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "16.3.11"; version = "16.3.13";
pname = "jmol"; pname = "jmol";
src = src =
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
in in
fetchurl { fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
hash = "sha256-sa2wYzLtk3rSghNxk/kJfaOIDPEJLfwKRRIXMRNBEuI="; hash = "sha256-ehJZSMhUsE0iO3sDD5Q0UMfcjNmTgPzMNgWG5nIeBFo=";
}; };
patchPhase = '' patchPhase = ''

View file

@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E="; hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";
}) })
./4.4.1-newer-spdlog-fmt-compat.patch ./4.4.1-newer-spdlog-fmt-compat.patch
./resynthesis-fix-narrowing-conversion.patch
]; ];
# make sure bundled dependencies don't get in the way - install also otherwise # make sure bundled dependencies don't get in the way - install also otherwise

View file

@ -0,0 +1,13 @@
diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp
index 7a7e404114f..f2889667af8 100644
--- a/plugins/resynthesis/src/resynthesis.cpp
+++ b/plugins/resynthesis/src/resynthesis.cpp
@@ -1058,7 +1058,7 @@ namespace hal
// delete the created directory and the contained files
std::filesystem::remove_all(base_path);
- return OK(subgraph.size());
+ return OK(static_cast<unsigned int>(subgraph.size()));
}
Result<u32> resynthesize_subgraph_of_type(Netlist* nl, const std::vector<const GateType*>& gate_types, GateLibrary* target_gl)

View file

@ -8,13 +8,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
version = "5.1.0"; version = "5.1.1";
pname = "adminer"; pname = "adminer";
# not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
src = fetchurl { src = fetchurl {
url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip"; url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip";
hash = "sha256-SLu7NJoCkfEL9WhYQSHEx5QZmD6cjkBXpwEnp7d6Elo="; hash = "sha256-L1akLFljp4UW/YEVLi317ijY62WN9L4g+OQ127vUP/4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -11,13 +11,13 @@
}: }:
let let
pname = "backrest"; pname = "backrest";
version = "1.7.3"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "garethgeorge"; owner = "garethgeorge";
repo = "backrest"; repo = "backrest";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-X3FiNor2q/JgyV05CIAls7MjMvongH5dGeutPz+CW9I="; hash = "sha256-p2CKXQeA0rHhS6uP0x2tNsFzHBCOi6sRDlr+o4HeBjk=";
}; };
frontend = stdenv.mkDerivation (finalAttrs: { frontend = stdenv.mkDerivation (finalAttrs: {
@ -69,7 +69,11 @@ buildGoModule {
checkFlags = checkFlags =
let let
skippedTests = skippedTests =
[ "TestRunCommand" ] [
"TestMultihostIndexSnapshots"
"TestRunCommand"
"TestSnapshot"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
"TestBackup" # relies on ionice "TestBackup" # relies on ionice
"TestCancelBackup" "TestCancelBackup"

View file

@ -6,12 +6,12 @@
}: }:
let let
pname = "bazecor"; pname = "bazecor";
version = "1.6.5"; version = "1.7.0";
src = appimageTools.extract { src = appimageTools.extract {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage";
hash = "sha256-TitZzTNfEnuU0clTsGKexrtbIcsqE1W9A1pJCefVA6U="; hash = "sha256-i+6EBgT8Fv3GN2qwnr+QH9mcDToeQvit52qRt30Y9sM=";
}; };
# Workaround for https://github.com/Dygmalab/Bazecor/issues/370 # Workaround for https://github.com/Dygmalab/Bazecor/issues/370

View file

@ -8,17 +8,17 @@
buildGoModule rec { buildGoModule rec {
pname = "bento"; pname = "bento";
version = "1.5.2"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "warpstreamlabs"; owner = "warpstreamlabs";
repo = "bento"; repo = "bento";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-ufRC/xVuSnoN+dHeiQZ2k2T8mYxz576l1n+y3Y3TMEY="; hash = "sha256-IPdRe5H/ADaQyz9MjFFplhesUwWMnZ9/RKLBt+f0Z8w=";
}; };
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-FRaT+TeH6+0RzvCwPd0e+2a6i85GTPARS2H49zYVwk4="; vendorHash = "sha256-ormwwLixxvU5W5Vy8c3HTfS5lXkcs+1z0EKr99Em92o=";
subPackages = [ subPackages = [
"cmd/bento" "cmd/bento"

View file

@ -5,15 +5,15 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "betula"; pname = "betula";
version = "1.3.1"; version = "1.4.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~bouncepaw"; owner = "~bouncepaw";
repo = "betula"; repo = "betula";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-20sA2Hnnppr2RXqu2Qx2bkU/u9FUkH6INUUGx2zKfao="; hash = "sha256-f2F0YRhDnKdMqcUvpcRFNAI62gbusfzIUKQSZ65onMU=";
}; };
vendorHash = "sha256-SWcQYF8LP6lw5kWlAVFt3qiwDnvpSOXenmdm6TSfJSc="; vendorHash = "sha256-3PS4fIyHbGGjnbMOy2VIQBXsnIyYDKR/ecl/i5jwSVM=";
env.CGO_ENABLED = 1; env.CGO_ENABLED = 1;
# These tests use internet, so are failing in Nix build. # These tests use internet, so are failing in Nix build.

View file

@ -18,7 +18,7 @@
}: }:
let let
version = "2.1.6"; version = "2.1.7";
jdk = jdk23.override { enableJavaFX = true; }; jdk = jdk23.override { enableJavaFX = true; };
@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb"; url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
hash = "sha256-420XZt8wEzY70xv1OZswYZO1/dtVDt8CRyKCJW068H0="; hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44=";
# Verify the upstream Debian package prior to extraction. # Verify the upstream Debian package prior to extraction.
# See https://bisq.wiki/Bisq_2#Installation # See https://bisq.wiki/Bisq_2#Installation
@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation rec {
signature = fetchurl { signature = fetchurl {
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc"; url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
hash = "sha256-17NjRIcDKlmqvX/zKVrahWd8qJEY+v25qP9yfFMPojw="; hash = "sha256-Cl9EIp+ycD8Tp/bx5dXQK206jZzrYJkI/U9ItfXDRWw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -3,24 +3,24 @@
let let
pname = "brave"; pname = "brave";
version = "1.76.81"; version = "1.77.95";
allArchives = { allArchives = {
aarch64-linux = { aarch64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-Q9BCoSIgP0asYACkHgashQ5h4BITl5My4dxuy50ID8g="; hash = "sha256-jK9narldfjxgtRjOR2P/0r2hVwFF+D60iCHOIrVTBdM=";
}; };
x86_64-linux = { x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-Mzd1qxPUmlZkl7kmuO+rEVT8EE2EF8fQwdF2398gjoI="; hash = "sha256-k4x2TdTIlYPCJ/u30JrwPt0AOSvt16qrxisHjqkDNY8=";
}; };
aarch64-darwin = { aarch64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
hash = "sha256-5GrlXZW2uIHNpTXFHStWWfGpz4hINR9z6442n2g9258="; hash = "sha256-apJFnG80joh7RMJndJI7jU6tgS2QwHZpnackVp4rCek=";
}; };
x86_64-darwin = { x86_64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
hash = "sha256-gOZagyA0oM8KvM+FTsYV/vknG6fG/49rfNInQmN/8K4="; hash = "sha256-wdKIFUwGKJdI7EiMFIrOJuLnMaeBSGgDOk2QUwhNlLE=";
}; };
}; };

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bstone"; pname = "bstone";
version = "1.2.13"; version = "1.2.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bibendovsky"; owner = "bibendovsky";
repo = "bstone"; repo = "bstone";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-jK40/FdC11SWe2Vmh6cbNTxPeM1vrAveEtUWoiAh+jc="; hash = "sha256-L07GfqeQPTWGQb+vOOXNgbYLYpxQ2OHFnCLWd4uSlBw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,8 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
postInstall = '' postInstall = ''
mkdir -p $out/bin mkdir -p $out/{bin,share/bibendovsky/bstone}
mv $out/bstone* $out/bin mv $out/bstone $out/bin
mv $out/*.txt $out/share/bibendovsky/bstone
''; '';
meta = { meta = {

View file

@ -8,13 +8,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "btcpayserver"; pname = "btcpayserver";
version = "2.0.7"; version = "2.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "btcpayserver"; owner = "btcpayserver";
repo = "btcpayserver"; repo = "btcpayserver";
tag = "v${version}"; tag = "v${version}";
sha256 = "sha256-LOyGNdlU8wvDFmYQ2v1H3Z12++ChVrGM53zBTWCCiCk="; sha256 = "sha256-OK2OqI4h2SLtnGM2Oen5IgmFKqCkd1ZPuXgCOx6Gixs=";
}; };
projectFile = "BTCPayServer/BTCPayServer.csproj"; projectFile = "BTCPayServer/BTCPayServer.csproj";

View file

@ -7,12 +7,12 @@
let let
pname = "cables"; pname = "cables";
version = "0.5.10"; version = "0.5.11";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
sha256 = "sha256-FwjmqCIoo1RG+57Y1fnAAWRtOAj4ILQb0pJMESxkiwo="; sha256 = "sha256-d6IKORuySXrVk5ifevtPlposSuxk7n9b/dxD8CRfdMQ=";
}; };
appimageContents = appimageTools.extract { appimageContents = appimageTools.extract {

View file

@ -70,6 +70,7 @@ let
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
octodi octodi
d3vil0p3r d3vil0p3r
blackzeshi
]; ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };

View file

@ -0,0 +1,22 @@
From f13bdf94c00a9da3b152ed9fe20001e240215b96 Mon Sep 17 00:00:00 2001
From: James Lambert <lambertjamesd@gmail.com>
Date: Tue, 9 Feb 2021 11:49:51 -0700
Subject: [PATCH] Cast mi_regs callbacks
---
bus/controller.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bus/controller.c b/bus/controller.c
index 1f0cdfccf..24b3df260 100644
--- a/bus/controller.c
+++ b/bus/controller.c
@@ -44,7 +44,7 @@ int bus_init(struct bus_controller *bus, int dd_present) {
static const struct bus_controller_mapping mappings[NUM_MAPPINGS] = {
{read_ai_regs, write_ai_regs, AI_REGS_BASE_ADDRESS, AI_REGS_ADDRESS_LEN},
{read_dp_regs, write_dp_regs, DP_REGS_BASE_ADDRESS, DP_REGS_ADDRESS_LEN},
- {read_mi_regs, write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN},
+ {(memory_rd_function)read_mi_regs, (memory_wr_function)write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN},
{read_pi_regs, write_pi_regs, PI_REGS_BASE_ADDRESS, PI_REGS_ADDRESS_LEN},
{read_ri_regs, write_ri_regs, RI_REGS_BASE_ADDRESS, RI_REGS_ADDRESS_LEN},
{read_si_regs, write_si_regs, SI_REGS_BASE_ADDRESS, SI_REGS_ADDRESS_LEN},

View file

@ -0,0 +1,137 @@
From 41ad58ab1953835313ad2b89686931b08b5b47e8 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 25 Mar 2025 15:26:07 +0300
Subject: [PATCH] Fix thread arg type for pthread_setname_np
- change `thread` arg type to `cen64_thread` instead of `cen64_thread *`
(`pthread_t` instead of `pthread_t *`) according to definition of
`pthread_setname_np` from `<pthread.h>`:
`int pthread_setname_np(pthread_t thread, const char *name);`
fixes gcc14 errors:
```
/build/source/cen64.c:475:24: error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion]
475 | cen64_thread_setname(thread, "device");
| ^~~~~~
| |
| cen64_thread {aka long unsigned int}
In file included from /build/source/device/device.h:26,
from /build/source/cen64.c:15:
/build/source/os/posix/thread.h:59:54: note: expected 'cen64_thread *' {aka 'long unsigned int *'} but argument is of type 'cen64_thread' {aka 'lo>
59 | static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
| ~~~~~~~~~~~~~~^
```
- add cast to `cen64_thread` from NULL where `cen64_thread` is called
with it, fixes gcc14 errors:
```
/build/source/gdb/gdb.c:82:24: error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion]
82 | cen64_thread_setname(NULL, "gdb");
| ^~~~
| |
| void *
/build/source/os/posix/thread.h:59:53: note: expected 'cen64_thread' {aka 'long unsigned int'} but argument is of type 'void *'
59 | static inline int cen64_thread_setname(cen64_thread t, const char *name) {
| ~~~~~~~~~~~~~^
```
---
cen64.c | 2 +-
device/device.c | 4 ++--
gdb/gdb.c | 4 ++--
os/posix/thread.h | 6 +++---
os/winapi/thread.h | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cen64.c b/cen64.c
index 51014a4..ca6bda1 100644
--- a/cen64.c
+++ b/cen64.c
@@ -483,7 +483,7 @@ int run_device(struct cen64_device *device, bool no_video) {
}
CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque) {
- cen64_thread_setname(NULL, "device");
+ cen64_thread_setname((cen64_thread)NULL, "device");
struct cen64_device *device = (struct cen64_device *) opaque;
device_run(device);
diff --git a/device/device.c b/device/device.c
index cd5a046..c915846 100644
--- a/device/device.c
+++ b/device/device.c
@@ -224,7 +224,7 @@ CEN64_THREAD_RETURN_TYPE run_rcp_thread(void *opaque) {
}
CEN64_THREAD_RETURN_TYPE run_vr4300_thread(void *opaque) {
- cen64_thread_setname(NULL, "vr4300");
+ cen64_thread_setname((cen64_thread)NULL, "vr4300");
struct cen64_device *device = (struct cen64_device *) opaque;
while (likely(device->running)) {
@@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) {
cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) {
vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler);
-}
\ No newline at end of file
+}
diff --git a/gdb/gdb.c b/gdb/gdb.c
index 021784d..0e8d188 100644
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -79,7 +79,7 @@ bool gdb_parse_packet(const char* input, int len, const char** command_start, co
}
CEN64_THREAD_RETURN_TYPE gdb_thread(void *opaque) {
- cen64_thread_setname(NULL, "gdb");
+ cen64_thread_setname((cen64_thread)NULL, "gdb");
struct gdb *gdb = (struct gdb *) opaque;
cen64_mutex_lock(&gdb->client_mutex);
@@ -257,4 +257,4 @@ cen64_cold void gdb_destroy(struct gdb* gdb) {
gdb->device = NULL;
free(gdb);
-}
\ No newline at end of file
+}
diff --git a/os/posix/thread.h b/os/posix/thread.h
index 2a261c6..e8e6144 100644
--- a/os/posix/thread.h
+++ b/os/posix/thread.h
@@ -45,9 +45,9 @@ static inline int cen64_thread_join(cen64_thread *t) {
#ifdef __APPLE__
int pthread_setname_np(const char*);
#elif __NETBSD__
-int pthread_setname_np(cen64_thread*, const char*, const char*);
+int pthread_setname_np(cen64_thread, const char*, const char*);
#else
-int pthread_setname_np(cen64_thread*, const char*);
+int pthread_setname_np(cen64_thread, const char*);
#endif
// Sets the name of the thread to a specific value
@@ -56,7 +56,7 @@ int pthread_setname_np(cen64_thread*, const char*);
// If you call it at the wrong time or your OS doesn't support custom thread names
// the return value will be non-zero.
// If cen64_thread is not set the name of the current thread will be changed.
-static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
+static inline int cen64_thread_setname(cen64_thread t, const char *name) {
#ifdef __APPLE__
if (t == NULL)
return pthread_setname_np(name);
diff --git a/os/winapi/thread.h b/os/winapi/thread.h
index d7c162a..128d935 100644
--- a/os/winapi/thread.h
+++ b/os/winapi/thread.h
@@ -57,7 +57,7 @@ static inline int cen64_thread_join(cen64_thread *t) {
//
// Windows isn't supported for the moment.
//
-static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
+static inline int cen64_thread_setname(cen64_thread t, const char *name) {
return ENOSYS;
}
--
2.48.1

View file

@ -11,15 +11,23 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cen64"; pname = "cen64";
version = "unstable-2022-10-02"; version = "0-unstable-2023-05-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "n64dev"; owner = "n64dev";
repo = "cen64"; repo = "cen64";
rev = "ee6db7d803a77b474e73992fdc25d76b9723d806"; rev = "1c1118462bd9d9b8ceb4c556a647718072477aab";
sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I="; sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w=";
}; };
patches = [
# fix build with gcc14:
# https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96
./cast-mi_regs-callbacks.patch
# https://github.com/n64dev/cen64/pull/237
./fix-thread-arg-type-for-pthread_setname_np.patch
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
libGL libGL

View file

@ -19,12 +19,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "circt"; pname = "circt";
version = "1.111.1"; version = "1.112.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "llvm"; owner = "llvm";
repo = "circt"; repo = "circt";
rev = "firtool-${version}"; rev = "firtool-${version}";
hash = "sha256-eOoUwYNQS83/uNfbbEPUbTf9aIjqc2vklIC3zi9U9KU="; hash = "sha256-yh7/2QsUO2/sCyrgT8QTBC/BENEZNmXoHTIiz5abngw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -6,20 +6,15 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "coconutbattery"; pname = "coconutbattery";
version = "3.9.14"; version = "4.0.2,152";
src = fetchzip { src = fetchzip {
url = "https://coconut-flavour.com/downloads/coconutBattery_${ url = "https://coconut-flavour.com/downloads/coconutBattery_${
builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version lib.replaceStrings [ "." "," ] [ "" "_" ] finalAttrs.version
}.zip"; }.zip";
hash = "sha256-zKSPKwDBwxlyNJFurCLLGtba9gpizJCjOOAd81vdD5Q="; hash = "sha256-PNSDUp07lUx5ebcfM3WSJAfRQjeuIIy7KfY0KJ0i1AE=";
}; };
dontPatch = true;
dontConfigure = true;
dontBuild = true;
dontFixup = true;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -29,16 +24,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = {
description = "Standard for battery reading since 2005"; description = "Standard for battery reading since 2005";
longDescription = '' longDescription = ''
With coconutBattery you are always aware of your current battery health. With coconutBattery you are always aware of your current battery health.
It shows you live information about the battery quality in your Mac, iPhone and iPad. It shows you live information about the battery quality in your Mac, iPhone and iPad.
''; '';
homepage = "https://www.coconut-flavour.com/coconutbattery"; homepage = "https://www.coconut-flavour.com/coconutbattery";
license = with licenses; [ unfree ]; license = with lib.licenses; [ unfree ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ stepbrobd ]; maintainers = with lib.maintainers; [ stepbrobd ];
platforms = [ platforms = [
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin" "x86_64-darwin"

View file

@ -68,6 +68,7 @@ python3Packages.buildPythonApplication rec {
]; ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
distutils # required in python312 to call subcommands (see https://github.com/Ericsson/codechecker/issues/4350)
lxml lxml
sqlalchemy sqlalchemy
alembic alembic
@ -122,6 +123,5 @@ python3Packages.buildPythonApplication rec {
felixsinger felixsinger
]; ];
mainProgram = "CodeChecker"; mainProgram = "CodeChecker";
platforms = platforms.linux;
}; };
} }

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "commit"; pname = "commit";
version = "4.2"; version = "4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sonnyp"; owner = "sonnyp";
repo = "Commit"; repo = "Commit";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw="; hash = "sha256-yNzMFOd0IN5EUKG7ztCEbQzQ9RHc+D4iC1OiBauMSwE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -8,6 +8,7 @@
ffmpeg, ffmpeg,
libxslt, libxslt,
shaka-packager, shaka-packager,
nix-update-script,
}: }:
let let
@ -24,13 +25,13 @@ let
in in
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "dash-mpd-cli"; pname = "dash-mpd-cli";
version = "0.2.25"; version = "0.2.26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emarsden"; owner = "emarsden";
repo = "dash-mpd-cli"; repo = "dash-mpd-cli";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4="; hash = "sha256-PMzHWY129Bddl1RQQyEPstqvDLAqXxGv9I3fw1AylBo=";
}; };
patches = [ patches = [
@ -38,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
]; ];
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0="; cargoHash = "sha256-qy8X9DoBD5MIUQ6akalqtyasst0ZKJJLZTEz+6Hp6EI=";
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
@ -59,6 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
} }
''; '';
passthru.updateScript = nix-update-script { };
meta = { meta = {
description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest"; description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest";
longDescription = '' longDescription = ''

View file

@ -17,15 +17,15 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "decibels"; pname = "decibels";
version = "46.0"; version = "48.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
group = "GNOME"; group = "GNOME";
owner = "Incubator"; owner = "Incubator";
repo = "decibels"; repo = "decibels";
rev = version; tag = version;
hash = "sha256-3LQQcrpmWrTfk8A8GR+KnxJEB1HGozgEsM+j5ECK8kc="; hash = "sha256-qtKiKfcxGLuV1bE3lb7l4s+reZRJXcjlV35M8eZmvHc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Play audio files"; description = "Play audio files";
homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels"; homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels";
changelog = "https://gitlab.gnome.org/GNOME/Incubator/decibels/-/blob/main/NEWS?ref_type=tags"; changelog = "https://gitlab.gnome.org/GNOME/decibels/-/blob/${version}/NEWS?ref_type=tags";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
maintainers = lib.teams.gnome-circle.members; maintainers = lib.teams.gnome-circle.members;
mainProgram = "org.gnome.Decibels"; mainProgram = "org.gnome.Decibels";

View file

@ -106,6 +106,9 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://gitlab.com/gabmus/envision"; homepage = "https://gitlab.com/gabmus/envision";
license = lib.licenses.agpl3Only; license = lib.licenses.agpl3Only;
mainProgram = "envision"; mainProgram = "envision";
# More maintainers needed!
# envision (wrapped) requires frequent updates to the dependency list;
# the more people that can help with this, the better.
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
pandapip1 pandapip1
Scrumplex Scrumplex

View file

@ -52,6 +52,7 @@ buildFHSEnv {
xorg.xorgproto xorg.xorgproto
SDL2 SDL2
wayland wayland
mesa-gl-headers
# Additional dependencies required for Monado WMR support # Additional dependencies required for Monado WMR support
bc bc
fmt fmt
@ -60,6 +61,7 @@ buildFHSEnv {
gtest gtest
jq jq
libepoxy libepoxy
lz4
lz4.dev lz4.dev
tbb tbb
libxkbcommon libxkbcommon

View file

@ -29,14 +29,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "furnace"; pname = "furnace";
version = "0.6.7"; version = "0.6.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tildearrow"; owner = "tildearrow";
repo = "furnace"; repo = "furnace";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-G5yjqsep+hDGXCqGNBKoMvV7JOD7ZZTxTPBl9VmG8RM="; hash = "sha256-pdl46Xrq1NS0Wtri/xMfd4SxKnFQykB0TpOG/GJT89Y=";
}; };
postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

View file

@ -13,8 +13,9 @@
pkg-config, pkg-config,
wrapGAppsHook3, wrapGAppsHook3,
openssl, glib-networking,
libsoup_3, libsoup_3,
openssl,
webkitgtk_4_1, webkitgtk_4_1,
}: }:
@ -66,9 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
buildInputs = [ buildInputs = [
glib-networking # needed to load icons
libsoup_3 libsoup_3
webkitgtk_4_1
openssl openssl
webkitgtk_4_1
]; ];
meta = { meta = {

View file

@ -1,18 +1,18 @@
[ [
{ {
"pname": "Azure.Core", "pname": "Azure.Core",
"version": "1.41.0", "version": "1.44.1",
"hash": "sha256-/ixQr8KFGlZa43gGd2A7aBzwu9h+wLO6OqIMy3YbW+Y=" "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
}, },
{ {
"pname": "Azure.Storage.Blobs", "pname": "Azure.Storage.Blobs",
"version": "12.21.2", "version": "12.24.0",
"hash": "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o=" "hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs="
}, },
{ {
"pname": "Azure.Storage.Common", "pname": "Azure.Storage.Common",
"version": "12.20.1", "version": "12.23.0",
"hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w=" "hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q="
}, },
{ {
"pname": "CommandLineParser", "pname": "CommandLineParser",
@ -25,9 +25,29 @@
"hash": "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE=" "hash": "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE="
}, },
{ {
"pname": "Microsoft.Bcl.AsyncInterfaces", "pname": "Microsoft.AspNetCore.App.Ref",
"version": "1.1.1", "version": "8.0.14",
"hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" "hash": "sha256-/KLfqaH4v++SyVJR9p+2WxrMDKPEZKmUvLUjB2ZwT/0="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
"version": "8.0.14",
"hash": "sha256-f0PiSIwbh5t4IKMcVBWb6qSEGp/NAHuC/bWdR3Er440="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "8.0.14",
"hash": "sha256-HGSGesUhWei4IE+jqGh85aokkIg7xufpVn+n1vOLoY4="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
"version": "8.0.14",
"hash": "sha256-rAypEtdQcbfckGqa8oAY2WLTDlx54Xi3IOiE42BKV+M="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "8.0.14",
"hash": "sha256-6nKy10sMp/xqjFZvDfv28s9+r8gzYnKpxVq9p2v6FAo="
}, },
{ {
"pname": "Microsoft.Bcl.AsyncInterfaces", "pname": "Microsoft.Bcl.AsyncInterfaces",
@ -35,129 +55,179 @@
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
}, },
{ {
"pname": "Microsoft.Build.Tasks.Git", "pname": "Microsoft.Bcl.Memory",
"version": "8.0.0", "version": "9.0.0",
"hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" "hash": "sha256-ECgyZ53XqJoRcZexQpctEq1nHFXuW4YqFSx7Elsae7U="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration", "pname": "Microsoft.Extensions.Configuration",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" "hash": "sha256-p1KEkbl1h3dJkBZQUMK2Jt1vbm/NGIHqLEr7QrLYIbg="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.Abstractions", "pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" "hash": "sha256-OjL0pzW+Wsp0KSrqawYHdtIf8w0XqvY8USEbptgP6dI="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.Binder", "pname": "Microsoft.Extensions.Configuration.Binder",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" "hash": "sha256-KxYOzATIl0qI8MScHL9BYsCB3dvqoNDCrraiquBHMVs="
}, },
{ {
"pname": "Microsoft.Extensions.DependencyInjection", "pname": "Microsoft.Extensions.DependencyInjection",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" "hash": "sha256-/gAk+YbJT1/XjMfPBrEg9wUbljA0g1vFJuE+mFOPwV0="
}, },
{ {
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" "hash": "sha256-90HSc8MgyemdtRTBN7Indq62DRaqI2mjai9iV/pi/o4="
}, },
{ {
"pname": "Microsoft.Extensions.Logging", "pname": "Microsoft.Extensions.Logging",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" "hash": "sha256-w1cKHraJW+i7avhTseoJ+u0parEAJ7r51E2qvsuXZDA="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Abstractions", "pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
}, },
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.2",
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "9.0.3",
"hash": "sha256-f/K3A9NPpCOTGlyha5DJf+OIjfAVWu+dJ4rAqQ+3sso="
},
{ {
"pname": "Microsoft.Extensions.Logging.Configuration", "pname": "Microsoft.Extensions.Logging.Configuration",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" "hash": "sha256-u9Un3Bc+Cbj2E8u2etU+KPPv3IbCKgCAY/SCAGK6+LE="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Console", "pname": "Microsoft.Extensions.Logging.Console",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c=" "hash": "sha256-bDHxUjuO4d63GXbDoD9Hdo8AvAke0/r38hzctAWQUqc="
}, },
{ {
"pname": "Microsoft.Extensions.Options", "pname": "Microsoft.Extensions.Options",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" "hash": "sha256-h4CLVA1cZdte8hd/bcb5dsi61MhAAScHRZU4LR2W5Z8="
}, },
{ {
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" "hash": "sha256-FjYrMjnkEplPTYoHUVU94zXIuVsjL5AcGHb/zYkh138="
}, },
{ {
"pname": "Microsoft.Extensions.Primitives", "pname": "Microsoft.Extensions.Primitives",
"version": "8.0.0", "version": "9.0.3",
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" "hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus="
}, },
{ {
"pname": "Microsoft.IdentityModel.Abstractions", "pname": "Microsoft.IdentityModel.Abstractions",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-zPWUKTCfGm4MWcYPU037NzezsFE1g8tEijjQkw5iooI=" "hash": "sha256-RDyVSOYjQFGZsGr2tjwcJHjJV4JJPZ5uZdwE3BbbLB0="
}, },
{ {
"pname": "Microsoft.IdentityModel.JsonWebTokens", "pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-Xv9MUnjb66U3xeR9drOcSX5n2DjOCIJZPMNSKjWHo9Y=" "hash": "sha256-Y3NBDifORZ09vKlIF8J1Ocxe8DrmWV4/DuVJZul4xmM="
}, },
{ {
"pname": "Microsoft.IdentityModel.Logging", "pname": "Microsoft.IdentityModel.Logging",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-FfwrH/2eLT521Kqw+RBIoVfzlTNyYMqlWP3z+T6Wy2Y=" "hash": "sha256-AXGRN3rs+CJlxyxF80FzPe8UDcZqg6jHrj12pyBs+gU="
}, },
{ {
"pname": "Microsoft.IdentityModel.Protocols", "pname": "Microsoft.IdentityModel.Protocols",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg=" "hash": "sha256-o+1L4GoUh94XKcUzTS/ECVoPIfVH/i84XN+wSmE75pg="
}, },
{ {
"pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0=" "hash": "sha256-H8ZkyYOR37DT09dbCU4khligNgUbIHfnHUiuaD5Kenw="
}, },
{ {
"pname": "Microsoft.IdentityModel.Tokens", "pname": "Microsoft.IdentityModel.Tokens",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA=" "hash": "sha256-rB4Hg9FSlkiXireuZKYdVq9CcqmJa5YeTw+WMlSVnkQ="
}, },
{ {
"pname": "Microsoft.IdentityModel.Validators", "pname": "Microsoft.IdentityModel.Validators",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-5LTLbFNWz33nco+hyKAEHcQeAWaBugJ0oMKR6AuEI34=" "hash": "sha256-BDdJNDquVEplPJT3fYOakg26bSNyzNyUce+7mCjtc5o="
}, },
{ {
"pname": "Microsoft.SourceLink.Common", "pname": "Microsoft.NETCore.App.Host.linux-arm64",
"version": "8.0.0", "version": "8.0.14",
"hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" "hash": "sha256-TCO/TrAqfmDvJfO+oM80frwHtg4hzpGTZXkrR3UiuAc="
}, },
{ {
"pname": "Microsoft.SourceLink.GitHub", "pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "8.0.0", "version": "8.0.14",
"hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" "hash": "sha256-MO52s0Y/7wkAhY4d+ecz1MT+xe7pMqchsakvcY8pWNA="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
"version": "8.0.14",
"hash": "sha256-QJeEGCWpGejHQiQVgnwUH60CxM9YPZfyuhywoVf/bE8="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-x64",
"version": "8.0.14",
"hash": "sha256-uVxJpshjquHLuWzFOA6gcWSB87U39dJw4y5MhmsPvoM="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "8.0.14",
"hash": "sha256-YeIjDhpNaO+7kWYZL0ZrbH+EX3inANNbd7m45cxDwLI="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
"version": "8.0.14",
"hash": "sha256-NBmDWdhOzIbS4KzGnndhWV5addf46B8/mn8j7BC/oDs="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "8.0.14",
"hash": "sha256-l8clUSsyExPwyZ7oO6Dl/K2Md1mnaNdVEe9G4716yCs="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
"version": "8.0.14",
"hash": "sha256-OrtH7sxUN+BKS+5LQJxto0QJkakQmFgfTgEyRp3bS2c="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "8.0.14",
"hash": "sha256-2S+TxQJfLtdpHZftM1YTENQYQpwH+ZWlmLSvwK51Ikk="
}, },
{ {
"pname": "System.ClientModel", "pname": "System.ClientModel",
"version": "1.0.0", "version": "1.1.0",
"hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y=" "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="
}, },
{ {
"pname": "System.Diagnostics.DiagnosticSource", "pname": "System.Diagnostics.DiagnosticSource",
"version": "6.0.1", "version": "6.0.1",
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
}, },
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "9.0.3",
"hash": "sha256-zgZF8BTksBk5oucX0j0Ju8qNG8oKJbIGio0GM+egT9M="
},
{ {
"pname": "System.IdentityModel.Tokens.Jwt", "pname": "System.IdentityModel.Tokens.Jwt",
"version": "8.0.1", "version": "8.6.1",
"hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" "hash": "sha256-vzwoEHRmUBnmlj77lFUZ/nD2oCEmY2rjwyaaXEZxuaU="
}, },
{ {
"pname": "System.Interactive.Async", "pname": "System.Interactive.Async",
@ -169,6 +239,11 @@
"version": "6.0.0", "version": "6.0.0",
"hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE=" "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="
}, },
{
"pname": "System.IO.Pipelines",
"version": "9.0.3",
"hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
},
{ {
"pname": "System.Linq.Async", "pname": "System.Linq.Async",
"version": "6.0.1", "version": "6.0.1",
@ -179,6 +254,11 @@
"version": "1.0.2", "version": "1.0.2",
"hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="
}, },
{
"pname": "System.Memory.Data",
"version": "6.0.0",
"hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
},
{ {
"pname": "System.Numerics.Vectors", "pname": "System.Numerics.Vectors",
"version": "4.5.0", "version": "4.5.0",
@ -191,18 +271,33 @@
}, },
{ {
"pname": "System.Text.Encodings.Web", "pname": "System.Text.Encodings.Web",
"version": "4.7.2", "version": "6.0.0",
"hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
},
{
"pname": "System.Text.Encodings.Web",
"version": "9.0.3",
"hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE="
}, },
{ {
"pname": "System.Text.Json", "pname": "System.Text.Json",
"version": "4.7.2", "version": "6.0.0",
"hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
}, },
{ {
"pname": "System.Text.Json", "pname": "System.Text.Json",
"version": "8.0.5", "version": "6.0.10",
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
},
{
"pname": "System.Text.Json",
"version": "6.0.9",
"hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs="
},
{
"pname": "System.Text.Json",
"version": "9.0.3",
"hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w="
}, },
{ {
"pname": "System.Threading.Tasks.Extensions", "pname": "System.Threading.Tasks.Extensions",

View file

@ -8,24 +8,24 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "garnet"; pname = "garnet";
version = "1.0.58"; version = "1.0.61";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "microsoft"; owner = "microsoft";
repo = "garnet"; repo = "garnet";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-PP1Dko7/3Yx3evEyTRhHA85m6XztQiUt307LVZsCx64="; hash = "sha256-Xvc/ECu/aIduHABZ08J3+iDgvOBs3vLCpzHJwfuLSp0=";
}; };
projectFile = "main/GarnetServer/GarnetServer.csproj"; projectFile = "main/GarnetServer/GarnetServer.csproj";
nugetDeps = ./deps.json; nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnet-runtime = dotnetCorePackages.runtime_9_0;
dotnetBuildFlags = [ dotnetBuildFlags = [
"-f" "-f"
"net8.0" "net9.0"
]; ];
dotnetInstallFlags = dotnetBuildFlags; dotnetInstallFlags = dotnetBuildFlags;

View file

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ghq"; pname = "ghq";
version = "1.7.1"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "x-motemen"; owner = "x-motemen";
repo = "ghq"; repo = "ghq";
tag = "v${version}"; tag = "v${version}";
sha256 = "sha256-5elUUZxhKZArtToEDfjYam7GS6m30GpbBLlUNy6dIyo="; sha256 = "sha256-5BN96/RShfJpkfpJe0qrZVDuyFoAV9kgCiBv4REY/5Y=";
}; };
vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec="; vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec=";

View file

@ -7,16 +7,16 @@
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "github-mcp-server"; pname = "github-mcp-server";
version = "0.1.0"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "github"; owner = "github";
repo = "github-mcp-server"; repo = "github-mcp-server";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-LpD4zLAeLFod7sCNvBW8u9Wk0lL75OmlRXZqpQsQMOs="; hash = "sha256-cIS6awIzGadeDdIfSmHKlL9NhouZwQAND7Au8zz0HJA=";
}; };
vendorHash = "sha256-YqjcPP4elzdwEVvYUcFBoPYWlFzeT+q2+pxNzgj1X0Q="; vendorHash = "sha256-eBKTnuJk705oE//ejdwu/hi1hq8N88C6e4dEkKuM+5g=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -12,18 +12,18 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "google-lighthouse"; pname = "google-lighthouse";
version = "12.4.0"; version = "12.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleChrome"; owner = "GoogleChrome";
repo = "lighthouse"; repo = "lighthouse";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-O5HBaL+NogrE7dWi3TI0C5t+kQcJ7YG6yxRWsYpE1vw="; hash = "sha256-v4V4K77WC3InQ+jRlzw0JV8ehPF+hwWlnAt3P8yHMGU=";
}; };
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
hash = "sha256-Jy3KBsHIh/HctSze3We04aisBjq67LZt0Z+HrBdDeIs="; hash = "sha256-qdOR7A8ku8qJyJ3rdzH1okt+P1aekGfdtZbxjYOqehA=";
}; };
yarnBuildScript = "build-report"; yarnBuildScript = "build-report";

View file

@ -16,27 +16,27 @@ let
gpt-4o-tokenizer = fetchurl { gpt-4o-tokenizer = fetchurl {
url = "https://huggingface.co/Xenova/gpt-4o/resolve/31376962e96831b948abe05d420160d0793a65a4/tokenizer.json"; url = "https://huggingface.co/Xenova/gpt-4o/resolve/31376962e96831b948abe05d420160d0793a65a4/tokenizer.json";
hash = "sha256-Q6OtRhimqTj4wmFBVOoQwxrVOmLVaDrgsOYTNXXO8H4="; hash = "sha256-Q6OtRhimqTj4wmFBVOoQwxrVOmLVaDrgsOYTNXXO8H4=";
meta.license = lib.licenses.unfree; meta.license = lib.licenses.mit;
}; };
claude-tokenizer = fetchurl { claude-tokenizer = fetchurl {
url = "https://huggingface.co/Xenova/claude-tokenizer/resolve/cae688821ea05490de49a6d3faa36468a4672fad/tokenizer.json"; url = "https://huggingface.co/Xenova/claude-tokenizer/resolve/cae688821ea05490de49a6d3faa36468a4672fad/tokenizer.json";
hash = "sha256-wkFzffJLTn98mvT9zuKaDKkD3LKIqLdTvDRqMJKRF2c="; hash = "sha256-wkFzffJLTn98mvT9zuKaDKkD3LKIqLdTvDRqMJKRF2c=";
meta.license = lib.licenses.unfree; meta.license = lib.licenses.mit;
}; };
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "goose-cli"; pname = "goose-cli";
version = "1.0.15"; version = "1.0.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "block"; owner = "block";
repo = "goose"; repo = "goose";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-9uIpwJaRpYvsWW8ysFQWgogp/4hh5b72+5dNwYQKrM8="; hash = "sha256-l/lcwTNUq2xJHh0MKhnDZjRJ/5cANbdar/Vusf38esQ=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-5qMciAnX34fbiV5Oy/+V3o7S3NwubxyRRNFXWcQK+kE="; cargoHash = "sha256-1xKWzgptnM1ZP0nQXILBoaKVwL2FyXpldTUIa1ITQO0=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -6,7 +6,7 @@
}: }:
let let
version = "0.17.68"; version = "0.17.70";
in in
buildGoModule { buildGoModule {
pname = "gqlgen"; pname = "gqlgen";
@ -16,7 +16,7 @@ buildGoModule {
owner = "99designs"; owner = "99designs";
repo = "gqlgen"; repo = "gqlgen";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-zu9Rgxua19dZNLUeJeMklKB0C95E8UVWGu/I5Lkk66E="; hash = "sha256-VpZQBmQKxqrWC9pD90V4hMO6mYgbCCbrenyCEbGTHtA=";
}; };
vendorHash = "sha256-B3RiZZee6jefslUSTfHDth8WUl5rv7fmEFU0DpKkWZk="; vendorHash = "sha256-B3RiZZee6jefslUSTfHDth8WUl5rv7fmEFU0DpKkWZk=";

View file

@ -17,7 +17,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "gtk-layer-shell"; pname = "gtk-layer-shell";
version = "0.9.0"; version = "0.9.1";
outputs = [ outputs = [
"out" "out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "wmww"; owner = "wmww";
repo = "gtk-layer-shell"; repo = "gtk-layer-shell";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY="; hash = "sha256-TObAo/YgS6ObYrNLitxMwneGzLxwnnBIOhBVAeAzbt4=";
}; };
strictDeps = true; strictDeps = true;

View file

@ -61,8 +61,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SDL-Hercules-390"; owner = "SDL-Hercules-390";
repo = "crypto"; repo = "crypto";
rev = "a5096e5dd79f46b568806240c0824cd8cb2fcda2"; rev = "9ac58405c2b91fb7cd230aed474dc7059f0fcad9";
hash = "sha256-VWjM8WxPMynyW49Z8U/r6SsF7u7Xbk7Dd0gR35lIw28="; hash = "sha256-hWNowhKP26+HMIL4facOCrZAJ1bR0rRTRc+2R9AM2cc=";
}; };
}); });
@ -71,8 +71,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SDL-Hercules-390"; owner = "SDL-Hercules-390";
repo = "decNumber"; repo = "decNumber";
rev = "3aa2f4531b5fcbd0478ecbaf72ccc47079c67280"; rev = "995184583107625015bb450228a5f3fb781d9502";
hash = "sha256-PfPhnYUSIw1sYiGRM3iHRTbHHbQ+sK7oO12pH/yt+MQ="; hash = "sha256-3PAJ+HZasf3fr6F1cmqIk+Jjv3Gzkki7AFrAHBaEATo=";
}; };
}); });
@ -81,8 +81,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SDL-Hercules-390"; owner = "SDL-Hercules-390";
repo = "SoftFloat"; repo = "SoftFloat";
rev = "4b0c326008e174610969c92e69178939ed80653d"; rev = "e053494d988ec0648c92f683abce52597bfae745";
hash = "sha256-DEIT5Xk6IqUXCIGD2Wj0h9xPOR0Mid2Das7aKMQMDaM="; hash = "sha256-1UCRYzf24U3zniKnatPvYKSmTEsx3YCrtv1tBR5lvw8=";
}; };
}); });
@ -91,8 +91,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SDL-Hercules-390"; owner = "SDL-Hercules-390";
repo = "telnet"; repo = "telnet";
rev = "729f0b688c1426018112c1e509f207fb5f266efa"; rev = "384b2542dfc9af67ca078e2bc13487a8fc234a3f";
hash = "sha256-ED0Cl+VcK6yl59ShgJBZKy25oAFC8eji36pNLwMxTM0="; hash = "sha256-dPgLK7nsRZsqY4fVMdlcSHKC2xkGdNmayyK2FW5CNiI=";
}; };
}); });
@ -108,13 +108,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hercules"; pname = "hercules";
version = "4.7"; version = "4.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SDL-Hercules-390"; owner = "SDL-Hercules-390";
repo = "hyperion"; repo = "hyperion";
rev = "Release_${version}"; rev = "Release_${version}";
hash = "sha256-5Kvs2OWQrlsRZpmx7vet8GCky5xAISBNAqn+NHgicOM"; hash = "sha256-3Go5m4/K8d4Vu7Yi8ULQpX83d44fu9XzmG/gClWeUKo=";
}; };
postPatch = '' postPatch = ''

View file

@ -2,15 +2,16 @@
lib, lib,
appimageTools, appimageTools,
fetchurl, fetchurl,
version ? "0.9.9.23",
hash ? "sha256-BTHiLTgLqtUCuxnpPeI5nwe8tYMp+uxFKm01qHnC8A0=",
}: }:
let let
version = "0.9.9.19";
pname = "hifile"; pname = "hifile";
src = fetchurl { src = fetchurl {
url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; url = "https://www.hifile.app/files/HiFile-${version}.AppImage";
hash = "sha256-WrPNH7N8nYr/zd6RGsX3mL1P+nYUzXMPgIoBtC6tGo0="; inherit hash;
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl common-updater-scripts #!nix-shell -I nixpkgs=./. -i bash -p curl nix-update
latestVersion=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '<h1>All downloads</h1>' | grep -m 1 '<li>.*AppImage.*' | sed -n 's/.*HiFile-\([0-9.]*\)\.AppImage.*/\1/p') latestVersion=$(curl -s "https://www.hifile.app/otherdownloads" | grep -A 10 '<h1>All downloads</h1>' | grep -m 1 '<li>.*AppImage.*' | sed -n 's/.*HiFile-\([0-9.]*\)\.AppImage.*/\1/p')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hifile.version" | tr -d '"') currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hifile.version" | tr -d '"')
@ -13,10 +13,4 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
fi fi
prefetch=$(nix-prefetch-url "https://www.hifile.app/files/HiFile-$latestVersion.AppImage") nix-update hifile --version $latestVersion
hash=$(nix-hash --type sha256 --to-sri "$prefetch")
update-source-version hifile 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="x86_64-linux"
update-source-version hifile "$latestVersion" "$hash" --system="x86_64-linux"

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "hyprgraphics"; pname = "hyprgraphics";
version = "0.1.2"; version = "0.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hyprwm"; owner = "hyprwm";
repo = "hyprgraphics"; repo = "hyprgraphics";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-U62Fo0w+aIXBAsSSYsfDsoe3YmoxWMArJ7pN2HNOAqo="; hash = "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,7 +8,6 @@
openssl, openssl,
upnpSupport ? true, upnpSupport ? true,
miniupnpc, miniupnpc,
aesniSupport ? stdenv.hostPlatform.aesSupport,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -37,14 +36,9 @@ stdenv.mkDerivation rec {
installShellFiles installShellFiles
]; ];
makeFlags = makeFlags = [
let "USE_UPNP=${if upnpSupport then "yes" else "no"}"
ynf = a: b: a + "=" + (if b then "yes" else "no"); ];
in
[
(ynf "USE_AESNI" aesniSupport)
(ynf "USE_UPNP" upnpSupport)
];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -7,6 +7,8 @@
glib, glib,
ncurses, ncurses,
libcap_ng, libcap_ng,
enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,
systemdMinimal,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,21 +26,27 @@ stdenv.mkDerivation rec {
autoreconfHook autoreconfHook
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs =
glib [
ncurses glib
libcap_ng ncurses
]; libcap_ng
]
++ (lib.optionals enableSystemd [
systemdMinimal
]);
LDFLAGS = "-lncurses"; configureFlags = lib.optionals enableSystemd [
"--with-systemd"
];
postInstall = '' postInstall = ''
# Systemd service # Systemd service
mkdir -p $out/lib/systemd/system mkdir -p "$out/lib/systemd/system"
grep -vi "EnvironmentFile" misc/irqbalance.service >$out/lib/systemd/system/irqbalance.service grep -vi "EnvironmentFile" misc/irqbalance.service >"$out/lib/systemd/system/irqbalance.service"
substituteInPlace $out/lib/systemd/system/irqbalance.service \ substituteInPlace "$out/lib/systemd/system/irqbalance.service" \
--replace /usr/sbin/irqbalance $out/bin/irqbalance \ --replace-fail /usr/sbin/irqbalance "$out/bin/irqbalance --journal" \
--replace ' $IRQBALANCE_ARGS' "" --replace-fail ' $IRQBALANCE_ARGS' ""
''; '';
meta = with lib; { meta = with lib; {

View file

@ -23,14 +23,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "itgmania"; pname = "itgmania";
version = "1.0.0"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "itgmania"; owner = "itgmania";
repo = "itgmania"; repo = "itgmania";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-GzpsyyjR7NhgCQ9D7q8G4YU7HhV1C1es1C1355gHnV8="; hash = "sha256-OGOvC7/NmEsWXVw4bFjqdT/Hg3Ypbwct//uWuW3/f1o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
description = "Fork of StepMania 5.1, improved for the post-ITG community"; description = "Fork of StepMania 5.1, improved for the post-ITG community";
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ftsimas ]; maintainers = with lib.maintainers; [
ftsimas
maxwell-lt
];
mainProgram = "itgmania"; mainProgram = "itgmania";
}; };
}) })

View file

@ -18,18 +18,18 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "jujutsu"; pname = "jujutsu";
version = "0.28.1"; version = "0.28.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jj-vcs"; owner = "jj-vcs";
repo = "jj"; repo = "jj";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-LDMHMFg9fjEMi8I2Fc3TEyWMctqJurAbckubCgkkZiM="; hash = "sha256-EAD40ZZr6VK4w9OuYzx2YcVgOODopF7IWN7GVjTlblE=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-y/GQSzI7bVPieuAmQKdZY1qticmmRYibBtgXSEJ7dU4="; cargoHash = "sha256-WOzzBhZLV4kfsmTGreg1m+sPcDjznB4Kh8ONVNZkp5A=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -4,6 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
fftwFloat, fftwFloat,
chafa, chafa,
curl,
glib, glib,
libopus, libopus,
opusfile, opusfile,
@ -13,24 +14,25 @@
libogg, libogg,
pkg-config, pkg-config,
versionCheckHook, versionCheckHook,
gitUpdater, nix-update-script,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "kew"; pname = "kew";
version = "3.0.3"; version = "3.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ravachol"; owner = "ravachol";
repo = "kew"; repo = "kew";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc="; hash = "sha256-64xdxRx4OanAcLgir9N7p/q71+gQYhffnWnxZzz93h8=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
fftwFloat.dev fftwFloat.dev
chafa chafa
curl.dev
glib.dev glib.dev
libopus libopus
opusfile opusfile
@ -51,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true; doInstallCheck = true;
passthru = { passthru = {
updateScript = gitUpdater { }; updateScript = nix-update-script { };
}; };
meta = { meta = {

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "keymapper"; pname = "keymapper";
version = "4.11.1"; version = "4.11.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "houmain"; owner = "houmain";
repo = "keymapper"; repo = "keymapper";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-Dq9oyCMMXWBDxX2Bj/IsrjBIxREwMQ12F5/SJ+sQfNY="; hash = "sha256-H2JdGfS+MMh6EDac2bjfcCtjdDSobClAgsqYbZYuSAo=";
}; };
# all the following must be in nativeBuildInputs # all the following must be in nativeBuildInputs

View file

@ -0,0 +1,42 @@
diff --git a/public/utils.js b/public/utils.js
index 3cd38b63..54152694 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -17,7 +17,7 @@ const osShortName = function () {
export function iconsPath() {
if (!app.isPackaged) {
- return path.join(__dirname, "..", "resources", osShortName, "icons");
+ return path.join(__dirname, "..", "..", "icons");
}
return path.join(process.resourcesPath, "icons");
@@ -25,26 +25,14 @@ export function iconsPath() {
export function publicPath() {
if (!app.isPackaged) {
- return path.join(__dirname, "..", "public");
+ return path.join(__dirname, "..", "..", "public");
}
return process.resourcesPath;
}
export function defaultServerBinary() {
- if (!app.isPackaged) {
- return {
- "mac": path.join(__dirname, "..", "..", "dist", "kopia_darwin_amd64", "kopia"),
- "win": path.join(__dirname, "..", "..", "dist", "kopia_windows_amd64", "kopia.exe"),
- "linux": path.join(__dirname, "..", "..", "dist", "kopia_linux_amd64", "kopia"),
- }[osShortName]
- }
-
- return {
- "mac": path.join(process.resourcesPath, "server", "kopia"),
- "win": path.join(process.resourcesPath, "server", "kopia.exe"),
- "linux": path.join(process.resourcesPath, "server", "kopia"),
- }[osShortName]
+ return "KOPIA"
}
export function selectByOS(x) {
return x[osShortName]

View file

@ -0,0 +1,94 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
electron,
copyDesktopItems,
makeDesktopItem,
nix-update-script,
makeWrapper,
kopia,
}:
let
version = "0.19.0";
src = fetchFromGitHub {
owner = "kopia";
repo = "kopia";
tag = "v${version}";
hash = "sha256-PfxMs9MwoI+4z8vZ1sVlIEal3TOmA06997jWwShNfrE=";
};
in
buildNpmPackage {
pname = "kopia-ui";
inherit version src;
sourceRoot = "${src.name}/app";
npmDepsHash = "sha256-3K5dwAQeAo98rz2gxGw3k/D+VkDJNe5pmAyEo4boetU=";
makeCacheWritable = true;
nativeBuildInputs = [
copyDesktopItems
makeWrapper
];
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
};
patches = [ ./fix-paths.patch ];
postPatch = ''
substituteInPlace public/utils.js --replace-fail KOPIA ${lib.getExe kopia}
'';
buildPhase = ''
runHook preBuild
cp -r ${electron.dist} electron-dist
chmod -R u+w ..
npm exec electron-builder -- \
--dir \
-c.electronDist=electron-dist \
-c.electronVersion=${electron.version} \
-c.extraMetadata.version=v${version}
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/kopia
cp -r ../dist/kopia-ui/*-unpacked/{locales,resources{,.pak}} $out/share/kopia
install -Dm644 $src/icons/kopia.svg $out/share/icons/hicolor/scalable/apps/kopia.svg
makeWrapper ${lib.getExe electron} $out/bin/kopia-ui \
--prefix PATH : ${lib.makeBinPath [ kopia ]} \
--add-flags $out/share/kopia/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--inherit-argv0
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "kopia-ui";
type = "Application";
desktopName = "KopiaUI";
comment = "Fast and secure open source backup.";
icon = "kopia-ui";
exec = "kopia-ui";
categories = [ "Utility" ];
})
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication";
mainProgram = "kopia-ui";
homepage = "https://kopia.io";
downloadPage = "https://github.com/kopia/kopia";
changelog = "https://github.com/kopia/kopia/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ blenderfreaky ];
platforms = lib.platforms.linux;
};
}

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "last"; pname = "last";
version = "1615"; version = "1638";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "mcfrith"; owner = "mcfrith";
repo = "last"; repo = "last";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-1opYdV4nszLSuHNCo0HuURuPYby8oVGXwQvDd68mDOM="; hash = "sha256-lOdXlAoLSrUb32GohfQGvmtwQsKDFGH4ImYMi8EZqU0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -42,14 +42,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files. # as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "limine"; pname = "limine";
version = "9.2.1"; version = "9.2.2";
# We don't use the Git source but the release tarball, as the source has a # We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources. # `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome. # Packaging that in Nix is very cumbersome.
src = fetchurl { src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-yHr8FMOKlWlSkkmkGADC6R4PHO7tHk38gwrJS/nPvvs="; hash = "sha256-uD3s117/uhAeRCex78gXSM9zIByFvjbjeVygkPXwgIM=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -7,7 +7,7 @@
pkg-config, pkg-config,
libpng, libpng,
libjpeg, libjpeg,
pcre, pcre2,
SDL2_image, SDL2_image,
glew, glew,
libGLU, libGLU,
@ -20,11 +20,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "logstalgia"; pname = "logstalgia";
version = "1.1.2"; version = "1.1.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; hash = "sha256-wEnv9AXpJANSIu2ya8xse18AoIkmq9t7Rn4kSSQnkKk=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
libpng libpng
libjpeg libjpeg
libX11 libX11
pcre pcre2
SDL2_image SDL2_image
libGLU libGLU
libGL libGL
@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
freetype freetype
]; ];
configureFlags = [
"--with-boost-system=boost_system"
"--with-boost-filesystem=boost_filesystem"
];
meta = with lib; { meta = with lib; {
homepage = "https://logstalgia.io/"; homepage = "https://logstalgia.io/";
description = "Website traffic visualization tool"; description = "Website traffic visualization tool";

View file

@ -24,13 +24,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "louvre"; pname = "louvre";
version = "2.16.0-1"; version = "2.16.2-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CuarzoSoftware"; owner = "CuarzoSoftware";
repo = "Louvre"; repo = "Louvre";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-zw/n/Q1wwTiwhk6Q3xrMl2pEFBAk/BqSa/p0LTDbGBA="; hash = "sha256-E6g9BqP8KniCBfYC1xOMqLA5RiAacsslgWAkvTop3CA=";
}; };
sourceRoot = "${finalAttrs.src.name}/src"; sourceRoot = "${finalAttrs.src.name}/src";

View file

@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mago"; pname = "mago";
version = "0.22.1"; version = "0.22.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "carthage-software"; owner = "carthage-software";
repo = "mago"; repo = "mago";
tag = version; tag = version;
hash = "sha256-Zc6DTqIVU4shmZ9csg4nzwjn7ut/D6FrBXATQqwHI8o="; hash = "sha256-78lnNbUKjQYS2BSRGiGmFfnu85Mz+xAwaDG5pVCBqkQ=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-wppfZNsAFzXMJzcIOHL8Lj2FCgPp/i/TZcHP4VYsGCk="; cargoHash = "sha256-lwL+5HuT6xiiittGlRDaFWfS9qum4xHginHT/TUMcco=";
env = { env = {
# Get openssl-sys to use pkg-config # Get openssl-sys to use pkg-config

View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "micronaut"; pname = "micronaut";
version = "4.7.6"; version = "4.8.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
sha256 = "sha256-PGdxwq20nSc7TPBlfo6HWxx6DmbZ1OFyeh4cZvsQ3Hg="; sha256 = "sha256-BV3O+HwZc8Bin3G+DoV/nxmroCxSinvuy+bW11TrTrY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -34,7 +34,17 @@ stdenv.mkDerivation rec {
mono mono
unzip unzip
]; ];
sourceRoot = ".";
# zip has no outer directory, so make one and unpack there
unpackPhase = ''
runHook preUnpack
mkdir -p source
cd source
unzip -q $src
runHook postUnpack
'';
AOT_FILES = [ AOT_FILES = [
"MissionPlanner.exe" "MissionPlanner.exe"

View file

@ -6,10 +6,10 @@
let let
pname = "mobilecoin-wallet"; pname = "mobilecoin-wallet";
version = "1.9.1"; version = "1.9.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage";
hash = "sha256-UCBQRcGFHMQlLGvChrrMmM0MYv7AZtlkngFK4ptIPU0="; hash = "sha256-JfG+eHsPFXZKi9Vjbw7CPvhmeMvfPWSDS65Ey4Lb8iQ=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

View file

@ -4,6 +4,7 @@
lib, lib,
buildGoModule, buildGoModule,
installShellFiles, installShellFiles,
nix-update-script,
}: }:
buildGoModule rec { buildGoModule rec {
@ -30,6 +31,8 @@ buildGoModule rec {
--zsh <($out/bin/mongocli completion zsh) --zsh <($out/bin/mongocli completion zsh)
''; '';
passthru.updateScript = nix-update-script { };
meta = { meta = {
description = "MongoDB CLI enable you to manage your MongoDB via ops manager and cloud manager"; description = "MongoDB CLI enable you to manage your MongoDB via ops manager and cloud manager";
homepage = "https://github.com/mongodb/mongodb-cli"; homepage = "https://github.com/mongodb/mongodb-cli";

View file

@ -1,7 +1,6 @@
{ {
fetchFromGitHub, fetchFromGitHub,
fetchYarnDeps, fetchYarnDeps,
fetchpatch,
lib, lib,
mqttx-cli, mqttx-cli,
nodejs, nodejs,
@ -13,25 +12,15 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mqttx-cli"; pname = "mqttx-cli";
version = "1.11.0"; version = "1.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emqx"; owner = "emqx";
repo = "MQTTX"; repo = "MQTTX";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-IPIiSav6MPJmzetBgVw9fLGPjJ+JKS3oWMEfCJmEY84="; hash = "sha256-kxK/c1tOwK9hCxX19um0z1MWBZQOwADYEh4xEqJNgWI=";
}; };
patches = [
# moves @faker-js/faker from devDependencies to dependencies
# because the final package depends on it
# https://github.com/emqx/MQTTX/pull/1801
(fetchpatch {
url = "https://github.com/emqx/MQTTX/commit/3d89c3a08477e9e2b5d83f2a222ceaa8c08e50ce.patch";
hash = "sha256-Rd6YpGHsvAYD7/XCJq6dgvGeKfOiLh7IUQFr/AQz0mY=";
})
];
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/cli/yarn.lock"; yarnLock = "${finalAttrs.src}/cli/yarn.lock";
hash = "sha256-vwPwSE6adxM1gkdsJBq3LH2eXze9yXADvnM90LsKjjo="; hash = "sha256-vwPwSE6adxM1gkdsJBq3LH2eXze9yXADvnM90LsKjjo=";

View file

@ -25,15 +25,15 @@
writeScript, writeScript,
}: }:
let let
id = "232635194"; id = "243289393";
in in
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "multiviewer-for-f1"; pname = "multiviewer-for-f1";
version = "1.38.1"; version = "1.43.2";
src = fetchurl { src = fetchurl {
url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
sha256 = "sha256-3UgpjQdZYr48MPoqgHci6Yvo+jxK7oa3THl/JuL8tRo="; sha256 = "sha256-wdA5f/80GkKP6LrrP2E6M9GY5bl6rg7Spz7NWB7cQjg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -42,6 +42,10 @@ let
pythonPath = python.pkgs.makePythonPath providerDependencies; pythonPath = python.pkgs.makePythonPath providerDependencies;
in in
assert
(lib.elem "airplay" providers)
-> throw "music-assistant: airplay support is missing libraop, a library we will not package because it depends on OpenSSL 1.1.";
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "music-assistant"; pname = "music-assistant";
version = "2.5.0"; version = "2.5.0";
@ -154,6 +158,11 @@ python.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "music_assistant" ]; pythonImportsCheck = [ "music_assistant" ];
postFixup = ''
# binary native code, segfaults when autopatchelf'd, requires openssl 1.1 to build
rm $out/${python3.sitePackages}/music_assistant/providers/airplay/bin/cliraop-*
'';
passthru = { passthru = {
inherit inherit
python python

View file

@ -31,11 +31,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nano"; pname = "nano";
version = "8.3"; version = "8.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
hash = "sha256-VRtxey4o9+kPdJMjaGobW7vYTPoTkGBNhUo8o3ePER4="; hash = "sha256-WtKSIrvVViTYfqZ3kosxBqdDEU1sb5tB82yXviqOYo0=";
}; };
nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;

View file

@ -10,13 +10,13 @@
buildNimPackage ( buildNimPackage (
finalAttrs: prevAttrs: { finalAttrs: prevAttrs: {
pname = "nitter"; pname = "nitter";
version = "0-unstable-2025-02-25"; version = "0-unstable-2025-04-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zedeus"; owner = "zedeus";
repo = "nitter"; repo = "nitter";
rev = "41fa47bfbf3917e9b3ac4f7b49c89a75a7a2bd44"; rev = "83b0f8b55ae7bfb8a19a0bf14de52f30d06b8db6";
hash = "sha256-cmYlmzCJl1405TuYExGw3AOmjdY0r7ObmmLCAom+Fyw="; hash = "sha256-2QIcAhzYrIo1q80959980H+hzLYtPHAOy0+CItDZ1d4=";
}; };
lockFile = ./lock.json; lockFile = ./lock.json;

View file

@ -81,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
{ {
stable = localRepoCheck nixVersions.stable; stable = localRepoCheck nixVersions.stable;
latest = localRepoCheck nixVersions.latest; latest = localRepoCheck nixVersions.latest;
git = localRepoCheck nixVersions.git;
nix_2_24 = localRepoCheck nixVersions.nix_2_24; nix_2_24 = localRepoCheck nixVersions.nix_2_24;
}; };

View file

@ -14,25 +14,27 @@
openssl, openssl,
readline, readline,
runtimeShell, runtimeShell,
versionCheckHook,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "nmh"; pname = "nmh";
version = "1.7.1"; version = "1.8";
src = fetchFromSavannah { src = fetchFromSavannah {
repo = "nmh"; repo = "nmh";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-sBftXl4hWs4bKw5weHkif1KIJBpheU/RCePx0WXuv9o="; hash = "sha256-ShAdinvBA7guVBhjqTelBRiUzyo5KqHcawlQS9kXtqs=";
}; };
patches = [ ./reproducible-build-date.patch ];
postPatch = '' postPatch = ''
substituteInPlace config/config.c --replace /bin/cat ${coreutils}/bin/cat
substituteInPlace \ substituteInPlace \
sbr/arglist.c \ sbr/arglist.c \
uip/mhbuildsbr.c \ uip/mhbuildsbr.c \
uip/whatnowsbr.c \ uip/whatnowsbr.c \
uip/slocal.c \ uip/slocal.c \
--replace '"/bin/sh"' '"${runtimeShell}"' --replace-fail '"/bin/sh"' '"${runtimeShell}"'
# the "cleanup" pseudo-test makes diagnosing test failures a pain # the "cleanup" pseudo-test makes diagnosing test failures a pain
ln -s -f ${stdenv}/bin/true test/cleanup ln -s -f ${stdenv}/bin/true test/cleanup
''; '';
@ -57,6 +59,13 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true; doCheck = true;
enableParallelBuilding = true; enableParallelBuilding = true;
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/install-mh";
versionCheckProgramArg = "-version";
meta = { meta = {
description = "New MH Mail Handling System"; description = "New MH Mail Handling System";
homepage = "https://nmh.nongnu.org/"; homepage = "https://nmh.nongnu.org/";

View file

@ -0,0 +1,15 @@
Index: config/version.sh
===================================================================
--- a/config/version.sh
+++ b/config/version.sh
@@ -11,9 +11,9 @@
git=" `git -C $srcdir describe --long --dirty`"
else
git=
fi
-date="`TZ=GMT0 date +'%Y-%m-%d %T'` +0000"
+date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
cat <<E
char *version_str = "nmh-$version$git built $date on $host";
char *version_num = "nmh-$version";

View file

@ -33,18 +33,18 @@
}: }:
let let
openrct2-version = "0.4.20"; openrct2-version = "0.4.21";
# Those versions MUST match the pinned versions within the CMakeLists.txt # Those versions MUST match the pinned versions within the CMakeLists.txt
# file. The REPLAYS repository from the CMakeLists.txt is not necessary. # file. The REPLAYS repository from the CMakeLists.txt is not necessary.
objects-version = "1.5.1"; objects-version = "1.6.1";
openmsx-version = "1.6"; openmsx-version = "1.6";
opensfx-version = "1.0.5"; opensfx-version = "1.0.5";
title-sequences-version = "0.4.14"; title-sequences-version = "0.4.14";
objects = fetchurl { objects = fetchurl {
url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip"; url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip";
hash = "sha256-xrgAy817G5xwfzZX+8Xy2508/Zwq32aKzMndus14Qd8="; hash = "sha256-aCkYZjDlLDMrakhH67k2xUmlIvytr49eXkV5xMkaRFA=";
}; };
openmsx = fetchurl { openmsx = fetchurl {
url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmsx-version}/openmusic.zip"; url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmsx-version}/openmusic.zip";
@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "OpenRCT2"; repo = "OpenRCT2";
rev = "v${openrct2-version}"; rev = "v${openrct2-version}";
hash = "sha256-G/uD3t8m7C74pjSA6dbz4gzu9CwEpmyFwtYpoFIiRjM="; hash = "sha256-exG6pXqok/mrDSCtqIs6VS2WwCr6XlP1gHJA1FgPOiM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -22,17 +22,18 @@ let
in in
stdenv.mkDerivation (final: { stdenv.mkDerivation (final: {
pname = "openterface-qt"; pname = "openterface-qt";
version = "0.2.0"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TechxArtisanStudio"; owner = "TechxArtisanStudio";
repo = "Openterface_QT"; repo = "Openterface_QT";
rev = "v${final.version}"; rev = "${final.version}";
hash = "sha256-2Z4sMoNfbGuZKyS4YVrId8AIKr5XhNBNcdYfywc2MXM="; hash = "sha256-HSUKewI6VPEAVkp/O2vnzXR9Eicecutntsd/WvuHU8w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
copyDesktopItems copyDesktopItems
qt6.wrapQtAppsHook qt6.wrapQtAppsHook
qt6.qmake qt6.qmake
qt6.qttools
]; ];
buildInputs = [ buildInputs = [
libusb1 libusb1
@ -41,6 +42,9 @@ stdenv.mkDerivation (final: {
qt6.qtserialport qt6.qtserialport
qt6.qtsvg qt6.qtsvg
]; ];
preBuild = ''
lrelease openterfaceQT.pro
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin

View file

@ -8,18 +8,24 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "pc"; pname = "pc";
version = "0.4"; version = "0.6";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~ft"; owner = "~ft";
repo = "pc"; repo = "pc";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-fzEDI20o5ROY9n/QRzCW66iCKYaBbI++Taur6EoA0wA="; hash = "sha256-hmFzFaBMb/hqKqc+2hYda1+iowWhs/pC+6LPPhhqzJo=";
}; };
nativeBuildInputs = [ byacc ]; nativeBuildInputs = [ byacc ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.hostPlatform.isDarwin [
"-Wno-error=implicit-function-declaration"
]
);
strictDeps = true; strictDeps = true;
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -65,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
libe57format libe57format
]; ];
strictDeps = true;
cmakeFlags = [ cmakeFlags = [
"-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}" "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}"
"-DBUILD_PLUGIN_HDF=ON" "-DBUILD_PLUGIN_HDF=ON"
@ -112,6 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
"pdal_app_plugin_test" "pdal_app_plugin_test"
]; ];
nativeCheckInputs = [
gdal # gdalinfo
];
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
# tests are flaky and they seem to fail less often when they don't run in # tests are flaky and they seem to fail less often when they don't run in
@ -120,6 +126,10 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck runHook postCheck
''; '';
postInstall = ''
patchShebangs --update --build $out/bin/pdal-config
'';
passthru.tests = { passthru.tests = {
version = testers.testVersion { version = testers.testVersion {
package = finalAttrs.finalPackage; package = finalAttrs.finalPackage;

View file

@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pixi-pack"; pname = "pixi-pack";
version = "0.3.3"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Quantco"; owner = "Quantco";
repo = "pixi-pack"; repo = "pixi-pack";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-Yf0ewDGDYpdl/tk4qvhKTbFmnGceqTJFv0bExL7N9AE="; hash = "sha256-th7hlxjnar9VoWINpxblzUGbxxz8hPKmLERd1y+mHKY=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-W8C3d+2KYgPwb5zyC59cdUC79W9Ho4gX4McKm/xtWjU="; cargoHash = "sha256-AEqhJWztOI4byViex4d0m85wBlGGYMykPNjgUfPAt6Q=";
buildInputs = [ openssl ]; buildInputs = [ openssl ];

View file

@ -11,16 +11,16 @@
buildGoModule rec { buildGoModule rec {
pname = "powerpipe"; pname = "powerpipe";
version = "1.2.2"; version = "1.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "turbot"; owner = "turbot";
repo = "powerpipe"; repo = "powerpipe";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-kOC2eS13OzyKGgaQj7BtLxzzjGqncTEFB7HaHPuedUE="; hash = "sha256-nYlhB6EeT98FF/FuYsJXgGfe7+naKwhTmOPy1lX90XQ=";
}; };
vendorHash = "sha256-fSMIsMefRWTX02/S9wCxbqQXN76qYQibU1Xq012HiXs="; vendorHash = "sha256-5+IapEYAL4p5jhGhqNw00s42e3dE0cXRDVawq8Fqb08=";
proxyVendor = true; proxyVendor = true;
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -6,16 +6,16 @@
}: }:
php.buildComposerProject2 (finalAttrs: { php.buildComposerProject2 (finalAttrs: {
pname = "pretty-php"; pname = "pretty-php";
version = "0.4.92"; version = "0.4.93";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lkrms"; owner = "lkrms";
repo = "pretty-php"; repo = "pretty-php";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-rKL6ViBEJf+GGxWood0DXVF8U7wuz22Z26SEdgDAJww="; hash = "sha256-5gFTL4hcnEMKrffMpLRfneq5zeMHH50fjpvZcnefJZ8=";
}; };
vendorHash = "sha256-V1oqMnDJgWujQXJJqyc2cvEvBbFv+KdXjXfb+sxs8/8="; vendorHash = "sha256-cp6WPlEc3WCW19UqLgrqMv8zE9UrCiTuN+WqTpAsuWE=";
passthru = { passthru = {
tests.version = testers.testVersion { tests.version = testers.testVersion {

View file

@ -2,25 +2,31 @@
beamPackages, beamPackages,
fetchFromGitHub, fetchFromGitHub,
lib, lib,
nix-update-script,
}: }:
beamPackages.mixRelease rec { let
inherit (beamPackages) mixRelease fetchMixDeps erlang;
in
mixRelease rec {
pname = "protoc-gen-elixir"; pname = "protoc-gen-elixir";
version = "0.13.0"; version = "0.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elixir-protobuf"; owner = "elixir-protobuf";
repo = "protobuf"; repo = "protobuf";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-TnuIlXYr36hx1sVktPHj4J4cJLCFK5F1xaX0V9/+ICQ="; hash = "sha256-SbwjOFTyN3euMNXkuIP49zNqoXmD8611IXgqPwqfuFU=";
}; };
mixFodDeps = beamPackages.fetchMixDeps { mixFodDeps = fetchMixDeps {
inherit version src; inherit version src;
pname = "protoc-gen-elixir-deps"; pname = "protoc-gen-elixir-deps";
hash = "sha256-lFfAfKAM4O+yIBXgdCA+EPe1XAOaTIjTfpOFjITpvQ4="; hash = "sha256-T1uL3xXXmCkobJJhS3p6xMrJUyiim3AMwaG87/Ix7A8=";
}; };
buildInputs = [ erlang ];
postBuild = '' postBuild = ''
mix do escript.build mix do escript.build
''; '';
@ -34,6 +40,8 @@ beamPackages.mixRelease rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = nix-update-script { };
meta = { meta = {
description = "A protoc plugin to generate Elixir code"; description = "A protoc plugin to generate Elixir code";
mainProgram = "protoc-gen-elixir"; mainProgram = "protoc-gen-elixir";

View file

@ -19,13 +19,13 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "readest"; pname = "readest";
version = "0.9.29"; version = "0.9.30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "readest"; owner = "readest";
repo = "readest"; repo = "readest";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-2L5Wyl3xWjiJCjwUq9mcKe/hnDeHjNnhHgFPISNqfk0="; hash = "sha256-Kratl77JJzrwzc3hi+BCjT/E2qmmbeJeXxiGH0AcM9I=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -38,14 +38,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
hash = "sha256-VcPxhCpDrKaqKtGMsvPwXwniPy0rbJ/i03gbZ3i87aE="; hash = "sha256-6JFBw/jktEQBXum7Cb4TrntbrnVQM36jE6sby2bmIlw=";
}; };
pnpmRoot = "../.."; pnpmRoot = "../..";
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-bRIZcR8UNE78k5cbOt6GQM+PlFVHR2qV7eB82Y+abZw="; cargoHash = "sha256-2XYfcYjrg7RUXuI0B4i9DVNr0i0bYNYHj1peAi77QaE=";
cargoRoot = "../.."; cargoRoot = "../..";

View file

@ -0,0 +1,12 @@
diff --git a/fang.c b/fang.c
index cda61bf..52f9659 100755
--- a/fang.c
+++ b/fang.c
@@ -45,6 +45,7 @@
#include <sys/socket.h>
#include <asm/types.h>
#include <netinet/in.h>
+#include <pthread.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>

View file

@ -6,7 +6,7 @@
bluez, bluez,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "redfang"; pname = "redfang";
version = "2.5"; version = "2.5";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "kalilinux"; group = "kalilinux";
owner = "packages"; owner = "packages";
repo = "redfang"; repo = "redfang";
rev = "upstream/${version}"; rev = "upstream/${finalAttrs.version}";
hash = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE="; hash = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE=";
}; };
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
url = "https://gitlab.com/kalilinux/packages/redfang/-/merge_requests/1.diff"; url = "https://gitlab.com/kalilinux/packages/redfang/-/merge_requests/1.diff";
sha256 = "sha256-oxIrUAucxsBL4+u9zNNe2XXoAd088AEAHcRB/AN7B1M="; sha256 = "sha256-oxIrUAucxsBL4+u9zNNe2XXoAd088AEAHcRB/AN7B1M=";
}) })
# error: implicit declaration of function 'pthread_create' []
./include-pthread.patch
]; ];
installFlags = [ "DESTDIR=$(out)" ]; installFlags = [ "DESTDIR=$(out)" ];
@ -32,11 +34,11 @@ stdenv.mkDerivation rec {
buildInputs = [ bluez ]; buildInputs = [ bluez ];
meta = with lib; { meta = {
description = "Small proof-of-concept application to find non discoverable bluetooth devices"; description = "Small proof-of-concept application to find non discoverable bluetooth devices";
homepage = "https://gitlab.com/kalilinux/packages/redfang"; homepage = "https://gitlab.com/kalilinux/packages/redfang";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
maintainers = with maintainers; [ moni ]; maintainers = with lib.maintainers; [ moni ];
mainProgram = "fang"; mainProgram = "fang";
}; };
} })

View file

@ -1,49 +1,55 @@
{ {
lib, lib,
nodejs,
buildNpmPackage, buildNpmPackage,
fetchFromGitHub, fetchFromGitHub,
makeWrapper,
redocly, redocly,
testers, testers,
}: }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "redocly"; pname = "redocly";
version = "1.29.0"; version = "1.34.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Redocly"; owner = "Redocly";
repo = "redocly-cli"; repo = "redocly-cli";
rev = "@redocly/cli@${version}"; rev = "@redocly/cli@${version}";
hash = "sha256-Oa4R4R7Obg26DKWZkccqjIcrD35pBw1AYIPe2/KN8f4="; hash = "sha256-1iyE0LYbVEleCdSw6fWvIHqCkWMEZrjK6tum+qytcCY=";
}; };
npmDepsHash = "sha256-V0NklVsPRqRJ479nIMWqs/sXciXOm6LAlIh3YcPPDEc="; npmDepsHash = "sha256-TIsVjdohsmvAAn9xQeeD5pu4CjXtYlD7bmKeDp113Lc=";
npmBuildScript = "prepare"; npmBuildScript = "prepare";
nativeBuildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
npm --prefix packages/cli run copy-assets npm --prefix packages/cli run copy-assets
''; '';
postInstall = '' postInstall = ''
rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core} rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core,respect-core}
cp -R packages/cli $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli cp -R packages/cli $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli
cp -R packages/core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/openapi-core cp -R packages/core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/openapi-core
cp -R packages/respect-core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/respect-core
mkdir $out/bin # Create a wrapper script to force the correct command name (Nodejs uses argv[1] for command name)
makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \ mkdir -p $out/bin
$out/bin/redocly \ cat <<EOF > $out/bin/redocly
--set-default REDOCLY_TELEMETRY off \ #!${lib.getBin nodejs}/bin/node
--set-default REDOCLY_SUPPRESS_UPDATE_NOTICE true // Override argv[1] to show "redocly" instead of "cli.js"
process.argv[1] = 'redocly';
// Set environment variables directly
process.env.REDOCLY_TELEMETRY = process.env.REDOCLY_TELEMETRY || "off";
process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE = process.env.REDOCLY_SUPPRESS_UPDATE_NOTICE || "true";
require('$out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js');
EOF
chmod +x $out/bin/redocly
''; '';
passthru = { passthru = {
tests.version = testers.testVersion { tests.version = testers.testVersion { package = redocly; };
package = redocly;
};
}; };
meta = { meta = {

View file

@ -23,6 +23,7 @@ let
libadwaita' = libadwaita.overrideAttrs (oldAttrs: { libadwaita' = libadwaita.overrideAttrs (oldAttrs: {
version = "1.6.2-unstable-2025-01-02"; version = "1.6.2-unstable-2025-01-02";
src = oldAttrs.src.override { src = oldAttrs.src.override {
tag = null;
rev = "f5f0e7ce69405846a8f8bdad11cef2e2a7e99010"; rev = "f5f0e7ce69405846a8f8bdad11cef2e2a7e99010";
hash = "sha256-n5RbGHtt2g627T/Tg8m3PjYIl9wfYTIcrplq1pdKAXk="; hash = "sha256-n5RbGHtt2g627T/Tg8m3PjYIl9wfYTIcrplq1pdKAXk=";
}; };

View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "reindeer"; pname = "reindeer";
version = "2025.03.24.00"; version = "2025.03.31.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookincubator"; owner = "facebookincubator";
repo = "reindeer"; repo = "reindeer";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-Rv6EtrsDISR/lHo0Fimh2cNToSxUE5bxVdURmjs8/g4="; hash = "sha256-ocnd/4bIZwrGik2r8HSeyPfLQycmJJrKikgLIZhsb6A=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-mzYpqI+PT5083exelS+kyGLZ+M8bTiTSxAoTwqV2ubc="; cargoHash = "sha256-DguWlibOB8z0Blj5ZVFycyJrxJHK3uUROt8hGxacxOY=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -8,16 +8,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "repomix"; pname = "repomix";
version = "0.3.0"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yamadashy"; owner = "yamadashy";
repo = "repomix"; repo = "repomix";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-a0FZaATQ4U9KtRY1m/Bi/1P9hDoNbcracZagm9EMSew="; hash = "sha256-vK+Fn9gmPUTWkUHmNAX9OAoGxhG4tiVwqK6P+f8hcJQ=";
}; };
npmDepsHash = "sha256-BD0JBwZ3FSMpJRRTKQinPuaSBjX/RrkwXUqDr1wXEhk="; npmDepsHash = "sha256-ihC4SCl0J5trz84ixUq12BjGtPMsfv5Ngs+QzkbjJbQ=";
nativeInstallCheckInputs = [ versionCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true; doInstallCheck = true;

View file

@ -22,19 +22,18 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "resources"; pname = "resources";
version = "1.7.1"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nokyan"; owner = "nokyan";
repo = "resources"; repo = "resources";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA="; hash = "sha256-z4ZVj/nS4n3oqENSK87YJ8sQRnqK7c4tWzKHUD0Qw2s=";
}; };
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src; inherit (finalAttrs) pname version src;
name = "resources-${finalAttrs.version}"; hash = "sha256-jHdEiK3nu9mN2A6biHq9Iu4bSniD74hGnKFBTt5xVDM=";
hash = "sha256-zqCqbQAUAIhjntX4gcV1aoJwjozZFlF7Sr49w7uIgaI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rkdeveloptool"; pname = "rkdeveloptool";
version = "unstable-2021-04-08"; version = "unstable-2025-03-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rockchip-linux"; owner = "rockchip-linux";
repo = "rkdeveloptool"; repo = "rkdeveloptool";
rev = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a"; rev = "304f073752fd25c854e1bcf05d8e7f925b1f4e14";
sha256 = "eIFzyoY6l3pdfCN0uS16hbVp0qzdG3MtcS1jnDX1Yk0="; sha256 = "sha256-GcSxkraJrDCz5ADO0XJk4xRrYTk0V5dAAim+D7ZiMJQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rpm-sequoia"; pname = "rpm-sequoia";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rpm-software-management"; owner = "rpm-software-management";
repo = "rpm-sequoia"; repo = "rpm-sequoia";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k="; hash = "sha256-Z2falZxewgMrrAyh8sDlIr9NfCzNs8GA+RHmfNYfzio=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-X+5Ww+cnt08mleA6FzxVGprjIEQVInQPSvTWGjXuGI8="; cargoHash = "sha256-LJyq2gWP/I6+4lArhsWmcAHlub0Ww76jkq2gagP86ao=";
patches = [ patches = [
./objdump.patch ./objdump.patch

View file

@ -1,23 +1,29 @@
{ {
lib, lib,
fetchFromGitHub, fetchFromGitHub,
flutter327, flutter329,
gst_all_1, gst_all_1,
libunwind, libunwind,
orc, orc,
webkitgtk_4_1, webkitgtk_4_1,
autoPatchelfHook, autoPatchelfHook,
xorg, xorg,
runCommand,
yq,
saber,
_experimental-update-script-combinators,
gitUpdater,
}: }:
flutter327.buildFlutterApplication rec {
flutter329.buildFlutterApplication rec {
pname = "saber"; pname = "saber";
version = "0.25.3"; version = "0.25.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "saber-notes"; owner = "saber-notes";
repo = "saber"; repo = "saber";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-plBcZo67/x8KcND28jqfrwbvI9IZz8ptLZoGl2y2vW4="; hash = "sha256-3ZTvGF5Ip6VTmyeuuZoJaGO1dDOee5GuRp6/YxSz27c=";
}; };
gitHashes = { gitHashes = {
@ -27,9 +33,7 @@ flutter327.buildFlutterApplication rec {
pubspecLock = lib.importJSON ./pubspec.lock.json; pubspecLock = lib.importJSON ./pubspec.lock.json;
nativeBuildInputs = [ nativeBuildInputs = [ autoPatchelfHook ];
autoPatchelfHook
];
buildInputs = [ buildInputs = [
gst_all_1.gstreamer gst_all_1.gstreamer
@ -41,8 +45,8 @@ flutter327.buildFlutterApplication rec {
]; ];
postInstall = '' postInstall = ''
install -Dm0644 ./flatpak/com.adilhanney.saber.desktop $out/share/applications/com.adilhanney.saber.desktop install -Dm0644 flatpak/com.adilhanney.saber.desktop $out/share/applications/saber.desktop
install -Dm0644 ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg install -Dm0644 assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg
''; '';
preFixup = '' preFixup = ''
@ -50,6 +54,22 @@ flutter327.buildFlutterApplication rec {
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/saber/lib/lib*.so patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/saber/lib/lib*.so
''; '';
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
nativeBuildInputs = [ yq ];
inherit (saber) src;
}
''
cat $src/pubspec.lock | yq > $out
'';
updateScript = _experimental-update-script-combinators.sequence [
(gitUpdater { rev-prefix = "v"; })
(_experimental-update-script-combinators.copyAttrOutputToFile "saber.pubspecSource" ./pubspec.lock.json)
];
};
meta = { meta = {
description = "Cross-platform open-source app built for handwriting"; description = "Cross-platform open-source app built for handwriting";
homepage = "https://github.com/saber-notes/saber"; homepage = "https://github.com/saber-notes/saber";

File diff suppressed because it is too large Load diff

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sentry-native"; pname = "sentry-native";
version = "0.8.2"; version = "0.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "getsentry"; owner = "getsentry";
repo = "sentry-native"; repo = "sentry-native";
tag = version; tag = version;
hash = "sha256-X5QA27y/7bJoGC1qDNhvbh5Cqm4StiZ9jkdsed+oVL4="; hash = "sha256-9jsn7oydaOYOAq6XYYlPjzzy6LSiKOpRtp+PxMlzwz0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -4,7 +4,7 @@
installShellFiles, installShellFiles,
fetchFromGitHub, fetchFromGitHub,
freetype, freetype,
nix-update-script, unstableGitUpdater,
gumbo, gumbo,
harfbuzz, harfbuzz,
jbig2dec, jbig2dec,
@ -15,13 +15,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "sioyek"; pname = "sioyek";
version = "2.0.0-unstable-2025-02-20"; version = "2.0.0-unstable-2025-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ahrm"; owner = "ahrm";
repo = "sioyek"; repo = "sioyek";
rev = "a64ad82b2c14e1ef821c13ddf1291ebb6aaafca6"; rev = "b3575d9634d6c305cdf555a383e019a1e9013f2a";
hash = "sha256-aI8GqXAgyh5VkayEQbaXOK+JQKzqVqQs8RO3CdOsgX8="; hash = "sha256-a6zIgFe8bHrqXAtCC4/LC5jl3hy2Cs1xZBI91sKQgqw=";
}; };
buildInputs = buildInputs =
@ -74,11 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
installManPage resources/sioyek.1 installManPage resources/sioyek.1
''; '';
passthru.updateScript = nix-update-script { passthru.updateScript = unstableGitUpdater {
extraArgs = [ branch = "development";
"--version" tagPrefix = "v";
"branch=development"
];
}; };
meta = with lib; { meta = with lib; {

View file

@ -4,7 +4,7 @@
fetchurl, fetchurl,
undmg, undmg,
appimageTools, appimageTools,
makeWrapper,
}: }:
let let
@ -66,8 +66,10 @@ else
src src
meta meta
; ;
nativeBuildInputs = [ makeWrapper ];
extraInstallCommands = '' extraInstallCommands = ''
wrapProgram $out/bin/sleek-todo \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
mkdir -p $out/share/{applications,sleek} mkdir -p $out/share/{applications,sleek}
cp -a ${appimageContents}/{locales,resources} $out/share/sleek cp -a ${appimageContents}/{locales,resources} $out/share/sleek
cp -a ${appimageContents}/usr/share/icons $out/share cp -a ${appimageContents}/usr/share/icons $out/share

View file

@ -16,13 +16,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "smartgit"; pname = "smartgit";
version = "24.1.2"; version = "24.1.3";
src = fetchurl { src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${ url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
}.tar.gz"; }.tar.gz";
hash = "sha256-bPiPb/k5f9dRpwm4Wj+c2mhFhH9WOz2hzKeDfQLRLHQ="; hash = "sha256-YhgE1Y0L8lzefJnvswKwIFnx6XIo40DszAr/cxOoOds=";
}; };
nativeBuildInputs = [ wrapGAppsHook3 ]; nativeBuildInputs = [ wrapGAppsHook3 ];

View file

@ -16,13 +16,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "webadmin"; pname = "webadmin";
version = "0.1.24"; version = "0.1.25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stalwartlabs"; owner = "stalwartlabs";
repo = "webadmin"; repo = "webadmin";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-KtCSP7PP1LBTcP1LFdEmom/4G8or87oA6ml6MXOhATk="; hash = "sha256-Hv7FojY/SZgbzS8XGVj0uRfynZCZPEbPiSHRuBtt/Jc=";
}; };
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-VXbFQLMtqypQlisirKhlfu9PYgmEryJx85GRqlRslNY="; cargoHash = "sha256-/BoGeAF4GbM8ddWCnxAueJQYgQZvAL0pQ0pDUW0mXI0=";
postPatch = '' postPatch = ''
# Using local tailwindcss for compilation # Using local tailwindcss for compilation

View file

@ -10,15 +10,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "star-history"; pname = "star-history";
version = "1.0.29"; version = "1.0.30";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-RpGR4DlAvSuaecHPiD367rRR7H5zQs0JOgtvh/PXgpM="; hash = "sha256-QTTBWuRXjx7UEMjnrIb4KQW+rtyKy4Q0Hu7OLt1Dph0=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-lVwH8NnmBl3ZakVbFYslvH39mjAOhmPRmXdshbwkx1Y="; cargoHash = "sha256-2GwZtNbUbdzxK31Gh4U2LsFkzV1ylXkZnP5r5FQ/hvU=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

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