Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8bbfcea60e
@ -1,11 +1,17 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.ttyd;
|
||||
|
||||
inherit (lib)
|
||||
optionals
|
||||
types
|
||||
concatLists
|
||||
mapAttrsToList
|
||||
mkOption
|
||||
;
|
||||
|
||||
# Command line arguments for the ttyd daemon
|
||||
args = [ "--port" (toString cfg.port) ]
|
||||
++ optionals (cfg.socket != null) [ "--interface" cfg.socket ]
|
||||
@ -14,6 +20,7 @@ let
|
||||
++ (concatLists (mapAttrsToList (_k: _v: [ "--client-option" "${_k}=${_v}" ]) cfg.clientOptions))
|
||||
++ [ "--terminal-type" cfg.terminalType ]
|
||||
++ optionals cfg.checkOrigin [ "--check-origin" ]
|
||||
++ optionals cfg.writeable [ "--writable" ] # the typo is correct
|
||||
++ [ "--max-clients" (toString cfg.maxClients) ]
|
||||
++ optionals (cfg.indexFile != null) [ "--index" cfg.indexFile ]
|
||||
++ optionals cfg.enableIPv6 [ "--ipv6" ]
|
||||
@ -30,40 +37,40 @@ in
|
||||
|
||||
options = {
|
||||
services.ttyd = {
|
||||
enable = mkEnableOption (lib.mdDoc "ttyd daemon");
|
||||
enable = lib.mkEnableOption ("ttyd daemon");
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 7681;
|
||||
description = lib.mdDoc "Port to listen on (use 0 for random port)";
|
||||
description = "Port to listen on (use 0 for random port)";
|
||||
};
|
||||
|
||||
socket = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/var/run/ttyd.sock";
|
||||
description = lib.mdDoc "UNIX domain socket path to bind.";
|
||||
description = "UNIX domain socket path to bind.";
|
||||
};
|
||||
|
||||
interface = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "eth0";
|
||||
description = lib.mdDoc "Network interface to bind.";
|
||||
description = "Network interface to bind.";
|
||||
};
|
||||
|
||||
username = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = lib.mdDoc "Username for basic authentication.";
|
||||
description = "Username for basic http authentication.";
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
apply = value: if value == null then null else toString value;
|
||||
description = lib.mdDoc ''
|
||||
File containing the password to use for basic authentication.
|
||||
description = ''
|
||||
File containing the password to use for basic http authentication.
|
||||
For insecurely putting the password in the globally readable store use
|
||||
`pkgs.writeText "ttydpw" "MyPassword"`.
|
||||
'';
|
||||
@ -72,19 +79,46 @@ in
|
||||
signal = mkOption {
|
||||
type = types.ints.u8;
|
||||
default = 1;
|
||||
description = lib.mdDoc "Signal to send to the command on session close.";
|
||||
description = "Signal to send to the command on session close.";
|
||||
};
|
||||
|
||||
entrypoint = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ "${pkgs.shadow}/bin/login" ];
|
||||
defaultText = lib.literalExpression ''
|
||||
[ "''${pkgs.shadow}/bin/login" ]
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
[ (lib.getExe pkgs.htop) ]
|
||||
'';
|
||||
description = "Which command ttyd runs.";
|
||||
apply = lib.escapeShellArgs;
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
# `login` needs to be run as root
|
||||
default = "root";
|
||||
description = "Which unix user ttyd should run as.";
|
||||
};
|
||||
|
||||
writeable = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null; # null causes an eval error, forcing the user to consider attack surface
|
||||
example = true;
|
||||
description = "Allow clients to write to the TTY.";
|
||||
};
|
||||
|
||||
clientOptions = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = {};
|
||||
example = literalExpression ''
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
fontSize = "16";
|
||||
fontFamily = "Fira Code";
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
description = ''
|
||||
Attribute set of client options for xtermjs.
|
||||
<https://xtermjs.org/docs/api/terminal/interfaces/iterminaloptions/>
|
||||
'';
|
||||
@ -93,50 +127,50 @@ in
|
||||
terminalType = mkOption {
|
||||
type = types.str;
|
||||
default = "xterm-256color";
|
||||
description = lib.mdDoc "Terminal type to report.";
|
||||
description = "Terminal type to report.";
|
||||
};
|
||||
|
||||
checkOrigin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether to allow a websocket connection from a different origin.";
|
||||
description = "Whether to allow a websocket connection from a different origin.";
|
||||
};
|
||||
|
||||
maxClients = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
description = lib.mdDoc "Maximum clients to support (0, no limit)";
|
||||
description = "Maximum clients to support (0, no limit)";
|
||||
};
|
||||
|
||||
indexFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc "Custom index.html path";
|
||||
description = "Custom index.html path";
|
||||
};
|
||||
|
||||
enableIPv6 = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether or not to enable IPv6 support.";
|
||||
description = "Whether or not to enable IPv6 support.";
|
||||
};
|
||||
|
||||
enableSSL = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether or not to enable SSL (https) support.";
|
||||
description = "Whether or not to enable SSL (https) support.";
|
||||
};
|
||||
|
||||
certFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc "SSL certificate file path.";
|
||||
description = "SSL certificate file path.";
|
||||
};
|
||||
|
||||
keyFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
apply = value: if value == null then null else toString value;
|
||||
description = lib.mdDoc ''
|
||||
description = ''
|
||||
SSL key file path.
|
||||
For insecurely putting the keyFile in the globally readable store use
|
||||
`pkgs.writeText "ttydKeyFile" "SSLKEY"`.
|
||||
@ -146,25 +180,27 @@ in
|
||||
caFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc "SSL CA file path for client certificate verification.";
|
||||
description = "SSL CA file path for client certificate verification.";
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.int;
|
||||
default = 7;
|
||||
description = lib.mdDoc "Set log level.";
|
||||
description = "Set log level.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
assertions =
|
||||
[ { assertion = cfg.enableSSL
|
||||
-> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null;
|
||||
message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specified."; }
|
||||
{ assertion = cfg.writeable != null;
|
||||
message = "services.ttyd.writeable must be set"; }
|
||||
{ assertion = ! (cfg.interface != null && cfg.socket != null);
|
||||
message = "Cannot set both interface and socket for ttyd."; }
|
||||
{ assertion = (cfg.username != null) == (cfg.passwordFile != null);
|
||||
@ -177,21 +213,19 @@ in
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
# Runs login which needs to be run as root
|
||||
# login: Cannot possibly work without effective root
|
||||
User = "root";
|
||||
User = cfg.user;
|
||||
LoadCredential = lib.optionalString (cfg.passwordFile != null) "TTYD_PASSWORD_FILE:${cfg.passwordFile}";
|
||||
};
|
||||
|
||||
script = if cfg.passwordFile != null then ''
|
||||
PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/TTYD_PASSWORD_FILE")
|
||||
${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \
|
||||
--credential ${escapeShellArg cfg.username}:"$PASSWORD" \
|
||||
${pkgs.shadow}/bin/login
|
||||
--credential ${lib.escapeShellArg cfg.username}:"$PASSWORD" \
|
||||
${cfg.entrypoint}
|
||||
''
|
||||
else ''
|
||||
${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \
|
||||
${pkgs.shadow}/bin/login
|
||||
${cfg.entrypoint}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@ -2,18 +2,28 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
name = "ttyd";
|
||||
meta.maintainers = with lib.maintainers; [ stunkymonkey ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
nodes.readonly = { pkgs, ... }: {
|
||||
services.ttyd = {
|
||||
enable = true;
|
||||
entrypoint = [ (lib.getExe pkgs.htop) ];
|
||||
writeable = false;
|
||||
};
|
||||
};
|
||||
|
||||
nodes.writeable = { pkgs, ... }: {
|
||||
services.ttyd = {
|
||||
enable = true;
|
||||
username = "foo";
|
||||
passwordFile = pkgs.writeText "password" "bar";
|
||||
writeable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("ttyd.service")
|
||||
machine.wait_for_open_port(7681)
|
||||
response = machine.succeed("curl -vvv -u foo:bar -s -H 'Host: ttyd' http://127.0.0.1:7681/")
|
||||
assert '<title>ttyd - Terminal</title>' in response, "Page didn't load successfully"
|
||||
for machine in [readonly, writeable]:
|
||||
machine.wait_for_unit("ttyd.service")
|
||||
machine.wait_for_open_port(7681)
|
||||
response = machine.succeed("curl -vvv -u foo:bar -s -H 'Host: ttyd' http://127.0.0.1:7681/")
|
||||
assert '<title>ttyd - Terminal</title>' in response, "Page didn't load successfully"
|
||||
'';
|
||||
})
|
||||
|
||||
@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
aarch64-linux = "sha256-6nXemaGiQjp2stjjKItPJ62VcH5Q5pRf63qKtl2haXI=";
|
||||
x86_64-darwin = "sha256-jSMAw+AMD63vqPckZjblw4EDngA4E8h0WlsZu3hUShY=";
|
||||
aarch64-darwin = "sha256-zujXURpIcw7IOw63AW167h6cywYXydhHZMzA2apGZAs=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@ -5,7 +5,7 @@ let
|
||||
arch =
|
||||
if stdenv.isLinux then "linux"
|
||||
else if stdenv.isDarwin then "darwin"
|
||||
else throw "Unsupported platform";
|
||||
else throw "Unsupported system: ${stdenv.system}";
|
||||
analysisDir = "server/analysis_binaries/${arch}";
|
||||
in
|
||||
vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||
|
||||
@ -206,8 +206,8 @@
|
||||
"flycast": {
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "7029e1615a215bc43e51f8eac605f31dd01ba8cd",
|
||||
"hash": "sha256-JUXKlUNIg+1vvOfUQpysxUMYIRJqIzj9UNIwb+8HRPo=",
|
||||
"rev": "44fa364f36c43bed19b055096600f075c656f78c",
|
||||
"hash": "sha256-UfASq8OXtsfubMUfke7P6HTygM/9fP421IoLQeJvPgY=",
|
||||
"fetchSubmodules": true,
|
||||
"date": "unstable-2024-02-09"
|
||||
},
|
||||
@ -249,9 +249,9 @@
|
||||
"gpsp": {
|
||||
"owner": "libretro",
|
||||
"repo": "gpsp",
|
||||
"rev": "85a2ac6c911ffcc77cf1bab418c78fe5218c0b1a",
|
||||
"hash": "sha256-iHfdsI6E2LQTC9HjqVRBHihVUpagtB8326M8Crll2iY=",
|
||||
"date": "unstable-2024-02-04"
|
||||
"rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72",
|
||||
"hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=",
|
||||
"date": "unstable-2024-02-10"
|
||||
},
|
||||
"gw": {
|
||||
"owner": "libretro",
|
||||
@ -277,9 +277,9 @@
|
||||
"mame": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "f55fe47b0997d24048700898195cb66bc0bccfb6",
|
||||
"hash": "sha256-JUL4ha7UL+hNG5oi178nLT1aUuxqfev0/bRU6y/Mg7A=",
|
||||
"date": "unstable-2024-02-05"
|
||||
"rev": "8ebaec4073703f5050dac3f6c8da408943e15938",
|
||||
"hash": "sha256-CFCem9MiaHW2flEZyJkcC9JEGzx7Ox/uqrTY3jue+Pk=",
|
||||
"date": "unstable-2024-02-13"
|
||||
},
|
||||
"mame2000": {
|
||||
"owner": "libretro",
|
||||
@ -298,9 +298,9 @@
|
||||
"mame2003-plus": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "debcb547ea7ae197433142810e99e1313c58cb14",
|
||||
"hash": "sha256-l9YmDiUJ+CQP4i8O8W+E9uTLPZZgLqLR9v7e5hFgJhE=",
|
||||
"date": "unstable-2024-02-09"
|
||||
"rev": "a4d62997d332acc709c9644641863c5498e01eb0",
|
||||
"hash": "sha256-9+pxx/fhNsvAMYDqalkkdljaR8/XxuMMSrrz7KeJtDU=",
|
||||
"date": "unstable-2024-02-13"
|
||||
},
|
||||
"mame2010": {
|
||||
"owner": "libretro",
|
||||
@ -361,10 +361,10 @@
|
||||
"mrboom": {
|
||||
"owner": "Javanaise",
|
||||
"repo": "mrboom-libretro",
|
||||
"rev": "865be65118ef70e9a486f872948f4fc805edf643",
|
||||
"hash": "sha256-jdOthryC1QvVvuPZUh/YyZhJeFWk1XhBuCm4hmAy8+Q=",
|
||||
"rev": "f688664f024723e00c0d2926e51b45754a25e2da",
|
||||
"hash": "sha256-t6ArMkyGvHJ9hLc+FFoH2wTk0wRFn5etzdLipTQnGyc=",
|
||||
"fetchSubmodules": true,
|
||||
"date": "unstable-2024-02-05"
|
||||
"date": "unstable-2024-02-09"
|
||||
},
|
||||
"mupen64plus": {
|
||||
"owner": "libretro",
|
||||
@ -383,9 +383,9 @@
|
||||
"nestopia": {
|
||||
"owner": "libretro",
|
||||
"repo": "nestopia",
|
||||
"rev": "8050c38e5a1db6927b03510651809e8ef932b888",
|
||||
"rev": "407df997b65cddbff9b25abae0510e6645205677",
|
||||
"hash": "sha256-Vlz69ZpXwawdE+bfjlKNrQNmFHhB53FOKhfMgq4viE0=",
|
||||
"date": "unstable-2024-02-03"
|
||||
"date": "unstable-2024-02-13"
|
||||
},
|
||||
"np2kai": {
|
||||
"owner": "AZO234",
|
||||
@ -456,10 +456,10 @@
|
||||
"ppsspp": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "25689c36d9c2f3f1b7aa612d89b86caf1809e376",
|
||||
"hash": "sha256-hXknMyBNo1vJ49gJsuNef+sccolAovg1I8Wzuw/BnE8=",
|
||||
"rev": "d832f96010fa378ef0a7f7980524a61803110ad7",
|
||||
"hash": "sha256-LkngiwjRoYw+N+DCdbbWnTokDAYXbqOMJX+DQGAUl2g=",
|
||||
"fetchSubmodules": true,
|
||||
"date": "unstable-2024-02-09"
|
||||
"date": "unstable-2024-02-13"
|
||||
},
|
||||
"prboom": {
|
||||
"owner": "libretro",
|
||||
@ -605,9 +605,9 @@
|
||||
"vecx": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-vecx",
|
||||
"rev": "a401c268e425dc8ae6a301e7fdb9a9e96f39b8ea",
|
||||
"hash": "sha256-24/bcQ5mgLl7zKvpnnSYr5SoLG02al6dP27KoOtnua4=",
|
||||
"date": "unstable-2023-06-01"
|
||||
"rev": "56a99fa08a7601b304d752188ca573febf26faeb",
|
||||
"hash": "sha256-9/d6qzsUJZYZewAbFI4LU2FVpv09uby/5mxCZU7rVzo=",
|
||||
"date": "unstable-2024-02-10"
|
||||
},
|
||||
"virtualjaguar": {
|
||||
"owner": "libretro",
|
||||
|
||||
@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
|
||||
description = "An efficient dynamic menu for wayland (wlroots)";
|
||||
homepage = "https://github.com/nyyManni/dmenu-wayland";
|
||||
maintainers = with maintainers; [ rewine ];
|
||||
mainProgram = "dmenu-wl";
|
||||
};
|
||||
}
|
||||
|
||||
@ -93,11 +93,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.62.156";
|
||||
version = "1.62.162";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-U+MjXuF3rv5N4juKeIzUfnSNVLx1LGn+Ws+b5p252Qk=";
|
||||
hash = "sha256-hQG6LHYPhqzfgR0Z7R+hXB1vEVDd6VEyIttSae15Mpo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -80,7 +80,7 @@ let
|
||||
outputHash = {
|
||||
x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q=";
|
||||
aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
||||
@ -38,13 +38,13 @@
|
||||
|
||||
let
|
||||
pname = "pcloud";
|
||||
version = "1.14.3";
|
||||
code = "XZ7IM70ZtWFon9pgEbk4XuvzJsTduQUyGFwV";
|
||||
version = "1.14.4";
|
||||
code = "XZDh750ZBgJa45xqQ8H1ztdMFX2wVhOCTOFk";
|
||||
|
||||
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
|
||||
src = fetchzip {
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
|
||||
hash = "sha256-huv1XXghWwh/oTtOsukffZP3nnHS2K5VcsuVs6CjFYc=";
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
|
||||
hash = "sha256-1KF3tF62lkT6tfeP/dMaZITXp4Vyegp3lFYdLJ49OR8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "protonvpn-gui";
|
||||
version = "4.1.0-unstable-2023-10-25";
|
||||
version = "4.1.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "proton-vpn-gtk-app";
|
||||
rev = "713324e9e4ee9f030c8115072cae379eb3340c42";
|
||||
hash = "sha256-DfuM4b2cSIA8j9Ux3TzInRCvzQGb9LvJDSwRhfadBPY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-D06dMMjzFE7gIGFpIH/+0xmVCckqAWLkb3lc2ZmxNZs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -71,7 +71,7 @@ buildPythonApplication rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=proton --cov-report=html --cov-report=term" ""
|
||||
--replace-fail "--cov=proton --cov-report=html --cov-report=term" ""
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitsign";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-COgoj5MrX7VBwjgfH+Ud7gp0gE7gpsYoyd0Jv4uXoec=";
|
||||
hash = "sha256-+oJBpERU2WbfmS7MyBbJKrh4kzY+rgSw4uKAU1y5kR4=";
|
||||
};
|
||||
vendorHash = "sha256-btvFro0K0+9potwForIj/7h41l+LbUE0Gym9aHaWtEE=";
|
||||
vendorHash = "sha256-Z46eDqUc8Mdq9lEMx1YOuSh5zPIMQrSkbto33AmgANU=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, libdrm
|
||||
, libev
|
||||
, libGL
|
||||
, libepoxy
|
||||
, libX11
|
||||
, libxcb
|
||||
, libxdg_basedir
|
||||
@ -32,13 +33,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "picom";
|
||||
version = "11.1";
|
||||
version = "11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-vdR3HzBZxtth3zJD3vMSlrnBTbopidw7FGKOk69S0R0=";
|
||||
hash = "sha256-7ohtI890CutwprPEY5njqWou0fD6T9eu51EBSQ2/lWs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libdrm
|
||||
libev
|
||||
libGL
|
||||
libepoxy
|
||||
libX11
|
||||
libxcb
|
||||
libxdg_basedir
|
||||
|
||||
126
pkgs/by-name/af/afterglow-cursors-recolored/package.nix
Normal file
126
pkgs/by-name/af/afterglow-cursors-recolored/package.nix
Normal file
@ -0,0 +1,126 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, themeVariants ? []
|
||||
, catppuccinColorVariants ? []
|
||||
, draculaColorVariants ? []
|
||||
, gruvboxColorVariants ? []
|
||||
, originalColorVariants ? []
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "afterglow-cursors-recolored";
|
||||
|
||||
availableThemeVariants = [
|
||||
"Catppuccin"
|
||||
"Dracula"
|
||||
"Gruvbox"
|
||||
"Original"
|
||||
];
|
||||
|
||||
availableColorVariants = {
|
||||
Catppuccin = [
|
||||
"Blue"
|
||||
"Flamingo"
|
||||
"Green"
|
||||
"Macchiato"
|
||||
"Maroon"
|
||||
"Mauve"
|
||||
"Peach"
|
||||
"Pink"
|
||||
"Red"
|
||||
"Rosewater"
|
||||
"Sapphire"
|
||||
"Sky"
|
||||
"Teal"
|
||||
"Yellow"
|
||||
];
|
||||
Dracula = [
|
||||
"Cyan"
|
||||
"Green"
|
||||
"Orange"
|
||||
"Pink"
|
||||
"Purple"
|
||||
"Red"
|
||||
"Teddy"
|
||||
"Yellow"
|
||||
];
|
||||
Gruvbox = [
|
||||
"Aqua"
|
||||
"Black"
|
||||
"Blue"
|
||||
"Gray"
|
||||
"Green"
|
||||
"Mojas84"
|
||||
"Orange"
|
||||
"Purple"
|
||||
"White"
|
||||
];
|
||||
Original = [
|
||||
"Blue"
|
||||
"Purple"
|
||||
"joris"
|
||||
"joris2"
|
||||
"joris3"
|
||||
"joris4"
|
||||
];
|
||||
};
|
||||
in
|
||||
|
||||
lib.checkListOfEnum "${pname}: theme variants" availableThemeVariants themeVariants
|
||||
lib.checkListOfEnum "${pname}: catppuccin color variants" availableColorVariants.Catppuccin catppuccinColorVariants
|
||||
lib.checkListOfEnum "${pname}: dracula color variants" availableColorVariants.Dracula draculaColorVariants
|
||||
lib.checkListOfEnum "${pname}: gruvbox color variants" availableColorVariants.Gruvbox gruvboxColorVariants
|
||||
lib.checkListOfEnum "${pname}: original color variants" availableColorVariants.Original originalColorVariants
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname;
|
||||
version = "0-unstable-2023-10-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TeddyBearKilla";
|
||||
repo = "Afterglow-Cursors-Recolored";
|
||||
rev = "940a5d30e52f8c827fa249d2bbcc4af889534888";
|
||||
hash = "sha256-GR+d+jrbeIGpqal5krx83PxuQto2PQTO3unQ+jaJf6s=";
|
||||
};
|
||||
|
||||
installPhase = let
|
||||
dist = {
|
||||
Catppuccin = "cat";
|
||||
Dracula = "dracula";
|
||||
Gruvbox = "gruvbox";
|
||||
};
|
||||
withAlternate = xs: xs': if xs != [ ] then xs else xs';
|
||||
themeVariants' = withAlternate themeVariants availableThemeVariants;
|
||||
colorVariants = {
|
||||
Catppuccin = withAlternate catppuccinColorVariants availableColorVariants.Catppuccin;
|
||||
Dracula = withAlternate draculaColorVariants availableColorVariants.Dracula;
|
||||
Gruvbox = withAlternate gruvboxColorVariants availableColorVariants.Gruvbox;
|
||||
Original = withAlternate originalColorVariants availableColorVariants.Original;
|
||||
};
|
||||
in ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/icons
|
||||
|
||||
${
|
||||
lib.concatMapStringsSep "\n" (theme:
|
||||
lib.concatMapStringsSep "\n" (color: ''
|
||||
ln -s \
|
||||
"$src/colors/${theme}/${color}/dist-${lib.optionalString (theme != "Original") (dist.${theme} + "-")}${lib.toLower color}" \
|
||||
"$out/share/icons/Afterglow-Recolored-${theme}-${color}"
|
||||
'') colorVariants.${theme}
|
||||
) themeVariants'
|
||||
}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A recoloring of the Afterglow Cursors x-cursor theme";
|
||||
homepage = "https://github.com/TeddyBearKilla/Afterglow-Cursors-Recolored";
|
||||
maintainers = with maintainers; [ d3vil0p3r ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
47
pkgs/by-name/ds/dsda-launcher/package.nix
Normal file
47
pkgs/by-name/ds/dsda-launcher/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, qt6
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dsda-launcher";
|
||||
version = "1.3.1-hotfix";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pedro-Beirao";
|
||||
repo = "dsda-launcher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V6VLUl148L47LjKnPe5MZCuhZSMtI0wd18i8b+7jCvk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qt6.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qt6.qtbase qt6.qtwayland ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
mkdir -p "./dsda-launcher/build"
|
||||
cd "./dsda-launcher/build"
|
||||
qmake6 ..
|
||||
make
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp ./dsda-launcher $out/bin
|
||||
|
||||
install -Dm444 ../icons/dsda-Launcher.desktop $out/share/applications/dsda-Launcher.desktop
|
||||
install -Dm444 ../icons/dsda-launcher.png $out/share/pixmaps/dsda-launcher.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Pedro-Beirao/dsda-launcher";
|
||||
description = "This is a launcher GUI for the dsda-doom source port";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.Gliczy ];
|
||||
};
|
||||
}
|
||||
16
pkgs/by-name/fr/freefilesync/curl-8.6.0.patch
Normal file
16
pkgs/by-name/fr/freefilesync/curl-8.6.0.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/libcurl/curl_wrap.cpp b/libcurl/curl_wrap.cpp
|
||||
index 11ac9dd..93edd44 100644
|
||||
--- a/libcurl/curl_wrap.cpp
|
||||
+++ b/libcurl/curl_wrap.cpp
|
||||
@@ -401,9 +401,10 @@ std::wstring zen::formatCurlStatusCode(CURLcode sc)
|
||||
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY);
|
||||
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT);
|
||||
ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL);
|
||||
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE);
|
||||
ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
|
||||
}
|
||||
- static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1);
|
||||
+ static_assert(CURL_LAST == CURLE_TOO_LARGE + 1);
|
||||
|
||||
return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
|
||||
}
|
||||
@ -72,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patch = "ffs_no_check_updates.patch";
|
||||
hash = "sha256-lPyHpxhZz8BSnDI8QfAzKpKwVkp2jiF49RWjKNuZGII=";
|
||||
})
|
||||
# Fix build with curl 8.6.0
|
||||
./curl-8.6.0.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
, munge
|
||||
, voms
|
||||
, perl
|
||||
, scitoken-cpp
|
||||
, scitokens-cpp
|
||||
, openssl
|
||||
}:
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
munge
|
||||
voms
|
||||
perl
|
||||
scitoken-cpp
|
||||
scitokens-cpp
|
||||
];
|
||||
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
i686-linux = "sha256-/Q7VZahYhLdKVFB25CanROYxD2etQOcRg+4bXZUMqTc=";
|
||||
x86_64-darwin = "sha256-9biFAbFD7Bva7KPKztgCvcaoX8E6AlJBKkjlDQdP6Zw=";
|
||||
aarch64-darwin = "sha256-to5Y0R9tm9b7jUQAK3eBylLhpu+w5oDd63FbBCBAvd8=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
inherit buildUnstable;
|
||||
}).overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.14.0+20240130git6e173a1bb";
|
||||
version = "1.14.0+20240212git8eb88bb9c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-D4DjZYsvtlJXgoAHkYb7qPqbNfpidXHmEozEj6nPPqA=";
|
||||
hash = "sha256-WwsIiyKF6hskv6NSTPiyY80nE3q97xzH359wFmN0OkU=";
|
||||
};
|
||||
})
|
||||
|
||||
102
pkgs/by-name/re/restinio/package.nix
Normal file
102
pkgs/by-name/re/restinio/package.nix
Normal file
@ -0,0 +1,102 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
asio,
|
||||
boost,
|
||||
expected-lite,
|
||||
fmt,
|
||||
llhttp,
|
||||
openssl,
|
||||
pcre2,
|
||||
zlib,
|
||||
catch2_3,
|
||||
# Build with the asio library bundled in boost instead of the standalone asio package.
|
||||
with_boost_asio ? false,
|
||||
}:
|
||||
|
||||
assert with_boost_asio -> boost != null;
|
||||
assert !with_boost_asio -> asio != null;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "restinio";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stiffstream";
|
||||
repo = "restinio";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
hash = "sha256-XodG+dVW4iBgFx0Aq0+/pZyCLyqTBtW7e9r69y176Ro=";
|
||||
};
|
||||
|
||||
patches = let
|
||||
useCommit = {id, name, hash}:
|
||||
fetchpatch {
|
||||
inherit name hash;
|
||||
url = "https://github.com/Stiffstream/restinio/commit/${id}.patch";
|
||||
};
|
||||
in [
|
||||
(useCommit {
|
||||
id = "57e6ae3f73a03a5120feb80a7bb5dca27179fa38";
|
||||
name = "restinio-unvendor-catch2_part1.patch";
|
||||
hash = "sha256-2Htt9WTP6nrh+1y7y2xleFj568IpnSEn9Qhb1ObLam8=";
|
||||
})
|
||||
(useCommit {
|
||||
id = "0060e493b99f03c38dda519763f6d6701bc18112";
|
||||
name = "restinio-unvendor-catch2_part2.patch";
|
||||
hash = "sha256-Eg/VNxPwNtEYmalP5myn+QvqwU6wln9v0vxbRelRHA8=";
|
||||
})
|
||||
(useCommit {
|
||||
id = "05bea25f82917602a49b72b8ea10eeb43984762f";
|
||||
name = "restinio-unvendor-catch2_part3.patch";
|
||||
hash = "sha256-fA+U/Y7FyrxDRiWSVXCy9dMF4gmfDLag7gBWoY74In0=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
expected-lite
|
||||
fmt
|
||||
llhttp
|
||||
openssl
|
||||
pcre2
|
||||
zlib
|
||||
] ++ (if with_boost_asio then [
|
||||
boost
|
||||
] else [
|
||||
asio
|
||||
]);
|
||||
|
||||
checkInputs = [
|
||||
catch2_3
|
||||
];
|
||||
|
||||
cmakeDir = "../dev";
|
||||
cmakeFlags = [
|
||||
"-DRESTINIO_TEST=ON"
|
||||
"-DRESTINIO_SAMPLE=OFF"
|
||||
"-DRESTINIO_BENCHMARK=OFF"
|
||||
"-DRESTINIO_WITH_SOBJECTIZER=OFF"
|
||||
"-DRESTINIO_ASIO_SOURCE=${if with_boost_asio then "boost" else "standalone"}"
|
||||
"-DRESTINIO_DEP_EXPECTED_LITE=find"
|
||||
"-DRESTINIO_DEP_FMT=find"
|
||||
"-DRESTINIO_DEP_LLHTTP=find"
|
||||
"-DRESTINIO_DEP_CATCH2=find"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
enableParallelChecking = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP(S)/WebSocket server C++ library";
|
||||
homepage = "https://github.com/Stiffstream/restinio";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ tobim ];
|
||||
};
|
||||
})
|
||||
@ -16,16 +16,16 @@
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
pname = "satty";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabm";
|
||||
repo = "Satty";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KCHKR6DP8scd9xdWi0bLw3wObrEi0tOsflXHa9f4Z5k=";
|
||||
hash = "sha256-640npBvOO4SZfQI5Tq1FY+B7Bg75YsaoGd/XhWAy9Zs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pUBtUC+WOuiypLUpXCPR1pu0fRrMVTxg7FE2JSaszNw=";
|
||||
cargoHash = "sha256-H+PnZWNaxdNaPLZmKJIcnEBTnpeXCxGC9cXnzR2hfoc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuuid, curl, sqlite, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scitoken-cpp";
|
||||
pname = "scitokens-cpp";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -30,13 +30,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "45.0";
|
||||
version = "45.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "M+dwFmImp0U31MELFTjvqIQklP/pvyyQoWyrmKuZe98=";
|
||||
sha256 = "lZWc24AkRASNUKGpHELbiyUWWgpoUzvAOJXrNyxN3gs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -68,11 +68,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-control-center";
|
||||
version = "45.2";
|
||||
version = "45.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-DPo8My1u2stz0GxrJv/KEHjob/WerIGbKTHglndT33A=";
|
||||
sha256 = "sha256-selJxOhsBiTsam7Q3wnJ+uKyKYPB3KYO2GrsjvCyQAQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -39,11 +39,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "45.0";
|
||||
version = "45.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sa/nZHmPiUi+25XHqzG9eFKaxctIHEH3p3d/Jk3lS9g=";
|
||||
sha256 = "Nj4JqjMI5/QHTgZiU6AYKzIqtgN2dD3heLu0AOVLqO4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -67,13 +67,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell";
|
||||
version = "45.3";
|
||||
version = "45.4";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "OhlyRyDYJ03GvO1o4N1fx2aKBM15l4y7uCI0dMzdqas=";
|
||||
sha256 = "W/6jeeEgscfyN/PsNprSfvXC9ZMMffFjs5J4LYWCCQ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -67,13 +67,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "45.3";
|
||||
version = "45.4";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "t4rqfz4r7IMioq8EBHFr4iaZBcfVDASwsqcaOIFPzQE=";
|
||||
sha256 = "kRQIN74VWC8sdTvmYauOQtrVXUobDwZQvQssk/Ar16s=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -20,12 +20,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-tweaks";
|
||||
version = "45.0";
|
||||
version = "45.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "JTmUZYroYXlNDG4OD0dd/hyvJ342dLh5J5AjjzTP1u4=";
|
||||
sha256 = "lf+n842bHf1eTOvvt1JBn+ohzUBwITla3J8RKFRBbU8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.updateScript = gnome.updateScript {
|
||||
packageName = "libdex";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -14,20 +14,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mongoc";
|
||||
version = "1.24.4";
|
||||
version = "1.25.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-c-driver";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cOPZ4o9q/cOBtGXFv6mOenTSyU/L2U6DZB4UmMnhtes=";
|
||||
hash = "sha256-4Bz6sftXSZDDV8PlTQG8ndOwwp+QHXtzacJ1BXfJAkQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/libbson/CMakeLists.txt src/libmongoc/CMakeLists.txt \
|
||||
--replace "\\\''${prefix}/" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@ -48,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_VERSION=${version}"
|
||||
"-DENABLE_UNINSTALL=OFF"
|
||||
"-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
# remove forbidden reference to $TMPDIR
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, mongoc
|
||||
, openssl
|
||||
, cyrus_sasl
|
||||
, cmake
|
||||
, validatePkgConfig
|
||||
, testers
|
||||
@ -31,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
mongoc
|
||||
openssl
|
||||
cyrus_sasl
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "restinio";
|
||||
version = "0.6.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-fyHuvrlm4XDWq1TpsZiskn1DkJASFzngN8D6O7NnskA=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/include
|
||||
mv restinio-*/dev/restinio $out/include
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library";
|
||||
homepage = "https://github.com/Stiffstream/restinio";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -221,13 +221,13 @@
|
||||
aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb";
|
||||
x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz";
|
||||
aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
hash = {
|
||||
x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52";
|
||||
aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a";
|
||||
x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d";
|
||||
aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@ -2,15 +2,20 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocamlfuse";
|
||||
version = "2.7.1_cvs8";
|
||||
version = "2.7.1_cvs9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astrada";
|
||||
repo = "ocamlfuse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cm9mdYzpKnYoNyAJvjJkiDBP/O4n1JiTkhXQO3w7+hA=";
|
||||
hash = "sha256-cOObHUAYiI2mN1qjsxcK6kHAmawuaGQOUNHqWioIvjM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/Fuse_main.c \
|
||||
--replace-warn "<fuse_lowlevel.h>" "<fuse/fuse_lowlevel.h>"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ camlidl ];
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ camlidl fuse ];
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, pydantic_1
|
||||
, pydantic
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -31,11 +32,16 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pydantic"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pydantic_1
|
||||
pydantic
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -27,18 +27,22 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certbot";
|
||||
version = "2.7.4";
|
||||
format = "setuptools";
|
||||
version = "2.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
owner = "certbot";
|
||||
repo = "certbot";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BZ7JqAciwbmkpbzR/qZHAraLJWWXNRN3Er4XvfU5kYs=";
|
||||
hash = "sha256-yYB9Y0wniRgzNk5XatkjKayIPj7ienXsqOboKPwzIfk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
configargparse
|
||||
acme
|
||||
@ -48,12 +52,7 @@ buildPythonPackage rec {
|
||||
josepy
|
||||
parsedatetime
|
||||
pyrfc3339
|
||||
pyopenssl
|
||||
pytz
|
||||
requests
|
||||
six
|
||||
zope-component
|
||||
zope-interface
|
||||
setuptools # for pkg_resources
|
||||
];
|
||||
|
||||
@ -67,13 +66,8 @@ buildPythonPackage rec {
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-o cache_dir=$(mktemp -d)"
|
||||
# See https://github.com/certbot/certbot/issues/8746
|
||||
"-W ignore::ResourceWarning"
|
||||
"-W ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${dialog}/bin" ];
|
||||
|
||||
# certbot.withPlugins has a similar calling convention as python*.withPackages
|
||||
@ -92,9 +86,11 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = src.meta.homepage;
|
||||
homepage = "https://github.com/certbot/certbot";
|
||||
changelog = "https://github.com/certbot/certbot/blob/${src.rev}/certbot/CHANGELOG.md";
|
||||
description = "ACME client that can obtain certs and extensibly update server configurations";
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "certbot";
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
license = with licenses; [ asl20 ];
|
||||
};
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.18.1";
|
||||
version = "2.18.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dTD9HO26elFdfNMJxlyK1jKf4xWcz98/XrKI3EpUSsc=";
|
||||
hash = "sha256-F8eNXUUEsTG/Qas9+UzmAtJaHrLxst9kQZV2C3LmTD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio-pdf";
|
||||
version = "0.0.4";
|
||||
version = "0.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "gradio_pdf";
|
||||
inherit version;
|
||||
hash = "sha256-lyZd8tH3SaTmE/7ooNaQJUYZRvjSOLx3+doWTCTXk9U=";
|
||||
hash = "sha256-yHISYpkZ5YgUBxCfu2rw3R+g9t4h1WogXXCuBiV92Vk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
||||
name = "x86_64";
|
||||
hash = "sha256-/+gegUMd2n7MpJvdilS5VWefXc0tuRcLrXBBXSH35b0=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported system");
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
in fetchPypi {
|
||||
pname = "home_assistant_chip_core";
|
||||
inherit version format;
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "16.0.4";
|
||||
version = "16.1.0";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-1Bg1R8c5VtJsd8NHd+WWdJRA39Jjgv9JUMcijZm942o=";
|
||||
hash = "sha256-rKy1bPgQOqx+F5cpFg+KG0r70B0RWns03gwoiVbz35U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-api-core";
|
||||
version = "0.20.1-unstable-2023-10-10";
|
||||
version = "0.20.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-api-core";
|
||||
rev = "9c03fc30d3ff08559cab3644eadde027b029375d";
|
||||
hash = "sha256-vnz1+NazQceAs9KA3Jq0tsJditRoG/LoBR+0wuDzzHk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-acck0Nc/15soTJBC/4y83ID9fjF/q4vrYr6SsLAAVRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,7 +38,7 @@ buildPythonPackage {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=proton/vpn/core/ --cov-report html --cov-report term" ""
|
||||
--replace-fail "--cov=proton/vpn/core/ --cov-report html --cov-report term" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "proton.vpn.core" ];
|
||||
@ -52,11 +52,6 @@ buildPythonPackage {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Has a single test failing with Permission denied: '/run'
|
||||
"tests/test_session.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Acts as a facade to the other Proton VPN components, exposing a uniform API to the available Proton VPN services";
|
||||
homepage = "https://github.com/ProtonVPN/python-proton-vpn-api-core";
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-connection";
|
||||
version = "0.11.0-unstable-2023-09-05";
|
||||
version = "0.11.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-connection";
|
||||
rev = "747ccacb5350ad59f2a09953b8d20c5c161aab54";
|
||||
hash = "sha256-WyMG0kmwBKoWc0mHnaop9E0upPAYHFwS/A9I1//WwlY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RuLnc/olI8S09WFG126N2xZgW4gf+DDpRstcelqMhs4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,7 +34,7 @@ buildPythonPackage {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=proton.vpn.connection --cov-report html --cov-report term" ""
|
||||
--replace-fail "--cov=proton.vpn.connection --cov-report html --cov-report term" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "proton.vpn.connection" ];
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-logger";
|
||||
version = "0.2.1-unstable-2023-05-10";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-logger";
|
||||
rev = "0acbc1ab41a65cbc9ceb340e3db011e6f89eb65a";
|
||||
hash = "sha256-VIggBKopAAKiNdQ5ypG1qI74E2WMDwDSriSuka/DBKA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,7 +28,7 @@ buildPythonPackage {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=proton/vpn/logging/ --cov-report html --cov-report term" ""
|
||||
--replace-fail "--cov=proton/vpn/logging/ --cov-report html --cov-report term" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "proton.vpn.logging" ];
|
||||
|
||||
@ -8,19 +8,20 @@
|
||||
, proton-vpn-connection
|
||||
, pycairo
|
||||
, pygobject3
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-network-manager";
|
||||
version = "0.3.0-unstable-2023-09-05";
|
||||
version = "0.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-network-manager";
|
||||
rev = "6ffd04fa0ae88a89d2b733443317066ef23b3ccd";
|
||||
hash = "sha256-Bqlwo7U/mwodQarl30n3/BNETqit1MVQUJT+mAhC6AI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UEXoIFLB3/q3G3ASrgsXxF21iT5rCWm4knGezcmxmnk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -40,12 +41,13 @@ buildPythonPackage {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=proton/vpn/backend/linux/networkmanager --cov-report html --cov-report term" ""
|
||||
--replace-fail "--cov=proton/vpn/backend/linux/networkmanager --cov-report html --cov-report term" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-session";
|
||||
version = "0.6.2-unstable-2023-10-24";
|
||||
version = "0.6.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "python-proton-vpn-session";
|
||||
rev = "419b25bd1823f78d1219dc4cc441eeaf37646068";
|
||||
hash = "sha256-YPyNxbKxw+670bNQZ7U5nljyUjsNJ+k7eL+HpGiSCLk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1oyCxBO9YqMopbw88UJF8k4BJFP4+m23NwSrqTYqcg8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -40,7 +40,7 @@ buildPythonPackage {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=proton.vpn.session --cov-report term" ""
|
||||
--replace-fail "--cov=proton.vpn.session --cov-report term" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "proton.vpn.session" ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, pydantic_1
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pydantic_1
|
||||
pydantic
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -54,5 +54,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/Skyscanner/pycfmodel/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
broken = versionAtLeast pydantic.version "2";
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,7 +45,6 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
black
|
||||
ruff
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, httpx
|
||||
, iso8601
|
||||
, poetry-core
|
||||
, pydantic_1
|
||||
, pydantic
|
||||
, pyjwt
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
@ -47,6 +47,7 @@ buildPythonPackage rec {
|
||||
"attrs"
|
||||
"httpx"
|
||||
"iso8601"
|
||||
"pydantic"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -58,7 +59,7 @@ buildPythonPackage rec {
|
||||
attrs
|
||||
httpx
|
||||
iso8601
|
||||
pydantic_1
|
||||
pydantic
|
||||
pyjwt
|
||||
python-dateutil
|
||||
retrying
|
||||
|
||||
@ -9,18 +9,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-book-theme";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version format;
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
pname = "sphinx_book_theme";
|
||||
hash = "sha256-CIvGnWX6uERq24aR7WFof3G/dQTJdAr2i8eM+TaiYRI=";
|
||||
hash = "sha256-zk3xqqs4WjqWM/p5coGTfqEgpRcJaLbrgXsR8+CKvAc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pint
|
||||
, pydantic_1 # use pydantic 2 on next release
|
||||
, pydantic
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, requests
|
||||
@ -26,11 +26,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-U+QlSrijvT77/m+yjhFxbcVTQe51J+PR4Kc8N+qG+wI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove on next release
|
||||
sed -i 's/pydantic==1.10.9/pydantic/' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@ -39,7 +34,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
arrow
|
||||
pint
|
||||
pydantic_1
|
||||
pydantic
|
||||
pytz
|
||||
requests
|
||||
responses
|
||||
@ -58,5 +53,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
broken = lib.versionAtLeast pydantic.version "2";
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||
pname = "StaticSitesClient-${versionFlavor}";
|
||||
version = flavor.buildId;
|
||||
|
||||
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform");
|
||||
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.32.6";
|
||||
version = "0.32.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+1nmxjR1iVtQXjdsqXaYTh8kLGq9gqSDjt1drvR9KoY=";
|
||||
hash = "sha256-gH0wJRf64XloBfnvtNdZlONESjxG5mS5Ok9HTX1PJUA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8taGEDJ+Qtw/4eOWYiWZmEbmCwqcFXYh3x/9wR3oBJ8=";
|
||||
vendorHash = "sha256-YvzUdcCjkCApufLk5CZv6L/mIlOuo9qEBoxHOxv2Ljc=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../. -i bash -p unzip curl jq common-updater-scripts
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p unzip curl jq common-updater-scripts
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../. -i bash -p curl jq common-updater-scripts
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
|
||||
@ -18,11 +18,11 @@ lua = luajitPackages;
|
||||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "knot-resolver";
|
||||
version = "5.7.0";
|
||||
version = "5.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
|
||||
sha256 = "383ef6db1cccabd2dd788ea9385f05e98a2bafdfeb7f0eda57ff9d572f4fad71";
|
||||
sha256 = "da14b415c61d53747a991f12d6209367ef826a13dc6bf4eeaf5d88760294c3a2";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -7,13 +7,13 @@ let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({
|
||||
src = if lib.isAttrs zipHash then
|
||||
fetchurl {
|
||||
name = "${pname}-${version}-${plat}.zip";
|
||||
hash = zipHash.${plat} or (throw "unsupported system");
|
||||
hash = zipHash.${plat} or (throw "Unsupported system: ${plat}");
|
||||
url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download" + {
|
||||
x86_64-linux = "?os=linux&arch=amd64";
|
||||
aarch64-linux = "?os=linux&arch=arm64";
|
||||
x86_64-darwin = "?os=darwin&arch=amd64";
|
||||
aarch64-darwin = "?os=darwin&arch=arm64";
|
||||
}.${plat} or (throw "unknown system");
|
||||
}.${plat} or (throw "Unsupported system: ${plat}");
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2024.01.04";
|
||||
version = "2024.02.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-IsQ+lAmQQGitKRlQUc7PgRKgwlEgYsR5q2XHp9k7tEM=";
|
||||
hash = "sha256-gFSwD/NUp/6cT53GKUQd+pthADOqNI0jT6yQo+/kgRY=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
1653
pkgs/tools/filesystems/stratisd/Cargo.lock
generated
1653
pkgs/tools/filesystems/stratisd/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -27,17 +27,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stratisd";
|
||||
version = "3.6.4";
|
||||
version = "3.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stratis-storage";
|
||||
repo = pname;
|
||||
rev = "refs/tags/stratisd-v${version}";
|
||||
hash = "sha256-0zSMFjAzTtTmpSCqlIq5GXk3/AhlhtECFZXmo6xcjWA=";
|
||||
hash = "sha256-qgf5Q2MAY8PAYlplvTX+YjYfDFLfddpyIG4S/IIYbsU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit pname version src;
|
||||
hash = "sha256-Bu87uHEcMKB+TX8gWHD1vRazOkqJSZKQcsPiaKXrGFE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-Silicon-${version}.dmg";
|
||||
hash = "sha256-Jg+tl902OWSm4GHxF7QXbRU5nxX4/5q6LTGubHWQ08E=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system");
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
buildInputs = [
|
||||
libsecret
|
||||
|
||||
@ -3,7 +3,14 @@
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
pydantic = self.pydantic_1;
|
||||
};
|
||||
};
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "cfripper";
|
||||
version = "1.15.3";
|
||||
pyproject = true;
|
||||
@ -20,11 +27,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
--replace "pluggy~=0.13.1" "pluggy" \
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
boto3
|
||||
cfn-flip
|
||||
click
|
||||
@ -35,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
moto
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
x86_64-linux = "amd64";
|
||||
};
|
||||
|
||||
data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported platform")};
|
||||
data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")};
|
||||
|
||||
baseUrl = "https://apt.enpass.io";
|
||||
|
||||
|
||||
@ -978,6 +978,7 @@ mapAliases ({
|
||||
https://github.com/SchildiChat/schildichat-desktop/issues/215''; # Added 2023-12-05
|
||||
schildichat-desktop = schildichat-web;
|
||||
schildichat-desktop-wayland = schildichat-web;
|
||||
scitoken-cpp = scitokens-cpp; # Added 2024-02-12
|
||||
sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10
|
||||
searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03
|
||||
session-desktop-appimage = session-desktop;
|
||||
|
||||
@ -24658,8 +24658,6 @@ with pkgs;
|
||||
|
||||
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
|
||||
|
||||
restinio = callPackage ../development/libraries/restinio { };
|
||||
|
||||
restish = callPackage ../tools/networking/restish { };
|
||||
|
||||
rhino = callPackage ../development/libraries/java/rhino {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user