diff options
Diffstat (limited to 'pkgs/development')
14 files changed, 83 insertions, 41 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 223a1921ef9d8..e751e9fc27325 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -108,6 +108,9 @@ in makePackage { passthru.deps = deps; + # Uses a lot of RAM, OOMs otherwise + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/development/libraries/libfprint-tod/default.nix index 8d7df57896d4c..a7705792cd8c9 100644 --- a/pkgs/development/libraries/libfprint-tod/default.nix +++ b/pkgs/development/libraries/libfprint-tod/default.nix @@ -6,7 +6,7 @@ # for the curious, "tod" means "Touch OEM Drivers" meaning it can load # external .so's. libfprint.overrideAttrs ({ postPatch ? "", mesonFlags ? [], ... }: let - version = "1.90.7+git20210222+tod1"; + version = "1.94.1+tod1"; in { pname = "libfprint-tod"; inherit version; @@ -16,7 +16,7 @@ in { owner = "3v1n0"; repo = "libfprint"; rev = "v${version}"; - sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; + sha256 = "sha256-IVeTQlZjea4xgbG/N7OTHAj6RT4WutfvQhV8qFEvkKo="; }; mesonFlags = mesonFlags ++ [ diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 67605dda51d99..b36e6f34c8262 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "luabind"; repo = "luabind"; - rev = version; + rev = "v${version}"; sha256 = "sha256-sK1ca2Oj9yXdmxyXeDO3k8YZ1g+HxIXLhvdTWdPDdag="; }; diff --git a/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/pkgs/development/libraries/mauikit-filebrowsing/default.nix index dd654deb88626..326f4b67ee29c 100644 --- a/pkgs/development/libraries/mauikit-filebrowsing/default.nix +++ b/pkgs/development/libraries/mauikit-filebrowsing/default.nix @@ -10,14 +10,14 @@ mkDerivation rec { pname = "mauikit-filebrowsing"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit-filebrowsing"; rev = "v${version}"; - sha256 = "sha256-mpO61VOYTBlAjtIa1gEYChREV2jjd/WG+rbZcJnbM+Q="; + sha256 = "sha256-j6VoNtMkDB5BSET/RUiQlWdL0D1dAHlW929WNCDC+PE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mauikit/default.nix b/pkgs/development/libraries/mauikit/default.nix index f730d848df86f..88436dd5e638e 100644 --- a/pkgs/development/libraries/mauikit/default.nix +++ b/pkgs/development/libraries/mauikit/default.nix @@ -14,14 +14,14 @@ mkDerivation rec { pname = "mauikit"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit"; rev = "v${version}"; - sha256 = "sha256-skukb9M6jhijCTb+tMIz/3vUCAvVJw+4zTFv9Z7HqWk="; + sha256 = "sha256-dpJQSCog/AZ4ip8NTQMt4g1ntAnL1cjjMzxJz/uCxZA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix new file mode 100644 index 0000000000000..fa702177781f0 --- /dev/null +++ b/pkgs/development/libraries/pangomm/2.42.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome +, ApplicationServices }: + +stdenv.mkDerivation rec { + pname = "pangomm"; + version= "2.42.2"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + ]; + propagatedBuildInputs = [ pango glibmm cairomm ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + + meta = with lib; { + description = "C++ interface to the Pango text rendering library"; + homepage = "https://www.pango.org/"; + license = with licenses; [ lgpl2 lgpl21 ]; + maintainers = with maintainers; [ lovek323 raskin ]; + platforms = platforms.unix; + + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. + ''; + }; +} diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 83afef9292449..74f1e7cddcee3 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.1.1"; + version = "1.3.2"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - sha256 = "sha256-o8wDZhNHGPV1BQ5Zi2kFNlWq5w0cqebaJUhUUwTK6So="; + sha256 = "sha256-auPpqoPeYxmkWTVbbKhEZI6gJGH9Pf1D9YLkuD3FaX0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index c07d31f77df3c..7e87fbab5d39d 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.8.2"; + version = "1.8.3"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lIpi7GGKJSNgmX64K3xXvrzcu469Kxe3rW71Lp3LKms="; + sha256 = "sha256-DjMUI5JBomv0f2AC1Nvb3DeqWn65AvZJWhWus4AZk7w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 47f69183d6850..1f7775c1d84f8 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -83,6 +83,8 @@ buildPythonPackage rec { "test_create_server_main_convenience" "test_debug" "test_auto_reload" + "test_no_exceptions_when_cancel_pending_request" + "test_ipv6_address_is_not_wrapped" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/sanic-org/sanic/issues/2298 "test_no_exceptions_when_cancel_pending_request" diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index ac4173c514abe..9d60879d88032 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j/JHHkS4mIuDv76HtIFbrf2VRqGINyB9OODaM+fJsJc="; + sha256 = "sha256-LBU2nXpmktjyy3x5cBGsrCM6k+6BEZaoDybHVrIrVBo="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 8d06ff94a032b..dc1eac59ceda8 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -14,14 +14,9 @@ let url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js"; sha256 = "1hm5kci2g6n5ikrvp1kpkkdzimjgylv1xicg2vnkbvd9rb56qa99"; }; - js.vue-router = fetchurl { - url = - "https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js"; - sha256 = "0418waib896ywwxkxliip75zp94k3s9wld51afrqrcq70axld0c9"; - }; js.ansi_up = fetchurl { - url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; - sha256 = "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"; + url = "https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js"; + sha256 = "1dx8wn38ds8d01kkih26fx1yrisg3kpz61qynjr4zil03ap0hrlr"; }; js.Chart = fetchurl { url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; @@ -29,10 +24,10 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; - sha256 = "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g"; + sha256 = "1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf"; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; @@ -40,7 +35,6 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p js css cp ${js.vue} js/vue.min.js - cp ${js.vue-router} js/vue-router.min.js cp ${js.ansi_up} js/ansi_up.js cp ${js.Chart} js/Chart.min.js ''; diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch index 355baeb837a56..33683fdb15194 100644 --- a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch +++ b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -4,25 +4,23 @@ does so unconditionally is twice as bad. Required files are downloaded as separate fixed-output derivations and put into correct location before build phase starts. ---- laminar-0.8/CMakeLists.txt -+++ laminar-0.8-new/CMakeLists.txt -@@ -82,15 +82,6 @@ +--- laminar-1.1/CMakeLists.txt ++++ laminar-1.1-new/CMakeLists.txt +@@ -82,13 +82,6 @@ COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' DEPENDS src/resources/index.html) -# Download 3rd-party frontend JS libs... -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js - js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e) --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js -- js/vue-router.min.js EXPECTED_MD5 5f51d4dbbf68fd6725956a5a2b865f3b) --file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) +-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js +- js/ansi_up.js EXPECTED_MD5 b31968e1a8fed0fa82305e978161f7f5) -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js - js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) # ...and compile them - generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js + generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue.min.js js/ansi_up.js js/Chart.min.js) -@@ -141,12 +132,12 @@ +@@ -139,12 +132,12 @@ target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z) endif() diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d3a62bf331bc0..96c45104bd200 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -145,13 +145,13 @@ rec { headers = "0r1qxgkpcn03fd28zbz86ilhsqg0gzp9clbghr5w6gy5ak8y68hz"; }; - electron_16 = mkElectron "16.0.0" { - armv7l-linux = "a3bec9664a17d3f8adc072f88d105601b5d25a42e339c73c26c3b59a0ab0f44a"; - aarch64-linux = "f4dc4ba8ce14f2e64943838c85654766522c46bb8e02914d3fdf1894b6e5b2fa"; - x86_64-linux = "a5c5c0547c989207ab63e0b06b46a04b545e4cc74e6fc8f94d7beda0c0bcb0b2"; - i686-linux = "e93e5eaaf33e4c30d2ba613b67858ada311a6e28b5fd42893499b50ef97b3695"; - x86_64-darwin = "f95847ea721cbf8632a72bec504137554aa262d111aaa5e2e30a74df66ff6c97"; - aarch64-darwin = "0c71b070cf6bcfa7dc4dad65ee14af926d5dda73e4a2f96e68cff844df8aba1d"; - headers = "1gr43w8pw9b7xl1bmpap8v1wp4ixmc2qkww02kbzfw53h6m4ccn3"; + electron_16 = mkElectron "16.0.1" { + armv7l-linux = "9fe58dcc8838fc641e9fc6f2723ece6f12c29169340da3ab754e1afc57634314"; + aarch64-linux = "991369b7dee6cf9c146c48566153baf898b5ed73efaada2688d1699d69ba366c"; + x86_64-linux = "4063b6d05c9320fc53535a7d932e03f94ad0aae95432437bbf2f2f222b67c5a5"; + i686-linux = "68a817a999dcc996497c53e54f06199af0c2de278ff910c28845405d1b1828f0"; + x86_64-darwin = "7e28327d3efb013f19295e2491208491c66b117a167e9e56d141d0516d6d5587"; + aarch64-darwin = "f05684ca31d3d98746bca9ec05d425998d60af640958eeb55f464747ceb97bdf"; + headers = "0sk6h0jqfw2q9h05xdzivwfa6040r4racf82s8i5xkw5s13vsl6d"; }; } diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index 9a521bfd27434..e2be56b638e83 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "drush-ops"; repo = pname; rev = version; - sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp"; + sha256 = "sha256-0nf/m+xJmfHsFLuordiMp8UyrGGXuS70+zFHkIxLWhU="; }; consoleTable = fetchurl { |