Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-27 06:45:59 +00:00 committed by GitHub
commit f385b431a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 839 additions and 409 deletions

View file

@ -1534,6 +1534,12 @@
githubId = 510553;
name = "Jos van Bakel";
};
c4605 = {
email = "bolasblack@gmail.com";
github = "bolasblack";
githubId = 382011;
name = "c4605";
};
caadar = {
email = "v88m@posteo.net";
github = "caadar";
@ -6429,6 +6435,10 @@
githubId = 44469426;
name = "Matheus de Souza Pessanha";
email = "matheus_pessanha2001@outlook.com";
keys = [{
longkeyid = "rsa4096/6DFD656220A3B849";
fingerprint = "2D4D 488F 17FB FF75 664E C016 6DFD 6562 20A3 B849";
}];
};
meatcar = {
email = "nixpkgs@denys.me";

View file

@ -48,8 +48,9 @@ let
cluster = "local";
user = name;
};
current-context = "local";
name = "local";
}];
current-context = "local";
});
caCert = secret "ca";

View file

@ -43,17 +43,15 @@ in
enable = mkEnableOption "the Firebird super server";
package = mkOption {
default = pkgs.firebirdSuper;
defaultText = "pkgs.firebirdSuper";
default = pkgs.firebird;
defaultText = "pkgs.firebird";
type = types.package;
/*
Example: <code>package = pkgs.firebirdSuper.override { icu =
pkgs.icu; };</code> which is not recommended for compatibility
reasons. See comments at the firebirdSuper derivation
*/
example = ''
<code>package = pkgs.firebird_3;</code>
'';
description = ''
Which firebird derivation to use.
Which Firebird package to be installed: <code>pkgs.firebird_3</code>
For SuperServer use override: <code>pkgs.firebird_3.override { superServer = true; };</code>
'';
};
@ -74,7 +72,7 @@ in
};
baseDir = mkOption {
default = "/var/db/firebird"; # ubuntu is using /var/lib/firebird/2.1/data/.. ?
default = "/var/lib/firebird";
type = types.str;
description = ''
Location containing data/ and system/ directories.
@ -111,6 +109,14 @@ in
cp ${firebird}/security2.fdb "${systemDir}"
fi
if ! test -e "${systemDir}/security3.fdb"; then
cp ${firebird}/security3.fdb "${systemDir}"
fi
if ! test -e "${systemDir}/security4.fdb"; then
cp ${firebird}/security4.fdb "${systemDir}"
fi
chmod -R 700 "${dataDir}" "${systemDir}" /var/log/firebird
'';

View file

@ -9,6 +9,7 @@ let
# Disable automatically generating desktop icon
noDesktopIcon=true
noBackup=${cfg.noBackup}
[Network]
# host setting is relevant only for web deployments - set the host on which the server will listen
@ -28,7 +29,7 @@ in
type = types.str;
default = "/var/lib/trilium";
description = ''
The directory storing the nodes database and the configuration.
The directory storing the notes database and the configuration.
'';
};
@ -40,6 +41,14 @@ in
'';
};
noBackup = mkOption {
type = types.bool;
default = false;
description = ''
Disable periodic database backups.
'';
};
host = mkOption {
type = types.str;
default = "127.0.0.1";
@ -85,7 +94,7 @@ in
config = lib.mkIf cfg.enable (lib.mkMerge [
{
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = with lib.maintainers; [ fliegendewurst ];
users.groups.trilium = {};
users.users.trilium = {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.10";
version = "4.0.11";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-o3+yL81WO5/UGh0gl4MOewPHTDch/Vij8mzZWOlEkjg=";
sha256 = "sha256-GzpYwytkWZBEIVmsOmK5RTJ7lPUfDeC1204FbK4O+XQ=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-lxkLRJYdP30JNDHwa7tpugyIObmnjIBQ/HMGw6deElo=";
sha256 = "sha256-BxBrgcAJm6KM6ha494xlwiLYOSAr71gDFgqlH5RPqMM=";
};
cargoSha256 = "0gg42b6h8782wny3dr9gc38wl6bybyf4smashchgrpc649ds6w0a";
cargoSha256 = "131fkdazcspblzblmd9nhkymwn7qh6lhaqvi1jqnsq4951l9f4ms";
nativeBuildInputs = [ clang ];

View file

@ -80,8 +80,8 @@ let
auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ];
CFLAGS = "-I${pkgs.llvmPackages.clang}/include";
LDFLAGS = "-L${pkgs.llvmPackages.clang}/lib";
CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include";
LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib";
});
# part of a larger package
@ -195,7 +195,7 @@ let
dontUseCmakeBuildDir = true;
doCheck = true;
packageRequires = [ self.emacs ];
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.clang ];
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.libclang ];
});
# tries to write a log file to $HOME

View file

@ -9,7 +9,7 @@
# Attributes inherit from specific versions
, version, src, meta, sourceRoot
, executableName, longName, shortName, pname
, executableName, longName, shortName, pname, updateScript
}:
let
@ -19,7 +19,7 @@ let
inherit pname version src sourceRoot;
passthru = {
inherit executableName tests;
inherit executableName tests updateScript;
fhs = fhs {};
fhsWithPackages = f: fhs { additionalPkgs = f; };
};

View file

@ -20,9 +20,6 @@ let
}.${system};
in
callPackage ./generic.nix rec {
# The update script doesn't correctly change the hash for darwin, so please:
# nixpkgs-update: no auto update
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.56.2";
@ -40,6 +37,8 @@ in
sourceRoot = "";
updateScript = ./update-vscodium.sh;
meta = with lib; {
description = ''
Open source source code editor developed by Microsoft for Windows,

View file

@ -28,8 +28,6 @@ let
in
callPackage ./generic.nix rec {
inherit sourceRoot;
# The update script doesn't correctly change the hash for darwin, so please:
# nixpkgs-update: no auto update
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
@ -47,6 +45,8 @@ in
tests = nixosTests.vscodium;
updateScript = ./update-vscodium.sh;
meta = with lib; {
description = ''
Open source source code editor developed by Microsoft for Windows,

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
version = "2021.5.9";
version = "2021.5.10";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
sha256 = "sha256-Ojbn4QRNZWkSF9RUtFt7roGbt/6l5SFAqEXBCcTJvRI=";
sha256 = "sha256-v/ehqaI3TPhHACtxU8PRB9tGp8qrl6AN6buxOhJdevI=";
};
vendorSha256 = null;

View file

@ -0,0 +1,36 @@
{ lib, buildGoModule, fetchFromGitHub, docker }:
buildGoModule rec {
pname = "fn";
version = "0.6.6";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
sha256 = "12s3xgrr11n8kfwsh8xpwcza1pr6b200dmc9h8igjy3s3cgg6sh7";
};
vendorSha256 = null;
subPackages = ["."];
buildInputs = [
docker
];
preBuild = ''
export HOME=$TMPDIR
'';
postInstall = ''
mv $out/bin/cli $out/bin/fn
'';
meta = with lib; {
description = "Command-line tool for the fn project";
homepage = "https://fnproject.io";
license = licenses.asl20;
maintainers = [ maintainers.c4605 ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.139.6";
version = "0.139.7";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-pAo8MmQqqSICB4rguhkGHJqyB9fBBzpp7NEaa59rVb4=";
sha256 = "sha256-mxnl5ALave2E61AqJAHlLHDLHOwA2wwjs3sb4WnG82A=";
};
vendorSha256 = "sha256-Hs09CT/KSwYL2AKLseOjWB5Xvvr5TvbzwDywsGQ9kMw=";
vendorSha256 = "sha256-tdsQx2AvbRC8l7YZFBg2xVqo0CLrOOwA9Nmuei+1ozw=";
doCheck = false;

View file

@ -0,0 +1,36 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "kubeone";
version = "1.2.1";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
sha256 = "1abm7735c4pjv31pfggkvia7br19zbhjpp2w0n5zckwrjm9hxns6";
};
vendorSha256 = "01rl4sd9prfw4ivx7dwrr9irjr0xryihp4fzpcjd2zg8f1ibkwsn";
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
installShellCompletion --cmd kubeone \
--bash <($out/bin/kubeone completion bash) \
--zsh <($out/bin/kubeone completion zsh)
'';
meta = {
description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments.";
homepage = "https://kubeone.io/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ lblasc ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terraform-provider-hcloud";
version = "1.22.0";
version = "1.26.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = pname;
rev = "v${version}";
sha256 = "1h4kplrmpsbwa0nq3zyqa0cnvhv1s5avdrjyf1k1f2z6b6h4gynf";
sha256 = "04fa3qr65hg1ylq2933ark5q1za6k0a4ky36a6vrw2dcgpr4f9zs";
};
vendorSha256 = "070p34g0ca55rmfdwf1l53yr8vyhmm5sb8hm8q036n066yp03yfs";
vendorSha256 = "15gcnwylxkgjriqscd4lagmwfssagq0ksrlb2svidw9aahmr7hw0";
# Spends an awful time in other test folders, apparently tries to reach
# opencensus and fails.

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.29.2";
version = "0.29.4";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-e4DwMphX8I37MShMt5nnoizfL919mJaFCkDGNeGXHbQ=";
sha256 = "sha256-/LWzUVZAr4zw8mekcHybNuqe0wv4ZU8UcE0oGxq6jqY=";
};
vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";

View file

@ -8,17 +8,18 @@
, libdeltachat
, qtimageformats
, qtmultimedia
, qtwebengine
}:
mkDerivation rec {
pname = "kdeltachat";
version = "unstable-2021-05-18";
version = "unstable-2021-05-22";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
rev = "837336dc93b66912d48a3b7a2e8c1991b4d3650f";
sha256 = "17ms6dcfdz0y24285fqpmgvw391bxrkagsiiy4g5cyp8gfppkgaj";
rev = "9c22c6d6a03f620f14f289b464354159b8a76f6b";
sha256 = "1qmal6dng8ynp5mrkrgykz78c8zp1gbv53s479qvj0h3axrp2s8p";
};
nativeBuildInputs = [
@ -32,6 +33,7 @@ mkDerivation rec {
libdeltachat
qtimageformats
qtmultimedia
qtwebengine
];
meta = with lib; {

View file

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.47.2";
version = "0.47.3";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "04fyi0gbih6iw61b6d8lprf9qhxb6zb1pgckmi016wgv8x5ck02p";
sha256 = "05l8yiqbqh2yr4cfbivpmj5q3jyzqz86wni36wcjlcg3rccms0hc";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "1f8csjgqq4yw1qcnlrfy5ysarazmvj2fnmnxj4sr1xjbfa78y2rr";
sha256 = "03nsvalaa0rch9i1kh6p5ynnsdmidm5zrw42klj70bamviklzsnh";
};
in {

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bowtie2";
version = "2.4.3";
version = "2.4.4";
src = fetchFromGitHub {
owner = "BenLangmead";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uEKTB8935YY6lpXv2tJBQ1hrRk63vALLQb6SUXsVyhQ=";
sha256 = "sha256-2B6w6c/qztyBb1jNA0zg+udQm41ouT1DyB6Ygpi5nC8=";
};
nativeBuildInputs = [ cmake ];

View file

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.36";
version = "1.8.37";
src = fetchPypi {
inherit pname version;
sha256 = "1gc92gp45d9pcxhmc03kbnar61jxfpx50v3jhdrsflpzhxyhjz5g";
sha256 = "0527c65b55652a130c44c131cce5644cc5ac00a3f85edb81899f79f5e3ee16fb";
};
postPatch = ''

View file

@ -4,13 +4,13 @@ let
common = opts: callPackage (import ./common.nix opts);
in {
sublime-merge = common {
buildVersion = "2047";
sha256 = "03a0whifhx9py25l96xpqhb4p6hi9qmnrk2bxz6gh02sinsp3mia";
buildVersion = "2056";
sha256 = "08472214kazx9fdw7y8gy0bp63mqxcpa79myn2w95wdp0mrlr119";
} {};
sublime-merge-dev = common {
buildVersion = "2046";
sha256 = "04laygxr4vm6mawlfmdn2vj0dwj1swab39znsgb1d6rhysz62kjd";
buildVersion = "2055";
sha256 = "0f5qmxs5cqgdp7gav223ibjwbcrh8bszk1yg1a6hpz8s8j3icvdi";
dev = true;
} {};
}

View file

@ -1,33 +1,56 @@
{ lib, stdenv, fetchurl, gtk-engine-murrine }:
{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "nordic";
version = "1.9.0";
version = "unstable-2021-05-21";
srcs = [
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz";
sha256 = "12x13h9w4yqk56a009zpj1kq3vn2hn290xryfv1b0vyf2r45rsn7";
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "7e4f95ddaa8d94a66ed11a3b939cbd10864f1610";
sha256 = "079gf8gxn1d2j44nhx4jzx2hz8hpsid7xwh414fjl3g2avb7n05a";
name = "Nordic";
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
sha256 = "0f38nx1rvp9l6xz62yx6cbab4im8d425gxr52jkc8gfqpl5lrf0q";
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "0b4197e281ba306ac4918cabbd83003c38c0067d";
sha256 = "1w85i2fbils2ivwsa85g1asj2nx0p0cak840nyr58hdwky49ci5p";
name = "Nordic-standard-buttons";
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker.tar.xz";
sha256 = "0frp0jf7hbiapl3m67av7rbm3sx8db52zi3j01k2hysh6kba7x33";
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "aba3c78910de8a47950a0b2defb8022c615d91f6";
sha256 = "1746w0iahmdgw3kj1q2cswf12pf0ln7qq1grfz9sn8rjafzjchj8";
name = "Nordic-darker";
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker-standard-buttons.tar.xz";
sha256 = "0grfsjr9kq0lszmqxvjvpgvf4avm34446nqykz1zfpdg50j7r54b";
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "9946dd747e1ea05782e084d2c2d94e2e4c7605ac";
sha256 = "0mz1l1h26zhv0pnsbs0rx0xrwrn2y8g3ik0aa8ww5f411vvzgfr5";
name = "Nordic-darker-standard-buttons";
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent.tar.xz";
sha256 = "0zndldwavir22ay2r0jazpikzzww3hc09gsmbiyjmw54v29qhl9r";
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "5c0be5a783cd14af5c7647ca13d946c64e03561d";
sha256 = "0751z3b9s0ycrsha20jx8lhdgvggcl0rdgv975dpaiqqjqyd9z06";
name = "Nordic-bluish-accent";
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent-standard-buttons.tar.xz";
sha256 = "1b9d2fvdndyh7lh3xhmc75csfbapl4gv59y7wy15k2awisvlvz07";
(fetchFromGitHub {
owner = "EliverLara";
repo = pname;
rev = "9cb8d9f786614579e59ec2c3dd9fd8dd9b56316e";
sha256 = "09s9y7waygrx3p6c0c4py0ywg2ihpdmx73xhw5f92rr5nhsvish7";
name = "Nordic-bluish-accent-standard-buttons";
})
];
@ -36,15 +59,28 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
cp -a Nordic* $out/share/themes
rm $out/share/themes/*/{LICENSE,README.md}
rm -r $out/share/themes/*/.gitignore
rm -r $out/share/themes/*/Art
rm -r $out/share/themes/*/LICENSE
rm -r $out/share/themes/*/README.md
rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js}
rm -r $out/share/themes/*/src
rm -r $out/share/themes/*/cinnamon/*.scss
rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss}
rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh}
rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss}
rm -r $out/share/themes/*/kde
rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish}
runHook postInstall
'';
meta = with lib; {
description = "Dark Gtk theme created using the awesome Nord color pallete";
description = "Dark Gtk theme using the Nord color pallete";
homepage = "https://github.com/EliverLara/Nordic";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = [ maintainers.romildo ];
};

View file

@ -0,0 +1,32 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-gtile";
version = "44";
src = fetchFromGitHub {
owner = "gTile";
repo = "gTile";
rev = "V${version}";
sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s";
};
uuid = "gTile@vibou";
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp -r * $out/share/gnome-shell/extensions/${uuid}
runHook postInstall
'';
meta = with lib; {
description = "A window tiling extension for Gnome. This is the new official home of the vibou.gTile extension.";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ mdsp ];
platforms = platforms.linux;
homepage = "https://github.com/gTile/gTile";
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "filesystem";
version = "1.5.4";
version = "1.5.6";
src = fetchFromGitHub {
owner = "gulrak";
repo = "filesystem";
rev = "v${version}";
hash = "sha256-SvNUzKoNiSIM0no+A0NUT6hmeUH9SzgLQLrC5XOC0Ho=";
hash = "sha256-qnBZ9aCrCPOgxymjbzrRs0gssijo8MJOMiy7QWWMb5c=";
};
nativeBuildInputs = [ cmake ];

View file

@ -33,7 +33,7 @@
stdenv.mkDerivation rec {
pname = "mediastreamer2";
version = "4.5.1";
version = "4.5.15";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "0aqma9834lzy1593qb9qwmzvzn50y6fzhmmg493jznf8977b0gsw";
sha256 = "sha256-n/EuXEQ9nJKC32PMvWkfP1G+E6uQQuu1/A168n8/cIY=";
};
patches = [

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.6885";
version = "9.0.7491";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AtaAVfMCIzStgwwPEt+6tAzjgpSK+KhhMksYK4BH9V0=";
sha256 = "sha256-rxrj+5cz6zNsc+zgrOp8+/XY/RZG93PJQU59mMy5lDA=";
};
propagatedBuildInputs = [ pyvex ];

View file

@ -5,8 +5,8 @@
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytest-aiohttp
, pytest-asyncio
, pytest-cov
, pytestCheckHook
, python-engineio
, python-socketio
@ -27,7 +27,9 @@ buildPythonPackage rec {
sha256 = "sha256-uqvM5F0rpw+xeCXYl4lGMt3r0ugPsUmSvujmTJ9HABk=";
};
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
@ -39,13 +41,20 @@ buildPythonPackage rec {
checkInputs = [
aresponses
asynctest
pytest-aiohttp
pytest-asyncio
pytest-cov
pytestCheckHook
];
postPatch = ''
# https://github.com/bachya/aioambient/pull/84
substituteInPlace pyproject.toml \
--replace 'websockets = "^8.1"' 'websockets = ">=8.1,<10.0"'
'';
# Ignore the examples directory as the files are prefixed with test_
pytestFlagsArray = [ "--ignore examples/" ];
disabledTestPaths = [ "examples/" ];
pythonImportsCheck = [ "aioambient" ];
meta = with lib; {

View file

@ -42,14 +42,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.6885";
version = "9.0.7491";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-+d1CtouaGv2GussG3QlQMzX0qcmJht9V3QW8RwH6da8=";
sha256 = "sha256-d0EWPko3jWCexFNCWbofD6CjDIpjKb5mha2tRgtzL4M=";
};
propagatedBuildInputs = [

View file

@ -4,25 +4,34 @@
, fetchFromGitHub
, progressbar
, pythonOlder
, tqdm
}:
buildPythonPackage rec {
pname = "angrop";
version = "9.0.6885";
version = "9.0.7491";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-B/1BO0MnqklMbyXqdBPA2Dfhr4pMjIIrzXmTzr81OdY=";
sha256 = "sha256-UWqHNgJ8vUbLK3n9tvwOgHyOyTXsqRJKaAPWQfqi3lo=";
};
propagatedBuildInputs = [
angr
progressbar
tqdm
];
postPatch = ''
# https://github.com/angr/angrop/issues/35
substituteInPlace setup.py \
--replace "packages=['angrop']," "packages=find_packages()," \
--replace "from distutils.core import setup" "from setuptools import find_packages, setup"
'';
# Tests have additional requirements, e.g., angr binaries
# cle is executing the tests with the angr binaries already and is a requirement of angr
doCheck = false;

View file

@ -0,0 +1,83 @@
{ lib
, buildPythonPackage
, fetchPypi
, installShellFiles
, ansible-collections
, cryptography
, jinja2
, junit-xml
, lxml
, ncclient
, packaging
, paramiko
, pexpect
, psutil
, pycrypto
, pyyaml
, requests
, resolvelib
, scp
, windowsSupport ? false, pywinrm
, xmltodict
}:
buildPythonPackage rec {
pname = "ansible-core";
version = "2.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "1if9cybdicjhrfzi6nndqakb4sh3mw1fijhvbzbsq7ki22vwww4l";
};
# ansible_connection is already wrapped, so don't pass it through
# the python interpreter again, as it would break execution of
# connection plugins.
postPatch = ''
substituteInPlace lib/ansible/executor/task_executor.py \
--replace "[python," "["
substituteInPlace requirements.txt \
--replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib"
'';
nativeBuildInputs = [
installShellFiles
];
propagatedBuildInputs = [
# depend on ansible-collections instead of the other way around
ansible-collections
# from requirements.txt
cryptography
jinja2
packaging
pyyaml
resolvelib
# optional dependencies
junit-xml
lxml
ncclient
paramiko
pexpect
psutil
pycrypto
requests
scp
xmltodict
] ++ lib.optional windowsSupport pywinrm;
postInstall = ''
installManPage docs/man/man1/*.1
'';
# internal import errors, missing dependencies
doCheck = false;
meta = with lib; {
description = "Radically simple IT automation";
homepage = "https://www.ansible.com";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ hexa ];
};
}

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.6885";
version = "9.0.7491";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j0Hxao04ctcV8xCjQjzyQEM4Y3VCFRPuEc9NIhDRut0=";
sha256 = "sha256-5mKXpvMhdcIKgvQkmj//YigvsgozZofvv6CvMdW3BHo=";
};
checkInputs = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.6885";
version = "9.0.7491";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UCO6kXI4W/fCFgevXaRrGMjMH3ZhG7dXmFi+pemX9sE=";
sha256 = "sha256-M6Irec8p4l2WNrVeqUob3m2xF3JMtdp7I+LSi0iArZk=";
};
# Use upstream z3 implementation

View file

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.6885";
version = "9.0.7491";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ubBs55ZIGssAwD+3YsZYzDA7/dwQ+UD9GtWPDGQrO80=";
sha256 = "sha256-P126IcUpq7b8u74YJFBXluGIIru+UOCnmHYmJBiK9Pc=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,34 @@
{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }:
buildPythonPackage rec {
pname = "commentjson";
version = "0.9.0";
src = fetchFromGitHub {
owner = "vaidik";
repo = "commentjson";
rev = "v${version}";
sha256 = "sha256-dPnIcv7TIeyG7rU938w7FrDklmaGuPpXz34uw/JjOgY=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "lark-parser>=0.7.1,<0.8.0" "lark-parser"
# NixOS is missing test.test_json module
rm -r commentjson/tests/test_json
'';
propagatedBuildInputs = [ lark-parser six ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "commentjson" ];
meta = with lib; {
description = "Add JavaScript or Python style comments in JSON";
homepage = "https://github.com/vaidik/commentjson/";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "connect-box";
version = "0.2.8";
version = "0.3.0";
src = fetchPypi {
pname = "connect_box";
inherit version;
sha256 = "1lvz7g2f0a9ifnjczmbavn105miirdgyayr4sixhzgdgadcdhz3l";
sha256 = "sha256-d1KqVKaHlZDm2o1GJ7r8KoONwfd1lxXexJxavCvjfW8=";
};
propagatedBuildInputs = [

View file

@ -8,25 +8,38 @@
, geventhttpclient
, git
, glibcLocales
, gpgme
, mock
, pkgs
, urllib3
}:
buildPythonPackage rec {
version = "0.20.21";
version = "0.20.23";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rHZMmpuA+mGv40BNUnDFBgqlf38IexGpU5XTt287cf0=";
sha256 = "sha256-QC5WtcB/BAR50RiOXC9AbiwAaqOUMIAVXUxtBeX8qGU=";
};
LC_ALL = "en_US.UTF-8";
propagatedBuildInputs = [ urllib3 certifi ];
propagatedBuildInputs = [
certifi
urllib3
];
# Only test dependencies
checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ];
checkInputs = [
fastimport
gevent
geventhttpclient
git
glibcLocales
gpgme
pkgs.gnupg
mock
];
doCheck = !stdenv.isDarwin;

View file

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
version = "0.43.0";
version = "0.43.1";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
sha256 = "sha256-mfVSiquZrCtAza4q9Ocle22e4ZMoTgxguevuOlZEUm8=";
sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY=";
};
postPatch = ''

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "hatasmota";
version = "0.2.13";
version = "0.2.14";
src = fetchFromGitHub {
owner = "emontnemery";
repo = pname;
rev = version;
sha256 = "sha256-RzBEiO8IfeMls7ssCZ2yhL78UVrpZykwDl1IUshqOu8=";
sha256 = "sha256-sCGUlEN1ejWhc2+9JRQ7UPqueq30u8gGSPRxbs4cnLE=";
};
propagatedBuildInputs = [

View file

@ -77,6 +77,8 @@ buildPythonPackage rec {
"test_delete"
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "The backendi.e. core services, APIs, and REST endpointsto Jupyter web applications.";
homepage = "https://github.com/jupyter-server/jupyter_server";

View file

@ -41,6 +41,8 @@ buildPythonPackage rec {
"test_get_language_pack"
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "JupyterLab Server";
homepage = "https://jupyter.org";

View file

@ -28,6 +28,8 @@ buildPythonPackage rec {
pytest-tornasync
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Jupyter lab environment notebook server extension.";
license = with licenses; [ bsd3 ];

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyftdi";
version = "0.52.9";
version = "0.53.1";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "eblot";
repo = pname;
rev = "v${version}";
sha256 = "07q9wmpl97a6laxfbcjqhv373msbsjppsyf5i77h0f6ccil0q1i6";
sha256 = "sha256-lpNe+8DhyfVuClGcjWIA6pnfh+NwdlBGffjRH62K4uw=";
};
propagatedBuildInputs = [ pyusb pyserial ];

View file

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymazda";
version = "0.1.5";
version = "0.1.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vV7Morza6ov/rN44+7Rvo9p7DoE6jQtDk00TdrD0zBo=";
sha256 = "sha256-fQcycOMNYCO6bP344DTLxNf/YoliEITyxsnIDyTPO5E=";
};
propagatedBuildInputs = [

View file

@ -1,28 +1,21 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, nose
, pytestCheckHook
, six
, fetchPypi
}:
buildPythonPackage rec {
pname = "pysmt";
version = "0.9.0";
version = "0.9.1.dev132";
format = "wheel"; # dev versions are only distributed as wheels
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "051j36kpz11ik9bhvp5jgxzc3h7f18i1pf5ssdhjwyabr0n0zra3";
src = fetchPypi {
pname = "PySMT";
inherit format version;
sha256 = "01iqs7yzms3alf1rdv0gnsnmfp7g8plkjcdqbari258zp4llf6x7";
};
propagatedBuildInputs = [ six ];
checkInputs = [
nose
pytestCheckHook
];
# No tests present, only GitHub release which is 0.9.0
doCheck = false;
pythonImportsCheck = [ "pysmt" ];

View file

@ -2,7 +2,6 @@
, aiohttp
, async_generator
, buildPythonPackage
, doCheck ? true
, fetchFromGitHub
, httpx
, pytest
@ -13,13 +12,13 @@
buildPythonPackage rec {
pname = "pytest-sanic";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "yunstanford";
repo = pname;
rev = "v${version}";
sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi";
sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw=";
};
buildInputs = [ pytest ];
@ -37,7 +36,20 @@ buildPythonPackage rec {
pytestCheckHook
];
inherit doCheck;
disabledTests = [
# https://github.com/yunstanford/pytest-sanic/issues/51
"test_fixture_sanic_client_get"
"test_fixture_sanic_client_post"
"test_fixture_sanic_client_put"
"test_fixture_sanic_client_delete"
"test_fixture_sanic_client_patch"
"test_fixture_sanic_client_options"
"test_fixture_sanic_client_head"
"test_fixture_sanic_client_close"
"test_fixture_sanic_client_passing_headers"
"test_fixture_sanic_client_context_manager"
"test_fixture_test_client_context_manager"
];
pythonImportsCheck = [ "pytest_sanic" ];
@ -46,9 +58,5 @@ buildPythonPackage rec {
homepage = "https://github.com/yunstanford/pytest-sanic/";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
# pytest-sanic is incompatible with Sanic 21.3, see
# https://github.com/sanic-org/sanic/issues/2095 and
# https://github.com/yunstanford/pytest-sanic/issues/50.
broken = lib.versionAtLeast sanic.version "21.3.0";
};
}

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.6885";
version = "9.0.7491";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E=";
sha256 = "sha256-tKfOkW1mLa4gCweF5bGVwnS7E+dRdc/PiuOfT7AgKNo=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, commentjson
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "resolvelib";
version = "0.7.0";
src = fetchFromGitHub {
owner = "sarugaku";
repo = "resolvelib";
rev = version;
sha256 = "0r7cxwrfvpqz4kd7pdf8fsynzlmi6c754jd5hzd6vssc1zlyvvhx";
};
checkInputs = [
commentjson
pytestCheckHook
];
meta = with lib; {
description = "Resolve abstract dependencies into concrete ones";
homepage = "https://github.com/sarugaku/resolvelib";
license = licenses.isc;
maintainers = with maintainers; [ hexa ];
};
}

View file

@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "snitun";
version = "0.20";
version = "0.21.0";
src = fetchFromGitHub {
owner = "NabuCasa";
repo = pname;
rev = version;
sha256 = "1nscfwycclfbll709w1q46w6rl0r5c3b85rsc7zwc3ixd1k8aajp";
sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg=";
};
propagatedBuildInputs = [ attrs cryptography async-timeout ];

View file

@ -19,14 +19,14 @@ let
in
buildPythonPackage rec {
pname = "ttp";
version = "0.6.0";
version = "0.7.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "dmulyalin";
repo = pname;
rev = version;
sha256 = "08pglwmnhdrsj9rgys1zclhq1h597izb0jq7waahpdabfg25v2sw";
sha256 = "0gv1hykbxx3wy195xynqi21rxzlh4701qw01s6pmf3x54w63fz42";
};
propagatedBuildInputs = [
@ -76,6 +76,9 @@ buildPythonPackage rec {
"test_include_attribute_with_yaml_loader"
# TypeError: string indices must be integers
"test_lookup_include_yaml"
# Missing .xslx files *shrug*
"test_excel_formatter_update"
"test_excel_formatter_update_using_result_kwargs"
# missing package n2g
"test_n2g_formatter"
];

View file

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "xkcdpass";
version = "1.17.6";
version = "1.19.2";
src = fetchPypi {
inherit pname version;
sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy";
sha256 = "sha256-F7977Tb8iu/pRy6YhginJgK0N0G3CjPpHjomLTFf1F8=";
};
nativeBuildInputs = [ installShellFiles ];

View file

@ -1,4 +1,5 @@
{ lib
, backoff
, buildPythonPackage
, fetchFromGitHub
, requests
@ -6,16 +7,19 @@
buildPythonPackage rec {
pname = "yalesmartalarmclient";
version = "0.3.1";
version = "0.3.4";
src = fetchFromGitHub {
owner = "domwillcode";
repo = "yale-smart-alarm-client";
rev = "v${version}";
sha256 = "0fscp9n66h8a8khvjs2rjgm95xsdckpknadnyxqdmhw3hlj0aw6h";
sha256 = "sha256-waWi3QnH7xQZh5iYklISCvfAaBdH5k+Y10huZuTNlSc=";
};
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [
backoff
requests
];
# Project has no tests
doCheck = false;
@ -23,7 +27,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to interface with Yale Smart Alarm Systems";
homepage = "https://github.com/mampfes/python-wiffi";
homepage = "https://github.com/domwillcode/yale-smart-alarm-client";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "7.3.0";
version = "7.4.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "158bpk4czfv2kkh1al1bb42jb0h3mbx9r72dk6crr2gg0bhabn8m";
sha256 = "1xhjmn6cwpdph12k4gbl2f1v72bp689779l5i16i90i01m31kwjp";
};
passthru.updateScript = ./update.sh;

View file

@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
zlib
];
# The conftest hangs on Hydra runners, because they are not logged in.
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
meta = with lib; {
description = "Jump and run game, reimplementation of Tower Toppler/Nebulus";
homepage = "http://toppler.sourceforge.net/";

View file

@ -1,28 +1,30 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert
, SDL2, libX11, libgdiplus, ffmpeg, openal, libsoundio
, libX11, libgdiplus, ffmpeg
, SDL2_mixer, openal, libsoundio, sndio
, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
}:
let
runtimeDeps = [
SDL2
gtk3
libX11
libgdiplus
ffmpeg
SDL2_mixer
openal
libsoundio
sndio
];
in stdenv.mkDerivation rec {
pname = "ryujinx";
version = "1.0.6835"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
version = "1.0.6893"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "e520eecb5ba682d4b51bb782e3bc99fb1d6afe04";
sha256 = "1yy1xslnvvl0m7g0jszj2pjwdwf0pbv53crzfkhla3n68kvfy00f";
rev = "fb65f392d1c4b0e01f22b6ddebcc8317ba9769c3";
sha256 = "0ncrcbwyirz21j81vc6yvcjc2fn8nc5ilrfczclq6f8cpy09c3y8";
};
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];

View file

@ -21,13 +21,13 @@
})
(fetchNuGet {
name = "DiscordRichPresence";
version = "1.0.166";
sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a";
version = "1.0.175";
sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd";
})
(fetchNuGet {
name = "FFmpeg.AutoGen";
version = "4.3.0";
sha256 = "03lb3xzgwxik8nljq87pr1b9bsxbsl3a4kvy0kqkw9f57n29ihvk";
version = "4.4.0";
sha256 = "02n4az1jv30078019png9gbspygz051inxsn6w4iar20dqp55g2w";
})
(fetchNuGet {
name = "GdkSharp";
@ -44,16 +44,16 @@
version = "3.22.25.128";
sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5";
})
(fetchNuGet {
name = "GtkSharp";
version = "3.22.25.128";
sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy";
})
(fetchNuGet {
name = "GtkSharp.Dependencies";
version = "1.1.0";
sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn";
})
(fetchNuGet {
name = "GtkSharp";
version = "3.22.25.128";
sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy";
})
(fetchNuGet {
name = "LibHac";
version = "0.12.0";
@ -89,6 +89,11 @@
version = "1.0.0";
sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x";
})
(fetchNuGet {
name = "Microsoft.NET.Test.Sdk";
version = "16.8.0";
sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9";
})
(fetchNuGet {
name = "Microsoft.NETCore.App.Host.osx-x64";
version = "5.0.5";
@ -144,11 +149,6 @@
version = "1.1.0";
sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
})
(fetchNuGet {
name = "Microsoft.NET.Test.Sdk";
version = "16.8.0";
sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9";
})
(fetchNuGet {
name = "Microsoft.TestPlatform.ObjectModel";
version = "16.8.0";
@ -279,26 +279,21 @@
version = "4.3.0";
sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn";
})
(fetchNuGet {
name = "runtime.any.System.Globalization";
version = "4.3.0";
sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x";
})
(fetchNuGet {
name = "runtime.any.System.Globalization.Calendars";
version = "4.3.0";
sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201";
})
(fetchNuGet {
name = "runtime.any.System.Globalization";
version = "4.3.0";
sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x";
})
(fetchNuGet {
name = "runtime.any.System.IO";
version = "4.3.0";
sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x";
})
(fetchNuGet {
name = "runtime.any.System.Reflection";
version = "4.3.0";
sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly";
})
(fetchNuGet {
name = "runtime.any.System.Reflection.Extensions";
version = "4.3.0";
@ -309,16 +304,16 @@
version = "4.3.0";
sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf";
})
(fetchNuGet {
name = "runtime.any.System.Reflection";
version = "4.3.0";
sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly";
})
(fetchNuGet {
name = "runtime.any.System.Resources.ResourceManager";
version = "4.3.0";
sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl";
})
(fetchNuGet {
name = "runtime.any.System.Runtime";
version = "4.3.0";
sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";
})
(fetchNuGet {
name = "runtime.any.System.Runtime.Handles";
version = "4.3.0";
@ -330,15 +325,20 @@
sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19";
})
(fetchNuGet {
name = "runtime.any.System.Text.Encoding";
name = "runtime.any.System.Runtime";
version = "4.3.0";
sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3";
sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";
})
(fetchNuGet {
name = "runtime.any.System.Text.Encoding.Extensions";
version = "4.3.0";
sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8";
})
(fetchNuGet {
name = "runtime.any.System.Text.Encoding";
version = "4.3.0";
sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3";
})
(fetchNuGet {
name = "runtime.any.System.Threading.Tasks";
version = "4.3.0";
@ -364,16 +364,6 @@
version = "4.3.0";
sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
})
(fetchNuGet {
name = "runtime.native.System";
version = "4.0.0";
sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
})
(fetchNuGet {
name = "runtime.native.System";
version = "4.3.0";
sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
})
(fetchNuGet {
name = "runtime.native.System.IO.Compression";
version = "4.1.0";
@ -384,15 +374,25 @@
version = "4.0.1";
sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
})
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
})
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography";
version = "4.0.0";
sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
})
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography.OpenSsl";
name = "runtime.native.System";
version = "4.0.0";
sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
})
(fetchNuGet {
name = "runtime.native.System";
version = "4.3.0";
sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
})
(fetchNuGet {
name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
@ -511,8 +511,8 @@
})
(fetchNuGet {
name = "Ryujinx.Graphics.Nvdec.Dependencies";
version = "4.3.0";
sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll";
version = "4.4.0-build7";
sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m";
})
(fetchNuGet {
name = "SharpZipLib";
@ -524,20 +524,20 @@
version = "1.0.0-beta0013";
sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql";
})
(fetchNuGet {
name = "SixLabors.ImageSharp";
version = "1.0.2";
sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj";
})
(fetchNuGet {
name = "SixLabors.ImageSharp.Drawing";
version = "1.0.0-beta11";
sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5";
})
(fetchNuGet {
name = "SixLabors.ImageSharp";
version = "1.0.2";
sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj";
})
(fetchNuGet {
name = "SPB";
version = "0.0.2";
sha256 = "178z9mi7zlk0laj79nkjh75ych47jjajiaj33hnh7zfmz05d8h6r";
version = "0.0.3-build15";
sha256 = "0h00yi2j65q31r5npsziq2rpiw832vf9r72j1hjqibp2l5m6v6yw";
})
(fetchNuGet {
name = "System.AppContext";
@ -564,16 +564,6 @@
version = "5.0.0";
sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh";
})
(fetchNuGet {
name = "System.Collections";
version = "4.0.11";
sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
})
(fetchNuGet {
name = "System.Collections";
version = "4.3.0";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
})
(fetchNuGet {
name = "System.Collections.Concurrent";
version = "4.0.12";
@ -590,9 +580,14 @@
sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
})
(fetchNuGet {
name = "System.ComponentModel";
name = "System.Collections";
version = "4.0.11";
sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
})
(fetchNuGet {
name = "System.Collections";
version = "4.3.0";
sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
})
(fetchNuGet {
name = "System.ComponentModel.EventBasedAsync";
@ -609,6 +604,11 @@
version = "4.3.0";
sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
})
(fetchNuGet {
name = "System.ComponentModel";
version = "4.3.0";
sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
})
(fetchNuGet {
name = "System.Console";
version = "4.0.0";
@ -659,16 +659,6 @@
version = "4.0.11";
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
})
(fetchNuGet {
name = "System.Globalization";
version = "4.0.11";
sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
})
(fetchNuGet {
name = "System.Globalization";
version = "4.3.0";
sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
})
(fetchNuGet {
name = "System.Globalization.Calendars";
version = "4.0.1";
@ -685,19 +675,14 @@
sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
})
(fetchNuGet {
name = "System.IO";
version = "4.1.0";
sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
name = "System.Globalization";
version = "4.0.11";
sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
})
(fetchNuGet {
name = "System.IO";
name = "System.Globalization";
version = "4.3.0";
sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
})
(fetchNuGet {
name = "System.IO.Compression";
version = "4.1.0";
sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
})
(fetchNuGet {
name = "System.IO.Compression.ZipFile";
@ -705,14 +690,9 @@
sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
})
(fetchNuGet {
name = "System.IO.FileSystem";
version = "4.0.1";
sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
})
(fetchNuGet {
name = "System.IO.FileSystem";
version = "4.3.0";
sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
name = "System.IO.Compression";
version = "4.1.0";
sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
})
(fetchNuGet {
name = "System.IO.FileSystem.Primitives";
@ -724,6 +704,31 @@
version = "4.3.0";
sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
})
(fetchNuGet {
name = "System.IO.FileSystem";
version = "4.0.1";
sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
})
(fetchNuGet {
name = "System.IO.FileSystem";
version = "4.3.0";
sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
})
(fetchNuGet {
name = "System.IO";
version = "4.1.0";
sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
})
(fetchNuGet {
name = "System.IO";
version = "4.3.0";
sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
})
(fetchNuGet {
name = "System.Linq.Expressions";
version = "4.1.0";
sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
})
(fetchNuGet {
name = "System.Linq";
version = "4.1.0";
@ -734,11 +739,6 @@
version = "4.3.0";
sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
})
(fetchNuGet {
name = "System.Linq.Expressions";
version = "4.1.0";
sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
})
(fetchNuGet {
name = "System.Management";
version = "5.0.0";
@ -784,26 +784,6 @@
version = "4.3.0";
sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx";
})
(fetchNuGet {
name = "System.Reflection";
version = "4.1.0";
sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
})
(fetchNuGet {
name = "System.Reflection";
version = "4.3.0";
sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.0.1";
sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.3.0";
sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
})
(fetchNuGet {
name = "System.Reflection.Emit.ILGeneration";
version = "4.0.1";
@ -824,6 +804,16 @@
version = "4.3.0";
sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.0.1";
sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.3.0";
sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
})
(fetchNuGet {
name = "System.Reflection.Extensions";
version = "4.0.1";
@ -854,6 +844,16 @@
version = "4.3.0";
sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1";
})
(fetchNuGet {
name = "System.Reflection";
version = "4.1.0";
sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
})
(fetchNuGet {
name = "System.Reflection";
version = "4.3.0";
sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
})
(fetchNuGet {
name = "System.Resources.ResourceManager";
version = "4.0.1";
@ -864,16 +864,6 @@
version = "4.3.0";
sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
})
(fetchNuGet {
name = "System.Runtime";
version = "4.1.0";
sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
})
(fetchNuGet {
name = "System.Runtime";
version = "4.3.0";
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
})
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.7.0";
@ -904,16 +894,6 @@
version = "4.3.0";
sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
})
(fetchNuGet {
name = "System.Runtime.InteropServices";
version = "4.1.0";
sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
})
(fetchNuGet {
name = "System.Runtime.InteropServices";
version = "4.3.0";
sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
})
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.0.0";
@ -924,6 +904,16 @@
version = "4.3.0";
sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
})
(fetchNuGet {
name = "System.Runtime.InteropServices";
version = "4.1.0";
sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
})
(fetchNuGet {
name = "System.Runtime.InteropServices";
version = "4.3.0";
sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
})
(fetchNuGet {
name = "System.Runtime.Numerics";
version = "4.0.1";
@ -934,6 +924,16 @@
version = "4.1.1";
sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
})
(fetchNuGet {
name = "System.Runtime";
version = "4.1.0";
sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
})
(fetchNuGet {
name = "System.Runtime";
version = "4.3.0";
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
})
(fetchNuGet {
name = "System.Security.AccessControl";
version = "4.5.0";
@ -984,11 +984,6 @@
version = "4.1.0";
sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
})
(fetchNuGet {
name = "System.Security.Principal";
version = "4.3.0";
sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf";
})
(fetchNuGet {
name = "System.Security.Principal.Windows";
version = "4.3.0";
@ -1005,14 +1000,9 @@
sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
})
(fetchNuGet {
name = "System.Text.Encoding";
version = "4.0.11";
sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
})
(fetchNuGet {
name = "System.Text.Encoding";
name = "System.Security.Principal";
version = "4.3.0";
sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf";
})
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
@ -1024,6 +1014,16 @@
version = "4.3.0";
sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
})
(fetchNuGet {
name = "System.Text.Encoding";
version = "4.0.11";
sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
})
(fetchNuGet {
name = "System.Text.Encoding";
version = "4.3.0";
sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
})
(fetchNuGet {
name = "System.Text.RegularExpressions";
version = "4.1.0";
@ -1034,31 +1034,11 @@
version = "4.3.0";
sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
})
(fetchNuGet {
name = "System.Threading";
version = "4.0.11";
sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
})
(fetchNuGet {
name = "System.Threading";
version = "4.3.0";
sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
})
(fetchNuGet {
name = "System.Threading.Overlapped";
version = "4.3.0";
sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm";
})
(fetchNuGet {
name = "System.Threading.Tasks";
version = "4.0.11";
sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
})
(fetchNuGet {
name = "System.Threading.Tasks";
version = "4.3.0";
sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.0.0";
@ -1069,6 +1049,16 @@
version = "4.3.0";
sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
})
(fetchNuGet {
name = "System.Threading.Tasks";
version = "4.0.11";
sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
})
(fetchNuGet {
name = "System.Threading.Tasks";
version = "4.3.0";
sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
})
(fetchNuGet {
name = "System.Threading.Thread";
version = "4.3.0";
@ -1084,6 +1074,16 @@
version = "4.0.1";
sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
})
(fetchNuGet {
name = "System.Threading";
version = "4.0.11";
sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
})
(fetchNuGet {
name = "System.Threading";
version = "4.3.0";
sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
})
(fetchNuGet {
name = "System.Xml.ReaderWriter";
version = "4.0.11";
@ -1104,14 +1104,14 @@
version = "4.3.0";
sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
})
(fetchNuGet {
name = "System.Xml.XPath";
version = "4.3.0";
sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci";
})
(fetchNuGet {
name = "System.Xml.XPath.XmlDocument";
version = "4.3.0";
sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm";
})
(fetchNuGet {
name = "System.Xml.XPath";
version = "4.3.0";
sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci";
})
]

View file

@ -1,8 +1,16 @@
diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs
index 20c0fb46..534576bc 100644
--- a/Ryujinx.Common/Configuration/LoggerModule.cs
+++ b/Ryujinx.Common/Configuration/LoggerModule.cs
@@ -75,7 +75,7 @@ namespace Ryujinx.Configuration
diff --git a/Ryujinx/Configuration/LoggerModule.cs b/Ryujinx/Configuration/LoggerModule.cs
index 44631ea0..534576bc 100644
--- a/Ryujinx/Configuration/LoggerModule.cs
+++ b/Ryujinx/Configuration/LoggerModule.cs
@@ -1,6 +1,7 @@
using Ryujinx.Common;
using Ryujinx.Common.Logging;
using System;
+using System.IO;
namespace Ryujinx.Configuration
{
@@ -74,7 +75,7 @@ namespace Ryujinx.Configuration
if (e.NewValue)
{
Logger.AddTarget(new AsyncLogTargetWrapper(

View file

@ -76,8 +76,8 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20201206";
sha256 = "1xs09v1zr98yvwvdsmzgryc2hbk92mwn54yxx8162l461465razc";
version = "20210206";
sha256 = "sha256-tnwownY9A05nYlkYaoCQZjeGGHuE+kJYzA7MPE2bXnQ=";
owner = "Winetricks";
repo = "winetricks";
rev = version;

View file

@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DYUZU_USE_BUNDLED_QT=OFF"
"-DYUZU_USE_BUNDLED_SDL2=OFF"
"-DYUZU_USE_BUNDLED_FFMPEG=OFF"
"-DENABLE_QT_TRANSLATION=ON"
"-DYUZU_USE_QT_WEB_ENGINE=ON"
"-DUSE_DISCORD_PRESENCE=ON"

View file

@ -4,25 +4,25 @@ let
in {
mainline = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-mainline";
version = "576";
version = "633";
branchName = branch;
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline";
rev = "mainline-0-${version}";
sha256 = "121pn3kmghpcf4pzs0mc8z3viyp32rzm7rssva7cdd5016z2648k";
sha256 = "1zq20dd6x3kk179ls7y3mc5rj9vr73qs12bdj52bl3kscphxybf1";
fetchSubmodules = true;
};
};
early-access = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-ea";
version = "1536";
version = "1704";
branchName = branch;
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
sha256 = "0smrx05xxr4b96i8bw6n6pynkl9r21ydfvpjdzxkr9amin20r54y";
sha256 = "07pcldcmn8ammzbnxki6by7hgacr6z0548dvhv2p5lp9qcf3xz22";
};
};
}.${branch}

View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.12.5";
version = "5.12.7";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@ -12,7 +12,7 @@ in
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-u9ebl2M8zrCNdangcUdk/78KwPCYV41PIB6YKTqCgIY=";
sha256 = "sha256-zwaCQ0qMp6LCyWZikyyDyTktBlYEvJqJX46uiRCOUz4=";
extraPostFetch = ''
rm $out/.config
'';

View file

@ -74,5 +74,6 @@ stdenv.mkDerivation {
description = "Linux tools to profile with performance counters";
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;
broken = kernel.kernelOlder "5";
};
}

View file

@ -32,5 +32,6 @@ stdenv.mkDerivation {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ uralbash ];
platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.4";
};
}

View file

@ -9,7 +9,7 @@ let base = {
changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md";
license = [ "IDPL" "Interbase-1.0" ];
platforms = platforms.linux;
maintainers = with maintainers; [ marcweber ];
maintainers = with maintainers; [ marcweber superherointj ];
};
nativeBuildInputs = [ autoreconfHook ];
@ -29,7 +29,7 @@ let base = {
runHook postInstall
'';
}; in {
}; in rec {
firebird_2_5 = stdenv.mkDerivation (base // rec {
version = "2.5.9";
@ -69,16 +69,17 @@ let base = {
});
firebird_4 = stdenv.mkDerivation (base // rec {
version = "4.0.0-rc1";
version = "4.0.0";
src = fetchFromGitHub {
owner = "FirebirdSQL";
repo = "firebird";
rev = "T4_0_0_RC1";
sha256 = "sha256-FLaRePosF5dtJ+fmrfvzkE6wawC9Z9YLhT/ZWkwWXb4=";
rev = "v${version}";
sha256 = "sha256-a4ex19FMfiJsUEhWUYd2YXKgJ24Jnpoab2t6x9sUuyQ=";
};
buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ];
});
firebird = firebird_4;
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "agate";
version = "3.0.2";
version = "3.0.3";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+X1ibnYAUB34u8+oNBSkjLtsArxlrg0Nq5zJrXi7Rfk=";
sha256 = "sha256-0sh9OuX52kvhTt681uZesOUttrxH8ZMxn6mTILQDQuU=";
};
cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko=";
cargoSha256 = "sha256-JBmSa2sc/eor0bCcIMhGGLmcJN+wCloP0Ao9DBybQbc=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

View file

@ -1,7 +1,9 @@
{ python3Packages, fetchurl, fetchFromGitHub }:
rec {
ansible = ansible_2_10;
ansible = ansible_2_11;
ansible_2_11 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "trivy";
version = "0.18.2";
version = "0.18.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5Ub78Js4KM1meXN5e1cwO8gb065cyGGNlsj4CGBIhTU=";
sha256 = "sha256-YQYDDg4rgLygswGl/IYb+USSsuXQ8kXh4NhQYvnaCko=";
};
vendorSha256 = "sha256-R1FX6BrzXP5HkqoYtY3f/oACAFLxIvcjiOyfq6YZezk=";
vendorSha256 = "sha256-f1un8jWhx7VfbbYV0/t3SLFXp496Wt5aEHkcuj/U4KQ=";
excludedPackages = "misc";

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "bacula";
version = "11.0.2";
version = "11.0.3";
src = fetchurl {
url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
sha256 = "sha256-ooaKsNhUIxubAlGt6fUAkbD+PDMfkq+6lnK4G9lp4C8=";
sha256 = "sha256-AVh3NPdJD8t3N4AbLh/hsflHB7s/sLcbNnE8eqsDkjw=";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]

View file

@ -2,22 +2,28 @@
stdenv.mkDerivation rec {
pname = "betterdiscordctl";
version = "1.7.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "bb010g";
repo = "betterdiscordctl";
rev = "v${version}";
sha256 = "12c3phcfwl4p2jfh22ihm57vxw4nq5kwqirb7y4gzc91swfh5yj1";
sha256 = "1wys3wbcz5hq8275ia2887kr5fzz4b3gkcp56667j9k0p3k3zfac";
};
preBuild = "sed -i 's/^nix=$/&yes/g;s/^DISABLE_UPGRADE=$/&yes/g' ./betterdiscordctl";
postPatch = ''
substituteInPlace betterdiscordctl \
--replace "DISABLE_SELF_UPGRADE=" "DISABLE_SELF_UPGRADE=yes"
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/doc/betterdiscordctl
runHook preInstall
mkdir -p "$out/bin" "$out/share/doc/betterdiscordctl"
install -Dm744 betterdiscordctl $out/bin/betterdiscordctl
install -Dm644 README.md $out/share/doc/betterdiscordctl/README.md
runHook postInstall
'';
meta = with lib; {

View file

@ -16,20 +16,20 @@
mkDerivation rec {
pname = "rpi-imager";
version = "1.6";
version = "1.6.2";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wX9EO5hgEM2ftOov0AERloH6GxrwptWltBYWLFXkPUw=";
sha256 = "sha256-ITn31ENEf2bysgJgV3u+NNPXk1pfIkUyJWIvS2DOrzY=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake util-linux ];
buildInputs = [
curl
libarchive
util-linux
qtbase
qtdeclarative
qtsvg
@ -46,6 +46,7 @@ mkDerivation rec {
meta = with lib; {
description = "Raspberry Pi Imaging Utility";
homepage = "https://www.raspberrypi.org/software/";
downloadPage = "https://github.com/raspberrypi/rpi-imager/";
license = licenses.asl20;
maintainers = with maintainers; [ ymarkus ];
platforms = platforms.all;

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.2.2";
version = "0.2.3";
src =
let
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
x86_64-darwin = "darwin_amd64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-K9WlOS9pRhBcoGaSZ3AhbGoTfKUrn4SDq50x6wnIib8=";
aarch64-linux = "sha256-BRm0Hy9vuxZSYINrPIMwl2UGZdWTSixLT8EJ1OzCGMg=";
x86_64-darwin = "sha256-pinmzz6GbQWAj3Ut/IB2o75w8X+CS2tXhE6nekYO4vc=";
x86_64-linux = "sha256-tfTyhuQaVh0F1HvFS+ToDk/lJEHEYMQVNFpdEjABer4=";
aarch64-linux = "sha256-0g6nYoNgu3C/r4fgKuZBrzTjpt14lQf2rpbVMS9CEZE=";
x86_64-darwin = "sha256-er1bDqi+PDucwUSsWDi8z1fUZTz7epq6HE6cOLTN3SE=";
};
in
fetchzip {

View file

@ -1,5 +1,5 @@
{ stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security
, libiconv }:
, libiconv, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "xh";
@ -9,19 +9,27 @@ rustPlatform.buildRustPackage rec {
owner = "ducaale";
repo = "xh";
rev = "v${version}";
sha256 = "sha256-eOP9sc1qmQuc3HecNNZDMarVkXmEfGZkan0H9598LC0=";
sha256 = "0b9cgjgzf1vxd9j6cz44g68xbaii8gb3973pvjf0p6barnqzvqvq";
};
cargoSha256 = "sha256-JXywHuZPQVhuWBVUNi9k8TwgE8KCNDtucjxxDi6unVM=";
cargoSha256 = "0lwxmqp0ww9wf9p3nd42q89j0g7ichpkcm0mb1p5hhagwqgb0z15";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ];
# Get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = 1;
checkFlagsArray = [ "--skip=basic_options" ];
postInstall = ''
installShellCompletion --cmd xh \
--bash completions/xh.bash \
--fish completions/xh.fish \
--zsh completions/_xh
# https://github.com/ducaale/xh#xh-and-xhs
ln -s $out/bin/xh $out/bin/xhs
'';
# Nix build happens in sandbox without internet connectivity
# disable tests as some of them require internet due to nature of application
@ -29,10 +37,11 @@ rustPlatform.buildRustPackage rec {
doInstallCheck = true;
postInstallCheck = ''
$out/bin/xh --help > /dev/null
$out/bin/xhs --help > /dev/null
'';
meta = with lib; {
description = "Yet another HTTPie clone in Rust";
description = "Friendly and fast tool for sending HTTP requests";
homepage = "https://github.com/ducaale/xh";
changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md";
license = licenses.mit;

View file

@ -0,0 +1,30 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "sammler";
version = "20210523-${lib.strings.substring 0 7 rev}";
rev = "259b9fc6155f40758e5fa480683467c35df746e7";
src = fetchFromGitHub {
owner = "redcode-labs";
repo = "Sammler";
inherit rev;
sha256 = "1gsv83sbqc9prkigbjvkhh547w12l3ynbajpnbqyf8sz4bd1nj5c";
};
vendorSha256 = "1510rhdac8v21kpp00q8yy6b13hgac8547d7f5q7nwrgnihg03w4";
subPackages = [ "." ];
runVend = true;
meta = with lib; {
description = "Tool to extract useful data from documents";
homepage = "https://github.com/redcode-labs/Sammler";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "step-ca";
version = "0.15.11";
version = "0.15.15";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
sha256 = "wFRs3n6V0z2keNVtqFw1q5jpA6BvNK5EftsNhichfsY=";
sha256 = "sha256-YYYpMHEis/zoRsdwW70X8zn0FMsW+2vMYdlWxr3qqzY==";
};
vendorSha256 = "f1NdszqYYx6X1HqwqG26jjfjXq1gDXLOrh64ccKRQ90=";
vendorSha256 = "sha256-mjj+70/ioqcchB3X5vZPb0Oa7lA/qKh5zEpidT0jrEs=";
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];

View file

@ -1,26 +1,24 @@
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
}:
buildGoModule rec {
pname = "step-cli";
version = "0.15.3-22-g3ddc5aa";
version = "0.15.16";
# 0.15.3 isn't enough, because we need https://github.com/smallstep/cli/pull/394
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3";
sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0";
rev = "v${version}";
sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I=";
};
preCheck = ''
# Tries to connect to smallstep.com
rm command/certificate/remote_test.go
'';
vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10";
vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM=";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

View file

@ -3131,7 +3131,6 @@ in
step-ca = callPackage ../tools/security/step-ca {
inherit (darwin.apple_sdk.frameworks) PCSC;
buildGoModule = buildGo115Module;
};
step-cli = callPackage ../tools/security/step-cli { };
@ -8370,6 +8369,8 @@ in
saml2aws = callPackage ../tools/security/saml2aws {};
sammler = callPackage ../tools/security/sammler {};
samplicator = callPackage ../tools/networking/samplicator { };
sandboxfs = callPackage ../tools/filesystems/sandboxfs { };
@ -12610,7 +12611,8 @@ in
ansible
ansible_2_8
ansible_2_9
ansible_2_10;
ansible_2_10
ansible_2_11;
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
@ -13442,6 +13444,8 @@ in
kubei = callPackage ../tools/security/kubei { };
kubeone = callPackage ../applications/networking/cluster/kubeone { };
kubeprompt = callPackage ../development/tools/kubeprompt { };
kubesec = callPackage ../tools/security/kubesec { };
@ -19014,8 +19018,7 @@ in
fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5;
firebird = firebird_3;
inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird;
freeradius = callPackage ../servers/freeradius { };
@ -30089,6 +30092,8 @@ in
atlantis = callPackage ../applications/networking/cluster/atlantis { };
fn-cli = callPackage ../applications/networking/cluster/fn-cli { };
auctex = callPackage ../tools/typesetting/tex/auctex { };
areca = callPackage ../applications/backup/areca {

View file

@ -419,6 +419,8 @@ in {
ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { };
ansible-core = callPackage ../development/python-modules/ansible/core.nix { };
ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
ansible-lint = callPackage ../development/python-modules/ansible-lint { };
@ -1521,6 +1523,8 @@ in {
commandparse = callPackage ../development/python-modules/commandparse { };
commentjson = callPackage ../development/python-modules/commentjson { };
commoncode = callPackage ../development/python-modules/commoncode { };
CommonMark = callPackage ../development/python-modules/commonmark { };
@ -7212,6 +7216,8 @@ in {
resampy = callPackage ../development/python-modules/resampy { };
resolvelib = callPackage ../development/python-modules/resolvelib { };
responses = callPackage ../development/python-modules/responses { };
respx = callPackage ../development/python-modules/respx { };
@ -7406,11 +7412,6 @@ in {
samsungtvws = callPackage ../development/python-modules/samsungtvws { };
sanic = callPackage ../development/python-modules/sanic {
# pytest-sanic is doing ok for the sole purpose of testing Sanic.
pytest-sanic = self.pytest-sanic.overridePythonAttrs (oldAttrs: {
doCheck = false;
meta.broken = false;
});
# Don't pass any `sanic` to avoid dependency loops. `sanic-testing`
# has special logic to disable tests when this is the case.
sanic-testing = self.sanic-testing.override { sanic = null; };