diff options
Diffstat (limited to 'pkgs/development')
17 files changed, 86 insertions, 56 deletions
diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 0d2541a5a1ab7..24fa6a9847388 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -18,12 +18,23 @@ , avrdude , gdb , openocd +, runCommand , tinygoTests ? [ "smoketest" ] }: let llvmMajor = lib.versions.major llvm.version; inherit (llvmPackages) llvm clang compiler-rt lld; + + # only doing this because only on darwin placing clang.cc in nativeBuildInputs + # doesn't build + bootstrapTools = runCommand "tinygo-bootstap-tools" { } '' + mkdir -p $out + ln -s ${lib.getBin clang.cc}/bin/clang $out/clang-${llvmMajor} + ln -s ${lib.getBin lld}/bin/ld.lld $out/ld.lld-${llvmMajor} + ln -s ${lib.getBin lld}/bin/wasm-ld $out/wasm-ld-${llvmMajor} + ln -s ${gdb}/bin/gdb $out/gdb-multiarch + ''; in buildGoModule rec { @@ -100,20 +111,13 @@ buildGoModule rec { # Disable windows and darwin cross-compile tests sed -i "/GOOS=windows/d" Makefile sed -i "/GOOS=darwin/d" Makefile - - # tinygo needs versioned binaries - mkdir -p $out/libexec/tinygo - ln -s ${lib.getBin clang.cc}/bin/clang $out/libexec/tinygo/clang-${llvmMajor} - ln -s ${lib.getBin lld}/bin/ld.lld $out/libexec/tinygo/ld.lld-${llvmMajor} - ln -s ${lib.getBin lld}/bin/wasm-ld $out/libexec/tinygo/wasm-ld-${llvmMajor} - ln -s ${gdb}/bin/gdb $out/libexec/tinygo/gdb-multiarch '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile \ --replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo" ''; preBuild = '' - export PATH=$out/libexec/tinygo:$PATH + export PATH=${bootstrapTools}:$PATH export HOME=$TMPDIR ''; @@ -149,7 +153,7 @@ buildGoModule rec { make build/release wrapProgram $out/bin/tinygo \ - --prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:$out/libexec/tinygo + --prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:${bootstrapTools} runHook postInstall ''; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index f4c622515d7d9..51d44e7f1e0ff 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -23,7 +23,7 @@ let # - imports lua-packages.nix # - adds spliced package sets to the package set # - applies overrides from `packageOverrides` - ({ lua, overrides, callPackage, makeScopeWithSplicing }: let + ({ lua, overrides, callPackage, makeScopeWithSplicing' }: let luaPackagesFun = callPackage ../../../top-level/lua-packages.nix { lua = self; }; @@ -39,18 +39,15 @@ let selfHostHost = luaOnHostForHost.pkgs; selfTargetTarget = luaOnTargetForTarget.pkgs or {}; }; - keep = self: { }; - extra = spliced0: {}; extensions = lib.composeManyExtensions [ generatedPackages overriddenPackages overrides ]; - in makeScopeWithSplicing - otherSplices - keep - extra - (lib.extends extensions luaPackagesFun)) + in makeScopeWithSplicing' { + inherit otherSplices; + f = lib.extends extensions luaPackagesFun; + }) { overrides = packageOverrides; lua = self; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index a2f9862083c98..201a080309d71 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -17,7 +17,7 @@ let # Function that when called # - imports perl-packages.nix # - adds spliced package sets to the package set - ({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing }: let + ({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing' }: let perlPackagesFun = callPackage ../../../top-level/perl-packages.nix { # allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages # most perl packages aren't called with callPackage so it's not possible to override their arguments individually @@ -34,13 +34,10 @@ let selfHostHost = perlOnHostForHost.pkgs; selfTargetTarget = perlOnTargetForTarget.pkgs or {}; }; - keep = self: { }; - extra = spliced0: {}; - in makeScopeWithSplicing - otherSplices - keep - extra - perlPackagesFun) + in makeScopeWithSplicing' { + inherit otherSplices; + f = perlPackagesFun; + }) { perl = self; }; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 8ea1c14c7111c..fb504c5043c80 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -5,7 +5,7 @@ , db , lib , libffiBoot -, makeScopeWithSplicing +, makeScopeWithSplicing' , pythonPackagesExtensions , stdenv }@args: diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index b73885b5e29e1..867027e3841c9 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, pythonPackagesExtensions, config, makeScopeWithSplicing, ... }: +{ lib, stdenv, callPackage, pythonPackagesExtensions, config, makeScopeWithSplicing', ... }: { implementation , libPrefix @@ -48,7 +48,6 @@ }; hooks = import ./hooks/default.nix; keep = self: hooks self {}; - extra = _: {}; optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix; @@ -61,12 +60,10 @@ overrides ]); aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); - in makeScopeWithSplicing - otherSplices - keep - extra - (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun)) - { + in makeScopeWithSplicing' { + inherit otherSplices keep; + f = lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun; + }) { overrides = packageOverrides; python = self; }); diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 16be29ad529e8..04fdf52982573 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -7,7 +7,7 @@ Check for any minor version changes. */ -{ makeScopeWithSplicing, generateSplicesForMkScope +{ makeScopeWithSplicing', generateSplicesForMkScope , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf @@ -265,6 +265,7 @@ let qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; + qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {}; qtscript = callPackage ../modules/qtscript.nix {}; qtsensors = callPackage ../modules/qtsensors.nix {}; qtserialbus = callPackage ../modules/qtserialbus.nix {}; @@ -332,4 +333,7 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; -in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages +in makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt5"; + f = addPackages; +} diff --git a/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix new file mode 100644 index 0000000000000..a71f9e8e352d6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix @@ -0,0 +1,8 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + pname = "qtremoteobjects"; + qtInputs = [ qtbase qtdeclarative ]; + # cycle is detected in build when adding "dev" "bin" too + outputs = [ "out" ]; +} diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 74ac03bbeb6da..d90834e0b3e2d 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -169,7 +169,7 @@ let } ./hooks/qmake-hook.sh; }; - # TODO(@Artturin): convert to makeScopeWithSplicing + # TODO(@Artturin): convert to makeScopeWithSplicing' # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 self = lib.makeScope newScope addPackages; in diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 0b5d9649f476f..77978654e68f8 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake + ninja setuptools wheel pybind11 diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index af6c1295bfa9a..5915459f8ec94 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.7"; + version = "0.12.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - hash = "sha256-r2UQrMmgWaS1v8ZSFSvpwiSRdGw5uTAoWIlSbzrG6/g="; + hash = "sha256-I56xWBbE1TqP+I8Op5X4TqHNB+gRlEPi7YQldIsjv4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 3b7a1ddb0613b..cab8e00401482 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymetno"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyMetno"; rev = "refs/tags/${version}"; - hash = "sha256-Do9RQS4gE2BapQtKQsnMzJ8EJzzxkCBA5r3z1zHXIsA="; + hash = "sha256-NikfHQwVviCKWGfY1atirFVaqWQHfXg8WAgZIDnGn4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index d5b152b603d1b..585d12e8fb048 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -15,16 +15,17 @@ , typing-extensions # optionals -, pycryptodome +, cryptography , pillow # tests , pytestCheckHook +, pytest-timeout }: buildPythonPackage rec { pname = "pypdf"; - version = "3.5.2"; + version = "3.15.1"; format = "pyproject"; src = fetchFromGitHub { @@ -33,7 +34,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-f+M4sfUzDy8hxHUiWG9hyu0EYvnjNA46OtHzBSJdID0="; + hash = "sha256-0KMZnMIeTkra2Il4HGDBtm8HLP8zpMXgUD4V5U5fYy0="; }; outputs = [ @@ -62,7 +63,7 @@ buildPythonPackage rec { passthru.optional-dependencies = rec { full = crypto ++ image; crypto = [ - pycryptodome + cryptography ]; image = [ pillow @@ -75,6 +76,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-timeout ] ++ passthru.optional-dependencies.full; pytestFlagsArray = [ @@ -82,6 +84,11 @@ buildPythonPackage rec { "-m" "'not enable_socket'" ]; + disabledTests = [ + # requires fpdf2 which we don't package yet + "test_compression" + ]; + meta = with lib; { description = "A pure-python PDF library capable of splitting, merging, cropping, and transforming the pages of PDF files"; homepage = "https://github.com/py-pdf/pypdf"; diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 3c62126d1d3b7..973969e3d1363 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.7.4"; + version = "0.7.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4u564tLk91duYv1IClHddur6t+Rbla/e9P0yWAxw2sw="; + hash = "sha256-zlCGEcG5tmgEXhSMDLKj0/imT1iHBqlp1O1QhmPrJcA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 3987dab5d87f2..5dea2f5e23a1e 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -1,24 +1,25 @@ { lib -, fetchPypi , buildPythonPackage , click-plugins , colorama +, fetchPypi +, pythonOlder , requests , setuptools -, pythonOlder +, tldextract , xlsxwriter }: buildPythonPackage rec { pname = "shodan"; - version = "1.29.1"; + version = "1.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4q9iVOGdKo+k6Slzi+VR4l3Hqvw5RzLndufjD6RM4zk="; + hash = "sha256-yWF8ZsR7h9SAHnCAtsdp7Jox2jmN7+CwR6Z5SSdDZFM="; }; propagatedBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { colorama requests setuptools + tldextract xlsxwriter ]; @@ -41,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/achillean/shodan-python"; changelog = "https://github.com/achillean/shodan-python/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ lihop ]; + maintainers = with maintainers; [ fab lihop ]; }; } diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index d984e7c106cc6..5e83f498722b2 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -28,7 +28,11 @@ buildPythonPackage rec { meta = { homepage = "https://gitlab.com/engmark/vcard"; description = "vCard validator, class and utility functions"; + longDescription = '' + This program can be used for strict validation and parsing of vCards. It currently supports vCard 3.0 (RFC 2426). + ''; license = lib.licenses.agpl3Plus; + mainProgram = "vcard"; maintainers = [ lib.maintainers.l0b0 ]; }; } diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/development/tools/initool/default.nix index 0d27dd4785a5c..ca6c88254e074 100644 --- a/pkgs/development/tools/initool/default.nix +++ b/pkgs/development/tools/initool/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "initool"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - hash = "sha256-+uyBweTmtMzwTsxL1xWnomtjcwra2hWcylqFHY2AexI="; + hash = "sha256-LV8Rv+7oUJ/4BX412WD1+Cs7N86OiXutN2ViAmo5jlE="; }; nativeBuildInputs = [ mlton ]; diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/development/tools/misc/k2tf/default.nix index e240834f2b4fb..9581cc42acff5 100644 --- a/pkgs/development/tools/misc/k2tf/default.nix +++ b/pkgs/development/tools/misc/k2tf/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "k2tf"; @@ -11,7 +11,16 @@ buildGoModule rec { sha256 = "sha256-zkkRzCTZCvbwBj4oIhTo5d3PvqLMJPzT3zV9jU3PEJs="; }; - vendorSha256 = "sha256-iCRiBCppqCZrCUQipoVgc4jUnLkX6QVFjxI6sv6n7tU="; + patches = [ + # update dependencies + # https://github.com/sl1pm4t/k2tf/pull/111 + (fetchpatch { + url = "https://github.com/sl1pm4t/k2tf/commit/7e7b778eeb80400cb0dadb1cdea4e617b5738147.patch"; + hash = "sha256-ZGQUuH7u3aNLml6rvOzOxVwSTlbhZLknXbHKeY4lp00="; + }) + ]; + + vendorSha256 = "sha256-yGuoE1bgwVHk3ym382OC93me9HPlVoNgGo/3JROVC2E="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; |