diff options
35 files changed, 383 insertions, 315 deletions
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index 49b5c935267b..6c53a2df6306 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -33,6 +33,8 @@ in { }; config = mkIf cfg.enable { + boot.kernelModules = [ "dummy" ]; + networking.interfaces.dummy0 = { ipAddress = "169.254.169.254"; prefixLength = 32; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 95f3c0801d2a..9aae3991ae26 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -253,19 +253,6 @@ in update-channel = "gogland_1.0_EAP"; }; - idea14-community = buildIdea rec { - name = "idea-community-${version}"; - version = "14.1.7"; - description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; - license = stdenv.lib.licenses.asl20; - src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz"; - }; - wmClass = "jetbrains-idea-ce"; - update-channel = "IDEA14.1"; - }; - idea-community = buildIdea rec { name = "idea-community-${version}"; version = "2017.2.2"; /* updated by script */ @@ -279,32 +266,6 @@ in update-channel = "IDEA_Release"; }; - idea14-ultimate = buildIdea rec { - name = "idea-ultimate-${version}"; - version = "14.1.7"; - description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1hhga1i2zbsipgq283gn19kv9n94inhr1bxh2yx19gz7yr4r49d2"; - }; - wmClass = "jetbrains-idea"; - update-channel = "IDEA14.1"; - }; - - idea15-ultimate = buildIdea rec { - name = "idea-ultimate-${version}"; - version = "15.0.6"; - description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll"; - }; - wmClass = "jetbrains-idea"; - update-channel = null; - }; - idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; version = "2017.2.2"; /* updated by script */ @@ -331,19 +292,6 @@ in update-channel = "PS2017.2"; }; - phpstorm10 = buildPhpStorm rec { - name = "phpstorm-${version}"; - version = "10.0.4"; - description = "Professional IDE for Web and PHP developers"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; - }; - wmClass = "jetbrains-phpstorm"; - update-channel = "WI10"; - }; - pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; version = "2017.2.2"; /* updated by script */ @@ -396,32 +344,6 @@ in update-channel = "rm2017.1"; }; - ruby-mine7 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "7.1.5"; - description = "The Most Intelligent Ruby and Rails IDE"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; - }; - wmClass = "jetbrains-rubymine"; - update-channel = null; - }; - - ruby-mine8 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "8.0.4"; - description = "The Most Intelligent Ruby and Rails IDE"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; - }; - wmClass = "jetbrains-rubymine"; - update-channel = null; - }; - webstorm = buildWebStorm rec { name = "webstorm-${version}"; version = "2017.2.2"; /* updated by script */ @@ -435,29 +357,4 @@ in update-channel = "WS_Release"; }; - webstorm10 = buildWebStorm rec { - name = "webstorm-${version}"; - version = "10.0.5"; - description = "Professional IDE for Web and JavaScript development"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic"; - }; - wmClass = "jetbrains-webstorm"; - update-channel = null; - }; - - webstorm11 = buildWebStorm rec { - name = "webstorm-${version}"; - version = "11.0.4"; - description = "Professional IDE for Web and JavaScript development"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "17agyqdyz6naxyx6p0y240ar93gja0ypw01nm2qmfzvh7ch03r24"; - }; - wmClass = "jetbrains-webstorm"; - update-channel = null; - }; } diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 4eefb207fd75..2f110749277c 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; - buildInputs = [ ncurses pkgconfig ] + nativeBuildInputs = [ gettext pkgconfig ]; + buildInputs = [ ncurses ] ++ stdenv.lib.optionals hostPlatform.isDarwin [ Carbon Cocoa ]; - nativeBuildInputs = [ gettext ]; configureFlags = [ "--enable-multibyte" diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index e0de8facd3f2..f72af1908c50 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.16.0"; + version = "1.16.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "04jf9rl5116qc3n7xgqxir9c54dpkjm210yinih0qnp1wxhb6q0m"; - "x86_64-linux" = "125xl933y4zmvp4922wm6b3p5d2xfdi9c5a7svx63p6fwxqjk33y"; - "x86_64-darwin" = "0v8v4spz31qbv5ikb4bkdfldmpj5i6ahlzwn2h5wbfzlzsl8bk24"; + "i686-linux" = "1k06rish1a1hqrkvzy21lg05vmzd345aa65g3d08ikh6508mp100"; + "x86_64-linux" = "1l2xbdvjfmf05cqcjcj3w2450vi7wvkm5zdwkmfhh01fnvbrygnw"; + "x86_64-darwin" = "0bxv3qlhcqn5sb5l5pjhi5560vi1sl844hx3r5x48gmmgd8yziaj"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 2316ce5ab298..79333e7d9fa1 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -46,17 +46,24 @@ buildRustPackage rec { pkgconfig ] ++ rpathLibs; - patchPhase = '' + postPatch = '' substituteInPlace copypasta/src/x11.rs \ --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin for f in $(find target/release -maxdepth 1 -type f); do cp $f $out/bin done; patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty + + mkdir -p $out/share/applications + cp Alacritty.desktop $out/share/applications/alacritty.desktop + + runHook postInstall ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6ca457cc1d37..cd9a71729218 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.7.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1al0vy11zvlxlrf03i631p6b419hy47pbzmgydswrii4prndj4xv"; + sha256 = "1wb0ixx11q0p5dzcszq1n2lx9bcl5dynr87d7anfiz73mxdq20za"; }; patches = [ diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 4ac0dc2eb944..b78a226b6145 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p"; }; - cmakeFlags = [ - "-DCMAKE_INSALL_PREFIX=$out" - ]; - enableParallelBuilding = true; patches = [ diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix index 7d35f1f64a8e..00a60ae50a48 100644 --- a/pkgs/applications/misc/valauncher/default.nix +++ b/pkgs/applications/misc/valauncher/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3, vala_0_26, pkgconfig, gnome3 }: +{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3 }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.3.1"; name = "valauncher-${version}"; src = fetchFromGitHub { owner = "Mic92"; repo = "valauncher"; rev = "v${version}"; - sha256 = "1d1gfmzmr5ra2rnjc6rbz31mf3hk7q04lh4i1hljgk7fh90dacb6"; + sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi"; }; - buildInputs = [ cmake gtk3 vala_0_26 pkgconfig gnome3.libgee ]; + buildInputs = [ cmake gtk3 vala pkgconfig gnome3.libgee ]; meta = with stdenv.lib; { description = "A fast dmenu-like gtk3 application launcher"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e82bd462fe32..4e3f0a684239 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.37"; + version = "0.14.38"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0mk09m5wc6g7w65cf86rrvzb2gfzbg4jrkwpsabn732iyhkkaj4z"; + sha256 = "0afid083azvrihv1v2cas09dprr2fflmj9gi7iy18gvwy2pg0jj8"; }; buildInputs = [ go removeReferencesTo ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 999faf756ed4..866be9cded9e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -86,7 +86,8 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; + inherit cc libc_bin libc_dev libc_lib binutils_bin coreutils_bin; + shell = getBin shell + shell.shellPath or ""; gnugrep_bin = if nativeTools then "" else gnugrep; binPrefix = prefix; @@ -384,10 +385,6 @@ stdenv.mkDerivation { # for substitution in utils.sh expandResponseParams = "${expand-response-params}/bin/expand-response-params"; - crossAttrs = { - shell = shell.crossDrv + shell.crossDrv.shellPath; - }; - meta = let cc_ = if cc != null then cc else {}; in (if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) // diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index 8d28879fb06f..ae17989d932b 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -6,7 +6,7 @@ # variables so that the compiler and the linker just "work". { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" -, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" +, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null , hostPlatform, targetPlatform }: @@ -56,15 +56,9 @@ stdenv.mkDerivation { langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; zlib = if gcc != null && gcc ? langVhdl then zlib else null; - shell = if shell == "" then stdenv.shell else - if builtins.isAttrs shell then (shell + shell.shellPath) - else shell; + shell = shell + shell.shellPath or ""; crossAttrs = { - shell = shell.crossDrv + shell.crossDrv.shellPath; - coreutils = coreutils.crossDrv; - binutils = binutils.crossDrv; - gcc = gcc.crossDrv; # # This is not the best way to do this. I think the reference should be # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index e543f799495f..5d952073740e 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -4,10 +4,14 @@ let self = { emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; - emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' - # hardening flags break WASM support - cat > $out/nix-support/add-hardening.sh - '' self.emscriptenfastcomp-unwrapped; + emscriptenfastcomp-wrapped = wrapCCWith { + cc = self.emscriptenfastcomp-unwrapped; + libc = stdenv.cc.libc; + extraBuildCommands = '' + # hardening flags break WASM support + cat > $out/nix-support/add-hardening.sh + ''; + }; emscriptenfastcomp = symlinkJoin { name = "emscriptenfastcomp"; paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 54f2b494e1dd..82c4a033c856 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11412,6 +11412,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "List_0_6_1" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "List"; + version = "0.6.1"; + sha256 = "0ar4bpfv9nqc3bdwg6rlcnwr5si2df38ch8m2wnnl0346yzvmjni"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/yairchu/generator"; + description = "List monad transformer and class"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListLike" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string @@ -25831,17 +25844,15 @@ self: { }) {inherit (pkgs) openssl;}; "apecs" = callPackage - ({ mkDerivation, base, containers, criterion, linear, mtl, random - , sdl2, vector + ({ mkDerivation, base, containers, criterion, linear, mtl + , QuickCheck, vector }: mkDerivation { pname = "apecs"; - version = "0.2.0.2"; - sha256 = "177cym1wfkfw2abg3hs17fj569j189vr99a98avh1nnf6bgv8hk9"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.3"; + sha256 = "0bsaxgmkcy4jpvf98frqa6dhdwzk2m59bcshb6rqx8ixllinpyvp"; libraryHaskellDepends = [ base containers mtl vector ]; - executableHaskellDepends = [ base linear random sdl2 ]; + testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion linear ]; homepage = "https://github.com/jonascarpay/apecs#readme"; description = "A fast ECS for game engine programming"; @@ -42109,6 +42120,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkmate" = callPackage + ({ mkDerivation, base, bytestring, containers, diff-parse + , directory, file-embed, filepath, github, hlint, hspec + , hspec-megaparsec, interpolatedstring-perl6, megaparsec + , monad-parallel, optparse-applicative, QuickCheck, quickcheck-text + , range, temporary, text + }: + mkDerivation { + pname = "checkmate"; + version = "0.1.3"; + sha256 = "1i0hbbgg5lh44azk5vsm6nppazgn657942rcx6h08d6925kn6l7v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers diff-parse directory filepath megaparsec + monad-parallel range text + ]; + executableHaskellDepends = [ + base diff-parse directory filepath github megaparsec + optparse-applicative range text + ]; + testHaskellDepends = [ + base bytestring diff-parse directory file-embed filepath hlint + hspec hspec-megaparsec interpolatedstring-perl6 megaparsec + QuickCheck quickcheck-text range temporary text + ]; + homepage = "https://github.com/spoqa/checkmate#readme"; + description = "Generate checklists relevant to a given patch"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "chell" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, options, patience , random, template-haskell, text, transformers @@ -52063,19 +52105,13 @@ self: { }) {}; "currency-codes" = callPackage - ({ mkDerivation, aeson, base, bson, lens, random, safe, swagger2 - , text - }: + ({ mkDerivation, aeson, base, bson, random, safe, text }: mkDerivation { pname = "currency-codes"; - version = "1.0.0.3"; - sha256 = "0lfaikcig22y79fm75jc40d6ii3xrj4firyfssyqcqbyjhvf3fyn"; - revision = "1"; - editedCabalFile = "0jp3x19zymrjxlzrg98ch2fch9a1c93g41nzcfmxc6jjy5lh7x6z"; - libraryHaskellDepends = [ - aeson base bson lens random safe swagger2 text - ]; - homepage = "https://gitlab.com/chordify/currency-codes"; + version = "2.0.0.0"; + sha256 = "0sdgnzww38l9vhjxs2b92c4j0db4ssbhxs4zrhvnfh66x6jjvnd5"; + libraryHaskellDepends = [ aeson base bson random safe text ]; + homepage = "https://github.com/chordify/currency-codes"; description = "ISO-4217 Currency Codes"; license = stdenv.lib.licenses.mit; }) {}; @@ -70865,8 +70901,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.0"; - sha256 = "0bg486byrg7mxc6j1v9fj80n43zk813riw5m5ninhyf0f34gjbwh"; + version = "0.5.4.1"; + sha256 = "0yclwq488g9mz6wsjcch7c5kwgc97rxp0lqjlfj44vbqbjk72l5x"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -80139,8 +80175,8 @@ self: { }: mkDerivation { pname = "goatee-gtk"; - version = "0.3.1.1"; - sha256 = "0pgpdk1y140pcdsyry185k0bpdhyr87bqrzk24yv65kgvqs442zm"; + version = "0.3.1.2"; + sha256 = "19qgkrv22jffvy27ykqyhgqw2qak4888r1d3x1lfs48r3bisli2h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -85359,6 +85395,30 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hackage-db_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.0"; + sha256 = "09xza82g45nv3gxmryqd2mns4bm8hr6d7hzr7nqdi6zq46s0lfgq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory filepath tar time + utf8-string + ]; + executableHaskellDepends = [ + base bytestring Cabal containers utf8-string + ]; + homepage = "https://github.com/peti/hackage-db#readme"; + description = "Access Hackage's package database via Data.Map"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hackage-diff" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process @@ -97707,8 +97767,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.5"; - sha256 = "1va5a1j4pa6yvzhk0y4pxs0q80ph3yr8jdbgy422mkvbmczxynna"; + version = "1.2.6"; + sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98214,6 +98274,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats_0_4_1_7" = callPackage + ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix-gsl-stats"; + version = "0.4.1.7"; + sha256 = "1gslgk58lzin43cvbpivhw7nrn9qyaa6qwhy1z9ypvyal5p8n3sa"; + libraryHaskellDepends = [ + base binary hmatrix storable-complex vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "http://code.haskell.org/hmatrix-gsl-stats"; + description = "GSL Statistics interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: mkDerivation { @@ -105034,8 +105112,8 @@ self: { }: mkDerivation { pname = "hsyslog-tcp"; - version = "0.1.0.0"; - sha256 = "06qlpxl5cf45a2y9ncjcngrghbhgf624a6s1yczx1pfx7zqda6i6"; + version = "0.2.0.0"; + sha256 = "1zbp8l5lj2xb6yczijd76dhdbxfzxpl7han1b01bc8qfw7pkj4g9"; libraryHaskellDepends = [ base bytestring hsyslog hsyslog-udp network text time ]; @@ -136267,7 +136345,7 @@ self: { description = "MXNet interface in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {mxnet = null;}; + }) {inherit (pkgs) mxnet;}; "mxnet-examples" = callPackage ({ mkDerivation, base, mxnet }: @@ -136297,7 +136375,7 @@ self: { description = "NNVM interface in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {mxnet = null;}; + }) {inherit (pkgs) mxnet;}; "myTestlll" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring @@ -136723,8 +136801,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.2.0.0"; - sha256 = "0s9n5zrn6jncgjnj56ffpfmlhd9pmf6r82cq5xl054rxh5kbr79p"; + version = "0.2.0.1"; + sha256 = "1vg1aflms5hwbx86a9hrs84y9fl6wi2ihgq32ag763kbih3wvcsr"; libraryHaskellDepends = [ aeson aeson-casing base bytestring conduit conduit-combinators conduit-extra containers hashable http-client http-client-tls @@ -156685,24 +156763,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_4_0_0" = callPackage + "pusher-http-haskell_1_5_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector + , containers, cryptonite, hashable, hspec, HTTP, http-client + , http-types, memory, network-uri, QuickCheck, scientific, text + , time, transformers, unordered-containers, vector }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.4.0.0"; - sha256 = "0mqv3h2c20p9zzhq87xysjx7fyf3w5ggss975pxdblr5y7x18bmc"; + version = "1.5.0.0"; + sha256 = "098vj92gwzspqp0xbd4dxxb3dggpdz5gpf616p2spkj9xvdqgy17"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers + aeson base base16-bytestring bytestring containers cryptonite + hashable HTTP http-client http-types memory text time transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring hspec http-client http-types QuickCheck - scientific text transformers unordered-containers vector + aeson base base16-bytestring bytestring cryptonite hspec HTTP + http-client http-types memory network-uri QuickCheck scientific + text time transformers unordered-containers vector ]; homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; @@ -157691,6 +157770,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.16"; sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1"; + revision = "1"; + editedCabalFile = "1sfqjhk7z185l0gxrvn5pi3s8mvnqv1d1yzrx0k0mi48y5421jcm"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific tagged text time @@ -181334,8 +181415,8 @@ self: { }: mkDerivation { pname = "static-tensor"; - version = "0.1.0.0"; - sha256 = "118srwpc648s2472mbr14y7pkf7swfd19p4na0s3b4jxqzrxf4wj"; + version = "0.2.0.0"; + sha256 = "1jnl9gv2z4554arzfkrna49vn646i4q57l3g8pq4phzzmq79hh1p"; libraryHaskellDepends = [ base deepseq lens mono-traversable singletons split template-haskell @@ -182930,6 +183011,8 @@ self: { pname = "streaming-postgresql-simple"; version = "0.2.0.1"; sha256 = "1ffsxwgsaxqnf49n4lnyrh2zy6q9zc1i3ssd03m08ip813pk5j8k"; + revision = "1"; + editedCabalFile = "1y5j3p3gphr3mnzl1dvfmbm8iipsdy0vq2fk0klxgid1dsqfl2vn"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -191679,6 +191762,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-gui_0_8_2_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, exceptions, file-embed, filepath, hashable + , network-uri, safe, snap-core, snap-server, stm, template-haskell + , text, transformers, unordered-containers, vault, vector + , websockets, websockets-snap + }: + mkDerivation { + pname = "threepenny-gui"; + version = "0.8.2.0"; + sha256 = "1qmvrkha68f30kdv8hvdkj25sgsski7rnd6dqmvbhqrn6fpsqm8r"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deepseq + exceptions file-embed filepath hashable network-uri safe snap-core + snap-server stm template-haskell text transformers + unordered-containers vault vector websockets websockets-snap + ]; + homepage = "http://wiki.haskell.org/Threepenny-gui"; + description = "GUI framework that uses the web browser as a display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui-contextmenu" = callPackage ({ mkDerivation, base, threepenny-gui }: mkDerivation { @@ -200074,15 +200183,15 @@ self: { }) {}; "userid" = callPackage - ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes - , web-routes-th + ({ mkDerivation, aeson, base, boomerang, cereal, safecopy + , web-routes, web-routes-th }: mkDerivation { pname = "userid"; - version = "0.1.2.8"; - sha256 = "0911217jymfmdh5j0f66bqgaa5nhs7yf907dgnyyzkysh2473cmh"; + version = "0.1.3"; + sha256 = "02vcgm7n4s5lljp93q6a3b7xgw6vm6m0hm8qz9qfzgllb2d8b353"; libraryHaskellDepends = [ - aeson base boomerang safecopy web-routes web-routes-th + aeson base boomerang cereal safecopy web-routes web-routes-th ]; homepage = "http://www.github.com/Happstack/userid"; description = "The UserId type and useful instances for web development"; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 6ce183889043..98f3ea1679cb 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,15 +1,18 @@ -{ fetchgit, stdenv, cmake, openssl, zlib }: +{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: stdenv.mkDerivation rec { - name = "libwebsockets-1.4"; + name = "libwebsockets-${version}"; + version = "2.3.0"; - src = fetchgit { - url = "git://git.libwebsockets.org/libwebsockets"; - rev = "16fb0132cec0fcced29bce6d86eaf94a9beb9785"; - sha256 = "0gk4dgx125nz7wl59bx0kgxxg261r9kyxvdff5ld98slr9f08d0l"; + src = fetchFromGitHub { + owner = "warmcat"; + repo = "libwebsockets"; + rev = "v${version}"; + sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy"; }; - buildInputs = [ cmake openssl zlib ]; + buildInputs = [ cmake openssl zlib libuv ]; + cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; meta = { description = "Light, portable C library for websockets"; @@ -19,8 +22,7 @@ stdenv.mkDerivation rec { throughput in both directions. ''; homepage = https://libwebsockets.org/trac/libwebsockets; - # See http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/tree/LICENSE - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.lgpl21; maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 65e10c5a3995..23b36db8fe10 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -12,9 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ glibmm ]; - - propagatedBuildInputs = [ libxml2 ]; + propagatedBuildInputs = [ libxml2 glibmm ]; meta = with stdenv.lib; { homepage = http://libxmlplusplus.sourceforge.net/; diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix new file mode 100644 index 000000000000..a7505f6f51cd --- /dev/null +++ b/pkgs/development/ocaml-modules/csv/1.5.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation { + + name = "ocaml${ocaml.version}-csv-1.5"; + + src = fetchzip { + url = "https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz"; + sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + + buildPhase = "ocaml setup.ml -build"; + + doCheck = true; + checkPhase = "ocaml setup.ml -test"; + + installPhase = "ocaml setup.ml -install"; + + meta = with stdenv.lib; { + description = "A pure OCaml library to read and write CSV files"; + homepage = https://github.com/Chris00/ocaml-csv; + license = licenses.lgpl21; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 751d40ff706d..ba4f982222b4 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,48 +1,26 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_lwt }: +{ stdenv, fetchurl, ocaml, findlib, jbuilder }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.2" - then { - version = "1.7"; - url = https://math.umons.ac.be/anum/software/csv/csv-1.7.tar.gz; - sha256 = "1mmcjiiz0jppgipavpph5kn04xcpalw4scbjrw2z3drghvr3qqwf"; - lwtSupport = true; - } else { - version = "1.5"; - url = https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz; - sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; - lwtSupport = false; - }; -in +stdenv.mkDerivation rec { + version = "2.0"; + name = "ocaml${ocaml.version}-csv-${version}"; + src = fetchurl { + url = "https://github.com/Chris00/ocaml-csv/releases/download/2.0/csv-2.0.tbz"; + sha256 = "1g6xsybwc5ifr7n4hkqlh3294njzca12xg86ghh6pqy350wpq1zp"; + }; -stdenv.mkDerivation { + unpackCmd = "tar -xjf $src"; - name = "ocaml${ocaml.version}-csv-${param.version}"; + buildInputs = [ ocaml findlib jbuilder ]; - src = fetchzip { - inherit (param) url sha256; - }; + buildPhase = "jbuilder build -p csv"; - buildInputs = [ ocaml findlib ocamlbuild ] - ++ stdenv.lib.optional param.lwtSupport ocaml_lwt; + inherit (jbuilder) installPhase; - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests" - + stdenv.lib.optionalString param.lwtSupport " --enable-lwt"; - - buildPhase = "ocaml setup.ml -build"; - - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - - installPhase = "ocaml setup.ml -install"; - - meta = with stdenv.lib; { - description = "A pure OCaml library to read and write CSV files"; - homepage = https://github.com/Chris00/ocaml-csv; - license = licenses.lgpl21; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; - }; + meta = { + description = "A pure OCaml library to read and write CSV files"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix new file mode 100644 index 000000000000..afa1895e5404 --- /dev/null +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage }: + +buildPythonPackage rec { + pname = "radicale_infcloud"; + name = "${pname}-${version}"; + version = "2017-07-27"; + + src = fetchFromGitHub { + owner = "Unrud"; + repo = "RadicaleInfCloud"; + rev = "972757bf4c6be8b966ee063e3741ced29ba8169f"; + sha256 = "1c9ql9nv8kwi791akwzd19dcqzd916i7yxzbnrismzw4f5bhgzsk"; + }; + + doCheck = false; # Tries to import radicale, circular dependency + + meta = with stdenv.lib; { + homepage = https://github.com/Unrud/RadicaleInfCloud/; + description = "Integrate InfCloud into Radicale's web interface"; + license = with licenses; [ agpl3 gpl3 ]; + platforms = platforms.all; + maintainers = with maintainers; [ aneeshusa ]; + }; +} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 26e81916774b..cbf890ab1ec6 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.54.0"; + version = "0.55.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "02z3jrfrr6gn056wplwkhymd1nyncjs67yl3vhv6n27jr3572npn"; + sha256 = "042q2197m9l7r6j053dd4hqaqv7dsc5wh8h6aifkcmqa4ypp4w5r"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 6d49b81bd611..e5f68365e427 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "0nhf7fksgaa8snrhfaac4n6gf29bbv59lfyiv7pr2jhbi5m9js2v"; + sha256 = "1w1f6nsdq3inxhqhy69mgljfjr51n1v1s8i51gcg11rd2bc67w63"; }; patchPhase = '' diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ee6b0fe8c375..24dd868d64dc 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -495,6 +495,17 @@ rec { }; + LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "LanguageClient-neovim-2017-09-05"; + src = fetchgit { + url = "https://github.com/autozimu/LanguageClient-neovim"; + rev = "5bfc3492d50c3c48c6e0b0d1899ed2bbca2cf48f"; + sha256 = "1zi3v4yx4hgzfr23377z84yngiqvdwjpdpkn12lpi6irb04q6641"; + }; + dependencies = []; + + }; + clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clighter8-2017-07-23"; src = fetchgit { @@ -1363,6 +1374,17 @@ rec { }; + nvim-cm-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nvim-cm-racer-2017-07-27"; + src = fetchgit { + url = "https://github.com/roxma/nvim-cm-racer"; + rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; + sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; + }; + dependencies = []; + + }; + nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "nvim-completion-manager-2017-09-05"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8dd187fe5223..f1983e3eeb6a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -31,6 +31,7 @@ "github:alvan/vim-closetag" "github:andviro/flake8-vim" "github:ap/vim-css-color" +"github:autozimu/LanguageClient-neovim" "github:bbchung/clighter8" "github:benekastah/neomake" "github:bitc/vim-hdevtools" @@ -109,6 +110,7 @@ "github:rhysd/vim-grammarous" "github:rodjek/vim-puppet" "github:roxma/nvim-completion-manager" +"github:roxma/nvim-cm-racer" "github:ryanoasis/vim-devicons" "github:rust-lang/rust.vim" "github:sbdchd/neoformat" diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 247c73e468d0..fb3796394e81 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,15 +3,22 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gccCrossStageFinal -, forcedNativePackages, forceSystem, newScope, platform, config +, forceSystem, newScope, platform, config , targetPlatform, buildPlatform -, overrides ? {} }: +, overrides ? {} +, buildPackages, pkgs +}: with args; let callPackage = newScope gnu; + forcedNativePackages = + if stdenv.hostPlatform == stdenv.buildPlatform + then pkgs + else buildPackages; + gnu = { hurdCross = forcedNativePackages.callPackage ./hurd { inherit fetchgit stdenv autoconf libtool texinfo diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index 640534aa2a6e..bff0f5db9538 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12.13"; + version = "4.12.14"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18sxw7mw4fya7381mkah70s3di6b8xxfigjhrhb7zcczrffb4vl9"; + sha256 = "09zxmknh6awhqmj8dyq95bdlwcasryy35hkjxjlzixdgn52kzaw6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 1d51b033dc14..d1c4d8ba8e7d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.2"; + version = "4.13.3"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lgwgw9yp5ywbylnmahsmqzs98yfq53mvvqqdgp7ljiqg8bxqjh6"; + sha256 = "1ayai3i0jakxzszpijhknjiwwi055wa74bpmnr0n7dh2l5s2rlh3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5f4686a5ec65..5033bb88f79a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.50"; + version = "4.9.51"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0dhm5w7qa1hyqp254r41b4nhf10a8w7sv1mhd16f61inpb41829c"; + sha256 = "12mag09scyzi5a352y39y4b6rjh89qqca53hhmjc396q09hsdyl3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 510f781e3936..4fc14a04eeab 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -18,11 +18,13 @@ stdenv.mkDerivation rec { makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" "SHELL=/bin/sh" + "HDAPS=1" ]; installPhase = '' install -v -D -m 644 thinkpad_ec.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/thinkpad_ec.ko" install -v -D -m 644 tp_smapi.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/tp_smapi.ko" + install -v -D -m 644 hdaps.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/hdapsd.ko" ''; dontStrip = true; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index a136c94aa575..b0e05aa8bc0a 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets }: +{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }: stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.4"; + version = "1.4.14"; name = "${pname}-${version}"; src = fetchurl { - url = http://mosquitto.org/files/source/mosquitto-1.4.tar.gz; - sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr"; + url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz"; + sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm"; }; - buildInputs = [ openssl libuuid libwebsockets ] + buildInputs = [ openssl libuuid libwebsockets c-ares libuv ] ++ stdenv.lib.optional stdenv.isDarwin cmake; makeFlags = [ @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { --replace "/usr/local" "" substituteInPlace config.mk \ --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" - ''; meta = { diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 3854d94f9093..48abd9a33742 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, openssl, ppp }: +{ stdenv, fetchFromGitHub, autoreconfHook, openssl, ppp, pkgconfig }: with stdenv.lib; let repo = "openfortivpn"; - version = "1.2.0"; + version = "1.5.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,10 +12,10 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1a1l9f6zivfyxg9g2x7kzkvcyh84s7l6v0kimihhrd19zl0m41jn"; + sha256 = "0fm0z73afghwmbshpsn5jfbyyfzz1v8s7scwycnvsk2cgv5f4r86"; }; - - buildInputs = [ openssl ppp autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl ppp ]; NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 7080cda57f41..87686cd52c12 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1rj538kp3wsdq7rhl8sy1wpwhlsbxcch0cwk64kgz8gpw05lllfl"; + sha256 = "1yv2pwf3vhv9dpbf51fnm0wy03va1cg5r7qaz7rg75cwbgb0rmrl"; }; buildInputs = [ diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index de4687a6a57f..5d60f4c7c5c3 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -7,7 +7,7 @@ let in buildGoPackage rec { name = "journalbeat-${version}"; - version = "5.5.0"; + version = "5.6.0"; goPackagePath = "github.com/mheese/journalbeat"; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "mheese"; repo = "journalbeat"; rev = "v${version}"; - sha256 = "134n1kg6nx5yycn2cyldiayaqm8zps94hz4zfz9klp2jzq68m35y"; + sha256 = "0b5yqzw1h945mwwyy7cza6bc7kzv3x1p9w2xkzmvr7rw3pd32r06"; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5418ddc002f8..60a3bc8394df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29,8 +29,6 @@ with pkgs; callPackage_i686 = pkgsi686Linux.callPackage; - forcedNativePackages = if hostPlatform == buildPlatform then pkgs else buildPackages; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. @@ -5390,17 +5388,22 @@ with pkgs; }; wrapCCMulti = cc: - if system == "x86_64-linux" then lowPrio ( - let - extraBuildCommands = '' - echo "dontMoveLib64=1" >> $out/nix-support/setup-hook - ''; - in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc); + if system == "x86_64-linux" then lowPrio (wrapCCWith { + cc = cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith { + cc = cc.cc; + libc = glibc_multi; + }); profiledCompiler = false; enableMultilib = true; - })) - else throw "Multilib ${cc.name} not supported on ‘${system}’"; + }; + + libc = glibc_multi; + + extraBuildCommands = '' + echo "dontMoveLib64=1" >> $out/nix-support/setup-hook + ''; + }) else throw "Multilib ${cc.name} not supported on ‘${system}’"; gcc_multi = wrapCCMulti gcc; @@ -5427,35 +5430,31 @@ with pkgs; if targetPlatform.libc == "msvcrt" then __targetPackages.windows.mingw_w64_headers else if targetPlatform.libc == "libSystem" then darwin.xcode else null; - in wrapCCCross { - cc = forcedNativePackages.gcc.cc.override { + in wrapCCWith { + name = "gcc-cross-wrapper"; + cc = gcc.cc.override { crossStageStatic = true; langCC = false; libcCross = libcCross1; enableShared = false; # Why is this needed? - inherit (forcedNativePackages) binutils; }; libc = libcCross1; - inherit (forcedNativePackages) binutils; }; # Only needed for mingw builds - gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCCross { + gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCWith { + name = "gcc-cross-wrapper"; cc = gccCrossStageStatic.gcc; libc = windows.mingw_headers2; - inherit (forcedNativePackages) binutils; }; - gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCCross { - cc = forcedNativePackages.gcc.cc.override { + gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCWith { + name = "gcc-cross-wrapper"; + cc = gcc.cc.override { crossStageStatic = false; - - # Why is this needed? - inherit (forcedNativePackages) binutils; }; libc = libcCross; - inherit (forcedNativePackages) binutils; }; gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { @@ -6207,19 +6206,24 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun { - nativeTools = stdenv.cc.nativeTools or false; - nativeLibc = stdenv.cc.nativeLibc or false; + wrapCCWith = { name ? "", cc, libc, extraBuildCommands ? "" }: ccWrapperFun { + nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; + nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; - cc = baseCC; - isGNU = baseCC.isGNU or false; - isClang = baseCC.isClang or false; - inherit libc extraBuildCommands; + noLibc = (libc == null); + + isGNU = cc.isGNU or false; + isClang = cc.isClang or false; + + inherit name cc libc extraBuildCommands; }; ccWrapperFun = callPackage ../build-support/cc-wrapper; - wrapCC = wrapCCWith stdenv.cc.libc ""; + wrapCC = cc: wrapCCWith { + inherit cc; + inherit (stdenv.cc) libc; + }; # legacy version, used for gnat bootstrapping wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old { nativeTools = stdenv.cc.nativeTools or false; @@ -6229,20 +6233,6 @@ with pkgs; libc = glibc; }; - wrapCCCross = - {cc, libc, binutils, shell ? "", name ? "gcc-cross-wrapper"}: - - forcedNativePackages.ccWrapperFun { - nativeTools = false; - nativeLibc = false; - noLibc = (libc == null); - - isGNU = cc.isGNU or false; - isClang = cc.isClang or false; - - inherit cc binutils libc shell name; - }; - # prolog yap = callPackage ../development/compilers/yap { }; @@ -7334,7 +7324,7 @@ with pkgs; cross_renaming: we should make all programs use pkgconfig as nativeBuildInput after the renaming. */ - pkgconfig = forcedNativePackages.callPackage ../development/tools/misc/pkgconfig { + pkgconfig = callPackage ../development/tools/misc/pkgconfig { fetchurl = fetchurlBoot; }; pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cccb378068d8..4af5a810fd06 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -172,7 +172,10 @@ let lwt = ocaml_lwt; }; - csv = callPackage ../development/ocaml-modules/csv { }; + csv = + if lib.versionAtLeast ocaml.version "4.2" + then callPackage ../development/ocaml-modules/csv { } + else callPackage ../development/ocaml-modules/csv/1.5.nix { }; curses = callPackage ../development/ocaml-modules/curses { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fdb65032e7bb..2584b6f2810b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18182,6 +18182,8 @@ in { }; }; + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; + recaptcha_client = buildPythonPackage rec { name = "recaptcha-client-1.0.6"; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 43951100de3d..44a46b7b6929 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -43,8 +43,9 @@ let // (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; }) // (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; }); # Get the set of outputs of a derivation - getOutputs = value: - lib.genAttrs (value.outputs or []) (output: value.${output}); + getOutputs = value: lib.genAttrs + (value.outputs or (lib.optional (value ? out) "out")) + (output: value.${output}); in # Certain *Cross derivations will fail assertions, but we need their # nativeDrv. We are assuming anything that fails to evaluate is an |