diff options
23 files changed, 293 insertions, 42 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d7463385ae587..1913e321a8c8a 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,4 +8,4 @@ ## Technical details -Please run `nix run nixpkgs.nix-info -c nix-info -m` and paste the result. +Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8cc9a80758d33..07c93f84fe0a2 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ If applicable, add screenshots to help explain your problem. Add any other context about the problem here. **Metadata** -Please run `nix run nixpkgs.nix-info -c nix-info -m` and paste the result. +Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. Maintainer information: ```yaml diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 97192f0c7ac08..f8962501ebdcb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7290,6 +7290,11 @@ githubId = 797581; name = "Vincent Bernardoff"; }; + vcanadi = { + email = "vito.canadi@gmail.com"; + github = "vcanadi"; + name = "Vitomir Čanadi"; + }; vcunat = { name = "Vladimír Čunát"; email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03 diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index d7149b35d4c0c..c2f2578733baf 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/6chjfy4j6hjwj5f8zcbbdg02i21x1qsi-nix-2.3.1"; - i686-linux = "/nix/store/xa8z7fwszjjm4kiwrxfc8xv9c1pzzm7a-nix-2.3.1"; - aarch64-linux = "/nix/store/8cac1ivcnchlpzmdjby2f71l1fwpnymr-nix-2.3.1"; - x86_64-darwin = "/nix/store/6639l9815ggdnb4aka22qcjy7p8w4hb9-nix-2.3.1"; + x86_64-linux = "/nix/store/0q5qnh10m2sfrriszc1ysmggw659q6qm-nix-2.3.2"; + i686-linux = "/nix/store/i7ad7r5d8a5b3l22hg4a1im2qq05y6vd-nix-2.3.2"; + aarch64-linux = "/nix/store/bv06pavfw0dbqzr8w3l7s71nx27gnxa0-nix-2.3.2"; + x86_64-darwin = "/nix/store/x6mnl1nij7y4v5ihlplr4k937ayr403r-nix-2.3.2"; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 40e69f8c9bcb4..0bfa850cb26e0 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -146,6 +146,7 @@ let krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + ksudoku = callPackage ./ksudoku.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; ktouch = callPackage ./ktouch.nix {}; diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix new file mode 100644 index 0000000000000..3641c1b333237 --- /dev/null +++ b/pkgs/applications/kde/ksudoku.nix @@ -0,0 +1,18 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, libGLU +, kdoctools +, kdeclarative +, libkdegames +}: + +mkDerivation { + name = "ksudoku"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libGLU kdeclarative libkdegames ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ genesis ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index edc5f9d7bfb0a..fa3970c4b1581 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "git-bug"; - version = "0.5.0"; - rev = "8d7a2c076a38c89085fd3191a2998efb659650c2"; + version = "0.6.0"; + rev = "fc568209f073b9d775a09e0dbb8289cf9e5749bf"; goPackagePath = "github.com/MichaelMure/git-bug"; src = fetchFromGitHub { inherit rev; owner = "MichaelMure"; repo = "git-bug"; - sha256 = "1l86m0y360lmpmpw2id0k7zc2nyq1irr26k2ik06lxhzvpbyajz6"; + sha256 = "1s18lzip52qpf52ad6m20j306mr16vnwhz9f7rirsa6b7srmcgli"; }; buildFlagsArray = '' diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix new file mode 100644 index 0000000000000..b5c59a83277dd --- /dev/null +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: + +with stdenv.lib; + +let + version = "1.3.0"; + incfile = builtins.toFile "make.inc.custom" '' + CC = g++ + FORT = gfortran + + ARCH = ar + ARCHFLAGS = cr + RANLIB = ranlib + + OPTS = -fPIC -O3 -DADD_ -Wall + FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input + F77OPTS = -fPIC -O3 -DADD_ -Wall + LDOPTS = -fPIC + + -include make.check-mkl + -include make.check-clblas + + # Gnu mkl is not available I guess? + #LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp + LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp + LIB += -lclBLAS -lOpenCL + + LIBDIR = -L$(MKLROOT)/lib/intel64 \ + -L$(MKLROOT)/../compiler/lib/intel64 \ + -L$(clBLAS)/lib64 + + INC = -I$(clBLAS)/include + #-I$(AMDAPP)/include + ''; +in stdenv.mkDerivation { + name = "clmagma-${version}"; + src = fetchurl { + url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; + sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; + name = "clmagma-${version}.tar.gz"; + }; + + buildInputs = [ + gfortran + clblas + opencl-headers + ocl-icd + mkl + intel-ocl + ]; + + enableParallelBuilding=true; + + MKLROOT = "${mkl}"; + clBLAS = "${clblas}"; + + # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, + # which is not available. + OPENCL_VENDOR_PATH="${intel-ocl}/etc/OpenCL/vendors"; + + preBuild = '' + # By default it tries to use GPU, and thus fails for CPUs + sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp + sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal + cp ${incfile} make.inc + ''; + + meta = with stdenv.lib; { + description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; + license = licenses.bsd3; + homepage = http://icl.cs.utk.edu/magma/index.html; + platforms = platforms.linux; + maintainers = with maintainers; [ volhovm ]; + }; +} diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix new file mode 100644 index 0000000000000..c1dacc84da0c7 --- /dev/null +++ b/pkgs/development/python-modules/notedown/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nbconvert +, nbformat +, notebook +, pandoc-attributes +, six +}: + +buildPythonPackage rec { + pname = "notedown"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee"; + }; + + propagatedBuildInputs = [ + notebook + nbconvert + nbformat + pandoc-attributes + six + ]; + + # No tests in pypi source + doCheck = false; + + meta = { + homepage = https://github.com/aaren/notedown; + description = "Convert IPython Notebooks to markdown (and back)"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vcanadi ]; + }; +} diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix new file mode 100644 index 0000000000000..8b5652bfb5441 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-attributes/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pandocfilters +}: + +buildPythonPackage rec { + pname = "pandoc-attributes"; + version = "0.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "69221502dac74f5df1317011ce62c85a83eef5da3b71c63b1908e98224304a8c"; + }; + + propagatedBuildInputs = [ + pandocfilters + ]; + + # No tests in pypi source + doCheck = false; + + meta = { + homepage = https://github.com/aaren/pandoc-attributes; + description = "An Attribute class to be used with pandocfilters"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vcanadi ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 76e60fda86a87..a8c66a49fb8ce 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -28,7 +29,7 @@ buildPythonPackage rec { cmakeFlags = [ "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" - ] ++ lib.optionals (python.isPy3k) [ + ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ # Enable some tests only on Python 3. The "test_string_view" test # 'testTypeError: string_view16_chars(): incompatible function arguments' # fails on Python 2. diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch new file mode 100644 index 0000000000000..847a6e076918b --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch @@ -0,0 +1,22 @@ +diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py +index ee21113..a4f4589 100644 +--- a/sphinxcontrib/tikz.py ++++ b/sphinxcontrib/tikz.py +@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + tf.write(latex) + tf.close() + +- system([self.builder.config.latex_engine, '--interaction=nonstopmode', ++ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode', + 'tikz-%s.tex' % shasum], + self.builder) + +@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + '-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution, + '-f', 'tikz-%s.pdf' % shasum], self.builder) + elif self.builder.config.tikz_proc_suite == "pdf2svg": +- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) ++ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) + else: + self.builder._tikz_warned = True + raise TikzExtError('Error (tikz extension): Invalid configuration ' diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix new file mode 100644 index 0000000000000..15585679a2939 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -0,0 +1,38 @@ +{ lib +, substituteAll +, buildPythonPackage +, fetchPypi +, sphinx +, pdf2svg +, texLive +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-tikz"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f362b11e3c2bd17d5f0f07fec03917c16fc5bbcda6fe31ee137c547ed6b03a3"; + }; + + patches = [ + (substituteAll { + src = ./binary-paths.patch; + inherit texLive pdf2svg; + }) + ]; + + propagatedBuildInputs = [ sphinx ]; + + # no tests in package + doCheck = false; + + meta = with lib; { + description = "TikZ extension for Sphinx"; + homepage = https://bitbucket.org/philexander/tikz; + maintainers = with maintainers; [ costrouc ]; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 65d3006a3b86d..de31057af14d5 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.27"; + version = "2.1.28"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "1ajj515ck5n0mzig77xnq1qgb2s4gf6ahgd5mab91406jvij9qf3"; + sha256 = "1zifbcqy9hmcdbz7sl046l2631f5a3j65kyin38l7wm7vrqx9s3h"; }; - cargoSha256 = "0ki5j5gh59c92a0w43kzljpiamv2jvyk4m2w8qldfyl5kaa40dxb"; + cargoSha256 = "1ys1yb939y144lhjr451cpqrayqn66r0zp71xm90fkqxsbv7wkqv"; buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = https://github.com/racer-rust/racer; license = licenses.mit; - maintainers = with maintainers; [ jagajaga ]; + maintainers = with maintainers; [ jagajaga ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index b43da123e2469..0256476218ab9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.92"; + version = "4.19.93"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18l3k0hgyanh6axgmmaaff139vpw6lf3fcf9iglpqwgspgw7rhr9"; + sha256 = "0d2qgwnmvnwbsijc8k85sgmywyrv55wpah6qwjk6kgx8h8zx5x9a"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 0eb57180644aa..89cbf776ac06b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.7"; + version = "5.4.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1jgwg5qb7lb30m5ywvpfagzrl6d0i524qpy3v99mina6j4fv5jdb"; + sha256 = "0llss8hbzkwqxx92y419vj2jvq0d8k52iivh3f59wgqr0b4i9i22"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 22fe4eae52eaf..cb6768a348ba7 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17163"; + rev = "17165"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ac4594be05ab4..e53ee1394edfb 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-01-01"; + version = "2020-01-04"; pname = "oh-my-zsh"; - rev = "ca627655dbd1d110dbea34ec4a8c1964a1da83d2"; + rev = "78b07e92fd4a3a5e1f92ee4e3d680c39b72c2245"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1hr7qaad8mr8bvx54ql5q97da6fhppdgk087mc5flygky6vf4yp6"; + sha256 = "1s5vr89dxgm1g3jcqybx4an80x0gmda4lh8y36r2dafxwmb09qmk"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch b/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch new file mode 100644 index 0000000000000..d79d9e3531f3f --- /dev/null +++ b/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch @@ -0,0 +1,26 @@ +From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 5 Jan 2020 15:35:15 +0100 +Subject: [PATCH] Fix darwin build + +--- + rwcancel/select_default.go | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go +index dd23cda..03f3452 100644 +--- a/rwcancel/select_default.go ++++ b/rwcancel/select_default.go +@@ -9,6 +9,7 @@ package rwcancel + + import "golang.org/x/sys/unix" + +-func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error { +- return unix.Select(nfd, r, w, e, timeout) ++func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) { ++ _, err = unix.Select(nfd, r, w, e, timeout) ++ return + } +-- +2.23.1 + diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 08ef1d3499c64..8832560b3b103 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -11,6 +11,8 @@ buildGoPackage rec { sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i"; }; + patches = [ ./0001-Fix-darwin-build.patch ]; + goDeps = ./deps.nix; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5cd8bf22cac94..28413971c004d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,7 +2,7 @@ , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, aws-sdk-cpp, boehmgc, boost +, boehmgc , stdenv, llvmPackages_6 }: @@ -170,17 +170,17 @@ in rec { # Nix1 has the perl bindings by default, so no need to build the manually. includesPerl = true; - inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; }; nixStable = callPackage common (rec { - name = "nix-2.3.1"; + name = "nix-2.3.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b"; + sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8"; }; - inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; } // stdenv.lib.optionalAttrs stdenv.cc.isClang { stdenv = llvmPackages_6.stdenv; }); @@ -196,7 +196,7 @@ in rec { }; fromGit = true; - inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; }); nixFlakes = lib.lowPrio (callPackage common rec { @@ -210,7 +210,7 @@ in rec { }; fromGit = true; - inherit storeDir stateDir confDir stdenv aws-sdk-cpp boehmgc boost; + inherit storeDir stateDir confDir boehmgc; }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99b1aa1a02a8e..7ac4f781ad7e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23883,6 +23883,7 @@ in lie = callPackage ../applications/science/math/LiE { }; magma = callPackage ../development/libraries/science/math/magma { }; + clmagma = callPackage ../development/libraries/science/math/clmagma { }; mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; @@ -24763,18 +24764,6 @@ in storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; boehmgc = boehmgc.override { enableLargeConfig = true; }; - # Tarball evaluation fails with a gcc9 based nix-env. - # $ nix-build pkgs/top-level/release.nix -A tarball - stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv; - aws-sdk-cpp = aws-sdk-cpp.override { - stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv; - }; - boost = boost.override { - buildPackages = buildPackages // { - stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv; - }; - stdenv = if stdenv.cc.isGNU then gcc8Stdenv else stdenv; - }; }) nix nix1 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a4832784404a..6d41aaf336464 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4294,6 +4294,8 @@ in { notebook = if isPy3k then callPackage ../development/python-modules/notebook { } else callPackage ../development/python-modules/notebook/2.nix { }; + notedown = callPackage ../development/python-modules/notedown { }; + notify = callPackage ../development/python-modules/notify { }; notify2 = callPackage ../development/python-modules/notify2 {}; @@ -5792,6 +5794,10 @@ in { sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; + sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz { + texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; + }; + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; Pweave = callPackage ../development/python-modules/pweave { }; @@ -6334,6 +6340,8 @@ in { pandocfilters = callPackage ../development/python-modules/pandocfilters { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + htmltreediff = callPackage ../development/python-modules/htmltreediff { }; repeated_test = callPackage ../development/python-modules/repeated_test { }; |