diff options
author | maralorn <mail@maralorn.de> | 2023-01-05 00:18:05 +0100 |
---|---|---|
committer | maralorn <mail@maralorn.de> | 2023-01-05 00:18:05 +0100 |
commit | 3b1869aa951895eb3402fc0bc884490c034f99fc (patch) | |
tree | e12588d5fb10dcce0badfdb25d1682209c8f04cb /pkgs/development | |
parent | 4045943b6411536f9c0484b7cb3772200895e97d (diff) | |
parent | 05968fc7e41177096305caa0b9360574367ce9fa (diff) |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'pkgs/development')
42 files changed, 391 insertions, 176 deletions
diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 7ac0a68be05b9..425ea5766f9c0 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -1,14 +1,13 @@ -{ gtk4 -, python3 -, stdenv -, fetchFromGitLab +{ fetchFromGitLab , gobject-introspection +, gtk4 , lib , meson , ninja +, python3 +, stdenv , testers }: - stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; version = "0.6.0"; @@ -21,31 +20,27 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0="; }; - doCheck = true; - nativeBuildInputs = [ meson ninja ]; buildInputs = [ - python3 - gtk4 - ] ++ (with python3.pkgs; [ - pygobject3 - wrapPython - ]); + (python3.withPackages (ps: with ps; [ + pygobject3 + ])) + ]; propagatedBuildInputs = [ + # For setup hook, so that the compiler can find typelib files gobject-introspection ]; - postFixup = '' - makeWrapperArgs="\ - --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ - --prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3})\"" - wrapPythonPrograms - ''; + doCheck = true; + + checkInputs = [ + gtk4 + ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 78c7a12027ce5..3c9362fee1ad2 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -16,6 +16,7 @@ , gmp, mpfr, libmpc, gettext, which, patchelf , isl ? null # optional, for the Graphite optimization framework. , zlib ? null +, libucontext ? null , gnatboot ? null , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins @@ -70,6 +71,44 @@ let majorVersion = "12"; }) ++ optional langD ../libphobos.patch + # backport fixes to build gccgo with musl libc + ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/cf79b1117bd177d3d4c6ed24b6fa243c3628ac2d.diff"; + hash = "sha256-mS5ZiYi5D8CpGXrWg3tXlbhp4o86ew1imCTwaHLfl+I="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/7f195a2270910a6ed08bd76e3a16b0a6503f9faf.diff"; + hash = "sha256-Ze/cFM0dQofKH00PWPDoklXUlwWhwA1nyTuiDAZ6FKo="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/762fd5e5547e464e25b4bee435db6df4eda0de90.diff"; + hash = "sha256-o28upwTcHAnHG2Iq0OewzwSBEhHs+XpBGdIfZdT81pk="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/e73d9fcafbd07bc3714fbaf8a82db71d50015c92.diff"; + hash = "sha256-1SjYCVHLEUihdON2TOC3Z2ufM+jf2vH0LvYtZL+c1Fo="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/b6c6a3d64f2e4e9347733290aca3c75898c44b2e.diff"; + hash = "sha256-RycJ3YCHd3MXtYFjxP0zY2Wuw7/C4bWoBAQtTKJZPOQ="; + }) + (fetchpatch { + excludes = [ "gcc/go/gofrontend/MERGE" ]; + url = "https://github.com/gcc-mirror/gcc/commit/2b1a604a9b28fbf4f382060bebd04adb83acc2f9.diff"; + hash = "sha256-WiBQG0Xbk75rHk+AMDvsbrm+dc7lDH0EONJXSdEeMGE="; + }) + (fetchpatch { + url = "https://github.com/gcc-mirror/gcc/commit/c86b726c048eddc1be320c0bf64a897658bee13d.diff"; + hash = "sha256-QSIlqDB6JRQhbj/c3ejlmbfWz9l9FurdSWxpwDebnlI="; + }) + ] + # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; @@ -178,6 +217,7 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) + ++ (optional (langGo && stdenv.hostPlatform.isMusl) libucontext) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 15626fe28cd7c..4052281b0f0df 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -199,11 +199,10 @@ let "--enable-shared" ] ++ [ "--with-threads" - "--enable-unicode=ucs${toString ucsEncoding}" - ] ++ optionals (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) [ "--with-system-ffi" - ] ++ optionals stdenv.hostPlatform.isCygwin [ "--with-system-expat" + "--enable-unicode=ucs${toString ucsEncoding}" + ] ++ optionals stdenv.hostPlatform.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" ] ++ optionals stdenv.isDarwin [ "--disable-toolbox-glue" @@ -238,10 +237,7 @@ let strictDeps = true; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl zlib ] - ++ optional (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) libffi - ++ optional stdenv.hostPlatform.isCygwin expat - ++ [ db gdbm ncurses sqlite readline ] + [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk libX11 ] ++ optional (stdenv.isDarwin && configd != null) configd; nativeBuildInputs = diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index cb0c8025ddfab..e82c3c8dfe77a 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "3.7.19"; + version = "3.7.20"; pname = "afflib"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "1qs843yi33yqbp0scqirn753lxzg762rz6xy2h3f8f77fijqj2qb"; + sha256 = "sha256-xkqBfTftzn+rgeuoaKfHP7vQmy4VZuaCq8VFlfZTUE4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index ba3366198c2c8..cb302f3381ca0 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: +{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat, libiconv }: stdenv.mkDerivation rec { pname = "cegui"; @@ -10,12 +10,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ogre freetype boost expat ]; + buildInputs = [ ogre freetype boost expat ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; meta = with lib; { homepage = "http://cegui.org.uk/"; description = "C++ Library for creating GUIs"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index f987e7c6497f5..bc10d06b846cc 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -11,27 +11,13 @@ stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-RWgU258Hwe7N736ED8uyCXbvgU34dUKL+4Hs9FhR8XA="; + hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys="; }; - patches = [ - ./BDJ-JARFILE-path.patch - (fetchpatch { - name = "Initial-support-for-Java-18.patch"; - url = "https://code.videolan.org/videolan/libbluray/-/commit/3187c3080096e107f0a27eed1843232b58342577.patch"; - hash = "sha256-2TSciAoPzELkgmFGB38h1RgynOCJueyCL8hIADxAPHo="; - }) - (fetchpatch { - name = "bd-j-BDJSecurityManager-Change-setSecurityManager-de.patch"; - url = "https://code.videolan.org/videolan/libbluray/-/commit/9a2d23d049760ef9cc9661ff90011a84d90368f1.patch"; - hash = "sha256-xCc2h5ocXCqnpVMPQaybT2Ncs2YOzifQ0mlCCUhYlc8="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook ] ++ lib.optionals withJava [ ant ]; diff --git a/pkgs/development/libraries/libucontext/default.nix b/pkgs/development/libraries/libucontext/default.nix new file mode 100644 index 0000000000000..1ce0e443b352a --- /dev/null +++ b/pkgs/development/libraries/libucontext/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libucontext"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "kaniini"; + repo = pname; + rev = "v${version}"; + hash = "sha256-fk3ZKkp3dsyeF6SOWSccr5MkKEwS4AAuosD/h+6wjSw="; + }; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/kaniini/libucontext"; + description = "ucontext implementation featuring glibc-compatible ABI"; + license = licenses.isc; + platforms = platforms.linux; + maintainers = [ maintainers.yuka ]; + }; +} diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix new file mode 100644 index 0000000000000..5fa03b7083e2b --- /dev/null +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "mpdecimal"; + version = "2.5.1"; + outputs = [ "out" "doc" ]; + + src = fetchurl { + url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; + hash = "sha256-n5zUwEH5m1xJ/7e1nZ8S2VtoPYhYVgiqVqYwdmeysh8="; + }; + + configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + + meta = { + description = "Library for arbitrary precision decimal floating point arithmetic"; + + longDescription = '' + libmpdec is a fast C/C++ library for correctly-rounded arbitrary + precision decimal floating point arithmetic. It is a complete + implementation of Mike Cowlishaw/IBM's General Decimal Arithmetic + Specification. The full specification is available here: + + http://speleotrove.com/decimal/ + + libmpdec will - with minor restrictions - also conform to the IEEE + 754-2008 Standard for Floating-Point Arithmetic, provided that the + appropriate context parameters are set. + + libmpdec++ is a complete implementation of the General Decimal Arithmetic + Specification. libmpdec++ is mostly a header library around libmpdec's C + functions. + ''; + + homepage = "https://www.bytereef.org/mpdecimal/index.html"; + + downloadPage = "https://www.bytereef.org/mpdecimal/download.html"; + + changelog = "https://www.bytereef.org/mpdecimal/changelog.html"; + + license = lib.licenses.bsd2; + + maintainers = with lib.maintainers; [ kaction ]; + + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index cd65630879ef9..73f15b744bf5c 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -1,50 +1,110 @@ -{ fetchurl, stdenv, lib -, cmake, libGLU, libGL -, freetype, freeimage, zziplib, xorgproto, libXrandr -, libXaw, freeglut, libXt, libpng, boost, ois -, libX11, libXmu, libSM, pkg-config -, libXxf86vm, libICE +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, pkg-config +, boost +, freeimage +, freetype +, libpng +, ois +, zziplib +, freeglut +, libGL +, libGLU +, libICE +, libSM +, libX11 +, libXaw +, libXmu +, libXrandr , libXrender -, withNvidiaCg ? false, nvidia_cg_toolkit -, withSamples ? false }: +, libXt +, libXxf86vm +, xorgproto +, darwin +, withNvidiaCg ? false +, nvidia_cg_toolkit +, withSamples ? false +}: +let + inherit (darwin.apple_sdk.frameworks) AGL Cocoa; +in stdenv.mkDerivation rec { pname = "ogre"; version = "1.10.11"; src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz"; - sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; + url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz"; + sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; }; - # fix for ARM. sys/sysctl.h has moved in later glibcs, and - # https://github.com/OGRECave/ogre-next/issues/132 suggests it isn't - # needed anyway. - postPatch = '' - substituteInPlace OgreMain/src/OgrePlatformInformation.cpp \ - --replace '#include <sys/sysctl.h>' "" - ''; + patches = [ + # aarch64-darwin support + (fetchpatch { + url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch"; + includes = [ "OgreMain/include/OgrePlatform*.h" ]; + sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y="; + }) + (fetchpatch { + url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch"; + sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ="; + }) + # aarch64-linux support + (fetchpatch { + name = "fix-build-on-aarch64-linux.patch"; + url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch"; + sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw="; + }) + ]; - cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] - ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") - ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = - [ libGLU libGL - freetype freeimage zziplib xorgproto libXrandr - libXaw freeglut libXt libpng boost ois - libX11 libXmu libSM - libXxf86vm libICE - libXrender - ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + buildInputs = [ + boost + freeimage + freetype + libpng + ois + zziplib + ] ++ lib.optionals stdenv.isLinux [ + freeglut + libGL + libGLU + libICE + libSM + libX11 + libXaw + libXmu + libXrandr + libXrender + libXt + libXxf86vm + xorgproto + ] ++ lib.optionals stdenv.isDarwin [ + AGL + Cocoa + ] ++ lib.optionals withNvidiaCg [ + nvidia_cg_toolkit + ]; + + cmakeFlags = [ + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + ]; meta = { - description = "A 3D engine"; + description = "3D Object-Oriented Graphics Rendering Engine"; homepage = "https://www.ogre3d.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin wegank ]; + platforms = lib.platforms.unix; license = lib.licenses.mit; }; } diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 6228b4760b64b..cbcbb619585ef 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "02w544q5dwyayl3mcrp0q4b140bpmk0xpcjjqq0i0sbhffzw1jn8"; + sha256 = "13kv6ydd2xka0lnnpcn5jv12pw9n6p7nljdlgkimwvsqsh1z5kfc"; }; dontUnpack = true; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://maestro.mobile.dev/"; license = licenses.asl20; platforms = lib.platforms.all; + changelog = "https://github.com/mobile-dev-inc/maestro/blob/main/CHANGELOG.md"; maintainers = with maintainers; [ SubhrajyotiSen ]; }; } diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 819298ac8cf18..0431c733cb909 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: +{ lib, fetchurl, ocaml, buildDunePackage, seq, stdlib-shims, ounit2 }: buildDunePackage rec { pname = "fileutils"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-v${version}.tbz"; - sha256 = "0qhlhc7fzcq0yfg1wyszsi0gyc4w9hyzmfv84aq9wc79i3283xgg"; + url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-${version}.tbz"; + hash = "sha256-enu2vGo2tuvawrTkap6bENNmxaLUQXpfHWih+7oKRF8="; }; - minimumOCamlVersion = "4.03"; - useDune2 = true; + minimalOCamlVersion = "4.03"; propagatedBuildInputs = [ + seq stdlib-shims ]; checkInputs = [ - ounit + ounit2 ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { description = "OCaml API to manipulate real files (POSIX like) and filenames"; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 13be1fcc1a67a..00b2df6256371 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.31"; + version = "9.2.32"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-jG7lZet15mp1ltbdcv1ZMHHa+ydFXQiNS+dl70tmluE="; + hash = "sha256-JHKF1uTzAzYrVx1iOtOjJYFbnvFeTzUjTmm24leHIMs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 82355e75be927..0646d10a13732 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.31"; + version = "9.2.32"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-i7kIHDg1iCtEeigS2+4MTS2fmUYYEbruL7q0s1skR9k="; + hash = "sha256-nyFEyOo4qtkyjAmkOV0JEOKAKWJKwjRrywKqP2yoJ54="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 691a4f1146cff..b567c10e8d926 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.10.0"; + version = "6.10.1"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9ezsWOvntr/El2vn1uQAQRqK8FsOGhnxXyX1nzQBNIw="; + hash = "sha256-JPFbYa9SvCKwXQCPnrdmLxz0KrdACNqfia9x/FQMz6Q="; }; postPatch = '' @@ -91,15 +92,15 @@ buildPythonPackage rec { "test_run_inside_role_dir" "test_run_multiple_role_path_no_trailing_slash" "test_runner_exclude_globs" - "test_discover_lintables_umlaut" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ]; meta = with lib; { - homepage = "https://github.com/ansible/ansible-lint"; description = "Best practices checker for Ansible"; + homepage = "https://github.com/ansible/ansible-lint"; + changelog = "https://github.com/ansible/ansible-lint/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sengaya ]; }; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 4bdc1c5585c9d..bc1b290a1f26d 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.31"; + version = "9.2.32"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-mrsEdVUp13XqVwrbLYbR8vAsu5wPHQcIOBBSmSPJQYY="; + hash = "sha256-LChk65iM238jB1jwgEis5Wfz8YGmb9UCOdmQcU+3bFA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 529975f1080bf..c5c7128f72236 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "ionrock"; repo = pname; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 3190cb6f7190d..9c7bb0898d863 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.31"; + version = "9.2.32"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-hIzB6E1z3ufbHFoe2IfBTuF4uuJibaFTqDjTf5ubHDU="; + hash = "sha256-Cf56Q2ZqBq3uoCGqG5pYxA6ANP8VLC6pAMZIL5ubq30="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 02d7d9e5390b8..3e876db6d66a6 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.31"; + version = "9.2.32"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-ZgM1GEsmp6LOoFf33l6cZY6cyCoitPDEpFbAVuAd0p8="; + hash = "sha256-KYWhwL3DAa/2Hb4I1NfYWA5gXrwEeMpDpAWCWGLqFeE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix index 019c1e1a21bce..da0e7e2c33588 100644 --- a/pkgs/development/python-modules/geniushub-client/default.nix +++ b/pkgs/development/python-modules/geniushub-client/default.nix @@ -1,30 +1,47 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "geniushub-client"; - version = "0.6.30"; + version = "0.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - sha256 = "390932b6e5051e221d104b2683d9deb6e352172c4ec4eeede0954bf2f9680211"; + src = fetchFromGitHub { + owner = "manzanotti"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-amsMZjCsPI8CUfSct4uumn8nVZDESlQFh19LXu3yb7o="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'VERSION = os.environ["GITHUB_REF_NAME"]' "" \ + --replace "version=VERSION," 'version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp ]; - # tests only implemented after 0.6.30 - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "geniushubclient" ]; + pythonImportsCheck = [ + "geniushubclient" + ]; meta = with lib; { - description = "Aiohttp-based client for Genius Hub systems"; - homepage = "https://github.com/zxdavb/geniushub-client"; + description = "Module to interact with Genius Hub systems"; + homepage = "https://github.com/manzanotti/geniushub-client"; + changelog = "https://github.com/manzanotti/geniushub-client/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix index 154700e89af24..71e640cce795e 100644 --- a/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -1,4 +1,5 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub , matplotlib @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "ghrepo-stats"; - version = "0.4.0"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,10 +18,17 @@ buildPythonPackage rec { owner = "mrbean-bremen"; repo = pname; rev = "v${version}"; - hash = "sha256-KFjqHrN0prcqu3wEPZpa7rLfuD0X/DN7BMo4zcHNmYo="; + hash = "sha256-rTW6wADpkP9GglNmQNVecHfA2yJZuzYhJfsLfucbcgY="; }; + postPatch = '' + # https://github.com/mrbean-bremen/ghrepo-stats/pull/1 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" + ''; + propagatedBuildInputs = [ + beautifulsoup4 matplotlib PyGithub ]; diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 7b707e25afdf8..e7507bcee171e 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.5.2"; + version = "0.4.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-gT4HxdmyX7oOQFBo1frkmmoXrNfGOcqL0hPZ40kRZeo="; + hash = "sha256-HPA3oeanFHx+g0nt/nsTzG3RTCdsjNSvDCXILR271P4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index b85000fe05c50..688065712c81a 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -47,8 +47,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04="; + rev = "refs/tags/${version}"; + sha256 = "sha256-CINKvRnBspciS+wefJB8gzBE13L8CjbYCkmLmTTeYlA="; }; propagatedBuildInputs = [ @@ -110,6 +110,10 @@ buildPythonPackage rec { "test_flowview" # ValueError: Exceeds the limit (4300) for integer string conversion "test_roundtrip_big_integer" + + "test_wireguard" + "test_commands_exist" + "test_statusbar" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index f448942ae01d7..0abcd60dcb843 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.4.0"; + version = "7.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-0AgmH0cxXPUBzC30HyX68WsSyYsDcPaVQHLOIsZbHzI="; + hash = "sha256-GucatimZTg0Fggrz4bG1x6YSa3wE/uLGB4ufil/km3w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple API to access Netatmo weather station data"; homepage = "https://github.com/jabesq/pyatmo"; + changelog = "https://github.com/jabesq/pyatmo/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ delroth ]; }; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 13519664b52bc..26292d3a8312d 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.15"; + version = "0.7.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alengwenus"; repo = pname; - rev = version; - hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g="; + rev = "refs/tags/${version}"; + hash = "sha256-OcXMVgG62JUH28BGvfO/rpnC++/klhBLJ2HafDu9R40="; }; checkInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "LCN-PCK library written in Python"; homepage = "https://github.com/alengwenus/pypck"; + changelog = "https://github.com/alengwenus/pypck/releases/tag/${version}"; license = with licenses; [ epl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 1f04a3a14b2d9..6ebb1485d2038 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.8.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-J5B5THfB/yPG1JSCpO2HTHTH0jn0nbKFzXpZMGJ/dKA="; + hash = "sha256-rMQjsGqdiXe8zS18hZQAro3UWyHPjNJYyQ/NAoxbE7k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index cbd68f387656d..08c23dfb5d3a5 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "sha256-VXWSoVRfgJWf9rOT4SE1mTJdeNmzR3TRc2pc6Pp1M5U="; + sha256 = "sha256-Y8HJ7MXYHJRUWPTcw8p+GGSFswuRI7u+/bIaJpKy7lY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 2f82837c5cf4d..12cfd4e71779a 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.31"; + version = "9.2.32"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Te0wFz+3/HVKlMXW5WJ6mRGh8wWiMXR6Ypi/4hvnz/8="; + hash = "sha256-5ZCFAEHcM+3yH9pFyrduG8Uo1Ofr4JkvcXjJEi5KRMc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index b4e02e77b2290..00873503e0f7c 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "qtawesome"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "spyder-ide"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KcYCXrTP8ED5j/VTLTw7a8zotDSqIu9ultmwp8Ip5nM="; + hash = "sha256-zXwIwYG76aCKPTE8mGiAOK8kQUCzJbqnjJszmIqByaA="; }; propagatedBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Iconic fonts in PyQt and PySide applications"; homepage = "https://github.com/spyder-ide/qtawesome"; + changelog = "https://github.com/spyder-ide/qtawesome/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; # fails on Darwin diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index 282e5b684f65f..ae3116de9ae53 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - hash = "sha256-HcHs9UhRbSKTxW5qEvmMrQ+kWIBAqVpyldapx635uNM="; + hash = "sha256-QOFBNTz8g3f6C8Vjkblrd3QFCRrA1WqOCv6xS4GbFC4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index a3354718c3aa4..6ea921c9f58af 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.2.5"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Re6ECMaDmg007XHw9Kpa46+oEs+01CzOZzszKzKS4WA="; + hash = "sha256-1x1TQNhKL3RgoeYSB8l607mHt0VrHwOU1CFemoaTCt8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix index 9e51ccd81d37e..5e25e3c16bec2 100644 --- a/pkgs/development/python-modules/socialscan/default.nix +++ b/pkgs/development/python-modules/socialscan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socialscan"; - version = "1.4.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iojw"; repo = pname; - rev = "v${version}"; - sha256 = "rT+/j6UqDOzuNBdN3I74YIxS6qkhd7BjHCGX+gGjprc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and CLI for accurately querying username and email usage on online platforms"; homepage = "https://github.com/iojw/socialscan"; + changelog = "https://github.com/iojw/socialscan/releases/tag/v${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 045780219d427..abb5e6c1fc0fd 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -4,29 +4,39 @@ , fetchPypi , yt-dlp , docopt -, isPy27 +, pythonOlder +, urllib3 }: buildPythonPackage rec { pname = "tubeup"; - version = "0.0.34"; + version = "0.0.35"; format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "ae1e606b243fd70742f8b5871c497628d258ee9f416caa46544aca9a5fbfbca0"; + sha256 = "006aea68bb8d967a7427c58ee7862e3f2481dae667c2bbcfb1a1f2fd80e665d1"; }; postPatch = '' substituteInPlace setup.py \ + --replace "internetarchive==3.0.2" "internetarchive" \ + --replace "urllib3==1.26.13" "urllib3" \ --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt yt-dlp ]; + propagatedBuildInputs = [ + internetarchive + docopt + urllib3 + yt-dlp + ]; - pythonImportsCheck = [ "tubeup" ]; + pythonImportsCheck = [ + "tubeup" + ]; # Tests failing upstream doCheck = false; @@ -34,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Youtube (and other video site) to Internet Archive Uploader"; homepage = "https://github.com/bibanon/tubeup"; + changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}"; license = licenses.gpl3Only; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index c4cc67e24c0b1..c0e0edb124c7f 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.89"; + version = "0.0.90"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-5qSznGO3Cke+lGPLHjzh/db5O0/Ypmd6D5MTHuiox6Q="; + hash = "sha256-SfzwS7M821uGfbOLR37iiw+gEebKDgu1H7f0fs3J9kw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 0763f2e9359c9..e53acd4e9e606 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre }: let fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; @@ -15,13 +15,24 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse pcre ]; + buildInputs = [ fuse pcre sqlite ]; patches = [ ./fusermount-setuid.patch ]; configurePhase = '' substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}' - substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre' + + for f in Tupfile Tuprules.tup src/tup/server/Tupfile build.sh; do + substituteInPlace "$f" \ + --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \ + --replace "pcre-config" "${stdenv.cc.targetPrefix}pkg-config libpcre" + done + + cat << EOF > tup.config + CONFIG_CC=${stdenv.cc.targetPrefix}cc + CONFIG_AR=${stdenv.cc.targetPrefix}ar + CONFIG_TUP_USE_SYSTEM_SQLITE=y + EOF ''; # Regular tup builds require fusermount to have suid, which nix cannot diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/development/tools/database/apgdiff/default.nix index 016259f0bbb4c..d96e3dbd99d04 100644 --- a/pkgs/development/tools/database/apgdiff/default.nix +++ b/pkgs/development/tools/database/apgdiff/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://apgdiff.com"; license = licenses.mit; inherit (jre.meta) platforms; - sourceProvenance = sourceTypes.binaryBytecode; + sourceProvenance = [ sourceTypes.binaryBytecode ]; maintainers = [ maintainers.misterio77 ]; }; }) diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index ccc895b895694..1c87084f7d868 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.6.0"; + version = "0.6.7"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-tP1ccUtHfj+JPUYGo+QFYjbz56uNl3p53QNeE/xaCt4="; + hash = "sha256-sZy5SQ3Gd6bZcEx/30XJXoUI2/HRGTUn8ZZHtti5Cos="; }; - cargoHash = "sha256-umOlvHDA8AtoAeB1i8nNgbjvzTmzwZfdjF+TCTKzqAU="; + cargoHash = "sha256-74bGGZakz3yAaamqt3UU4r0QGbUcN6vIXebsgTj6cBM="; postPatch = '' rm .cargo/config.toml ''; - cargoBuildFlags = [ "--package" "lang-srv" ]; + cargoBuildFlags = [ "--package" "millet-ls" ]; - cargoTestFlags = [ "--package" "lang-srv" ]; + cargoTestFlags = [ "--package" "millet-ls" ]; meta = with lib; { description = "A language server for Standard ML"; @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; - mainProgram = "lang-srv"; + mainProgram = "millet-ls"; }; } diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 02d5a4e549da2..30c0800f2c5f4 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "universal-ctags"; - version = "5.9.20221106.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "p${finalAttrs.version}"; - hash = "sha256-6piWdofvlX+ysXmRPnQc7PlZuHSyVqdVxOztY2+Pcss="; + rev = "v${finalAttrs.version}"; + hash = "sha256-XlqBndo8g011SDGp3zM7S+AQ0aCp6rpQlqJF6e5Dd6w="; }; depsBuildBuild = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.all; mainProgram = "ctags"; priority = 1; # over the emacs implementation }; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ef5a143f94c65..8c38ec2833ca2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.207"; + version = "0.0.209"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DAjBie0wiweT/FE4kHLrYoymy+NJvaXkYSky1iJwwv4="; + sha256 = "sha256-DYMGGA/GGE4Vue8G61gmDFspODVI81vTK9iOuIB8dDA="; }; - cargoSha256 = "sha256-px6T0DsQPWD6qWZpvEoEUwAiFPxVaBmevGguYpPTQoo="; + cargoSha256 = "sha256-Uvl/3VutaquorMMd8KQlqBc5DOdh23oLZSjGExTqUWE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 13bfdccac61f4..676a09bae86c5 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.47"; + version = "0.9.48"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-G7Y2x9aRcQB28uR2TlyG8JW9kYSD9iMPASd0VFXOxcE="; + sha256 = "sha256-y1Ka9XEXuwavAI23C4UmjTHraHHnbsA3QzDIkkSqfoU="; }; - cargoSha256 = "sha256-7fesLvkHPpPS4xKn3r6hLjQzP0udm92BsVPhdckTk7c="; + cargoSha256 = "sha256-1LsAbBdRz5Xf+LF/eOc34d+SQ0Ein8JW5/4v7ZZEFqA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 9c863e09efdd9..3f9549401441c 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -7,8 +8,12 @@ , cairo , gtk3 , webkitgtk +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) CoreServices Security; +in rustPlatform.buildRustPackage rec { pname = "tauri"; version = "1.2.3"; @@ -26,7 +31,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g="; - buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ]; + buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index d150332ae63e1..e13549009792d 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.18.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x5NHMTyOZSGOnAUCRu1qZggU5m832TFrBTSNJU6DUKo="; + sha256 = "sha256-mJp4lb4pzjdjodHk2zLAEePn+oIPI/vTtU0YOIbmWDY="; }; - vendorSha256 = "sha256-IRuwX+VF0ltASTt/QKlZ3A00tgDhc9qpBfzhINp3HgQ="; + vendorSha256 = "sha256-8kk+KCanbnsizGRjF3qcxCBxC7Sx0zfptQFTETZp89E="; proxyVendor = true; diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix index a4aabab9d93f0..d5f188f80b684 100644 --- a/pkgs/development/tools/zsv/default.nix +++ b/pkgs/development/tools/zsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsv"; - version = "0.3.3-alpha"; + version = "0.3.4-alpha"; src = fetchFromGitHub { owner = "liquidaty"; repo = "zsv"; rev = "v${version}"; - sha256 = "sha256-gKtnyBCgiXNKiAjOYk2rxExfcNGHEAmjealcCTWRj+M="; + sha256 = "sha256-3drVqKRs5bjkvQiHyEANI5geeF5g7ba2+RxmAhxbu84="; }; nativeBuildInputs = [ perl ]; |