Navigation Menu

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 9fe1b95c3d62
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 18848aa605c0
Choose a head ref
  • 17 commits
  • 32 files changed
  • 3 contributors

Commits on Nov 11, 2019

  1. ocaml-modules: replace buildInputs with nativeBuildInputs where appro… 

    …priate

The default has been to use buildInputs for build dependencies.
This doesn't work when cross-compiling.
    @yorickvP @balsoft
    yorickvP authored and balsoft committed Nov 11, 2019
    Copy the full SHA
    4550405 View commit details
    Browse the repository at this point in the history

  2. ocamlPackages.ocamlgraph: allow building without lablgtk

    @yorickvP @balsoft
    yorickvP authored and balsoft committed Nov 11, 2019
    Copy the full SHA
    2693fa4 View commit details
    Browse the repository at this point in the history

  3. ocamlPackages.cpuid: 0.1.0 -> 0.1.2

    @yorickvP @balsoft
    yorickvP authored and balsoft committed Nov 11, 2019
    Copy the full SHA
    5a40ccf View commit details
    Browse the repository at this point in the history

  4. ocamlPackages.zarith: 1.8 -> 1.9

    @yorickvP @balsoft
    yorickvP authored and balsoft committed Nov 11, 2019
    Copy the full SHA
    a1cc0f1 View commit details
    Browse the repository at this point in the history

  5. libusb1: use lib.getLib to find systemd.lib 

    This allows this package to build with eudev instead.
    @yorickvP @balsoft
    yorickvP authored and balsoft committed Nov 11, 2019
    Copy the full SHA
    b3862e2 View commit details
    Browse the repository at this point in the history

  6. libgcrypt: disable asm on musl

    @yorickvP @balsoft
    yorickvP authored and balsoft committed Nov 11, 2019
    Copy the full SHA
    3df718e View commit details
    Browse the repository at this point in the history

  7. kmod: fix --enable-static

    @balsoft
    balsoft committed Nov 11, 2019
    Copy the full SHA
    8983cac View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2019

  1. js_of_ocaml: fix dependencies

    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    81ca7cc View commit details
    Browse the repository at this point in the history

  2. ocaml: num: Allow to disable dynamic linking

    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    07b838f View commit details
    Browse the repository at this point in the history

  3. ocaml: opam-file-format: Allow to disable dynamic linking

    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    484e0a8 View commit details
    Browse the repository at this point in the history

  4. ocaml: uchar: add the ability to build without dynamic linking

    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    08edfb6 View commit details
    Browse the repository at this point in the history

  5. ocaml: num: add ability to link statically

    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    81384e0 View commit details
    Browse the repository at this point in the history

  6. ocaml: nocrypto: fix dependency on ppx_tools

    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    78ec0e6 View commit details
    Browse the repository at this point in the history

  7. kmod: make pkgsStatic.kmod build

    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    9c9a0e9 View commit details
    Browse the repository at this point in the history

  8. ocaml: partially fix pkgsStatic.ocaml-ng 

    This commit adds a static adapter for ocaml packages and applies it to
pkgsStatic.ocaml-ng.

The adapter fixes build of ocaml itself with version <= 4.7 and also attempts
to fix builds of some packages.
    @balsoft
    balsoft committed Nov 26, 2019
    Copy the full SHA
    7263951 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Merge branch 'master' into static-fixes

    @matthewbauer
    matthewbauer committed Dec 2, 2019
    Copy the full SHA
    0505c51 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #73820 from serokell/static-fixes 

    Fix static building for ocaml-ng
    @matthewbauer
    matthewbauer committed Dec 2, 2019
    Copy the full SHA
    18848aa View commit details
    Browse the repository at this point in the history