diff options
Diffstat (limited to 'pkgs/development')
13 files changed, 94 insertions, 54 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch index 34d4726150c..2996342dead 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch @@ -17,7 +17,7 @@ index f2db3e9..4ff2602 100644 if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned) - && len && len < (1 << 12)) { + && len) { -+ if (len >= (1 << 14)) { ++ if (len >= (1 << 20)) { + fprintf(stderr, "%s: exceeded environment length limit", argv[0]); + return 1; + } diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index fb998169595..54fea18fd17 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -1,27 +1,35 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen -, graphviz, lcov }: +{ stdenv +, fetchurl +, cmake +, pkg-config +, gtest +, doxygen +, graphviz +, lcov +}: stdenv.mkDerivation rec { pname = "properties-cpp"; version = "0.0.1"; - src = let srcver = version+"+14.10.20140730"; in - fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz"; - sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; - }; - - buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ]; + src = let srcver = "${version}+14.10.20140730"; in + fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz"; + sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; + }; - patchPhase = '' + postPatch = '' sed -i "/add_subdirectory(tests)/d" CMakeLists.txt ''; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ gtest doxygen graphviz lcov ]; + meta = with stdenv.lib; { homepage = "https://launchpad.net/properties-cpp"; description = "A very simple convenience library for handling properties and signals in C++11"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ edwtjo ]; }; - } diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch index 26d189d8601..4871032f6f2 100644 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch @@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h #define HAVE_SYS_TIMEB_H 1 #if !PLATFORM(GTK) && !PLATFORM(QT) -diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake ---- a/Source/WTF/wtf/PlatformMac.cmake -+++ b/Source/WTF/wtf/PlatformMac.cmake -@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) - - find_library(COCOA_LIBRARY Cocoa) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) --find_library(READLINE_LIBRARY Readline) - list(APPEND WTF_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} -- ${READLINE_LIBRARY} - libicucore.dylib - ) - diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index b1a892d5b80..927acc1819e 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -14,28 +14,33 @@ then throw "sedlex is not available for OCaml ${ocaml.version}" else let + unicodeVersion = "12.1.0"; + baseUrl = "https://www.unicode.org/Public/${unicodeVersion}"; + DerivedCoreProperties = fetchurl { - url = "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt"; + url = "${baseUrl}/ucd/DerivedCoreProperties.txt"; sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6"; }; DerivedGeneralCategory = fetchurl { - url = "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt"; + url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt"; sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q"; }; PropList = fetchurl { - url = "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt"; + url = "${baseUrl}/ucd/PropList.txt"; sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"; }; in buildDunePackage rec { pname = "sedlex"; - version = "2.1"; + version = "2.2"; + + useDune2 = true; src = fetchFromGitHub { owner = "ocaml-community"; repo = "sedlex"; rev = "v${version}"; - sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"; + sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3"; }; propagatedBuildInputs = [ @@ -43,6 +48,7 @@ buildDunePackage rec { ]; preBuild = '' + rm src/generator/data/dune ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt ln -s ${PropList} src/generator/data/PropList.txt diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index f9996eb6af6..175004c71bb 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.10"; - url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz"; - sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb"; + version = "1.11"; + url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz"; + sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr"; } else { version = "1.3"; url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 3537736f77f..dc7b160b943 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,25 +1,31 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: +{ stdenv +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + buildPythonPackage rec { - version = "3.2.10"; + version = "3.3.1"; pname = "asgiref"; disabled = pythonOlder "3.5"; - # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "django"; repo = pname; rev = version; - sha256 = "1sj4yy2injaskwfi5pkb542jl8s6ljijnyra81gpw0pgd3d0bgxv"; + sha256 = "00r4l9x425wkbac6b6c2ksm2yjinrvvdf0ajizrzq32h0jg82016"; }; propagatedBuildInputs = [ async-timeout ]; - checkInputs = [ pytest pytest-asyncio ]; - - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; meta = with stdenv.lib; { description = "Reference ASGI adapters and channel layers"; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 7884ff65f28..4251c88058c 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "branca"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1f7drarwiw8fh17hpq8b3p4mfqgjbh3k045dvpx5z12d3a0zg7ca"; + sha256 = "c111453617b17ab2bda60a4cd71787d6f2b59c85cdf71ab160a737606ac66c31"; }; checkInputs = [ pytest selenium ]; diff --git a/pkgs/development/python-modules/hole/default.nix b/pkgs/development/python-modules/hole/default.nix new file mode 100644 index 00000000000..87c63be32e8 --- /dev/null +++ b/pkgs/development/python-modules/hole/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +}: + +buildPythonPackage rec { + pname = "hole"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "065fxc0l16j8xkjd0y0qar9cmqmjyp8jcshakbakldkfscpx3s5m"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # no tests are present + doCheck = false; + + pythonImportsCheck = [ "hole" ]; + + meta = with lib; { + description = "Python API for interacting with a Pihole instance."; + homepage = "https://github.com/home-assistant-ecosystem/python-hole"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index bc924000ed1..b844d9e2c02 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.0.2"; + version = "2.0.3"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8df057b08fc27d8f7106bfa997d0a21e2acef017f905f06d6fb0aa6a20d4d2b2"; + sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 79c5cf25e30..727a840476a 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.1"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "53950eb89f77066d6caf553c52ec01701a8bebbaffa9e0a627df3f229ca8720f"; + sha256 = "54df73364662ff3c763da3b42b9d27b1771ebfb3361caa255e44e1bf1544015b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 781604fb9b0..7db53969402 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,12 +25,12 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.8.1"; + version = "5.8.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9c1afca73b13ede07680015d69f611c7dec33b8c22565de70f0cbbf0464b8db7"; + sha256 = "dea7d11ec0b4584a438fab7a1acb56864b32cc9e7d6ffa166572f75a2b033dc0"; }; # Tells the tests which database to use diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 07953ea439f..29d00a159ab 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -13,6 +13,7 @@ , libdrm , mesa , libxkbcommon +, libappindicator-gtk3 }@args: let diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index ee3609783c2..6d0dbc8cace 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -13,6 +13,7 @@ , libdrm , mesa , libxkbcommon +, libappindicator-gtk3 }: version: hashes: @@ -56,7 +57,7 @@ let }; electronLibPath = with stdenv.lib; makeLibraryPath ( - [ libuuid at-spi2-atk at-spi2-core ] + [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] ); |