Merge master into staging-next

maintainers/maintainer-list.nix

@@ -3991,6 +3991,12 @@
     githubId = 32152;
     name = "Luka Blaskovic";
   };
+  ldelelis = {
+    email = "ldelelis@est.frba.utn.edu.ar";
+    github = "ldelelis";
+    githubId = 20250323;
+    name = "Lucio Delelis";
+  };
   ldesgoui = {
     email = "ldesgoui@gmail.com";
     github = "ldesgoui";
@@ -6945,6 +6951,12 @@
     githubId = 870673;
     name = "Takuo Yonezawa";
   };
+  talkara = {
+    email = "taito.horiuchi@relexsolutions.com";
+    github = "talkara";
+    githubId = 51232929;
+    name = "Taito Horiuchi";
+  };
   talyz = {
     email = "kim.lindberger@gmail.com";
     github = "talyz";

pkgs/applications/audio/pulseeffects/default.nix

@@ -46,13 +46,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "pulseeffects";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "1cpiill24c54sy97xm1r0sqqpxj6ar40pnnwb72qs8b9zzci920r";
+    sha256 = "1r1hk5zp2cgrwyqkvp8kg2dkbihdyx3ydzhmirkwya8jag9pwadd";
   };
 
   nativeBuildInputs = [

pkgs/applications/graphics/rapid-photo-downloader/default.nix

@@ -6,11 +6,11 @@
 
 mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "rapid-photo-downloader";
-  version = "0.9.17";
+  version = "0.9.18";
 
   src = fetchurl {
     url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz";
-    sha256 = "10vqbi9rcg8r0jxpx2kn8xmahwgdcal28wpix2fg6nkp5rfwxnr6";
+    sha256 = "15p7sssg6vmqbm5xnc4j5dr89d7gl7y5qyq44a240yl5aqkjnybw";
   };
 
   # Disable version check and fix install tests

pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix

@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.7.4";
+  version = "6.8.3";
   pname = "frostwire";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
-    sha256 = "0pd9akfq8cx9qkfkzravvrb8pjaxa4b0vgjdwqc1zvkng4wl8848";
+    sha256 = "1fnrr96jmak2rf54cc0chbm7ls5rfav78vhw98sa7zy544l2sn88";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/applications/radio/tqsl/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tqsl";
-  version = "2.4.7";
+  version = "2.5.1";
 
   src = fetchurl {
     url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
-    sha256 = "1i33bk3annz4rnjc58knprfajq1pbyjqyrhygqybvl7bsp70c5ri";
+    sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/applications/science/logic/iprover/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iprover";
-  version = "2018_Jul_24_11h";
+  version = "3.1";
 
   src = fetchurl {
-    url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover_${version}.tar.gz";
+    url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz";
-    sha256 = "1iqim11flzm56aaysasl5whajcv1gq31hkidaqfr8ww7kwl1h06p";
+    sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8";
   };
 
   buildInputs = [ ocaml eprover zlib ];

pkgs/applications/video/smtube/default.nix

@@ -1,12 +1,12 @@
 { lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }:
 
 mkDerivation rec {
-  version = "19.6.0";
+  version = "20.1.0";
   pname = "smtube";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";
+    sha256 = "00x7gyk06d01hrr1lcqbrffbkkpj2j0j1fy9mkxc7slbzqcl27dz";
   };
 
   makeFlags = [

pkgs/data/themes/plata/default.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "plata-theme";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitLab {
     owner = "tista500";
     repo = "plata-theme";
     rev = version;
-    sha256 = "0rva56xdvsj6vwwvrn55137mw83c9p4xy00i3mq0ryh43imyj4mg";
+    sha256 = "1z8kiac3gb4hsyq92p5dd8fyjv7bad55q65kbnjiskpm4ircg4ja";
   };
 
   preferLocalBuild = true;

pkgs/development/compilers/go/remove-fhs-test-references.patch

@@ -1,13 +0,0 @@
-diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go
-index d694990..87fa259 100644
---- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go
-+++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go
-@@ -452,7 +452,7 @@ func TestGetwd(t *testing.T) {
- 	defer fd.Close()
- 	// These are chosen carefully not to be symlinks on a Mac
- 	// (unlike, say, /var, /etc)
--	dirs := []string{"/", "/usr/bin"}
-+	dirs := []string{"/"}
- 	switch runtime.GOOS {
- 	case "android":
- 		dirs = []string{"/", "/system/bin"}

pkgs/development/compilers/go/remove-tools-1.9.patch

@@ -1,35 +0,0 @@
-diff --git a/src/go/build/build.go b/src/go/build/build.go
-index d8163d0172..dd80a70473 100644
---- a/src/go/build/build.go
-+++ b/src/go/build/build.go
-@@ -1592,7 +1592,7 @@ func init() {
- }
- 
- // ToolDir is the directory containing build tools.
--var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
-+var ToolDir = runtime.GOTOOLDIR()
- 
- // IsLocalImport reports whether the import path is
- // a local import path, like ".", "..", "./foo", or "../foo".
-diff --git a/src/runtime/extern.go b/src/runtime/extern.go
-index 6e6c674d96..e9f62f96dc 100644
---- a/src/runtime/extern.go
-+++ b/src/runtime/extern.go
-@@ -223,6 +223,17 @@ func GOROOT() string {
- 	return sys.DefaultGoroot
- }
- 
-+// GOTOOLDIR returns the root of the Go tree.
-+// It uses the GOTOOLDIR environment variable, if set,
-+// or else the root used during the Go build.
-+func GOTOOLDIR() string {
-+	s := gogetenv("GOTOOLDIR")
-+	if s != "" {
-+		return s
-+	}
-+	return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
-+}
-+
- // Version returns the Go tree's version string.
- // It is either the commit hash and date at the time of the build or,
- // when possible, a release tag like "go1.3".

pkgs/development/compilers/go/ssl-cert-file-1.9.patch

@@ -1,80 +0,0 @@
-diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
-index 8e80533590..31c0c666ec 100644
---- a/src/crypto/x509/root_cgo_darwin.go
-+++ b/src/crypto/x509/root_cgo_darwin.go
-@@ -201,11 +201,20 @@ int FetchPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots) {
- import "C"
- import (
- 	"errors"
-+	"io/ioutil"
-+	"os"
- 	"unsafe"
- )
- 
- func loadSystemRoots() (*CertPool, error) {
- 	roots := NewCertPool()
-+	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+		data, err := ioutil.ReadFile(file)
-+		if err == nil {
-+			roots.AppendCertsFromPEM(data)
-+			return roots, nil
-+		}
-+	}
- 
- 	var data C.CFDataRef = nil
- 	var untrustedData C.CFDataRef = nil
-diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
-index bc35a1cf21..21e52bec51 100644
---- a/src/crypto/x509/root_darwin.go
-+++ b/src/crypto/x509/root_darwin.go
-@@ -81,18 +81,26 @@ func execSecurityRoots() (*CertPool, error) {
- 		)
- 	}
- 
--	cmd := exec.Command("/usr/bin/security", args...)
--	data, err := cmd.Output()
--	if err != nil {
--		return nil, err
--	}
--
- 	var (
- 		mu          sync.Mutex
- 		roots       = NewCertPool()
- 		numVerified int // number of execs of 'security verify-cert', for debug stats
- 	)
- 
-+	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+		data, err := ioutil.ReadFile(file)
-+		if err == nil {
-+			roots.AppendCertsFromPEM(data)
-+			return roots, nil
-+		}
-+	}
-+
-+	cmd := exec.Command("/usr/bin/security", args...)
-+	data, err := cmd.Output()
-+	if err != nil {
-+		return nil, err
-+	}
-+
- 	blockCh := make(chan *pem.Block)
- 	var wg sync.WaitGroup
- 
-diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
-index 65b5a5fdbc..c9c7ac6a74 100644
---- a/src/crypto/x509/root_unix.go
-+++ b/src/crypto/x509/root_unix.go
-@@ -37,6 +37,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
- 
- func loadSystemRoots() (*CertPool, error) {
- 	roots := NewCertPool()
-+	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+		data, err := ioutil.ReadFile(file)
-+		if err == nil {
-+			roots.AppendCertsFromPEM(data)
-+			return roots, nil
-+		}
-+	}
- 
- 	files := certFiles
- 	if f := os.Getenv(certFileEnv); f != "" {

pkgs/development/compilers/mono/generic.nix

@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [glib];
 
-  # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
+  NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
-  dontDisableStatic = true;
 
   configureFlags = [
     "--x-includes=${libX11.dev}/include"

pkgs/development/compilers/osl/default.nix

@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
   # In theory this could use GCC + Clang rather than just Clang,
   # but https://github.com/NixOS/nixpkgs/issues/29877 stops this
   name = "openshadinglanguage-${version}";
-  version = "1.10.8";
+  version = "1.10.9";
 
   src = fetchFromGitHub {
     owner = "imageworks";
     repo = "OpenShadingLanguage";
-    rev = "Release-1.10.8";
+    rev = "Release-1.10.9";
-    sha256 = "1vfdbs1yprr22nx64ff89jcqabfw0md8drifpbzqn2v6ipc8gz6a";
+    sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll";
   };
 
   cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];

pkgs/development/libraries/amtk/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gtk3
 , pkgconfig, gnome3, dbus, xvfb_run }:
 let
-  version = "5.0.1";
+  version = "5.0.2";
   pname = "amtk";
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d";
+    sha256 = "11jgz2i9wjzv4alrxl1qyxiapb52w7vs5ygfgsw0qgdap8gqkk3i";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/aws-checksums/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-checksums";
-  version = "0.1.3";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1s6zwf97rkkvnf3p7vlaykwa4pxpvj78pmxvvjf5jk29f93b49xp";
+    sha256 = "018fnpn0jc686jxp5wf8qxmjphk3z43l8n1mgcgaa9zw94i24jgk";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/bwidget/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bwidget";
-  version = "1.9.13";
+  version = "1.9.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz";
-    sha256 = "109s81hzd86vwzs18v4s03asn3l395wl64kd311045p7h0ig9n3n";
+    sha256 = "0knlnpmwam74v0qa1h9gg4f32vzzz7ays2wbslflf51ilg7nw6jk";
   };
 
   dontBuild = true;

pkgs/development/libraries/galario/default.nix

@@ -0,0 +1,78 @@
+{ stdenv
+, fetchzip
+, fetchFromGitHub
+, cmake
+, fftw
+, fftwFloat
+, enablePython ? false
+, pythonPackages
+, llvmPackages
+}:
+let
+  # CMake recipes are needed to build galario
+  # Build process would usually download them
+  great-cmake-cookoff = fetchzip {
+    url = "https://github.com/UCL/GreatCMakeCookOff/archive/v2.1.9.tar.gz";
+    sha256 = "1yd53b5gx38g6f44jmjk4lc4igs3p25z6616hfb7aq79ly01q0w2";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "galario";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "mtazzari";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1akz7md7ly16a89zr880c265habakqdg9sj8iil90klqa0i21w6g";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ fftw fftwFloat ]
+    ++ stdenv.lib.optional enablePython pythonPackages.python
+    ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp
+  ;
+
+  propagatedBuildInputs = stdenv.lib.optional enablePython [
+    pythonPackages.numpy
+    pythonPackages.cython
+    pythonPackages.pytest
+  ];
+
+  checkInputs = stdenv.lib.optional enablePython pythonPackages.scipy;
+
+  preConfigure = ''
+    mkdir -p build/external/src
+    cp -r ${great-cmake-cookoff} build/external/src/GreatCMakeCookOff
+    chmod -R 777 build/external/src/GreatCMakeCookOff
+  '';
+
+  preCheck = ''
+    ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"}
+    ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""}
+  '';
+
+  doCheck = true;
+
+  postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enablePython) ''
+    install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so
+    install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GPU Accelerated Library for Analysing Radio Interferometer Observations";
+    longDescription = ''
+      Galario is a library that exploits the computing power of modern
+      graphic cards (GPUs) to accelerate the comparison of model
+      predictions to radio interferometer observations. Namely, it
+      speeds up the computation of the synthetic visibilities given a
+      model image (or an axisymmetric brightness profile) and their
+      comparison to the observations.
+    '';
+    homepage = "https://mtazzari.github.io/galario/";
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.smaret ];
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/librealsense/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "librealsense";
-  version = "2.29.0";
+  version = "2.31.0";
 
   outputs = [ "out" "dev" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "IntelRealSense";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wrg1c4fcd5ky96hmnczg9izfgd0yxls8ghxxzrdvgdlg269f443";
+    sha256 = "0lw4dqywahi7wfd1dz5nkil55sh7wscsrwkapkvvgyi418pqvmpn";
   };
 
   buildInputs = [

pkgs/development/libraries/pkcs11helper/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pkcs11-helper";
-  version = "1.25.1";
+  version = "1.26";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "pkcs11-helper";
     rev = "${pname}-${version}";
-    sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns";
+    sha256 = "15n3vy1v5gian0gh5y7vq5a6n3fngfwb41sbvrlwbjw0yh23sb1b";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

pkgs/development/libraries/vtk/default.nix

@@ -1,5 +1,6 @@
 { stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
 , qtLib ? null
+, enablePython ? false, python ? null
 # Darwin support
 , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
 , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
@@ -27,10 +28,12 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ]
     ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
                                    CFNetwork Security ApplicationServices CoreText
-                                   IOSurface ImageIO OpenGL GLUT ];
+                                   IOSurface ImageIO OpenGL GLUT ]
+    ++ optional enablePython [
+      python
+    ];
   propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
 
-
   preBuild = ''
     export LD_LIBRARY_PATH="$(pwd)/lib";
   '';
@@ -42,7 +45,8 @@ stdenv.mkDerivation rec {
   # objects.
   cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ]
     ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
-    ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
+    ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
+    ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt

pkgs/development/libraries/wcslib/default.nix

@@ -1,14 +1,14 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "6.4";
+  version = "7.1";
   pname = "wcslib";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
-    sha256 ="003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k";
+    sha256 ="05ji2v4la8h6azprb8x2zh6wrswxsq8cqw9zml0layc4nfg79fzh";
   };
 
   prePatch = ''

pkgs/development/libraries/wxSVG/default.nix

@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
 
   pname = "wxSVG";
   srcName = "wxsvg-${version}";
-  version = "1.5.21";
+  version = "1.5.22";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
-    sha256 = "0v368qgqad49saklwcbq76f1xkg126g0ll1jw9x2bdds02kvg1fw";
+    sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d";
   };
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/development/python-modules/apprise/default.nix

@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1j925g7x0j8fzns431360myr8844swb8mb78wacw2vlj6x1c558c";
+    sha256 = "15kwnvs2ka6sg1gq65bbf9lk0jp104br813y6wvrbwipiz8kkjn1";
   };
 
   nativeBuildInputs = [ Babel ];

pkgs/development/python-modules/apptools/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, traits, traitsui, configobj
+, nose, tables, pandas
+}:
+
+buildPythonPackage rec {
+  pname = "apptools";
+  version = "4.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dw6vvq7lqkj7mgn3s7r5hs937kl4mj5g7jf2qgvhdld9lsc5xbk";
+  };
+
+  propagatedBuildInputs = [ traits traitsui configobj ];
+
+  checkInputs = [
+    nose
+    tables
+    pandas
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Set of packages that Enthought has found useful in creating a number of applications.";
+    homepage = https://github.com/enthought/apptools;
+    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    license = licenses.bsdOriginal;
+  };
+}

pkgs/development/python-modules/awkward/default.nix

@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "0.12.19";
+  version = "0.12.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s729a8205jzg7pfw8xgmi850x03p9nw8c6a602f5bnmhha96h45";
+    sha256 = "13494pnzz68qfnx17975h4c5l15idgg7wxl9r86q7jp5s1pphvb3";
   };
 
   nativeBuildInputs = [ pytestrunner ];

pkgs/development/python-modules/breathe/default.nix

@@ -1,13 +1,13 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
 
 buildPythonPackage rec {
-  version = "4.14.0";
+  version = "4.14.1";
   pname = "breathe";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "178848e4088faf8c2c60f000379fcabfb3411b260e0fbddc08fb57e0e5caea08";
+    sha256 = "1ia9iq3kk0g8cqcsf03di3cnq295gfixriqfpp9wd38zf2wgq0l1";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

pkgs/development/python-modules/django-anymail/default.nix

@@ -0,0 +1,47 @@
+{
+    stdenv,
+    buildPythonPackage,
+    fetchFromGitHub,
+    six,
+    requests,
+    django,
+    boto3,
+    python,
+    mock,
+}:
+
+buildPythonPackage rec {
+  pname = "django-anymail";
+  version = "6.1.0";
+
+  src = fetchFromGitHub {
+    owner = "anymail";
+    repo = pname;
+    rev = "v6.1";
+    sha256 = "04jgz3qnsnba18rlqgxyb2g9128pk3ivflnj6695kibxg724fcpv";
+  };
+
+  propagatedBuildInputs = [
+    six
+    requests
+    django
+    boto3
+  ];
+
+  checkInputs = [ mock ];
+  checkPhase = ''
+    substituteInPlace setup.py --replace "tests_require=[" "tests_require=[], #"
+    export CONTINUOUS_INTEGRATION=1
+    export ANYMAIL_SKIP_TESTS="sparkpost"
+    ${python.interpreter} setup.py test
+  '';
+
+  # this package allows multiple email backends
+  # sparkpost is missing because it's not packaged yet
+  meta = with stdenv.lib; {
+    description = "Django email backends and webhooks for Mailgun";
+    homepage = https://github.com/anymail/django-anymail;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ivegotasthma ];
+  };
+}

pkgs/development/python-modules/envisage/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, traits, apptools
+, ipykernel
+}:
+
+buildPythonPackage rec {
+  pname = "envisage";
+  version = "4.7.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0jb5nw0w9x97jij0hd3d7kfzcj58r1cqmplmdy56bj11dyc4wyc9";
+  };
+
+  propagatedBuildInputs = [ traits apptools ];
+
+  preCheck = ''
+    export HOME=$PWD/HOME
+  '';
+
+  checkInputs = [
+    ipykernel
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'";
+    homepage = https://github.com/enthought/envisage;
+    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    license = licenses.bsdOriginal;
+  };
+}

pkgs/development/python-modules/furl/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict }:
+
+buildPythonPackage rec {
+  pname = "furl";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx";
+  };
+
+  checkInputs = [ flake8 ];
+
+  propagatedBuildInputs = [ six orderedmultidict ];
+
+  meta = with stdenv.lib; {
+    description = "URL manipulation made simple.";
+    homepage = https://github.com/gruns/furl;
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ vanzef ];
+  };
+}

pkgs/development/python-modules/geopandas/default.nix

@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "geopandas";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
     rev = "v${version}";
-    sha256 = "1wy2n204vf5bbswgma205lr1is7nnxr385m4x3v7pra05bq8ag3q";
+    sha256 = "11mzb5spwa06h1zhn7z905wcwya2x5srghv82jp5zjka9zdhsycd";
   };
 
   checkInputs = [ pytest Rtree ];

pkgs/development/python-modules/iapws/default.nix

@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, scipy }:
+
+buildPythonPackage rec {
+  pname = "iapws";
+  version = "1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3d7a7a17343157dacd3f654b7f82d1974492209756c4de99332d4f6b375227e6";
+  };
+
+  propagatedBuildInputs = [ scipy ];
+
+  meta = with lib; {
+    description = "Python implementation of standard from IAPWS";
+    homepage = "https://github.com/jjgomera/iapws";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ dawidsowa ];
+  };
+}

pkgs/development/python-modules/jupyterlab/default.nix

@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "1.2.5";
+  version = "1.2.6";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "086zl3pdsq2jwcxv7ppp3lpwh25mgnn0y0s6scmkrz158yj55kp3";
+    sha256 = "0mc3nrj7fc5q2ajr09m261j386jsp8qjljg8anghlh8czc9ln4s2";
   };
 
   propagatedBuildInputs = [ jupyterlab_server notebook ];

pkgs/development/python-modules/mayavi/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, wxPython, pygments, numpy, vtk, traitsui, envisage, apptools
+, nose, mock
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "mayavi";
+  version = "4.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "tar.bz2";
+    sha256 = "02rg4j1vkny2piqn3f728kg34m54kgx396g6h5y7ykz2lk3f3h44";
+  };
+
+  # Discovery of 'vtk' in setuptools is not working properly, due to a missing
+  # .egg-info in the vtk package. It does however import and run just fine.
+  postPatch = ''
+    substituteInPlace mayavi/__init__.py --replace "'vtk'" ""
+  '';
+
+  propagatedBuildInputs = [ wxPython pygments numpy vtk traitsui envisage apptools ];
+
+  checkInputs = [ nose mock ];
+
+  disabled = isPy3k; # TODO: This would need pyqt5 instead of wxPython
+
+  doCheck = false; # Needs X server
+
+  meta = with stdenv.lib; {
+    description = "3D visualization of scientific data in Python";
+    homepage = https://github.com/enthought/mayavi;
+    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    license = licenses.bsdOriginal;
+  };
+}

pkgs/development/python-modules/orderedmultidict/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, flake8, six }:
+
+buildPythonPackage rec {
+  pname = "orderedmultidict";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4";
+  };
+
+  checkInputs = [ flake8 ];
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    description = "Ordered Multivalue Dictionary.";
+    homepage = https://github.com/gruns/orderedmultidict;
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ vanzef ];
+  };
+}

pkgs/development/python-modules/pyface/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, setuptools, six, traits, wxPython
+}:
+
+buildPythonPackage rec {
+  pname = "pyface";
+  version = "6.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q5rihmhcdyyp44p31f5l4a0mc9m3293rvcnma5p8w0v8j7dbrm7";
+  };
+
+  propagatedBuildInputs = [ setuptools six traits wxPython ];
+
+  doCheck = false; # Needs X server
+
+  meta = with stdenv.lib; {
+    description = "Traits-capable windowing framework";
+    homepage = https://github.com/enthought/pyface;
+    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    license = licenses.bsdOriginal;
+  };
+}

pkgs/development/python-modules/pyfcm/default.nix

@@ -0,0 +1,29 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pyfcm";
+  version = "1.4.7";
+
+  src = fetchFromGitHub {
+    owner = "olucurious";
+    repo = "pyfcm";
+    rev = "${version}";
+    sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # pyfcm's unit testing suite requires network access
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python client for FCM - Firebase Cloud Messaging (Android, iOS and Web)";
+    homepage = "https://github.com/olucurious/pyfcm";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ldelelis ];
+  };
+}

pkgs/development/python-modules/pythonnet/default.nix

@@ -5,6 +5,7 @@
 , python
 , pytest
 , pycparser
+, psutil
 , pkgconfig
 , dotnetbuildhelpers
 , clang
@@ -20,10 +21,10 @@ let
     outputFiles = [ "*" ];
   };
 
-  NUnit360 = fetchNuGet {
+  NUnit371 = fetchNuGet {
     baseName = "NUnit";
-    version = "3.6.0";
+    version = "3.7.1";
-    sha256 = "0wz4sb0hxlajdr09r22kcy9ya79lka71w0k1jv5q2qj3d6g2frz1";
+    sha256 = "1yc6dwaam4w2ss1193v735nnl79id78yswmpvmjr1w4bgcbdza4l";
     outputFiles = [ "*" ];
   };
 
@@ -31,11 +32,11 @@ in
 
 buildPythonPackage rec {
   pname = "pythonnet";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hxnkrfj8ark9sbamcxzd63p98vgljfvdwh79qj3ac8pqrgghq80";
+    sha256 = "1ach9jic7a9rd3vmc4bphkr9fq01a0qk81f8a7gr9npwzmkqx8x3";
   };
 
   postPatch = ''
@@ -55,20 +56,26 @@ buildPythonPackage rec {
     dotnetbuildhelpers
     clang
 
-    NUnit360
+    mono
+
+    NUnit371
     UnmanagedExports127
   ];
 
   buildInputs = [
     mono
+    psutil # needed for memory leak tests
   ];
 
   preBuild = ''
     rm -rf packages
     mkdir packages
 
-    ln -s ${NUnit360}/lib/dotnet/NUnit/ packages/NUnit.3.6.0
+    ln -s ${NUnit371}/lib/dotnet/NUnit/ packages/NUnit.3.7.1
     ln -s ${UnmanagedExports127}/lib/dotnet/NUnit/ packages/UnmanagedExports.1.2.7
+
+    # Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542
+    export TERM=xterm
   '';
 
   checkPhase = ''

pkgs/development/python-modules/robotframework-databaselibrary/default.nix

@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, robotframework
+}:
+
+buildPythonPackage rec {
+  version = "1.2.4";
+  pname = "robotframework-databaselibrary";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "627d872b3dda6a308a650ac9e676dadedf9c294e4ef70ad207cbb86b78eb8847";
+  };
+
+  # unit tests are impure
+  doCheck = false;
+
+  propagatedBuildInputs = [ robotframework ];
+
+  meta = with stdenv.lib; {
+    description = "Database Library contains utilities meant for Robot Framework";
+    homepage = https://github.com/franz-see/Robotframework-Database-Library;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ talkara ];
+  };
+
+}

pkgs/development/python-modules/sfepy/default.nix

@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, numpy
+, scipy
+, matplotlib
+, pyparsing
+, tables
+, cython
+, python
+, sympy
+}:
+
+buildPythonPackage rec {
+  name = "sfepy_${version}";
+  version = "2019.2";
+
+  src = fetchurl {
+    url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz";
+    sha256 = "17dj0wbchcfa6x27yx4d4jix4z4nk6r2640xkqcsw0mf62x5l1pj";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    cython
+    scipy
+    matplotlib
+    pyparsing
+    tables
+    sympy
+  ];
+
+  postPatch = ''
+    # broken test
+    rm tests/test_homogenization_perfusion.py
+
+    # slow tests
+    rm tests/test_input_*.py
+    rm tests/test_elasticity_small_strain.py
+    rm tests/test_term_call_modes.py
+    rm tests/test_refine_hanging.py
+    rm tests/test_hyperelastic_tlul.py
+    rm tests/test_poly_spaces.py
+    rm tests/test_linear_solvers.py
+    rm tests/test_quadratures.py
+  '';
+
+  checkPhase = ''
+    export HOME=$TMPDIR
+    mv sfepy sfepy.hidden
+    mkdir -p $HOME/.matplotlib
+    echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
+    ${python.interpreter} run_tests.py -o $TMPDIR/test_outputs --raise
+  '';
+
+  meta = with lib; {
+    homepage = https://sfepy.org/;
+    description = "Simple Finite Elements in Python";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ wd15 ];
+  };
+}

pkgs/development/python-modules/traitsui/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, traits, pyface, wxPython
+}:
+
+buildPythonPackage rec {
+  pname = "traitsui";
+  version = "6.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "080fq9hag7hvcnsd5c5fn74zjmjl6rjq40r0zwdz2bjlk9049xpi";
+  };
+
+  propagatedBuildInputs = [ traits pyface wxPython ];
+
+  doCheck = false; # Needs X server
+
+  meta = with stdenv.lib; {
+    description = "Traits-capable windowing framework";
+    homepage = https://github.com/enthought/traitsui;
+    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    license = licenses.bsdOriginal;
+  };
+}

pkgs/development/python-modules/z3c-checkversions/default.nix

@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, zc_buildout
+, zope_testrunner
+}:
+
+buildPythonPackage rec {
+  pname = "z3c-checkversions";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "z3c.checkversions";
+    sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d";
+  };
+
+  propagatedBuildInputs = [ zc_buildout ];
+  checkInputs = [ zope_testrunner ];
+  checkPhase = ''
+    ${python.interpreter} -m zope.testrunner --test-path=src []
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/zopefoundation/z3c.checkversions;
+    description = "Find newer package versions on PyPI";
+    license = licenses.zpl21;
+  };
+}

pkgs/development/tools/asn2quickder/default.nix

@@ -3,10 +3,10 @@
 
 buildPythonApplication rec {
   pname = "asn2quickder";
-  version = "1.2-6";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
-    sha256 = "00wifjydgmqw2i5vmr049visc3shjqccgzqynkmmhkjhs86ghzr6";
+    sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr";
     rev = "version-${version}";
     owner = "vanrein";
     repo = "quick-der";

pkgs/development/tools/sslmate/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages, makeWrapper, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "sslmate-1.7.0";
+  name = "sslmate-1.7.1";
 
   src = fetchurl {
     url = "https://packages.sslmate.com/other/${name}.tar.gz";
-    sha256 = "0vhppvy5vphipbycfilzxdly7nw12brscz4biawf3bl376yp7ljm";
+    sha256 = "1i56za41cfqlml9g787xqqs0r8jifd3y7ks9nf4k2dhhi4rijkj5";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

pkgs/games/wesnoth/default.nix

@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.9";
+  version = "1.14.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "1mhdrlflxxyknf54lwdbvs7fazlc1scf7z6vxxa3j746fks533ga";
+    sha256 = "0xnfbz7nin56ms929i5f8rv4mpifbvr64r4ryfhrqmba0vkk9sz7";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

pkgs/servers/metabase/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "metabase";
-  version = "0.34.1";
+  version = "0.34.2";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "0fcggpv9ikx481ci7jw6phhmk3mqxbsn9pfs1kqmhwy1ka4ck6dg";
+    sha256 = "02hpm8h98dsxyjs736bss3pk253aayf9dr7csj6qn3y68hs67jpk";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/servers/sickbeard/sickgear.nix

@@ -4,13 +4,13 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
 in stdenv.mkDerivation rec {
   pname = "sickgear";
-  version = "0.20.0";
+  version = "0.21.5";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    sha256 = "1zg95szvfbmwinx1z5nlbmyck7ximvyna0x71yflmadkgf88nv0k";
+    sha256 = "1wzfdf6300vabflsdbkizjg322in1rgksp7dk8gii38czja9y893";
   };
 
   dontBuild = true;

pkgs/servers/sql/postgresql/ext/pg_partman.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_partman";
-  version = "4.2.2";
+  version = "4.3.0";
 
   buildInputs = [ postgresql ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "pgpartman";
     repo   = pname;
     rev    = "refs/tags/v${version}";
-    sha256 = "04d34b5z957imm3dndzjn474rxbgx95ha7a9x3vd0rya1pjv927r";
+    sha256 = "1zkjz4hkjqzg0j7i7bjxgdcv2kfcgqwahirh06yag6hvm4qf9y9w";
   };
 
   installPhase = ''

pkgs/tools/audio/abcmidi/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "abcMIDI";
-  version = "2019.11.11";
+  version = "2019.12.09";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-    sha256 = "0xid13jqhbknrs31j74iwgjm0h0c64w3kqk9g9am1pkjwxh8d460";
+    sha256 = "1pc7wm4np43ax13k4sfwr12dzyinw9p2ghacdw0rwdljg0k000a2";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

pkgs/tools/cd-dvd/unetbootin/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "unetbootin";
-  version = "675";
+  version = "677";
 
   src = fetchFromGitHub {
     owner  = "unetbootin";
     repo   = "unetbootin";
     rev    = version;
-    sha256 = "0b7z2amsf6i7b56a5sfs5di1vh30h6ybcqg23d5gx5zgn3w38w4a";
+    sha256 = "1mk6179r2lz2d0pvln1anvf5p4l7vfrnnnlhgyx2dlx6pfacsspy";
   };
 
   setSourceRoot = ''

pkgs/tools/compression/xdelta/default.nix

@@ -10,10 +10,10 @@ let
     else "--without-${name}";
 in stdenv.mkDerivation rec {
   pname = "xdelta";
-  version = "3.0.11";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
-    sha256 = "1c7xym7xr26phyf4wb9hh2w88ybzbzh2w3h1kyqq3da0ndidmf2r";
+    sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
     rev = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";

pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-m17n";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus-m17n";
     rev = version;
-    sha256 = "1xl7swqn46nhi43rka0zx666mpk667ykag3sz07x0zqrwi41frps";
+    sha256 = "16davz397svhjb234kx7mnq2m3wdxi2fh1ryniphbczjpbwn23g6";
   };
 
   nativeBuildInputs = [

pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix

@@ -13,13 +13,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.7.4";
+  version = "2.7.5";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    sha256 = "0wp9y6cgxsb2z1hk899q7wybl7v49vkgx6x5zl4l706jm3w9qmg8";
+    sha256 = "072mi8r10v78sfs81zxdwfabf87fp872c99c5iral1ywwa4iynpl";
   };
 
   patches = [ ./hunspell-dirs.patch ];

pkgs/tools/misc/broot/default.nix

@@ -1,21 +1,23 @@
-{ stdenv, rustPlatform, fetchFromGitHub, coreutils, installShellFiles }:
+{ stdenv, rustPlatform, fetchFromGitHub, coreutils, libiconv, Security, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "0.12.2";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1y2da4xcdsvvss4plbp77pqhi8fqjlnsgpcwq8fkc0vx049ijhcm";
+    sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak";
   };
 
-  cargoSha256 = "1h9jpyxvk76h06jgy3bwbr3ymhqypsyq05m99clkkrlwp8dnsgqq";
+  cargoSha256 = "0vzpyymylzxjm613lf5xr6hd21ijkl3vwq4y6h1q3as41phw2sqb";
   verifyCargoDeps = true;
 
   nativeBuildInputs = [ installShellFiles ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+
   postPatch = ''
     substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/'
   '';

pkgs/tools/networking/haproxy/default.nix

@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "2.0.10";
+  version = "2.1.2";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
-    sha256 = "1sm42q9l159pdmjs5dg544z10dn6x073caljkqh0p4syshysnf0x";
+    sha256 = "0xqb64nyl7hqnzpqb2jhv1ash47fcf4sspl3lalybb85i65b0yb0";
   };
 
   buildInputs = [ openssl zlib ]

pkgs/tools/networking/telepresence/default.nix

@@ -17,13 +17,13 @@ let
   });
 in pythonPackages.buildPythonPackage rec {
   pname = "telepresence";
-  version = "0.101";
+  version = "0.104";
 
   src = fetchFromGitHub {
     owner = "datawire";
     repo = "telepresence";
     rev = version;
-    sha256 = "1rxq22vcrw29682g7pdcwcjyifcg61z8y4my1di7yw731aldk274";
+    sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/tools/package-management/xbps/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xbps";
-  version = "0.57.1";
+  version = "0.58";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
     rev = version;
-    sha256 = "0adxhhvn5r6hwwqp42iwwfrslmps30ycndi6v39934v38rf0wx9s";
+    sha256 = "03zjbqz6fcp9h45ms93hsf96yd79r6hmbk6vixl5m34bf1z2qdn5";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

pkgs/tools/system/syslog-ng/default.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "syslog-ng";
-  version = "3.24.1";
+  version = "3.25.1";
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "0ggsb5867mca83f5mqsi0j7hslvmj8943xynd5myjas5gcss1l6l";
+    sha256 = "05v8vgs4fbzslqjca9zjk7hkiyb6yj4i2v0fi51xan6ypirrdjrl";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

pkgs/tools/text/highlight/default.nix

@@ -5,13 +5,13 @@ with stdenv.lib;
 let
   self = stdenv.mkDerivation rec {
     pname = "highlight";
-    version = "3.54";
+    version = "3.55";
 
     src = fetchFromGitLab {
       owner = "saalen";
       repo = "highlight";
       rev = "v${version}";
-      sha256 = "1144qv3c02hd3qrnms9cxfprdmkvz06vy4zjq500wg4iz7r8654m";
+      sha256 = "1cn8m2qk5vl5zcrmg0wlvj9wvpm0gdb5idh9bhh5b6pbl0hm93cr";
     };
 
     enableParallelBuilding = true;

pkgs/top-level/all-packages.nix

@@ -1270,7 +1270,9 @@ in
 
   brook = callPackage ../tools/networking/brook { };
 
-  broot = callPackage ../tools/misc/broot { };
+  broot = callPackage ../tools/misc/broot {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
 
@@ -24521,6 +24523,8 @@ in
 
   fityk = callPackage ../applications/science/misc/fityk { };
 
+  galario = callPackage ../development/libraries/galario { };
+
   gildas = callPackage ../applications/science/astronomy/gildas { };
 
   gplates = callPackage ../applications/science/misc/gplates {

pkgs/top-level/python-packages.nix

@@ -690,6 +690,8 @@ in {
 
   fsspec = callPackage ../development/python-modules/fsspec { };
 
+  furl = callPackage ../development/python-modules/furl { };
+
   fuse = callPackage ../development/python-modules/fuse-python {
     inherit (pkgs) fuse pkgconfig;
   };
@@ -921,6 +923,8 @@ in {
 
   ordered-set = callPackage ../development/python-modules/ordered-set { };
 
+  orderedmultidict = callPackage ../development/python-modules/orderedmultidict { };
+
   ortools = (toPythonModule (pkgs.or-tools.override {
     inherit (self) python;
     pythonProtobuf = self.protobuf;
@@ -1078,6 +1082,8 @@ in {
 
   pyfaidx = callPackage ../development/python-modules/pyfaidx { };
 
+  pyfcm = callPackage ../development/python-modules/pyfcm { };
+
   pyfttt = callPackage ../development/python-modules/pyfttt { };
 
   pyftdi = callPackage ../development/python-modules/pyftdi { };
@@ -1614,6 +1620,8 @@ in {
 
   approvaltests = callPackage ../development/python-modules/approvaltests { };
 
+  apptools = callPackage ../development/python-modules/apptools {};
+
   apsw = callPackage ../development/python-modules/apsw {};
 
   astor = callPackage ../development/python-modules/astor {};
@@ -1992,6 +2000,8 @@ in {
 
   zc_buildout221 = callPackage ../development/python-modules/buildout { };
 
+  z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
+
   bunch = callPackage ../development/python-modules/bunch { };
 
   can = callPackage ../development/python-modules/can {};
@@ -2567,6 +2577,8 @@ in {
 
   entrypoints = callPackage ../development/python-modules/entrypoints { };
 
+  envisage = callPackage ../development/python-modules/envisage { };
+
   enzyme = callPackage ../development/python-modules/enzyme {};
 
   escapism = callPackage ../development/python-modules/escapism { };
@@ -3228,6 +3240,8 @@ in {
 
   django-allauth = callPackage ../development/python-modules/django-allauth { };
 
+  django-anymail = callPackage ../development/python-modules/django-anymail {};
+
   django_appconf = callPackage ../development/python-modules/django_appconf { };
 
   django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { };
@@ -3595,6 +3609,11 @@ in {
 
   futures = callPackage ../development/python-modules/futures { };
 
+  galario = toPythonModule (pkgs.galario.override {
+    enablePython = true;
+    pythonPackages = self;
+  });
+
   gcovr = callPackage ../development/python-modules/gcovr { };
 
   gdal = toPythonModule (pkgs.gdal.override {
@@ -3822,6 +3841,8 @@ in {
 
   httpretty = callPackage ../development/python-modules/httpretty { };
 
+  iapws = callPackage ../development/python-modules/iapws { };
+
   icalendar = callPackage ../development/python-modules/icalendar { };
 
   ics = callPackage ../development/python-modules/ics { };
@@ -4139,6 +4160,8 @@ in {
 
   maya = callPackage ../development/python-modules/maya { };
 
+  mayavi = callPackage ../development/python-modules/mayavi { };
+
   mccabe = callPackage ../development/python-modules/mccabe { };
 
   mechanize = callPackage ../development/python-modules/mechanize { };
@@ -4621,6 +4644,8 @@ in {
 
   fipy = callPackage ../development/python-modules/fipy { };
 
+  sfepy = callPackage ../development/python-modules/sfepy { };
+
   pelican = callPackage ../development/python-modules/pelican {
     inherit (pkgs) glibcLocales git;
   };
@@ -4861,6 +4886,8 @@ in {
 
   pyext = callPackage ../development/python-modules/pyext { };
 
+  pyface = callPackage ../development/python-modules/pyface { };
+
   pyfantom = callPackage ../development/python-modules/pyfantom { };
 
   pyfma = callPackage ../development/python-modules/pyfma { };
@@ -5278,6 +5305,8 @@ in {
 
   robotframework = callPackage ../development/python-modules/robotframework { };
 
+  robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { };
+
   robotframework-requests = callPackage ../development/python-modules/robotframework-requests { };
 
   robotframework-ride = callPackage ../development/python-modules/robotframework-ride { };
@@ -6154,6 +6183,8 @@ in {
 
   tracing = callPackage ../development/python-modules/tracing { };
 
+  traitsui = callPackage ../development/python-modules/traitsui { };
+
   translationstring = callPackage ../development/python-modules/translationstring { };
 
   ttystatus = callPackage ../development/python-modules/ttystatus { };
@@ -6663,6 +6694,11 @@ in {
 
   visitor = callPackage ../development/python-modules/visitor { };
 
+  vtk = toPythonModule (pkgs.vtk.override {
+    inherit (self) python;
+    enablePython = true;
+  });
+
   whitenoise = callPackage ../development/python-modules/whitenoise { };
 
   XlsxWriter = callPackage ../development/python-modules/XlsxWriter { };