diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-15 18:01:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-15 18:01:52 +0000 |
commit | 7ba15c5a4114d2875ac514c461b1d2b21ec19974 (patch) | |
tree | af18365d138fb00dd30007898cdf2fa08b393432 /pkgs/development | |
parent | a9bd291c06a18642c5478d32f87b869a408a15d5 (diff) | |
parent | fe4a555a4c1c930ebaf3614e3a482100fac93957 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development')
39 files changed, 353 insertions, 140 deletions
diff --git a/pkgs/development/compilers/asl/default.nix b/pkgs/development/compilers/asl/default.nix index cfc44c717e083..b8c900a20b3c1 100644 --- a/pkgs/development/compilers/asl/default.nix +++ b/pkgs/development/compilers/asl/default.nix @@ -1,19 +1,22 @@ { lib , stdenv , fetchzip -, buildDocs ? false, tex +, tex +, buildDocs ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "asl"; - version = "142-bld211"; + version = "142-bld232"; - src = fetchzip { + src = let inherit (finalAttrs) pname version; in fetchzip { name = "${pname}-${version}"; url = "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-${version}.tar.bz2"; - hash = "sha256-Sbm16JX7kC/7Ws7YgNBUXNqOCl6u+RXgfNjTODhCzSM="; + hash = "sha256-Q50GzXBxFMhbt5s9OgHPNH4bdqz2hhEmTnMmKowVn2E="; }; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = lib.optionals buildDocs [ tex ]; postPatch = lib.optionalString (!buildDocs) '' @@ -26,10 +29,10 @@ stdenv.mkDerivation rec { preBuild = '' bindir="${placeholder "out"}/bin" \ - docdir="${placeholder "out"}/doc/asl" \ + docdir="${placeholder "doc"}/share/doc/asl" \ incdir="${placeholder "out"}/include/asl" \ libdir="${placeholder "out"}/lib/asl" \ - mandir="${placeholder "out"}/share/man" \ + mandir="${placeholder "man"}/share/man" \ substituteAll ${./Makefile-nixos.def} Makefile.def mkdir -p .objdir ''; @@ -47,8 +50,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} -# TODO: multiple outputs +}) # TODO: cross-compilation support # TODO: customize TeX input # TODO: report upstream about `mkdir -p .objdir/` diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 52606781935bd..96bf06e41ea0e 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boehmgc, zlib, sqlite, pcre, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g"; }; + patches = [ + # https://github.com/HaxeFoundation/neko/pull/224 + (fetchpatch { + url = "https://github.com/HaxeFoundation/neko/commit/ff5da9b0e96cc0eabc44ad2c10b7a92623ba49ee.patch"; + sha256 = "sha256-isM7QGPiyXgT2zpIGd+r12vKg7I1rOWYTTWxuECafro="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil @@ -26,7 +34,9 @@ stdenv.mkDerivation rec { bin/neko bin/test.n ''; - doInstallCheck = true; + # Called from tools/test.neko line 2 + # Uncaught exception - Segmentation fault + doInstallCheck = !stdenv.isDarwin; dontPatchELF = true; dontStrip = true; diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index 74324b03e6add..ef0b40c31b7c8 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -10,8 +10,9 @@ }; dontBuild = true; installPhase = '' - mkdir -p "$out/share/bats" - cp -r . "$out/share/bats/bats-assert" + mkdir -p "$out/share/bats/bats-assert" + cp load.bash "$out/share/bats/bats-assert" + cp -r src "$out/share/bats/bats-assert" ''; meta = { description = "Common assertions for Bats"; @@ -33,8 +34,9 @@ }; dontBuild = true; installPhase = '' - mkdir -p "$out/share/bats" - cp -r . "$out/share/bats/bats-file" + mkdir -p "$out/share/bats/bats-file" + cp load.bash "$out/share/bats/bats-file" + cp -r src "$out/share/bats/bats-file" ''; meta = { description = "Common filesystem assertions for Bats"; @@ -56,8 +58,9 @@ }; dontBuild = true; installPhase = '' - mkdir -p "$out/share/bats" - cp -r . "$out/share/bats/bats-support" + mkdir -p "$out/share/bats/bats-support" + cp load.bash "$out/share/bats/bats-support" + cp -r src "$out/share/bats/bats-support" ''; meta = { description = "Supporting library for Bats test helpers"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 667fb749d330e..7237d09817ff2 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -17,7 +17,6 @@ , libGL ? null , libGLU ? null , wxGTK ? null -, wxmac ? null , xorg ? null , parallelBuild ? false , systemd @@ -72,7 +71,7 @@ }: assert wxSupport -> (if stdenv.isDarwin -then wxmac != null +then wxGTK != null else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; @@ -80,7 +79,7 @@ assert javacSupport -> openjdk11 != null; let inherit (lib) optional optionals optionalAttrs optionalString; - wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; + wxPackages2 = if stdenv.isDarwin then [ wxGTK ] else wxPackages; in stdenv.mkDerivation ({ diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 4c7680f704696..3d451de582a5e 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libfixposix"; - version="0.4.3"; + version="0.5.1"; src = fetchFromGitHub { owner = "sionescu"; repo = "libfixposix"; rev = "v${version}"; - sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j"; + sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ]; diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index 833c08b7322f5..9aa6e7d046419 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] [[package]] name = "libc" -version = "0.2.125" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "memchr" @@ -25,9 +25,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "regex" -version = "1.5.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -36,13 +36,13 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rure" -version = "0.2.1" +version = "0.2.2" dependencies = [ "libc", "regex", diff --git a/pkgs/development/libraries/rure/pin.json b/pkgs/development/libraries/rure/pin.json index 234631d07c6e9..7e6b1101702e8 100644 --- a/pkgs/development/libraries/rure/pin.json +++ b/pkgs/development/libraries/rure/pin.json @@ -1,5 +1,5 @@ { "pname": "rure", - "version": "0.2.1", - "sha256": "18sd1dfagf2338mp32kfjbqpc3n0agm61p044jl7yhy299ws21r8" + "version": "0.2.2", + "sha256": "0n2c9b8arfgcq1l7gr8dfcmdvdbggvfd0msy6sbx3bln74wwbr06" } diff --git a/pkgs/development/lisp-modules-new/import/database/sqlite.lisp b/pkgs/development/lisp-modules-new/import/database/sqlite.lisp index 18d384e06c708..0fd0807fc6b9b 100644 --- a/pkgs/development/lisp-modules-new/import/database/sqlite.lisp +++ b/pkgs/development/lisp-modules-new/import/database/sqlite.lisp @@ -71,6 +71,31 @@ getAttr = builtins.getAttr; in {") +;; Random compilation errors +(defparameter +broken-packages+ + (list + ;; no dispatch function defined for #\t + "hu.dwim.logger" + "hu.dwim.serializer" + "hu.dwim.quasi-quote" + ;; Tries to write in $HOME + "ubiquitous" + "math" + ;; Upstream bad packaging, multiple systems in clml.blas.asd + "clml.blas.hompack" + ;; Fails on SBCL due to heap exhaustion + "magicl" + ;; Probably missing dependency in QL data + "mcclim-bezier" + ;; Missing dependency on c2ffi cffi extension + "hu.dwim.zlib" + ;; Missing libgvc.so native library + "hu.dwim.graphviz" + ;; These require libRmath.so, but I don't know where to get it from + "cl-random" + "cl-random-tests" + )) + (defmethod database->nix-expression ((database sqlite-database) outfile) (sqlite:with-open-database (db (database-url database)) (with-open-file (f outfile @@ -131,6 +156,7 @@ in {") (remove "asdf" (str:split-omit-nulls #\, deps) :test #'string=)))) - ,@(when (find #\/ name) + ,@(when (or (find #\/ name) + (find name +broken-packages+ :test #'string=)) '(("meta" (:attrs ("broken" (:symbol "true")))))))))))) (format f "~%}~%")))) diff --git a/pkgs/development/lisp-modules-new/imported.nix b/pkgs/development/lisp-modules-new/imported.nix index 5620620188b23..a592eb845075c 100644 --- a/pkgs/development/lisp-modules-new/imported.nix +++ b/pkgs/development/lisp-modules-new/imported.nix @@ -20457,6 +20457,9 @@ in { }); systems = [ "cl-random" ]; lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-num-utils" pkgs) (getAttr "cl-rmath" pkgs) (getAttr "cl-slice" pkgs) (getAttr "gsll" pkgs) (getAttr "let-plus" pkgs) (getAttr "lla" pkgs) ]; + meta = { + broken = true; + }; }; cl-random-forest = { pname = "cl-random-forest"; @@ -20496,6 +20499,9 @@ in { }); systems = [ "cl-random-tests" ]; lispLibs = [ (getAttr "cl-random" pkgs) (getAttr "clunit" pkgs) ]; + meta = { + broken = true; + }; }; cl-rdfxml = { pname = "cl-rdfxml"; @@ -25092,6 +25098,9 @@ in { }); systems = [ "clml.blas.hompack" ]; lispLibs = [ (getAttr "f2cl-lib" pkgs) ]; + meta = { + broken = true; + }; }; clml_dot_blas_dot_real = { pname = "clml.blas.real"; @@ -36543,10 +36552,6 @@ in { }); systems = [ "gsll" ]; lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "foreign-array" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - # needs "nativeLibs=nixpkgs.gsl" for libgslcblas.so and a way to set CFLAGS="-I gsl/include" or something similar - broken = true; - }; }; gt = { pname = "gt"; @@ -37991,6 +37996,9 @@ in { }); systems = [ "hu.dwim.graphviz" ]; lispLibs = [ (getAttr "cffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "metabang-bind" pkgs) ]; + meta = { + broken = true; + }; }; hu_dot_dwim_dot_graphviz_dot_documentation = { pname = "hu.dwim.graphviz.documentation"; @@ -38030,6 +38038,9 @@ in { }); systems = [ "hu.dwim.logger" ]; lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "local-time" pkgs) ]; + meta = { + broken = true; + }; }; hu_dot_dwim_dot_logger_plus_iolib = { pname = "hu.dwim.logger+iolib"; @@ -38381,6 +38392,9 @@ in { }); systems = [ "hu.dwim.quasi-quote" ]; lispLibs = [ (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; + meta = { + broken = true; + }; }; hu_dot_dwim_dot_quasi-quote_dot_css = { pname = "hu.dwim.quasi-quote.css"; @@ -38718,6 +38732,9 @@ in { }); systems = [ "hu.dwim.serializer" ]; lispLibs = [ (getAttr "babel" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; + meta = { + broken = true; + }; }; hu_dot_dwim_dot_serializer_dot_documentation = { pname = "hu.dwim.serializer.documentation"; @@ -39379,6 +39396,9 @@ in { }); systems = [ "hu.dwim.zlib" ]; lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) ]; + meta = { + broken = true; + }; }; hu_dot_dwim_dot_zlib_slash_fancy = { pname = "hu.dwim.zlib_fancy"; @@ -47305,6 +47325,9 @@ in { }); systems = [ "math" ]; lispLibs = [ (getAttr "cl-utilities" pkgs) (getAttr "font-discovery" pkgs) (getAttr "gsll" pkgs) (getAttr "vgplot" pkgs) ]; + meta = { + broken = true; + }; }; math_slash_appr = { pname = "math_appr"; @@ -47717,6 +47740,9 @@ in { }); systems = [ "mcclim-bezier" ]; lispLibs = [ (getAttr "flexichain" pkgs) (getAttr "clim" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "mcclim-clx" pkgs) (getAttr "mcclim-null" pkgs) (getAttr "mcclim-render" pkgs) ]; + meta = { + broken = true; + }; }; mcclim-bezier_slash_clx = { pname = "mcclim-bezier_clx"; @@ -68823,6 +68849,9 @@ in { }); systems = [ "ubiquitous" ]; lispLibs = [ ]; + meta = { + broken = true; + }; }; ubiquitous-concurrent = { pname = "ubiquitous-concurrent"; diff --git a/pkgs/development/lisp-modules-new/patches/cl-freetype2-fix-grovel-includes.patch b/pkgs/development/lisp-modules-new/patches/cl-freetype2-fix-grovel-includes.patch new file mode 100644 index 0000000000000..5260f0c058414 --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/cl-freetype2-fix-grovel-includes.patch @@ -0,0 +1,16 @@ +--- a/src/ffi/grovel/grovel-freetype.h ++++ b/src/ffi/grovel/grovel-freetype.h +@@ -2,7 +2,7 @@ + #include <ft2build.h> + #include FT_FREETYPE_H + +-#include <ftsystem.h> +-#include <fttypes.h> +-#include <ftlist.h> +-#include <ftimage.h> ++#include <freetype/ftsystem.h> ++#include <freetype/fttypes.h> ++#include <freetype/ftlist.h> ++#include <freetype/ftimage.h> + +Diff finished. Mon Nov 14 22:41:57 2022 diff --git a/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index 8e281f6b2c594..07dd90feb3028 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -22,6 +22,29 @@ let cl-cairo2 = pkg: { nativeLibs = [ cairo ]; }; + cl-cairo2-xlib = pkg: { + nativeLibs = [ gtk2-x11 ]; + }; + cl-freetype2 = pkg: { + nativeLibs = [ freetype ]; + nativeBuildInputs = [ freetype ]; + patches = [ ./patches/cl-freetype2-fix-grovel-includes.patch ]; + }; + cl-pango = pkg: { + nativeLibs = [ pango ]; + }; + cl-gtk2-gdk = pkg: { + nativeLibs = [ gtk2-x11 ]; + }; + cl-gtk2-glib = pkg: { + nativeLibs = [ glib ]; + }; + cl-gtk2-pango = pkg: { + nativeLibs = [ pango ]; + }; + cl-rsvg2 = pkg: { + nativeLibs = [ librsvg ]; + }; cl-cffi-gtk-gdk = pkg: { nativeLibs = [ gtk3 ]; }; @@ -134,22 +157,38 @@ let systems = [ "iolib" "iolib/os" "iolib/pathnames" ]; }; "cl-ana.hdf-cffi" = pkg: { - nativeBuildInputs = [ hdf5 ]; - nativeLibs = [ hdf5 ]; + nativeBuildInputs = [ pkgs.hdf5 ]; + nativeLibs = [ pkgs.hdf5 ]; NIX_LDFLAGS = [ "-lhdf5" ]; }; gsll = pkg: { - nativeBuildInputs = [ gsl ]; - nativeLibs = [ gsl ]; + nativeBuildInputs = [ pkgs.gsl ]; + nativeLibs = [ pkgs.gsl ]; }; cl-libyaml = pkg: { - nativeLibs = [ libyaml ]; + nativeLibs = [ pkgs.libyaml ]; }; cl-libxml2 = pkg: { - nativeLibs = [ libxml2 ]; + nativeLibs = [ pkgs.libxml2 ]; }; cl-readline = pkg: { - nativeLibs = [ readline ]; + nativeLibs = [ pkgs.readline ]; + }; + pzmq = pkg: { + nativeBuildInputs = [ pkgs.zeromq ]; + nativeLibs = [ pkgs.zeromq ]; + }; + pzmq-compat = pkg: { + nativeBuildInputs = [ pkgs.zeromq ]; + nativeLibs = [ pkgs.zeromq ]; + }; + pzmq-examples = pkg: { + nativeBuildInputs = [ pkgs.zeromq ]; + nativeLibs = [ pkgs.zeromq ]; + }; + pzmq-test = pkg: { + nativeBuildInputs = [ pkgs.zeromq ]; + nativeLibs = [ pkgs.zeromq ]; }; }; diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index bbbaa7361c698..23f26ca72b256 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-XPvnZOshA+PdFOzOlJXMfRTRYSue0uHsNwQsCwv3WOU="; + hash = "sha256-VvGhFf9x257YdSmOxjztGZW9FLBNd028rH3+BvXAQ4o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 428ae9a5949eb..ec5204470d452 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.2"; + version = "0.5.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EPzYIPoT5yAdobmdfaehOYhYeKM6NMpcNZWVR2Dac8k="; + hash = "sha256-5moJ/Pu1Ixy4s7mCbjxQYROafjHVDM2cmpg0imDznl0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index ec7555b224929..612cb70d6f650 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -5,6 +5,7 @@ , dill , fastavro , fetchFromGitHub +, fetchpatch , freezegun , grpcio , grpcio-tools @@ -53,6 +54,16 @@ buildPythonPackage rec { sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; }; + patches = [ + (fetchpatch { + # https://github.com/apache/beam/pull/24143 + name = "fix-for-dill-0.3.6.patch"; + url = "https://github.com/apache/beam/commit/7e014435b816015d21cc07f3f6c80809f3d8023d.patch"; + hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk="; + stripLen = 2; + }) + ]; + pythonRelaxDeps = [ # See https://github.com/NixOS/nixpkgs/issues/156957 "dill" @@ -138,6 +149,10 @@ buildPythonPackage rec { "apache_beam/runners/portability/flink_runner_test.py" "apache_beam/runners/portability/samza_runner_test.py" "apache_beam/runners/portability/spark_runner_test.py" + + # Fails starting from dill 0.3.6 because it tries to pickle pytest globals: + # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499. + "apache_beam/transforms/window_test.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 6a52ff4fd2d17..41f2f2864d18e 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -1,15 +1,19 @@ { lib +, anyio , buildPythonPackage , fetchFromGitHub , paho-mqtt +, pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm , typing-extensions }: buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.13.0"; - format = "setuptools"; + version = "0.14.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,22 +21,47 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-On4N5KPnbwYrJguWwBdrnaNq58ZeGIPYSFzIRBfojpQ="; + hash = "sha256-ByVslOx/XsxVan2/xdRi+wOQR9oVpIGtHPcHlIcHMEk="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ paho-mqtt ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; - # Module will have tests starting with > 0.13.0 - doCheck = false; + checkInputs = [ + anyio + pytestCheckHook + ]; pythonImportsCheck = [ "asyncio_mqtt" ]; + disabledTests = [ + # Tests require network access + "test_client_filtered_messages" + "test_client_unfiltered_messages" + "test_client_unsubscribe" + "test_client_will" + "test_client_tls_context" + "test_client_tls_params" + "test_client_username_password " + "test_client_logger" + "test_client_max_concurrent_outgoing_calls" + "test_client_websockets" + "test_client_pending_calls_threshold" + "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" + ]; + meta = with lib; { description = "Idomatic asyncio wrapper around paho-mqtt"; homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index dec024fa8385f..848fb80ff0936 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "1.6.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "v${version}"; - sha256 = "/397YGV6QWWmKfqr5hSvqRoPOu7Hx1Pak6rVPR3etzw="; + sha256 = "sha256-TkMwOE/Jug1zKjR1048o/Jmn8o9/oQPNqzwXYakwpgs="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { # Currently most tests have performance issues pytestFlagsArray = [ - "tests/constants_test.py" + "coconut/tests/constants_test.py" ]; pythonImportsCheck = [ "coconut" ]; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index a553aeab65c0d..6b9b1a14befec 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a"; + sha256 = "17beb467d3cb39fffec3227c468f0dd8db8a09129faeb95a6bb4c84b2b6c6683"; }; patches = [ diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 85ac03ba3eb48..eefb4d85f90da 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - sha256 = "sha256-af1oYeNEQdz6HivAhvQY0xm3J4s+uXpcdema37oG15U="; + hash = "sha256-gT8Zrjzzunm5nt0GHYY0z2ZxtKBSc6FXndlrStbwo64="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index bc481493ef2a4..6b737e8834795 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -2,6 +2,7 @@ , aiofiles , buildPythonPackage , cached-property +, colorama , fetchFromGitHub , git , pdm-pep517 @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.23.0"; + version = "0.24.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = version; - hash = "sha256-eoWOkAwAd3ab9+uUfAdrYhkheibfGYkuoNQX/3nS57w="; + hash = "sha256-Gcht9pmh15dvSHRsG9y82l4HoJ7l/gxbmrRh7Jow2Bs="; }; postPatch = '' @@ -34,7 +35,9 @@ buildPythonPackage rec { pdm-pep517 ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = [ + colorama + ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 7a7855d291b4f..03a43a92eecfd 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = "refs/tags/${version}"; - hash = "sha256-79/siHqwY3TNFIxodR24TJwsrKapG1GP4u4fIKxdFI4="; + hash = "sha256-HZsgha7CAjJYDDBlh2Ib24glUiMAXpNR8KsSdm78BA8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 24b3514943031..7cb1daa10cf2e 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.1.1"; + version = "2.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw="; + hash = "sha256-Z60apquRzhkPbxgGKgDswtW9GUXGt9MbdAsh3Yh31b0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix index 791963f4107f8..46510d61a89fa 100644 --- a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix +++ b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mitmproxy-wireguard"; - version = "0.1.17"; + version = "0.1.18"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "decathorpe"; repo = "mitmproxy_wireguard"; rev = "refs/tags/${version}"; - hash = "sha256-G//3h9QHModKNcGqG2FcV65bver809J4Xnig/Fr5zdg="; + hash = "sha256-vDexI9ihZhisbtt7k9epYD3RjPUaUnEX1TuDQDHZO8A="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-KPk6lLofsWDG+rswG5+q4bs9CZJFn4RuepX/OQvZ1Pw="; + hash = "sha256-iVrF+9D4HHRx1E10GbGftcmil3Epw6iuRdf2m2o+/u8="; }; # Module has no tests, only a test client diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 58ead57744960..d944a987aa421 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-cZk6Eu6Jp3tSPAb0HplR/I0pX2YIFhOaAsI3YRS0LVw="; + hash = "sha256-KAVBK0ZR1R27cWH99DVOYNFWKa4ubBXzgM0hVpGRIpE="; }; nativeBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'license = "ISC"' 'license = {text = "ISC"}' \ --replace 'dynamic = ["version"]' 'version = "${version}"' ''; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index d86e740b28855..97ada3b699284 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.2"; + version = "6.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-194CaN7Ei3/ja55BWsUst4EN/B7/JUmJxtCmnN9Z/bI="; + hash = "sha256-YSzwcrWhqyKjdydwodf57S+HIGaKE124umJPtJKiM5g="; }; patches = [ diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index 594964e664918..ec0c2308d8156 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , pythonOlder , zstd +, stdenv }: buildPythonPackage rec { @@ -52,5 +53,6 @@ buildPythonPackage rec { homepage = "https://pymemcache.readthedocs.io/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.is32bit; }; } diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 37e3490a54c7c..c2df3f72cef06 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -19,22 +19,22 @@ buildPythonPackage rec { pname = "pysvn"; - version = "1.9.12"; + version = "1.9.18"; format = "other"; src = fetchurl { url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; - sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q="; + hash = "sha256-lUPsNumMYwZoiR1Gt/hqdLLoHOZybRxwvu9+eU1CY78="; }; + patches = [ + ./replace-python-first.patch + ]; + buildInputs = [ bash subversion apr aprutil expat neon openssl ] ++ lib.optionals stdenv.isLinux [ e2fsprogs ] ++ lib.optionals stdenv.isDarwin [ gcc ]; - postPatch = '' - sed -i "117s|append(|insert(0, |" Tests/benchmark_diff.py - ''; - preConfigure = '' cd Source ${python.interpreter} setup.py backport @@ -47,11 +47,10 @@ buildPythonPackage rec { --apr-lib-dir=${apr.out}/lib \ --svn-lib-dir=${subversion.out}/lib \ --svn-bin-dir=${subversion.out}/bin - '' + (lib.optionalString (stdenv.isDarwin && !isPy3k) '' - sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile - ''); + ''; + + checkInputs = [ glibcLocales ]; - checkInputs = [ glibcLocales ]; checkPhase = '' runHook preCheck @@ -60,11 +59,12 @@ buildPythonPackage rec { sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh make -C ../Tests - ${python.interpreter} -c "import pysvn" - runHook postCheck ''; + # FIXME https://github.com/NixOS/nixpkgs/issues/175227 + # pythonImportsCheck = [ "pysvn" ]; + installPhase = '' dest=$(toPythonPath $out)/pysvn mkdir -p $dest @@ -77,8 +77,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Subversion"; - homepage = "http://pysvn.tigris.org/"; + homepage = "https://pysvn.sourceforge.io/"; license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; # g++: command not found broken = stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/pysvn/replace-python-first.patch b/pkgs/development/python-modules/pysvn/replace-python-first.patch new file mode 100644 index 0000000000000..9ec4ce826e3ec --- /dev/null +++ b/pkgs/development/python-modules/pysvn/replace-python-first.patch @@ -0,0 +1,13 @@ +Index: Extension/Tests/benchmark_diff.py +=================================================================== +--- Extension/Tests/benchmark_diff.py (revision 2093) ++++ Extension/Tests/benchmark_diff.py (working copy) +@@ -115,7 +115,7 @@ + + if self.python: + python_re = LiteralCaseBlindSearch( self.python ) +- self.replacement_list.append( ++ self.replacement_list.insert(0, + (python_re, '<PYTHON>') ) + + if self.svn_bin: diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 30bdd8b31ff48..1f9f5e9f04f0f 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-U7lD2iVy2gS5Ktop4PVKg+cUbIg4MJt+m6tH5aOb1Y4="; + hash = "sha256-rJtZqq7tZ/VFk4fMpDZYyTQRa1Pokmn2aw6LA+FBGXw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 38746820578be..24c9411540400 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "4.1.0"; + version = "4.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AlGKjw1tKb6KRFt/KsY3U/8p6PKi+qAXd1aNVQDXd6Y="; + sha256 = "sha256-f4rrbj+Q+WgywwG/8hp+te776JTIjFBkg9NVVl2IzBo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 9618873410e54..340c471c27273 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5QWjlidDtf0OWQ9sdS08bCX5XV41igWmPr20gwbumQU="; + hash = "sha256-B1tqL8bc+mWEjQrS4lQM55/ahOeUyuE8VBtk6QMj6Mk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 631f03d9c25bf..7c9fbb0f146e5 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -1,47 +1,57 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, testers +, datree +}: buildGoModule rec { pname = "datree"; - version = "1.6.42"; + version = "1.7.3"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-4sj+zyFYtG/C6oDuQno/rkyxgdnnvAn9GZ5qvqA+UhA="; + hash = "sha256-FeGV/GXzt/AHprvKyt/gPAxxJ7d46GXrh0QRLb7qp0E="; }; - vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw="; + vendorHash = "sha256-m3O5AoAHSM6rSnmL5N7V37XU38FADb0Edt/EZvvb2u4="; + + nativeBuildInputs = [ installShellFiles ]; ldflags = [ - "-extldflags '-static'" "-s" "-w" "-X github.com/datreeio/datree/cmd.CliVersion=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/datree version | grep ${version} > /dev/null - ''; + tags = [ "main" ]; postInstall = '' - for shell in bash fish zsh; do - $out/bin/datree completion $shell > datree.$shell - installShellCompletion datree.$shell - done + installShellCompletion \ + --cmd datree \ + --bash <($out/bin/datree completion bash) \ + --fish <($out/bin/datree completion fish) \ + --zsh <($out/bin/datree completion zsh) ''; - doCheck = true; + passthru.tests.version = testers.testVersion { + package = datree; + command = "datree version"; + }; meta = with lib; { - description = - "CLI tool to ensure K8s manifests and Helm charts follow best practices as well as your organization’s policies"; + description = "CLI tool to ensure K8s manifests and Helm charts follow best practices"; + longDescription = '' + Datree provides an E2E policy enforcement solution to run automatic checks + for rule violations. Datree can be used on the command line, admission + webhook, or even as a kubectl plugin to run policies against Kubernetes + objects. + ''; homepage = "https://datree.io/"; - license = [ licenses.asl20 ]; - maintainers = [ maintainers.jceb ]; - mainProgram = "datree"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi jceb ]; }; } diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index c6fbc71126402..57c405a7f7b53 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.35"; + version = "0.36.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TYtjwEQTXjkp1o95cXJw0VDVv5us07K+6NrJF9bsJfg="; + sha256 = "sha256-0emAo/K27lmQ+409maTR/hnonQVkbijF0RAwvIErBFo="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 672dddfc5ca22..6c09b5392e21b 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, python3, check, libxcrypt }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }: stdenv.mkDerivation rec { pname = "libsigrokdecode"; @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; - nativeBuildInputs = [ pkg-config ]; + # upstream was rleased before Python 3.9 and thus only checks versions up to 3.8 + postPatch = '' + substituteInPlace configure.ac --replace '[python-3.8-embed]' '[python3-embed]' + ''; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib python3 libxcrypt ]; checkInputs = [ check ]; doCheck = true; diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/development/tools/nc4nix/default.nix index b7d638e0af41c..ae91e40d58604 100644 --- a/pkgs/development/tools/nc4nix/default.nix +++ b/pkgs/development/tools/nc4nix/default.nix @@ -1,22 +1,34 @@ { lib , buildGoModule , fetchFromGitLab +, nix +, makeWrapper }: buildGoModule rec { pname = "nc4nix"; - version = "unstable-2022-11-12"; + version = "unstable-2022-11-13"; src = fetchFromGitLab { domain = "git.project-insanity.org"; owner = "onny"; repo = "nc4nix"; - rev = "d7f55a42b5ca0d02382349c6ec776eefe6079703"; - sha256 = "sha256-MfMW2B+udXV/lQPGUBFuAE7jwmy4D1M+CYkCuJ088aM="; + rev = "857e789287692e42f3fcaae039d6f323b383543b"; + sha256 = "sha256-ekuvqTyoaYiNju4yiQLPmxaXaGD4T3Wv9A8CHY1MZOI="; }; vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + # Depends on nix-prefetch-url + wrapProgram $out/bin/nc4nix \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + ''; + meta = with lib; { description = "Packaging helper for Nextcloud apps"; homepage = "https://git.project-insanity.org/onny/nc4nix"; diff --git a/pkgs/development/tools/nil/default.nix b/pkgs/development/tools/nil/default.nix index c943d4715e57d..60232a41e9085 100644 --- a/pkgs/development/tools/nil/default.nix +++ b/pkgs/development/tools/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2022-11-07"; + version = "2022-11-15"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-ioY9RvKx9DKnNTeMW8mAIEq23w7Y+lAOFWMkgUQ5fu4="; + hash = "sha256-KzQmGCEaOACOqaE1LsVZsqn18XpjlUbGWztDEI+o++w="; }; - cargoHash = "sha256-sL/bnLK3TifmVHy3LOsduETHh9SGz639vgEKkbHE0HQ="; + cargoHash = "sha256-t5HfL7DKMcWJGod6x30NoHYYlAza++fEdEVvfvFWems="; CFG_DATE = version; CFG_REV = "release"; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 28cef688d0df1..bdcf05d97001b 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-d71MZwQ1n64ZaWNs/DzXpRe6NgSBnvickZwHYrUJNhA="; + sha256 = "sha256-CKDGyVIWBOYM82r7oDbs8bEH31Hu0Uovt+72z90r8ng="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index fa9ff95b0fd2d..18530f3c66901 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -1,26 +1,24 @@ -{ lib, buildDunePackage, fetchFromGitHub +{ lib, buildDunePackage, fetchurl , ocamlbuild }: buildDunePackage rec { pname = "js_of_ocaml-ocamlbuild"; - version = "4.0.0"; + version = "5.0"; minimalOCamlVersion = "4.02"; - src = fetchFromGitHub { - owner = "ocsigen"; - repo = pname; - rev = "852302c8f35b946e2ec275c529a79e46d8749be6"; - sha256 = "sha256:03ayvakvbh4wi4dwcgd7r9y8ka8cv3d59hb81yk2dxyd94bln145"; + src = fetchurl { + url = "https://github.com/ocsigen/js_of_ocaml-ocamlbuild/releases/download/${version}/js_of_ocaml-ocamlbuild-${version}.tbz"; + sha256 = "sha256-qlm8vxzie8sqPrd6iiwf8X6d2+DyQOOhmMoc67ChwHs="; }; propagatedBuildInputs = [ ocamlbuild ]; meta = { description = "An ocamlbuild plugin to compile to JavaScript"; + homepage = "https://github.com/ocsigen/js_of_ocaml-ocamlbuild"; license = lib.licenses.lgpl2Only; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; }; } diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 2ab10d7a5b63b..93f499bc6734c 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.115"; + version = "0.0.119"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eb5k6gW70Z4bVrJhrDtI6G1Hk5C98gdqZP6rkgiI6uQ="; + sha256 = "sha256-aFyaDp7lghg1AlPB2WD4oJ85Qcj9Wwj07PMF0lbCkI8="; }; - cargoSha256 = "sha256-s2ufpiCqQG5JoLsEscIusY/4B7SieABIK164Up0H74I="; + cargoSha256 = "sha256-LkNNKuhmRPZHQWTjfUoJSjgTVXLW6Tgg/yfhfjrEwSg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 816ee72f28be9..fc469acb27c5e 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.430"; + version = "0.0.431"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-XlUg0FNQw8IuZ5biMILy53FJ9s84+M/VdACSbBwGKG0="; + sha256 = "sha256-X3zKD5AyLYNhVtNpvGShbXjX+bNN7xYjVSfs1TqhgeQ="; }; vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc="; |