diff options
Diffstat (limited to 'pkgs/development')
74 files changed, 1162 insertions, 178 deletions
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index fa4b4abafdee..163577935839 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps -, pcre, cacert, llvm -, Security, Foundation -, makeWrapper, git, subversion, mercurial, bazaar }: +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: let @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { GOCACHE = "off"; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + 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 ]; @@ -165,9 +162,6 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) - - # (https://github.com/golang/go/wiki/GoGetTools) - wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 56d363f1015f..f58e0801030e 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps -, pcre, cacert, llvm -, Security, Foundation -, makeWrapper, git, subversion, mercurial, bazaar }: +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: let @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { GOCACHE = "off"; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + 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 ]; @@ -171,9 +168,6 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) - - # (https://github.com/golang/go/wiki/GoGetTools) - wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 48f16c3ffa5a..d6ae163813f3 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps -, pcre, cacert, llvm -, Security, Foundation -, makeWrapper, git, subversion, mercurial, bazaar }: +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: let @@ -35,7 +32,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + 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 ]; @@ -165,9 +162,6 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) - - # (https://github.com/golang/go/wiki/GoGetTools) - wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 32a22566bdb1..4bd49b06796d 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { name = "guile-cairo-${version}"; - version = "1.4.1"; + version = "1.10.0"; src = fetchurl { - url = "http://download.gna.org/guile-cairo/${name}.tar.gz"; - sha256 = "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"; + url = "mirror://savannah/guile-cairo/${name}.tar.gz"; + sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile cairo expat ]; - checkInputs = [ guile-lib ]; + enableParallelBuilding = true; doCheck = true; + checkInputs = [ guile-lib ]; meta = with stdenv.lib; { description = "Cairo bindings for GNU Guile"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = "http://home.gna.org/guile-cairo/"; + homepage = https://www.nongnu.org/guile-cairo/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 15bd1507cc93..733201d8960c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1151,4 +1151,7 @@ self: super: { }); xmonad-extras = doJailbreak super.xmonad-extras; + + arbtt = doJailbreak super.arbtt; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 67c38a354b43..f9938de6f59d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -227,7 +227,7 @@ in { # We can't update the darwin versions because they simply don't compile at # all due to a bug in the intl extensions. # - # The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10. + # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10, 7.2.11. php71 = generic ( if stdenv.isDarwin then @@ -237,8 +237,8 @@ in { } else { - version = "7.1.22"; - sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8"; + version = "7.1.23"; + sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d"; } ); @@ -250,8 +250,8 @@ in { } else { - version = "7.2.10"; - sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1"; + version = "7.2.11"; + sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa"; } ); } diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 21d9ce23d319..f53aa873b482 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version="4.4.2"; src = fetchurl { - url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; + url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz"; sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 16fc7e0c960d..77ce77dee5ad 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,42 +1,75 @@ -{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: + +let + parquet-testing = fetchFromGitHub { + owner = "apache"; + repo = "parquet-testing"; + rev = "46ae2605c2de306f5740587107dcf333a527f2d1"; + sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik"; + }; +in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll"; + sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q"; }; sourceRoot = "apache-arrow-${version}/cpp"; - # patch to fix python-test - patches = [ ./darwin.patch ]; + patches = [ + # fix ARROW-3467 + ./double-conversion_cmake.patch + + # patch to fix python-test + ./darwin.patch + ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost python.pkgs.python python.pkgs.numpy ]; + buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; preConfigure = '' + substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + + patchShebangs build-support/ ''; BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; }; + DOUBLE_CONVERSION_HOME = double-conversion; FLATBUFFERS_HOME = flatbuffers; - GTEST_HOME = gtest; GFLAGS_HOME = gflags; + GLOG_HOME = glog; + GTEST_HOME = gtest; LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; RAPIDJSON_HOME = rapidjson; SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; - ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + THRIFT_HOME = thrift; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; }; ZSTD_HOME = zstd; cmakeFlags = [ "-DARROW_PYTHON=ON" + "-DARROW_PARQUET=ON" ]; + doInstallCheck = true; + PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; + installCheckInputs = [ perl which ]; + installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + for f in release/*-test; do + install_name_tool -add_rpath "$out"/lib "$f" + done + '') + '' + ctest -L unittest -V + ''; + meta = { description = "A cross-language development platform for in-memory data"; homepage = https://arrow.apache.org/; diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch new file mode 100644 index 000000000000..336fdde9e8fb --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,7 +615,7 @@ endif(UNIX) + set(ARROW_LINK_LIBS) + + # Libraries to link statically with libarrow.so +-set(ARROW_STATIC_LINK_LIBS double-conversion) ++set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET}) + + if (ARROW_WITH_BROTLI) + SET(ARROW_STATIC_LINK_LIBS +@@ -694,7 +694,7 @@ else () + set(ARROW_MIN_TEST_LIBS + arrow_shared + ${ARROW_LINK_LIBS} +- double-conversion ++ ${DOUBLE_CONVERSION_TARGET} + ${BOOST_SYSTEM_LIBRARY} + ${BOOST_FILESYSTEM_LIBRARY} + ${BOOST_REGEX_LIBRARY} +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") + set(DOUBLE_CONVERSION_VENDORED 1) + else() + find_package(double-conversion REQUIRED) ++ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion) + set(DOUBLE_CONVERSION_VENDORED 0) + endif() + + include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) +-ADD_THIRDPARTY_LIB(double-conversion +- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) + + if (DOUBLE_CONVERSION_VENDORED) ++ ADD_THIRDPARTY_LIB(double-conversion ++ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) ++ set(DOUBLE_CONVERSION_TARGET double-conversion) + add_dependencies(arrow_dependencies double-conversion_ep) + endif() + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4131e5f7a27c..1ab0718e7960 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { postFixup = '' # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1i#line 1 "{}"' -i '{}' \; + -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a ''; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index db46412ceb55..7c0664533b8f 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -10,14 +10,14 @@ assert glSupport -> libGL != null; let - version = "1.15.12"; + version = "1.15.14"; inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "cairo-${version}"; src = fetchurl { url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; - sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn"; + sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 660cdfa6414b..49e929821f7f 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake, boost, brigand }: stdenv.mkDerivation rec { name = "fcppt-${version}"; - version = "2.5.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi"; + sha256 = "0zyqgmi1shjbwin1lx428v7vbi6jnywb1d47dascdn89r5gz6klv"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; - cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ]; + cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" "-DBrigand_INCLUDE_DIR=${brigand}/include" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 416ecb5631ed..8e7d10782157 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { name = "gpgme-${version}"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0vxx5xaag3rhp4g2arp5qm77gvz4kj0m3hnpvhkdvqyjfhbi26rd"; + sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l"; }; outputs = [ "out" "dev" "info" ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; - doCheck = false; # fails 8 out of 26 tests with "GPGME: Decryption failed". Spooky! + doCheck = true; meta = with stdenv.lib; { homepage = https://gnupg.org/software/gpgme/index.html; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index aa670cd4c86b..52c087b19147 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -46,6 +46,7 @@ mkDerivation rec { homepage = http://gitorious.org/grantlee; maintainers = [ maintainers.ttuegel ]; + license = licenses.lgpl21; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 9dde67b5c795..1446e339745e 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ ]; + license = stdenv.lib.licenses.lgpl21; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index a9e7f9fcff3e..a099643061a1 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index b92bbf64514e..7f35f088da2b 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - description = "gtk-sharp-beans binds some API from Gtk+ that isn't in Gtk# 2.12.x"; + description = "Binds some API from Gtk+ that isn't in Gtk# 2.12.x"; platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 5b3ca828a3f8..c037db97c044 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -46,7 +46,10 @@ stdenv.mkDerivation { gtk = gtk2; }; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Graphical User Interface Toolkit for mono and .Net"; + homepage = https://www.mono-project.com/docs/gui/gtksharp; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 22094f3a3f64..14676be0dcb9 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation { name = "gtkspell-2.0.16"; - + src = fetchurl { url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz; sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [aspell gtk2 enchant intltool]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Word-processor-style highlighting and replacement of misspelled words"; + homepage = http://gtkspell.sourceforge.net; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 20dda589b9cc..9d2088808c13 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; buildInputs = [ perl zlib ]; - meta = { + meta = with stdenv.lib; { description = "Hebrew spell checker"; homepage = http://hspell.ivrix.org.il/; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index b3914a4438b3..62c3d79cf9a1 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO. ''; platforms = platforms.all; + license = with licenses; [ gpl2 lgpl21 mpl11 ]; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index f99aa0b6f0cf..516e4184623a 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index dda1435c1dac..ddce76b10f72 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation { doCheck = false; # fails to compile - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; + homepage = http://id3lib.sourceforge.net; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 585f6f18bbab..b99a3c7059aa 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.19"; + version = "2.20"; in stdenv.mkDerivation rec { name = "libblockdev-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "1ny31vaarzbpw0h863p2r5cvjsfs77d33nnisf8bhjc6ps6js3ys"; + sha256 = "13xy8vx2dnnxczpnwapchc5ncigcxb2fhpmrmglbpkjqmhn2zbdj"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 4da0738fde5e..e3d5c7d6424e 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "0d6lmnr5yfpkzr1yr6f2ilxprl6v9r4r7917k4iz0wc3jlcndwl3"; + sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index ea05df45169f..5f295009b994 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "liblinear-${version}"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "13q48azqy9pd8jyhk0c2hzj5xav1snbdrj8pp38vwrv2wwhfz7rz"; + sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs"; }; buildPhase = '' diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 1becd0ee8ef6..e46eb9208de6 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libmesode-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "boothj5"; repo = "libmesode"; rev = version; - sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh"; + sha256 = "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 9803e09610e6..e009a9f920b1 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.12"; + version = "0.19.0"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"; + sha256 = "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index e0e0b59a9a9f..b4bdd200211c 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "p11-kit-${version}"; - version = "0.23.13"; + version = "0.23.14"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; rev = version; - sha256 = "1z2rbw2qbwj64i88llc1mkf0263qa0kxc2350kg25r7mghxbw1y6"; + sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw"; }; outputs = [ "out" "dev"]; diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix deleted file mode 100644 index 804ddb136f03..000000000000 --- a/pkgs/development/libraries/parquet-cpp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }: - -stdenv.mkDerivation rec { - name = "parquet-cpp-${version}"; - version = "1.5.0"; - - src = fetchurl { - url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz"; - sha256 = "19nwqahc0igr0jfprbf2m86rmzz6zicw4z7b8z832wbsyc904wli"; - }; - - patches = [ ./api.patch ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; - - preConfigure = '' - substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - ''; - - ARROW_HOME = arrow-cpp; - THRIFT_HOME = thrift; - GTEST_HOME = gtest; - SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; - ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; - - cmakeFlags = [ - "-DPARQUET_BUILD_BENCHMARKS=OFF" - ]; - - meta = { - description = "A C++ library to read and write the Apache Parquet columnar data format"; - homepage = http://parquet.apache.org; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 2a07eba261b7..c93ba1b12909 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "vulkan-headers-${version}"; - version = "1.1.82.0"; + version = "1.1.85"; buildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "sdk-${version}"; - sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p"; + rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0"; + sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 5ffdc4375373..6f720857f7cf 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: -let version = "1.1.82.0"; in +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig +, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: + +let + version = "1.1.85"; +in + assert version == vulkan-headers.version; stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; @@ -9,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "sdk-${version}"; - sha256 = "16i4s1adfh822ahj3ywp279lv6szwd2sn2q5pmvpg2kk6mbh410d"; + rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c"; + sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index eb25982a69b3..1c09edf3a7ea 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -2,7 +2,7 @@ let pname = "ocplib-simplex"; - version = "0.3"; + version = "0.4"; in stdenv.mkDerivation { @@ -11,13 +11,15 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "OCamlPro-Iguernlala"; repo = pname; - rev = version; - sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa"; + rev = "v${version}"; + sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ocaml findlib ]; + installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)"; + createFindlibDestdir = true; meta = { diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 71229b886e7b..8b7caef8eda5 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.0.9"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "98a94b32d4929d3e34595b4654b8e7f951182f540056b9cb734c88899912f729"; + sha256 = "15yhjbx1xwdbfkg0l1c1wgjayb55zgm8rywjymj655yaqiammm5r"; }; meta = { diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 3699fdd5d499..682dee000144 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -1,19 +1,24 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "amqplib"; - version = "0.6.1"; + version = "1.0.2"; - src = fetchurl { - url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz; - sha256 = "04nsn68wz9m24rvbssirkyighazbn20j60wjmi0r7jcpcf00sb3s"; + src = fetchPypi { + inherit pname version; + extension = "tgz"; + sha256 = "843d69b681a60afd21fbf50f310404ec67fcdf9d13dfcf6e9d41f3b456217e5b"; }; - # error: invalid command 'test' + # testing assumes network connection doCheck = false; + checkPhase = '' + ${python.interpreter} tests/client_0_8/run_all.py + ''; + meta = with stdenv.lib; { - homepage = http://code.google.com/p/py-amqplib/; + homepage = https://github.com/barryp/py-amqplib; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix new file mode 100644 index 000000000000..5d664e77d295 --- /dev/null +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, future +}: + +buildPythonPackage rec { + version = "0.2.1"; + pname = "atsim.potentials"; + + src = fetchPypi { + inherit pname version; + sha256 = "2abdec2fb4e8198f4e0e41634ad86625d5356a4a3f1ba1f41568d0697df8f36f"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ future ]; + + # tests are not included with release + doCheck = false; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/mjdr/atsim_potentials; + description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix new file mode 100644 index 000000000000..00cc67d34bd9 --- /dev/null +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -0,0 +1,32 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-nspkg +, isPyPy +, python +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-common"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491"; + }; + + propagatedBuildInputs = [ azure-nspkg ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix new file mode 100644 index 000000000000..5ba49d1f3f1f --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -0,0 +1,33 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-common +, azure-mgmt-nspkg +, requests +}: + +buildPythonPackage rec { + version = "0.20.0"; + pname = "azure-mgmt-common"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; + }; + + propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix new file mode 100644 index 000000000000..4ea60f2f29a5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + +buildPythonPackage rec { + version = "0.20.0"; + pname = "azure-mgmt-compute"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix new file mode 100644 index 000000000000..fd47f8895fd4 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-mgmt-common +, python +}: + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-mgmt-network"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix new file mode 100644 index 000000000000..aa037b48b4f5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -0,0 +1,25 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-nspkg +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-mgmt-nspkg"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; + }; + + propagatedBuildInputs = [ azure-nspkg ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix new file mode 100644 index 000000000000..b60e3aee3402 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -0,0 +1,38 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-mgmt-resource"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix new file mode 100644 index 000000000000..2e0523bb25cc --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + +buildPythonPackage rec { + version = "0.20.0"; + pname = "azure-mgmt-storage"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix new file mode 100644 index 000000000000..fb06758c5d40 --- /dev/null +++ b/pkgs/development/python-modules/azure-nspkg/default.nix @@ -0,0 +1,22 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-nspkg"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "293f286c15ea123761f30f5b1cb5adebe5f1e5009efade923c6dd1e017621bf7"; + }; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix new file mode 100644 index 000000000000..8fb27be0e51f --- /dev/null +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -0,0 +1,31 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-common +, requests +, python +}: + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-servicemanagement-legacy"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs"; + }; + + propagatedBuildInputs = [ azure-common requests ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix new file mode 100644 index 000000000000..6693a7464d43 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -0,0 +1,35 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-common +, futures +, dateutil +, requests +, isPy3k +}: + +buildPythonPackage rec { + version = "0.20.3"; + pname = "azure-storage"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + }; + + propagatedBuildInputs = [ azure-common dateutil requests ] + ++ pkgs.lib.optionals (!isPy3k) [ futures ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix new file mode 100644 index 000000000000..c021e483d943 --- /dev/null +++ b/pkgs/development/python-modules/azure/default.nix @@ -0,0 +1,39 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, dateutil +, futures +, pyopenssl +, requests +, pythonOlder +, isPy3k +}: + +buildPythonPackage rec { + version = "0.11.0"; + pname = "azure"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24"; + }; + + propagatedBuildInputs = [ dateutil pyopenssl requests ] + ++ pkgs.lib.optionals (!isPy3k) [ futures ]; + + # depends on futures for python 3 (not necissary) + patchPhase = if (!isPy3k) then "" else '' + sed -i -e "s/'futures'//" setup.py + ''; + + # tests are not packaged in pypi release + doCheck = false; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix new file mode 100644 index 000000000000..e58f071589a6 --- /dev/null +++ b/pkgs/development/python-modules/boto/default.nix @@ -0,0 +1,38 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, nose +, mock +, requests +, httpretty +}: + +buildPythonPackage rec { + pname = "boto"; + version = "2.49.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"; + }; + + checkPhase = '' + ${python.interpreter} tests/test.py default + ''; + + checkInputs = [ nose mock ]; + propagatedBuildInputs = [ requests httpretty ]; + + meta = with pkgs.lib; { + homepage = https://github.com/boto/boto; + license = licenses.mit; + description = "Python interface to Amazon Web Services"; + longDescription = '' + The boto module is an integrated interface to current and + future infrastructural services offered by Amazon Web + Services. This includes S3, SQS, EC2, among others. + ''; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ba65297dbb9c..c8c9267265d9 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.15"; + version = "1.11.16"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi"; + sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 0bfe43a20e18..bf04f5e61197 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.8"; + version = "2.0.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8"; + sha256 = "0sgx548zp5xf8dajiamdskbrphssiyajhgbw8iza6b68mda4bnfn"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index f66215c84db1..f79a7c49ca9b 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.1"; + version = "2.1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b7p6d77xqs2hdq2k1amqgbr3050zn5i8asz5w2lxajqnvb1rk71"; + sha256 = "0ibbs76pzy8zd47yviljrp1s66fmbf5b62fixayaznj7pdzavg7g"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix new file mode 100644 index 000000000000..7c071a5cee6b --- /dev/null +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "eradicate"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "092zmck919bn6sl31ixrzhn88g9nvhwzmwzpq8dzgn6c8k2h3bzr"; + }; + + meta = with lib; { + description = "eradicate removes commented-out code from Python files."; + homepage = https://github.com/myint/eradicate; + license = [ licenses.mit ]; + + maintainers = [ maintainers.mmlb ]; + }; +} diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix new file mode 100644 index 000000000000..869e26d675a3 --- /dev/null +++ b/pkgs/development/python-modules/fdint/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cython +, numpy +, python +, isPy3k +}: + +buildPythonPackage rec { + version = "2.0.2"; + pname = "fdint"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "30db139684d362652670e2cd3206b5dd7b3b93b86c3aff37f4b4fd4a3f98aead"; + }; + + buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy ]; + + # tests not included with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} -m fdint.tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/scott-maddox/fdint; + description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix new file mode 100644 index 000000000000..d6c6a41ae084 --- /dev/null +++ b/pkgs/development/python-modules/gsd/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + version = "1.5.2"; + pname = "gsd"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ce73a9bc7b79968a2b96cc2b0934e2cbe11700adbd02b4b492fea1e3d4d51f4"; + }; + + propagatedBuildInputs = [ numpy ]; + + # tests not packaged with gsd + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/glotzer/gsd; + description = "General simulation data file format"; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/histbook/default.nix b/pkgs/development/python-modules/histbook/default.nix new file mode 100644 index 000000000000..8c44bd3ebdae --- /dev/null +++ b/pkgs/development/python-modules/histbook/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, numpy, pandas }: + +buildPythonPackage rec { + pname = "histbook"; + version = "1.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "12d5l4c5pxwac5hzcfif51j87qjljm0w9nd0c8pnhj7q2snap4x4"; + }; + + propagatedBuildInputs = [ numpy pandas ]; + + meta = with lib; { + homepage = https://github.com/scikit-hep/histbook; + description = "Versatile, high-performance histogram toolkit for Numpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix new file mode 100644 index 000000000000..4afdb1a1dc9c --- /dev/null +++ b/pkgs/development/python-modules/imutils/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, opencv3 +}: + +buildPythonPackage rec { + version = "0.5.1"; + pname = "imutils"; + + src = fetchPypi { + inherit pname version; + sha256 = "37d17adc9e71386c59b28f4ef5972ef6fe0023714fa1a652b8edc83f7ce0654c"; + }; + + propagatedBuildInputs = [ opencv3 ]; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/jrosebr1/imutils; + description = "A series of convenience functions to make basic image processing functions"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index f57ac12c0da8..36407fd684ae 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, typing, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: buildPythonPackage rec { pname = "mypy_extensions"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "04h8brrbbx151dfa2cvvlnxgmb5wa00mhd2z7nd20s8kyibfkq1p"; }; - propagatedBuildInputs = [ typing ]; + propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ]; meta = with stdenv.lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix new file mode 100644 index 000000000000..7cfc42e352b6 --- /dev/null +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonAtLeast +}: + +buildPythonPackage rec { + version = "0.9.1"; + pname = "nest_asyncio"; + disabled = !(pythonAtLeast "3.5"); + + src = fetchPypi { + inherit pname version; + sha256 = "0844af67deda3243389d47cd8754b6775c5c828345e0277beca7bd008d273392"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/erdewit/nest_asyncio; + description = "Patch asyncio to allow nested event loops"; + license = licenses.bsdOriginal; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix new file mode 100644 index 000000000000..4b8269136ad2 --- /dev/null +++ b/pkgs/development/python-modules/progress/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "1.4"; + pname = "progress"; + + src = fetchPypi { + inherit pname version; + sha256 = "5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a"; + }; + + # tests not packaged with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} test_progress.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/verigak/progress/; + description = "Easy to use progress bars"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix new file mode 100644 index 000000000000..5bcf07f10157 --- /dev/null +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, six +, mypy_extensions +, typing +, pytest +}: + +buildPythonPackage rec { + version = "1.0.6"; + pname = "pyannotate"; + + src = fetchPypi { + inherit pname version; + sha256 = "dbdc2a26cbf45490a650e976ba45f99abe9ddbf0af5746307914e5ef419e325e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six mypy_extensions ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/dropbox/pyannotate; + description = "Auto-generate PEP-484 annotations"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index e73b1717331c..8ebb88fa6a73 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,8 +1,7 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }: let - _arrow-cpp = arrow-cpp.override { inherit python;}; - _parquet-cpp = parquet-cpp.override { arrow-cpp = _arrow-cpp; }; + _arrow-cpp = arrow-cpp.override { inherit python; }; in buildPythonPackage rec { @@ -17,18 +16,11 @@ buildPythonPackage rec { checkInputs = [ pandas pytest pytestrunner JPype1 ]; PYARROW_BUILD_TYPE = "release"; - PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib"; - - preBuild = '' - substituteInPlace CMakeLists.txt --replace "\''${ARROW_ABI_VERSION}" '"0.0.0"' - substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"' - - # fix the hardcoded value - substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${_parquet-cpp.version}")' - ''; + PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; preCheck = '' rm pyarrow/tests/test_hdfs.py + rm pyarrow/tests/test_cuda.py # fails: "ArrowNotImplementedError: Unsupported numpy type 22" substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled" @@ -47,7 +39,7 @@ buildPythonPackage rec { ''; ARROW_HOME = _arrow-cpp; - PARQUET_HOME = _parquet-cpp; + PARQUET_HOME = _arrow-cpp; setupPyBuildFlags = ["--with-parquet" ]; diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index c4ef98b43ef6..c463ab8823c8 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -1,22 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, mccabe, pycodestyle, pydocstyle, pyflakes +{ lib, buildPythonPackage, fetchPypi +, eradicate, mccabe, pycodestyle, pydocstyle, pyflakes , pytest, ipdb }: buildPythonPackage rec { pname = "pylama"; - version = "7.4.3"; + version = "7.5.5"; src = fetchPypi { inherit pname version; - sha256 = "390c1dab1daebdf3d6acc923e551b035c3faa77d8b96b98530c230493f9ec712"; + sha256 = "1zg7wca9s5srvbj3kawalv4438l47hg7m6gaw8rd4i43lbyyqya6"; }; - patches = fetchpatch { - url = "${meta.homepage}/pull/116.patch"; - sha256 = "00jz5k2w0xahs1m3s603j6l4cwzz92qsbbk81fh17nq0f47999mv"; - }; - - propagatedBuildInputs = [ mccabe pycodestyle pydocstyle pyflakes ]; + propagatedBuildInputs = [ + eradicate + mccabe + pycodestyle + pydocstyle + pyflakes + ]; checkInputs = [ pytest ipdb ]; @@ -27,7 +28,7 @@ buildPythonPackage rec { description = "Code audit tool for python"; homepage = https://github.com/klen/pylama; # ambiguous license declarations: https://github.com/klen/pylama/issues/64 - license = licenses.lgpl3; + license = [ licenses.lgpl3 ]; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix new file mode 100644 index 000000000000..581de7beeebc --- /dev/null +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyannotate +, pytest +}: + +buildPythonPackage rec { + version = "1.0.2"; + pname = "pytest-annotate"; + + src = fetchPypi { + inherit pname version; + sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3"; + }; + + propagatedBuildInputs = [ pyannotate pytest ]; + + # not testing for a testing module... + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/kensho-technologies/pytest-annotate; + description = "Generate PyAnnotate annotations from your pytest tests"; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix new file mode 100644 index 000000000000..09d8aa40e197 --- /dev/null +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ansible +, pytest +, mock +, isPy3k +}: + +buildPythonPackage rec { + version = "2.0.1"; + pname = "pytest-ansible"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "553f2bc9e64f8c871ad29b7d5c100f6e549fe85db26bd1ff5dda8b769bb38a3e"; + }; + + patchPhase = '' + sed -i "s/'setuptools-markdown'//g" setup.py + ''; + + # requires pandoc < 2.0 + # buildInputs = [ setuptools-markdown ]; + checkInputs = [ mock ]; + propagatedBuildInputs = [ ansible pytest ]; + + # tests not included with release + doCheck = false; + + checkPhase = '' + pytest tests + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/jlaska/pytest-ansible; + description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix new file mode 100644 index 000000000000..83bdcec86bd2 --- /dev/null +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.3.2"; + pname = "pyvoro"; + + src = fetchPypi { + inherit pname version; + sha256 = "f31c047f6e4fc5f66eb0ab43afd046ba82ce247e18071141791364c4998716fc"; + }; + + # No tests in package + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/joe-jordan/pyvoro; + description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index b09da2d4cecf..cad2a93640ae 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -72,7 +72,7 @@ in buildPythonPackage rec { ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn nvidia_x11 ]); in lib.optionalString (stdenv.isLinux) '' - rrPath="$out/${python.sitePackages}/tensorflow/:${rpath}" + rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}" internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" find $out -name '*${stdenv.hostPlatform.extensions.sharedLibrary}' -exec patchelf --set-rpath "$rrPath" {} \; ''; diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix new file mode 100644 index 000000000000..ab6a4183df50 --- /dev/null +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -0,0 +1,35 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, pytest +, python +, cssutils +, isPyPy +}: + +buildPythonPackage rec { + pname = "tinycss"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ cssutils ]; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + # Disable Cython tests for PyPy + TINYCSS_SKIP_SPEEDUPS_TESTS = pkgs.lib.optional isPyPy true; + + meta = with pkgs.lib; { + description = "Complete yet simple CSS parser for Python"; + license = licenses.bsd3; + homepage = https://pythonhosted.org/tinycss/; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix new file mode 100644 index 000000000000..8697d5dc4427 --- /dev/null +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, pandas +, imutils +, progress +, matplotlib +, pytest +}: + +buildPythonPackage rec { + version = "0.1.5"; + pname = "vidstab"; + + src = fetchPypi { + inherit pname version; + sha256 = "b775652cc4f41812de04bc443ad522c1bdaef456a00c74857e9ebc5d2066e362"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; + + # tests not packaged with pypi + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/AdamSpannbauer/python_video_stab; + description = "Video Stabilization using OpenCV"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix new file mode 100644 index 000000000000..10ed99e3ffe6 --- /dev/null +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -0,0 +1,29 @@ +{ lib, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + pname = "cpplint"; + version = "1.3.0"; + + # Fetch from github instead of pypi, since the test cases are not in the pypi archive + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "107v7bp35kxbv9v7wl79h7115z1m4b48rhasp0cnivql1grd277i"; + }; + + postPatch = '' + patchShebangs cpplint_unittest.py + ''; + + checkPhase = '' + ./cpplint_unittest.py + ''; + + meta = with lib; { + homepage = https://github.com/cpplint/cpplint; + description = "Static code checker for C++"; + maintainers = [ maintainers.bhipple ]; + license = [ licenses.bsd3 ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a6a6e9a11054..0f7fc4804906 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.138.1"; + version = "2.138.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "09svkqii9lv1br0al6wjn1l0fsqf6s7fdrfc0awmfsg8fmjlpf7c"; + sha256 = "10qyr8izngnhlr1b03a9vdnbmwprbqsjnd55hjdalmxy6dq5mvfq"; }; buildCommand = '' diff --git a/pkgs/development/tools/continuous-integration/jenkins/update.sh b/pkgs/development/tools/continuous-integration/jenkins/update.sh new file mode 100755 index 000000000000..e8b6d9257758 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/jenkins/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts jq + +set -eu -o pipefail + +core_json="$(curl --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" + +version="$(jq -r .version <<<$core_json)" +sha256="$(jq -r .sha256 <<<$core_json)" +hash="$(nix-hash --type sha256 --to-base32 "$sha256")" +url="$(jq -r .url <<<$core_json)" + +update-source-version jenkins "$version" "$hash" "$url" diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 469e64acff06..d75a7e0ee3db 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "bison-3.0.5"; + name = "bison-3.1"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd"; + sha256 = "0ip9krjf0lw57pk3wfbxgjhif1i18hm3vh35d1ifrvhnafskdjx7"; }; patches = []; # remove on another rebuild diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 784c59c7c1e1..471808980082 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.11.0"; - sha256 = "16wfgwnb2yd6y608svj2fizdq3sid44m0wqn4swkvclxb71444mr"; + version = "10.12.0"; + sha256 = "1r0aqcxafha13ks8586x77n77zi88db259cpaix0y1ivdh6qkkfr"; } diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix new file mode 100644 index 000000000000..911e03daa371 --- /dev/null +++ b/pkgs/development/web/now-cli/default.nix @@ -0,0 +1,87 @@ +{ stdenv, lib, fetchurl }: +stdenv.mkDerivation rec { + name = "now-cli-${version}"; + version = "11.4.6"; + + # TODO: switch to building from source, if possible + src = fetchurl { + url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; + sha256 = "1bl0yrzxdfy6sks674qlfch8mg3b0x1wj488v83glags8ibsg3cl"; + }; + + sourceRoot = "."; + unpackCmd = '' + gunzip -c $curSrc > now-linux + ''; + + buildPhase = ":"; + + installPhase = '' + mkdir $out + mkdir $out/bin + cp now-linux $out/bin/now + ''; + + # now is a node program packaged using zeit/pkg. + # thus, it contains hardcoded offsets. + # patchelf shifts these locations when it expands headers. + + # this could probably be generalised into allowing any program packaged + # with zeit/pkg to be run on nixos. + + preFixup = let + libPath = lib.makeLibraryPath [stdenv.cc.cc]; + in '' + + orig_size=$(stat --printf=%s $out/bin/now) + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/now + patchelf --set-rpath ${libPath} $out/bin/now + chmod +x $out/bin/now + + new_size=$(stat --printf=%s $out/bin/now) + + ###### zeit-pkg fixing starts here. + # we're replacing plaintext js code that looks like + # PAYLOAD_POSITION = '1234 ' | 0 + # [...] + # PRELUDE_POSITION = '1234 ' | 0 + # ^-----20-chars-----^^------22-chars------^ + # ^-- grep points here + # + # var_* are as described above + # shift_by seems to be safe so long as all patchelf adjustments occur + # before any locations pointed to by hardcoded offsets + + var_skip=20 + var_select=22 + shift_by=$(expr $new_size - $orig_size) + + function fix_offset { + # $1 = name of variable to adjust + location=$(grep -obUam1 "$1" $out/bin/now | cut -d: -f1) + location=$(expr $location + $var_skip) + + value=$(dd if=$out/bin/now iflag=count_bytes,skip_bytes skip=$location \ + bs=1 count=$var_select status=none) + value=$(expr $shift_by + $value) + + echo -n $value | dd of=$out/bin/now bs=1 seek=$location conv=notrunc + } + + fix_offset PAYLOAD_POSITION + fix_offset PRELUDE_POSITION + + ''; + dontStrip = true; + + + + meta = with stdenv.lib; { + homepage = https://zeit.co/now; + description = "The Command Line Interface for Now - Global Serverless Deployments"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.bhall ]; + }; +} \ No newline at end of file |