Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -1,8 +1,9 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.hardware.uinput;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.hardware.uinput = {
|
||||
enable = lib.mkEnableOption "uinput support";
|
||||
};
|
||||
@@ -10,7 +11,7 @@ in {
|
||||
config = lib.mkIf cfg.enable {
|
||||
boot.kernelModules = [ "uinput" ];
|
||||
|
||||
users.groups.uinput = {};
|
||||
users.groups.uinput.gid = config.ids.gids.uinput;
|
||||
|
||||
services.udev.extraRules = ''
|
||||
SUBSYSTEM=="misc", KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
|
||||
|
||||
@@ -35,7 +35,6 @@ in
|
||||
|
||||
};
|
||||
|
||||
|
||||
config = {
|
||||
|
||||
ids.uids = {
|
||||
@@ -111,7 +110,7 @@ in
|
||||
postgres = 71;
|
||||
#vboxusers = 72; # unused
|
||||
#vboxsf = 73; # unused
|
||||
smbguest = 74; # unused
|
||||
smbguest = 74; # unused
|
||||
varnish = 75;
|
||||
datadog = 76;
|
||||
lighttpd = 77;
|
||||
@@ -290,7 +289,7 @@ in
|
||||
postgrey = 258;
|
||||
# hound = 259; # unused, removed 2023-11-21
|
||||
leaps = 260;
|
||||
ipfs = 261;
|
||||
ipfs = 261;
|
||||
# stanchion = 262; # unused, removed 2020-10-14
|
||||
# riak-cs = 263; # unused, removed 2020-10-14
|
||||
infinoted = 264;
|
||||
@@ -436,7 +435,7 @@ in
|
||||
postgres = 71;
|
||||
vboxusers = 72;
|
||||
vboxsf = 73;
|
||||
smbguest = 74; # unused
|
||||
smbguest = 74; # unused
|
||||
varnish = 75;
|
||||
datadog = 76;
|
||||
lighttpd = 77;
|
||||
@@ -666,6 +665,7 @@ in
|
||||
rstudio-server = 324;
|
||||
localtimed = 325;
|
||||
automatic-timezoned = 326;
|
||||
uinput = 327;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
||||
@@ -45,7 +45,7 @@ let
|
||||
default = [ "any" ];
|
||||
};
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
type = lib.types.lines;
|
||||
description = "Extra zone config to be appended at the end of the zone section.";
|
||||
default = "";
|
||||
};
|
||||
|
||||
@@ -249,12 +249,14 @@ in
|
||||
package = mkPackageOption pkgs "keycloak" { };
|
||||
|
||||
initialAdminPassword = mkOption {
|
||||
type = str;
|
||||
default = "changeme";
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Initial password set for the `admin`
|
||||
user. The password is not stored safely and should be changed
|
||||
Initial password set for the temporary `admin` user.
|
||||
The password is not stored safely and should be changed
|
||||
immediately in the admin panel.
|
||||
|
||||
See [Admin bootstrap and recovery](https://www.keycloak.org/server/bootstrap-admin-recovery) for details.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -351,35 +353,12 @@ in
|
||||
for more information about hostname configuration.
|
||||
'';
|
||||
};
|
||||
|
||||
proxy = mkOption {
|
||||
type = enum [ "edge" "reencrypt" "passthrough" "none" ];
|
||||
default = "none";
|
||||
example = "edge";
|
||||
description = ''
|
||||
The proxy address forwarding mode if the server is
|
||||
behind a reverse proxy.
|
||||
|
||||
- `edge`:
|
||||
Enables communication through HTTP between the
|
||||
proxy and Keycloak.
|
||||
- `reencrypt`:
|
||||
Requires communication through HTTPS between the
|
||||
proxy and Keycloak.
|
||||
- `passthrough`:
|
||||
Enables communication through HTTP or HTTPS between
|
||||
the proxy and Keycloak.
|
||||
|
||||
See <https://www.keycloak.org/server/reverseproxy> for more information.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
example = literalExpression ''
|
||||
{
|
||||
hostname = "keycloak.example.com";
|
||||
proxy = "reencrypt";
|
||||
https-key-store-file = "/path/to/file";
|
||||
https-key-store-password = { _secret = "/run/keys/store_password"; };
|
||||
}
|
||||
@@ -497,6 +476,16 @@ in
|
||||
See [New Hostname options](https://www.keycloak.org/docs/25.0.0/upgrading/#new-hostname-options) for details.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.settings.proxy or null == null;
|
||||
message = ''
|
||||
The option `services.keycloak.settings.proxy' has been removed.
|
||||
Set `services.keycloak.settings.proxy-headers` in combination
|
||||
with other hostname options as needed instead.
|
||||
See [Proxy option removed](https://www.keycloak.org/docs/latest/upgrading/index.html#proxy-option-removed)
|
||||
for more information.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ keycloakBuild ];
|
||||
@@ -633,6 +622,9 @@ in
|
||||
environment = {
|
||||
KC_HOME_DIR = "/run/keycloak";
|
||||
KC_CONF_DIR = "/run/keycloak/conf";
|
||||
} // lib.optionalAttrs (cfg.initialAdminPassword != null) {
|
||||
KC_BOOTSTRAP_ADMIN_USERNAME = "admin";
|
||||
KC_BOOTSTRAP_ADMIN_PASSWORD = cfg.initialAdminPassword;
|
||||
};
|
||||
serviceConfig = {
|
||||
LoadCredential =
|
||||
@@ -658,6 +650,7 @@ in
|
||||
|
||||
ln -s ${themesBundle} /run/keycloak/themes
|
||||
ln -s ${keycloakBuild}/providers /run/keycloak/
|
||||
ln -s ${keycloakBuild}/lib /run/keycloak/
|
||||
|
||||
install -D -m 0600 ${confFile} /run/keycloak/conf/keycloak.conf
|
||||
|
||||
@@ -672,8 +665,6 @@ in
|
||||
mkdir -p /run/keycloak/ssl
|
||||
cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/
|
||||
'' + ''
|
||||
export KEYCLOAK_ADMIN=admin
|
||||
export KEYCLOAK_ADMIN_PASSWORD=${escapeShellArg cfg.initialAdminPassword}
|
||||
kc.sh --verbose start --optimized
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -20,6 +20,8 @@ let
|
||||
|
||||
nodes = {
|
||||
keycloak = { config, ... }: {
|
||||
virtualisation.memorySize = 2047;
|
||||
|
||||
security.pki.certificateFiles = [
|
||||
certs.ca.cert
|
||||
];
|
||||
@@ -48,8 +50,7 @@ let
|
||||
];
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
xmlstarlet
|
||||
html-tidy
|
||||
htmlq
|
||||
jq
|
||||
];
|
||||
};
|
||||
@@ -151,16 +152,14 @@ let
|
||||
# post url.
|
||||
keycloak.succeed(
|
||||
"curl -sSf -c cookie '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/auth?client_id=${client.name}&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&scope=openid+email&response_type=code&response_mode=query&nonce=qw4o89g3qqm' >login_form",
|
||||
"tidy -asxml -q -m login_form || true",
|
||||
"xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:div/_:form[@id='kc-form-login']\" -v @action login_form >form_post_url",
|
||||
"htmlq '#kc-form-login' --attribute action --filename login_form --output form_post_url"
|
||||
)
|
||||
|
||||
# Post the login form and save the response. Once again tidy up
|
||||
# the HTML, then extract the authorization code.
|
||||
keycloak.succeed(
|
||||
"curl -sSf -L -b cookie -d 'username=${user.username}' -d 'password=${password}' -d 'credentialId=' \"$(<form_post_url)\" >auth_code_html",
|
||||
"tidy -asxml -q -m auth_code_html || true",
|
||||
"xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:input[@id='code']\" -v @value auth_code_html >auth_code",
|
||||
"htmlq '#code' --attribute value --filename auth_code_html --output auth_code"
|
||||
)
|
||||
|
||||
# Exchange the authorization code for an access token.
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "17.0.4";
|
||||
version = "18.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-mtAMvaC8W9/o+ccHyvJRZ5Stq82m6IgXk/jOcxaGSXA=";
|
||||
sha256 = "sha256-h88wqKwkxY/5uOU0SQp8vb4ri3Ndi3ezHPTDFJGVE2Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
let
|
||||
pname = "sparrow";
|
||||
version = "1.9.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
|
||||
sha256 = "sha256-b1OIizSMTOtLM3/RFiBJPSbkj/C0d0s5ggcUwjCdBBo=";
|
||||
sha256 = "sha256-Z4rA3KObPAOuJeI+TzyYaXDyptAxBAWzYJDTplUvw50=";
|
||||
|
||||
# nativeBuildInputs, downloadToTemp, and postFetch are used to verify the signed upstream package.
|
||||
# The signature is not a self-contained file. Instead the SHA256 of the package is added to a manifest file.
|
||||
@@ -56,12 +56,12 @@ let
|
||||
|
||||
manifest = fetchurl {
|
||||
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt";
|
||||
sha256 = "sha256-2IGhP9Xsli9d0zTzPliJH/tE5TXei1vjVngtjL9vA48=";
|
||||
sha256 = "sha256-qjkKw3WmbRBf+yqcSIYVWmYz8M3u2JxnBriR0Ec/C7A=";
|
||||
};
|
||||
|
||||
manifestSignature = fetchurl {
|
||||
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt.asc";
|
||||
sha256 = "sha256-FSR9Z+27J/u1MYIR+LrL+pqCP6q4GfVYtRZ0WA9AaKM=";
|
||||
sha256 = "sha256-CRrEzWqFVFQGWsh2+rjSuGHuFmf+y6SetCi2G89jZ/0=";
|
||||
};
|
||||
|
||||
publicKey = ./publickey.asc;
|
||||
|
||||
+3
-3
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "lsp-bridge";
|
||||
version = "0-unstable-2024-09-27";
|
||||
version = "0-unstable-2024-10-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manateelazycat";
|
||||
repo = "lsp-bridge";
|
||||
rev = "f9d540ff451d9a0ee92819b84472820f16be15d5";
|
||||
hash = "sha256-YqUC2Z24ORwIMNZUsAJrAnSaDovccnGMg2OSYY1mYoQ=";
|
||||
rev = "2d0cd0bea3bd503ca3bb7bcf4a6a78af091c7ecc";
|
||||
hash = "sha256-q6xIYUhXTqGeR9tnjd1xnCOnOeOMypJN6vfGjZDuIIM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -19,13 +19,13 @@ with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "kupfer";
|
||||
version = "321";
|
||||
version = "327";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.bz2";
|
||||
sha256 = "0nagjp63gxkvsgzrpjk78cbqx9a7rbnjivj1avzb2fkhrlxa90c7";
|
||||
url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz";
|
||||
sha256 = "sha256-F5ScSfD/LwpSOAAqTN0WX5yFhoz23DYfeCC+KuvixYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,15 +35,19 @@
|
||||
withContrib ? true,
|
||||
}:
|
||||
|
||||
assert lib.warnIf (
|
||||
enableMixmaster
|
||||
) "Support for mixmaster has been removed from neomutt since the 20241002 release" true;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "neomutt";
|
||||
version = "20240425";
|
||||
version = "20241002";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomutt";
|
||||
repo = "neomutt";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ=";
|
||||
hash = "sha256-c8G0CGg4jrwq+HVR4O0AtaJNzr7pDYsie1410tisLEY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -95,25 +99,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace /etc/mime.types ${mailcap}/etc/mime.types
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
"--enable-autocrypt"
|
||||
"--gpgme"
|
||||
"--gss"
|
||||
"--lmdb"
|
||||
"--notmuch"
|
||||
"--ssl"
|
||||
"--sasl"
|
||||
"--with-homespool=mailbox"
|
||||
"--with-mailpath="
|
||||
# To make it not reference .dev outputs. See:
|
||||
# https://github.com/neomutt/neomutt/pull/2367
|
||||
"--disable-include-path-in-cflags"
|
||||
"--zlib"
|
||||
]
|
||||
++ lib.optional enableZstd "--zstd"
|
||||
++ lib.optional enableLua "--lua"
|
||||
++ lib.optional enableMixmaster "--mixmaster";
|
||||
configureFlags = [
|
||||
"--enable-autocrypt"
|
||||
"--gpgme"
|
||||
"--gss"
|
||||
"--lmdb"
|
||||
"--notmuch"
|
||||
"--ssl"
|
||||
"--sasl"
|
||||
"--with-homespool=mailbox"
|
||||
"--with-mailpath="
|
||||
# To make it not reference .dev outputs. See:
|
||||
# https://github.com/neomutt/neomutt/pull/2367
|
||||
"--disable-include-path-in-cflags"
|
||||
"--zlib"
|
||||
] ++ lib.optional enableZstd "--zstd" ++ lib.optional enableLua "--lua";
|
||||
|
||||
postInstall =
|
||||
''
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "3.73";
|
||||
version = "3.75";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
hash = "sha256-5CgkpL0nBLKojKPSfkYxh8F5Ub+yWhfmOsKC5qQ4QaE=";
|
||||
hash = "sha256-f4ddm9+A3Km0aKlKFeoFMKxm94u0pbNvHaozesmQCH4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rj5BbbT3/IBtPZ1MqbwC9TNp+N9ec90Anear2AWBZZU=";
|
||||
vendorHash = "sha256-hdvlz3KbB6wPva3o5suEApgZ6w98R8TPYrPlmqYJbvo=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
||||
@@ -651,6 +651,53 @@ rec {
|
||||
*/
|
||||
writeHaskellBin = name: writeHaskell "/bin/${name}";
|
||||
|
||||
/**
|
||||
writeNim takes a name, an attrset with an optional Nim compiler, and some
|
||||
Nim source code, returning an executable.
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `pkgs.writers.writeNim` usage example
|
||||
|
||||
```nix
|
||||
writeNim "hello-nim" { nim = pkgs.nim2; } ''
|
||||
echo "hello nim"
|
||||
'';
|
||||
```
|
||||
:::
|
||||
*/
|
||||
writeNim =
|
||||
name:
|
||||
{
|
||||
makeWrapperArgs ? [ ],
|
||||
nim ? pkgs.nim2,
|
||||
nimCompileOptions ? { },
|
||||
strip ? true,
|
||||
}:
|
||||
let
|
||||
nimCompileCmdArgs = lib.cli.toGNUCommandLineShell { optionValueSeparator = ":"; } (
|
||||
{
|
||||
d = "release";
|
||||
nimcache = ".";
|
||||
}
|
||||
// nimCompileOptions
|
||||
);
|
||||
in
|
||||
makeBinWriter {
|
||||
compileScript = ''
|
||||
cp $contentPath tmp.nim
|
||||
${lib.getExe nim} compile ${nimCompileCmdArgs} tmp.nim
|
||||
mv tmp $out
|
||||
'';
|
||||
inherit makeWrapperArgs strip;
|
||||
} name;
|
||||
|
||||
/**
|
||||
writeNimBin takes the same arguments as writeNim but outputs a directory
|
||||
(like writeScriptBin)
|
||||
*/
|
||||
writeNimBin = name: writeNim "/bin/${name}";
|
||||
|
||||
/**
|
||||
Like writeScript but the first line is a shebang to nu
|
||||
|
||||
|
||||
@@ -31,6 +31,8 @@ let
|
||||
writeJSBin
|
||||
writeJSON
|
||||
writeLua
|
||||
writeNim
|
||||
writeNimBin
|
||||
writeNu
|
||||
writePerl
|
||||
writePerlBin
|
||||
@@ -109,6 +111,10 @@ recurseIntoAttrs {
|
||||
_ -> print "fail"
|
||||
'');
|
||||
|
||||
nim = expectSuccessBin (writeNimBin "test-writers-nim-bin" { } ''
|
||||
echo "success"
|
||||
'');
|
||||
|
||||
js = expectSuccessBin (writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } ''
|
||||
var semver = require('semver');
|
||||
|
||||
@@ -191,6 +197,10 @@ recurseIntoAttrs {
|
||||
end
|
||||
'');
|
||||
|
||||
nim = expectSuccess (writeNim "test-writers-nim" { } ''
|
||||
echo "success"
|
||||
'');
|
||||
|
||||
nu = expectSuccess (writeNu "test-writers-nushell" ''
|
||||
echo "success"
|
||||
'');
|
||||
@@ -411,6 +421,23 @@ recurseIntoAttrs {
|
||||
''
|
||||
);
|
||||
|
||||
nim = expectSuccess (
|
||||
writeNim "test-writers-wrapping-nim"
|
||||
{
|
||||
makeWrapperArgs = [
|
||||
"--set"
|
||||
"ThaigerSprint"
|
||||
"Thailand"
|
||||
];
|
||||
}
|
||||
''
|
||||
import os
|
||||
|
||||
if getEnv("ThaigerSprint") == "Thailand":
|
||||
echo "success"
|
||||
''
|
||||
);
|
||||
|
||||
python = expectSuccess (
|
||||
writePython3 "test-writers-wrapping-python"
|
||||
{
|
||||
|
||||
@@ -62,14 +62,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.17.56"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.17.64"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-h82g99+3TsMa5yyzt7A1q3m2vO34rJlhmOlXx6jqmUk=";
|
||||
hash = "sha256-Hq86KhAIATSz3dF1zO6aSdZQAfLs4EcRqWglAOJUVGk=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@@ -23,11 +23,11 @@ let
|
||||
{
|
||||
x86_64-linux = {
|
||||
name = "BombSquad_Linux_x86_64";
|
||||
hash = "sha256-ICjaNZSCUbslB5pELbI4e+1zXWrZzkCkv69jLRx4dr0=";
|
||||
hash = "sha256-jrExsqaM6uhnKMGPkJJTsKt2Imek+YDI2soSP/kfPj0=";
|
||||
};
|
||||
aarch-64-linux = {
|
||||
name = "BombSquad_Linux_Arm64";
|
||||
hash = "sha256-w42qhioZ9JRm004WEKzsJ3G1u09tLuPvTy8qV3DuglI=";
|
||||
hash = "sha256-o1Yg0C5k07NZzc9jQrHXR+kkQl8HZ55U9/fqcpe3Iyw=";
|
||||
};
|
||||
}
|
||||
.${targetPlatform.system} or (throw "${targetPlatform.system} is unsupported.");
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "intel-undervolt";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kitsunyan";
|
||||
repo = "intel-undervolt";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-BxTNqXC+vG24/y8yZ/h1Ep4F8MwVdjsr5uo/BjuWULo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp intel-undervolt $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Intel CPU undervolting and throttling configuration tool";
|
||||
homepage = "https://github.com/kitsunyan/intel-undervolt";
|
||||
mainProgram = "intel-undervolt";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = [ "x86_64-linux" ]; # It probably compiles for aaarch64-linux too, but what's the point?
|
||||
maintainers = with lib.maintainers; [ pandapip1 ];
|
||||
};
|
||||
})
|
||||
Generated
+3525
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,103 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
binutils,
|
||||
dpkg,
|
||||
fakeroot,
|
||||
jdk17,
|
||||
fontconfig,
|
||||
autoPatchelfHook,
|
||||
libXinerama,
|
||||
libXrandr,
|
||||
file,
|
||||
gtk3,
|
||||
glib,
|
||||
cups,
|
||||
lcms2,
|
||||
alsa-lib,
|
||||
}:
|
||||
let
|
||||
gradleBuildTask = ":desktopApp:packageDeb";
|
||||
gradleUpdateTask = gradleBuildTask;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keyguard";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AChep";
|
||||
repo = "keyguard-app";
|
||||
rev = "16e02dee823184058d43a706ed6a34d03e29680b";
|
||||
hash = "sha256-jiQnLMGUdM2UcW4c/zz2XqEVix5B68wEvpPtVAnVfEI=";
|
||||
};
|
||||
|
||||
inherit gradleBuildTask gradleUpdateTask;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
binutils
|
||||
dpkg
|
||||
fakeroot
|
||||
jdk17
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
inherit (finalAttrs) pname;
|
||||
data = ./deps.json;
|
||||
silent = false;
|
||||
useBwrap = false;
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
gradleFlags = [ "-Dorg.gradle.java.home=${jdk17}" ];
|
||||
|
||||
env.JAVA_HOME = jdk17;
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
libXinerama
|
||||
libXrandr
|
||||
file
|
||||
gtk3
|
||||
glib
|
||||
cups
|
||||
lcms2
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/
|
||||
dpkg -x ./desktopApp/build/compose/binaries/main/deb/*.deb $out
|
||||
mv $out/opt/keyguard/* -t $out/
|
||||
rm -r $out/opt
|
||||
install -Dm0644 $out/lib/*-Keyguard.desktop $out/share/applications/Keyguard.desktop
|
||||
substituteInPlace $out/share/applications/Keyguard.desktop \
|
||||
--replace-fail 'Exec=/opt/keyguard/bin/Keyguard' 'Exec=Keyguard' \
|
||||
--replace-fail 'Icon=/opt/keyguard/lib/Keyguard.png' 'Icon=Keyguard'
|
||||
install -Dm0644 $out/lib/Keyguard.png $out/share/pixmaps/Keyguard.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Alternative client for the Bitwarden platform, created to provide the best user experience possible";
|
||||
homepage = "https://github.com/AChep/keyguard-app";
|
||||
mainProgram = "Keyguard";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ aucub ];
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode
|
||||
];
|
||||
platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
+4
-4
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick
|
||||
, jdk, perl
|
||||
, jdk17, perl
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -34,9 +34,9 @@ stdenv.mkDerivation {
|
||||
mkdir -pv $out/bin
|
||||
cp -a netbeans $out
|
||||
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
|
||||
--prefix PATH : ${lib.makeBinPath [ jdk which ]} \
|
||||
--prefix JAVA_HOME : ${jdk.home} \
|
||||
--add-flags "--jdkhome ${jdk.home} \
|
||||
--prefix PATH : ${lib.makeBinPath [ jdk17 which ]} \
|
||||
--prefix JAVA_HOME : ${jdk17.home} \
|
||||
--add-flags "--jdkhome ${jdk17.home} \
|
||||
-J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true"
|
||||
|
||||
# Extract pngs from the Apple icon image and create
|
||||
@@ -1,34 +1,35 @@
|
||||
{ alsa-lib
|
||||
, autoPatchelfHook
|
||||
, buildFHSEnv
|
||||
, dbus
|
||||
, elfutils
|
||||
, expat
|
||||
, extraEnv ? { }
|
||||
, fetchFromGitLab
|
||||
, fetchurl
|
||||
, glib
|
||||
, glibc
|
||||
, lib
|
||||
, libGL
|
||||
, libapparmor
|
||||
, libbsd
|
||||
, libedit
|
||||
, libffi_3_3
|
||||
, libgcrypt
|
||||
, libglvnd
|
||||
, makeShellWrapper
|
||||
, sqlite
|
||||
, squashfsTools
|
||||
, stdenv
|
||||
, tcp_wrappers
|
||||
, udev
|
||||
, waylandpp
|
||||
, writeShellScript
|
||||
, xkeyboard_config
|
||||
, xorg
|
||||
, xz
|
||||
, zstd
|
||||
{
|
||||
alsa-lib,
|
||||
autoPatchelfHook,
|
||||
buildFHSEnv,
|
||||
dbus,
|
||||
elfutils,
|
||||
expat,
|
||||
extraEnv ? { },
|
||||
fetchFromGitLab,
|
||||
fetchurl,
|
||||
glib,
|
||||
glibc,
|
||||
lib,
|
||||
libGL,
|
||||
libapparmor,
|
||||
libbsd,
|
||||
libedit,
|
||||
libffi_3_3,
|
||||
libgcrypt,
|
||||
libglvnd,
|
||||
makeShellWrapper,
|
||||
sqlite,
|
||||
squashfsTools,
|
||||
stdenv,
|
||||
tcp_wrappers,
|
||||
udev,
|
||||
waylandpp,
|
||||
writeShellScript,
|
||||
xkeyboard_config,
|
||||
xorg,
|
||||
xz,
|
||||
zstd,
|
||||
}:
|
||||
let
|
||||
pname = "plex-desktop";
|
||||
@@ -104,48 +105,52 @@ let
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r . $out
|
||||
cp -r . $out
|
||||
|
||||
ln -s ${libedit}/lib/libedit.so.0 $out/lib/libedit.so.2
|
||||
rm $out/usr/lib/x86_64-linux-gnu/libasound.so.2
|
||||
ln -s ${alsa-lib}/lib/libasound.so.2 $out/usr/lib/x86_64-linux-gnu/libasound.so.2
|
||||
rm $out/usr/lib/x86_64-linux-gnu/libasound.so.2.0.0
|
||||
ln -s ${alsa-lib}/lib/libasound.so.2.0.0 $out/usr/lib/x86_64-linux-gnu/libasound.so.2.0.0
|
||||
ln -s ${libedit}/lib/libedit.so.0 $out/lib/libedit.so.2
|
||||
rm $out/usr/lib/x86_64-linux-gnu/libasound.so.2
|
||||
ln -s ${alsa-lib}/lib/libasound.so.2 $out/usr/lib/x86_64-linux-gnu/libasound.so.2
|
||||
rm $out/usr/lib/x86_64-linux-gnu/libasound.so.2.0.0
|
||||
ln -s ${alsa-lib}/lib/libasound.so.2.0.0 $out/usr/lib/x86_64-linux-gnu/libasound.so.2.0.0
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
buildFHSEnv {
|
||||
name = "${pname}-${version}";
|
||||
targetPkgs = pkgs: [ xkeyboard_config ];
|
||||
inherit pname version meta;
|
||||
targetPkgs = pkgs: [ xkeyboard_config ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps
|
||||
install -m 444 -D ${plex-desktop}/meta/gui/plex-desktop.desktop $out/share/applications/plex-desktop.desktop
|
||||
substituteInPlace $out/share/applications/plex-desktop.desktop \
|
||||
--replace-fail \
|
||||
'Icon=''${SNAP}/meta/gui/icon.png' \
|
||||
'Icon=${plex-desktop}/meta/gui/icon.png' \
|
||||
--replace-fail \
|
||||
'Exec=plex-desktop' \
|
||||
'Exec=plex-desktop-${version}'
|
||||
'';
|
||||
|
||||
runScript = writeShellScript "plex-desktop.sh" ''
|
||||
# Widevine won't download unless this directory exists.
|
||||
mkdir -p $HOME/.cache/plex/
|
||||
PLEX_USR_PATH=${lib.makeSearchPath "usr/lib/x86_64-linux-gnu" [ plex-desktop ]}
|
||||
|
||||
set -o allexport
|
||||
LD_LIBRARY_PATH=${lib.makeLibraryPath [ plex-desktop libglvnd-1_4_0 ]}:$PLEX_USR_PATH
|
||||
LIBGL_DRIVERS_PATH=$PLEX_USR_PATH/dri
|
||||
${lib.toShellVars extraEnv}
|
||||
exec ${plex-desktop}/Plex.sh
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps
|
||||
install -m 444 -D ${plex-desktop}/meta/gui/plex-desktop.desktop $out/share/applications/plex-desktop.desktop
|
||||
substituteInPlace $out/share/applications/plex-desktop.desktop \
|
||||
--replace-fail \
|
||||
'Icon=''${SNAP}/meta/gui/icon.png' \
|
||||
'Icon=${plex-desktop}/meta/gui/icon.png' \
|
||||
--replace-fail \
|
||||
'Exec=plex-desktop' \
|
||||
'Exec=plex-desktop-${version}'
|
||||
'';
|
||||
}
|
||||
|
||||
runScript = writeShellScript "plex-desktop.sh" ''
|
||||
# Widevine won't download unless this directory exists.
|
||||
mkdir -p $HOME/.cache/plex/
|
||||
PLEX_USR_PATH=${lib.makeSearchPath "usr/lib/x86_64-linux-gnu" [ plex-desktop ]}
|
||||
|
||||
set -o allexport
|
||||
LD_LIBRARY_PATH=${
|
||||
lib.makeLibraryPath [
|
||||
plex-desktop
|
||||
libglvnd-1_4_0
|
||||
]
|
||||
}:$PLEX_USR_PATH
|
||||
LIBGL_DRIVERS_PATH=$PLEX_USR_PATH/dri
|
||||
${lib.toShellVars extraEnv}
|
||||
exec ${plex-desktop}/Plex.sh
|
||||
'';
|
||||
passthru.updateScript = ./update.sh;
|
||||
}
|
||||
|
||||
@@ -73,6 +73,7 @@ sed --regexp-extended \
|
||||
# try to build the updated version
|
||||
#
|
||||
|
||||
export NIXPKGS_ALLOW_UNFREE=1
|
||||
if ! nix-build -A plex-desktop "$nixpkgs"; then
|
||||
echo "The updated plex-desktop failed to build."
|
||||
exit 1
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
renode.overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.3+20240927gitbb819bb49";
|
||||
version = "1.15.3+20241004git4b8a8f170";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
|
||||
hash = "sha256-IcQKAslgmN+ChYJLsS0umR1/FSAicWyP6Ek/v668+40=";
|
||||
hash = "sha256-/+fH5DHL/kg4IlJyOlCuOMsUocaBsA8GYvq5iP7Ip+4=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# 15284.1 (build number)
|
||||
# dcd0176 (commit hash)
|
||||
# 20240504 (pub date)
|
||||
version = "1.5284-15284.1-dcd0176-20240504";
|
||||
version = "1.5310-15310.1-5f6bcc5-20240930";
|
||||
|
||||
src = fetchzip {
|
||||
url =
|
||||
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
commitHash = lib.elemAt (lib.splitString "-" finalAttrs.version) 2;
|
||||
in
|
||||
"https://updates.rewind.ai/builds/main/b${buildNumber}-main-${commitHash}.zip";
|
||||
hash = "sha256-Y7iAYHH/msZoXFzAZHJb6YoDz5fwMPHJx1kg7TqP5Gw=";
|
||||
hash = "sha256-uNqblEOezCj1JanDl6MZZO3GLX5jgWh19VeMcmwZvZg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,77 +1,83 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
# native
|
||||
, cmake
|
||||
, desktopToDarwinBundle
|
||||
, pkg-config
|
||||
# not native
|
||||
, gdal
|
||||
, wxGTK32
|
||||
, proj
|
||||
, libsForQt5
|
||||
, curl
|
||||
, libiodbc
|
||||
, xz
|
||||
, libharu
|
||||
, opencv
|
||||
, vigra
|
||||
, postgresql
|
||||
, darwin
|
||||
, unixODBC
|
||||
, poppler
|
||||
, hdf5
|
||||
, netcdf
|
||||
, sqlite
|
||||
, qhull
|
||||
, giflib
|
||||
, libsvm
|
||||
, fftw
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
# native
|
||||
cmake,
|
||||
desktopToDarwinBundle,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
# not native
|
||||
gdal,
|
||||
wxGTK32,
|
||||
proj,
|
||||
libsForQt5,
|
||||
curl,
|
||||
libiodbc,
|
||||
xz,
|
||||
libharu,
|
||||
opencv,
|
||||
vigra,
|
||||
pdal,
|
||||
postgresql,
|
||||
darwin,
|
||||
unixODBC,
|
||||
poppler,
|
||||
hdf5,
|
||||
netcdf,
|
||||
sqlite,
|
||||
qhull,
|
||||
giflib,
|
||||
libsvm,
|
||||
fftw,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "saga";
|
||||
version = "9.3.2";
|
||||
version = "9.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
|
||||
hash = "sha256-741O6C7amxSnOOTledF0izmVhiT79tFI4+EOtpNqP2Q=";
|
||||
hash = "sha256-M4228GDo9jIVJMfl61n7cgTAmBYZrmHdXb+mD40vWqY";
|
||||
};
|
||||
|
||||
sourceRoot = "saga-${version}/saga-gis";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapGAppsHook3
|
||||
pkg-config
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libsForQt5.dxflib
|
||||
fftw
|
||||
libsvm
|
||||
hdf5
|
||||
gdal
|
||||
wxGTK32
|
||||
proj
|
||||
libharu
|
||||
opencv
|
||||
vigra
|
||||
postgresql
|
||||
libiodbc
|
||||
xz
|
||||
qhull
|
||||
giflib
|
||||
]
|
||||
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
|
||||
# for why the have additional buildInputs on darwin
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
unixODBC
|
||||
poppler
|
||||
netcdf
|
||||
sqlite
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
curl
|
||||
libsForQt5.dxflib
|
||||
fftw
|
||||
libsvm
|
||||
hdf5
|
||||
gdal
|
||||
wxGTK32
|
||||
pdal
|
||||
proj
|
||||
libharu
|
||||
opencv
|
||||
vigra
|
||||
postgresql
|
||||
libiodbc
|
||||
xz
|
||||
qhull
|
||||
giflib
|
||||
]
|
||||
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
|
||||
# for why the have additional buildInputs on darwin
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
unixODBC
|
||||
poppler
|
||||
netcdf
|
||||
sqlite
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin))
|
||||
@@ -82,7 +88,13 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://saga-gis.sourceforge.io";
|
||||
changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; teams.geospatial.members ++ [ michelk mpickering ];
|
||||
maintainers =
|
||||
with maintainers;
|
||||
teams.geospatial.members
|
||||
++ [
|
||||
michelk
|
||||
mpickering
|
||||
];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
python3.pkgs.toPythonModule (
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2024-06-19";
|
||||
version = "0-unstable-2024-10-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "acf3f109b2a99a5e6f25f5f2975016a36673c6ef";
|
||||
hash = "sha256-NdFnB5JEaWo7gt+RwxKxkVtEL8uGLlc4z0ROHN+zoL4=";
|
||||
rev = "e7a4d7d7c3d688b69737f2b1ecd23571f5e3a0b9";
|
||||
hash = "sha256-JfcB19Tfk5e7DyArzz9TNjidOZjkSxTLEU3ZhE105qs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "slumber";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LucasPickering";
|
||||
repo = "slumber";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TfJAVXJssnKj/RREetFBWgJcGNdpCTF7KUu3CrigF08=";
|
||||
hash = "sha256-W7KvIc6FqM4RUqUsMOzfwBD9kVIFdqPba8dz+Ysg4sY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jLBid9MDQ2eMhG0knxU1gxbi+eRFlCPYRkzWnjCnyG0=";
|
||||
cargoHash = "sha256-1PNf7EVr4UibxR1OM04tDr5jreEeFxvKfx6Qe3p6dJQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
|
||||
|
||||
|
||||
@@ -78,8 +78,8 @@ let
|
||||
libcava.src = fetchFromGitHub {
|
||||
owner = "LukashonakV";
|
||||
repo = "cava";
|
||||
rev = "0.10.2";
|
||||
hash = "sha256-jU7RQV2txruu/nUUl0TzjK4nai7G38J1rcTjO7UXumY=";
|
||||
rev = "0.10.3";
|
||||
hash = "sha256-ZDFbI69ECsUTjbhlw2kHRufZbQMu+FQSMmncCJ5pagg=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
@@ -1,25 +1,36 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper
|
||||
{ lib, stdenv, fetchurl, fetchpatch2, makeWrapper
|
||||
, haskellPackages, haskell
|
||||
, which, swi-prolog, rlwrap, tk
|
||||
, curl, git, unzip, gnutar, coreutils, sqlite }:
|
||||
|
||||
let
|
||||
pname = "pakcs";
|
||||
version = "3.6.0";
|
||||
version = "3.7.2";
|
||||
|
||||
# Don't switch to "Current release" without a reason, because its
|
||||
# source updates without version bump. Prefer last from "Older releases" instead.
|
||||
src = fetchurl {
|
||||
url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz";
|
||||
hash = "sha256-1r6jEY3eEGESKcAepiziVbxpIvQLtCS6l0trBU3SGGo=";
|
||||
hash = "sha256-ZfQUgFqmPPCeDx/T5G/JdvYDq/7XbvsgxPcEX4y9HZ4=";
|
||||
};
|
||||
|
||||
curry-frontend = (haskellPackages.override {
|
||||
overrides = self: super: {
|
||||
curry-frontend = haskell.lib.compose.overrideCabal (drv: {
|
||||
inherit src;
|
||||
postUnpack = "sourceRoot+=/frontend";
|
||||
}) (super.callPackage ./curry-frontend.nix { });
|
||||
curry-frontend = lib.pipe (super.callPackage ./curry-frontend.nix { })
|
||||
[ haskell.lib.doJailbreak
|
||||
(haskell.lib.compose.overrideCabal (drv: {
|
||||
inherit src;
|
||||
postUnpack = "sourceRoot+=/frontend";
|
||||
}))
|
||||
(haskell.lib.compose.appendPatch
|
||||
# mtl 2.3 compatibility has been fixed upstream but it's not in
|
||||
# the release yet
|
||||
(fetchpatch2 {
|
||||
name = "fix-mtl-2.3.patch";
|
||||
url = "https://git.ps.informatik.uni-kiel.de/curry/curry-frontend/-/commit/3b26d2826141fee676da07939c2929a049279b70.diff";
|
||||
hash = "sha256-R3XjoUzAwTvDoUEAIIjmrSh2r4RHMqe00RMIs+7jFPY=";
|
||||
}))
|
||||
];
|
||||
};
|
||||
}).curry-frontend;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmrpflash";
|
||||
version = "0.9.22";
|
||||
version = "0.9.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jclehner";
|
||||
repo = "nmrpflash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gr/7tZYnuXFvfIUh2MmtgSbFoELTomQ4h05y/WFDhjo=";
|
||||
hash = "sha256-WneKImWEQQHBFEw/ABE7wA8ZFIvh2t5nJkfviq1fH4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fpdf2";
|
||||
version = "2.7.9";
|
||||
version = "2.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "py-pdf";
|
||||
repo = "fpdf2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8CuK8ZFn4msOSNIdgOFjD3ygVeiBUw4/Bc3w1J6Kn9U=";
|
||||
hash = "sha256-MYurl/nEZhdhGxeNalwTWnZ8lr9SYJBR7hIjBZLOrJU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python,
|
||||
fetchFromGitHub,
|
||||
scikit-build-core,
|
||||
cmake,
|
||||
ninja,
|
||||
nanobind,
|
||||
pkg-config,
|
||||
numpy,
|
||||
clipper2,
|
||||
tbb,
|
||||
glm,
|
||||
pytestCheckHook,
|
||||
trimesh,
|
||||
}:
|
||||
|
||||
let
|
||||
# archived library, but manifold3d has removed this on master
|
||||
thrust-src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "thrust";
|
||||
rev = "refs/tags/2.1.0";
|
||||
hash = "sha256-U9WgRZva7R/bNOF5VZTvIwIQDQDD3/bRO08j2TPLl9Q=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "manifold3d";
|
||||
version = "2.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elalish";
|
||||
repo = "manifold";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0zjS4ygt85isP1jyiTCeD/umhQ8ffIN+u2CeLeybX9U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
build-system = [
|
||||
scikit-build-core
|
||||
cmake
|
||||
ninja
|
||||
nanobind
|
||||
pkg-config
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glm
|
||||
tbb
|
||||
clipper2
|
||||
];
|
||||
|
||||
env.SKBUILD_CMAKE_DEFINE = "FETCHCONTENT_SOURCE_DIR_THRUST=${thrust-src}";
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
trimesh
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
${python.interpreter} bindings/python/examples/run_all.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"manifold3d"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Geometry library for topological robustness";
|
||||
homepage = "https://github.com/elalish/manifold";
|
||||
changelog = "https://github.com/elalish/manifold/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.8.22";
|
||||
version = "0.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JSWsL0GIO+6DZAWnGej6LL3aApIjlIEyyEl0WEOh9Io=";
|
||||
hash = "sha256-7sG6i1WusNuCpuaojFXhSfPWCA2/nzHXvMF29ApGTDg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycaption";
|
||||
version = "2.2.14";
|
||||
version = "2.2.15";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "pbs";
|
||||
repo = "pycaption";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9COO8cJRxXiWWceh3XtasSMBq7E5Py0p+1b3sWMaMWE=";
|
||||
hash = "sha256-07Llsp2Cvvo9WueeTBJnAos3uynhYL0gT5U21EI9dHY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
cudaPackages,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
pythonOlder,
|
||||
addDriverRunpath,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
@@ -14,15 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynvml";
|
||||
version = "11.5.0";
|
||||
version = "11.5.3";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpuopenanalytics";
|
||||
repo = "pynvml";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-K3ZENjgi+TVDxr55dRK1y8SwzfgVIzcnD4oEI+KHRa4=";
|
||||
hash = "sha256-8NkYBRpcW3dvxVc6z17TMRPqA0YK/J/CdjuqgdcTdy8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -37,7 +35,7 @@ buildPythonPackage rec {
|
||||
rm versioneer.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
versioneer
|
||||
];
|
||||
@@ -59,10 +57,10 @@ buildPythonPackage rec {
|
||||
print(f"{pynvml.nvmlInit()=}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python bindings for the NVIDIA Management Library";
|
||||
homepage = "https://github.com/gpuopenanalytics/pynvml";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "10.12.0";
|
||||
version = "11.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Wr7ERUjTgUvB4HCqGFK8s/xcwCnpR8D3MxVusfjIcDA=";
|
||||
hash = "sha256-H6xmDcwwFCaMr8lKRevqxm8adSNl9gAZ0iY+DB4Plls=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -36,6 +36,8 @@
|
||||
torch,
|
||||
tqdm,
|
||||
transformers,
|
||||
|
||||
tinygrad,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -92,7 +94,13 @@ buildPythonPackage rec {
|
||||
# pyobjc-framework-metal
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tinygrad" ];
|
||||
pythonImportsCheck =
|
||||
[
|
||||
"tinygrad"
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
"tinygrad.runtime.ops_nv"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
blobfile
|
||||
@@ -175,6 +183,10 @@ buildPythonPackage rec {
|
||||
"extra/"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
withCuda = tinygrad.override { cudaSupport = true; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Simple and powerful neural network framework";
|
||||
homepage = "https://github.com/tinygrad/tinygrad";
|
||||
|
||||
@@ -43,7 +43,7 @@ index 6af74187..c5a6c6c4 100644
|
||||
+ pass
|
||||
+if libnvrtc is None:
|
||||
+ raise RuntimeError(f"`libnvrtc.so` not found")
|
||||
+_libraries['libnvrtc.so'] = ctypes.CDLL(libnvrtc)
|
||||
+_libraries['libnvrtc.so'] = libnvrtc
|
||||
def string_cast(char_pointer, encoding='utf-8', errors='strict'):
|
||||
value = ctypes.cast(char_pointer, ctypes.c_char_p).value
|
||||
if value is not None and encoding is not None:
|
||||
|
||||
@@ -624,6 +624,11 @@ in
|
||||
];
|
||||
} // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
buildInputs = [ libxml2 ];
|
||||
|
||||
# libxml 2.12 upgrade requires these fixes
|
||||
# https://github.com/sparklemotion/nokogiri/pull/3032
|
||||
# which don't trivially apply to older versions
|
||||
meta.broken = (lib.versionOlder attrs.version "1.16.0") && (lib.versionAtLeast libxml2.version "2.12");
|
||||
});
|
||||
|
||||
openssl = attrs: {
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
pname = "sccache";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "sccache";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sP6KTR50Ns4Yf/DGeSK7kB0dF0lraWbx948EOmsy+8c=";
|
||||
sha256 = "sha256-HqTPC7J3hf5+dcsWlqc/FR7ev3f6J4jxhDwgM4GxYww=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6tiTgyhkPeH/oWcce1U2UsVngEfc4LKbB1zMt7meshA=";
|
||||
cargoHash = "sha256-ZUdjdKUUrQCUjwTh+T61Wn5gle4kzAbi3P1LvkS+NfQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.78";
|
||||
version = "0.9.79";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-nQIq/WCbB3iWxDdD13tthvmndYhccttcOeXWJ7Dri+0=";
|
||||
hash = "sha256-bP7tOhmfcfAtgL5d/G/B+ZgWeE8Q7f0A09XundTrU3g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XGDPxak2jVKkGyhPMpW4KxzyMd5aaIj1Hguw+XEM7w8=";
|
||||
cargoHash = "sha256-dprzi/VRzJBBkZ3xNSYLNAnwdyY+m8wVZbyv41p6v+I=";
|
||||
|
||||
cargoBuildFlags = [ "-p" "cargo-nextest" ];
|
||||
cargoTestFlags = [ "-p" "cargo-nextest" ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ./common.nix {
|
||||
version = "11.0.23";
|
||||
hash = "sha256-ISsDetefL9ow5aZ7vcSG1BgGwBO0FtDrd741mi8ORiY=";
|
||||
version = "11.0.24";
|
||||
hash = "sha256-Z+XvaUed7gtyHc9YjHG5e1H5QR6yP9UUWvxQGR5hojk=";
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ./common.nix {
|
||||
version = "12.0.12";
|
||||
hash = "sha256-CFdVT+AYK2KvXRzqMtTLz89BsXSuPolv+2u8EbTsil4=";
|
||||
version = "12.0.14";
|
||||
hash = "sha256-Ps8pVq377QLFyQZg6AoyEr1G9PonFaVxOCD69/VTGEY=";
|
||||
}
|
||||
|
||||
@@ -18,11 +18,11 @@ let
|
||||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "25.0.6";
|
||||
version = "26.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
hash = "sha256-1VHixRgErao/1ZEJv+rlnNmUd2NT35X89D8wuUhYF08=";
|
||||
hash = "sha256-BWkF5iiR4J7NskrJUFmlP0N+HEkyZLnLJbMmbXCROxo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carapace-sh";
|
||||
repo = "carapace-bin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-onkYihS4abrOfqOehlDy+ooL2d04w6DwOY3+B4+L3IQ=";
|
||||
hash = "sha256-ryFnccCSgQ0qEf3oRPmIO98fx2BlkK2dEFvNk2m9qSo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UFpQAlXFS1O/MqeGvUAWSQLhP03wf8JX8zz8cMyMmrc=";
|
||||
vendorHash = "sha256-biJN+WjNK/Fjjd3+ihZcFCu75fup3g9R6lIa6qHco5I=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -27,7 +27,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tmux";
|
||||
version = "3.5";
|
||||
version = "3.5a";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "tmux";
|
||||
repo = "tmux";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8CRZj7UyBhuB5QO27Y+tHG62S/eGxPOHWrwvh1aBqq0=";
|
||||
hash = "sha256-Z9XHpyh4Y6iBI4+SfFBCGA8huFJpRFZy9nEB7+WQVJE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,40 +1,45 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
builder (3.2.3)
|
||||
erubis (2.7.0)
|
||||
ffi (1.11.1)
|
||||
fileutils (0.7.2)
|
||||
gssapi (1.3.0)
|
||||
base64 (0.2.0)
|
||||
bigdecimal (3.1.8)
|
||||
builder (3.3.0)
|
||||
erubi (1.13.0)
|
||||
ffi (1.17.0)
|
||||
fileutils (1.7.2)
|
||||
gssapi (1.3.1)
|
||||
ffi (>= 1.0.1)
|
||||
gyoku (1.3.1)
|
||||
gyoku (1.4.0)
|
||||
builder (>= 2.1.2)
|
||||
rexml (~> 3.0)
|
||||
httpclient (2.8.3)
|
||||
little-plugger (1.1.4)
|
||||
logger (1.4.3)
|
||||
logging (2.2.2)
|
||||
logger (1.6.1)
|
||||
logging (2.4.0)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.10)
|
||||
multi_json (1.14.1)
|
||||
nori (2.6.0)
|
||||
rexml (3.2.5)
|
||||
rubyntlm (0.6.2)
|
||||
rubyzip (1.3.0)
|
||||
stringio (0.0.2)
|
||||
winrm (2.3.2)
|
||||
multi_json (~> 1.14)
|
||||
multi_json (1.15.0)
|
||||
nori (2.7.1)
|
||||
bigdecimal
|
||||
rexml (3.3.8)
|
||||
rubyntlm (0.6.5)
|
||||
base64
|
||||
rubyzip (2.3.2)
|
||||
stringio (3.1.1)
|
||||
winrm (2.3.9)
|
||||
builder (>= 2.1.2)
|
||||
erubis (~> 2.7)
|
||||
erubi (~> 1.8)
|
||||
gssapi (~> 1.2)
|
||||
gyoku (~> 1.0)
|
||||
httpclient (~> 2.2, >= 2.2.0.2)
|
||||
logging (>= 1.6.1, < 3.0)
|
||||
nori (~> 2.0)
|
||||
rexml (>= 3.2.3.1)
|
||||
rubyntlm (~> 0.6.0, >= 0.6.1)
|
||||
winrm-fs (1.3.2)
|
||||
erubis (~> 2.7)
|
||||
nori (~> 2.0, >= 2.7.1)
|
||||
rexml (~> 3.0)
|
||||
rubyntlm (~> 0.6.0, >= 0.6.3)
|
||||
winrm-fs (1.3.5)
|
||||
erubi (~> 1.8)
|
||||
logging (>= 1.6.1, < 3.0)
|
||||
rubyzip (~> 1.1)
|
||||
rubyzip (~> 2.0)
|
||||
winrm (~> 2.0)
|
||||
|
||||
PLATFORMS
|
||||
|
||||
@@ -1,43 +1,63 @@
|
||||
{
|
||||
base64 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
bigdecimal = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.8";
|
||||
};
|
||||
builder = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
|
||||
sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.3";
|
||||
version = "3.3.0";
|
||||
};
|
||||
erubis = {
|
||||
erubi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
|
||||
sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.0";
|
||||
version = "1.13.0";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
|
||||
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.1";
|
||||
version = "1.17.0";
|
||||
};
|
||||
fileutils = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "173z4dsqp9khcsl7x93dq1qj9d7rd378a7yfg53b1s6mczlkvh2k";
|
||||
sha256 = "0c86k3027r896wsgvjgdx27kg5d2x4479bc6ni93w9hq88rgp81n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.2";
|
||||
version = "1.7.2";
|
||||
};
|
||||
gssapi = {
|
||||
dependencies = ["ffi"];
|
||||
@@ -45,21 +65,21 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh";
|
||||
sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
};
|
||||
gyoku = {
|
||||
dependencies = ["builder"];
|
||||
dependencies = ["builder" "rexml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
|
||||
sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
};
|
||||
httpclient = {
|
||||
groups = ["default"];
|
||||
@@ -86,10 +106,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ihvvl2im9qii31d42c9kfscdg2flfqajs6ycbpslznclmfc71gc";
|
||||
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.3";
|
||||
version = "1.6.1";
|
||||
};
|
||||
logging = {
|
||||
dependencies = ["little-plugger" "multi_json"];
|
||||
@@ -97,91 +117,93 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
|
||||
sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.2";
|
||||
version = "2.4.0";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
|
||||
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
};
|
||||
nori = {
|
||||
dependencies = ["bigdecimal"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
|
||||
sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.0";
|
||||
version = "2.7.1";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
|
||||
sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.5";
|
||||
version = "3.3.8";
|
||||
};
|
||||
rubyntlm = {
|
||||
dependencies = ["base64"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
|
||||
sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.2";
|
||||
version = "0.6.5";
|
||||
};
|
||||
rubyzip = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l";
|
||||
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "2.3.2";
|
||||
};
|
||||
stringio = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hj8awh547kf6a7vgs565xh8hicffd0brb2a96jna5lr3a2fvmj8";
|
||||
sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.2";
|
||||
version = "3.1.1";
|
||||
};
|
||||
winrm = {
|
||||
dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"];
|
||||
dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19vxrclxc5l8n2agwvv291740s6gna2phg3lkybjb0ldkmpi3sj2";
|
||||
sha256 = "01jxpshw5kx5ha21ymaaj14vibv5bvm0dd80ccc6xl3jaxy7cszg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.2";
|
||||
version = "2.3.9";
|
||||
};
|
||||
winrm-fs = {
|
||||
dependencies = ["erubis" "logging" "rubyzip" "winrm"];
|
||||
dependencies = ["erubi" "logging" "rubyzip" "winrm"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3";
|
||||
sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.2";
|
||||
version = "1.3.5";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -88,6 +88,12 @@ stdenv.mkDerivation rec {
|
||||
"--no-suite" "fprintd:TestPamFprintd"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Skip flaky test "test_removal_during_enroll"
|
||||
# https://gitlab.freedesktop.org/libfprint/fprintd/-/issues/129
|
||||
./skip-test-test_removal_during_enroll.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
po/check-translations.sh \
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/tests/fprintd.py b/tests/fprintd.py
|
||||
index 370d7bb..4e4d78c 100644
|
||||
--- a/tests/fprintd.py
|
||||
+++ b/tests/fprintd.py
|
||||
@@ -1609,6 +1609,7 @@ class FPrintdVirtualDeviceTest(FPrintdVirtualDeviceBaseTest):
|
||||
time.sleep(1)
|
||||
|
||||
def test_removal_during_enroll(self):
|
||||
+ self.skipTest("flaky test")
|
||||
if not self._has_hotplug:
|
||||
self.skipTest("libfprint is too old for hotplug")
|
||||
|
||||
@@ -9,16 +9,16 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vaultwarden";
|
||||
version = "1.32.0";
|
||||
version = "1.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "vaultwarden";
|
||||
rev = version;
|
||||
hash = "sha256-y8+hkvUKj0leJJ5w72HOVDSOtKW6y2Y44VfOZSetn4M=";
|
||||
hash = "sha256-bjLa3/B+H49BHXU9xYAtoSsaJBtDJIm6+coGEplzxdM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1Z0ba1FhxQ5qVpofi0XD1MYz02QCvdXGeuViW3lU6JQ=";
|
||||
cargoHash = "sha256-3JfdgGHhj2Fva9BB5vNYDX1eHk2EZl/7f6AeLRqkaGQ=";
|
||||
|
||||
# used for "Server Installed" version in admin panel
|
||||
env.VW_VERSION = version;
|
||||
|
||||
@@ -620,8 +620,6 @@ with pkgs;
|
||||
|
||||
figma-agent = callPackage ../applications/graphics/figma-agent { };
|
||||
|
||||
figma-linux = callPackage ../applications/graphics/figma-linux { };
|
||||
|
||||
firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
|
||||
|
||||
frece = callPackage ../development/tools/frece { };
|
||||
@@ -10981,11 +10979,7 @@ with pkgs;
|
||||
|
||||
paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
|
||||
|
||||
pakcs = callPackage ../development/compilers/pakcs {
|
||||
# Doesn't compile with GHC 9.0 due to whitespace syntax changes
|
||||
# see also https://github.com/NixOS/nixpkgs/issues/166108
|
||||
haskellPackages = haskell.packages.ghc810;
|
||||
};
|
||||
pakcs = callPackage ../development/compilers/pakcs { };
|
||||
|
||||
pal = callPackage ../tools/misc/pal { };
|
||||
|
||||
@@ -12456,7 +12450,7 @@ with pkgs;
|
||||
|
||||
sparrow-unwrapped = callPackage ../applications/blockchains/sparrow {
|
||||
openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {};
|
||||
openjdk = openjdk21.override { enableJavaFX = true; };
|
||||
openjdk = jdk22.override { enableJavaFX = true; };
|
||||
};
|
||||
|
||||
sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { };
|
||||
@@ -12701,8 +12695,6 @@ with pkgs;
|
||||
|
||||
stricat = callPackage ../tools/security/stricat { };
|
||||
|
||||
staruml = callPackage ../tools/misc/staruml { };
|
||||
|
||||
stone-phaser = callPackage ../applications/audio/stone-phaser { };
|
||||
|
||||
systrayhelper = callPackage ../tools/misc/systrayhelper { };
|
||||
@@ -16755,8 +16747,6 @@ with pkgs;
|
||||
|
||||
inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };
|
||||
|
||||
infracost = callPackage ../tools/misc/infracost { };
|
||||
|
||||
msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
|
||||
|
||||
msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
|
||||
@@ -31663,10 +31653,6 @@ with pkgs;
|
||||
|
||||
nanorc = callPackage ../applications/editors/nano/nanorc { };
|
||||
|
||||
netbeans = callPackage ../applications/editors/netbeans {
|
||||
jdk = jdk17;
|
||||
};
|
||||
|
||||
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
|
||||
|
||||
ncdu = callPackage ../tools/misc/ncdu {
|
||||
@@ -31735,8 +31721,6 @@ with pkgs;
|
||||
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
|
||||
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
|
||||
|
||||
obsidian = callPackage ../applications/misc/obsidian { };
|
||||
|
||||
octoprint = callPackage ../applications/misc/octoprint { };
|
||||
|
||||
oculante = callPackage ../applications/graphics/oculante { };
|
||||
@@ -34355,8 +34339,6 @@ with pkgs;
|
||||
|
||||
scaleft = callPackage ../applications/networking/scaleft { };
|
||||
|
||||
scaleway-cli = callPackage ../tools/admin/scaleway-cli { };
|
||||
|
||||
beancount = with python3.pkgs; toPythonApplication beancount;
|
||||
|
||||
beancount-black = with python3.pkgs; toPythonApplication beancount-black;
|
||||
|
||||
@@ -7609,6 +7609,8 @@ self: super: with self; {
|
||||
|
||||
manifest-ml = callPackage ../development/python-modules/manifest-ml { };
|
||||
|
||||
manifold3d = callPackage ../development/python-modules/manifold3d { };
|
||||
|
||||
manifestoo = callPackage ../development/python-modules/manifestoo { };
|
||||
|
||||
manifestoo-core = callPackage ../development/python-modules/manifestoo-core { };
|
||||
|
||||
@@ -346,7 +346,7 @@ let
|
||||
nvfetcher
|
||||
oama
|
||||
ormolu
|
||||
# pakcs broken by set-extra on 2024-03-15
|
||||
pakcs
|
||||
pandoc
|
||||
place-cursor-at
|
||||
pinboard-notes-backup
|
||||
|
||||
Reference in New Issue
Block a user