mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
eab8e6bda8
|
|
@ -7,7 +7,7 @@
|
|||
, alsa-lib
|
||||
, libsndfile
|
||||
, qt4
|
||||
, qscintilla
|
||||
, qscintilla-qt4
|
||||
, libpulseaudio
|
||||
, libjack2
|
||||
, audioBackend ? "pulse" # "pulse", "alsa", or "jack"
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
alsa-lib
|
||||
libsndfile
|
||||
qt4
|
||||
qscintilla
|
||||
qscintilla-qt4
|
||||
] ++ lib.optional (audioBackend == "pulse") libpulseaudio
|
||||
++ lib.optional (audioBackend == "jack") libjack2;
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ in mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||
"-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5"
|
||||
"-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
|
||||
++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
|
||||
|
||||
|
|
|
|||
76
pkgs/applications/misc/minigalaxy/default.nix
Normal file
76
pkgs/applications/misc/minigalaxy/default.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, docutils
|
||||
, gettext
|
||||
, glibcLocales
|
||||
, glib-networking
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, python3
|
||||
, python3Packages
|
||||
, steam-run-native
|
||||
, unzip
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "minigalaxy";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkwouter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BbtwLuG5TH/+06Ez8+mwSAjG1IWg9/3uxzjmgPHczAw=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
env HOME=$PWD LC_ALL=en_US.UTF-8 pytest
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib-networking
|
||||
gobject-introspection
|
||||
gtk3
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
glibcLocales
|
||||
pytest
|
||||
tox
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
docutils
|
||||
python3.pkgs.pygobject3
|
||||
python3.pkgs.requests
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.simplejson
|
||||
steam-run-native
|
||||
unzip
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
# Run Linux games using the Steam Runtime by using steam-run in the wrapper
|
||||
postFixup = ''
|
||||
sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run-native}/bin/steam-run#' -i $out/bin/minigalaxy
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sharkwouter.github.io/minigalaxy/";
|
||||
changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md";
|
||||
downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
|
||||
description = "A simple GOG client for Linux";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ srapenne ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla-qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqliteman";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qt4 qscintilla ];
|
||||
buildInputs = [ qt4 qscintilla-qt4 ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp
|
||||
|
|
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preConfigure = ''
|
||||
cd Sqliteman
|
||||
sed -i 's,/usr/include/Qsci,${qscintilla}/include/Qsci,' cmake/modules/FindQScintilla.cmake
|
||||
sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla}/libs,' cmake/modules/FindQScintilla.cmake
|
||||
sed -i 's,/usr/include/Qsci,${qscintilla-qt4}/include/Qsci,' cmake/modules/FindQScintilla.cmake
|
||||
sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla-qt4}/libs,' cmake/modules/FindQScintilla.cmake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.26.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.27.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-QIRt16AHILBNxKPxsOQ0n65W/bbalhXH1fM7KIaXP10=";
|
||||
sha256 = "1agxn4fcgln5lsccvw5b7g2psv6nv2y7qm5df201c9pbwjak74nm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.5.8";
|
||||
version = "1.5.9";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XIAByE2/eVG8DAZXstKs51LQYdVPcPQuIlST3xCclrU=";
|
||||
sha256 = "sha256-v5seKJMfZUVMbydxKiTSy0OSwen6I/3DrGJnL2DyqHg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -51,7 +51,7 @@ buildGoModule rec {
|
|||
homepage = "https://containerd.io/";
|
||||
description = "A daemon to control runC";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline vdemeester ];
|
||||
maintainers = with maintainers; [ offline vdemeester endocrimes ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -233,19 +233,19 @@ rec {
|
|||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.9";
|
||||
version = "20.10.12";
|
||||
rev = "v${version}";
|
||||
sha256 = "1msqvzfccah6cggvf1pm7n35zy09zr4qg2aalgwpqigv0jmrbyd4";
|
||||
sha256 = "sha256-nU6grb2lSW7BY7w9aAXwVbGp9TyO2ZxnJaxAi0wbk/c=";
|
||||
moby-src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "moby";
|
||||
rev = "v${version}";
|
||||
sha256 = "04xx7m8s9vrkm67ba2k5i90053h5qqkjcvw5rc8w7m5a309xcp4n";
|
||||
sha256 = "sha256-qizzK1qJNRGFisahE3iAzZTNW/HmledlMNxcJCMQSJ4=";
|
||||
};
|
||||
runcRev = "v1.0.2"; # v1.0.2
|
||||
runcRev = "v1.0.2";
|
||||
runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp";
|
||||
containerdRev = "v1.4.11"; # v1.4.11
|
||||
containerdSha256 = "02slv4gc2blxnmv0p8pkm139vjn6ihjblmn8ps2k1afbbyps0ilr";
|
||||
containerdRev = "v1.4.12";
|
||||
containerdSha256 = "sha256-g30kshXyGVew5tVaXFAOQUOYvvo0JBqIj1YaC5nTiS8=";
|
||||
tiniRev = "v0.19.0"; # v0.19.0
|
||||
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsonnet";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
outputs = ["out" "doc"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "google";
|
||||
repo = "jsonnet";
|
||||
sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim";
|
||||
sha256 = "sha256-RmuvpKv9Dg3JcxsdZDBMehJjG5SvrV0spHgxApFeuJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jekyll ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextpnr";
|
||||
version = "2021.15.21";
|
||||
version = "2022.01.03";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "d04cfd5f0f6da184f5b8a03f0ce18fbd1d98eca3";
|
||||
hash = "sha256-gm/+kwIZ/m10+KuCJoK45F56nKZD3tM0myHwbFKIKAs=";
|
||||
rev = "089ca8258e6f4dc93f8d39594c1109a8578cdc98";
|
||||
hash = "sha256-N8kX/+fN8Qe+qme8RFlZyYQ/3p1WBkt0ztUwjJIQCIw=";
|
||||
name = "nextpnr";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "0.12+36";
|
||||
version = "0.12+54";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "yosys";
|
||||
rev = "60c3ea367c942459a95e610ed98f277ce46c0142";
|
||||
hash = "sha256-NcfhNUmb3IDG08XgS+NGbRLI8sn4aQkOA7RF7wucDug=";
|
||||
rev = "59a71503448401d2476cf0872808e0a99c3a4d81";
|
||||
hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
fi
|
||||
|
||||
if ! grep -q "YOSYS_VER := $version" Makefile; then
|
||||
echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
|
||||
echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing."
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "yosys-bluespec";
|
||||
version = "2021.08.19";
|
||||
version = "2021.09.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thoughtpolice";
|
||||
repo = "yosys-bluespec";
|
||||
rev = "bcea1635c97747acd3bcb5b8f1968b3f57ae62bc";
|
||||
sha256 = "0ipx9yjngs3haksdb440wlydviszwqnxgzynpp7yic2x3ai7i8m1";
|
||||
rev = "f6f4127a4e96e18080fd5362b6769fa3e24c76b1";
|
||||
sha256 = "sha256-3cNFP/k4JsgLyUQHWU10Htl2Rh0staAcA3R4piD6hDE=";
|
||||
};
|
||||
|
||||
buildInputs = [ yosys readline zlib bluespec ];
|
||||
|
|
|
|||
60
pkgs/development/libraries/qscintilla-qt4/default.nix
Normal file
60
pkgs/development/libraries/qscintilla-qt4/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ stdenv, lib, fetchurl, unzip, qt4, qmake4Hook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla-qt4";
|
||||
version = "2.11.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
|
||||
sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
|
||||
};
|
||||
|
||||
sourceRoot = "QScintilla-${version}/Qt4Qt5";
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
|
||||
nativeBuildInputs = [ unzip qmake4Hook ];
|
||||
|
||||
patches = ./fix-qt4-build.patch;
|
||||
|
||||
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
||||
# by some packages such as sqlitebrowser
|
||||
postFixup = ''
|
||||
ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace qscintilla.pro \
|
||||
--replace '$$[QT_INSTALL_LIBS]' $out/lib \
|
||||
--replace '$$[QT_INSTALL_HEADERS]' $out/include \
|
||||
--replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
|
||||
--replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]' $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Qt port of the Scintilla text editing library";
|
||||
longDescription = ''
|
||||
QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
|
||||
control.
|
||||
|
||||
As well as features found in standard text editing components,
|
||||
QScintilla includes features especially useful when editing and
|
||||
debugging source code. These include support for syntax styling,
|
||||
error indicators, code completion and call tips. The selection
|
||||
margin can contain markers like those used in debuggers to
|
||||
indicate breakpoints and the current line. Styling choices are
|
||||
more open than with many editors, allowing the use of
|
||||
proportional fonts, bold and italics, multiple foreground and
|
||||
background colours and multiple fonts.
|
||||
'';
|
||||
homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";
|
||||
license = with licenses; [ gpl3 ]; # and commercial
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,33 +1,27 @@
|
|||
{ stdenv, lib, fetchurl, unzip
|
||||
, qt4 ? null, qmake4Hook ? null
|
||||
, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
|
||||
, qtbase, qtmacextras
|
||||
, qmake
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
|
||||
version = "2.11.6";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla-qt5";
|
||||
version = "2.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
|
||||
sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
|
||||
sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
|
||||
};
|
||||
|
||||
sourceRoot = "QScintilla-${version}/Qt4Qt5";
|
||||
sourceRoot = "QScintilla_src-${version}/src";
|
||||
|
||||
buildInputs = [ (if withQt5 then qtbase else qt4) ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ];
|
||||
|
||||
nativeBuildInputs = [ unzip ]
|
||||
++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
|
||||
nativeBuildInputs = [ unzip qmake ]
|
||||
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
patches = lib.optional (!withQt5) ./fix-qt4-build.patch;
|
||||
|
||||
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
|
||||
# by some packages such as sqlitebrowser
|
||||
postFixup = ''
|
||||
|
|
@ -36,14 +30,13 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
preConfigure = ''
|
||||
substituteInPlace qscintilla.pro \
|
||||
--replace '$$[QT_INSTALL_LIBS]' $out/lib \
|
||||
--replace '$$[QT_INSTALL_HEADERS]' $out/include \
|
||||
--replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
|
||||
--replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
|
||||
--replace '$$[QT_INSTALL_DATA]' $out/share${lib.optionalString (! withQt5) "/qt"}
|
||||
--replace '$$[QT_INSTALL_DATA]' $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apycula";
|
||||
version = "0.0.1a12";
|
||||
version = "0.2a2";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Apycula";
|
||||
hash = "sha256-TFb1C1GaMAK+ckEeXDxSyO2Cgx5dmq62daoSnAiAFmI=";
|
||||
hash = "sha256-pcVoYGBhp9jyuWBJ/Rpi8cjwDgPjhJ1PrPblj5DQTpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fontParts";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "794ada47e19ba41ef39b59719be312b127672bcb56bb7208dd3234d2bb3e8218";
|
||||
sha256 = "a3a3926e977f82ae19e6823760b59f2338085973da1eaad5badaf969f261a737";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "GeoAlchemy2";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d97f85a4ff84341c12b1d7a6fee5ab5e5e942271279684310bb2f507b6ee5c53";
|
||||
sha256 = "3b51f4d0558b7effb9add93aaa813c7a160ed293c346f5379a6fa1c8049af062";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.2.51";
|
||||
version = "1.2.52";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-CMoa7FQnGTWS14WmWvuryO2bKMWC05PBIDBlEWRjNRA=";
|
||||
sha256 = "sha256-PSacL0ze+TvNBHj+HIpaoy8GxnklFwFrNztEso6lwqU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
42
pkgs/development/python-modules/qscintilla-qt4/default.nix
Normal file
42
pkgs/development/python-modules/qscintilla-qt4/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, disabledIf
|
||||
, isPy3k
|
||||
, isPyPy
|
||||
, pkgs
|
||||
, python
|
||||
, pyqt4
|
||||
}:
|
||||
|
||||
disabledIf (isPy3k || isPyPy)
|
||||
(buildPythonPackage {
|
||||
pname = "qscintilla";
|
||||
version = pkgs.qscintilla.version;
|
||||
format = "other";
|
||||
|
||||
src = pkgs.qscintilla.src;
|
||||
|
||||
nativeBuildInputs = [ pkgs.xorg.lndir ];
|
||||
|
||||
buildInputs = [ pyqt4.qt pyqt4 ];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out
|
||||
lndir ${pyqt4} $out
|
||||
rm -rf "$out/nix-support"
|
||||
cd Python
|
||||
${python.executable} ./configure-old.py \
|
||||
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
|
||||
--apidir $out/api/${python.libPrefix} \
|
||||
-n ${pkgs.qscintilla}/include \
|
||||
-o ${pkgs.qscintilla}/lib \
|
||||
--sipdir $out/share/sip
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python binding to QScintilla, Qt based text editing control";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ danbst ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,51 +2,53 @@
|
|||
, pythonPackages
|
||||
, qscintilla
|
||||
, qtbase
|
||||
, qmake
|
||||
, qtmacextras
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) buildPythonPackage isPy3k python sip_4 pyqt5;
|
||||
inherit (pythonPackages) buildPythonPackage isPy3k python sip sipbuild pyqt5 pyqt-builder;
|
||||
in buildPythonPackage rec {
|
||||
pname = "qscintilla";
|
||||
version = qscintilla.version;
|
||||
src = qscintilla.src;
|
||||
format = "other";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
nativeBuildInputs = [ sip_4 qtbase ];
|
||||
buildInputs = [ qscintilla ];
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ];
|
||||
buildInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Python/configure.py \
|
||||
--replace \
|
||||
"target_config.py_module_dir" \
|
||||
"'$out/${python.sitePackages}'"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# configure.py will look for this folder
|
||||
mkdir -p $out/share/sip/PyQt5
|
||||
|
||||
cd Python
|
||||
substituteInPlace configure.py \
|
||||
--replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
|
||||
${python.executable} ./configure.py \
|
||||
--pyqt=PyQt5 \
|
||||
--destdir=$out/${python.sitePackages}/PyQt5 \
|
||||
--stubsdir=$out/${python.sitePackages}/PyQt5 \
|
||||
--apidir=$out/api/${python.libPrefix} \
|
||||
--qsci-incdir=${qscintilla}/include \
|
||||
--qsci-featuresdir=${qscintilla}/mkspecs/features \
|
||||
--qsci-libdir=${qscintilla}/lib \
|
||||
--pyqt-sipdir=${pyqt5}/${python.sitePackages}/PyQt5/bindings \
|
||||
--qsci-sipdir=$out/share/sip/PyQt5 \
|
||||
--sip-incdir=${sip_4}/include
|
||||
cp pyproject-qt5.toml pyproject.toml
|
||||
echo '[tool.sip.project]' >> pyproject.toml
|
||||
echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \
|
||||
>> pyproject.toml
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace project.py \
|
||||
--replace \
|
||||
"if self.project.qsci_external_lib:
|
||||
if self.qsci_features_dir is not None:" \
|
||||
"if self.project.qsci_external_lib:
|
||||
self.builder_settings.append('QT += widgets')
|
||||
|
||||
self.builder_settings.append('QT += printsupport')
|
||||
|
||||
if self.qsci_features_dir is not None:"
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
build = ''
|
||||
sip-install --qsci-features-dir ${qscintilla}/mkspecs/features \
|
||||
--qsci-include-dir ${qscintilla}/include \
|
||||
--qsci-library-dir ${qscintilla}/lib --api-dir ${qscintilla}/share";
|
||||
'';
|
||||
postInstall = ''
|
||||
# Needed by pythonImportsCheck to find the module
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-learn";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rCyp27dU1hz+HIO6hINJjvlR0puT7AnW8AKEfyEKmdo=";
|
||||
sha256 = "sha256-tYcJWaVIS2FPJtMcpMF1JLGwMXUiGZ3JhcO0JW4DB2c=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
|
||||
|
||||
let
|
||||
version = "3.17.0";
|
||||
version = "3.18.0";
|
||||
owner = "erlang";
|
||||
deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; };
|
||||
rebar3 = stdenv.mkDerivation rec {
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
inherit owner;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02sk3whrbprzlih4pgcsd6ngmassfjfmkz21gwvb7mq64pib40k6";
|
||||
sha256 = "09648hzc2mnjwf9klm20cg4hb5rn2xv2gmzcg98ffv37p5yfl327";
|
||||
};
|
||||
|
||||
buildInputs = [ erlang ];
|
||||
|
|
|
|||
|
|
@ -16,23 +16,23 @@ let
|
|||
};
|
||||
relx = builder {
|
||||
name = "relx";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
src = fetchHex {
|
||||
pkg = "relx";
|
||||
version = "4.5.0";
|
||||
sha256 = "sha256-3bWPIMzmymP1onJeklgW3XITR2aYo/PDy0+ownIgLFI=";
|
||||
version = "4.6.0";
|
||||
sha256 = "sha256-L/gTHGMJPGIcazfcUtGyhIqTiIZYS0twHTW9vkN39Qk=";
|
||||
};
|
||||
beamDeps = [ bbmustache ];
|
||||
};
|
||||
providers = builder {
|
||||
name = "providers";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
src = fetchHex {
|
||||
pkg = "providers";
|
||||
version = "1.8.1";
|
||||
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
|
||||
version = "1.9.0";
|
||||
sha256 = "sha256-0ofodEBqFQVghkKwo9tbaNato/KrABrsh+f018efwBc=";
|
||||
};
|
||||
beamDeps = [ getopt ];
|
||||
beamDeps = [ erlware_commons getopt ];
|
||||
};
|
||||
getopt = builder {
|
||||
name = "getopt";
|
||||
|
|
@ -86,21 +86,21 @@ let
|
|||
};
|
||||
certifi = builder {
|
||||
name = "certifi";
|
||||
version = "2.6.1";
|
||||
version = "2.8.0";
|
||||
src = fetchHex {
|
||||
pkg = "certifi";
|
||||
version = "2.6.1";
|
||||
sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
|
||||
version = "2.8.0";
|
||||
sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
bbmustache = builder {
|
||||
name = "bbmustache";
|
||||
version = "1.10.0";
|
||||
version = "1.12.2";
|
||||
src = fetchHex {
|
||||
pkg = "bbmustache";
|
||||
version = "1.10.0";
|
||||
sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4=";
|
||||
version = "1.12.2";
|
||||
sha256 = "sha256-aIszpNXMLVH1da3ws2g/xAo4MUovFQkG7c/Hf1tXezs=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
|
|
|||
51
pkgs/development/tools/database/indradb/default.nix
Normal file
51
pkgs/development/tools/database/indradb/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, rustPlatform
|
||||
, rustfmt
|
||||
}:
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
owner = "indradb";
|
||||
repo = "indradb";
|
||||
rev = "06134dde5bb53eb1d2aaa52afdaf9ff3bf1aa674";
|
||||
sha256 = "sha256-g4Jam7yxMc+piYQzgMvVsNTF+ce1U3thzYl/M9rKG4o=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graph database written in rust ";
|
||||
homepage = "https://github.com/indradb/indradb";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
in
|
||||
{
|
||||
indradb-server = rustPlatform.buildRustPackage {
|
||||
pname = "indradb-server";
|
||||
version = "unstable-2021-01-05";
|
||||
inherit src;
|
||||
|
||||
cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
|
||||
|
||||
buildAndTestSubdir = "server";
|
||||
|
||||
nativeBuildInputs = [ rustfmt ];
|
||||
|
||||
# test rely on libindradb and it can't be found
|
||||
# failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63
|
||||
# `let _server = Server::start(&format!("../target/debug/libindradb_plugin_*.{}", LIBRARY_EXTENSION)).unwrap();`
|
||||
doCheck = false;
|
||||
};
|
||||
indradb-client = rustPlatform.buildRustPackage {
|
||||
pname = "indradb-client";
|
||||
version = "unstable-2021-01-05";
|
||||
inherit src;
|
||||
|
||||
cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
|
||||
|
||||
nativeBuildInputs = [ rustfmt ];
|
||||
|
||||
buildAndTestSubdir = "client";
|
||||
};
|
||||
}
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.21.4";
|
||||
version = "0.21.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spikecodes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9Qr1afzp5BwcnJ4WjACJQk4NA81JTnNBmZZNFMZ6FvU=";
|
||||
sha256 = "sha256-pALPhSoamsU5xEbSoXFe+Cikl16gxTXccUATMkYB97M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-HD6asNFb0ZICeXnUwF4ZZ568GJRPeSy4XwflpIuWJw8=";
|
||||
cargoSha256 = "sha256-/P8wyFPCcCoGINtJ0qom3xLlkunH6xZPd7/7ynXmTy4=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "direnv";
|
||||
version = "2.30.2";
|
||||
version = "2.30.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "direnv";
|
||||
repo = "direnv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lQcy3EXl6KicAzRbypyX8sh39vNbZE2aUHBtwx07s9g=";
|
||||
sha256 = "sha256-cLDafCZH0WKexO6jCdzUhRWaxmQYb1ay9w9lje3cQ+U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k=";
|
||||
|
|
@ -29,6 +29,9 @@ buildGoModule rec {
|
|||
|
||||
checkInputs = [ fish zsh ];
|
||||
|
||||
# temporarily disable tests, check if they can be reenabled with the next release
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
make test-go test-bash test-fish test-zsh
|
||||
|
|
|
|||
|
|
@ -9095,7 +9095,9 @@ with pkgs;
|
|||
|
||||
qprint = callPackage ../tools/text/qprint { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla { };
|
||||
qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { };
|
||||
|
||||
qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
|
||||
|
||||
qshowdiff = callPackage ../tools/text/qshowdiff { };
|
||||
|
||||
|
|
@ -12409,6 +12411,10 @@ with pkgs;
|
|||
|
||||
idris2 = callPackage ../development/compilers/idris2 { };
|
||||
|
||||
inherit (callPackage ../development/tools/database/indradb { })
|
||||
indradb-server
|
||||
indradb-client;
|
||||
|
||||
intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { };
|
||||
|
||||
intercal = callPackage ../development/compilers/intercal { };
|
||||
|
|
@ -27105,6 +27111,8 @@ with pkgs;
|
|||
|
||||
minicom = callPackage ../tools/misc/minicom { };
|
||||
|
||||
minigalaxy = callPackage ../applications/misc/minigalaxy { };
|
||||
|
||||
minimodem = callPackage ../applications/radio/minimodem { };
|
||||
|
||||
minidjvu = callPackage ../applications/graphics/minidjvu { };
|
||||
|
|
|
|||
|
|
@ -8291,13 +8291,13 @@ in {
|
|||
|
||||
qreactor = callPackage ../development/python-modules/qreactor { };
|
||||
|
||||
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { };
|
||||
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { };
|
||||
|
||||
qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
|
||||
pythonPackages = self;
|
||||
};
|
||||
|
||||
qscintilla = self.qscintilla-qt4;
|
||||
qscintilla = self.qscintilla-qt5;
|
||||
|
||||
qtawesome = callPackage ../development/python-modules/qtawesome { };
|
||||
|
||||
|
|
|
|||
|
|
@ -190,9 +190,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
|
|||
|
||||
qoauth = callPackage ../development/libraries/qoauth { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla {
|
||||
withQt5 = true;
|
||||
};
|
||||
qscintilla = callPackage ../development/libraries/qscintilla { };
|
||||
|
||||
qt5ct = callPackage ../tools/misc/qt5ct { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue