Merge staging-next into staging
This commit is contained in:
commit
cbbcb5c1aa
|
@ -39,6 +39,7 @@ let
|
|||
|
||||
erlang-ls = callPackage ./erlang-ls { };
|
||||
erlfmt = callPackage ./erlfmt { };
|
||||
elvis-erlang = callPackage ./elvis-erlang { };
|
||||
|
||||
# BEAM-based languages.
|
||||
elixir = elixir_1_12;
|
||||
|
|
46
pkgs/development/beam-modules/elvis-erlang/default.nix
Normal file
46
pkgs/development/beam-modules/elvis-erlang/default.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{ fetchFromGitHub, fetchgit, fetchHex, rebar3WithPlugins, rebar3-nix, rebar3Relx
|
||||
, buildRebar3, writeScript, lib }:
|
||||
|
||||
let
|
||||
owner = "inaka";
|
||||
repo = "elvis";
|
||||
in rebar3Relx rec {
|
||||
releaseType = "escript";
|
||||
# The package name "elvis" is already taken
|
||||
pname = "elvis-erlang";
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "139mgd4cwc0vazxfnssyym61jd9g45wn1nc53mjfzx5dkrrn4dc5";
|
||||
rev = version;
|
||||
};
|
||||
beamDeps = builtins.attrValues (import ./rebar-deps.nix {
|
||||
inherit fetchHex fetchgit fetchFromGitHub;
|
||||
builder = buildRebar3;
|
||||
});
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash common-updater-scripts git nix-prefetch-git gnutar gzip "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}"
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sort -V | tail -1)
|
||||
if [ "$latest" != "${version}" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
nix_path="$nixpkgs/pkgs/development/beam-modules/elvis-erlang"
|
||||
update-source-version elvis-erlang "$latest" --version-key=version --print-changes --file="$nix_path/default.nix"
|
||||
tmpdir=$(mktemp -d)
|
||||
cp -R $(nix-build $nixpkgs --no-out-link -A elvis-erlang.src)/* "$tmpdir"
|
||||
(cd "$tmpdir" && HOME=. rebar3 nix lock -o "$nix_path/rebar-deps.nix")
|
||||
else
|
||||
echo "${repo} is already up-to-date"
|
||||
fi
|
||||
'';
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/inaka/elvis";
|
||||
description = "Erlang Style Reviewer";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dlesl ];
|
||||
};
|
||||
}
|
168
pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
Normal file
168
pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
Normal file
|
@ -0,0 +1,168 @@
|
|||
# Generated by rebar3_nix
|
||||
let fetchOnly = { src, ... }: src;
|
||||
in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }:
|
||||
let
|
||||
self = packages // (overrides self packages);
|
||||
packages = with self; {
|
||||
unicode_util_compat = builder {
|
||||
name = "unicode_util_compat";
|
||||
version = "0.7.0";
|
||||
src = fetchHex {
|
||||
pkg = "unicode_util_compat";
|
||||
version = "0.7.0";
|
||||
sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
ssl_verify_fun = builder {
|
||||
name = "ssl_verify_fun";
|
||||
version = "1.1.6";
|
||||
src = fetchHex {
|
||||
pkg = "ssl_verify_fun";
|
||||
version = "1.1.6";
|
||||
sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
parse_trans = builder {
|
||||
name = "parse_trans";
|
||||
version = "3.4.0";
|
||||
src = fetchHex {
|
||||
pkg = "parse_trans";
|
||||
version = "3.4.0";
|
||||
sha256 = "sha256-+Z42iDC+pEVSIk434ElDpUh08IuFkEhd6NE4MrY6LcM=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
mimerl = builder {
|
||||
name = "mimerl";
|
||||
version = "1.2.0";
|
||||
src = fetchHex {
|
||||
pkg = "mimerl";
|
||||
version = "1.2.0";
|
||||
sha256 = "sha256-8nhYVlCqWBmGJkY46/aY+LsZ3yl/Zq2RsYkQ38bhkyM=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
metrics = builder {
|
||||
name = "metrics";
|
||||
version = "1.0.1";
|
||||
src = fetchHex {
|
||||
pkg = "metrics";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-abCa3dxPdKQHFq5U0UD5O+sPuJeNhjbq3tDDG28JnxY=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
idna = builder {
|
||||
name = "idna";
|
||||
version = "6.1.1";
|
||||
src = fetchHex {
|
||||
pkg = "idna";
|
||||
version = "6.1.1";
|
||||
sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo=";
|
||||
};
|
||||
beamDeps = [ unicode_util_compat ];
|
||||
};
|
||||
certifi = builder {
|
||||
name = "certifi";
|
||||
version = "2.6.1";
|
||||
src = fetchHex {
|
||||
pkg = "certifi";
|
||||
version = "2.6.1";
|
||||
sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
zipper = builder {
|
||||
name = "zipper";
|
||||
version = "1.0.1";
|
||||
src = fetchHex {
|
||||
pkg = "zipper";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
lager = builder {
|
||||
name = "lager";
|
||||
version = "3.9.1";
|
||||
src = fetchHex {
|
||||
pkg = "lager";
|
||||
version = "3.9.1";
|
||||
sha256 = "sha256-P1m6daBKmeXxi/kcifRtzlNvg8bLQV/ibm51pivvN9w=";
|
||||
};
|
||||
beamDeps = [ goldrush ];
|
||||
};
|
||||
katana_code = builder {
|
||||
name = "katana_code";
|
||||
version = "1.1.2";
|
||||
src = fetchHex {
|
||||
pkg = "katana_code";
|
||||
version = "1.1.2";
|
||||
sha256 = "sha256-5+YWKkToJqA/aLUDt9kpgbiUv4NMHvDmR3g/fWaIAhw=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
jsx = builder {
|
||||
name = "jsx";
|
||||
version = "2.10.0";
|
||||
src = fetchHex {
|
||||
pkg = "jsx";
|
||||
version = "2.10.0";
|
||||
sha256 = "sha256-moPjcEgHKYAWlo21Bvn60PAn3jdUbrg4s64QZMOgrWI=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
hackney = builder {
|
||||
name = "hackney";
|
||||
version = "1.17.1";
|
||||
src = fetchHex {
|
||||
pkg = "hackney";
|
||||
version = "1.17.1";
|
||||
sha256 = "sha256-0sup48gQOtAyBiPp8cM+jTeKFeqr4u6K5EGJjz01oYw=";
|
||||
};
|
||||
beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ];
|
||||
};
|
||||
goldrush = builder {
|
||||
name = "goldrush";
|
||||
version = "0.1.9";
|
||||
src = fetchHex {
|
||||
pkg = "goldrush";
|
||||
version = "0.1.9";
|
||||
sha256 = "sha256-mctBKM/8syJ1geXU2APVQT+mQ/TrllI/d9nmk32ZTOs=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
getopt = builder {
|
||||
name = "getopt";
|
||||
version = "1.0.2";
|
||||
src = fetchHex {
|
||||
pkg = "getopt";
|
||||
version = "1.0.2";
|
||||
sha256 = "sha256-oAKa6kMi+4KmH2h2ptnGbcmHi2y2H6oT3zGHOE/U6iY=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
elvis_core = builder {
|
||||
name = "elvis_core";
|
||||
version = "1.1.2";
|
||||
src = fetchHex {
|
||||
pkg = "elvis_core";
|
||||
version = "1.1.2";
|
||||
sha256 = "sha256-xO5Cp6fC/FZ/Pqa1FQFkzWgpDxEA6bGaTPiG2Kocpzw=";
|
||||
};
|
||||
beamDeps = [ katana_code zipper ];
|
||||
};
|
||||
egithub = builder {
|
||||
name = "egithub";
|
||||
version = "0.7.0";
|
||||
src = fetchHex {
|
||||
pkg = "egithub";
|
||||
version = "0.7.0";
|
||||
sha256 = "sha256-4AnOEe/YAI0PntWdnEiOPpq+MCoPLNbWY+TMJnVvzEw=";
|
||||
};
|
||||
beamDeps = [ goldrush hackney jsx lager ];
|
||||
};
|
||||
};
|
||||
in self
|
|
@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "cc" "$CC"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '-shared' '-dynamiclib -undefined dynamic_lookup' \
|
||||
--replace '.so' '.dylib'
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-appconfiguration";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b83cd2cb63d93225de84e27abbfc059212f8de27766f4c58dd3abb839dff0be4";
|
||||
sha256 = "85c9c25612f160897ae212532ec7c19c94b0f4463f4830d0ee08cb2d296df407";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-eventhub";
|
||||
version = "5.5.0";
|
||||
version = "5.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7b757b4910ac74902564b38089b9861c1bc51ff15bd49ff056888f939f7c4c49";
|
||||
sha256 = "aa6d9e3e9b8b1a5ad211a828de867b85910720722577a4d51cd5aa6889d1d9e9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
pname = "azure-mgmt-compute";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "9227c3755a70bc377d70e35e1fc6f1fab109dd88974fd2c7129867ccaa10f813";
|
||||
sha256 = "7d582f3a4331f681f6bc358b796d9c33d7c0d55aa95c2874fc8dbe692e6bfa6d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, msrest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-extendedlocation";
|
||||
version = "1.0.0b2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
msrest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.extendedlocation" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Extendedlocation Management Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
|
@ -4,6 +4,7 @@
|
|||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
}:
|
||||
|
||||
|
@ -21,6 +22,7 @@ buildPythonPackage rec {
|
|||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
|
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-servicebus";
|
||||
version = "7.3.0";
|
||||
version = "7.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "sha256-NigQxqZjekZjlu6wSrziVwbEBclxfwSK4svd0eHPKr8=";
|
||||
sha256 = "dc162fc572087cdf53065a2ea9517b002a6702cf382f998d69903d68c16c731e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "uamqp";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-XzfiLzRK1/DCmnxPW/H+KqnBuCbpYPawS2JnTQq+Vbw=";
|
||||
sha256 = "sha256-JNGlpu2HvwTGV77WnAQFyvJImHesE2R+ZwMAlhlyk2U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
|
||||
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert
|
||||
, libX11, libgdiplus, ffmpeg
|
||||
, SDL2_mixer, openal, libsoundio, sndio
|
||||
, SDL2_mixer, openal, libsoundio, sndio, pulseaudio
|
||||
, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
@ -15,16 +15,17 @@ let
|
|||
openal
|
||||
libsoundio
|
||||
sndio
|
||||
pulseaudio
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.0.6893"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
version = "1.0.6954"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "fb65f392d1c4b0e01f22b6ddebcc8317ba9769c3";
|
||||
sha256 = "0ncrcbwyirz21j81vc6yvcjc2fn8nc5ilrfczclq6f8cpy09c3y8";
|
||||
rev = "31cbd09a75a9d5f4814c3907a060e0961eb2bb15";
|
||||
sha256 = "00qql0wmlzs722s0igip3v0yjlqhc31jcr7nghwibcqrmx031azk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
|
||||
|
@ -79,9 +80,13 @@ in stdenv.mkDerivation rec {
|
|||
--output $out/lib/ryujinx
|
||||
shopt -s extglob
|
||||
|
||||
# TODO: fix this hack https://github.com/Ryujinx/Ryujinx/issues/2349
|
||||
mkdir -p $out/lib/sndio-6
|
||||
ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
|
||||
|
||||
makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \
|
||||
--set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \
|
||||
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \
|
||||
--suffix LD_LIBRARY_PATH : "${builtins.concatStringsSep ":" [ (lib.makeLibraryPath runtimeDeps) "$out/lib/sndio-6" ]}" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
|
||||
for i in 16 32 48 64 96 128 256 512 1024; do
|
||||
|
|
15
pkgs/misc/emulators/ryujinx/deps.nix
generated
15
pkgs/misc/emulators/ryujinx/deps.nix
generated
|
@ -9,6 +9,11 @@
|
|||
version = "3.22.25.128";
|
||||
sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "CommandLineParser";
|
||||
version = "2.8.0";
|
||||
sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Concentus";
|
||||
version = "1.1.7";
|
||||
|
@ -259,11 +264,6 @@
|
|||
version = "3.22.25.128";
|
||||
sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.SDL2-CS";
|
||||
version = "1.0.225-alpha";
|
||||
sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "runtime.any.System.Collections";
|
||||
version = "4.3.0";
|
||||
|
@ -514,6 +514,11 @@
|
|||
version = "4.4.0-build7";
|
||||
sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Ryujinx.SDL2-CS";
|
||||
version = "2.0.15-build11";
|
||||
sha256 = "0s4h69l2b508l5wxp4v4ip8k83k78p3963xxv8bfamin9517przi";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "SharpZipLib";
|
||||
version = "1.3.0";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ pname, version, src, branchName
|
||||
, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook
|
||||
, stdenv, lib, wrapQtAppsHook
|
||||
, cmake, pkg-config
|
||||
, libpulseaudio, libjack2, alsa-lib, sndio
|
||||
, vulkan-loader, vulkan-headers
|
||||
|
@ -9,7 +9,7 @@
|
|||
, glslang
|
||||
, boost173
|
||||
, catch2
|
||||
, fmt
|
||||
, fmt_8
|
||||
, SDL2
|
||||
, udev
|
||||
, libusb1
|
||||
|
@ -29,20 +29,13 @@ stdenv.mkDerivation rec {
|
|||
glslang
|
||||
boost173
|
||||
catch2
|
||||
fmt
|
||||
fmt_8
|
||||
SDL2
|
||||
udev
|
||||
libusb1
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # Without this, yuzu tries to read version info from .git which is not present.
|
||||
url = "https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/28cbf656e3188b80eda0031d0b2713708ecd630f/inject-git-info.patch";
|
||||
sha256 = "1zxh5fwdr7jl0aagb3yfwd0995vyyk54f0f748f7c4rqvg6867fd";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DYUZU_USE_BUNDLED_QT=OFF"
|
||||
"-DYUZU_USE_BUNDLED_SDL2=OFF"
|
||||
|
@ -50,19 +43,20 @@ stdenv.mkDerivation rec {
|
|||
"-DENABLE_QT_TRANSLATION=ON"
|
||||
"-DYUZU_USE_QT_WEB_ENGINE=ON"
|
||||
"-DUSE_DISCORD_PRESENCE=ON"
|
||||
# Shows errors about not being able to find .git at runtime if you do not set these
|
||||
"-DGIT_BRANCH=\"\""
|
||||
"-DGIT_DESC=\"\""
|
||||
];
|
||||
|
||||
# This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
|
||||
# making the build fail, as that path does not exist
|
||||
dontFixCmake = true;
|
||||
|
||||
preConfigure = ''
|
||||
# Trick the configure system. This prevents a check for submodule directories.
|
||||
rm -f .gitmodules
|
||||
|
||||
# see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
|
||||
cmakeFlagsArray+=(
|
||||
"-DTITLE_BAR_FORMAT_IDLE=\"yuzu ${branchName} ${version}\""
|
||||
"-DTITLE_BAR_FORMAT_RUNNING=\"yuzu ${branchName} ${version} \| \{3\}\""
|
||||
"-DTITLE_BAR_FORMAT_IDLE=yuzu ${branchName} ${version}"
|
||||
"-DTITLE_BAR_FORMAT_RUNNING=yuzu ${branchName} ${version} | {3}"
|
||||
)
|
||||
'';
|
||||
|
||||
|
@ -87,5 +81,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
maintainers = with maintainers; [ ivar joshuafern ];
|
||||
platforms = platforms.linux;
|
||||
broken = stdenv.isAarch64; # Currently aarch64 is not supported.
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,25 +4,25 @@ let
|
|||
in {
|
||||
mainline = libsForQt5.callPackage ./base.nix rec {
|
||||
pname = "yuzu-mainline";
|
||||
version = "633";
|
||||
version = "679";
|
||||
branchName = branch;
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline";
|
||||
rev = "mainline-0-${version}";
|
||||
sha256 = "1zq20dd6x3kk179ls7y3mc5rj9vr73qs12bdj52bl3kscphxybf1";
|
||||
sha256 = "1wkxkgfff5nn30mn2pqcrlsr7fja6bgaallsx1ainlcbamfyspcz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
early-access = libsForQt5.callPackage ./base.nix rec {
|
||||
pname = "yuzu-ea";
|
||||
version = "1704";
|
||||
version = "1855";
|
||||
branchName = branch;
|
||||
src = fetchFromGitHub {
|
||||
owner = "pineappleEA";
|
||||
repo = "pineapple-src";
|
||||
rev = "EA-${version}";
|
||||
sha256 = "07pcldcmn8ammzbnxki6by7hgacr6z0548dvhv2p5lp9qcf3xz22";
|
||||
sha256 = "0civ63zi23cym3kii4v3aiqrsg2zzj0w6sp6sa14ixysagqxsd4a";
|
||||
};
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "2.24.2";
|
||||
version = "2.26.0";
|
||||
srcName = "azure-cli-${version}-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -9,7 +9,7 @@ let
|
|||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
sha256 = "sha256-4XmwM0/89hacA8ARs5Zq/ahzeqIc9wS18zT/ale+wQ4=";
|
||||
sha256 = "sha256-O5EL51RRxrp6D82p0Qbo59y/GAkBDhIkIdTxnagKgkY=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overriden in the py package scope
|
||||
|
@ -81,6 +81,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
|||
azure-mgmt-dns
|
||||
azure-mgmt-eventgrid
|
||||
azure-mgmt-eventhub
|
||||
azure-mgmt-extendedlocation
|
||||
azure-mgmt-hdinsight
|
||||
azure-mgmt-imagebuilder
|
||||
azure-mgmt-iotcentral
|
||||
|
|
|
@ -86,7 +86,7 @@ let
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" \
|
||||
--replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \
|
||||
--replace "cryptography>=3.2,<3.4" "cryptography"
|
||||
'';
|
||||
|
||||
|
@ -132,17 +132,20 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip"
|
||||
"sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q=";
|
||||
|
||||
azure-batch = overrideAzureMgmtPackage super.azure-batch "10.0.0" "zip"
|
||||
"83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0";
|
||||
|
||||
azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip"
|
||||
"0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr";
|
||||
|
||||
azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip"
|
||||
"1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83";
|
||||
azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "15.0.0" "zip"
|
||||
"9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb";
|
||||
|
||||
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip"
|
||||
"8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
|
||||
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip"
|
||||
"d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f";
|
||||
|
||||
azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip"
|
||||
"f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";
|
||||
|
@ -153,23 +156,23 @@ let
|
|||
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip"
|
||||
"sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs=";
|
||||
|
||||
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip"
|
||||
"0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1";
|
||||
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip"
|
||||
"0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza";
|
||||
|
||||
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip"
|
||||
"f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b";
|
||||
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip"
|
||||
"sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM=";
|
||||
|
||||
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "18.0.0" "zip"
|
||||
"551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c";
|
||||
|
||||
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip"
|
||||
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.0.0" "zip"
|
||||
"b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f";
|
||||
|
||||
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
|
||||
"059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
|
||||
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip"
|
||||
"73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676";
|
||||
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "20.0.0" "zip"
|
||||
"7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8";
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "21.0.0" "zip"
|
||||
"sha256-kifDdVpwvDd9cONeH8bx+rEJ3YiXT9LHEphnzKoQ+BM=";
|
||||
|
||||
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
|
||||
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
|
||||
|
@ -177,14 +180,11 @@ let
|
|||
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip"
|
||||
"1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7";
|
||||
|
||||
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.2.0" "zip"
|
||||
"sha256-x2YJt+fX0B+YMn7+yYi4t21K518DQQ3kBHn1nCrDSqo=";
|
||||
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.0.0" "zip"
|
||||
"d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11";
|
||||
|
||||
azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip"
|
||||
"8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998";
|
||||
|
||||
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.3.0" "zip"
|
||||
"4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d";
|
||||
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.4.0" "zip"
|
||||
"fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b";
|
||||
|
||||
azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip"
|
||||
"sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA=";
|
||||
|
@ -192,8 +192,8 @@ let
|
|||
azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
|
||||
"0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
|
||||
|
||||
azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc9" "zip"
|
||||
"sha256-txWYthg9QI5OSW6yE5lY+Gpb+/E6x3jb/obfSQuaAcg=";
|
||||
azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "9.0.0" "zip"
|
||||
"aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510";
|
||||
|
||||
azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip"
|
||||
"0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc";
|
||||
|
@ -210,8 +210,8 @@ let
|
|||
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
|
||||
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
|
||||
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "2.0.0" "zip"
|
||||
"ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e";
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "4.0.0" "zip"
|
||||
"7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42";
|
||||
|
||||
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
|
||||
"407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8";
|
||||
|
@ -261,17 +261,17 @@ let
|
|||
azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip"
|
||||
"9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
|
||||
|
||||
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip"
|
||||
"09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5";
|
||||
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.0.0b2" "zip"
|
||||
"sha256-FTxY8qoihHG4OZuKT3sRRlKfORbIoqDqug9Ko+6S9dw=";
|
||||
|
||||
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.26.0" "zip"
|
||||
"sha256-tmsxhHt6mRWNOXDebckZSXt4L8+757NRKSDu6wVMqRE=";
|
||||
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.29.0" "zip"
|
||||
"sha256-a8epWPoGI4SA01DkjToaHmTx8lSPgwMB7dutI/zaoAA=";
|
||||
|
||||
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip"
|
||||
"1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";
|
||||
|
||||
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.6.0" "zip"
|
||||
"sha256-+By1KyIHdKq5P/zyW9wX4D/YS2kWg2ZAeJ+G+/Y2uYQ=";
|
||||
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.0.0" "zip"
|
||||
"bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8";
|
||||
|
||||
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip"
|
||||
"c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
|
||||
|
@ -288,17 +288,17 @@ let
|
|||
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip"
|
||||
"28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907";
|
||||
|
||||
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc17" "zip"
|
||||
"sha256-M6lenj1rVEJZ+EJyBXkqokFfr1e5sqRgcAbUc0W0svo=";
|
||||
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.0.0" "zip"
|
||||
"480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756";
|
||||
|
||||
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip"
|
||||
"e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82";
|
||||
|
||||
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip"
|
||||
"1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r";
|
||||
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip"
|
||||
"fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b";
|
||||
|
||||
azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "0.1.1" "zip"
|
||||
"16raxr5naszrxmgbfhsvh7rqcph5cx6x3f480790m79ykvmjj0pi";
|
||||
azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip"
|
||||
"c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b";
|
||||
|
||||
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
|
||||
"0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
|
||||
|
@ -312,8 +312,8 @@ let
|
|||
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip"
|
||||
"0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap";
|
||||
|
||||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip"
|
||||
"sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M=";
|
||||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "8.0.0" "zip"
|
||||
"2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000";
|
||||
|
||||
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz"
|
||||
"74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc";
|
||||
|
@ -458,20 +458,6 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
pyjwt = super.pyjwt.overridePythonAttrs(oldAttrs: rec {
|
||||
version = "1.7.1";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
|
||||
};
|
||||
|
||||
# new cryptography returns slightly different values than what's expected
|
||||
# this gets tested in azure-cli-core, so not absolutely necessary to run tests here
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec {
|
||||
version = "1.38";
|
||||
|
||||
|
|
|
@ -12337,7 +12337,7 @@ in
|
|||
erlang_nox = beam_nox.interpreters.erlang;
|
||||
|
||||
inherit (beam.packages.erlang)
|
||||
erlang-ls erlfmt
|
||||
erlang-ls erlfmt elvis-erlang
|
||||
rebar rebar3 rebar3WithPlugins
|
||||
fetchHex beamPackages;
|
||||
|
||||
|
|
|
@ -823,6 +823,8 @@ in {
|
|||
|
||||
azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { };
|
||||
|
||||
azure-mgmt-extendedlocation = callPackage ../development/python-modules/azure-mgmt-extendedlocation { };
|
||||
|
||||
azure-mgmt-hanaonazure = callPackage ../development/python-modules/azure-mgmt-hanaonazure { };
|
||||
|
||||
azure-mgmt-hdinsight = callPackage ../development/python-modules/azure-mgmt-hdinsight { };
|
||||
|
|
Loading…
Reference in a new issue