diff options
Diffstat (limited to 'pkgs')
25 files changed, 191 insertions, 80 deletions
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 59e09939e80..d7a27dd4bcc 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -9,14 +9,9 @@ , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror , hidapi, rapidjson, quirc -, trezorSupport ? true -, libusb1 -, protobuf -, python3 +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - stdenv.mkDerivation rec { pname = "monero-gui"; version = "0.17.2.2"; @@ -30,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook - (getDev qttools) + (lib.getDev qttools) ]; buildInputs = [ @@ -41,8 +36,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson quirc - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] - ++ optionals stdenv.isDarwin [ qtmacextras ]; + ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ] + ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -98,7 +93,7 @@ stdenv.mkDerivation rec { done; ''; - meta = { + meta = with lib; { description = "Private, secure, untraceable currency"; homepage = "https://getmonero.org/"; license = licenses.bsd3; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 2a12bfe872b..7dd2e569021 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -4,17 +4,9 @@ , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson , CoreData, IOKit, PCSC -, trezorSupport ? true -, libusb1 ? null -, protobuf ? null -, python3 ? null +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - -assert stdenv.isDarwin -> IOKit != null; -assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; - stdenv.mkDerivation rec { pname = "monero"; version = "0.17.2.0"; @@ -45,8 +37,8 @@ stdenv.mkDerivation rec { zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf - ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ] - ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -54,7 +46,7 @@ stdenv.mkDerivation rec { "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" "-DRandomX_ROOT_DIR=${randomx}" - ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; outputs = [ "out" "source" ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 02a9a6e6562..69db13fec19 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -21,7 +21,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText }: +{ lib, stdenv, texinfo, writeText, gcc }: self: let @@ -32,7 +32,7 @@ self: let }; elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText; + inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 41a0670d0c8..965b8d8189a 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, emacs, texinfo, writeText }: +{ lib, stdenv, emacs, texinfo, writeText, gcc }: with lib; @@ -19,7 +19,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ phases = "installPhase fixupPhase distPhase"; diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 1456d9e423d..ef154982ad0 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo, writeText, ... }: +{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: with lib; @@ -72,6 +72,8 @@ stdenv.mkDerivation ({ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; + nativeBuildInputs = [ gcc ]; + addEmacsNativeLoadPath = true; postInstall = '' diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index c30d3e59906..408448f26a0 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: with lib; @@ -28,7 +28,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ ename = if ename == null diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 571d0eb687c..6b53f3fdd95 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit */ -{ lib, lndir, makeWrapper, runCommand }: self: +{ lib, lndir, makeWrapper, runCommand, gcc }: self: with lib; @@ -65,7 +65,10 @@ runCommand # Store all paths we want to add to emacs here, so that we only need to add # one path to the load lists deps = runCommand "emacs-packages-deps" - { inherit explicitRequires lndir emacs; } + { + inherit explicitRequires lndir emacs; + nativeBuildInputs = lib.optional nativeComp gcc; + } '' findInputsOld() { local pkg="$1"; shift diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index ac0f3312414..c399772a9f3 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { postInstall = let includedLibs = [ "base" "contrib" "network" "prelude" ]; name = "${pname}-${version}"; - packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs; + packagePaths = + builtins.map (l: "$out/${name}/${l}-${version}") includedLibs; additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths; in '' # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 10d688d89b6..d94a0e1d78b 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - configureFlags = lib.optional stdenv.targetPlatform.isWindows "--disable-examples"; + configureFlags = lib.optional (stdenv.targetPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples"; meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index c5524b82077..daa97bfddde 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -308,7 +308,7 @@ let }; teck-programmer = super.teck-programmer.override { - buildInputs = [ pkgs.libusb ]; + buildInputs = [ pkgs.libusb1 ]; }; vega-cli = super.vega-cli.override { diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix new file mode 100644 index 00000000000..f7d3c1e41c5 --- /dev/null +++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, gmp +, dune-configurator +, cstruct +, bigstring +, alcotest +, hex +}: + +buildDunePackage rec { + pname = "secp256k1-internal"; + version = "0.2"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "ocaml-secp256k1-internal"; + rev = "v${version}"; + sha256 = "1g9fyi78nmmm19l2cggwj14m4n80rz7gmnh1gq376zids71s6qxv"; + }; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + gmp + cstruct + bigstring + ]; + + buildInputs = [ + dune-configurator + ]; + + checkInputs = [ + alcotest + hex + ]; + + doCheck = true; + + meta = { + description = "Bindings to secp256k1 internal functions (generic operations on the curve)"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 0983805780f..ac574174278 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -1,37 +1,47 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy27 -, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "dill"; - version = "0.3.1.1"; + version = "0.3.4"; + doCheck = !isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c"; + src = fetchFromGitHub { + owner = "uqfoundation"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0x702gh50wb3n820p2p9w49cn4a354y207pllwc7snfxprv6hypm"; }; - # python2 can't import a test fixture - doCheck = !isPy27; - checkInputs = [ nose ]; - checkPhase = '' - PYTHONPATH=$PWD/tests:$PYTHONPATH - nosetests \ - --ignore-files="test_classdef" \ - --ignore-files="test_objects" \ - --ignore-files="test_selected" \ - --exclude="test_the_rest" \ - --exclude="test_importable" - ''; + checkInputs = [ + pytestCheckHook + ]; + # Tests seem to fail because of import pathing and referencing items/classes in modules. # Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests. + disabledTestPaths = [ + "tests/test_diff.py" + "tests/test_module.py" + "tests/test_objects.py" + ]; + + disabledTests = [ + "test_class_objects" + "test_method_decorator" + "test_importable" + "test_the_rest" + ]; + + pythonImportsCheck = [ "dill" ]; - meta = { + meta = with lib; { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index 67930bcd034..50140ef8308 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; - rev = "df74f7dff562d868ad8088b7251f9e7206271d37"; - sha256 = "0b2znvjngffxc0mlmqmcai8l22ff09kc39bj6f0lkjw735vclnzh"; + rev = "v${version}"; + sha256 = "sha256-d/AbvgAD3GHXpwhqjT5Xt9q7Kix+eFMX4kW2BywZWX0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index c922d0b52d4..75d0c365e61 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -28,14 +28,14 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "1.2.0"; + version = "1.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "1763qmcd1gxap27jppqaywx03k5cagcl62z2p2qdiqigdksplm2g"; + sha256 = "sha256-qY4xsoVk1hyY9dYmVXaqDRjcShUQmp8VZOzAQNiC6EM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix new file mode 100644 index 00000000000..d95aa846965 --- /dev/null +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, autopep8 +, nose +, pycodestyle +, twine +}: + +buildPythonPackage rec { + pname = "opensimplex"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "lmas"; + repo = pname; + rev = "v${version}"; + sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; + }; + + checkInputs = [ autopep8 nose pycodestyle twine ]; + checkPhase = '' + nosetests tests/ + ''; + + meta = with lib; { + description = "OpenSimplex Noise functions for 2D, 3D and 4D"; + longDescription = '' + OpenSimplex noise is an n-dimensional gradient noise function that was + developed in order to overcome the patent-related issues surrounding + Simplex noise, while continuing to also avoid the visually-significant + directional artifacts characteristic of Perlin noise. + ''; + homepage = "https://github.com/lmas/opensimplex"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 3d39b3516b6..b0ea3fdcb24 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.9"; + version = "0.7.10"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "0clpi6bplzw7qg2m0hgwqr71zwxrh901gwprhd1yjykn30njp5bw"; + sha256 = "sha256-B2imewEONewj1Y+Q316reIBZB/b9WQAu67x9cLMkRTU="; }; checkInputs = [ diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 82e1cb66e2b..df807188f14 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -19,6 +19,7 @@ my $autoModules = $ENV{'AUTO_MODULES'}; my $preferBuiltin = $ENV{'PREFER_BUILTIN'}; my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'}; my $buildRoot = $ENV{'BUILD_ROOT'}; +my $makeFlags = $ENV{'MAKE_FLAGS'}; $SIG{PIPE} = 'IGNORE'; # Read the answers. @@ -40,7 +41,7 @@ close ANSWERS; sub runConfig { # Run `make config'. - my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX}"); + my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX} $makeFlags"); # Parse the output, look for questions and then send an # appropriate answer. diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index b35c84513e6..aa0f19858b8 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -21,6 +21,9 @@ , # Legacy overrides to the intermediate kernel config, as string extraConfig ? "" + # Additional make flags passed to kbuild +, extraMakeFlags ? [] + , # kernel intermediate config overrides, as a set structuredExtraConfig ? {} @@ -97,7 +100,7 @@ let in lib.concatStringsSep "\n" ([baseConfigStr] ++ configFromPatches); configfile = stdenv.mkDerivation { - inherit ignoreConfigErrors autoModules preferBuiltin kernelArch; + inherit ignoreConfigErrors autoModules preferBuiltin kernelArch extraMakeFlags; pname = "linux-config"; inherit version; @@ -116,6 +119,9 @@ let # e.g. "bzImage" kernelTarget = stdenv.hostPlatform.linux-kernel.target; + makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags + ++ extraMakeFlags; + prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that # generate-config.pl from the generic builder can answer them. @@ -134,16 +140,19 @@ let export HOSTLD=$LD_FOR_BUILD # Get a basic config file for later refinement with $generateConfig. - make -C . O="$buildRoot" $kernelBaseConfig \ + make $makeFlags \ + -C . O="$buildRoot" $kernelBaseConfig \ ARCH=$kernelArch \ HOSTCC=$HOSTCC HOSTCXX=$HOSTCXX HOSTAR=$HOSTAR HOSTLD=$HOSTLD \ - CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF + CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF \ + $makeFlags # Create the config file. echo "generating kernel configuration..." ln -s "$kernelConfigPath" "$buildRoot/kernel-config" DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ - PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig + PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \ + perl -w $generateConfig ''; installPhase = "mv $buildRoot/.config $out"; @@ -151,7 +160,6 @@ let enableParallelBuilding = true; passthru = rec { - module = import ../../../../nixos/modules/system/boot/kernel_config.nix; # used also in apache # { modules = [ { options = res.options; config = svc.config or svc; } ]; @@ -172,14 +180,14 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; passthru = { features = kernelFeatures; - inherit commonStructuredConfig isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index fda2881a8d2..77add0aef53 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk +, libelf, cpio, elfutils, zstd, gawk, python3Minimal , writeTextFile }: @@ -19,6 +19,8 @@ in { stdenv, # The kernel version version, + # Additional kernel make flags + extraMakeFlags ? [], # The version of the kernel module directory modDirVersion ? version, # The kernel source (tarball, git checkout, etc.) @@ -121,7 +123,7 @@ let # See also https://kernelnewbies.org/BuildId sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|' - patchShebangs scripts/ld-version.sh + patchShebangs scripts ''; postPatch = '' @@ -173,7 +175,9 @@ let "KBUILD_BUILD_VERSION=1-NixOS" kernelConf.target "vmlinux" # for "perf" and things like that - ] ++ optional isModular "modules"; + ] + ++ optional isModular "modules" + ++ extraMakeFlags; installFlags = [ "INSTALLKERNEL=${installkernel}" @@ -307,7 +311,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd python3Minimal ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. @@ -325,7 +329,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat "ARCH=${stdenv.hostPlatform.linuxArch}" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; + ] ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; }) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index c259f962b04..da0e7364e95 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.0"; + version = "1.10.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256:0gc5shz1nbya7jdkggw2izbw1p4lwkbqgbc5ihlvnwrfdgksfqqd"; + sha256 = "sha256-oap0pXqtIbT9wMfD/RuJ2tTRynSvfzsgL8TyY4nj3sM="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256:0sxnnzzsp58ma42ylysdgxibqf65f4f9vbf8c20r44426vg75as7"; + vendorSha256 = "sha256-DloQGxeooVhYWA5/ICkL2UEQvNPilb2F5pst78UzWPI="; doCheck = false; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 0a01a3dad5a..19a464aff72 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ glib.dev ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index a925d07cb7c..e542a2ae714 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pam, xmlsec }: let + # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream securityDependency = if stdenv.isDarwin then xmlsec else pam; @@ -16,6 +17,8 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency ]; + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; + passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d168d34e373..34f99561601 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -26,7 +26,7 @@ let mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { - inherit (pkgs) stdenv texinfo writeText; + inherit (pkgs) stdenv texinfo writeText gcc; inherit lib; }; @@ -44,7 +44,7 @@ let }; emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix { - inherit (pkgs) makeWrapper runCommand; + inherit (pkgs) makeWrapper runCommand gcc; inherit (pkgs.xorg) lndir; inherit lib; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e5a792caf0f..ebe7465fae5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1031,6 +1031,8 @@ let inherit (pkgs) secp256k1; }; + secp256k1-internal = callPackage ../development/ocaml-modules/secp256k1-internal { }; + seq = callPackage ../development/ocaml-modules/seq { }; sosa = callPackage ../development/ocaml-modules/sosa { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abf8dc2ee80..0ea1e6a456b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4989,6 +4989,8 @@ in { openshift = callPackage ../development/python-modules/openshift { }; + opensimplex = callPackage ../development/python-modules/opensimplex { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; |