BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-11-18 18:01:14 +00:00 committed by GitHub
commit 91e24d05d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 2951 additions and 981 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
maintainers/maintainer-list.nix
View file

@ -1564,6 +1564,16 @@
githubId = 87764;
name = "Ben Ford";
};
boppyt = {
email = "boppy@nwcpz.com";
github = "boppyt";
githubId = 71049646;
name = "Zack A";
keys = [{
longkeyid = "rsa4096/0x6310C97DE31D1545";
fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545";
}];
};
borisbabic = {
email = "boris.ivan.babic@gmail.com";
github = "borisbabic";
@ -4717,6 +4727,12 @@
githubId = 896431;
name = "Chris Hodapp";
};
hollowman6 = {
email = "hollowman@hollowman.ml";
github = "HollowMan6";
githubId = 43995067;
name = "Songlin Jiang";
};
holymonson = {
email = "holymonson@gmail.com";
github = "holymonson";
@ -7839,6 +7855,12 @@
githubId = 99988;
name = "Maarten Hoogendoorn";
};
MoritzBoehme = {
email = "mail@moritzboeh.me";
github = "MoritzBoehme";
githubId = 42215704;
name = "Moritz Böhme";
};
MostAwesomeDude = {
email = "cds@corbinsimpson.com";
github = "MostAwesomeDude";
@ -9985,6 +10007,12 @@
githubId = 592876;
name = "Robert W. Pearce";
};
rprecenth = {
email = "rasmus@precenth.eu";
github = "Prillan";
githubId = 1675190;
name = "Rasmus Précenth";
};
rprospero = {
email = "rprospero+nix@gmail.com";
github = "rprospero";

38
nixos/modules/services/databases/hbase.nix
View file

@ -5,18 +5,24 @@ with lib;
let
cfg = config.services.hbase;
configFile = pkgs.writeText "hbase-site.xml" ''
<configuration>
<property>
<name>hbase.rootdir</name>
<value>file://${cfg.dataDir}/hbase</value>
</property>
<property>
<name>hbase.zookeeper.property.dataDir</name>
<value>${cfg.dataDir}/zookeeper</value>
</property>
</configuration>
'';
defaultConfig = {
"hbase.rootdir" = "file://${cfg.dataDir}/hbase";
"hbase.zookeeper.property.dataDir" = "${cfg.dataDir}/zookeeper";
};
buildProperty = configAttr:
(builtins.concatStringsSep "\n"
(lib.mapAttrsToList
(name: value: ''
<property>
<name>${name}</name>
<value>${builtins.toString value}</value>
</property>
'')
configAttr));
configFile = pkgs.writeText "hbase-site.xml"
(buildProperty (defaultConfig // cfg.settings));
configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } ''
mkdir -p $out
@ -85,6 +91,14 @@ in {
'';
};
settings = mkOption {
type = with lib.types; attrsOf (oneOf [ str int bool ]);
default = defaultConfig;
description = ''
configurations in hbase-site.xml, see <link xlink:href="https://github.com/apache/hbase/blob/master/hbase-server/src/test/resources/hbase-site.xml"/> for details.
'';
};
};
};

2
nixos/modules/services/matrix/mjolnir.nix
View file

@ -14,6 +14,8 @@ let
else
cfg.homeserverUrl;
rawHomeserverUrl = cfg.homeserverUrl;
pantalaimon = {
inherit (cfg.pantalaimon) username;

65
pkgs/applications/editors/lite-xl/default.nix Normal file
View file

@ -0,0 +1,65 @@
{ agg
, fetchFromGitHub
, fetchpatch
, Foundation
, freetype
, lib
, lua5_2
, meson
, ninja
, pcre2
, pkg-config
, reproc
, SDL2
, stdenv
}:
stdenv.mkDerivation rec {
pname = "lite-xl";
version = "2.0.1";
src = fetchFromGitHub {
owner = "lite-xl";
repo = "lite-xl";
rev = "v${version}";
sha256 = "sha256-+RbmT6H/5Ldhv3qOClxMjCSGMudbkGtkjo2SpGqExao=";
};
patches = [
# Fixes compatibility with Lua5.2, remove patch when PR merged
# https://github.com/lite-xl/lite-xl/pull/435
(fetchpatch {
name = "0001-replace-unpack-with-table.unpack.patch";
url = "https://github.com/lite-xl/lite-xl/commit/30ccde896d1ffe37cbd8990e9b8aaef275e18935.patch";
sha256 = "sha256-IAe3jIyD3OtZtu1V7MtPR4QzFKvU/aV/nLQ4U9nHyIQ=";
})
# Lets meson fallback to the system reproc if available.
# remove patch when 2.0.2 is proposed.
(fetchpatch {
name = "0002-use-dependency-fallbacks-use-system-reproc-if-available.patch";
url = "https://github.com/lite-xl/lite-xl/commit/973acb787aacb0164b2f4ae6fe335d250ba80a7b.patch";
sha256 = "sha256-GmgATsRlj1FePmw3+AoWEMZIo2eujHYewKQCx583qbU=";
})
];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [
agg
freetype
lua5_2
pcre2
reproc
SDL2
] ++ lib.optionals stdenv.isDarwin [
Foundation
];
meta = with lib; {
description = "A lightweight text editor written in Lua";
homepage = "https://github.com/lite-xl/lite-xl";
license = licenses.mit;
maintainers = with maintainers; [ boppyt ];
platforms = platforms.unix;
};
}

4
pkgs/applications/misc/cloak/default.nix
View file

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
pname = "cloak";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
homepage = "https://github.com/evansmurithi/cloak";
description = "Command-line OTP authenticator application";

10
pkgs/applications/misc/osmscout-server/default.nix
View file

@ -1,6 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
, libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
}:
@ -41,7 +41,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake pkg-config qttools ];
buildInputs = [
kirigami2 qtquickcontrols2 qtlocation
mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
libpostal sqlite marisa kyotocabinet boost protobuf date
];
@ -52,8 +52,10 @@ mkDerivation rec {
mv data/valhalla.json-3.1 data/valhalla.json
'';
# Choose to build the kirigami UI variant
qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ];
qmakeFlags = [
"SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant
"CONFIG+=disable_mapnik" # Disable the optional mapnik backend
];
meta = with lib; {
description = "Maps server providing tiles, geocoder, and router";

21
pkgs/applications/networking/cluster/tgswitch/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
pname = "tgswitch";
version = "0.5.378";
src = fetchFromGitHub {
owner = "warrensbox";
repo = "tgswitch";
rev = version;
sha256 = "0q2aqh75acbpkmvkws0rl3d5dzq3sisy637c0x6cnc88h34g3n3i";
};
goPackagePath = "github.com/warrensbox/tgswitch";
meta = with lib; {
description = "A command line tool to switch between different versions of terragrunt";
homepage = "https://github.com/warrensbox/tgswitch";
license = licenses.mit;
maintainers = with maintainers; [ psibi ];
};
}

11
pkgs/applications/networking/mailreaders/electron-mail/default.nix
View file

@ -1,13 +1,13 @@
{ appimageTools, lib, fetchurl }:
{ appimageTools, lib, fetchurl, libsecret }:
let
pname = "electron-mail";
version = "4.12.2";
version = "4.12.7";
name = "ElectronMail-${version}";
src = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU=";
sha256 = "42d0b49a2feba628f4845940ffd9607739bd5fcdbe6ba37e15f993c511d21e46";
};
appimageContents = appimageTools.extract { inherit name src; };
@ -16,13 +16,16 @@ in appimageTools.wrapType2 {
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
extraPkgs = pkgs: with pkgs; [
libsecret
];
meta = with lib; {
description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail";
homepage = "https://github.com/vladimiry/ElectronMail";

4
pkgs/applications/networking/mhost/default.nix
View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, rustPlatform, lib }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "mhost";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0gqrya0bpdd67k2sxib7f4npnrx84d9r4hjq2sg2xz4j8pmgs018";
buildInputs = lib.optional stdenv.isDarwin Security;
CARGO_CRATE_NAME = "mhost";
doCheck = false;

45
pkgs/applications/networking/synology-drive/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }:
mkDerivation rec {
pname = "synology-drive";
subVersion = "12674";
version = "3.0.1-${subVersion}";
src = fetchurl {
url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb";
sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a";
};
nativeBuildInputs = [ autoPatchelfHook dpkg ];
buildInputs = [ glibc gnome.nautilus ];
unpackPhase = ''
mkdir -p $out
dpkg -x $src $out
'';
installPhase = ''
# synology-drive executable
cp -av $out/usr/* $out
rm -rf $out/usr
runHook postInstall
'';
postInstall = ''
substituteInPlace $out/bin/synology-drive --replace /opt $out/opt
'';
meta = with lib; {
homepage = "https://www.synology.com/";
description = "Synchronize files between client and Synology NAS.";
longDescription = ''
Drive for PC, the desktop utility of the DSM add-on package.
Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers.
'';
license = licenses.unfree;
maintainers = with maintainers; [ MoritzBoehme ];
platforms = [ "x86_64-linux" ];
};
}

27
pkgs/applications/video/streamlink/default.nix
View file

@ -1,17 +1,16 @@
{ lib
, python3Packages
, rtmpdump
, ffmpeg
, fetchpatch
}:
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "2.4.0";
version = "3.0.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af";
sha256 = "sha256-GDbUlu5tRL5mdT7KrIdmxCbeAtYL1xvZXyZFwiuvKXo=";
};
checkInputs = with python3Packages; [
@ -22,26 +21,20 @@ python3Packages.buildPythonApplication rec {
];
propagatedBuildInputs = (with python3Packages; [
pycryptodome
requests
iso-639
iso3166
websocket-client
isodate
lxml
pycountry
pycryptodome
pysocks
requests
websocket-client
]) ++ [
rtmpdump
ffmpeg
];
patches = [
# Patch failing tests to expect correct Accept-Encoding as generated by Requests
(fetchpatch {
url = "https://github.com/streamlink/streamlink/commit/ae747a113199c119bced4613d33edcc67a222bb9.patch";
includes = [ "tests/test_stream_json.py" ];
sha256 = "sha256-KEgyWdh5DNgNktmLSvKQowUQO9p9Q7zP4NbCQJPNgKw=";
})
];
postPatch = ''
substituteInPlace setup.cfg --replace 'lxml >=4.6.4,<5.0' 'lxml'
'';
meta = with lib; {
homepage = "https://streamlink.github.io/";

4
pkgs/development/interpreters/erlang/R24.nix
View file

@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "24.1.4";
sha256 = "sha256-QE2VRayIswVrAOv9/bq+ebv3xxIL3fFMnfm5u1Wh8j4=";
version = "24.1.5";
sha256 = "sha256-MSPoJpbL9WeERqCSh9fiw9jhJGssqolxudyURpiypb0=";
}

22
pkgs/development/libraries/agg/default.nix
View file

@ -8,8 +8,18 @@ stdenv.mkDerivation rec {
url = "https://www.antigrain.com/${pname}-${version}.tar.gz";
sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake libtool freetype SDL libX11 ];
nativeBuildInputs = [
pkg-config
autoconf
automake
libtool
];
buildInputs = [
freetype
SDL
] ++ lib.optionals stdenv.isLinux [
libX11
];
postPatch = ''
substituteInPlace include/agg_renderer_outline_aa.h \
@ -22,7 +32,11 @@ stdenv.mkDerivation rec {
sh autogen.sh
'';
configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--enable-examples=no" ];
configureFlags = lib.optionals stdenv.isLinux [
"--x-includes=${lib.getDev libX11}/include"
"--x-libraries=${lib.getLib libX11}/lib"
"--enable-examples=no"
];
# libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o
# libtool: error: cannot find the library 'libexamples.la'
@ -43,6 +57,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
homepage = "http://www.antigrain.com/";
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
}

22
pkgs/development/libraries/iqueue/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft_gsl }:
stdenv.mkDerivation rec {
pname = "iqueue";
version = "0.1.0";
src = fetchurl {
url = "https://github.com/twosigma/iqueue/releases/download/v${version}/iqueue-${version}.tar.gz";
sha256 = "0049fnr02k15gr21adav33swrwxrpbananilnrp63vp5zs5v9m4x";
};
doCheck = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libbsd microsoft_gsl ];
meta = with lib; {
homepage = "https://github.com/twosigma/iqueue";
description = "Indexed queue";
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.catern ];
};
}

5
pkgs/development/libraries/proj/default.nix
View file

@ -42,6 +42,11 @@ stdenv.mkDerivation rec {
"-DRUN_NETWORK_DEPENDENT_TESTS=OFF"
];
preCheck = ''
export HOME=$TMPDIR
export TMP=$TMPDIR
'';
doCheck = true;
meta = with lib; {

7
pkgs/development/libraries/stxxl/default.nix
View file

@ -2,7 +2,7 @@
, stdenv
, fetchFromGitHub
, cmake
, parallel ? true
, parallelSupport ? (!stdenv.isDarwin)
}:
let
@ -25,11 +25,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF"
(mkFlag parallel "USE_GNU_PARALLEL")
(mkFlag parallelSupport "USE_GNU_PARALLEL")
(mkFlag parallelSupport "USE_OPENMP")
];
passthru = {
inherit parallel;
inherit parallelSupport;
};
meta = with lib; {

8
pkgs/development/python-modules/bimmer-connected/default.nix
View file

@ -5,20 +5,21 @@
, pbr
, requests
, pytestCheckHook
, requests-mock
}:
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.7.22";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
sha256 = "sha256-tAkgOZvf9nyrAfFRxGkp7O/2oIAdBx+hNZbK9den+5c=";
sha256 = "sha256-sox24UpuIK5SP0IWVxa/NiyR5IrTzXe0SVTCd4FB6mo=";
};
nativeBuildInputs = [
@ -33,6 +34,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
requests-mock
];
meta = with lib; {

4
pkgs/development/python-modules/flask-wtf/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-WTF";
version = "0.15.1";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc";
sha256 = "872fbb17b5888bfc734edbdcf45bc08fb365ca39f69d25dc752465a455517b28";
};
propagatedBuildInputs = [ flask wtforms nose ];

38
pkgs/development/python-modules/gistyc/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, certifi
, click
, requests
}:
buildPythonPackage rec {
pname = "gistyc";
version = "1.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-WVK45U9e3qyZFi9wSRHNi9+1u4TetlZkYXAZN7LVqhE=";
};
propagatedBuildInputs = [
certifi
click
requests
];
meta = with lib; {
homepage = "https://github.com/ThomasAlbin/gistyc";
description = "A Python based GitHub GIST management tool";
longDescription = ''
gistyc is a Python-based library that enables developers to create, update
and delete their GitHub GISTs. CLI capabilities allow you to execute the
routines from the shell and can be integrated into your project's CI/CD
pipeline to automatically create or update your GISTs (e.g., via GitHub
actions). Files are separated in GIST sections depending on the separation
blocks.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
};
}

7
pkgs/development/python-modules/ihatemoney/default.nix
View file

@ -132,6 +132,13 @@ buildPythonPackage rec {
debts
];
# upstream performed the update without needing to patch the code
# the original patch does not apply, sadly
# https://github.com/spiral-project/ihatemoney/pull/912
postPatch = ''
substituteInPlace setup.cfg --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2"
'';
checkInputs = [
flask_testing
pytestCheckHook

48
pkgs/development/python-modules/pydyf/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ lib,
buildPythonPackage,
fetchPypi,
isPy3k,
pytestCheckHook,
coverage,
ghostscript,
pillow,
pytest,
pytest-cov,
pytest-flake8,
pytest-isort
}:
buildPythonPackage rec {
pname = "pydyf";
version = "0.1.2";
disabled = !isPy3k;
pytestFlagsArray = [
# setup.py is auto-generated and doesn't pass the flake8 check
"--ignore=setup.py"
];
checkInputs = [
pytestCheckHook
coverage
ghostscript
pillow
pytest
pytest-cov
pytest-flake8
pytest-isort
];
src = fetchPypi {
inherit version;
pname = "pydyf";
sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw=";
};
meta = with lib; {
homepage = "https://doc.courtbouillon.org/pydyf/stable/";
description = "Low-level PDF generator written in Python and based on PDF specification 1.7";
license = licenses.bsd3;
maintainers = with maintainers; [ rprecenth ];
};
}

65
pkgs/development/python-modules/weasyprint/default.nix
View file

@ -1,17 +1,24 @@
{ buildPythonPackage,
fetchPypi,
fetchpatch,
pytestCheckHook,
brotli,
cairosvg,
fonttools,
pydyf,
pyphen,
cffi,
cssselect,
lxml,
html5lib,
tinycss,
zopfli,
glib,
harfbuzz,
pango,
fontconfig,
lib, stdenv,
ghostscript,
pytest,
pytest-runner,
pytest-isort,
@ -23,35 +30,48 @@
buildPythonPackage rec {
pname = "weasyprint";
version = "52";
version = "53.4";
disabled = !isPy3k;
# excluded test needs the Ahem font
checkPhase = ''
runHook preCheck
pytest -k 'not test_font_stretch'
runHook postCheck
'';
pytestFlagsArray = [
# setup.py is auto-generated and doesn't pass the flake8 check
"--ignore=setup.py"
# ffi.py is patched by us and doesn't pass the flake8 check
"--ignore=weasyprint/text/ffi.py"
];
# ignore failing flake8-test
prePatch = ''
substituteInPlace setup.cfg \
--replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501'
'';
disabledTests = [
# test_font_stretch needs the Ahem font (fails on macOS)
"test_font_stretch"
];
checkInputs = [ pytest pytest-runner pytest-isort pytest-flake8 pytest-cov ];
checkInputs = [
pytestCheckHook
ghostscript
pytest
pytest-runner
pytest-isort
pytest-flake8
pytest-cov
];
FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss ];
propagatedBuildInputs = [
brotli
cairosvg
cffi
cssselect
fonttools
html5lib
lxml
pydyf
pyphen
tinycss
zopfli
];
# 47043a1fd7e50a892b9836466f521df85d597c4.patch can be removed after next release of weasyprint, see:
# https://github.com/Kozea/WeasyPrint/issues/1333#issuecomment-818062970
patches = [
(fetchpatch {
url = "https://github.com/Kozea/WeasyPrint/commit/47043a1fd7e50a892b9836466f521df85d597c44.patch";
sha256 = "0l9z0hrav3bcdajlg3vbzljq0lkw7hlj8ppzrq3v21hbj1il1nsb";
})
(substituteAll {
src = ./library-paths.patch;
fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}";
@ -59,13 +79,14 @@ buildPythonPackage rec {
gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}";
pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
src = fetchPypi {
inherit version;
pname = "WeasyPrint";
sha256 = "0rwf43111ws74m8b1alkkxzz57g0np3vmd8as74adwnxslfcg4gs";
pname = "weasyprint";
sha256 = "sha256-EMyxfVXHMJa98e3T7+WMuFWwfkwwfZutTryaPxP/RYA=";
};
meta = with lib; {

59
pkgs/development/python-modules/weasyprint/library-paths.patch
View file

@ -1,38 +1,31 @@
diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py
index 79e3b5b..4438eb4 100644
--- a/weasyprint/fonts.py
+++ b/weasyprint/fonts.py
@@ -45,11 +45,8 @@ else:
# with OSError: dlopen() failed to load a library: cairo / cairo-2
# So let's hope we find the same file as cairo already did ;)
# Same applies to pangocairo requiring pangoft2
- fontconfig = dlopen(ffi, 'fontconfig', 'libfontconfig',
- 'libfontconfig-1.dll',
- 'libfontconfig.so.1', 'libfontconfig-1.dylib')
- pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0',
- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib')
+ fontconfig = dlopen(ffi, '@fontconfig@')
+ pangoft2 = dlopen(ffi, '@pangoft2@')
ffi.cdef('''
// FontConfig
diff --git a/weasyprint/text.py b/weasyprint/text.py
index 1dc5e4d..b070bad 100644
--- a/weasyprint/text.py
+++ b/weasyprint/text.py
@@ -255,12 +255,9 @@ def dlopen(ffi, *names):
diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py
index 0734cbea..22e31a5e 100644
--- a/weasyprint/text/ffi.py
+++ b/weasyprint/text/ffi.py
@@ -387,21 +387,11 @@ def _dlopen(ffi, *names):
return ffi.dlopen(names[0]) # pragma: no cover
-gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so.0',
- 'libgobject-2.0.dylib')
-pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0',
- 'libpango-1.0.dylib')
-pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0',
- 'libpangocairo-1.0.so.0', 'libpangocairo-1.0.dylib')
+gobject = dlopen(ffi, '@gobject@')
+pango = dlopen(ffi, '@pango@')
+pangocairo = dlopen(ffi, '@pangocairo@')
-gobject = _dlopen(
- ffi, 'gobject-2.0-0', 'gobject-2.0', 'libgobject-2.0-0',
- 'libgobject-2.0.so.0', 'libgobject-2.0.dylib')
-pango = _dlopen(
- ffi, 'pango-1.0-0', 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0',
- 'libpango-1.0.dylib')
-harfbuzz = _dlopen(
- ffi, 'harfbuzz', 'harfbuzz-0.0', 'libharfbuzz-0',
- 'libharfbuzz.so.0', 'libharfbuzz.so.0', 'libharfbuzz.0.dylib')
-fontconfig = _dlopen(
- ffi, 'fontconfig-1', 'fontconfig', 'libfontconfig', 'libfontconfig-1.dll',
- 'libfontconfig.so.1', 'libfontconfig-1.dylib')
-pangoft2 = _dlopen(
- ffi, 'pangoft2-1.0-0', 'pangoft2-1.0', 'libpangoft2-1.0-0',
- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib')
+gobject = _dlopen(ffi, '@gobject@')
+pango = _dlopen(ffi, '@pango@')
+harfbuzz = _dlopen(ffi, '@harfbuzz@')
+fontconfig = _dlopen(ffi, '@fontconfig@')
+pangoft2 = _dlopen(ffi, '@pangoft2@')
gobject.g_type_init()

8
pkgs/development/tools/rust/cargo-crev/default.nix
View file

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
version = "0.20.1";
version = "0.21.3";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = version;
sha256 = "sha256-j2dafXUI6rDEYboSAciMeNma/YaBYKuQZgMUGVU+oBQ=";
rev = "v${version}";
sha256 = "sha256-CwECZz+qS5+rgwudRutcKZsYxfMLcVbA/9SZASmF+k4=";
};
cargoSha256 = "sha256-khrpS6QFpweKbTbR0YhAJTTrgDoZl9fzYPDs+JE1mtA=";
cargoSha256 = "sha256-7c6Hu6UacQuRsCHlGKr1TtN+XHVGr1sw+HEGWeT9SJA=";
preCheck = ''
export HOME=$(mktemp -d)

11
pkgs/games/pacvim/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ncurses }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses }:
stdenv.mkDerivation {
pname = "pacvim";
@ -9,6 +9,15 @@ stdenv.mkDerivation {
rev = "ca7c8833c22c5fe97974ba5247ef1fcc00cedb8e";
sha256 = "1kq6j7xmsl5qfl1246lyglkb2rs9mnb2rhsdrp18965dpbj2mhx2";
};
patches = [
# Fix pending upstream inclusion for ncurses-6.3 support:
# https://github.com/jmoon018/PacVim/pull/53
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/jmoon018/PacVim/commit/760682824cdbb328af616ff43bf822ade23924f7.patch";
sha256 = "1y3928dc2nkfldqhpiqk0blbx7qj8ar35f1w7fb92qwxrj8p4i6g";
})
];
buildInputs = [ ncurses ];
makeFlags = [ "PREFIX=$(out)" ];

868
pkgs/misc/emulators/retroarch/cores.nix
View file

File diff suppressed because it is too large Load diff

9
pkgs/misc/emulators/retroarch/default.nix
View file

@ -22,12 +22,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "retroarch-bare";
version = "1.8.5";
# FIXME: retroarch >=1.9.3 doesn't load the cores
version = "1.9.2";
src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
sha256 = "1pg8j9wvwgrzsv4xdai6i6jgdcc922v0m42rbqxvbghbksrc8la3";
sha256 = "sha256-Dwv0hl+d99FbVMG4KnkjO1aYfAw0m4x+zvrbyb/wOX8=";
rev = "v${version}";
};
@ -55,8 +56,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://libretro.com";
description = "Multi-platform emulator frontend for libretro cores";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch ];
maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ];
};
}

513
pkgs/misc/emulators/retroarch/hashes.json Normal file
View file

@ -0,0 +1,513 @@
{
"atari800": {
"owner": "libretro",
"repo": "libretro-atari800",
"rev": "478a8ec99a7f8436a39d5ac193c5fe313233ee7b",
"sha256": "LJpRegJVR2+sS1UmTTpVest0rMrNDBMXmj/jRFVglWI=",
"fetchSubmodules": false
},
"beetle-snes": {
"owner": "libretro",
"repo": "beetle-bsnes-libretro",
"rev": "bc867656d7438aaffc6818b3b92350587bc78a47",
"sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg=",
"fetchSubmodules": false
},
"beetle-gba": {
"owner": "libretro",
"repo": "beetle-gba-libretro",
"rev": "38182572571a48cb58057cde64b915237c4e2d58",
"sha256": "4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=",
"fetchSubmodules": false
},
"beetle-lynx": {
"owner": "libretro",
"repo": "beetle-lynx-libretro",
"rev": "b84c79b2f185482f9cec2b10f33cbe1bc5732dd9",
"sha256": "pR3EsFN/Wf77gPoAnjf/nI0XlB2098qIrmbdjB4jmMQ=",
"fetchSubmodules": false
},
"beetle-ngp": {
"owner": "libretro",
"repo": "beetle-ngp-libretro",
"rev": "f969af2b52f20642aea7e800e3cfcce728f3aee9",
"sha256": "GIzLZ3iOJeHKdAowhM4S56iouaxX8v2XZgc/ZiCzCPk=",
"fetchSubmodules": false
},
"beetle-pce-fast": {
"owner": "libretro",
"repo": "beetle-pce-fast-libretro",
"rev": "81d4c9d07a76c89c32ad0e7450b69bde6403836f",
"sha256": "LhQbAEUMhoIF3VfwLbhtD7xxSddzdgwIHHnSabQPAvs=",
"fetchSubmodules": false
},
"beetle-pcfx": {
"owner": "libretro",
"repo": "beetle-pcfx-libretro",
"rev": "a1f1734509dd6acb11269f118d61f480ae8dbacf",
"sha256": "rvRDuYJLxb1TSwNXhp3ATJW0sQgWi8Cj4NR3hep/AJk=",
"fetchSubmodules": false
},
"beetle-psx": {
"owner": "libretro",
"repo": "beetle-psx-libretro",
"rev": "ccca81930a078c0efd77b00327d2ee212698f3b4",
"sha256": "Hy8Zrp0kTR+Mfbq0nVYerSarRCxZI+ykgDOscakDMiU=",
"fetchSubmodules": false
},
"beetle-saturn": {
"owner": "libretro",
"repo": "beetle-saturn-libretro",
"rev": "e1119e91a4e3f4b30971455aeb3c1a6f4cd05e59",
"sha256": "lKlNNAHK1ynFXY++Ya0m1Ax5YTZkd44eQjzuOLXfWa8=",
"fetchSubmodules": false
},
"beetle-supergrafx": {
"owner": "libretro",
"repo": "beetle-supergrafx-libretro",
"rev": "59062662d6e925ad512fcbb9c1a0db97d1592bc1",
"sha256": "kGyl5XJMFUALPAEZf4IynY6bmXWfqy0o65eO8zS0RTE=",
"fetchSubmodules": false
},
"beetle-wswan": {
"owner": "libretro",
"repo": "beetle-wswan-libretro",
"rev": "0c7faaf7f70b72ebb68e310530cd46a69e680d40",
"sha256": "UQyICcZe1DVotSFt0QVnGop+JG5NJwTBcGSZaFW0P0U=",
"fetchSubmodules": false
},
"beetle-vb": {
"owner": "libretro",
"repo": "beetle-vb-libretro",
"rev": "1bd0da71c8f6add253ad76e2b6e1357cd09fc304",
"sha256": "KguKbRK0uXE+brpF8HdRwi8Gt76AMa4wkh1MFvNCbN4=",
"fetchSubmodules": false
},
"bluemsx": {
"owner": "libretro",
"repo": "bluemsx-libretro",
"rev": "cfc1df4d026387883f21994bcce603c4a6be8730",
"sha256": "ix/AyYNer1R73ZJW1reXyj7geBr3ThrqXf5Ki5yrz9A=",
"fetchSubmodules": false
},
"bsnes-mercury": {
"owner": "libretro",
"repo": "bsnes-mercury",
"rev": "d232c6ea90552f5921fec33a06626f08d3e18b24",
"sha256": "fpl7hmqz+Ca+9ZeM6E1JSikbiu+NJUU8xXtyl6Dd9Gg=",
"fetchSubmodules": false
},
"citra": {
"owner": "libretro",
"repo": "citra",
"rev": "b1959d07a340bfd9af65ad464fd19eb6799a96ef",
"sha256": "Tw6Niba9gsZOMKGaXF9AZ5gdigB0mmFyqoRTMElM/Ps=",
"fetchSubmodules": true
},
"desmume": {
"owner": "libretro",
"repo": "desmume",
"rev": "7ea0fc96804fcd9c8d33e8f76cf64b1be50cc5ea",
"sha256": "4S/CirRVOBN6PVbato5X5fu0tBn3Fu5FEAbdf3TBqng=",
"fetchSubmodules": false
},
"desmume2015": {
"owner": "libretro",
"repo": "desmume2015",
"rev": "cd89fb7c48c735cb321311fbce7e6e9889dda1ce",
"sha256": "9Ou/n6pxRjJOp/Ybpyg4+Simosj2X26kLZCMEqeVL6U=",
"fetchSubmodules": false
},
"dolphin": {
"owner": "libretro",
"repo": "dolphin",
"rev": "82e617439b622af5d1189e9fec67e7f1376be099",
"sha256": "Q3a+0SYocX1hBGLs1K9r932NkiCDFINPhtHeyzUknJE=",
"fetchSubmodules": false
},
"dosbox": {
"owner": "libretro",
"repo": "dosbox-libretro",
"rev": "aa71b67d54eaaf9e41cdd3cb5153d9cff0ad116e",
"sha256": "L0Y67UROjldnXUlLQ+Xbd7RHLb96jDxlB/k+LR9Kbas=",
"fetchSubmodules": false
},
"eightyone": {
"owner": "libretro",
"repo": "81-libretro",
"rev": "30344d3499fdb301ee33de136f7b390bebe0756a",
"sha256": "kMwga9MkjV+dKxW3VLu+rxst6H20HhREoiNBsCLa1G0=",
"fetchSubmodules": false
},
"fbalpha2012": {
"owner": "libretro",
"repo": "fbalpha2012",
"rev": "23f98fc7cf4f2f216149c263cf5913d2e28be8d4",
"sha256": "dAInW6tTV7oXcPhKMnHWcmQaWQCTqRrYHD2yuaI1I1w=",
"fetchSubmodules": false
},
"fbneo": {
"owner": "libretro",
"repo": "fbneo",
"rev": "4d6387b7f3e3f1a9c25015789d751c6db1a9ae8c",
"sha256": "bIOmvhu9mOfOXoOTbwbjMHIZ3JkGz96yyFZALmqkOmk=",
"fetchSubmodules": false
},
"fceumm": {
"owner": "libretro",
"repo": "libretro-fceumm",
"rev": "a918869c18c9f30b84e04260b78b675b8a3c7be1",
"sha256": "nDYPrwIsvhWveDQDE0WEK7GO60iRE967p1XxXn+lNj4=",
"fetchSubmodules": false
},
"flycast": {
"owner": "libretro",
"repo": "flycast",
"rev": "ae670ea28fdbb9f08149cb598312a71a0970ca67",
"sha256": "jmSOfyak5mX04HgZOtCF9cz8HqAApxDXHJ6IqhqGILE=",
"fetchSubmodules": false
},
"fmsx": {
"owner": "libretro",
"repo": "fmsx-libretro",
"rev": "20c805409b8f6e1f9d61cb3dff0d5b28d82d1ee3",
"sha256": "uqqVF2+YpfWOKbe8aIreoImFb3/kL8ohslJkl+JivQI=",
"fetchSubmodules": false
},
"freeintv": {
"owner": "libretro",
"repo": "freeintv",
"rev": "0058a09492c5c17a4fa59ebb3601ce66844b3b25",
"sha256": "DA6eAl9ZR84Ow8rH9q/DVbEU83nmidwMy3kqk+hWWLQ=",
"fetchSubmodules": false
},
"gambatte": {
"owner": "libretro",
"repo": "gambatte-libretro",
"rev": "4b822bcf561856689e101dd5505d365de5ffcffe",
"sha256": "FsIQLd/UO5xs/aTpggSn8WLPgi83gsxRlwKR+UzH+TY=",
"fetchSubmodules": false
},
"genesis-plus-gx": {
"owner": "libretro",
"repo": "Genesis-Plus-GX",
"rev": "309a4aacfd582c312dcad61b7abfdffba4a0c66e",
"sha256": "jnbey1USldDZGXGXLLR5TgSJZgD+6ZFpwfIf6c8xvyM=",
"fetchSubmodules": false
},
"gpsp": {
"owner": "libretro",
"repo": "gpsp",
"rev": "a2aa78733d8daf1d550c9dc76c6ff94e8670b31c",
"sha256": "nKim7YkksUyZO97SvrW1TEYQlA+7Yi7xbLtyDPV4LWc=",
"fetchSubmodules": false
},
"gw": {
"owner": "libretro",
"repo": "gw-libretro",
"rev": "0f1ccca156388880bf4507ad44741f80945dfc6f",
"sha256": "BVpx8pL224J2u9W6UDrxzfEv4qIsh6wrf3bDdd1R850=",
"fetchSubmodules": false
},
"handy": {
"owner": "libretro",
"repo": "libretro-handy",
"rev": "e7b4e32d5f32d6e96630072072844a7dd16a02d9",
"sha256": "dQpEqxOcac7gdbmWu4HTvFx++us/spVMfroBlLTAgF0=",
"fetchSubmodules": false
},
"hatari": {
"owner": "libretro",
"repo": "hatari",
"rev": "cea06eebf695b078fadc0e78bb0f2b2baaca799f",
"sha256": "Z05IGubwdgg7X/e2ZG49zVfXuITM59HW/1gicdpDXls=",
"fetchSubmodules": false
},
"mame": {
"owner": "libretro",
"repo": "mame",
"rev": "031ac783585e7d5156a6f87a9ba20d88caf94ad6",
"sha256": "hLMQw5jvJTxojGwCY7iUDHcJdLZjcLzEDhW576TerJI=",
"fetchSubmodules": false
},
"mame2000": {
"owner": "libretro",
"repo": "mame2000-libretro",
"rev": "4793742b457945afb74053c8a895e6ff0b36b033",
"sha256": "DA9fZTic/jlYzSAIiOjfhohyEyQZiBNdIa8YCZoKZNs=",
"fetchSubmodules": false
},
"mame2003": {
"owner": "libretro",
"repo": "mame2003-libretro",
"rev": "d0ed1a565803cfada9f4088326eae616f6e5f8a3",
"sha256": "JGEy6Mp5qcZwaehzbj+qpdBfxHzqi6qIR7akxIj/WK8=",
"fetchSubmodules": false
},
"mame2003-plus": {
"owner": "libretro",
"repo": "mame2003-plus-libretro",
"rev": "841e44dff953a346127f15be53cb34778e20ce1c",
"sha256": "aCXyeDcz0uSObe4S2bQWCxIAF5aA3kne5v0HT+oXHuw=",
"fetchSubmodules": false
},
"mame2010": {
"owner": "libretro",
"repo": "mame2010-libretro",
"rev": "932e6f2c4f13b67b29ab33428a4037dee9a236a8",
"sha256": "HSZRSnc+0300UE9fPcUOMrXABlxHhTewkFPTqQ4Srxs=",
"fetchSubmodules": false
},
"mame2015": {
"owner": "libretro",
"repo": "mame2015-libretro",
"rev": "ef41361dc9c88172617f7bbf6cd0ead4516a3c3f",
"sha256": "HZrw9KKwYAJyU4NH1BEvuod/TK/nqjN03qJuSX8JP8o=",
"fetchSubmodules": false
},
"mame2016": {
"owner": "libretro",
"repo": "mame2016-libretro",
"rev": "d53c379892b0bd91b4a52fc2de491e1199f03e32",
"sha256": "GQ4Sdg/1nZRT4Z1Aqq1zPo96duqIGyt6sjghf9ap2Jg=",
"fetchSubmodules": false
},
"mesen": {
"owner": "SourMesen",
"repo": "mesen",
"rev": "86326e832974d984846ae078e568c023a5f76f1f",
"sha256": "At5rhlJ6rAnXaQrmRA1NtCCi+Ff/ytlt5dwsaXZhxXg=",
"fetchSubmodules": false
},
"meteor": {
"owner": "libretro",
"repo": "meteor-libretro",
"rev": "e533d300d0561564451bde55a2b73119c768453c",
"sha256": "zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=",
"fetchSubmodules": false
},
"mgba": {
"owner": "libretro",
"repo": "mgba",
"rev": "033e067285745909722df930deaeead80ea2d54a",
"sha256": "ZFmiVOf8H3PtSCWTtYc3XsIpiJI6XZ2v/HsusQsg7H8=",
"fetchSubmodules": false
},
"mupen64plus": {
"owner": "libretro",
"repo": "mupen64plus-libretro-nx",
"rev": "018ee72b4fe247b38ed161033ad12a19bb936f00",
"sha256": "vJz9S9lUgJp8O0NgJF6/EYymFqwZefvrT/HJLpMhgEk=",
"fetchSubmodules": false
},
"neocd": {
"owner": "libretro",
"repo": "neocd_libretro",
"rev": "83d10f3be10fff2f28aa56fc674c687528cb7f5c",
"sha256": "yYZGoMsUfE8cpU9i826UWQGi1l0zPJPcBDb2CINxGeQ=",
"fetchSubmodules": false
},
"nestopia": {
"owner": "libretro",
"repo": "nestopia",
"rev": "ea6f1c0631bb62bf15ab96493127dd9cfaf74d1c",
"sha256": "v+5000V1SR1sXWHryoZEi5sTgaRlVMrHmWKJX2stdSk=",
"fetchSubmodules": false
},
"np2kai": {
"owner": "AZO234",
"repo": "NP2kai",
"rev": "3e8fedc7c1c6f68faa26589187512474a766ee9e",
"sha256": "5bfh/aZOqfHz1x2s5AzZo4zq9qA4w10d9vYuuILdKJQ=",
"fetchSubmodules": true
},
"o2em": {
"owner": "libretro",
"repo": "libretro-o2em",
"rev": "c039e83f2589cb9d21b9aa5dc211954234ab8c97",
"sha256": "QQS4mS68C3aTZ4dw7ju6WyPlDjIBoDkIeQduCccAmDQ=",
"fetchSubmodules": false
},
"opera": {
"owner": "libretro",
"repo": "opera-libretro",
"rev": "d8aa7cecf96298bd7ee51718086f7b1bc8c57e2a",
"sha256": "1t+zwCVmqiPFFNCNq9XzVfRGbEA1q8v4jzhOb+wV/nA=",
"fetchSubmodules": false
},
"parallel-n64": {
"owner": "libretro",
"repo": "parallel-n64",
"rev": "0a67445ce63513584d92e5c57ea87efe0da9b3bd",
"sha256": "rms+T8JOp/TJ/T5a5uLj8lu1LLz/GAsJZ7UbK42C9yU=",
"fetchSubmodules": false
},
"pcsx_rearmed": {
"owner": "libretro",
"repo": "pcsx_rearmed",
"rev": "589bd99ba31de8216624dbf0cbbc016f0663ce3d",
"sha256": "6OtsWXTo6ca0M/cofpvWPEd0Tqy3XDa8vaa7OUTxnMU=",
"fetchSubmodules": false
},
"picodrive": {
"owner": "libretro",
"repo": "picodrive",
"rev": "9cb99ce36f93871b05c5adc2790b2e33e63b50b6",
"sha256": "hhdEuri1hSNLAkno8Rwd0Yls11Yh6Q7/+t4T2LH+BaE=",
"fetchSubmodules": true
},
"play": {
"owner": "jpd002",
"repo": "Play-",
"rev": "b8e16159734c2068db0f2f12b11bc16ef55058ce",
"sha256": "qjp1rEjmDAAB2wXITA3lAS+ERJuZinoneJToYiYRi/w=",
"fetchSubmodules": true
},
"ppsspp": {
"owner": "hrydgard",
"repo": "ppsspp",
"rev": "b6e7fe1aaf2bbb8f4faa1378bf14f434aea33cc1",
"sha256": "Kif6oF8Bjhgc02xKDivCG9RBxj5wxNFEwxl9nX3AZug=",
"fetchSubmodules": true
},
"prboom": {
"owner": "libretro",
"repo": "libretro-prboom",
"rev": "0f5927db4fb7e61f32bc9eccc5f809e54f71a371",
"sha256": "DFpDxEUHjuCcHQGxT+impj98vYITeok1SHrRN5Hba4M=",
"fetchSubmodules": false
},
"prosystem": {
"owner": "libretro",
"repo": "prosystem-libretro",
"rev": "f8652c7f2b0edc81685d03204d4963fc4ea9eccd",
"sha256": "Ki4Dyb//X8isP0tScqunA/qt2vkX6d2HH7rHhqk3D5k=",
"fetchSubmodules": false
},
"quicknes": {
"owner": "libretro",
"repo": "QuickNES_Core",
"rev": "71b8000b33daab8ed488f8707ccd8d5b623443f8",
"sha256": "Wx8nFWy0DQaZlhEMiI2KRwBK0earSVSke7/qXbs0bQ0=",
"fetchSubmodules": false
},
"sameboy": {
"owner": "libretro",
"repo": "sameboy",
"rev": "68f67b3db7747ba7aac84c5c253bc71d5a906525",
"sha256": "/4JQ1Tem3UgOUIcsLV0aLU+1R55hMTaT+wWElwj00Q4=",
"fetchSubmodules": false
},
"scummvm": {
"owner": "libretro",
"repo": "scummvm",
"rev": "63e57573a9ffe71a1083ff46d9cd210203b87afb",
"sha256": "LTFe8HIX9OSJuJj5YfPigrPAE8nrbSpDckh0hj3w52s=",
"fetchSubmodules": false
},
"smsplus-gx": {
"owner": "libretro",
"repo": "smsplus-gx",
"rev": "3f1ffede55bcfe0168caa484a00bf041ab591abf",
"sha256": "fD+grzMPk4uXvmzGf+f9Mor0eefBLHIumCydsSHUsck=",
"fetchSubmodules": false
},
"snes9x": {
"owner": "snes9xgit",
"repo": "snes9x",
"rev": "edc32fc0bd6aea6d5645a03f0f94b72f3cbfa43e",
"sha256": "Zeojdoykmk+lpG1z5EdZToGWYDQvSSQqaEr7F68iyk0=",
"fetchSubmodules": false
},
"snes9x2002": {
"owner": "libretro",
"repo": "snes9x2002",
"rev": "e16cb16efa00765b1bc3b8fee195680efb1542c7",
"sha256": "0dhLpNy+NUE3mE/ejEwbq3G28/a2HONS5NPslI5LOEc=",
"fetchSubmodules": false
},
"snes9x2005": {
"owner": "libretro",
"repo": "snes9x2005",
"rev": "88a46f7c085f6e2accc4c777e264b9b5cd41cf0e",
"sha256": "5wVKK3xhCXkvonwQRyVtd8Afggb0gv8Sv7PEYkDfKRE=",
"fetchSubmodules": false
},
"snes9x2010": {
"owner": "libretro",
"repo": "snes9x2010",
"rev": "714b1c8e08c7580430190119b07e793405773ac2",
"sha256": "yKSQEE+lT4V2V1XqemfziHuIt79TcvC0ranU9ounTXo=",
"fetchSubmodules": false
},
"stella": {
"owner": "stella-emu",
"repo": "stella",
"rev": "e1035b74fce26932078d00e8625688927efce34c",
"sha256": "+ZvSCnnoKGyToSFqUQOArolFdgUcBBFNjFw8aoVDkYI=",
"fetchSubmodules": false
},
"stella2014": {
"owner": "libretro",
"repo": "stella2014-libretro",
"rev": "934c7a2a44ef038af529b68950ddba4f7ea3478e",
"sha256": "s7LQ47sAPTyk4COONk4qnebxCq78zGLIjh3Y2+1fIak=",
"fetchSubmodules": false
},
"tgbdual": {
"owner": "libretro",
"repo": "tgbdual-libretro",
"rev": "1e0c4f931d8c5e859e6d3255d67247d7a2987434",
"sha256": "0wHv9DpKuzJ/q5vERqCo4GBLre2ggClBIWSjGnMLQq8=",
"fetchSubmodules": false
},
"thepowdertoy": {
"owner": "libretro",
"repo": "ThePowderToy",
"rev": "ac620c0a89a18774c3ad176a8a1bc596df23ff57",
"sha256": "C/X1DbmnucRddemEYml2zN3qr5yoXY3b+nvqfpboS0M=",
"fetchSubmodules": false
},
"tic80": {
"owner": "libretro",
"repo": "tic-80",
"rev": "bd03e6a548676745e81fa95e60b233b5a56420c2",
"sha256": "SXJvWX6Q3BrdajNnT4HIf6H2z7dXXvnXTJXf/TYRw4I=",
"fetchSubmodules": true
},
"vba-next": {
"owner": "libretro",
"repo": "vba-next",
"rev": "b218f48bb27b5d3885fa4076ff325922b5acd817",
"sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo=",
"fetchSubmodules": false
},
"vba-m": {
"owner": "libretro",
"repo": "vbam-libretro",
"rev": "254f6effebe882b7d3d29d9e417c6aeeabc08026",
"sha256": "vJWjdqJ913NLGL4G15sRPqO/wp9xPsuhUMLUuAbDRKk=",
"fetchSubmodules": false
},
"vecx": {
"owner": "libretro",
"repo": "libretro-vecx",
"rev": "28d6efc8972313903d0802a736ff8c3bc115e78f",
"sha256": "VYa8s+HB8IYF+HS6SA+sO5DzpgCtnMGrh88KTVNGICY=",
"fetchSubmodules": false
},
"virtualjaguar": {
"owner": "libretro",
"repo": "virtualjaguar-libretro",
"rev": "d1b1b28a6ad2518b746e3f7537ec6d66db96ec57",
"sha256": "Io25dt80fqIqIxwzF2DK9J5UFz6YCUQoqThcIuxdEBo=",
"fetchSubmodules": false
},
"yabause": {
"owner": "libretro",
"repo": "yabause",
"rev": "811f9e81dbff4bed18644e19631fd4893e73e6ee",
"sha256": "VstPh0oMEZ7/ts58NjZxBYZZx/7dRTYePhDIQMu0WOo=",
"fetchSubmodules": false
}
}

135
pkgs/misc/emulators/retroarch/update.py Executable file
View file

@ -0,0 +1,135 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests nix-prefetch-github ])" -p "git"
import json
import sys
from pathlib import Path
from nix_prefetch_github import nix_prefetch_github
SCRIPT_PATH = Path(__file__).absolute().parent
HASHES_PATH = SCRIPT_PATH / "hashes.json"
CORES = {
"atari800": {"repo": "libretro-atari800"},
"beetle-snes": {"repo": "beetle-bsnes-libretro"},
"beetle-gba": {"repo": "beetle-gba-libretro"},
"beetle-lynx": {"repo": "beetle-lynx-libretro"},
"beetle-ngp": {"repo": "beetle-ngp-libretro"},
"beetle-pce-fast": {"repo": "beetle-pce-fast-libretro"},
"beetle-pcfx": {"repo": "beetle-pcfx-libretro"},
"beetle-psx": {"repo": "beetle-psx-libretro"},
"beetle-saturn": {"repo": "beetle-saturn-libretro"},
"beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"},
"beetle-wswan": {"repo": "beetle-wswan-libretro"},
"beetle-vb": {"repo": "beetle-vb-libretro"},
"bluemsx": {"repo": "bluemsx-libretro"},
"bsnes-mercury": {"repo": "bsnes-mercury"},
"citra": {"repo": "citra", "fetch_submodules": True},
"desmume": {"repo": "desmume"},
"desmume2015": {"repo": "desmume2015"},
"dolphin": {"repo": "dolphin"},
"dosbox": {"repo": "dosbox-libretro"},
"eightyone": {"repo": "81-libretro"},
"fbalpha2012": {"repo": "fbalpha2012"},
"fbneo": {"repo": "fbneo"},
"fceumm": {"repo": "libretro-fceumm"},
"flycast": {"repo": "flycast"},
"fmsx": {"repo": "fmsx-libretro"},
"freeintv": {"repo": "freeintv"},
"gambatte": {"repo": "gambatte-libretro"},
"genesis-plus-gx": {"repo": "Genesis-Plus-GX"},
"gpsp": {"repo": "gpsp"},
"gw": {"repo": "gw-libretro"},
"handy": {"repo": "libretro-handy"},
"hatari": {"repo": "hatari"},
"mame": {"repo": "mame"},
"mame2000": {"repo": "mame2000-libretro"},
"mame2003": {"repo": "mame2003-libretro"},
"mame2003-plus": {"repo": "mame2003-plus-libretro"},
"mame2010": {"repo": "mame2010-libretro"},
"mame2015": {"repo": "mame2015-libretro"},
"mame2016": {"repo": "mame2016-libretro"},
"mesen": {"repo": "mesen", "owner": "SourMesen"},
"meteor": {"repo": "meteor-libretro"},
"mgba": {"repo": "mgba"},
"mupen64plus": {"repo": "mupen64plus-libretro-nx"},
"neocd": {"repo": "neocd_libretro"},
"nestopia": {"repo": "nestopia"},
"np2kai": {"repo": "NP2kai", "owner": "AZO234", "fetch_submodules": True},
"o2em": {"repo": "libretro-o2em"},
"opera": {"repo": "opera-libretro"},
"parallel-n64": {"repo": "parallel-n64"},
"pcsx_rearmed": {"repo": "pcsx_rearmed"},
"picodrive": {"repo": "picodrive", "fetch_submodules": True},
"play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True},
"ppsspp": {"repo": "ppsspp", "owner": "hrydgard", "fetch_submodules": True},
"prboom": {"repo": "libretro-prboom"},
"prosystem": {"repo": "prosystem-libretro"},
"quicknes": {"repo": "QuickNES_Core"},
"sameboy": {"repo": "sameboy"},
"scummvm": {"repo": "scummvm"},
"smsplus-gx": {"repo": "smsplus-gx"},
"snes9x": {"repo": "snes9x", "owner": "snes9xgit"},
"snes9x2002": {"repo": "snes9x2002"},
"snes9x2005": {"repo": "snes9x2005"},
"snes9x2010": {"repo": "snes9x2010"},
"stella": {"repo": "stella", "owner": "stella-emu"},
"stella2014": {"repo": "stella2014-libretro"},
"tgbdual": {"repo": "tgbdual-libretro"},
"thepowdertoy": {"repo": "ThePowderToy"},
"tic80": {"repo": "tic-80", "fetch_submodules": True},
"vba-next": {"repo": "vba-next"},
"vba-m": {"repo": "vbam-libretro"},
"vecx": {"repo": "libretro-vecx"},
"virtualjaguar": {"repo": "virtualjaguar-libretro"},
"yabause": {"repo": "yabause"},
}
def info(*msg):
print(*msg, file=sys.stderr)
def get_repo_hash_fetchFromGitHub(repo, owner="libretro", fetch_submodules=False):
assert repo is not None, "Parameter 'repo' can't be None."
repo_hash = nix_prefetch_github(
owner=owner, repo=repo, fetch_submodules=fetch_submodules
)
return {
"owner": repo_hash.repository.owner,
"repo": repo_hash.repository.name,
"rev": repo_hash.rev,
"sha256": repo_hash.sha256,
"fetchSubmodules": repo_hash.fetch_submodules,
}
def get_repo_hash(fetcher="fetchFromGitHub", **kwargs):
if fetcher == "fetchFromGitHub":
return get_repo_hash_fetchFromGitHub(**kwargs)
else:
raise ValueError(f"Unsupported fetcher: {fetcher}")
def get_repo_hashes():
repo_hashes = {}
for core, repo in CORES.items():
info(f"Getting repo hash for '{core}'...")
repo_hashes[core] = get_repo_hash(**repo)
return repo_hashes
def main():
repo_hashes = get_repo_hashes()
info(f"Generating '{HASHES_PATH}'...")
with open(HASHES_PATH, "w") as f:
f.write(json.dumps(repo_hashes, indent=4))
f.write("\n")
info("Finished!")
if __name__ == "__main__":
main()

8
pkgs/misc/emulators/retroarch/wrapper.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, makeWrapper, retroarch, cores }:
{ stdenv, lib, makeWrapper, retroarch, cores ? [ ] }:
stdenv.mkDerivation {
pname = "retroarch";
@ -8,10 +8,10 @@ stdenv.mkDerivation {
buildCommand = ''
mkdir -p $out/lib
$(for coreDir in $cores
for coreDir in $cores
do
$(ln -s $coreDir/* $out/lib/.)
done)
ln -s $coreDir/* $out/lib/.
done
ln -s -t $out ${retroarch}/share

7
pkgs/servers/heisenbridge/default.nix
View file

@ -2,20 +2,17 @@
python3Packages.buildPythonApplication rec {
pname = "heisenbridge";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "hifi";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q7xqKjAUBHh87VAgsgDOCPDINDh0yUdr3UoUlLqJr5k=";
sha256 = "sha256-rN+qoBS9zIy5EHlFQxgAlcz9haoYJNMKJ2wlS46UOi0=";
};
postPatch = ''
echo "${version}" > heisenbridge/version.txt
substituteInPlace setup.cfg \
--replace "mautrix >=0.10.5, <0.11" "mautrix >=0.10.5, <0.12"
'';
propagatedBuildInputs = with python3Packages; [

4
pkgs/servers/mjolnir/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "mjolnir";
version = "1.1.20";
version = "1.2.1";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "mjolnir";
rev = "v${version}";
sha256 = "yfMBnNriSpwitR4u664iz+8uWp/3iSTymyFajMBP5xg=";
sha256 = "4c9LyQb5SZ1IoBayiP0C0ho4hwJDv49DhsuoQIv9bTs=";
};
nativeBuildInputs = [

1722
pkgs/servers/mjolnir/node-deps.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/servers/nextcloud/default.nix
View file

@ -51,8 +51,8 @@ in {
};
nextcloud22 = generic {
version = "22.2.2";
sha256 = "sha256-lDvn29N19Lhm3P2YIVM/85vr/U07qR+M8TkF/D/GTfA=";
version = "22.2.3";
sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo=";
};
# tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

31
pkgs/tools/filesystems/kio-fuse/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib
, mkDerivation
, fetchgit
, cmake
, extra-cmake-modules
, kio
, fuse3
}:
mkDerivation rec {
pname = "kio-fuse";
version = "5.0.1";
src = fetchgit {
url = "https://invent.kde.org/system/kio-fuse.git";
sha256 = "sha256-LSFbFCaEPkQTk1Rg9xpueBOQpkbr/tgYxLD31F6i/qE=";
rev = "v${version}";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ kio fuse3 ];
meta = with lib; {
description = "FUSE Interface for KIO";
homepage = "https://invent.kde.org/system/kio-fuse";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ _1000teslas ];
};
}

29
pkgs/tools/misc/ibus-theme-tools/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib, python3Packages, fetchFromGitHub, gettext }:
python3Packages.buildPythonApplication rec {
pname = "ibus-theme-tools";
version = "4.2.0";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "IBus-Theme-Tools";
rev = "v${version}";
sha256 = "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2";
};
buildInputs = [ gettext ];
propagatedBuildInputs = with python3Packages; [ tinycss2 pygobject3 ];
# No test.
doCheck = false;
pythonImportsCheck = [ "ibus_theme_tools" ];
meta = with lib; {
description = "Generate the IBus GTK or GNOME Shell theme from existing themes";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ hollowman6 ];
homepage = "https://github.com/openSUSE/IBus-Theme-Tools";
};
}

3
pkgs/tools/system/plan9port/default.nix
View file

@ -14,7 +14,7 @@
stdenv.mkDerivation {
pname = "plan9port";
version = "0.pre+date=2021-10-19";
version = "2021-10-19";
src = fetchFromGitHub {
owner = "9fans";
@ -101,6 +101,7 @@ stdenv.mkDerivation {
kovirobi
];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}
# TODO: investigate the mouse chording support patch

6
pkgs/tools/text/tidy-viewer/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tidy-viewer";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "alexhallam";
repo = "tv";
rev = version;
sha256 = "sha256-YXYz+SvL6YRwnZ7frmmx4NevNTh0rJcW7e4jSuX3TNs=";
sha256 = "sha256-onLu4XNe3sLfZ273Hq9IvgZEV9ir8oEXX7tQG75K2Hw=";
};
cargoSha256 = "sha256-KwnnoVacTMw7kHLQynv9557zUq8aFZfzBD+Zc9Q6XBs=";
cargoSha256 = "sha256-CYiRi6ny0wzTddpjdnnMHGqcWRM9wVjF34RmETgLH5A=";
# this test parses command line arguments
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context

26
pkgs/top-level/all-packages.nix
View file

@ -259,7 +259,9 @@ with pkgs;
clj-kondo = callPackage ../development/tools/clj-kondo { };
cloak = callPackage ../applications/misc/cloak { };
cloak = callPackage ../applications/misc/cloak {
inherit (darwin.apple_sdk.frameworks) Security;
};
cmark = callPackage ../development/libraries/cmark { };
@ -1044,6 +1046,8 @@ with pkgs;
hyper = callPackage ../applications/terminal-emulators/hyper { };
iqueue = callPackage ../development/libraries/iqueue {};
iterm2 = callPackage ../applications/terminal-emulators/iterm2 {};
kitty = callPackage ../applications/terminal-emulators/kitty {
@ -1735,6 +1739,8 @@ with pkgs;
gitless = callPackage ../applications/version-management/gitless { python = python3; };
gistyc = with python3Packages; toPythonApplication gistyc;
gitlint = python3Packages.callPackage ../tools/misc/gitlint { };
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
@ -3222,6 +3228,10 @@ with pkgs;
lite = callPackage ../applications/editors/lite { };
lite-xl = callPackage ../applications/editors/lite-xl {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
loadwatch = callPackage ../tools/system/loadwatch { };
loccount = callPackage ../development/tools/misc/loccount { };
@ -4159,6 +4169,8 @@ with pkgs;
ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
ibus-theme-tools = callPackage ../tools/misc/ibus-theme-tools { };
interception-tools = callPackage ../tools/inputmethods/interception-tools { };
interception-tools-plugins = {
caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
@ -6741,6 +6753,8 @@ with pkgs;
kibi = callPackage ../applications/editors/kibi { };
kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
kismet = callPackage ../applications/networking/sniffers/kismet { };
kiterunner = callPackage ../tools/security/kiterunner { };
@ -7664,7 +7678,9 @@ with pkgs;
metasploit = callPackage ../tools/security/metasploit { };
mhost = callPackage ../applications/networking/mhost { };
mhost = callPackage ../applications/networking/mhost {
inherit (darwin.apple_sdk.frameworks) Security;
};
ms-sys = callPackage ../tools/misc/ms-sys { };
@ -19665,7 +19681,7 @@ with pkgs;
StormLib = callPackage ../development/libraries/StormLib { };
stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
stxxl = callPackage ../development/libraries/stxxl { };
sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
@ -27116,6 +27132,8 @@ with pkgs;
mlt-qt5 = libsForQt514.mlt;
};
synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { };
taxi = callPackage ../applications/networking/ftp/taxi { };
librep = callPackage ../development/libraries/librep { };
@ -33035,6 +33053,8 @@ with pkgs;
tfswitch = callPackage ../applications/networking/cluster/tfswitch {};
tgswitch = callPackage ../applications/networking/cluster/tgswitch {};
tilt = callPackage ../applications/networking/cluster/tilt {};
timeular = callPackage ../applications/office/timeular {};

4
pkgs/top-level/python-packages.nix
View file

@ -3098,6 +3098,8 @@ in {
gipc = callPackage ../development/python-modules/gipc { };
gistyc = callPackage ../development/python-modules/gistyc { };
git-annex-adapter =
callPackage ../development/python-modules/git-annex-adapter { };
@ -6362,6 +6364,8 @@ in {
pydy = callPackage ../development/python-modules/pydy { };
pydyf = callPackage ../development/python-modules/pydyf { };
pyechonest = callPackage ../development/python-modules/pyechonest { };
pyeclib = callPackage ../development/python-modules/pyeclib { };