diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-01 00:56:17 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-01 00:56:17 +0000 |
commit | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (patch) | |
tree | 43aa870dd5804832ff7a1922361fe37cf592a13d /pkgs/development | |
parent | a6f7ba375272e838c84af00a7fbc37a9247448e9 (diff) | |
parent | 999c670119eee8017d2de703e766e6c9ed8527d7 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/arduino/platformio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/go/2-dev.nix | 262 | ||||
-rw-r--r-- | pkgs/development/compilers/go/ssl-cert-file-2-dev.patch | 45 | ||||
-rw-r--r-- | pkgs/development/interpreters/self/default.nix | 27 | ||||
-rw-r--r-- | pkgs/development/libraries/qtpbfimageplugin/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/redkite/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/aiobotocore/default.nix | 42 | ||||
-rw-r--r-- | pkgs/development/python-modules/aioitertools/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/python-modules/eyed3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/modeled/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyftdi/default.nix | 25 | ||||
-rw-r--r-- | pkgs/development/python-modules/s3fs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/slixmpp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/metals/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/wire/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js | 10 |
16 files changed, 475 insertions, 55 deletions
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index 248d07adf6e1f..194385e79529b 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.0.3"; + version = "5.0.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "0sf5dy0cmhy66rmk0hq1by7nrmf7qz0a99hrk55dpbp6r6vnk3hw"; + sha256 = "15jnhlhkk9z6cyzxw065r3080dqan951klwf65p152vfzg79wf84"; }; self = { diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix new file mode 100644 index 0000000000000..44ee67ca8f6ab --- /dev/null +++ b/pkgs/development/compilers/go/2-dev.nix @@ -0,0 +1,262 @@ +{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages +, pkgsBuildTarget +, fetchpatch +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "2"; + + src = fetchgit { + url = https://go.googlesource.com/go; + rev = "abe4d3dce12252ed09216eaa67b7dab8c8922537"; + sha256 = "sha256:1d46w8426148q81fvrifx9glgn402jvf29n44i8j8g1pvzkfckh6"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + echo '${version}' > VERSION + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-2-dev.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.15.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "dev.go2go"; + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members ++ [ maintainers._3noch ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch b/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch new file mode 100644 index 0000000000000..6146880f7a031 --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch @@ -0,0 +1,45 @@ +diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go +index ce88de025e..258ecc45d1 100644 +--- a/src/crypto/x509/root_darwin_amd64.go ++++ b/src/crypto/x509/root_darwin_amd64.go +@@ -10,6 +10,7 @@ import ( + "bytes" + macOS "crypto/x509/internal/macos" + "fmt" ++ "io/ioutil" + "os" + "strings" + ) +@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + var trustedRoots []*Certificate + untrustedRoots := make(map[string]bool) + +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index b48e618a65..195c1ff25a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index cf62399adc64f..0d5cc061f5917 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,6 +1,6 @@ -{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: +{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self # so that it can be written to when using the Self transposer. Running 'Self' # after installation runs without an image. You can then build a Self image with: @@ -11,16 +11,18 @@ stdenv.mkDerivation { # This image can later be started with: # $ Self -s myimage.snap # - version = "4.5.0"; pname = "self"; + version = "2017.1"; - src = fetchgit { - url = "https://github.com/russellallen/self"; - rev = "d16bcaad3c5092dae81ad0b16d503f2a53b8ef86"; - sha256 = "1dhs6209407j0ll9w9id31vbawdrm9nz1cjak8g8hixrw1nid4i5"; + src = fetchFromGitHub { + owner = "russellallen"; + repo = pname; + rev = version; + sha256 = "C/1Q6yFmoXx2F97xuvkm8DxFmmvuBS7uYZOxq/CRNog="; }; - buildInputs = [ ncurses xorg.libX11 xorg.libXext makeWrapper cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ ncurses libX11 libXext ]; selfWrapper = ./self; @@ -33,12 +35,11 @@ stdenv.mkDerivation { --set SELF_ROOT "$out" ''; - meta = { + meta = with stdenv.lib; { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; homepage = "https://selflanguage.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.doublec ]; - platforms = with stdenv.lib.platforms; linux; - broken = true; # segfaults on gcc > 4.4 + license = licenses.bsd3; + maintainers = [ maintainers.doublec ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 48c0158531a54..ecff7f7f8215b 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "1w2d33g13vkjasabmcgvhsmfqv3jmwbxhqxm1jnyc7d4nlk4jwmb"; + sha256 = "063agzcrcihasqqk2yqxqxg9xknjs99y6vx3n1v7md7dqnfv4iva"; }; nativeBuildInputs = [ qmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Fix plugin dir substituteInPlace pbfplugin.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" - + '' + stdenv.lib.optionalString stdenv.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { vector tiles without (almost) any application modifications. ''; homepage = "https://github.com/tumic0/QtPBFImagePlugin"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix index af8a1a914e4bd..ce3ac37895e03 100644 --- a/pkgs/development/libraries/redkite/default.nix +++ b/pkgs/development/libraries/redkite/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitLab, cmake, cairo }: +{ stdenv, fetchFromGitHub, cmake, cairo }: stdenv.mkDerivation rec { pname = "redkite"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "0c5k0a6ydb8szdgniqsva8l9j2sishlhsww13b3a9grvr7hb2bpq"; + sha256 = "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix new file mode 100644 index 0000000000000..308219865393f --- /dev/null +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestrunner +, typing-extensions +, wrapt +, aioitertools +, aiohttp +, botocore +}: + +buildPythonPackage rec { + pname = "aiobotocore"; + version = "1.1.2"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fn9hgcg3qr9f7srjxc21bzkiix4al9308531slwlm99r0x3xcjl"; + }; + + # relax version constraints: aiobotocore works with newer botocore versions + # the pinning used to match some `extras_require` we're not using. + preConfigure = '' + substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore' + ''; + + propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; + + # tests not distributed on pypi + doCheck = false; + pythonImportsCheck = [ "aiobotocore" ]; + + meta = with lib; { + description = "Async client for amazon services using botocore and aiohttp/asyncio."; + license = licenses.asl20; + homepage = "https://github.com/aio-libs/aiobotocore"; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix new file mode 100644 index 0000000000000..1c5ce1e2faeb3 --- /dev/null +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, typing-extensions +, coverage +, python +, toml +}: + +buildPythonPackage rec { + pname = "aioitertools"; + version = "0.7.1"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "18ql6k2j1839jf2rmmmm29v6fb7mr59l75z8nlf0sadmydy6r9al"; + }; + + propagatedBuildInputs = [ typing-extensions ]; + checkInputs = [ coverage toml ]; + + checkPhase = '' + ${python.interpreter} -m coverage run -m aioitertools.tests + ''; + + meta = with lib; { + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + license = licenses.mit; + homepage = "https://pypi.org/project/aioitertools/"; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 321c26542d112..d8ccb299fccb1 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.9.5"; + version = "0.9.6"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "faf5806197f2093e82c2830d41f2378f07b3a9da07a16fafb14fc6fbdebac50a"; + sha256 = "4b5064ec0fb3999294cca0020d4a27ffe4f29149e8292fdf7b2de9b9cabb7518"; }; # requires special test data: diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index e4cdec7766d61..66fe63e3daf1c 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -5,7 +5,7 @@ , six , moretools , pathpy -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -15,31 +15,19 @@ buildPythonPackage rec { src = fetchPypi { extension = "zip"; inherit pname version; - sha256 = "64934c68cfcdb75ed4a1ccadcfd5d2a46bf1b8e8e81dde89ef0f042c401e94f1"; + sha256 = "1wcl3r02q10gxy4xw7g8x2wg2sx4sbawzbfcl7a5xdydrxl4r4v4"; }; - buildInputs = [ - zetup - ]; + buildInputs = [ zetup ]; - propagatedBuildInputs = [ - six - moretools - pathpy - ]; + propagatedBuildInputs = [ six moretools pathpy ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - pytest test - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Universal data modeling for Python"; homepage = "https://bitbucket.org/userzimmermann/python-modeled"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 4cb6138d5ebb4..71253a894e762 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -1,24 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pyusb, pyserial }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pythonOlder +, pyusb +}: buildPythonPackage rec { pname = "pyftdi"; - version = "0.51.2"; + version = "0.52.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "14mkwk44bgm6s4kqagz7nm6p6gsygmksl2628jaqh7ppblxca9as"; + sha256 = "0nm4z7v9qcb9mxqbl21jgzica4faldnpy5qmbkrc6scnx55pxfm9"; }; propagatedBuildInputs = [ pyusb pyserial ]; + # tests requires access to the serial port + doCheck = false; + pythonImportsCheck = [ "pyftdi" ]; - meta = { + meta = with lib; { description = "User-space driver for modern FTDI devices"; + longDescription = '' + PyFtdi aims at providing a user-space driver for popular FTDI devices. + This includes UART, GPIO and multi-serial protocols (SPI, I2C, JTAG) + bridges. + ''; homepage = "https://github.com/eblot/pyftdi"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 9c900610e0318..739b32ec70d14 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3, fsspec }: +{ stdenv, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: buildPythonPackage rec { pname = "s3fs"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ docutils ]; - propagatedBuildInputs = [ boto3 fsspec ]; + propagatedBuildInputs = [ aiobotocore fsspec ]; # Depends on `moto` which has a long dependency chain with exact # version requirements that can't be made to work with current diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 2fd7d92e3d7cd..012a49eb32360 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.5.2"; + version = "1.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0c5g4r5c6zm5fgvk6dd0dbx9gl3ws2swajc5knlacnpfykwzp5b4"; + sha256 = "0jamly1jv31ragpv8yn52av1m48iwl4i7f9knb67vmk8c22rjdwa"; }; patches = [ diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 0d8911e5b213d..951e9a0ac2e8f 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.7"; + version = "0.9.8"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9"; + outputHash = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix new file mode 100644 index 0000000000000..ff6d1e7ac5d0c --- /dev/null +++ b/pkgs/development/tools/wire/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wire"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "wire"; + rev = "v${version}"; + sha256 = "0fYXo/LnxKV/qoaP59XCyEtLLAysZm/WhRdm3RnLdvw="; + }; + + vendorSha256 = "ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + + subPackages = [ "cmd/wire" ]; + + meta = with lib; { + homepage = "https://github.com/google/wire"; + description = "A code generation tool that automates connecting components using dependency injection"; + license = licenses.asl20; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js index 81feaaf3a6595..bd48b84f22d3b 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js @@ -7,9 +7,17 @@ const path = require('path') // - https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz // - git+https://github.com/srghma/node-shell-quote.git // - git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git +// - https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf function urlToName(url) { - if (url.startsWith('git+')) { + + // Yarn generates `codeload.github.com` tarball URLs, where the final + // path component (file name) is the git hash. See #111. + // See also https://github.com/yarnpkg/yarn/blob/989a7406/src/resolvers/exotics/github-resolver.js#L24-L26 + let isCodeloadGitTarballUrl = + url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') + + if (url.startsWith('git+') || isCodeloadGitTarballUrl) { return path.basename(url) } |