Merge staging-next into staging
This commit is contained in:
commit
292a3ad6a3
@ -5461,4 +5461,9 @@
|
||||
github = "freezeboy";
|
||||
name = "freezeboy";
|
||||
};
|
||||
tesq0 = {
|
||||
email = "mikolaj.galkowski@gmail.com";
|
||||
github = "tesq0";
|
||||
name = "Mikolaj Galkowski";
|
||||
};
|
||||
}
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lollypop";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
|
||||
format = "other";
|
||||
doCheck = false;
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://gitlab.gnome.org/World/lollypop";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1gjxcwl467h7011j9v4zy1j0fjlz480ibvk4akr6xwjg894jykbx";
|
||||
sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -28,8 +28,8 @@ python2Packages.buildPythonApplication rec {
|
||||
dontStrip = true; # we are not generating any binaries
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://puddletag.net;
|
||||
description = "An audio tag editor similar to the Windows program, Mp3tag";
|
||||
homepage = https://docs.puddletag.net;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -15,6 +15,8 @@
|
||||
, libXi
|
||||
, qtx11extras
|
||||
, qtmacextras
|
||||
, qtsvg
|
||||
, qrencode
|
||||
|
||||
, withKeePassBrowser ? true
|
||||
, withKeePassSSHAgent ? true
|
||||
@ -26,13 +28,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keepassxc-${version}";
|
||||
version = "2.3.4";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keepassxreboot";
|
||||
repo = "keepassxc";
|
||||
rev = "${version}";
|
||||
sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3";
|
||||
sha256 = "1k8s56003gym2dv6c54gxwzs20i7lf6w5g5qnr449jfmf6wvbivr";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
|
||||
@ -50,7 +52,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./darwin.patch
|
||||
./qt511.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
|
||||
"-DWITH_GUI_TESTS=ON"
|
||||
"-DWITH_XC_AUTOTYPE=ON"
|
||||
"-DWITH_XC_YUBIKEY=ON"
|
||||
"-DWITH_XC_KEESHARE=ON"
|
||||
]
|
||||
++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON")
|
||||
++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON")
|
||||
@ -67,6 +69,8 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
make test ARGS+="-E testgui --output-on-failure"
|
||||
'';
|
||||
|
||||
@ -85,8 +89,10 @@ stdenv.mkDerivation rec {
|
||||
libyubikey
|
||||
qtbase
|
||||
qtx11extras
|
||||
qtsvg
|
||||
yubikey-personalization
|
||||
zlib
|
||||
qrencode
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
|
||||
|
||||
postInstall = optionalString stdenv.isDarwin ''
|
||||
|
@ -1,32 +1,33 @@
|
||||
Remove the use of macdeployqt to avoid copying dependencies and
|
||||
reduce installation size from 90 MB to 9 MB.
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 658548f7..f8f10bdb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -250,8 +250,8 @@ else()
|
||||
set(PROGNAME keepassxc)
|
||||
endif()
|
||||
|
||||
-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
|
||||
- set(CMAKE_INSTALL_PREFIX "/Applications")
|
||||
+if(APPLE AND WITH_APP_BUNDLE)
|
||||
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
|
||||
set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
|
||||
endif()
|
||||
|
||||
@@ -262,7 +262,7 @@ if(MINGW)
|
||||
@@ -288,6 +288,7 @@ if(MINGW)
|
||||
set(PLUGIN_INSTALL_DIR ".")
|
||||
set(DATA_INSTALL_DIR "share")
|
||||
elseif(APPLE AND WITH_APP_BUNDLE)
|
||||
- set(CLI_INSTALL_DIR "/usr/local/bin")
|
||||
+ set(CLI_INSTALL_DIR "../bin")
|
||||
set(PROXY_INSTALL_DIR "/usr/local/bin")
|
||||
set(BIN_INSTALL_DIR ".")
|
||||
set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
|
||||
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
|
||||
set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
|
||||
set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
|
||||
set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
|
||||
@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON)
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_MACOSX_RPATH TRUE)
|
||||
- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
|
||||
- if(NOT MACDEPLOYQT_EXE)
|
||||
- message(FATAL_ERROR "macdeployqt is required to build in macOS")
|
||||
- else()
|
||||
- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
|
||||
- endif()
|
||||
endif()
|
||||
|
||||
# Debian sets the the build type to None for package builds.
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 69526967..38f7c5d4 100644
|
||||
index 110dc606..f9b58818 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
|
||||
@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
|
||||
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
|
||||
include(CPack)
|
||||
|
||||
@ -39,10 +40,10 @@ index 69526967..38f7c5d4 100644
|
||||
|
||||
install(TARGETS ${PROGNAME}
|
||||
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
|
||||
index 08c53278..b833b692 100644
|
||||
index f1c5387f..abf70b48 100644
|
||||
--- a/src/autotype/mac/CMakeLists.txt
|
||||
+++ b/src/autotype/mac/CMakeLists.txt
|
||||
@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
|
||||
@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE)
|
||||
add_custom_command(TARGET keepassx-autotype-cocoa
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
|
||||
|
@ -17,15 +17,17 @@ in mkDerivation rec {
|
||||
sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://www.krename.net;
|
||||
description = "A powerful batch renamer for KDE";
|
||||
license = licenses.gpl2;
|
||||
inherit (kconfig.meta) platforms;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
||||
buildInputs = [ taglib exiv2 podofo ];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
||||
propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A powerful batch renamer for KDE";
|
||||
homepage = https://kde.org/applications/utilities/krename/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
inherit (kconfig.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit description;
|
||||
homepage = http://www.anydesk.com;
|
||||
homepage = https://www.anydesk.com;
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "wordgrinder";
|
||||
owner = "davidgiven";
|
||||
rev = "${version}";
|
||||
sha256 = "1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf";
|
||||
sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
@ -5,13 +5,14 @@
|
||||
|
||||
python.buildPythonPackage rec {
|
||||
pname = "snakemake";
|
||||
version = "5.2.2";
|
||||
version = "5.4.4";
|
||||
|
||||
propagatedBuildInputs = with python; [
|
||||
appdirs
|
||||
ConfigArgParse
|
||||
datrie
|
||||
docutils
|
||||
GitPython
|
||||
jsonschema
|
||||
pyyaml
|
||||
ratelimiter
|
||||
@ -21,7 +22,7 @@ python.buildPythonPackage rec {
|
||||
|
||||
src = python.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "adffe7e24b4a613a9e8bf0a2a320b3cea236d86afb9132bb0bbbc08b8e35a3a3";
|
||||
sha256 = "157323e0e1be34302edbbf399b2acbe25a4291bceffd47a0469963a970c9375f";
|
||||
};
|
||||
|
||||
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
|
||||
|
@ -2,14 +2,14 @@
|
||||
mkDerivation,
|
||||
extra-cmake-modules, gettext, kdoctools, python,
|
||||
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
|
||||
cups, pcre, pipewire
|
||||
cups, pcre, pipewire, kio
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "xdg-desktop-portal-kde";
|
||||
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
|
||||
buildInputs = [
|
||||
cups pcre pipewire
|
||||
cups pcre pipewire kio
|
||||
kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
|
||||
];
|
||||
}
|
||||
|
25
pkgs/development/libraries/hiredis-vip/default.nix
Normal file
25
pkgs/development/libraries/hiredis-vip/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hiredis-vip";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vipshop";
|
||||
repo = "hiredis-vip";
|
||||
rev = version;
|
||||
sha256 = "1z9zry635pxqv6d2cgk3dghb5qfpg9m7dz34ld4djw9b53hjr2z2";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "A C client library for the Redis database";
|
||||
homepage = https://github.com/vipshop/hiredis-vip;
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
|
||||
}
|
@ -2,6 +2,8 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, pandas
|
||||
, pyarrow
|
||||
, pytestrunner
|
||||
, pytest
|
||||
, h5py
|
||||
@ -9,15 +11,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "0.8.7";
|
||||
version = "0.8.14";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp";
|
||||
sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
checkInputs = [ pytest h5py ];
|
||||
checkInputs = [ pandas pyarrow pytest h5py ];
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
checkPhase = ''
|
||||
|
@ -15,12 +15,6 @@ buildPythonPackage rec {
|
||||
sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
# Patch to make this package work on requests >= 2.11.x
|
||||
# CAN BE REMOVED ON NEXT PACKAGE UPDATE
|
||||
sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
|
||||
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for controlling Broadlink IR controllers";
|
||||
homepage = http://github.com/mjg59/python-broadlink;
|
||||
homepage = https://github.com/mjg59/python-broadlink;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
|
||||
, cython, pytest, pytestrunner, hypothesis }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -10,6 +10,14 @@ buildPythonPackage rec {
|
||||
sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix tests against recent hypothesis
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff";
|
||||
sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
buildInputs = [ pytest pytestrunner hypothesis ];
|
||||
|
||||
|
@ -1,20 +1,12 @@
|
||||
{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.5.2";
|
||||
pname = "ldap3";
|
||||
version = "2.6";
|
||||
|
||||
## This should work, but 2.5.2 has a weird tarball with empty source files
|
||||
## where upstream repository has non-empty ones
|
||||
# src = fetchPypi {
|
||||
# inherit pname version;
|
||||
# sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz";
|
||||
# };
|
||||
src = fetchFromGitHub {
|
||||
owner = "cannatag";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0p5l4bhy6j2nvvlxz5zvznbaqb72x791v9la2jr2wpwr60mzz9hw";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f0v82584b7gkzrnnnl4fc88w4i73x7cxqbzy0r0bknm33yfwcq5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyasn1 ];
|
||||
|
@ -9,23 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nixpkgs";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
disabled = ! pythonAtLeast "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
|
||||
sha256 = "12ycbv31g4qv14aq6hfb85hhx026lgvzqfsrkpzb64na0c1yjcvn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patch should be dropped once https://github.com/t184256/nixpkgs-python-importer/pull/7
|
||||
# is merged and in a release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/adisbladis/nixpkgs-python-importer/commit/749e05f1.patch";
|
||||
sha256 = "1a72phazpqf6vf3hl3m84z9i5n6h1xpa53bqxnpsff6agxxhd21b";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ pbr ];
|
||||
propagatedBuildInputs = [ pythonix ];
|
||||
|
||||
|
@ -1,8 +1,13 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch
|
||||
, python3, xdg_utils
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, xdg_utils
|
||||
, requests, filetype, pyparsing, configparser, arxiv2bib
|
||||
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
|
||||
, pylibgen, click, python-slugify, habanero, isbnlib
|
||||
, prompt_toolkit, pygments
|
||||
#, optional, dependencies
|
||||
, jinja2, whoosh, pytest
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "papis";
|
||||
version = "0.8.2";
|
||||
|
||||
@ -14,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
requests filetype pyparsing configparser arxiv2bib
|
||||
pyyaml chardet beautifulsoup4 colorama bibtexparser
|
||||
pylibgen click python-slugify habanero isbnlib
|
||||
@ -23,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
jinja2 whoosh
|
||||
];
|
||||
|
||||
checkInputs = (with python3.pkgs; [
|
||||
checkInputs = ([
|
||||
pytest
|
||||
]) ++ [
|
||||
xdg_utils
|
||||
@ -39,6 +44,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "Powerful command-line document and bibliography manager";
|
||||
homepage = http://papis.readthedocs.io/en/latest/;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.nico202 ];
|
||||
maintainers = with lib.maintainers; [ nico202 teto ];
|
||||
};
|
||||
}
|
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dune-${version}";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a";
|
||||
sha256 = "18j5afg54bww9az05wc7m5ixzvvq38wfnwq6ni09pi2n848m21ca";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
|
@ -24,6 +24,7 @@ buildPythonApplication rec {
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set PYTHONPATH \"$PYTHONPATH\""
|
||||
"--set PIP_IGNORE_INSTALLED 1"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -1,9 +1,10 @@
|
||||
{ stdenv, lib, fetchurl, makeWrapper, file, getopt
|
||||
, gtk2, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
|
||||
, gtk2, gtk3, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
|
||||
, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
|
||||
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
|
||||
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
|
||||
, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium
|
||||
, libpqxx
|
||||
}:
|
||||
|
||||
let
|
||||
@ -13,20 +14,21 @@ let
|
||||
cairo dbus expat zlib libpng12 udev tbb
|
||||
libX11 libXcursor libXdamage libXfixes libXrender libXi
|
||||
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
|
||||
libpqxx gtk3
|
||||
];
|
||||
libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ];
|
||||
binPath = lib.makeBinPath [ nodejs gnutar ];
|
||||
|
||||
ver = "2017.4.10";
|
||||
build = "f1";
|
||||
ver = "2018.3.0";
|
||||
build = "f2";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "unity-editor-${version}";
|
||||
version = "${ver}x${build}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://beta.unity3d.com/download/14396d76537e/LinuxEditorInstaller/Unity.tar.xz";
|
||||
sha256 = "e1b4fe41c0ff793f7a9146c49a8eca8c71d30abdfa3e81922bd69699810b3f67";
|
||||
url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
|
||||
sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv";
|
||||
};
|
||||
|
||||
nosuidLib = ./unity-nosuid.c;
|
||||
@ -79,7 +81,8 @@ in stdenv.mkDerivation rec {
|
||||
fi
|
||||
}
|
||||
|
||||
upm_linux=$unitydir/Data/Resources/Upm/upm-linux
|
||||
upm_linux=$unitydir/Data/Resources/PackageManager/Server/UnityPackageManager
|
||||
|
||||
|
||||
orig_size=$(stat --printf=%s $upm_linux)
|
||||
|
||||
@ -132,6 +135,6 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jb55 ];
|
||||
maintainers = with maintainers; [ jb55 tesq0 ];
|
||||
};
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "0.91.2";
|
||||
version = "0.91.3";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ ];
|
||||
"abode.alarm_control_panel" = ps: with ps; [ ];
|
||||
|
@ -111,7 +111,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "0.91.2";
|
||||
hassVersion = "0.91.3";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -126,7 +126,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "home-assistant";
|
||||
rev = version;
|
||||
sha256 = "193lim90dgidkis7cryp9hm8744bwhahj9fqicmnhhxlkg0s8zy5";
|
||||
sha256 = "00zzb466xbyz8sxjszkjsgks4smj94qw40agwyfn75ciiib2p8fw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, ppp, libevent, openssl }:
|
||||
{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sstp-client-${version}";
|
||||
version = "1.0.11";
|
||||
version = "1.0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz";
|
||||
sha256 = "087vp3n7nv001fsgbmkjpgl3a2vhbix22cflrqi5bv9h8181p18v";
|
||||
sha256 = "1zv7rx6wh9rhbyg9pg6759by8hc6n4162zrrw0y812cnaw3b8zj8";
|
||||
};
|
||||
|
||||
patchPhase =
|
||||
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-pppd-plugin-dir=$(out)/lib/pppd"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libevent openssl ppp ];
|
||||
|
||||
meta = {
|
||||
|
@ -10553,6 +10553,8 @@ in
|
||||
|
||||
hiredis = callPackage ../development/libraries/hiredis { };
|
||||
|
||||
hiredis-vip = callPackage ../development/libraries/hiredis-vip { };
|
||||
|
||||
hivex = callPackage ../development/libraries/hivex { };
|
||||
|
||||
hound = callPackage ../development/tools/misc/hound { };
|
||||
@ -16095,7 +16097,7 @@ in
|
||||
|
||||
papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { };
|
||||
|
||||
papis = callPackage ../tools/misc/papis { };
|
||||
papis = with python3Packages; toPythonApplication papis;
|
||||
|
||||
paps = callPackage ../tools/misc/paps { };
|
||||
|
||||
|
@ -2124,6 +2124,8 @@ in {
|
||||
|
||||
paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { };
|
||||
|
||||
papis = callPackage ../development/python-modules/papis { };
|
||||
|
||||
papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { };
|
||||
|
||||
pathspec = callPackage ../development/python-modules/pathspec { };
|
||||
|
Loading…
Reference in New Issue
Block a user