Merge staging-next into staging
This commit is contained in:
commit
d96e74c8b8
|
@ -4658,6 +4658,12 @@
|
||||||
github = "ethindp";
|
github = "ethindp";
|
||||||
githubId = 8030501;
|
githubId = 8030501;
|
||||||
};
|
};
|
||||||
|
ethinx = {
|
||||||
|
email = "eth2net@gmail.com";
|
||||||
|
github = "ethinx";
|
||||||
|
githubId = 965612;
|
||||||
|
name = "York Wong";
|
||||||
|
};
|
||||||
Etjean = {
|
Etjean = {
|
||||||
email = "et.jean@outlook.fr";
|
email = "et.jean@outlook.fr";
|
||||||
github = "Etjean";
|
github = "Etjean";
|
||||||
|
|
|
@ -60,7 +60,7 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
rootCredentialsFile = mkOption {
|
rootCredentialsFile = mkOption {
|
||||||
type = types.nullOr types.path;
|
type = types.nullOr types.path;
|
||||||
default = null;
|
default = null;
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
|
@ -96,29 +96,62 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
warnings = optional ((cfg.accessKey != "") || (cfg.secretKey != "")) "services.minio.`accessKey` and services.minio.`secretKey` are deprecated, please use services.minio.`rootCredentialsFile` instead.";
|
warnings = optional ((cfg.accessKey != "") || (cfg.secretKey != "")) "services.minio.`accessKey` and services.minio.`secretKey` are deprecated, please use services.minio.`rootCredentialsFile` instead.";
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd = lib.mkMerge [{
|
||||||
"d '${cfg.configDir}' - minio minio - -"
|
tmpfiles.rules = [
|
||||||
] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir);
|
"d '${cfg.configDir}' - minio minio - -"
|
||||||
|
] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir);
|
||||||
|
|
||||||
systemd.services.minio = {
|
services.minio = {
|
||||||
description = "Minio Object Storage";
|
description = "Minio Object Storage";
|
||||||
after = [ "network-online.target" ];
|
after = [ "network-online.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --console-address ${cfg.consoleAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}";
|
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --console-address ${cfg.consoleAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
User = "minio";
|
User = "minio";
|
||||||
Group = "minio";
|
Group = "minio";
|
||||||
LimitNOFILE = 65536;
|
LimitNOFILE = 65536;
|
||||||
EnvironmentFile = if (cfg.rootCredentialsFile != null) then cfg.rootCredentialsFile
|
EnvironmentFile =
|
||||||
else if ((cfg.accessKey != "") || (cfg.secretKey != "")) then (legacyCredentials cfg)
|
if (cfg.rootCredentialsFile != null) then cfg.rootCredentialsFile
|
||||||
else null;
|
else if ((cfg.accessKey != "") || (cfg.secretKey != "")) then (legacyCredentials cfg)
|
||||||
|
else null;
|
||||||
|
};
|
||||||
|
environment = {
|
||||||
|
MINIO_REGION = "${cfg.region}";
|
||||||
|
MINIO_BROWSER = "${if cfg.browser then "on" else "off"}";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
environment = {
|
}
|
||||||
MINIO_REGION = "${cfg.region}";
|
|
||||||
MINIO_BROWSER = "${if cfg.browser then "on" else "off"}";
|
(lib.mkIf (cfg.rootCredentialsFile != null) {
|
||||||
};
|
# The service will fail if the credentials file is missing
|
||||||
};
|
services.minio.unitConfig.ConditionPathExists = cfg.rootCredentialsFile;
|
||||||
|
|
||||||
|
# The service will not restart if the credentials file has
|
||||||
|
# been changed. This can cause stale root credentials.
|
||||||
|
paths.minio-root-credentials = {
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
|
pathConfig = {
|
||||||
|
PathChanged = [ cfg.rootCredentialsFile ];
|
||||||
|
Unit = "minio-restart.service";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.minio-restart = {
|
||||||
|
description = "Restart MinIO";
|
||||||
|
|
||||||
|
script = ''
|
||||||
|
systemctl restart minio.service
|
||||||
|
'';
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = 5;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})];
|
||||||
|
|
||||||
users.users.minio = {
|
users.users.minio = {
|
||||||
group = "minio";
|
group = "minio";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import ./make-test-python.nix ({ pkgs, ...} :
|
import ./make-test-python.nix ({ pkgs, ... }:
|
||||||
let
|
let
|
||||||
accessKey = "BKIKJAA5BMMU2RHO6IBB";
|
accessKey = "BKIKJAA5BMMU2RHO6IBB";
|
||||||
secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
|
secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
|
||||||
minioPythonScript = pkgs.writeScript "minio-test.py" ''
|
minioPythonScript = pkgs.writeScript "minio-test.py" ''
|
||||||
|
@ -18,41 +18,55 @@ let
|
||||||
sio.seek(0)
|
sio.seek(0)
|
||||||
minioClient.put_object('test-bucket', 'test.txt', sio, sio_len, content_type='text/plain')
|
minioClient.put_object('test-bucket', 'test.txt', sio, sio_len, content_type='text/plain')
|
||||||
'';
|
'';
|
||||||
in {
|
rootCredentialsFile = "/etc/nixos/minio-root-credentials";
|
||||||
name = "minio";
|
credsPartial = pkgs.writeText "minio-credentials-partial" ''
|
||||||
meta = with pkgs.lib.maintainers; {
|
MINIO_ROOT_USER=${accessKey}
|
||||||
maintainers = [ bachp ];
|
'';
|
||||||
};
|
credsFull = pkgs.writeText "minio-credentials-full" ''
|
||||||
|
MINIO_ROOT_USER=${accessKey}
|
||||||
nodes = {
|
MINIO_ROOT_PASSWORD=${secretKey}
|
||||||
machine = { pkgs, ... }: {
|
'';
|
||||||
services.minio = {
|
in
|
||||||
enable = true;
|
{
|
||||||
rootCredentialsFile = pkgs.writeText "minio-credentials" ''
|
name = "minio";
|
||||||
MINIO_ROOT_USER=${accessKey}
|
meta = with pkgs.lib.maintainers; {
|
||||||
MINIO_ROOT_PASSWORD=${secretKey}
|
maintainers = [ bachp ];
|
||||||
'';
|
|
||||||
};
|
|
||||||
environment.systemPackages = [ pkgs.minio-client ];
|
|
||||||
|
|
||||||
# Minio requires at least 1GiB of free disk space to run.
|
|
||||||
virtualisation.diskSize = 4 * 1024;
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
testScript = ''
|
nodes = {
|
||||||
start_all()
|
machine = { pkgs, ... }: {
|
||||||
machine.wait_for_unit("minio.service")
|
services.minio = {
|
||||||
machine.wait_for_open_port(9000)
|
enable = true;
|
||||||
|
inherit rootCredentialsFile;
|
||||||
|
};
|
||||||
|
environment.systemPackages = [ pkgs.minio-client ];
|
||||||
|
|
||||||
# Create a test bucket on the server
|
# Minio requires at least 1GiB of free disk space to run.
|
||||||
machine.succeed(
|
virtualisation.diskSize = 4 * 1024;
|
||||||
"mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
|
};
|
||||||
)
|
};
|
||||||
machine.succeed("mc mb minio/test-bucket")
|
|
||||||
machine.succeed("${minioPythonScript}")
|
testScript = ''
|
||||||
assert "test-bucket" in machine.succeed("mc ls minio")
|
import time
|
||||||
assert "Test from Python" in machine.succeed("mc cat minio/test-bucket/test.txt")
|
|
||||||
machine.shutdown()
|
start_all()
|
||||||
'';
|
# simulate manually editing root credentials file
|
||||||
})
|
machine.wait_for_unit("multi-user.target")
|
||||||
|
machine.copy_from_host("${credsPartial}", "${rootCredentialsFile}")
|
||||||
|
time.sleep(3)
|
||||||
|
machine.copy_from_host("${credsFull}", "${rootCredentialsFile}")
|
||||||
|
|
||||||
|
machine.wait_for_unit("minio.service")
|
||||||
|
machine.wait_for_open_port(9000)
|
||||||
|
|
||||||
|
# Create a test bucket on the server
|
||||||
|
machine.succeed(
|
||||||
|
"mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
|
||||||
|
)
|
||||||
|
machine.succeed("mc mb minio/test-bucket")
|
||||||
|
machine.succeed("${minioPythonScript}")
|
||||||
|
assert "test-bucket" in machine.succeed("mc ls minio")
|
||||||
|
assert "Test from Python" in machine.succeed("mc cat minio/test-bucket/test.txt")
|
||||||
|
machine.shutdown()
|
||||||
|
'';
|
||||||
|
})
|
||||||
|
|
|
@ -11,11 +11,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ocenaudio";
|
pname = "ocenaudio";
|
||||||
version = "3.11.21";
|
version = "3.11.22";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||||
sha256 = "sha256-nItqx3g4W3s1phHe6F8EtOL4nwJQ0XnKB8Ujg71/Q3Q=";
|
sha256 = "sha256-mmPFASc2ARI1ht9SYhFsDjTkWfhxXdc2zEi5rvfanZc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://www.ocenaudio.com";
|
homepage = "https://www.ocenaudio.com";
|
||||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
platforms = platforms.linux;
|
platforms = [ "x86_64-linux" ];
|
||||||
maintainers = with maintainers; [ onny ];
|
maintainers = with maintainers; [ onny ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,17 +18,17 @@ let
|
||||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||||
|
|
||||||
sha256 = {
|
sha256 = {
|
||||||
x86_64-linux = "0dqwjc606z8qizg9hcfjlpq92hmaxh3a09368ffz7irl5sgwp300";
|
x86_64-linux = "1h8iryrcn22i2vxh7srlfy1amdvkk6p7fk6wmsbylhb845zfq0s2";
|
||||||
x86_64-darwin = "00795gr9dmshz6sfgsp70fii6m76fqdmqskwkdwqwxddl0i07sw5";
|
x86_64-darwin = "1q2nfm89m9lp9mf7q62l17z9gkmj0fpjmn905x7dw8xjlslkp9v8";
|
||||||
aarch64-linux = "04ckk6l9ym1igaqk1zfyy4zx05yryi641lc0i1l38k3mbv1k3gvw";
|
aarch64-linux = "19y661ad95dmr9hhkmb8a2w17jj4c9ywlg49bi2r5l7birv4v6hy";
|
||||||
aarch64-darwin = "16z96h8s9irgb17gy6ng3r6cbiwrxa7q7qazqamnmgvvahg08kvj";
|
aarch64-darwin = "18ycg1hj26zj68zni314wpbl3h8p7jw3lf2h791vjzbpgjznxnz4";
|
||||||
armv7l-linux = "042ihy4bg39y4m2djkqcx099w9710ikprbw3z7gh1gqvj3qyxy6i";
|
armv7l-linux = "0hk67pik1z1s1nd2m0xc8zgfyn8i7v2z14j5bmc48k7spirrpz7r";
|
||||||
}.${system} or throwSystem;
|
}.${system} or throwSystem;
|
||||||
in
|
in
|
||||||
callPackage ./generic.nix rec {
|
callPackage ./generic.nix rec {
|
||||||
# Please backport all compatible updates to the stable release.
|
# Please backport all compatible updates to the stable release.
|
||||||
# This is important for the extension ecosystem.
|
# This is important for the extension ecosystem.
|
||||||
version = "1.76.1";
|
version = "1.76.2";
|
||||||
pname = "vscode";
|
pname = "vscode";
|
||||||
|
|
||||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||||
|
|
|
@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
|
moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
|
||||||
for file in "$dev"/bin/*-config; do
|
for file in "$dev"/bin/*-config; do
|
||||||
substituteInPlace "$file" --replace pkg-config \
|
substituteInPlace "$file" --replace pkg-config \
|
||||||
"PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
|
"PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"
|
||||||
done
|
done
|
||||||
'' + lib.optionalString ghostscriptSupport ''
|
'' + lib.optionalString ghostscriptSupport ''
|
||||||
for la in $out/lib/*.la; do
|
for la in $out/lib/*.la; do
|
||||||
|
|
|
@ -29,13 +29,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vengi-tools";
|
pname = "vengi-tools";
|
||||||
version = "0.0.23";
|
version = "0.0.24";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mgerhardy";
|
owner = "mgerhardy";
|
||||||
repo = "vengi";
|
repo = "vengi";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-wRqQ7x6eQTrzFU++Qgq/7NXXo5F1onlZBdQ9ttNvvEw=";
|
sha256 = "sha256-ZkO2CLSuuJcFJFBO4XS8Qec0CxxAJdzOGfFa2zy+4uI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||||
mkdir $out
|
mkdir $out
|
||||||
for format in vox qef qbt qb vxm vxr binvox gox cub vxl csv; do
|
for format in vox qef qbt qb vxm vxr binvox gox cub vxl csv; do
|
||||||
echo Testing $format export
|
echo Testing $format export
|
||||||
${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output $out/chr_knight.$format
|
${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output $out/chr_knight.$format
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||||
name = "vengi-tools-test-voxconvert-roundtrip";
|
name = "vengi-tools-test-voxconvert-roundtrip";
|
||||||
meta.timeout = 10;
|
meta.timeout = 10;
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output chr_knight.vox
|
${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output chr_knight.vox
|
||||||
${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb
|
${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb
|
||||||
${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox
|
${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox
|
||||||
diff chr_knight.vox chr_knight1.vox
|
diff chr_knight.vox chr_knight1.vox
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec {
|
(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec {
|
||||||
pname = "signalbackup-tools";
|
pname = "signalbackup-tools";
|
||||||
version = "20230307-1";
|
version = "20230316";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bepaald";
|
owner = "bepaald";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-+FjjGsYMmleN+TDKFAsvC9o81gVhZHIrUgrWuzksxZU=";
|
hash = "sha256-aq/+6wxGEYhOsAIBJ+Phjc+jKZGFxrWIZozi4T6WwBI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
54
pkgs/applications/networking/sniffers/qtwirediff/default.nix
Normal file
54
pkgs/applications/networking/sniffers/qtwirediff/default.nix
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, qtbase
|
||||||
|
, qmake
|
||||||
|
, qtwayland
|
||||||
|
, wrapQtAppsHook
|
||||||
|
, wireshark-cli
|
||||||
|
}:
|
||||||
|
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "qtwirediff";
|
||||||
|
version = "unstable-2023-03-07";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "aaptel";
|
||||||
|
repo = "qtwirediff";
|
||||||
|
rev = "e0a38180cdf9d94b7535c441487dcefb3a8ec72e";
|
||||||
|
hash = "sha256-QS4PslSHe2qhxayF7IHvtFASgd4A7vVtSY8tFQ6dqXM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
qmake
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
qtbase
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
|
qtwayland
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
|
mkdir -p $out/Applications
|
||||||
|
cp -r qtwirediff.app $out/Applications
|
||||||
|
makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff
|
||||||
|
'' + lib.optionalString stdenv.isLinux ''
|
||||||
|
install -Dm755 -T qtwirediff $out/bin/qtwirediff
|
||||||
|
wrapProgram $out/bin/qtwirediff \
|
||||||
|
--prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}"
|
||||||
|
'' + ''
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Debugging tool to diff network traffic leveraging Wireshark";
|
||||||
|
homepage = "https://github.com/aaptel/qtwirediff";
|
||||||
|
license = lib.licenses.gpl3Plus;
|
||||||
|
maintainers = with lib.maintainers; [ janik ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "rclone";
|
pname = "rclone";
|
||||||
version = "1.61.1";
|
version = "1.62.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-mBnpmCzuMCXZPM3Tq2SsOPwEfTUn1StahkB5U/6Fe+A=";
|
sha256 = "sha256-nG3XW6OGzfbvkBmlmeOCnVRFun3EWIVLLvMXGhOAi+4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-EGNRKSlpdH/NNfLzSDL3lQzArVsVM6oRkyZm31V8cgM=";
|
vendorSha256 = "sha256-UA6PlhKxJ9wpg3mbiJ4Mqc4npwEBa93qi6WrQR8JQSk=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ buildGoModule rec {
|
||||||
postInstall =
|
postInstall =
|
||||||
let
|
let
|
||||||
rcloneBin =
|
rcloneBin =
|
||||||
if stdenv.buildPlatform == stdenv.hostPlatform
|
if stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||||
then "$out"
|
then "$out"
|
||||||
else lib.getBin buildPackages.rclone;
|
else lib.getBin buildPackages.rclone;
|
||||||
in
|
in
|
||||||
|
@ -45,8 +45,8 @@ buildGoModule rec {
|
||||||
# as the setuid wrapper is required as non-root on NixOS.
|
# as the setuid wrapper is required as non-root on NixOS.
|
||||||
''
|
''
|
||||||
wrapProgram $out/bin/rclone \
|
wrapProgram $out/bin/rclone \
|
||||||
--suffix PATH : "${lib.makeBinPath [ fuse ] }" \
|
--suffix PATH : "${lib.makeBinPath [ fuse ] }" \
|
||||||
--prefix LD_LIBRARY_PATH : "${fuse}/lib"
|
--prefix LD_LIBRARY_PATH : "${fuse}/lib"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
|
||||||
qtbase
|
qtbase
|
||||||
qtmultimedia
|
qtmultimedia
|
||||||
qttools
|
qttools
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
qtwayland
|
qtwayland
|
||||||
] ++ lib.optionals useMupdf [
|
] ++ lib.optionals useMupdf [
|
||||||
freetype
|
freetype
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations
|
# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations
|
||||||
, boost
|
, boost
|
||||||
|
, ncurses
|
||||||
, enableCApi ? true
|
, enableCApi ? true
|
||||||
# requires numpy
|
# requires numpy
|
||||||
, enablePythonApi ? false
|
, enablePythonApi ? false
|
||||||
|
@ -105,6 +106,7 @@ stdenv.mkDerivation rec {
|
||||||
# However, if enableLibuhd_Python_api *or* enableUtils is on, we need
|
# However, if enableLibuhd_Python_api *or* enableUtils is on, we need
|
||||||
# pythonEnv for runtime as well. The utilities' runtime dependencies are
|
# pythonEnv for runtime as well. The utilities' runtime dependencies are
|
||||||
# handled at the environment
|
# handled at the environment
|
||||||
|
++ optionals (enableExamples) [ ncurses ncurses.dev ]
|
||||||
++ optionals (enablePythonApi || enableUtils) [ pythonEnv ]
|
++ optionals (enablePythonApi || enableUtils) [ pythonEnv ]
|
||||||
++ optionals (enableDpdk) [ dpdk ]
|
++ optionals (enableDpdk) [ dpdk ]
|
||||||
;
|
;
|
||||||
|
@ -124,7 +126,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
postPhases = [ "installFirmware" "removeInstalledTests" ]
|
postPhases = [ "installFirmware" "removeInstalledTests" ]
|
||||||
++ optionals (enableUtils) [ "moveUdevRules" ]
|
++ optionals (enableUtils && stdenv.targetPlatform.isLinux) [ "moveUdevRules" ]
|
||||||
;
|
;
|
||||||
|
|
||||||
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
|
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack
|
{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack
|
||||||
, fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper
|
, fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper
|
||||||
, libxsmm, spglib, which, pkg-config
|
, libxsmm, spglib, which, pkg-config, plumed, zlib
|
||||||
, enableElpa ? false
|
, enableElpa ? false
|
||||||
, elpa
|
, elpa
|
||||||
} :
|
} :
|
||||||
|
@ -34,6 +34,8 @@ in stdenv.mkDerivation rec {
|
||||||
scalapack
|
scalapack
|
||||||
blas
|
blas
|
||||||
lapack
|
lapack
|
||||||
|
plumed
|
||||||
|
zlib
|
||||||
] ++ lib.optional enableElpa elpa;
|
] ++ lib.optional enableElpa elpa;
|
||||||
|
|
||||||
propagatedBuildInputs = [ mpi ];
|
propagatedBuildInputs = [ mpi ];
|
||||||
|
@ -64,7 +66,8 @@ in stdenv.mkDerivation rec {
|
||||||
AR = ar -r
|
AR = ar -r
|
||||||
DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \
|
DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \
|
||||||
-D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \
|
-D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \
|
||||||
-D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"}
|
-D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} \
|
||||||
|
-D__PLUMED2
|
||||||
CFLAGS = -fopenmp
|
CFLAGS = -fopenmp
|
||||||
FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \
|
FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \
|
||||||
-ftree-vectorize -funroll-loops -msse2 \
|
-ftree-vectorize -funroll-loops -msse2 \
|
||||||
|
@ -77,8 +80,11 @@ in stdenv.mkDerivation rec {
|
||||||
-lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \
|
-lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \
|
||||||
-lint2 -lstdc++ -lvori \
|
-lint2 -lstdc++ -lvori \
|
||||||
-lgomp -lpthread -lm \
|
-lgomp -lpthread -lm \
|
||||||
-fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"}
|
-fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} \
|
||||||
|
-lz -ldl -lstdc++ ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \
|
||||||
|
-lplumed
|
||||||
LDFLAGS = \$(FCFLAGS) \$(LIBS)
|
LDFLAGS = \$(FCFLAGS) \$(LIBS)
|
||||||
|
include ${plumed}/lib/plumed/src/lib/Plumed.inc
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
47
pkgs/applications/version-management/git-dive/default.nix
Normal file
47
pkgs/applications/version-management/git-dive/default.nix
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
# libgit2-sys doesn't support libgit2 1.6 yet
|
||||||
|
, libgit2_1_5
|
||||||
|
, zlib
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "git-dive";
|
||||||
|
version = "0.1.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "gitext-rs";
|
||||||
|
repo = "git-dive";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-zq594j/X74qzRSjbkd2lup/WqZXpTOecUYRVQGqpXug=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-f3hiAVno5BuPgqP1y9XtVQ/TJcnqwUnEOqaU/tTljTQ=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
libgit2_1_5
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
|
||||||
|
checkFlags = [
|
||||||
|
# requires internet access
|
||||||
|
"--skip=screenshot"
|
||||||
|
];
|
||||||
|
|
||||||
|
# don't use vendored libgit2
|
||||||
|
buildNoDefaultFeatures = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Dive into a file's history to find root cause";
|
||||||
|
homepage = "https://github.com/gitext-rs/git-dive";
|
||||||
|
changelog = "https://github.com/gitext-rs/git-dive/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
license = with licenses; [ asl20 mit ];
|
||||||
|
maintainers = with maintainers; [ figsoda ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -18,13 +18,13 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "deepin-voice-note";
|
pname = "deepin-voice-note";
|
||||||
version = "5.10.22";
|
version = "5.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linuxdeepin";
|
owner = "linuxdeepin";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-ZDw/kGmhcoTPDUsZa9CYhrVbK4Uo75G0L4q4cCBPr7E=";
|
sha256 = "sha256-JX4OuVu+5/a3IhkfnvaWVDaKl+xg/8qxlvp9hM0nHNU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
|
||||||
gst-plugins-good
|
gst-plugins-good
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0";
|
env.NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0";
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, blas
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert !blas.isILP64;
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "plumed";
|
||||||
|
version = "2.8.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "plumed";
|
||||||
|
repo = "plumed2";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-ugYhJq8KFjT8rkAOX/yZ9IlEklXCwRxKH49REd2QN9E=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
patchShebangs .
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ blas ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Molecular metadynamics library";
|
||||||
|
homepage = "https://github.com/plumed/plumed2";
|
||||||
|
license = licenses.lgpl3Only;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "gnuradio";
|
owner = "gnuradio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg=";
|
sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -58,4 +58,3 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "maestro";
|
pname = "maestro";
|
||||||
version = "1.24.0";
|
version = "1.25.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||||
sha256 = "19zzs2a8zrnbgjqvdh31naf2h9l2am4bankshh563gfgcfsl0af0";
|
sha256 = "0rkm2rgbbr4rbycg2kz5in2wjklv23jr7ms5p49j3bpa6nkv4jq3";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiolivisi";
|
pname = "aiolivisi";
|
||||||
version = "0.0.18";
|
version = "0.0.19";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-8Cy2hhYrUBRfVb2hgil6Irk+iTJmJ8JL+5wvm4rm7kM=";
|
hash = "sha256-eT/sqLykd4gQVt972646mH+QArf7p/XQH53/UtsuKRs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioopenexchangerates";
|
pname = "aioopenexchangerates";
|
||||||
version = "0.4.0";
|
version = "0.4.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MartinHjelmare";
|
owner = "MartinHjelmare";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-qm9B4m5CLhfqnZj+sdHZ+iA0+YnDR9Dh3lCy/YADkEI=";
|
hash = "sha256-JS134qjK2pT6KLD+91EmrA3HCNmF8DWcq71E/k9ULSA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -51,6 +51,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Library for the Openexchangerates API";
|
description = "Library for the Openexchangerates API";
|
||||||
homepage = "https://github.com/MartinHjelmare/aioopenexchangerates";
|
homepage = "https://github.com/MartinHjelmare/aioopenexchangerates";
|
||||||
|
changelog = "https://github.com/MartinHjelmare/aioopenexchangerates/blob/vv${version}/CHANGELOG.md";
|
||||||
license = with licenses; [ asl20 ];
|
license = with licenses; [ asl20 ];
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bond-async";
|
pname = "bond-async";
|
||||||
version = "0.1.22";
|
version = "0.1.23";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "bondhome";
|
owner = "bondhome";
|
||||||
repo = "bond-async";
|
repo = "bond-async";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-wU1niuzHwNmrmyjcTlBIKrBf1wMbHHFlIBxFNHUwDw4=";
|
hash = "sha256-Kht2O/+F7Nw78p1Q6NGugm2bfAwZAUWAs30htoWkafI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -40,6 +40,7 @@ buildPythonPackage rec {
|
||||||
meta = {
|
meta = {
|
||||||
description = "Asynchronous Python wrapper library over Bond Local API";
|
description = "Asynchronous Python wrapper library over Bond Local API";
|
||||||
homepage = "https://github.com/bondhome/bond-async";
|
homepage = "https://github.com/bondhome/bond-async";
|
||||||
|
changelog = "https://github.com/bondhome/bond-async/releases/tag/v${version}";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [ dotlambda ];
|
maintainers = with lib.maintainers; [ dotlambda ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "chia-rs";
|
pname = "chia-rs";
|
||||||
version = "0.2.2";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "chia-network";
|
owner = "chia-network";
|
||||||
repo = "chia_rs";
|
repo = "chia_rs";
|
||||||
rev = "refs/tags/${version}";
|
rev = version;
|
||||||
hash = "sha256-mr5v68NP9+M4FlP/3Gv3GvZOWaCNjZDARKGANgDTs4E=";
|
hash = "sha256-kjURkzynrrb5iD5s77Q3nETt71SCGGazm/2lt9HS5JU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jupyter-lsp";
|
pname = "jupyter-lsp";
|
||||||
version = "1.5.1";
|
version = "2.0.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4=";
|
hash = "sha256-89n1mdSOCTpLq/vawZTDAzLmJIzkoD1z+nEviMd55Rk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -23,10 +23,10 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server";
|
description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server";
|
||||||
homepage = "https://pypi.org/project/jupyter-lsp";
|
homepage = "https://jupyterlab-lsp.readthedocs.io/en/latest/";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ doronbehar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jupyterlab-lsp";
|
pname = "jupyterlab-lsp";
|
||||||
version = "3.10.2";
|
version = "4.0.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-VZrUaS+X9C3WufCzMKuScD8CuORbuvbpz1mJiolyIqA=";
|
hash = "sha256-Rh5rX48HglIGy7Qg4lvmP3bVVCB3ibWnenCHMui5pJE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
||||||
homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp";
|
homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ doronbehar ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,10 +43,14 @@ buildPythonPackage rec {
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'.
|
# Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'.
|
||||||
"test_new_session_width_height"
|
"test_new_session_width_height"
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
# tests/test_pane.py:113: AssertionError
|
||||||
|
"test_capture_pane_start"
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||||
"test_test.py"
|
"tests/test_test.py"
|
||||||
|
"tests/legacy_api/test_test.py"
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "libtmux" ];
|
pythonImportsCheck = [ "libtmux" ];
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "marshmallow-dataclass";
|
pname = "marshmallow-dataclass";
|
||||||
version = "8.5.11";
|
version = "8.5.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "lovasoa";
|
owner = "lovasoa";
|
||||||
repo = "marshmallow_dataclass";
|
repo = "marshmallow_dataclass";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-P2eJLNI+G0km2HWZII4tx/uJ+6lvyxtap/qPh13LLmA=";
|
hash = "sha256-vU3UZVX9J7nkHGfGUWoCOmsvkpe7p8cqQJd+YhkxeSw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "peaqevcore";
|
pname = "peaqevcore";
|
||||||
version = "13.1.1";
|
version = "13.2.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-JwmShU/YJhJvNofKrE8/e3/PKFSEGWWhHO8heEWTZac=";
|
hash = "sha256-fu4NL5m8+eae2+sTyi1yNA1J2qQfjfSlbIQyorlXZ6Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -3,17 +3,21 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pyserial
|
, pyserial
|
||||||
, pyserial-asyncio
|
, pyserial-asyncio
|
||||||
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyblackbird";
|
pname = "pyblackbird";
|
||||||
version = "0.5";
|
version = "0.6";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "koolsb";
|
owner = "koolsb";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "0m1yd1cb3z8011x7nicxpf091bdcwghcphn0l21c65f71rabzg6s";
|
hash = "sha256-+ehzrr+RrwFKOOuxBq3+mwnuMPxZFV4QTZG1IRgsbLc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -23,11 +27,15 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
# Test setup try to create a serial port
|
# Test setup try to create a serial port
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
pythonImportsCheck = [ "pyblackbird" ];
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"pyblackbird"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python implementation for Monoprice Blackbird units";
|
description = "Python implementation for Monoprice Blackbird units";
|
||||||
homepage = "https://github.com/koolsb/pyblackbird";
|
homepage = "https://github.com/koolsb/pyblackbird";
|
||||||
|
changelog = "https://github.com/koolsb/pyblackbird/releases/tag/${version}";
|
||||||
license = with licenses; [ mit ];
|
license = with licenses; [ mit ];
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,11 +9,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "smpplib";
|
pname = "smpplib";
|
||||||
version = "2.2.1";
|
version = "2.2.2";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166";
|
sha256 = "sha256-8hkec7JNupTyiJvy6hpgru9r1Dr9Pdu8Yy1+QdnzDkc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -36,6 +37,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "SMPP library for Python";
|
description = "SMPP library for Python";
|
||||||
homepage = "https://github.com/python-smpplib/python-smpplib";
|
homepage = "https://github.com/python-smpplib/python-smpplib";
|
||||||
|
changelog = "https://github.com/python-smpplib/python-smpplib/releases/tag/${version}";
|
||||||
license = licenses.lgpl3Plus;
|
license = licenses.lgpl3Plus;
|
||||||
maintainers = with maintainers; [ globin ];
|
maintainers = with maintainers; [ globin ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "xknx";
|
pname = "xknx";
|
||||||
version = "2.6.0";
|
version = "2.7.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "XKNX";
|
owner = "XKNX";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-ivqUego6a9ieSxgHKd3szVAE23zMI54nYqbZjHIgVVE=";
|
hash = "sha256-Hr2uDFsYArU4iSK0xKZONjEgVZU0C0e4UpAD03t10zA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
, bleak
|
, bleak
|
||||||
, bleak-retry-connector
|
, bleak-retry-connector
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
|
, cryptography
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, poetry-core
|
, poetry-core
|
||||||
, pycryptodome
|
|
||||||
, pytest-asyncio
|
, pytest-asyncio
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "yalexs-ble";
|
pname = "yalexs-ble";
|
||||||
version = "2.0.4";
|
version = "2.1.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||||
owner = "bdraco";
|
owner = "bdraco";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-8jZxAG1NVFkWbQF1HwyQbqd0NVRgpluspdtgRaF4zhg=";
|
hash = "sha256-BF2jGEFtUYckFNJwddLGjwQYIhYKhM7q6Q2mCil6Z3Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||||
async-timeout
|
async-timeout
|
||||||
bleak
|
bleak
|
||||||
bleak-retry-connector
|
bleak-retry-connector
|
||||||
pycryptodome
|
cryptography
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
|
|
|
@ -23,14 +23,14 @@ with py.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "checkov";
|
pname = "checkov";
|
||||||
version = "2.3.92";
|
version = "2.3.95";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bridgecrewio";
|
owner = "bridgecrewio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-7Mr9mWnUuxfGJZVx845JHtIbWZeWStY/xbWUVjOcksM=";
|
hash = "sha256-M7Qy7+yh1LZlMq3cN5HJ2IHea4qBlLr7ckT0v/PuunI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -114,7 +114,7 @@ buildPythonApplication rec {
|
||||||
# Tests are comparing console output
|
# Tests are comparing console output
|
||||||
"cli"
|
"cli"
|
||||||
"console"
|
"console"
|
||||||
# Starting to fail after 2.3.92
|
# Starting to fail after 2.3.95
|
||||||
"test_runner_verify_secrets_skip"
|
"test_runner_verify_secrets_skip"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -4,12 +4,12 @@ let
|
||||||
version = "2.2.0-961";
|
version = "2.2.0-961";
|
||||||
hash = "0gbjm8x40hzf787kccfxqb2wdgfks81f6hzr6rrmid42s4bfs5w7";
|
hash = "0gbjm8x40hzf787kccfxqb2wdgfks81f6hzr6rrmid42s4bfs5w7";
|
||||||
|
|
||||||
coreclr-version = "release/7.0";
|
coreclr-version = "v7.0.4";
|
||||||
coreclr-src = fetchFromGitHub {
|
coreclr-src = fetchFromGitHub {
|
||||||
owner = "dotnet";
|
owner = "dotnet";
|
||||||
repo = "runtime";
|
repo = "runtime";
|
||||||
rev = coreclr-version;
|
rev = coreclr-version;
|
||||||
sha256 = "sha256-kBYb0Uw1IzDTpsEyd02/5sliVHoLmZdGnpybneV0u7U=";
|
sha256 = "sha256-gPl9sfn3eL3AUli1gdPizDK4lciTJ1ImBcics5BA63M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||||
|
|
|
@ -13,13 +13,13 @@ let
|
||||||
in
|
in
|
||||||
let finalPackage = buildDotnetModule rec {
|
let finalPackage = buildDotnetModule rec {
|
||||||
pname = "omnisharp-roslyn";
|
pname = "omnisharp-roslyn";
|
||||||
version = "1.39.4";
|
version = "1.39.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OmniSharp";
|
owner = "OmniSharp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "rX0FeURw6WMbcJOomqHFcZ9tpKO1td60/HbbVClV324=";
|
sha256 = "6KCHZ5I5OkDaensqHO//owI/nrQkOoF60f/n3YV7jaE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
|
projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
|
||||||
|
|
35
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
35
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
|
@ -18,19 +18,19 @@
|
||||||
(fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.1"; sha256 = "08mnq4swyjzjscj56rcc1ckyrzs84nsx312hh1xcw29m86ad7jpz"; })
|
(fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.1"; sha256 = "08mnq4swyjzjscj56rcc1ckyrzs84nsx312hh1xcw29m86ad7jpz"; })
|
||||||
(fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.0.0"; sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; })
|
(fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.0.0"; sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; })
|
||||||
(fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.1"; sha256 = "0yib6x7hankpr9knfxascybhydkq6zwc3ahg8f2hzph9pcf9krjz"; })
|
(fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.1"; sha256 = "0yib6x7hankpr9knfxascybhydkq6zwc3ahg8f2hzph9pcf9krjz"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0-2.22527.10"; sha256 = "0xvlmg1n5aj7ifb1kd6jg1sk6251rz8xi877v8jz4qx178vqcx8s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.5.0-2.22527.10/microsoft.codeanalysis.common.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.6.0-3.23153.5"; sha256 = "0qp3dzqr32yf64cxdzngvrri6rljvw6d2kbir27dk5nwg0r6nlnp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.6.0-3.23153.5/microsoft.codeanalysis.common.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "15vsv35zzgjysyr5hsrykc9qx8l062i4fyqg6hay7acqfx5kp539"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.6.0-3.23153.5"; sha256 = "1vbd1xy5aynbvrm9nngn8blf6hrmbnbdj9nyvp2ynznglgns78yv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.6.0-3.23153.5/microsoft.codeanalysis.csharp.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.5.0-2.22527.10"; sha256 = "0bq3512kkhwq5p81svy7s850apdq0qmydjxqmms6f70sspyxh38b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.features.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.6.0-3.23153.5"; sha256 = "1jsw9nf2fjp51gx5wpsjp2jyn882bmqvb39n0vxykyb8sf2h86g5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.6.0-3.23153.5/microsoft.codeanalysis.csharp.features.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.5.0-2.22527.10"; sha256 = "0lr2y28amwg5p0bb9gyh1yybci9swjwm0pp85nlr8zj8a8d1633w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.scripting.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.6.0-3.23153.5"; sha256 = "1mjfbk508pks8hfxn2a8pfp3gwxkly7iil2rc7y9vmngdysc2b5p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.6.0-3.23153.5/microsoft.codeanalysis.csharp.scripting.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0-2.22527.10"; sha256 = "0xwclnvvlq36955vlih56a28fp79c6927rmhlqkdhqs3lsdz9l23"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.workspaces.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.6.0-3.23153.5"; sha256 = "0cxr0sgjklrn1yzx9r565c1vmazv953qpr7jvgcl53wg0y174mz2"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.6.0-3.23153.5/microsoft.codeanalysis.csharp.workspaces.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.5.0-2.22527.10"; sha256 = "0lg4bgm4awidj41p8gdjy6j4a2dq5hwvq7rw37sv9af93ri16pfh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.6.0-3.23153.5"; sha256 = "1c2rnh0wcxggyhv6i5bnyy8p8b060ahdpspa0jps24q745awadbf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.6.0-3.23153.5/microsoft.codeanalysis.externalaccess.omnisharp.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "1ffcwf7pwcx4s63k6dhbgyj2anrw3n49cyj1845983vm918p9ymw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.6.0-3.23153.5"; sha256 = "07670byyv1m6ydg8fv010js71zrhpg6iyi7sc9mx5g7vp5cl315d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.6.0-3.23153.5/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.5.0-2.22527.10"; sha256 = "1n06zkwpyc6jxsy3mlr23ad42yga40fbsyfnxdi632p4iav294w0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.5.0-2.22527.10/microsoft.codeanalysis.features.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.6.0-3.23153.5"; sha256 = "0r7gswdp817lpf6kgh8145wpdb9f9xhacjcp2ypwk9bfsq82yc5a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.6.0-3.23153.5/microsoft.codeanalysis.features.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.5.0-2.22527.10"; sha256 = "1xlm9n7kgin9cfr2xybjxgiwwbnfifyx0r4mm1gfdhgfjbykbqhf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.5.0-2.22527.10/microsoft.codeanalysis.scripting.common.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.6.0-3.23153.5"; sha256 = "0pwfxb0rsw0ijgm7bq7zfd2wdj5wvsdq1gz20bcbwcn56rqnlz32"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.6.0-3.23153.5/microsoft.codeanalysis.scripting.common.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0-2.22527.10"; sha256 = "00swl909fqjp6vd41jc7f9kd7n5fzzqvpf1jicrbyr2nmh3mk0xk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.5.0-2.22527.10/microsoft.codeanalysis.workspaces.common.4.5.0-2.22527.10.nupkg"; })
|
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.6.0-3.23153.5"; sha256 = "158gnwij5dy78qifxhhvadaj5lq6x5zm85rhdfdpffclva1239iy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.6.0-3.23153.5/microsoft.codeanalysis.workspaces.common.4.6.0-3.23153.5.nupkg"; })
|
||||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||||
(fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "1.4.0"; sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"; })
|
(fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "1.4.0"; sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"; })
|
||||||
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
|
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
|
||||||
|
@ -67,13 +67,13 @@
|
||||||
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; })
|
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; })
|
||||||
(fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.0.0"; sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; })
|
(fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.0.0"; sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; })
|
||||||
(fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.0.0"; sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; })
|
(fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.0.0"; sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; })
|
||||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.3.0"; sha256 = "0q4z9mx1ccflpbm5nhcimi5s3rppn1wmmg1lmc03vkdzkav0ymgv"; })
|
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; })
|
||||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.3.0"; sha256 = "0n0iahawk4cjc7pkddjyaqnb10fn5qcjy59645ni0wy8q3myiskh"; })
|
(fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.4.1"; sha256 = "1yr6f3pzmv8a2bij18649qbxy7f3gssywvy0gfzw10vc4am4zbz0"; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.4.27"; sha256 = "17f9bj01qxdd7mjxslgxkhky6xmg7agpimkf071k451csj5k2vkd"; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.5.22"; sha256 = "05fijdlzfxx2jb1lfgjx7m63yzwxi8x3a96bh4wayrjvhbp6vxqa"; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.4.27"; sha256 = "1js19g9i2vz012l1ma2wx23awyxh2jqng1qs652l9jwj6gmp71v8"; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.5.22"; sha256 = "1y6xg2249cdmcbvn1abhigv6fjbkghdajfs2mb2s9kw29sp5898l"; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.65"; sha256 = "0ghkgws849x88pk7da3y9nwi8k2l9cr4sp68d08wpx1w68fw0liq"; })
|
||||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||||
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; })
|
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; })
|
||||||
|
@ -83,7 +83,6 @@
|
||||||
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
|
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
|
||||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; })
|
(fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; })
|
||||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
|
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
|
||||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
|
|
||||||
(fetchNuGet { pname = "NuGet.Common"; version = "6.2.0"; sha256 = "1xvjlly8x3gs26sbcil8vn3xf8wfb7lkmb36sics46b7a6fmkdhn"; })
|
(fetchNuGet { pname = "NuGet.Common"; version = "6.2.0"; sha256 = "1xvjlly8x3gs26sbcil8vn3xf8wfb7lkmb36sics46b7a6fmkdhn"; })
|
||||||
(fetchNuGet { pname = "NuGet.Common"; version = "6.4.0-preview.1.53"; sha256 = "1p3f3p9md7d880hbp50msp54qkhwknxkz62sm79ndgldnclwrr3i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.4.0-preview.1.53/nuget.common.6.4.0-preview.1.53.nupkg"; })
|
(fetchNuGet { pname = "NuGet.Common"; version = "6.4.0-preview.1.53"; sha256 = "1p3f3p9md7d880hbp50msp54qkhwknxkz62sm79ndgldnclwrr3i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.4.0-preview.1.53/nuget.common.6.4.0-preview.1.53.nupkg"; })
|
||||||
(fetchNuGet { pname = "NuGet.Configuration"; version = "6.2.0"; sha256 = "07hmnm1v5qbqpa2m77gikm0pds8c7blnc98il17alswc5hhmblm8"; })
|
(fetchNuGet { pname = "NuGet.Configuration"; version = "6.2.0"; sha256 = "07hmnm1v5qbqpa2m77gikm0pds8c7blnc98il17alswc5hhmblm8"; })
|
||||||
|
@ -220,6 +219,7 @@
|
||||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
|
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
|
||||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; })
|
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; })
|
||||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; })
|
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; })
|
||||||
|
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; })
|
||||||
(fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; })
|
(fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; })
|
||||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
|
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
|
||||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
|
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
|
||||||
|
@ -273,6 +273,7 @@
|
||||||
(fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; })
|
(fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; })
|
||||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
|
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
|
||||||
(fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; })
|
(fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; })
|
||||||
|
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
|
||||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
|
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
|
||||||
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
|
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
|
||||||
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
|
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
|
||||||
|
|
|
@ -44,6 +44,9 @@ in
|
||||||
--replace 'exec' 'exec ${steam-run}/bin/steam-run'
|
--replace 'exec' 'exec ${steam-run}/bin/steam-run'
|
||||||
'' + ''
|
'' + ''
|
||||||
wrapProgram $out/bin/XIVLauncher.Core --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
wrapProgram $out/bin/XIVLauncher.Core --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||||
|
# the reference to aria2 gets mangled as UTF-16LE and isn't detectable by nix: https://github.com/NixOS/nixpkgs/issues/220065
|
||||||
|
mkdir -p $out/nix-support
|
||||||
|
echo ${aria2} >> $out/nix-support/depends
|
||||||
'';
|
'';
|
||||||
|
|
||||||
executables = [ "XIVLauncher.Core" ];
|
executables = [ "XIVLauncher.Core" ];
|
||||||
|
|
|
@ -7,11 +7,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "oil";
|
pname = "oil";
|
||||||
version = "0.14.0";
|
version = "0.14.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||||
hash = "sha256-ZrT2vHfbc0S9Q9e9lDiyptfSC3CIiQs8Co9FODil7oY=";
|
hash = "sha256-I/r/DhELLpKMnZqUh847F/uVPiCYF5b574cjP59+ZG0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "qovery-cli";
|
pname = "qovery-cli";
|
||||||
version = "0.51.1";
|
version = "0.52.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Qovery";
|
owner = "Qovery";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-TgbFNtN0FLhW7BqRq8tAs7WtMWdJpQN9fRCzTlE0XoU=";
|
hash = "sha256-AbgUxCZBnGkuzA8xmr6s4QxTtQFFkhjPmLmSX2AcQXE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto=";
|
vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto=";
|
||||||
|
|
|
@ -4,16 +4,16 @@
|
||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "hysteria";
|
pname = "hysteria";
|
||||||
version = "1.3.3";
|
version = "1.3.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "HyNetwork";
|
owner = "HyNetwork";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-CQgCFtvQDvhHTk10gpxfAvEJLz/i+CXXyzGrxi26hBk=";
|
sha256 = "sha256-Xmc6xkOepvLDHcIHaYyJIO2e3yIWQxPEacS7Wx09eAM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-sN+2XYoC+dDs6QKxwxuBCW4dOf4elSNKdOrbMxjOtSY=";
|
vendorSha256 = "sha256-hpV+16yU03fT8FIfxbEnIcafn6H/IMpMns9onPPPrDk=";
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "jadx";
|
pname = "jadx";
|
||||||
version = "1.4.5";
|
version = "1.4.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "skylot";
|
owner = "skylot";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-so82zzCXIJV5tIVUBJFZEpArThNQVqWASGofNzIobQM=";
|
hash = "sha256-nxEK2K6id1Rnqo85ls6YEHXrhc9ykJU17+olGqg+aGA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
deps = stdenv.mkDerivation {
|
deps = stdenv.mkDerivation {
|
||||||
|
@ -44,7 +44,7 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHash = "sha256-J6YpBYVqx+aWiMFX/67T7bhu4RTlKVaT4t359YJ6m7I=";
|
outputHash = "sha256-QebPRmfLtXy4ZlyKeGC5XNzhMTsYI0X36My+nTFvQpM=";
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
{ lib, fetchFromGitHub, fetchzip, stdenv }:
|
{ lib, fetchFromGitHub, fetchzip, stdenv }:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
version = "1.14.0";
|
version = "1.15.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "returntocorp";
|
owner = "returntocorp";
|
||||||
repo = "semgrep";
|
repo = "semgrep";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-qtiOZRqN+EqJs7kDmNReW4uweEynJd0TrU7vpR/fbqI=";
|
sha256 = "sha256-x+AOt6nn2hN4MODFZCvlq0kZ3VLoS7rVcFGGCEssIu0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# submodule dependencies
|
# submodule dependencies
|
||||||
|
@ -24,8 +24,8 @@ rec {
|
||||||
"cli/src/semgrep/semgrep_interfaces" = fetchFromGitHub {
|
"cli/src/semgrep/semgrep_interfaces" = fetchFromGitHub {
|
||||||
owner = "returntocorp";
|
owner = "returntocorp";
|
||||||
repo = "semgrep-interfaces";
|
repo = "semgrep-interfaces";
|
||||||
rev = "deffcb8e0e5166e29ce17b8af72716f45cbb2aa6";
|
rev = "ba9241ca8f13dea72a4ca5c5eae99f45c071c8b4";
|
||||||
sha256 = "sha256-yrVn1fJcAkQd3TMIvrWa5NDb/fN3ngybOycu7DG4pbE=";
|
sha256 = "sha256-2rcMmN42445AivcyYLPeE+HBYOyxJijQME1UUr9HISA=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -35,11 +35,11 @@ rec {
|
||||||
data = {
|
data = {
|
||||||
x86_64-linux = {
|
x86_64-linux = {
|
||||||
suffix = "-ubuntu-16.04.tgz";
|
suffix = "-ubuntu-16.04.tgz";
|
||||||
sha256 = "sha256-cnF92jrVeRxDAbDQxicZ4+CfdOD7BJUz2fHjIHEim24=";
|
sha256 = "sha256-vLtV1WAnOD6HhgrWYIP0NfXHKfvXORksdNp5UTG1QWc=";
|
||||||
};
|
};
|
||||||
x86_64-darwin = {
|
x86_64-darwin = {
|
||||||
suffix = "-osx.zip";
|
suffix = "-osx.zip";
|
||||||
sha256 = "sha256-eg6oHTz3vRd4GubvOYiJIjv/NZgXRWHPBmFvSu60S+E=";
|
sha256 = "sha256-6+ENjOOIJ5TSjpnJ5pDudblrWj/FLUe66UGr6V9c0HQ=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
src = let
|
src = let
|
||||||
|
|
|
@ -38,10 +38,8 @@ buildPythonApplication rec {
|
||||||
SEMGREP_SKIP_BIN = true;
|
SEMGREP_SKIP_BIN = true;
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
"attrs"
|
|
||||||
"boltons"
|
"boltons"
|
||||||
"jsonschema"
|
"glom"
|
||||||
"typing-extensions"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with pythonPackages; [
|
propagatedBuildInputs = with pythonPackages; [
|
||||||
|
|
|
@ -36,22 +36,20 @@ let
|
||||||
in
|
in
|
||||||
with localPython.pkgs; buildPythonApplication rec {
|
with localPython.pkgs; buildPythonApplication rec {
|
||||||
pname = "awsebcli";
|
pname = "awsebcli";
|
||||||
version = "3.20.3";
|
version = "3.20.5";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU=";
|
hash = "sha256-EoSEanwGvP3RcemXrVy7iAGrY/vMC6LbwcrXj2OsF8Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
substituteInPlace setup.py \
|
substituteInPlace requirements.txt \
|
||||||
--replace "six>=1.11.0,<1.15.0" "six==1.16.0" \
|
--replace "six>=1.11.0,<1.15.0" "six==1.16.0" \
|
||||||
--replace "requests>=2.20.1,<=2.26" "requests<3" \
|
--replace "requests>=2.20.1,<=2.26" "requests<3" \
|
||||||
--replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \
|
--replace "pathspec==0.10.1" "pathspec>=0.10.0,<1" \
|
||||||
--replace "pathspec==0.9.0" "pathspec>=0.10.0,<1" \
|
|
||||||
--replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \
|
--replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \
|
||||||
--replace "future>=0.16.0,<0.17.0" "future" \
|
|
||||||
--replace "termcolor == 1.1.0" "termcolor>=2.0.0,<3"
|
--replace "termcolor == 1.1.0" "termcolor>=2.0.0,<3"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -59,8 +57,6 @@ with localPython.pkgs; buildPythonApplication rec {
|
||||||
glibcLocales
|
glibcLocales
|
||||||
];
|
];
|
||||||
|
|
||||||
LC_ALL = "en_US.UTF-8";
|
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
pytest
|
pytest
|
||||||
mock
|
mock
|
||||||
|
@ -93,6 +89,7 @@ with localPython.pkgs; buildPythonApplication rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://aws.amazon.com/elasticbeanstalk/";
|
homepage = "https://aws.amazon.com/elasticbeanstalk/";
|
||||||
description = "A command line interface for Elastic Beanstalk";
|
description = "A command line interface for Elastic Beanstalk";
|
||||||
|
changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst";
|
||||||
maintainers = with maintainers; [ eqyiel kirillrdy ];
|
maintainers = with maintainers; [ eqyiel kirillrdy ];
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1856,6 +1856,8 @@ with pkgs;
|
||||||
|
|
||||||
git-delete-merged-branches = callPackage ../applications/version-management/git-delete-merged-branches { };
|
git-delete-merged-branches = callPackage ../applications/version-management/git-delete-merged-branches { };
|
||||||
|
|
||||||
|
git-dive = callPackage ../applications/version-management/git-dive { };
|
||||||
|
|
||||||
git-extras = callPackage ../applications/version-management/git-extras { };
|
git-extras = callPackage ../applications/version-management/git-extras { };
|
||||||
|
|
||||||
git-fame = callPackage ../applications/version-management/git-fame { };
|
git-fame = callPackage ../applications/version-management/git-fame { };
|
||||||
|
@ -24225,6 +24227,8 @@ with pkgs;
|
||||||
mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { };
|
mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
plumed = callPackage ../development/libraries/science/chemistry/plumed { };
|
||||||
|
|
||||||
### DEVELOPMENT / LIBRARIES / AGDA
|
### DEVELOPMENT / LIBRARIES / AGDA
|
||||||
|
|
||||||
agdaPackages = callPackage ./agda-packages.nix {
|
agdaPackages = callPackage ./agda-packages.nix {
|
||||||
|
@ -29946,6 +29950,8 @@ with pkgs;
|
||||||
};
|
};
|
||||||
wireshark-qt = wireshark;
|
wireshark-qt = wireshark;
|
||||||
|
|
||||||
|
qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff {};
|
||||||
|
|
||||||
tshark = wireshark-cli;
|
tshark = wireshark-cli;
|
||||||
wireshark-cli = wireshark.override {
|
wireshark-cli = wireshark.override {
|
||||||
withQt = false;
|
withQt = false;
|
||||||
|
|
Loading…
Reference in a new issue