diff options
Diffstat (limited to 'pkgs/development')
60 files changed, 429 insertions, 156 deletions
diff --git a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff new file mode 100644 index 00000000000..14e7ccd5624 --- /dev/null +++ b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff @@ -0,0 +1,27 @@ +diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotutils.c +--- algol68g-2.8.4-old/source/plotutils.c 2016-10-11 18:14:48.000000000 -0300 ++++ algol68g-2.8.4-new/source/plotutils.c 2021-07-30 02:42:29.762627511 -0300 +@@ -1026,10 +1026,10 @@ + X_COORD (&DEVICE (f)) = 0; + Y_COORD (&DEVICE (f)) = 0; + return (PLOTTER (&DEVICE (f))); +- } else if (!strcmp (device_type, "gif")) { +-/*------------------------------------+ +-| Supported plotter type - pseudo GIF | +-+------------------------------------*/ ++ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) { ++/*-------------------------------------------+ ++| Supported plotter type - pseudo GIF or PNG | +++-------------------------------------------*/ + char *z = DEREF (char, &A68_PAGE_SIZE (&DEVICE (f))), size[BUFFER_SIZE]; + /* Establish page size */ + if (!scan_int (&z, &(WINDOW_X_SIZE (&DEVICE (f))))) { +@@ -1067,7 +1067,7 @@ + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BITMAPSIZE", size); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BG_COLOR", (void *) "black"); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "GIF_ANIMATION", (void *) "no"); +- PLOTTER (&DEVICE (f)) = pl_newpl_r ("gif", NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); ++ PLOTTER (&DEVICE (f)) = pl_newpl_r (device_type, NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); + if (PLOTTER (&DEVICE (f)) == NULL) { + diagnostic_node (A68_RUNTIME_ERROR, p, ERROR_DEVICE_CANNOT_OPEN); + exit_genie (p, A68_RUNTIME_ERROR); diff --git a/pkgs/development/compilers/algol68g/default.nix b/pkgs/development/compilers/algol68g/default.nix new file mode 100644 index 00000000000..88210ca5b72 --- /dev/null +++ b/pkgs/development/compilers/algol68g/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchurl +, gsl +, plotutils +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "algol68g"; + version = "2.8.4"; + + src = fetchurl { + url = "https://jmvdveer.home.xs4all.nl/${pname}-${version}.tar.gz"; + hash = "sha256-WCPM0MGP4Qo2ihF8w5JHSMSl0P6N/w2dgY/3PDQlZfA="; + }; + + patches = [ + # add PNG support + ./0001-plotutils-png-support.diff + ]; + + buildInputs = [ + gsl + plotutils + postgresql + ]; + + postInstall = let + pdfdoc = fetchurl { + url = "https://jmvdveer.home.xs4all.nl/learning-algol-68-genie.pdf"; + hash = "sha256-QCwn1e/lVfTYTeolCFErvfMhvwCgsBnASqq2K+NYmlU="; + }; + in + '' + install -m644 ${pdfdoc} $out/share/doc/${pname}/learning-algol-68-genie.pdf + ''; + + meta = with lib; { + homepage = "https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html"; + description = "Algol 68 Genie compiler-interpreter"; + longDescription = '' + Algol 68 Genie (a68g) is a recent checkout hybrid compiler-interpreter, + written from scratch by Marcel van der Veer. It ranks among the most + complete Algol 68 implementations. It implements for example arbitrary + precision arithmetic, complex numbers, parallel processing, partial + parametrisation and formatted transput, as well as support for curses, + regular expressions and sounds. It can be linked to GNU plotutils, the GNU + scientific library and PostgreSQL. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/cone/default.nix b/pkgs/development/compilers/cone/default.nix new file mode 100644 index 00000000000..9344160ad76 --- /dev/null +++ b/pkgs/development/compilers/cone/default.nix @@ -0,0 +1,42 @@ +{ llvmPackages +, lib +, fetchFromGitHub +, cmake +}: + +llvmPackages.stdenv.mkDerivation rec { + pname = "cone"; + version = "unstable-2021-07-25"; + + src = fetchFromGitHub { + owner = "jondgoodwin"; + repo = pname; + rev = "5feaabc342bcff3755f638a7e25155cd12127592"; + sha256 = "CTDS83AWtuDY5g6NDn7O2awrYsKFf3Kp35FkMEjfbVw="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + llvmPackages.llvm + ]; + + postPatch = '' + sed -i CMakeLists.txt \ + -e 's/LLVM 7/LLVM/' \ + -e '/AVR/d' + ''; + + installPhase = '' + install -Dm755 conec $out/bin/conec + install -Dm644 libconestd.a $out/lib/libconestd.a + ''; + + meta = with lib; { + description = "Cone Programming Language"; + homepage = "https://cone.jondgoodwin.com"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 3656f1e0dd8..e8452f46a8a 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }: -with lib; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mkcl"; version = "1.1.11"; @@ -11,6 +11,15 @@ with lib; stdenv.mkDerivation rec { sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26"; }; + patches = [ + # "Array sys_siglist[] never was part of the public interface. Replace it with calls to psiginfo()." + (fetchpatch { + name = "sys_siglist.patch"; + url = "https://github.com/jcbeaudoin/MKCL/commit/0777dd08254c88676f4f101117b10786b22111d6.patch"; + sha256 = "1dnr1jzha77nrxs22mclrcqyqvxxn6q1sfn35qjs77fi3jcinjsc"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ gmp ]; @@ -18,7 +27,7 @@ with lib; stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ - "GMP_CFLAGS=-I${gmp.dev}/include" + "GMP_CFLAGS=-I${lib.getDev gmp}/include" "GMP_LDFLAGS=-L${gmp.out}/lib" ]; @@ -27,9 +36,9 @@ with lib; stdenv.mkDerivation rec { cd contrib/tinycc ./configure --cc=cc \ --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ - --crtprefix=${getLib stdenv.cc.libc}/lib \ - --sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include \ - --libpaths=${getLib stdenv.cc.libc}/lib + --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ + --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ + --libpaths=${lib.getLib stdenv.cc.libc}/lib )''; postInstall = '' @@ -38,7 +47,7 @@ with lib; stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "ANSI Common Lisp Implementation"; homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 6490391eb63..3a629421d6b 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,9 +1,10 @@ -{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io }: +{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: with lib; let recent = versions.isGe "8.7" coq.coq-version; in mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; + inherit version; defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [ { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 339bcb9d6b0..d24cf147930 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -5,6 +5,8 @@ with lib; mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; + release."20210730".rev = "d87937faaf7460bcd6985931ac36f551d67e11af"; + release."20210730".sha256 = "04x7433yvibxknk6gy4971yzb4saa3z4dnfy9n6irhyafzlxyf0f"; release."20190414".rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; release."20190414".sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay"; release."20180709".rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; @@ -12,6 +14,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.13"; out = "20210730"; } { case = range "8.8" "8.9"; out = "20190414"; } { case = range "8.6" "8.7"; out = "20180709"; } ] null; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index cdb90452365..82d88b4a62e 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,16 +1,18 @@ -{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, version ? null }: +{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }: -with lib; mkCoqDerivation { +with lib; mkCoqDerivation rec { pname = "interval"; owner = "coqinterval"; domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.8" ; out = "4.1.1"; } + { case = isGe "8.8" ; out = "4.3.0"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko="; + release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE="; release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU="; release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp"; release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0"; @@ -18,8 +20,11 @@ with lib; mkCoqDerivation { releaseRev = v: "interval-${v}"; nativeBuildInputs = [ which autoconf ]; - propagatedBuildInputs = [ bignums coquelicot flocq ]; + propagatedBuildInputs = [ bignums coquelicot flocq ] + ++ lib.optionals (versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; + mlPlugin = true; + enableParallelBuilding = true; meta = with lib; { description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant"; diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index b4e9ebba797..8d1d114e12c 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -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.0.4"; - sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM="; + version = "24.0.5"; + sha256 = "4ZyYcBhep67aPr8SY7JK/3YXD5Th8UcyjTP7UIZ5c5Q="; } diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix index 414171082e3..02d3dbeb9fd 100644 --- a/pkgs/development/interpreters/yabasic/default.nix +++ b/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yabasic"; - version = "2.89.1"; + version = "2.90.1"; src = fetchurl { url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; - hash = "sha256-k8QmQCpszLyotEiWDrG878RM2wqSq7I4W9j6Z2Ub3Yg="; + hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo="; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.yabasic.de/"; + homepage = "http://2484.de/yabasic/"; description = "Yet another BASIC"; longDescription = '' Yabasic is a traditional basic-interpreter. It comes with goto and various diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a13ebf28193..bea56617468 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -9,25 +9,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235"; - sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i"; + rev = "6d98243093c0b36442da94de7010f3eacc2a9909"; + hash = "sha256-n57Fuz2k6sX1o3vYBmC41eRKGnyt9+YL5r3WTHHRRzw="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; rev = "ddd898958803cb89b7156c6350584d1cda0fe8de"; - sha256 = "0n16xqlpxn2ryp43w8pppxrbwmllx6sk4hv3ycgikfj57nd3ibc0"; + hash = "sha256-gK04mj1Fuhkf82NDMrXplFa+cr/3Ij7I9VnYfinuJlg="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "4.0.1"; + version = "5.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m"; + hash = "sha256-w7QxPspZTCD3Yag2cZchqvB2AAGviWuuw6tkQg/5kQo="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { # ./cpp/thirdparty/versions.txt url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; - sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; }; ARROW_MIMALLOC_URL = fetchurl { @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz"; - sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs"; + "https://github.com/microsoft/mimalloc/archive/v1.7.2.tar.gz"; + hash = "sha256-sZEuNUVlpLaYQQ91g8D4OTSm27Ot5Uq33csVaTIJNr0="; }; patches = [ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 2aa5ea015fd..1ba2d79dcec 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.121"; + version = "1.8.130"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ="; + sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index dcb10b8ba08..c1ef9cee990 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "sha256-N30v9OZwTmDbltPPmeSa0uOGJhos1VzyS5zY9vVCWfA="; + sha256 = "sha256-QQoWOJGwL03zbBfrFNXz0Ff9Agc2dMBW9nW3jdOwEE8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 56f0e03921b..b79fb2fd06d 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2.21"; + version = "1.3"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pea79tbz3AgWsZy9CDCNJ6CEsEkmqqBaxn+AjqB9PY0="; + sha256 = "sha256-j5ecrU2DUJBubDZF9wRxr0eNCHWe2TzToxQn8HkrX5c="; }; buildInputs = [ diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 363140b5f58..723b5a0ec1f 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.81.0"; + version = "1.81.1"; src = fetchurl { url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0="; + sha256 = "sha256-D06zFem93deX9MVf3qTh9F/Kfjs1ii/Gk/2VfOLEPKk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index c7d84d9d8af..8107ff3c98e 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.27.0"; + version = "0.30.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs="; + sha256 = "sha256-wW322s2y3tT24FFBtGge2pGloboFKQCiSp+E5lpQ3EA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 07a91f96ff3..5cd7a7c8fe7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1479,6 +1479,36 @@ penlight = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +plenary-nvim = buildLuarocksPackage { + pname = "plenary.nvim"; + version = "scm-1"; + + knownRockspec = (fetchurl { + url = "mirror://luarocks/plenary.nvim-scm-1.rockspec"; + sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/nvim-lua/plenary.nvim", + "rev": "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974", + "date": "2021-07-12T11:07:18-04:00", + "path": "/nix/store/djp9yacizsxs9hiz786fb900fri0m2l8-plenary.nvim", + "sha256": "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny", + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua luassert ]; + + meta = with lib; { + homepage = "http://github.com/nvim-lua/plenary.nvim"; + description = "lua functions you don't want to write "; + license.fullName = "MIT/X11"; + }; +}; rapidjson = buildLuarocksPackage { pname = "rapidjson"; version = "0.6.1-1"; diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/default.nix index d0cb663fb74..941c7ce904e 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libusb1 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rpiboot"; - version = "unstable-2020-10-20"; + version = "2021.07.01"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "d3760e119385a179765f43a50a8e051a44127c25"; - sha256 = "0vygzh2h27xplqp1x4isj6kgrgmvmvc1mr3ghmsi98kzp91w772r"; + rev = "v${version}"; + sha256 = "sha256-BkNyYCrasfiRs7CbJa7tCo2k70TLGcXkOX+zGPyZGGE="; }; nativeBuildInputs = [ libusb1 ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/raspberrypi/usbboot"; - description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; + description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; license = licenses.asl20; maintainers = with maintainers; [ cartr ]; platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 3ddd3d366e8..12cca132ab1 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "09qbqn57h92f81xv35f645ai7nkkqf7cidkg3qrwfpxcwc2g9kdz"; + sha256 = "01lj0abg93icvf4nz1ngshl04avm48lh0naqjcaaxa6ak1gxf97d"; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index acad9cb0f59..53098646db2 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1h1jb57zp8wy24xy60j76sl4hrzhhwfsvfx26zhbnhqzmwghpd5x"; + sha256 = "1n0qklh0cwp75mr7zgv7a9qm58gxpfbwialhnyg8w9y00mqh6flj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 1ab86c1820a..ed84b56f0f8 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1myrzp5axg0dj7kxqc2mz3kfqlds3vzvavcncrj5y9xpx8m7l71m"; + sha256 = "10ky13j66ysag9wmx8hsmr4pn16h24rp34zqi3qn7hk1v2jrkkx6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 40583a12ada..4f33bbb6101 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9166"; + version = "9.0.9297"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0y77lyz019rm9zgxpam6dbb006c7j66hwy985h3fg6nbz74pcml5"; + sha256 = "0hlwf98ijb8c9gc51pjy4kq4zal2cmqrr34dgk31f03dnp65yiz7"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix new file mode 100644 index 00000000000..06cb2bf7580 --- /dev/null +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, cffi +, brotli +}: + +buildPythonPackage rec { + pname = "brotlicffi"; + version = "1.0.9.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-hyper"; + repo = pname; + rev = "v${version}"; + sha256 = "0qx7an7772brmx1rbbrqzqnkqqvicc70mx740nl31kzzyv4jjs00"; + }; + + buildInputs = [ + brotli + ]; + + propagatedBuildInputs = [ + cffi + ]; + + preBuild = '' + export USE_SHARED_BROTLI=1 + ''; + + # Test data is not available, only when using libbortli git checkout + doCheck = false; + + pythonImportsCheck = [ "brotlicffi" ]; + + meta = with lib; { + description = "Python CFFI bindings to the Brotli library"; + homepage = "https://github.com/python-hyper/brotlicffi"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 8d8e5ec00dc..de34be979f3 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k , python, twisted, jinja2, zope_interface, sqlalchemy , sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq , txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial @@ -26,11 +26,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0vh2v1qs65kwcj1x8r1wj2g456kflspyz7mjara9ph9qs7j97y74"; + sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA="; }; propagatedBuildInputs = [ @@ -78,6 +78,19 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + # Fix compatibility with SQLAlchemy 1.4 + (fetchpatch { + url = "https://github.com/buildbot/buildbot/pull/6156.patch"; + sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my"; + stripLen = 1; + excludes = [ + ".bbtravis.yml" + "buildbot/test/unit/db/test_enginestrategy.py" + "buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py" + "requirements-ci.txt" + "requirements-cidb.txt" + ]; + }) ]; postPatch = '' @@ -97,6 +110,7 @@ let passthru = { inherit withPlugins; tests.buildbot = nixosTests.buildbot; + updateScript = ./update.sh; }; meta = with lib; { diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index b00a2ece568..94cca457b9c 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "13bcshfas3r7hl205il9fzdjfhd18jf0lxrr5wd8r6qzdrl6i1y6"; + sha256 = "sha256-6PpR/zDy1ZZWFN2qzIeNWk9kmDpecZH40IEMoqyprnk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 62f32a00fb4..f01967337a1 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1qb82s72mrm39123kwkypa2nhdsks6v9nkpw4vvscnq4p9xbzw2c"; + sha256 = "sha256-6dG8yCHmysQELodaPXOrI8J8Uc1/7YHwplnvYZyeuo0="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0kwzj28dmhkcr44nf39s82xjc9y5p27w4ywxfpm55cim3hwxbcb1"; + sha256 = "sha256-bjDVA5478pHtBXIVPSZJURRqU9EVFVXG/933oDQZCpk="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0vvp6z0d0qf5i5kykzph28hr3g9wgzrmmbbzdnm94yk4wsqq7w86"; + sha256 = "sha256-I31sryOUW6JVsWpkgvQe9ICyoDZUVewRPtG0JdIVJo8="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0y839swv9vdkwi4i1hjiyrjbj1bs74sbkpr5f58ivkjlf5alb56b"; + sha256 = "sha256-FWi67S3wXuISLP0f4VzXisEWXN60xlgU4I946QkX9Eo="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1zsh1bvrl3byx0ycz5jnhijzifxglm8w7kcxp79k7frw7i02fpvy"; + sha256 = "sha256-6kXB+hu75V59KMo7tIHbE2Wvig6raTbPc7vYVVl/1y0="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/update.sh b/pkgs/development/python-modules/buildbot/update.sh new file mode 100755 index 00000000000..3406f05db3e --- /dev/null +++ b/pkgs/development/python-modules/buildbot/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update +set -eu -o pipefail + +nix-update python3Packages.buildbot +nix-update --version=skip python3Packages.buildbot-worker +nix-update --version=skip python3Packages.buildbot-pkg +nix-update --version=skip python3Packages.buildbot-plugins.www +nix-update --version=skip python3Packages.buildbot-plugins.console-view +nix-update --version=skip python3Packages.buildbot-plugins.waterfall-view +nix-update --version=skip python3Packages.buildbot-plugins.grid-view +nix-update --version=skip python3Packages.buildbot-plugins.wsgi-dashboards diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 4313d16d0b7..f873eeee98a 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0q16vgvlhiybq5rhva9kcj5v2mhfpdb5czm2vng4rrfqqiqq918m"; + sha256 = "sha256-pIXdqahCWJGRiXKDyih2UjGYdyzwhxnYgMwCzdQfYUo="; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 3dc930473f5..b39034f3093 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9166"; + version = "9.0.9297"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "0rwl5q7z16agcykn0an2lyqfn2z5yvmg0xcvxfpvndf6zpnbqhx0"; + sha256 = "1lacpdzaifn050msh4rf75qphbh56dc2kdk7m426q4ki3g7026n7"; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 0110625eba8..f3c2f9977b0 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9166"; + version = "9.0.9297"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1mvdcwzim52mc7vjrr2cq8xwwi0v0ai3z608mg5nfbbf4zjji76c"; + sha256 = "1n5ybbxmsm7mc7z40b9imbgzjzmbjq58sh6zvzjyqqnl9k657khc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix index cb5f032a6f2..e9bb585544e 100644 --- a/pkgs/development/python-modules/dotmap/default.nix +++ b/pkgs/development/python-modules/dotmap/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "dotmap"; - version = "1.3.23"; + version = "1.3.24"; src = fetchPypi { inherit pname version; - sha256 = "0hy88kzzb7zhxfr7iyvl6rhmvz02538pbna7zypaard4a88bbbka"; + sha256 = "1mvkhkrhzzzng17j2yvwp4x1hj8wls3qw5lngqs777a2qc1mhg0r"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index c4811677655..e48826eae9f 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "3.5.2"; + version = "4.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1irf4dcq9fcqvvjbijkymm63n2s7a19igs1zsbv7y8fa5a2yprhd"; + sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index 223f3893e18..5806104d419 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iaqualink"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "flz"; repo = "iaqualink-py"; rev = "v${version}"; - sha256 = "13iwngjjqzr1pkmskbc2wakccvcjkf4bk65f4jp4ywpciilr4zjw"; + sha256 = "0xgxajw38jrc55xh8w8mq0dk82ml77mfs8yn05gcpv8l24y70chq"; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index a769128fd86..a7981feb205 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.9"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pLdAxBipmr+HUr9NSupm7h/68PK95r3zY/qZTBs1m54="; + sha256 = "0ilh9wfzggnbfz068vkz66g64ar6isl3m2vcp7jf2zbaj0bqsjax"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index e104dbff4f6..1196a6575da 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "0pj987v04y5askczlma2ilwllwfsg7p5mwhv0h1lcl1lg0fbsvn9"; + sha256 = "1wcr59k1bncwfza5k8mllaxz8fwfyqbwgm5xp908w2449i71wl7r"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 65f70efb7c5..fadb3f58d50 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.8"; + version = "5.0.9"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QgMc0O5jk5LgKQg9ZMCZd3dNLv1typm1Rp2u8kSsqYk="; + sha256 = "1jfbwnipklpgxjgsgsx4j53anbqyrbgvj0wb84fvsm32jq9m8avf"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 989433b499d..e9510d9552c 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -41,9 +41,9 @@ buildPythonPackage rec { # enabled in nixpkgs. # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 "--deselect=pyarrow/tests/test_memory.py::test_env_var" - # Deselect the parquet dataset write test because it erroneously fails to find the + # Deselect a parquet dataset test because it erroneously fails to find the # pyarrow._dataset module. - "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem" + "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 6737f126073..02f1cc69152 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.22"; + version = "0.4.24"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6"; + sha256 = "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0"; }; patches = [ @@ -32,9 +32,10 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py ''; - meta = { + meta = with lib; { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-magic/libmagic-path.patch b/pkgs/development/python-modules/python-magic/libmagic-path.patch index 5a1dbec7d51..e9530d6ddf7 100644 --- a/pkgs/development/python-modules/python-magic/libmagic-path.patch +++ b/pkgs/development/python-modules/python-magic/libmagic-path.patch @@ -1,17 +1,28 @@ -diff --git a/magic/loader.py b/magic/loader.py -index 6b2bfcb..69778af 100644 ---- a/magic/loader.py -+++ b/magic/loader.py -@@ -5,11 +5,7 @@ import glob +diff --git i/magic/loader.py w/magic/loader.py +index 931f161..b8096d1 100644 +--- i/magic/loader.py ++++ w/magic/loader.py +@@ -35,16 +35,12 @@ def _lib_candidates(): + + def load_lib(): - libmagic = None - # Let's try to find magic or magic1 -- dll = ctypes.util.find_library('magic') \ -- or ctypes.util.find_library('magic1') \ -- or ctypes.util.find_library('cygmagic-1') \ -- or ctypes.util.find_library('libmagic-1') \ -- or ctypes.util.find_library('msys-magic-1') # for MSYS2 -+ dll = '@libmagic@' ++ lib = '@libmagic@' + +- for lib in _lib_candidates(): +- # find_library returns None when lib not found +- if lib is None: +- continue +- try: +- return ctypes.CDLL(lib) +- except OSError: +- pass +- else: +- # It is better to raise an ImportError since we are importing magic module +- raise ImportError('failed to find libmagic. Check your installation') ++ try: ++ return ctypes.CDLL(lib) ++ except OSError: ++ pass - # necessary because find_library returns None if it doesn't find the library - if dll: ++ # It is better to raise an ImportError since we are importing magic module ++ raise ImportError('failed to find libmagic. Check your installation') diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 202c8254f6b..3d37dcae872 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.23.0"; + version = "2.23.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i"; + sha256 = "1jc0gh0y5fz02wab50v6m4x0pfycdkjvf1vw05d8d0yqsv7ld7fw"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index a6c2b1d381b..ee61f4fcca0 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9166"; + version = "9.0.9297"; src = fetchPypi { inherit pname version; - sha256 = "0h7jw7blr4bal7pw711cxmwm4jjypchshc8ks04z2lyziy83ywja"; + sha256 = "1dfg7kacmwln0sazs5hakmsmfbm8m55qq1ydxi4g2ix3bfxkc1c4"; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index ad2574bd86c..80d69a04333 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.6.5"; + version = "0.6.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-8nLzNEle5eR5qc/tC1CX+Kh3WkPuKyy9VDMiAVbOykA="; + sha256 = "04h4av65x0a2iv3a4rpsq19m9pi7wk8j447rr5z7jwap870gs8nd"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 570054a3686..45ba1223e84 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.52.1"; + version = "0.55.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "1ky2pp924c10ylgk0pgdgj822sajd51ijamlgshy9jc2s3n9acay"; + sha256 = "1l71r9il45svdwydvi08hnyh310j0gha11qhyqvdz14d8czf8ahn"; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 3b775eeaef1..f1aa4204a04 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchHex, erlang, makeWrapper, writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: @@ -40,12 +40,14 @@ let ''; - patches = [] - # Skips test that can write outside the designated tmp directory, potentially resulting in build failures - # due to file ownership issues if ran without sandbox (eg. Mac M1 default). This patch can be Removed when - # rebar3 releases with the following commit: - # https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21 - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ./tmp-tests-skip.patch ]; + patches = [ + # TODO: remove this on next rebar3 release + (fetchpatch { + name = "escriptize-erl-libs"; + url = "https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21.patch"; + sha256 = "01xjaqnhmjlxqdgb8ph15wssjq5crdhjslxnndbs5f0kscqpq14c"; + }) + ]; checkPhase = '' HOME=. escript ./rebar3 ct diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index b32eed9a166..3b98a7a7775 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.31.0"; + version = "3.32.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-Rot5A2zSEleTifadHEvAlydchzCdDo/VPZELostDfng="; + sha256 = "sha256-wgIqsOqdwnKL1mWD1CR1ru2erc9iSZoDXxeOtobeAQQ="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 22b7752c593..741bcfbe5a8 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.3.2"; + version = "7.4.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-ID/vqkFzKHLeuojHUxUFYURn+Dxb78XwxfJVV+S130A="; + sha256 = "sha256-UvEPTZtQWztl7ZC1XrBxE8+emlXQjMG4IJEti5vVxUM="; }; - vendorSha256 = "sha256-30rrRkPIH0sr8koKRLs1Twe6Z55+lr9gkgUDrY+WOTw="; + vendorSha256 = "sha256-IY+HGgoKNS/j3FGCX3F3EK1GehBjs3Z1K8V3O7a3swk="; doCheck = false; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2802a05f8ad..59e79a6ee19 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.16"; + version = "0.12.17"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-rDPjxr6gaaH55l72dMaZsGCxayM8Nodjn3fppydpjZk="; + sha256 = "sha256-wZOBjNOgGmwIQNCrhzwGPmI/fW/yZiDqq8l4oSDTvZs="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index 4165f9bd41c..caac892bf12 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ijq"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromSourcehut { owner = "~gpanders"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0xLmjidPxjSkYmLI4lWieT2rswZsWBY/IUXFOrUFAMo="; + sha256 = "sha256-mPO3P+NGFIoHuvMFwj87S8H8LQx7QpfPy2zi91la2C0="; }; - vendorSha256 = "sha256-7UuQXnQdlUMC0ZIgHydQ5bZMB5XrE7dhx5+1NI+zFkM="; + vendorSha256 = "sha256-HbrmfZ/P5bUF7Qio5L1sb/HAYk/tL2SOmxHCXvSw72I="; nativeBuildInputs = [ installShellFiles makeWrapper scdoc ]; @@ -31,6 +31,6 @@ buildGoModule rec { description = "Interactive wrapper for jq"; homepage = "https://git.sr.ht/~gpanders/ijq"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ justinas ]; + maintainers = with maintainers; [ justinas SuperSandro2000 ]; }; } diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index feeb22e1d44..7206a6d7d24 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook -, onigurumaSupport ? true, oniguruma }: +{ lib +, stdenv +, fetchpatch +, fetchFromGitHub +, autoreconfHook +, onigurumaSupport ? true +, oniguruma +}: stdenv.mkDerivation rec { pname = "jq"; @@ -46,8 +52,8 @@ stdenv.mkDerivation rec { "--datadir=\${doc}/share" "--mandir=\${man}/share/man" ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" - # jq is linked to libjq: - ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + # jq is linked to libjq: + ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; installCheckTarget = "check"; @@ -63,8 +69,8 @@ stdenv.mkDerivation rec { description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; - platforms = with platforms; linux ++ darwin; - downloadPage = "http://stedolan.github.io/jq/download/"; + platforms = platforms.unix; + downloadPage = "https://stedolan.github.io/jq/download/"; updateWalker = true; }; } diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index d7a2e733859..cad2c7e1a18 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -16,6 +16,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + postPatch = '' + # this hard codes the compiler, which breaks the aarch64 in particular + # we rather want to set the compiler ourself + rm .cargo/config + ''; + postInstall = '' installManPage man/just.1 diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 61b4a570b81..fde540b057e 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.41.0"; + version = "0.42.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "10z1010k25i40iv7v339csmbs83hmwjv1004jikckb78wncd12s3"; + sha256 = "sha256-MrIn+siqBnjwst4HKdJQ+iy1PxCldKizXkmqHH6D3Kg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 7b9ebd57391..52272e61956 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check -, libserialport, librevisa, doxygen, glibmm +, libserialport, librevisa, doxygen, glibmm, python3 , version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4" }: @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libzip glib libusb1 libftdi1 check libserialport - librevisa doxygen glibmm - ]; + nativeBuildInputs = [ doxygen pkg-config python3 ]; + buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa glibmm ]; strictDeps = true; @@ -29,11 +27,18 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" ''; + doInstallCheck = true; + installCheckPhase = '' + # assert that c++ bindings are included + [[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \ + || { echo 'C++ bindings were not generated; check configure output'; false; } + ''; + meta = with lib; { description = "Core library of the sigrok signal analysis software suite"; homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 30e02a3623f..6e55292722f 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -5,7 +5,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "v3.5.0_nix"; - sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; + rev = "nix_v3.5.0-1"; + sha256 = "sha256-jcgshxAuuc8QizpYL/2K3PKYWiKsnF/8BJAUaryvEvQ="; }; }) diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix index 38723bbf3c1..d33f455c9b9 100644 --- a/pkgs/development/tools/rust/cargo-criterion/default.nix +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-criterion"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bheisler"; repo = pname; rev = version; - sha256 = "sha256-NiuK+PexfF2wmA8drqqkv/RQlVwYLT3q2QWvV0ghJwg="; + sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0="; }; - cargoSha256 = "sha256-5Z9Oz8jjyM3+cHAZ++thRDdNlb0Kj54Mg7JjF9JrLdw="; + cargoSha256 = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 216e8362215..6cc10418fc0 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yTUYMLVjzbuHqQxW68snxQ0CzoOwEBGXWFR/4yfDZ34="; + sha256 = "sha256-TqrbkTij+XCousADorrzsVVNVYOUEyl5+nhMn4IgaIY="; }; - cargoSha256 = "sha256-WXvl+Xbu/oGTEFhbn6GuLoiNX+DxwhtT6cuucCOQsC4="; + cargoSha256 = "sha256-cA4a7lqzOXkNZ7ehM/gCqtTyAaY2TH+23bITHBId8wQ="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0565127f8d0..c440c83a80e 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.6.4"; + version = "2.7.5"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1h19rsxsn2piifillv29nwks2k9l391jwygjbfy8pc0ha8yi63mw"; + outputHash = "1xvx9bd6lf9m1r5p05d37qnjlzny6xrbkh8m7z4q4rk7i1vl8xv0"; }; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index b26d5a8a9db..55c2d3139e9 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ue9HCAYqv8DXiEZEuGRFPywNegakxBpb66RELP1Y+cg="; + sha256 = "sha256-z6fL2uvv8E6NDBbbQKZ2Xhc6PI+e0Zl6mUvxIRhduH0="; }; - cargoSha256 = "sha256-HCsJG//RnlcmRSrBdf7iZTUOiQabMV2rICPLKvuE4AI="; + cargoSha256 = "sha256-xGoOVp0Pt6cpCBK8IkyFCIcBNucDo98o3f7T3TQQhZY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index ff673658272..0e1715a4c12 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "8.0.0"; + version = "8.1.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z"; + sha256 = "17cq88qrq3dshgfaycb77xbkzr9drw7fvw0xqijlxivvmnbvwi6i"; }; # don't remove runtime deps diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index cfd6c211ab5..66cf2e4904d 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.3"; - sha256 = "143ihn30jd08nk19saxn6qp3ldc9yvy8w338i4cg9256wgx120im"; + version = "12.22.4"; + sha256 = "0k6dwkhpmjcdb71zd92a5v0l82rsk06p57iyjby84lhy2fmlxka4"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index ad6c8aacddc..3b04f751b48 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.3"; - sha256 = "0j3zd5vavsapqs9h682mr8r5i7xp47n0w4vjvm8rw3rn3dg4p2sb"; + version = "14.17.4"; + sha256 = "0b6gadc53r07gx6qr6281ifr5m9bgprmfdqyz9zh5j7qhkkz8yxf"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 766df734a4a..c89b48ae3dd 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.5.0"; - sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; + version = "16.6.0"; + sha256 = "1ndrqx3k5m62r7nzl5za59m33bx10541n7xbaxxz7088ifh18msw"; } |