diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-10 23:24:57 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-10 23:24:57 +0100 |
commit | 88c998fb2107539e8d0995e6ec766014f72a0cea (patch) | |
tree | 85ba76727829fb34eccfd645a0812f19ad929159 /pkgs/development | |
parent | 5114061fa1ea2963a1daaa6640d61983ebde5337 (diff) | |
parent | dd7235715565d6dde51b3cf5861d17484084b426 (diff) | |
download | nixlib-88c998fb2107539e8d0995e6ec766014f72a0cea.tar nixlib-88c998fb2107539e8d0995e6ec766014f72a0cea.tar.gz nixlib-88c998fb2107539e8d0995e6ec766014f72a0cea.tar.bz2 nixlib-88c998fb2107539e8d0995e6ec766014f72a0cea.tar.lz nixlib-88c998fb2107539e8d0995e6ec766014f72a0cea.tar.xz nixlib-88c998fb2107539e8d0995e6ec766014f72a0cea.tar.zst nixlib-88c998fb2107539e8d0995e6ec766014f72a0cea.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development')
23 files changed, 182 insertions, 62 deletions
diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 34b37926ea6f..a37d5c3d2cf6 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -247,7 +247,6 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { - branch = "1.14"; homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index b0803b6c7a7d..47bf9cebd4c7 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -250,7 +250,6 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { - branch = "1.15"; homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 75667a6cb2b5..6bc32b07c3d2 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - branch = "1.4"; homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix index 9af08dde19e8..35d3365768a3 100644 --- a/pkgs/development/compilers/go/2-dev.nix +++ b/pkgs/development/compilers/go/2-dev.nix @@ -252,7 +252,6 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { - branch = "dev.go2go"; homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 130387a97b0e..c0f10ab5d8f0 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -27,9 +27,6 @@ # We want parallel builds by default , enableParallelBuilding ? true -# Disabled flag -, disabled ? false - # Do not enable this without good reason # IE: programs coupled with the compiler , allowGoReference ? false @@ -243,9 +240,7 @@ let [ lib.maintainers.kalbasit ]; }; }); -in if disabled then - throw "${package.name} not supported for go ${go.meta.branch}" -else if (goPackagePath != null) then +in if (goPackagePath != null) then throw "`goPackagePath` not needed with `buildGoModule`" else package diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index ab8ee9166f98..3f85b6e0268f 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -10,9 +10,6 @@ # We want parallel builds by default , enableParallelBuilding ? true -# Disabled flag -, disabled ? false - # Go import path of the package , goPackagePath @@ -249,7 +246,5 @@ let platforms = go.meta.platforms or lib.platforms.all; } // meta; }); -in if disabled then - throw "${package.name} not supported for go ${go.meta.branch}" -else +in package diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 862b45299a63..00a8c8d520bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -92,7 +92,7 @@ self: super: base template-haskell ghcjs-base split containers text ghc-prim ]; description = "FFI QuasiQuoter for GHCJS"; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; }) {}; # experimental ghcjs-vdom = self.callPackage @@ -112,7 +112,7 @@ self: super: base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split template-haskell ]; - license = pkgs.stdenv.lib.licenses.mit; + license = pkgs.lib.licenses.mit; description = "bindings for https://github.com/Matt-Esch/virtual-dom"; }) {}; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6d4e16f83786..30476a1a6ce5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -711,7 +711,7 @@ self: super: builtins.intersectAttrs super { # mplayer-spot uses mplayer at runtime. mplayer-spot = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ]; + let path = pkgs.lib.makeBinPath [ pkgs.mplayer ]; in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: { postInstall = '' wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}" @@ -723,7 +723,7 @@ self: super: builtins.intersectAttrs super { primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; + let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index c94528e674f4..69d0ac6b7a5f 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -59,7 +59,7 @@ mkDerivation { knownVulnerabilities = [ "CVE-2017-1000385" ]; platforms = ["x86_64-linux" "x86_64-darwin"]; - license = pkgs.stdenv.lib.licenses.asl20; - maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; + license = pkgs.lib.licenses.asl20; + maintainers = with pkgs.lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix new file mode 100644 index 000000000000..bf953d87fe2a --- /dev/null +++ b/pkgs/development/libraries/argtable/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "argtable"; + version = "3.1.5"; + srcVersion = "v${version}.1c1bb23"; + + src = fetchFromGitHub { + owner = "argtable"; + repo = "argtable3"; + rev = srcVersion; + sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM="; + }; + + nativeBuildInputs = [ cmake ]; + + postPatch = '' + patchShebangs tools/build + ''; + + meta = with stdenv.lib; { + homepage = "https://argtable.org"; + description = "A single-file, ANSI C command-line parsing library"; + longDescription = '' + Argtable is an open source ANSI C library that parses GNU-style + command-line options. It simplifies command-line parsing by defining a + declarative-style API that you can use to specify what your command-line + syntax looks like. Argtable will automatically generate consistent error + handling logic and textual descriptions of the command line syntax, which + are essential but tedious to implement for a robust CLI program. + ''; + license = with licenses; bsd3; + maintainers = with maintainers; [ AndersonTorres artuuge ]; + platforms = with platforms; all; + }; +} +# TODO [ AndersonTorres ]: a NixOS test suite diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index f0b430c91d81..3f8e6f01b34b 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee -, overrideCC, gcc6 +{ stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee +, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools , mysqlSupport ? false, libmysqlclient ? null , postgresSupport ? false, postgresql ? null }: @@ -15,8 +15,16 @@ assert postgresSupport -> postgresql != null; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; + + patches = [ + # fix compile error with mysql + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff"; + sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv"; + }) + ]; + configureFlags = with stdenv.lib; [ - "--enable-gi-system-install=no" "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -32,7 +40,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) libmysqlclient ++ optional (postgresSupport) postgresql; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 2b56590df5dc..aa23b3f8eafa 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,19 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd -, doxygen, catch, pkg-config +{ stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, cmake +, argtable +, catch2 +, curl +, doxygen +, hiredis +, jsoncpp +, libmicrohttpd }: stdenv.mkDerivation rec { pname = "libjson-rpc-cpp"; - version = "0.7.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cinemast"; repo = "libjson-rpc-cpp"; - sha256 = "07bg4nyvx0yyhy8c4x9i22kwqpx5jlv36dvpabgbb46ayyndhr7a"; + sha256 = "sha256-EAakiqlfMprwLjloDekOssaB/EnAmn5njcwHGZtYs9w="; rev = "v${version}"; }; - NIX_CFLAGS_COMPILE = "-I${catch}/include/catch"; + NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; + + patches = [ + (fetchpatch { + name = "int-to-MHD_Result.patch"; + url = "https://patch-diff.githubusercontent.com/raw/cinemast/libjson-rpc-cpp/pull/299.patch"; + sha256 = "sha256-hiey6etzbOxhMElTMX7offKbey7c2OO/UWeN03k0AaM="; + }) + ]; + + nativeBuildInputs = [ pkg-config cmake doxygen ]; + buildInputs = [ + argtable + catch2 + curl + hiredis + jsoncpp + libmicrohttpd + ]; postPatch = '' for f in cmake/FindArgtable.cmake \ @@ -26,35 +54,43 @@ stdenv.mkDerivation rec { sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake ''; - configurePhase = '' + preConfigure = '' mkdir -p Build/Install pushd Build + ''; + # this hack is needed because the cmake scripts + # require write permission to absolute paths + configurePhase = '' + runHook preConfigure cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \ -DCMAKE_BUILD_TYPE=Release + runHook postConfigure ''; - installPhase = '' - mkdir -p $out - + preInstall = '' function fixRunPath { p=$(patchelf --print-rpath $1) q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" patchelf --set-rpath $q $1 } - make install + mkdir -p $out + ''; - sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib/pkgconfig/*.pc - for f in Install/lib/*.so* $(find Install/bin -executable -type f); do + postInstall = '' + sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib64/pkgconfig/*.pc + for f in Install/lib64/*.so* $(find Install/bin -executable -type f); do fixRunPath $f done - cp -r Install/* $out ''; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ jsoncpp argtable curl libmicrohttpd doxygen catch ]; + installPhase = '' + runHook preInstall + make install + runHook postInstall + ''; meta = with stdenv.lib; { description = "C++ framework for json-rpc (json remote procedure call)"; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix new file mode 100644 index 000000000000..8eeb94cdc295 --- /dev/null +++ b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.72"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "sha256-Cugl+ODX9BIB/USg3xz0VMHLC8UP6dWcJlUiYCZML/g="; + }; +}) diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index 9edc215abcf7..14c800f568b0 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -16,9 +17,12 @@ buildPythonPackage rec { sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; }; + # OSError: AF_UNIX path too long + doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook - pytest-asyncio + pytest-asyncio ]; disabledTests = [ "test_protocol_pause_resume" ]; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 68ac9e45bb4b..85ed160413e7 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -22,12 +22,15 @@ buildPythonPackage rec { inherit pname version; sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; }; - patches = [ (fetchpatch { - # Compatibility with h5py 3. - # Will be included in the next releasse after 1.3.1 - url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; - sha256 = "00m8ias58xycn5n78sy9wywf4wck1v0gb8gzmg40inzdiha93jyz"; - }) ]; + + patches = [ + (fetchpatch { + # Compatibility with h5py 3. + # Will be included in the next releasse after 1.3.1 + url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch"; + sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1"; + }) + ]; propagatedBuildInputs = [ future @@ -53,10 +56,11 @@ buildPythonPackage rec { cd clifford/test ''; - pytestFlagsArray = [ - "-m \"not veryslow\"" - "--ignore=test_algebra_initialisation.py" # fails without JIT - "--ignore=test_cga.py" + disabledTests = [ + "veryslow" + "test_algebra_initialisation" + "test_cga" + "test_estimate_rotor_sequential[random_sphere]" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix new file mode 100644 index 000000000000..68da870f4e2d --- /dev/null +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "commandparse"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53"; + }; + + # tests only distributed upstream source, not PyPi + doCheck = false; + pythonImportsCheck = [ "commandparse" ]; + + meta = with lib; { + description = "Python module to parse command based CLI application"; + homepage = "https://github.com/flgy/commandparse"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.fab ]; + }; +} diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 7df6d72c55c4..b43c5ab192cb 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { buildInputs = [ pbr ]; propagatedBuildInputs = [ pythonix ]; + # does not have any tests + doCheck = false; + pythonImportsCheck = [ "nixpkgs" ]; + meta = with stdenv.lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; homepage = "https://github.com/t184256/nixpkgs-python-importer"; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index ecbdb73abc06..37d1e362ac11 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { pytestCheckHook ]; + doCheck = !stdenv.isDarwin; + preCheck = stdenv.lib.optionalString stdenv.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 9b2062dbf6c6..ec44a9a15e14 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,5 +1,5 @@ -{ buildPythonPackage, python, fetchurl, stdenv, pyside2, - cmake, qt5, llvmPackages }: +{ buildPythonPackage, python, fetchurl, stdenv, pyside2 +, cmake, qt5, llvmPackages }: stdenv.mkDerivation { pname = "shiboken2"; @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 606092e8cdcb..2e13f67e9f77 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; @@ -40,7 +40,7 @@ buildGoModule rec { ''; excludedPackages = "\\(" - + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ]) + + stdenv.lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + "\\)"; # Set GOTOOLDIR for derivations adding this to buildInputs diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 08f8049aa8a1..f658e78d5db0 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -1,6 +1,6 @@ { pkgs, ctags }: -with pkgs.stdenv.lib; +with pkgs.lib; # define some ctags wrappers adding support for some not that common languages # customization: diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 787f6e3c33ca..480c7cfd5561 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "1hiy8klig7j0if4iqbb0432iqsnds00aya6p4xmm913qfpsyh6cq"; + sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m"; }; - cargoSha256 = "0pf8j202rpglcxamsr8r3wwmgsdgih24m52vh1q85l93vj7jkm1v"; + cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 16d66c48af8b..22627f3df1bc 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -407,7 +407,7 @@ self: super: export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config ''; - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = old.passthru // { llvm = pkgs.llvm; }; } |