Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
588cccd6c5
|
|
@ -306,7 +306,7 @@ in
|
|||
virtualisation.msize =
|
||||
mkOption {
|
||||
type = types.ints.positive;
|
||||
default = pkgs.vmTools.default9PMsizeBytes;
|
||||
default = 16384;
|
||||
description =
|
||||
''
|
||||
The msize (maximum packet size) option passed to 9p file systems, in
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ in makeTest {
|
|||
connect-timeout = 1
|
||||
'';
|
||||
|
||||
virtualisation.memorySize = 2048;
|
||||
virtualisation.diskSize = 8 * 1024;
|
||||
virtualisation.emptyDiskImages = [
|
||||
# Small root disk for installer
|
||||
|
|
|
|||
|
|
@ -76,8 +76,8 @@ let
|
|||
def assemble_qemu_flags():
|
||||
flags = "-cpu max"
|
||||
${if (system == "x86_64-linux" || system == "i686-linux")
|
||||
then ''flags += " -m 1500"''
|
||||
else ''flags += " -m 1000 -enable-kvm -machine virt,gic-version=host"''
|
||||
then ''flags += " -m 1024"''
|
||||
else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"''
|
||||
}
|
||||
return flags
|
||||
|
||||
|
|
@ -288,7 +288,7 @@ let
|
|||
# builds stuff in the VM, needs more juice
|
||||
virtualisation.diskSize = 8 * 1024;
|
||||
virtualisation.cores = 8;
|
||||
virtualisation.memorySize = 3096;
|
||||
virtualisation.memorySize = 1536;
|
||||
|
||||
# Use a small /dev/vdb as the root disk for the
|
||||
# installer. This ensures the target disk (/dev/vda) is
|
||||
|
|
|
|||
39
pkgs/applications/audio/soundwireserver/default.nix
Executable file
39
pkgs/applications/audio/soundwireserver/default.nix
Executable file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, qt5
|
||||
, autoPatchelfHook
|
||||
, unzip
|
||||
, fetchzip
|
||||
, portaudio
|
||||
}:
|
||||
|
||||
qt5.mkDerivation {
|
||||
pname = "soundwire";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://web.archive.org/web/20211120182526/https://georgielabs.net/SoundWire_Server_linux64.tar.gz";
|
||||
hash = "sha256-TECuQ5WXpeikc9tXEE/wVBnRbdYd0OaIFFhsBRmaukA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
portaudio
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D SoundWire-Server.desktop $out/share/applications/SoundWireServer.desktop
|
||||
install -D SoundWireServer $out/bin/SoundWireServer
|
||||
install -D sw-icon.xpm $out/share/icons/hicolor/256x256/apps/sw-icon.xpm
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Turn your Android device into wireless headphones / wireless speaker";
|
||||
homepage = "https://georgielabs.net/";
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
license = licenses.unfree;
|
||||
};
|
||||
}
|
||||
|
|
@ -110,7 +110,7 @@ rec {
|
|||
|
||||
echo "mounting Nix store..."
|
||||
mkdir -p /fs${storeDir}
|
||||
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=${toString default9PMsizeBytes}
|
||||
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
|
||||
|
||||
mkdir -p /fs/tmp /fs/run /fs/var
|
||||
mount -t tmpfs -o "mode=1777" none /fs/tmp
|
||||
|
|
@ -119,7 +119,7 @@ rec {
|
|||
|
||||
echo "mounting host's temporary directory..."
|
||||
mkdir -p /fs/tmp/xchg
|
||||
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=${toString default9PMsizeBytes}
|
||||
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L
|
||||
|
||||
mkdir -p /fs/proc
|
||||
mount -t proc none /fs/proc
|
||||
|
|
@ -1174,11 +1174,4 @@ rec {
|
|||
`debDistros' sets. */
|
||||
diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns;
|
||||
|
||||
# The default 9P msize value is 8 KiB, which according to QEMU is
|
||||
# insufficient and would degrade performance.
|
||||
# See: https://wiki.qemu.org/Documentation/9psetup#msize
|
||||
# Use 128KiB which is the default in linux 5.15+
|
||||
# https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe
|
||||
# TODO: actually set it to 128KiB, it was causing failures in many tests due to memory usage
|
||||
default9PMsizeBytes = 16 * 1024;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
$unzip/bin/unzip $src
|
||||
mkdir $out
|
||||
mv $name/* $out/
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
{lib, stdenv, fetchurl, unzip} :
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "httpunit-1.7";
|
||||
builder = ./builder.sh;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "httpunit";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/httpunit/httpunit-1.7.zip";
|
||||
url = "mirror://sourceforge/httpunit/httpunit-${version}.zip";
|
||||
sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf";
|
||||
};
|
||||
|
||||
inherit unzip;
|
||||
buildCommand = ''
|
||||
cp ./* $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://httpunit.sourceforge.net";
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.17.0";
|
||||
version = "1.20.1";
|
||||
pname = "azure-core";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46";
|
||||
sha256 = "21d06311c9c373e394ed9f9db035306773334a0181932e265889eca34d778d17";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-eventgrid";
|
||||
version = "4.5.0";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "41ce94305fd3c4e2534f7663fb1be79819fc7d59f2b20544593ea6c914839351";
|
||||
sha256 = "b96afc0317c764c2c428512485305ec5748698081cb6bc70dcaa903b0ac04754";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cognitiveservices";
|
||||
version = "12.0.0";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676";
|
||||
sha256 = "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-keyvault";
|
||||
version = "9.2.0";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "37ecd44c49ceca7d7c9431e59148febd15d7fec261651ed72ddd58755e7450b0";
|
||||
sha256 = "54156422e618b686d52232a7989594b240bd18afd0fa381e12e4772ed4ab5ea8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-loganalytics";
|
||||
version = "11.0.0";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d";
|
||||
sha256 = "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, msrest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-servicelinker";
|
||||
version = "1.0.0b1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4f70d3bcd98ba539bfef870e3c497ebdc5efed3200c2627a61718baa9ab21a61";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
msrest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "azure.mgmt.servicelinker" ];
|
||||
|
||||
# no tests with sdist
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Servicelinker Management Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-storage-blob";
|
||||
version = "12.8.1";
|
||||
version = "12.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "eb37b50ddfb6e558b29f6c8c03b0666514e55d6170bf4624e7261a3af93c6401";
|
||||
sha256 = "cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-synapse-artifacts";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "5e1d8f03939eafe29c301659c7b819053513be6f224861388b0048ca62e7a75d";
|
||||
sha256 = "3f782c9b590b8ae43678c6e003df8ca8cca675832039d270b0b7437ff01557fd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
|
||||
, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
|
||||
, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib
|
||||
, miniupnpc, enet, mbedtls, soundtouch, sfml
|
||||
, miniupnpc, enet, mbedtls, soundtouch, sfml, writeScript
|
||||
, vulkan-loader ? null, libpulseaudio ? null
|
||||
|
||||
# - Inputs used for Darwin
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolphin-emu";
|
||||
version = "5.0-15260";
|
||||
version = "5.0-15445";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
rev = "207c931a04c8e2629a735bc2b3f36b5c89365ca7";
|
||||
sha256 = "15r9syk7f62h16klcznw7css6sng8nqkkz4d1qr8d988rdfaiypx";
|
||||
rev = "db02b50d2ecdfbbc21e19aadc57253c353069f77";
|
||||
sha256 = "l2vbTZOcjfyZjKOI3n5ig2f7cDYR22GcqKS479LMtP8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -64,6 +64,17 @@ stdenv.mkDerivation rec {
|
|||
install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
|
||||
'';
|
||||
|
||||
|
||||
passthru.updateScript = writeScript "dolphin-update-script" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
set -eou pipefail
|
||||
json="$(curl -s https://dolphin-emu.org/update/latest/beta)"
|
||||
version="$(jq -r '.shortrev' <<< "$json")"
|
||||
rev="$(jq -r '.hash' <<< "$json")"
|
||||
update-source-version dolphin-emu-beta "$version" --rev="$rev"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dolphin-emu.org";
|
||||
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
|
||||
|
|
|
|||
|
|
@ -164,7 +164,8 @@ server = stdenv.mkDerivation (common // {
|
|||
bzip2 lz4 lzo snappy xz zstd
|
||||
cracklib judy libevent libxml2
|
||||
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
|
||||
++ optionals stdenv.hostPlatform.isLinux [ linux-pam pmdk.dev ]
|
||||
++ optionals stdenv.hostPlatform.isLinux [ linux-pam ]
|
||||
++ optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev
|
||||
++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv
|
||||
++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "lemmy-ui",
|
||||
"description": "An isomorphic UI for lemmy",
|
||||
"version": "0.13.3",
|
||||
"version": "0.14.0",
|
||||
"author": "Dessalines <tyhou13@gmx.com>",
|
||||
"license": "AGPL-3.0",
|
||||
"scripts": {
|
||||
|
|
@ -12,24 +12,25 @@
|
|||
"lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
|
||||
"prebuild:dev": "yarn clean && node generate_translations.js",
|
||||
"prebuild:prod": "yarn clean && node generate_translations.js",
|
||||
"prepare": "husky install",
|
||||
"start": "yarn build:dev --watch"
|
||||
},
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/parser": "^4.32.0",
|
||||
"@typescript-eslint/parser": "^5.4.0",
|
||||
"autosize": "^5.0.1",
|
||||
"check-password-strength": "^2.0.3",
|
||||
"choices.js": "^9.0.1",
|
||||
"emoji-short-name": "^1.0.0",
|
||||
"express": "~4.17.1",
|
||||
"i18next": "^21.1.1",
|
||||
"inferno": "^7.4.10",
|
||||
"inferno-create-element": "^7.4.10",
|
||||
"i18next": "^21.5.0",
|
||||
"inferno": "^7.4.11",
|
||||
"inferno-create-element": "^7.4.11",
|
||||
"inferno-helmet": "^5.2.1",
|
||||
"inferno-hydrate": "^7.4.10",
|
||||
"inferno-hydrate": "^7.4.11",
|
||||
"inferno-i18next-dess": "^0.0.1",
|
||||
"inferno-router": "^7.4.10",
|
||||
"inferno-server": "^7.4.10",
|
||||
"inferno-router": "^7.4.11",
|
||||
"inferno-server": "^7.4.11",
|
||||
"isomorphic-cookie": "^1.2.4",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"markdown-it": "^12.1.0",
|
||||
|
|
@ -40,57 +41,57 @@
|
|||
"moment": "^2.29.1",
|
||||
"reconnecting-websocket": "^4.4.0",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"rxjs": "^7.2.0",
|
||||
"rxjs": "^7.4.0",
|
||||
"serialize-javascript": "^6.0.0",
|
||||
"tippy.js": "^6.3.1",
|
||||
"toastify-js": "^1.11.1",
|
||||
"tippy.js": "^6.3.7",
|
||||
"toastify-js": "^1.11.2",
|
||||
"tributejs": "^5.1.3",
|
||||
"ws": "^8.2.2"
|
||||
"ws": "^8.2.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.15.5",
|
||||
"@babel/plugin-transform-runtime": "^7.14.5",
|
||||
"@babel/plugin-transform-typescript": "^7.15.4",
|
||||
"@babel/preset-env": "7.15.6",
|
||||
"@babel/preset-typescript": "^7.14.5",
|
||||
"@babel/runtime": "^7.15.4",
|
||||
"@babel/core": "^7.16.0",
|
||||
"@babel/plugin-transform-runtime": "^7.16.0",
|
||||
"@babel/plugin-transform-typescript": "^7.16.1",
|
||||
"@babel/preset-env": "7.16.0",
|
||||
"@babel/preset-typescript": "^7.16.0",
|
||||
"@babel/runtime": "^7.16.3",
|
||||
"@types/autosize": "^4.0.0",
|
||||
"@types/express": "^4.17.13",
|
||||
"@types/node": "^16.10.1",
|
||||
"@types/node": "^16.11.7",
|
||||
"@types/node-fetch": "^2.5.11",
|
||||
"@types/serialize-javascript": "^5.0.1",
|
||||
"@typescript-eslint/eslint-plugin": "^4.32.0",
|
||||
"babel-loader": "^8.2.2",
|
||||
"@typescript-eslint/eslint-plugin": "^5.4.0",
|
||||
"babel-loader": "^8.2.3",
|
||||
"babel-plugin-inferno": "^6.3.0",
|
||||
"bootstrap": "^5.1.1",
|
||||
"bootswatch": "^5.1.1",
|
||||
"bootstrap": "^5.1.3",
|
||||
"bootswatch": "^5.1.3",
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
"copy-webpack-plugin": "^9.0.1",
|
||||
"css-loader": "^6.3.0",
|
||||
"eslint": "^7.30.0",
|
||||
"copy-webpack-plugin": "^9.1.0",
|
||||
"css-loader": "^6.5.1",
|
||||
"eslint": "^8.2.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"husky": "^7.0.2",
|
||||
"husky": "^7.0.4",
|
||||
"import-sort-style-module": "^6.0.0",
|
||||
"iso-639-1": "^2.1.9",
|
||||
"lemmy-js-client": "0.13.0",
|
||||
"lint-staged": "^11.0.1",
|
||||
"mini-css-extract-plugin": "^2.3.0",
|
||||
"iso-639-1": "^2.1.10",
|
||||
"lemmy-js-client": "0.14.0-rc.1",
|
||||
"lint-staged": "^11.2.6",
|
||||
"mini-css-extract-plugin": "^2.4.4",
|
||||
"node-fetch": "^2.6.1",
|
||||
"node-sass": "^6.0.1",
|
||||
"prettier": "^2.4.1",
|
||||
"prettier-plugin-import-sort": "^0.0.7",
|
||||
"prettier-plugin-organize-imports": "^2.3.4",
|
||||
"prettier-plugin-packagejson": "^2.2.13",
|
||||
"prettier-plugin-packagejson": "^2.2.15",
|
||||
"rimraf": "^3.0.2",
|
||||
"run-node-webpack-plugin": "^1.3.0",
|
||||
"sass-loader": "^12.1.0",
|
||||
"sass-loader": "^12.3.0",
|
||||
"sortpack": "^2.2.0",
|
||||
"style-loader": "^3.3.0",
|
||||
"terser": "^5.9.0",
|
||||
"typescript": "^4.4.3",
|
||||
"webpack": "5.54.0",
|
||||
"webpack-cli": "^4.7.2",
|
||||
"webpack-dev-server": "4.3.0",
|
||||
"style-loader": "^3.3.1",
|
||||
"terser": "^5.10.0",
|
||||
"typescript": "^4.4.4",
|
||||
"webpack": "5.64.1",
|
||||
"webpack-cli": "^4.9.1",
|
||||
"webpack-dev-server": "4.5.0",
|
||||
"webpack-node-externals": "^3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "0.13.3",
|
||||
"serverSha256": "sha256-Ht+gcNv8gQAQtEuAJ/QH4nNvo+PZogNB09f4eRlvIYg=",
|
||||
"serverCargoSha256": "sha256-j/l/muCQefvuuWsi+Iahr1M4V6AUzmxm3pr7cJxw7Ww=",
|
||||
"uiSha256": "sha256-uHb+V3zadiHlExpmAdRLoV3F/0mrYrko6RTDJcw9YO4=",
|
||||
"uiYarnDepsSha256": "sha256-53sa6uL1+SvhtUtKdS36rBcJVgVXhnNdITWPyauLrx4="
|
||||
"version": "0.14.0",
|
||||
"serverSha256": "sha256-rrLOWoy4GkVtfIPpyR0Zwvnqq39CoZRDaVPNSpeJpkA=",
|
||||
"serverCargoSha256": "sha256-6HrsMwzcmNw8udsCdvn8zgIWN0N3Vvsn9bFk+5tBOds=",
|
||||
"uiSha256": "sha256-e+ajyUc2P5eK1dH7qQsC9BmZgT3NCGLbbzbUE3i2rXY=",
|
||||
"uiYarnDepsSha256": "sha256-g3jCc98ftFyvZGD2bESY1eIsLZyQxZpDxgHdRGu78vs="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,27 +4,27 @@
|
|||
# TODO set to `verbose` or `extdebug` once implemented in oil
|
||||
shopt --set xtrace
|
||||
|
||||
var directory = $(dirname $0 | xargs realpath)
|
||||
var owner = "LemmyNet"
|
||||
var ui_repo = "lemmy-ui"
|
||||
var server_repo = "lemmy"
|
||||
var latest_rev = $(curl -q https://api.github.com/repos/${owner}/${server_repo}/releases/latest | \
|
||||
const directory = $(dirname $0 | xargs realpath)
|
||||
const owner = "LemmyNet"
|
||||
const ui_repo = "lemmy-ui"
|
||||
const server_repo = "lemmy"
|
||||
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${server_repo}/releases/latest | \
|
||||
jq -r '.tag_name')
|
||||
var latest_version = $(echo $latest_rev)
|
||||
var current_version = $(jq -r '.version' $directory/pin.json)
|
||||
const latest_version = $(echo $latest_rev)
|
||||
const current_version = $(jq -r '.version' $directory/pin.json)
|
||||
if ($latest_version === $current_version) {
|
||||
echo "lemmy is already up-to-date"
|
||||
return 0
|
||||
} else {
|
||||
# for some strange reason, hydra fails on reading upstream package.json directly
|
||||
var source = "https://raw.githubusercontent.com/$owner/$ui_repo/$latest_version"
|
||||
var package_json = "$(curl -qf $source/package.json)"
|
||||
const source = "https://raw.githubusercontent.com/$owner/$ui_repo/$latest_version"
|
||||
const package_json = $(curl -qf $source/package.json)
|
||||
echo $package_json > $directory/package.json
|
||||
|
||||
var server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev "$latest_rev")
|
||||
var server_tarball_hash = "sha256-$(echo $server_tarball_meta | jq -r '.sha256')"
|
||||
var ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev "$latest_rev")
|
||||
var ui_tarball_hash = "sha256-$(echo $ui_tarball_meta | jq -r '.sha256')"
|
||||
const server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev $latest_rev)
|
||||
const server_tarball_hash = "sha256-$(echo $server_tarball_meta | jq -r '.sha256')"
|
||||
const ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev $latest_rev)
|
||||
const ui_tarball_hash = "sha256-$(echo $ui_tarball_meta | jq -r '.sha256')"
|
||||
|
||||
jq ".version = \"$latest_version\" | \
|
||||
.\"serverSha256\" = \"$server_tarball_hash\" | \
|
||||
|
|
@ -32,12 +32,12 @@ if ($latest_version === $current_version) {
|
|||
.\"serverCargoSha256\" = \"\" | \
|
||||
.\"uiYarnDepsSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
|
||||
|
||||
var new_cargo_sha256 = $(nix-build -A lemmy-server 2>&1 | \
|
||||
const new_cargo_sha256 = $(nix-build -A lemmy-server 2>&1 | \
|
||||
tail -n 2 | \
|
||||
head -n 1 | \
|
||||
sd '\s+got:\s+' '')
|
||||
|
||||
var new_offline_cache_sha256 = $(nix-build -A lemmy-ui 2>&1 | \
|
||||
const new_offline_cache_sha256 = $(nix-build -A lemmy-ui 2>&1 | \
|
||||
tail -n 2 | \
|
||||
head -n 1 | \
|
||||
sd '\s+got:\s+' '')
|
||||
|
|
@ -46,3 +46,4 @@ if ($latest_version === $current_version) {
|
|||
.\"uiYarnDepsSha256\" = \"$new_offline_cache_sha256\"" \
|
||||
$directory/pin.json | sponge $directory/pin.json
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "2.29.1";
|
||||
version = "2.30.0";
|
||||
srcName = "azure-cli-${version}-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -9,7 +9,7 @@ let
|
|||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
sha256 = "sha256-9H38dZZz2rGSuWS1T398p+9T+G+Rt5gi3Ip2xIauEWo=";
|
||||
sha256 = "sha256-b4hNacraNomhiFGEiHcMweqbEq3vTHus+xbFPv5X5HQ=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overriden in the py package scope
|
||||
|
|
@ -117,6 +117,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
|||
azure-mgmt-servicebus
|
||||
azure-mgmt-servicefabric
|
||||
azure-mgmt-servicefabricmanagedclusters
|
||||
azure-mgmt-servicelinker
|
||||
azure-mgmt-signalr
|
||||
azure-mgmt-sql
|
||||
azure-mgmt-sqlvirtualmachine
|
||||
|
|
|
|||
|
|
@ -1,24 +1,7 @@
|
|||
{ stdenv, python, lib, src, version }:
|
||||
|
||||
let
|
||||
buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage (attrs // {
|
||||
# Remove overly restrictive version contraints and obsolete namespace setup
|
||||
prePatch = (attrs.prePatch or "") + ''
|
||||
rm -f azure_bdist_wheel.py tox.ini
|
||||
substituteInPlace setup.py \
|
||||
--replace "cryptography>=3.2,<3.4" "cryptography"
|
||||
sed -i "/azure-namespace-package/c\ " setup.cfg
|
||||
'';
|
||||
|
||||
# Prevent these __init__'s from violating PEP420, only needed for python2
|
||||
pythonNamespaces = [ "azure.cli" ];
|
||||
|
||||
checkInputs = [ mock pytest ] ++ (attrs.checkInputs or []);
|
||||
checkPhase = attrs.checkPhase or ''
|
||||
cd azure
|
||||
HOME=$TMPDIR pytest
|
||||
'';
|
||||
});
|
||||
buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage attrs;
|
||||
|
||||
overrideAzureMgmtPackage = package: version: extension: sha256:
|
||||
# check to make sure overriding is even necessary
|
||||
|
|
@ -91,12 +74,14 @@ let
|
|||
--replace "cryptography>=3.2,<3.4" "cryptography"
|
||||
'';
|
||||
|
||||
checkInputs = with self; [ pytest ];
|
||||
doCheck = stdenv.isLinux;
|
||||
# ignore tests that does network call, or assume powershell
|
||||
checkPhase = ''
|
||||
rm azure/{,cli/}__init__.py
|
||||
python -c 'import azure.common; print(azure.common)'
|
||||
PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \
|
||||
PYTHONPATH=$PWD:${src}/src/azure-cli-testsdk:$PYTHONPATH HOME=$TMPDIR pytest \
|
||||
azure/cli/core/tests \
|
||||
--ignore=azure/cli/core/tests/test_profile.py \
|
||||
--ignore=azure/cli/core/tests/test_generic_update.py \
|
||||
-k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell'
|
||||
|
|
@ -126,6 +111,7 @@ let
|
|||
--replace "portalocker~=1.6" "portalocker"
|
||||
'';
|
||||
|
||||
checkInputs = [ py.pkgs.pytest ];
|
||||
# ignore flaky test
|
||||
checkPhase = ''
|
||||
cd azure
|
||||
|
|
@ -157,14 +143,14 @@ let
|
|||
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.0.0" "zip"
|
||||
"75103fb4541aeae30bb687dee1fedd9ca65530e6b97b2d9ea87f74816905202a";
|
||||
|
||||
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "9.1.0b1" "zip"
|
||||
"sha256-O/6dE6lUnowYTWwQLWt3u1dwV4jBof+Jok0PUhFEEs0=";
|
||||
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.0.0" "zip"
|
||||
"bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a";
|
||||
|
||||
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.0.0" "zip"
|
||||
"sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4=";
|
||||
|
||||
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.15.0" "zip"
|
||||
"sha256-y5akbJdqXZsRi+mecq1opR1Ye9yTxNblGp/zjiXEqFY=";
|
||||
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "3.0.0" "zip"
|
||||
"sha256-y5akbJdqXZsRi+mecq1opR1Ye9yTxNblGp/zjiXEqaY=";
|
||||
|
||||
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "19.0.0" "zip"
|
||||
"bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100";
|
||||
|
|
@ -175,20 +161,20 @@ let
|
|||
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip"
|
||||
"73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676";
|
||||
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.0.0" "zip"
|
||||
"sha256-HrJrllukBJ3c8Q1PJYGHJfwDxJHDvnZTfQ10zrEUawQ=";
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip"
|
||||
"sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA=";
|
||||
|
||||
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
|
||||
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
|
||||
|
||||
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.0.0" "zip"
|
||||
"041431c5a768ac652aac318a17f2a53b90db968494c79abbafec441d0be387ff";
|
||||
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip"
|
||||
"sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA=";
|
||||
|
||||
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip"
|
||||
"sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q=";
|
||||
|
||||
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.4.0" "zip"
|
||||
"fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b";
|
||||
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "7.0.0b2" "zip"
|
||||
"sha256-hVvYW9gkfTVMwis3IdD0JXYDxdKcyyzIFx3hNk7VMLI=";
|
||||
|
||||
azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip"
|
||||
"04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087";
|
||||
|
|
@ -217,8 +203,8 @@ let
|
|||
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
|
||||
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
|
||||
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "4.0.0" "zip"
|
||||
"7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42";
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip"
|
||||
"7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a4a";
|
||||
|
||||
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
|
||||
"407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8";
|
||||
|
|
@ -226,8 +212,8 @@ let
|
|||
azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "11.0.0" "zip"
|
||||
"41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d";
|
||||
|
||||
azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.0.0" "zip"
|
||||
"5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8";
|
||||
azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.1.0" "zip"
|
||||
"sha256-Yu9/6LqY5WQStDTJw13HVbPF5GnywBu+0s4NEpc6BEs=";
|
||||
|
||||
azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip"
|
||||
"384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e";
|
||||
|
|
@ -277,11 +263,11 @@ let
|
|||
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b1" "zip"
|
||||
"sha256-SrFTvU+67U3CpMLPZMawXuRdSIbTsfav2jFZIsZWPmw=";
|
||||
|
||||
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.0.0" "zip"
|
||||
"bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8";
|
||||
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b2" "zip"
|
||||
"sha256-/BAxKDttp/tS/X45y8X4KBm5qxtNuVXhrc5qB3A+wRE=";
|
||||
|
||||
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "9.0.0" "zip"
|
||||
"sha256-cDc9vrNad2ikc0G7O1cMVZGXvBujb8j4vxUTnkyLrXA=";
|
||||
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "10.0.0" "zip"
|
||||
"5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32";
|
||||
|
||||
azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip"
|
||||
"1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr";
|
||||
|
|
@ -289,14 +275,14 @@ let
|
|||
azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "9.1.0" "zip"
|
||||
"0ba9f10e1e8d03247a316e777d6f27fabf268d596dda2af56ac079fcdf5e7afe";
|
||||
|
||||
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.1.0" "zip"
|
||||
"sha256-zTXoHEo8+BKt5L3PH3zPS1t4qAHvlnNAASpqyf5h3tI=";
|
||||
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.2.0" "zip"
|
||||
"sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA=";
|
||||
|
||||
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip"
|
||||
"28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907";
|
||||
|
||||
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.1.0" "zip"
|
||||
"62efbb03275d920894d79879ad0ed59605163abd32177dcf24e90c1862ebccbd";
|
||||
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.2.0" "zip"
|
||||
"f2bcdbcf0b9fdc2df0df9eccb77cb489091d3c670ed53cba77e5ffd734e9539b";
|
||||
|
||||
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip"
|
||||
"e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82";
|
||||
|
|
@ -319,11 +305,11 @@ let
|
|||
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip"
|
||||
"de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913";
|
||||
|
||||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "8.0.0" "zip"
|
||||
"2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000";
|
||||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip"
|
||||
"41ebdc69c0d1f81d25dd30438c14fff4331f66639f55805b918b9649eaffe78a";
|
||||
|
||||
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz"
|
||||
"74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc";
|
||||
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.7.0" "tar.gz"
|
||||
"cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9";
|
||||
|
||||
azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
|
||||
version = "0.60.0";
|
||||
|
|
@ -420,6 +406,17 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec {
|
||||
version = "4.5.0b4";
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
extension = "zip";
|
||||
sha256 = "sha256-f43ZTMFc0IVIaa69gEZFOLALREcx3RRCFoYDY2FYLrY=";
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
# part of azure.mgmt.datalake namespace
|
||||
azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec {
|
||||
version = "0.2.1";
|
||||
|
|
|
|||
|
|
@ -9604,6 +9604,8 @@ with pkgs;
|
|||
|
||||
soundkonverter = libsForQt5.soundkonverter;
|
||||
|
||||
soundwireserver = callPackage ../applications/audio/soundwireserver { };
|
||||
|
||||
sozu = callPackage ../servers/sozu { };
|
||||
|
||||
sparsehash = callPackage ../development/libraries/sparsehash { };
|
||||
|
|
|
|||
|
|
@ -969,6 +969,8 @@ in {
|
|||
|
||||
azure-mgmt-servicefabricmanagedclusters = callPackage ../development/python-modules/azure-mgmt-servicefabricmanagedclusters { };
|
||||
|
||||
azure-mgmt-servicelinker = callPackage ../development/python-modules/azure-mgmt-servicelinker { };
|
||||
|
||||
azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { };
|
||||
|
||||
azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue