Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
9e44972094
|
|
@ -126,7 +126,7 @@ let
|
|||
getValues getFiles
|
||||
optionAttrSetToDocList optionAttrSetToDocList'
|
||||
scrubOptionValue literalExpression literalExample literalDocBook
|
||||
showOption showFiles unknownModule mkOption;
|
||||
showOption showFiles unknownModule mkOption mkPackageOption;
|
||||
inherit (self.types) isType setType defaultTypeMerge defaultFunctor
|
||||
isOptionType mkOptionType;
|
||||
inherit (self.asserts)
|
||||
|
|
|
|||
|
|
@ -1,26 +1,38 @@
|
|||
{ lib, stdenv, fetchurl, ruby, cdparanoia, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, cdparanoia, cddiscid, ruby }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.2";
|
||||
version = "0.8.0rc3";
|
||||
pname = "rubyripper";
|
||||
src = fetchurl {
|
||||
url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2";
|
||||
sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bleskodev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f";
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs .";
|
||||
|
||||
configureFlags = [ "--enable-cli" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ ruby cdparanoia ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/rrip_cli" \
|
||||
--prefix PATH : "${ruby}/bin" \
|
||||
--prefix PATH : "${cdparanoia}/bin"
|
||||
|
||||
buildInputs = [
|
||||
cddiscid
|
||||
cdparanoia
|
||||
ruby
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/rrip_cli \
|
||||
--prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "High quality CD audio ripper";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://github.com/bleskodev/rubyripper";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,15 +47,27 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
|||
mktplcRef = {
|
||||
name = "cpptools";
|
||||
publisher = "ms-vscode";
|
||||
version = "1.7.1";
|
||||
version = "1.9.1";
|
||||
};
|
||||
|
||||
vsix = fetchurl {
|
||||
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
|
||||
url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix";
|
||||
sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk=";
|
||||
name = "${mktplcRef.publisher}-${mktplcRef.name}.gz";
|
||||
url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64";
|
||||
sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
gzip -d $src --stdout &> temporary.zip
|
||||
unzip temporary.zip
|
||||
rm temporary.zip
|
||||
|
||||
cd extension/
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
jq
|
||||
];
|
||||
|
|
|
|||
|
|
@ -59,13 +59,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
|
|||
mktplcRef = {
|
||||
name = "python";
|
||||
publisher = "ms-python";
|
||||
version = "2021.11.1422169775";
|
||||
version = "2022.0.1814523869";
|
||||
};
|
||||
|
||||
vsix = fetchurl {
|
||||
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
|
||||
url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";
|
||||
sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs=";
|
||||
sha256 = "sha256-JDaimcOUDo9GuFA3mhbbGLwqZE9ejk8pWYc+9PrRhVk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ in
|
|||
mktplcRef = {
|
||||
name = "vscode-wakatime";
|
||||
publisher = "WakaTime";
|
||||
version = "17.1.0";
|
||||
sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw";
|
||||
version = "18.0.5";
|
||||
sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,18 +1,31 @@
|
|||
{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems
|
||||
, dotnetCorePackages, libX11, libgdiplus, ffmpeg
|
||||
, SDL2_mixer, openal, libsoundio, sndio, pulseaudio
|
||||
, gtk3, gdk-pixbuf, wrapGAppsHook
|
||||
{ lib
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, dotnetCorePackages
|
||||
, libX11
|
||||
, libgdiplus
|
||||
, ffmpeg
|
||||
, SDL2_mixer
|
||||
, openal
|
||||
, libsoundio
|
||||
, sndio
|
||||
, pulseaudio
|
||||
, gtk3
|
||||
, gdk-pixbuf
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.0.7168"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
version = "1.1.54"; # Versioning is based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "6e0799580f0d1b473a79471c5d365c6524d97a86";
|
||||
sha256 = "145sn9xkjxj79292faypcdmpmbxm1w70q0iprg6pfymf9920gvfv";
|
||||
rev = "3705c206688c69d3348f5cec84dc480d8d7c578e";
|
||||
sha256 = "1lhnr11x46yjpka865m0dzkbkdxmrrhjcpvq4ab4wll6j0ipy908";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
|
|
@ -67,22 +80,31 @@ buildDotnetModule rec {
|
|||
done
|
||||
'';
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
desktopName = "Ryujinx";
|
||||
name = "ryujinx";
|
||||
exec = "Ryujinx";
|
||||
icon = "ryujinx";
|
||||
comment = meta.description;
|
||||
type = "Application";
|
||||
categories = [ "Game" ];
|
||||
})];
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
desktopName = "Ryujinx";
|
||||
name = "ryujinx";
|
||||
exec = "Ryujinx";
|
||||
icon = "ryujinx";
|
||||
comment = meta.description;
|
||||
type = "Application";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Experimental Nintendo Switch Emulator written in C#";
|
||||
homepage = "https://ryujinx.org/";
|
||||
license = licenses.mit;
|
||||
changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
description = "Experimental Nintendo Switch Emulator written in C#";
|
||||
longDescription = ''
|
||||
Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan,
|
||||
written in C#. This emulator aims at providing excellent accuracy and
|
||||
performance, a user-friendly interface and consistent builds. It was
|
||||
written from scratch and development on the project began in September
|
||||
2017.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivar jk ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "Ryujinx";
|
||||
};
|
||||
|
|
|
|||
4
pkgs/applications/emulators/ryujinx/deps.nix
generated
4
pkgs/applications/emulators/ryujinx/deps.nix
generated
|
|
@ -10,8 +10,8 @@
|
|||
(fetchNuGet { pname = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; })
|
||||
(fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; })
|
||||
(fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; })
|
||||
(fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; })
|
||||
(fetchNuGet { pname = "LibHac"; version = "0.14.3"; sha256 = "13pv5dwffj8c2mfibra3hkd1pgg5cj075sf48kgp82y501l25q5m"; })
|
||||
(fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; })
|
||||
(fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; })
|
||||
|
|
|
|||
|
|
@ -1,40 +1,57 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6
|
||||
set -eo pipefail
|
||||
set -euxo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
deps_file="$(realpath "./deps.nix")"
|
||||
DEPS_FILE="$(realpath "./deps.nix")"
|
||||
|
||||
nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info
|
||||
new_hash="$(jq -r ".sha256" < repo_info)"
|
||||
new_rev="$(jq -r ".rev" < repo_info)"
|
||||
rm repo_info
|
||||
RELEASE_JOB_DATA=$(
|
||||
curl -s -H "Accept: application/vnd.github.v3+json" \
|
||||
https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows |
|
||||
jq -r '.workflows[] | select(.name == "Release job") | { id, path }'
|
||||
)
|
||||
RELEASE_JOB_ID=$(echo "$RELEASE_JOB_DATA" | jq -r '.id')
|
||||
RELEASE_JOB_FILE=$(echo "$RELEASE_JOB_DATA" | jq -r '.path')
|
||||
|
||||
new_version="$(
|
||||
curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \
|
||||
| grep -Po '"version":.*?[^\\]",' \
|
||||
| sed 's/"version":"\(.*\)",/\1/'
|
||||
)"
|
||||
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
||||
BASE_VERSION=$(
|
||||
curl -s "https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/${RELEASE_JOB_FILE}" |
|
||||
grep -Po 'RYUJINX_BASE_VERSION:.*?".*"' |
|
||||
sed 's/RYUJINX_BASE_VERSION: "\(.*\)"/\1/'
|
||||
)
|
||||
|
||||
if [[ "$new_version" == "$old_version" ]]; then
|
||||
echo "Already up to date! Doing nothing"
|
||||
exit 0
|
||||
LATEST_RELEASE_JOB_DATA=$(
|
||||
curl -s -H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows/${RELEASE_JOB_ID}/runs" |
|
||||
jq -r '.workflow_runs[0] | { head_sha, run_number }'
|
||||
)
|
||||
COMMIT=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.head_sha')
|
||||
PATCH_VERSION=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.run_number')
|
||||
|
||||
NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}"
|
||||
|
||||
OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
||||
|
||||
echo "comparing versions $OLD_VERSION => $NEW_VERSION"
|
||||
if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
|
||||
echo "Already up to date! Doing nothing"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cd ../../../..
|
||||
update-source-version ryujinx "$new_version" "$new_hash" --rev="$new_rev"
|
||||
SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')"
|
||||
|
||||
store_src="$(nix-build . -A ryujinx.src --no-out-link)"
|
||||
src="$(mktemp -d /tmp/ryujinx-src.XXX)"
|
||||
cp -rT "$store_src" "$src"
|
||||
chmod -R +w "$src"
|
||||
pushd "$src"
|
||||
cd ../../../..
|
||||
update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT"
|
||||
|
||||
STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)"
|
||||
SRC="$(mktemp -d /tmp/ryujinx-src.XXX)"
|
||||
cp -rT "$STORE_SRC" "$SRC"
|
||||
chmod -R +w "$SRC"
|
||||
pushd "$SRC"
|
||||
|
||||
mkdir nuget_tmp.packages
|
||||
dotnet restore Ryujinx.sln --packages nuget_tmp.packages
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet restore Ryujinx.sln --packages nuget_tmp.packages
|
||||
|
||||
nuget-to-nix ./nuget_tmp.packages > "$deps_file"
|
||||
nuget-to-nix ./nuget_tmp.packages >"$DEPS_FILE"
|
||||
|
||||
popd
|
||||
rm -r "$src"
|
||||
rm -r "$SRC"
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "corectrl";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "corectrl";
|
||||
repo = "corectrl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269";
|
||||
sha256 = "sha256-vMSIo4tfvEO6SVxB5aNBnHEn+PXN6wUfRAgUCwZEHKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "PrusaSlicer";
|
||||
name = "prusa-slicer";
|
||||
exec = "prusa-slicer";
|
||||
icon = "PrusaSlicer";
|
||||
comment = "G-code generator for 3D printers";
|
||||
|
|
@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
|
|||
categories = [ "Development" ];
|
||||
})
|
||||
(makeDesktopItem {
|
||||
name = "PrusaSlicer G-code Viewer";
|
||||
name = "prusa-gcodeviewer";
|
||||
exec = "prusa-gcodeviewer";
|
||||
icon = "PrusaSlicer-gcodeviewer";
|
||||
comment = "G-code viewer for 3D printers";
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ let
|
|||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = appname;
|
||||
name = "superslicer";
|
||||
exec = "superslicer";
|
||||
icon = appname;
|
||||
comment = description;
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.22.6";
|
||||
version = "1.22.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-aPPRzNotm3ATL0lEq+49lrlrHoNp+Dm1Im5jYF4E1vY=";
|
||||
sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
|
|
|||
|
|
@ -34,6 +34,11 @@
|
|||
, extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions
|
||||
}:
|
||||
let
|
||||
# FIXME: workaround until https://github.com/NixOS/nixpkgs/pull/162246 lands
|
||||
cleanName = if lib.hasInfix " " name
|
||||
then throw "Name must not contain spaces!"
|
||||
else name;
|
||||
|
||||
# There are multiple places in the FDO spec that make "boolean" values actually tristate,
|
||||
# e.g. StartupNotify, where "unset" is literally defined as "do something reasonable".
|
||||
# So, handle null values separately.
|
||||
|
|
@ -111,8 +116,8 @@ let
|
|||
content = [ mainSectionRendered ] ++ actionsRendered;
|
||||
in
|
||||
writeTextFile {
|
||||
name = "${name}.desktop";
|
||||
destination = "/share/applications/${name}.desktop";
|
||||
name = "${cleanName}.desktop";
|
||||
destination = "/share/applications/${cleanName}.desktop";
|
||||
text = builtins.concatStringsSep "\n" content;
|
||||
checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "olm";
|
||||
version = "3.2.9";
|
||||
version = "3.2.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.matrix.org";
|
||||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08";
|
||||
sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
, visualizationSupport ? false }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "binwalk";
|
||||
pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "garages-amsterdam";
|
||||
version = "3.2.1";
|
||||
version = "4.0.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "garages_amsterdam";
|
||||
rev = "v${version}";
|
||||
sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9";
|
||||
sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -35,7 +36,9 @@ buildPythonPackage rec {
|
|||
# The only test requires network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "garages_amsterdam" ];
|
||||
pythonImportsCheck = [
|
||||
"garages_amsterdam"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for getting garage occupancy in Amsterdam";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glfw";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FlorianRhiem";
|
||||
repo = "pyGLFW";
|
||||
rev = "v${version}";
|
||||
sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk";
|
||||
sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM=";
|
||||
};
|
||||
|
||||
# Patch path to GLFW shared object
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "5.1.1";
|
||||
version = "5.2.0";
|
||||
pname = "gspread";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f";
|
||||
sha256 = "sha256-JRc6wIFGnPnWIVFMZXbGz0bznIJfF4uMueeDdKY3sL8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,10 @@
|
|||
, ipython
|
||||
, jupyter-client
|
||||
, ipykernel
|
||||
, packaging
|
||||
, psutil
|
||||
, tornado
|
||||
, tqdm
|
||||
, isPy3k
|
||||
, futures ? null
|
||||
}:
|
||||
|
|
@ -25,7 +28,7 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ nose ];
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado
|
||||
propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm
|
||||
] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
||||
# Requires access to cluster
|
||||
|
|
|
|||
|
|
@ -64,8 +64,15 @@ buildPythonPackage rec {
|
|||
"tests/"
|
||||
];
|
||||
|
||||
# See https://github.com/google/jax/issues/9705.
|
||||
disabledTests = lib.optionals usingMKL [ "test_custom_root_with_aux" ];
|
||||
# See
|
||||
# * https://github.com/google/jax/issues/9705
|
||||
# * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921
|
||||
# * https://github.com/NixOS/nixpkgs/issues/161960
|
||||
disabledTests = lib.optionals usingMKL [
|
||||
"test_custom_linear_solve_cholesky"
|
||||
"test_custom_root_with_aux"
|
||||
"testEigvalsGrad_shape"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jax"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, pkg-config
|
||||
, python
|
||||
, dbus-python
|
||||
, packaging
|
||||
, enlightenment
|
||||
}:
|
||||
|
||||
|
|
@ -11,18 +12,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-efl";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r";
|
||||
sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ enlightenment.efl ];
|
||||
|
||||
propagatedBuildInputs = [ dbus-python ];
|
||||
propagatedBuildInputs = [ dbus-python packaging ];
|
||||
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE"
|
||||
|
|
@ -39,8 +40,8 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for EFL and Elementary";
|
||||
homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/";
|
||||
description = "Python bindings for Enlightenment Foundation Libraries";
|
||||
homepage = "https://github.com/DaveMDS/python-efl";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl3 lgpl3 ];
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
|
|
|
|||
|
|
@ -1,24 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, installShellFiles
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xkcdpass";
|
||||
version = "1.19.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c5a2e948746da6fe504e8404284f457d8e98da6df5047c6bb3f71b18882e9d2a";
|
||||
hash = "sha256-xaLpSHRtpv5QToQEKE9FfY6Y2m31BHxrs/cbGIgunSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "xkcdpass" ];
|
||||
pythonImportsCheck = [
|
||||
"xkcdpass"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.10") [
|
||||
# https://github.com/redacted/XKCD-password-generator/issues/138
|
||||
"test_entropy_printout_valid_input"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage *.?
|
||||
|
|
@ -27,7 +43,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Generate secure multiword passwords/passphrases, inspired by XKCD";
|
||||
homepage = "https://pypi.python.org/pypi/xkcdpass/";
|
||||
homepage = "https://github.com/redacted/XKCD-password-generator";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo=";
|
||||
hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zfec";
|
||||
version = "1.5.5";
|
||||
version = "1.5.7.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca";
|
||||
sha256 = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyutil ];
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ let
|
|||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Scene Builder";
|
||||
name = "scenebuilder";
|
||||
exec = "scenebuilder";
|
||||
icon = "scenebuilder";
|
||||
comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces.";
|
||||
desktopName = pname;
|
||||
desktopName = "Scene Builder";
|
||||
mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ];
|
||||
categories = [ "Development" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,19 +1,25 @@
|
|||
{ stdenv, lib, fetchurl, writeText, php, makeWrapper }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, formats
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, php
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
completion = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
|
||||
sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U=";
|
||||
hash = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U=";
|
||||
};
|
||||
|
||||
ini = writeText "php.ini" ''
|
||||
[PHP]
|
||||
memory_limit = -1 ; no limit as composer uses a lot of memory
|
||||
ini = (formats.ini { }).generate "php.ini" {
|
||||
PHP.memory_limit = -1; # no limit as composer uses a lot of memory
|
||||
Phar."phar.readonly" = "Off";
|
||||
};
|
||||
|
||||
[Phar]
|
||||
phar.readonly = Off
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wp-cli";
|
||||
|
|
@ -21,19 +27,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar";
|
||||
sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k=";
|
||||
hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
dir=$out/share/wp-cli
|
||||
mkdir -p $out/bin $dir
|
||||
|
||||
install -Dm444 ${src} $dir/wp-cli
|
||||
install -Dm444 ${ini} $dir/php.ini
|
||||
install -Dm444 ${completion} $out/share/bash-completion/completions/wp
|
||||
installShellCompletion --bash --name wp ${completion}
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \
|
||||
--add-flags "-c $dir/php.ini" \
|
||||
--add-flags "-f $dir/wp-cli"
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Domination";
|
||||
name = "domination";
|
||||
desktopName = "Domination";
|
||||
exec = "domination";
|
||||
icon = "domination";
|
||||
};
|
||||
editorDesktopItem = makeDesktopItem {
|
||||
name = "Domination Map Editor";
|
||||
name = "domination-map-editor";
|
||||
desktopName = "Domination Map Editor";
|
||||
exec = "domination-map-editor";
|
||||
icon = "domination";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let
|
|||
version = "2.9.3";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Lunar Client";
|
||||
name = "lunar-client";
|
||||
exec = "lunar-client";
|
||||
icon = "lunarclient";
|
||||
comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roon-server";
|
||||
version = "1.8-898";
|
||||
version = "1.8-903";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
in
|
||||
fetchurl {
|
||||
url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
|
||||
sha256 = "sha256-khp2E5BYb7bGEW6xfCKEqYDqAdElOFLbAkaHjILfyqo=";
|
||||
sha256 = "sha256-FkB3sh1uwOctBOAW7eO8HFNr9a9RG3Yq4hKKscYYER4=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kpM/9bRUpcqF7dXlCS01Fn8TBfeW9Rr92pBd6w6HA30=";
|
||||
sha256 = "sha256-/XkHvXzF7SG5niIknd+wh1Uc0ZbfrklgTkZigjz3aNY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lLIlPzmXdz7kY7EEb+l4hUvM7y+1pDNK06/0lB0g2SM=";
|
||||
vendorSha256 = "sha256-C3JpjDXQ6sUnz9ixO3w2aP3G122nYHezYrNW/FZqlJQ=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "remote-touchpad";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unrud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XyE8N+YVwfgxToKkhpe8zJ0e3HFDpKt7cfERxWCfbfU=";
|
||||
sha256 = "sha256-GjXcQyv55yJSAFeNNB+YeCVWav7vMGo/d1FCPoujYjA=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXi libXt libXtst ];
|
||||
tags = [ "portal,x11" ];
|
||||
|
||||
vendorSha256 = "sha256-zTx38kW/ylXXML73C2sFQciV2y3+qbO0S/ZdkiEh5Qs=";
|
||||
vendorSha256 = "sha256-WG8OjtfVemtmHkrMg4O0oofsjtFKmIvcmCn9AYAGIrc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Control mouse and keyboard from the webbrowser of a smartphone.";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }:
|
||||
{ lib, stdenv, fetchurl, libffi, coreutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "txr";
|
||||
version = "273";
|
||||
version = "274";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg=";
|
||||
sha256 = "sha256-bWgz0kmPLN0V0rkFRiCqxkBjhN8FV9fL+Vu8GSw9Ja4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
buildInputs = [ libffi ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -10609,7 +10609,7 @@ with pkgs;
|
|||
|
||||
twurl = callPackage ../tools/misc/twurl { };
|
||||
|
||||
txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; };
|
||||
txr = callPackage ../tools/misc/txr { inherit (llvmPackages_latest) stdenv; };
|
||||
|
||||
txt2man = callPackage ../tools/misc/txt2man { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1200,9 +1200,7 @@ in {
|
|||
|
||||
binwalk = callPackage ../development/python-modules/binwalk { };
|
||||
|
||||
binwalk-full = appendToName "full" (self.binwalk.override {
|
||||
visualizationSupport = true;
|
||||
});
|
||||
binwalk-full = self.binwalk.override { visualizationSupport = true; };
|
||||
|
||||
biopython = callPackage ../development/python-modules/biopython { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue