diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 5917739f2442..f477b811d70f 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,6 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true -, withALSA ? true, alsa-lib ? null, withPulseAudio ? false, libpulseaudio ? null -, withPortAudio ? false, portaudio ? null }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, stdenv +, openssl +, withALSA ? true +, alsa-lib +, withPortAudio ? false +, portaudio +, withPulseAudio ? false +, libpulseaudio +, withRodio ? true +}: rustPlatform.buildRustPackage rec { pname = "librespot"; @@ -15,26 +26,26 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ + rustPlatform.bindgenHook + ]; - buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib - ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withPortAudio portaudio; + buildInputs = [ openssl ] + ++ lib.optional withALSA alsa-lib + ++ lib.optional withPortAudio portaudio + ++ lib.optional withPulseAudio libpulseaudio; buildNoDefaultFeatures = true; buildFeatures = lib.optional withRodio "rodio-backend" ++ lib.optional withALSA "alsa-backend" - ++ lib.optional withPulseAudio "pulseaudio-backend" - ++ lib.optional withPortAudio "portaudio-backend"; - - doCheck = false; + ++ lib.optional withPortAudio "portaudio-backend" + ++ lib.optional withPulseAudio "pulseaudio-backend"; meta = with lib; { description = "Open Source Spotify client library and playback daemon"; homepage = "https://github.com/librespot-org/librespot"; + changelog = "https://github.com/librespot-org/librespot/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ bennofs ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/librespot.x86_64-darwin }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index d7b1f54d3912..cfb1d17c9129 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "7.0"; + version = "7.1"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "jdbqw4srh4bYJoHw4a/YT2t1IQ0XORtkQ8Q35FFVIUk="; + sha256 = "V7p1Hpt1GfD23e5QUgLjh8dd3kQMH3qhuTEMw4FAaDY="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 52f087b9db4d..003b07cb9759 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.7"; + version = "1.9"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7nMAaMLFLF5WuWgac9wdIvzRTTVpKRM7zB2tIlowBEE="; + sha256 = "sha256-jrP8V1EhHldliZEjiX55TJujc82ub46aWi1boJYDVTg="; }; buildInputs = [ libcap acl file readline ]; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index c694d5da3dbb..e11df27ab6c3 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -72,14 +72,14 @@ let six ]; in mkDerivation rec { - version = "3.22.10"; + version = "3.22.13"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-v/PshUZpf8fVW2PrGBiuAMfyfC/osOkR9GcnNOyg0l4="; + hash = "sha256-l9UaxPBTkKrTygise0nVBDrPX3aRRW62HtIYwrtYp3Q="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 57913c3e17e6..9f445facb167 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -72,14 +72,14 @@ let six ]; in mkDerivation rec { - version = "3.26.2"; + version = "3.28.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-WU1yamZM/UVhtZjoZ/5J8gt7FOHEHi0D2Z9BWEl4br0="; + hash = "sha256-ndwDN/DH+Y+dc8aNa45cSIM8yQUmIWq0jx6xWsZo4rk="; }; passthru = { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 12b181d2edd4..f0924d1402a9 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , callPackage -, fetchFromGitHub +, fetchurl , fetchpatch , makeWrapper , cmake @@ -48,6 +48,7 @@ , patchRcPathFish , patchRcPathPosix , tbb +, xrootd , Cocoa , CoreSymbolication , OpenGL @@ -70,20 +71,21 @@ in stdenv.mkDerivation rec { pname = "root"; - version = "6.26.08"; + version = "6.26.10"; passthru = { tests = import ./tests { inherit callPackage; }; }; - src = fetchFromGitHub { - owner = "root-project"; - repo = "root"; - rev = "v${builtins.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-cNd1GvEbO/a+WdDe8EHYGmdlw3TrOT2fWaSk+s7fw7U="; + src = fetchurl { + url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; + hash = "sha256-jla+w5cQQBeqVPnrVU3noaE0R0/gs7sPQ6cPxPq9Yl8="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; + propagatedBuildInputs = [ + nlohmann_json + ]; buildInputs = [ davix ftgl @@ -107,12 +109,12 @@ stdenv.mkDerivation rec { libjpeg libtiff libpng - nlohmann_json patchRcPathCsh patchRcPathFish patchRcPathPosix python.pkgs.numpy tbb + xrootd ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] @@ -195,7 +197,7 @@ stdenv.mkDerivation rec { "-Dvdt=OFF" "-Dwebgui=OFF" "-Dxml=ON" - "-Dxrootd=OFF" + "-Dxrootd=ON" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" ++ lib.optionals stdenv.isDarwin [ @@ -209,19 +211,23 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. + # TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged. postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ --set PYTHONPATH "$out/lib" \ - --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib" + --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib:${lib.makeLibraryPath [ xrootd ]}" done - # Make ldd and sed available to the ROOT executable - wrapProgram "$out/bin/root" --prefix PATH : "${lib.makeBinPath [ - gnused # sed - stdenv.cc # c++ ld etc. - stdenv.cc.libc # ldd - ]}" + # Make ldd and sed available to the ROOT executable by prefixing PATH. + wrapProgram "$out/bin/root" \ + --prefix PATH : "${lib.makeBinPath [ + gnused # sed + stdenv.cc # c++ ld etc. + stdenv.cc.libc # ldd + ]}" \ + --prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xrootd ]}" # Patch thisroot.{sh,csh,fish} diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/data/fonts/smiley-sans/default.nix new file mode 100644 index 000000000000..3bef9608b46e --- /dev/null +++ b/pkgs/data/fonts/smiley-sans/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "smiley-sans"; + version = "1.0.0"; + + src = fetchzip { + url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip"; + sha256 = "sha256-LE0CZkWiXjyuiEk316ABCNQL9n5GID8CipjBIu2o6uk="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/opentype *.otf + install -Dm644 -t $out/share/fonts/truetype *.ttf + install -Dm644 -t $out/share/fonts/woff2 *.woff2 + runHook postInstall + ''; + + meta = with lib; { + description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric"; + homepage = "https://atelier-anchor.com/typefaces/smiley-sans/"; + changelog = "https://github.com/atelier-anchor/smiley-sans/blob/main/CHANGELOG.md"; + license = licenses.ofl; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index 696f7acb3311..ffbd1c22d4b6 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "jrsonnet"; @@ -11,8 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A="; }; + cargoSha256 = "sha256-eFfAU9Q3nYAJK+kKP1Y6ONjOIfkuYTlelrFrEW9IJ8c="; + nativeBuildInputs = [ installShellFiles ]; + # skip flaky tests + checkFlags = [ + "--skip=tests::native_ext" + ]; + postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet @@ -24,13 +31,10 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-eFfAU9Q3nYAJK+kKP1Y6ONjOIfkuYTlelrFrEW9IJ8c="; - - meta = { + meta = with lib; { description = "Purely-functional configuration language that helps you define JSON data"; - maintainers = with lib.maintainers; [ lach ]; - license = lib.licenses.mit; homepage = "https://github.com/CertainLach/jrsonnet"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jrsonnet.x86_64-darwin + license = licenses.mit; + maintainers = with maintainers; [ figsoda lach ]; }; } diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/development/interpreters/nickel/default.nix index 00fd78bdd0c4..91200030f631 100644 --- a/pkgs/development/interpreters/nickel/default.nix +++ b/pkgs/development/interpreters/nickel/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "refs/tags/${version}"; # because pure ${version} doesn't work - hash = "sha256-L2MQ0dS9mZ+SOFoS/rclPtEl3/iFyEKn6Bse/ysHyKo="; + hash = "sha256-bUUQP7ze0j8d+VEckexDOferAgAHdKZbdKR3q0TNOeE="; }; - cargoSha256 = "sha256-3ucWGmylRatJOl8zktSRMXr5p6L+5+LQV6ALJTtQpiA="; + cargoSha256 = "sha256-E8eIUASjCIVsZhptbU41VfK8bFmA4FTT3LVagLrgUso="; meta = with lib; { homepage = "https://nickel-lang.org/"; @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { that are then fed to another system. It is designed to have a simple, well-understood core: it is in essence JSON with functions. ''; + changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 999a5231c0bc..22e60b20aef9 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, cmake, coreutils, python, root }: +{ lib +, stdenv +, fetchurl +, cmake +, coreutils +, python +, root +}: let pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; @@ -16,9 +23,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-zQ91yA91VJxZzCqCns52Acd96Xyypat1eQysjh1YUDI="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ root_py ] - ++ lib.optional withPython python; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + root_py + ] + ++ lib.optional withPython python; cmakeFlags = [ "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index c26aba66515b..60b5a0b581dc 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-YIonU0VeBnqZQLXBa8hqtsR+LHSbyd0ZeWmW60NSsv0="; + sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; }; # The Apple SDK only exports locale_t from xlocale.h whereas glibc diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix index a2e90dab6125..f048839292b6 100644 --- a/pkgs/development/misc/datafusion/default.nix +++ b/pkgs/development/misc/datafusion/default.nix @@ -1,35 +1,38 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub +, stdenv +, darwin }: -let - pname = "datafusion-cli"; - version = "unstable-2022-04-08"; -in -rustPlatform.buildRustPackage { - inherit pname version; - # TODO the crate has been yanked so not the best source - # the repo is a workspace with a lock inside a subdirectory, making - # compilation from github source not straightforward - # re-evaluate strategy on release after 7.0.0 +rustPlatform.buildRustPackage rec { + pname = "datafusion-cli"; + version = "15.0.0"; + src = fetchFromGitHub { owner = "apache"; repo = "arrow-datafusion"; - rev = "9cbde6d0e30fd29f59b0a16e309bdb0843cc7c64"; - sha256 = "sha256-XXd9jvWVivOBRS0PVOU9F4RQ6MrS/q78JF4S6Htd67w="; + rev = version; + sha256 = "sha256-s+gQoczTesJGOpz4W5hBPDdxo4eQnf+D10+V2kx65Io="; }; sourceRoot = "source/datafusion-cli"; - cargoSha256 = "sha256-Q0SjVofl1+sex15sSU9s7PgKeHG2b0gJPSqz7YZFOVs="; + cargoSha256 = "sha256-w+/5Ig+U8y4nwu7QisnZvc3UlZaEU/kovV6birOWndE="; + + buildInputs = lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + checkFlags = [ + # fails even outside the Nix sandbox + "--skip=object_storage::tests::s3_region_validation" + ]; meta = with lib; { - broken = stdenv.isDarwin; description = "cli for Apache Arrow DataFusion"; homepage = "https://arrow.apache.org/datafusion"; + changelog = "https://github.com/apache/arrow-datafusion/blob/${version}/datafusion/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix new file mode 100644 index 000000000000..443a086c5f82 --- /dev/null +++ b/pkgs/development/python-modules/autofaiss/default.nix @@ -0,0 +1,60 @@ +{ buildPythonPackage +, embedding-reader +, faiss +, fetchFromGitHub +, fire +, fsspec +, lib +, numpy +, pyarrow +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "autofaiss"; + version = "2.15.3"; + + src = fetchFromGitHub { + owner = "criteo"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-RJOOUMI4w1YPEjDKi0YkqTXU01AbVoPn2+Id6kdC5pA="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRemoveDeps = [ + # The `dataclasses` packages is a python2-only backport, unnecessary in + # python3. + "dataclasses" + # We call it faiss, not faiss-cpu. + "faiss-cpu" + ]; + + pythonRelaxDeps = [ + # As of v2.15.3, autofaiss asks for pyarrow<8 but we have pyarrow v9.0.0 in + # nixpkgs at the time of writing (2022-12-15). + "pyarrow" + ]; + + propagatedBuildInputs = [ embedding-reader fsspec numpy faiss fire pyarrow ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + # Attempts to spin up a Spark cluster and talk to it which doesn't work in + # the Nix build environment. + "test_build_partitioned_indexes" + "test_index_correctness_in_distributed_mode_with_multiple_indices" + "test_index_correctness_in_distributed_mode" + "test_quantize_with_pyspark" + ]; + + meta = with lib; { + description = "Automatically create Faiss knn indices with the most optimal similarity search parameters"; + homepage = "https://github.com/criteo/autofaiss"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix new file mode 100644 index 000000000000..2d4af5ca1f12 --- /dev/null +++ b/pkgs/development/python-modules/embedding-reader/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, fetchFromGitHub +, fsspec +, lib +, numpy +, pandas +, pyarrow +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "embedding-reader"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "rom1504"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-uyeIcAW9O9PR4cqmifC6Lx+Hn6XPb1RH/ksmUWvbdtw="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "pyarrow" ]; + + propagatedBuildInputs = [ fsspec numpy pandas pyarrow ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "embedding_reader" ]; + + meta = with lib; { + description = "Efficiently read embedding in streaming from any filesystem"; + homepage = "https://github.com/rom1504/embedding-reader"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index fb727e0f51c9..bb94e8f8ee81 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -1,22 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub, go }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "nasmfmt"; - version = "unstable-2021-04-24"; + version = "unstable-2022-09-15"; src = fetchFromGitHub { owner = "yamnikov-oleg"; repo = "nasmfmt"; - rev = "efba220c5252eb717f080d266dcc8304efdeab40"; - sha256 = "sha256-snhXF+IP0qzl43rKQ0Ugfo1zv3RyNfjxnMpjZEBgPQg="; + rev = "127dbe8e72376c67d7dff89010ccfb49fc7b533e"; + hash = "sha256-1c7ZOdoM0/Us7cnTT3sds2P5pcCedrCfl0GqQBnf9Rk="; }; - goPackagePath = "github.com/yamnikov-oleg/nasmfmt"; + vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + preBuild = '' + cp ${./go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Formatter for NASM source files"; homepage = "https://github.com/yamnikov-oleg/nasmfmt"; - platforms = go.meta.platforms; license = licenses.mit; maintainers = with maintainers; [ ckie ]; }; diff --git a/pkgs/development/tools/nasmfmt/go.mod b/pkgs/development/tools/nasmfmt/go.mod new file mode 100644 index 000000000000..0dfb1521c9e5 --- /dev/null +++ b/pkgs/development/tools/nasmfmt/go.mod @@ -0,0 +1,3 @@ +module github.com/yamnikov-oleg/nasmfmt + +go 1.18 diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix index 8841f1df6e3c..a386853247dc 100644 --- a/pkgs/tools/misc/coinlive/default.nix +++ b/pkgs/tools/misc/coinlive/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , fetchFromGitHub , openssl , pkg-config , rustPlatform +, Security }: rustPlatform.buildRustPackage rec { @@ -24,6 +26,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 357e0816cce7..8ccdec4f5573 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16279,6 +16279,8 @@ with pkgs; self = pkgsi686Linux.callPackage ../development/interpreters/self { }; + smiley-sans = callPackage ../data/fonts/smiley-sans { }; + inherit (callPackages ../applications/networking/cluster/spark { }) spark_3_2 spark_3_1 @@ -18755,6 +18757,7 @@ with pkgs; CoinMP = callPackage ../development/libraries/CoinMP { }; coinlive = callPackage ../tools/misc/coinlive { + inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 127bee350da6..405b9de1c9db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -780,6 +780,8 @@ self: super: with self; { autocommand = callPackage ../development/python-modules/autocommand { }; + autofaiss = callPackage ../development/python-modules/autofaiss { }; + autograd = callPackage ../development/python-modules/autograd { }; autoit-ripper = callPackage ../development/python-modules/autoit-ripper { }; @@ -2935,6 +2937,8 @@ self: super: with self; { email-validator = callPackage ../development/python-modules/email-validator { }; + embedding-reader = callPackage ../development/python-modules/embedding-reader { }; + embrace = callPackage ../development/python-modules/embrace { }; emcee = callPackage ../development/python-modules/emcee { };