Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 6a662cbf4357
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: b357f9e62492
Choose a head ref
  • 6 commits
  • 11 files changed
  • 4 contributors

Commits on Mar 6, 2020

  1. ocamlPackages.pgocaml_ppx: init at 4.0 

    (cherry picked from commit 4f7484f)
    @vbgl @nomeata
    vbgl authored and nomeata committed Mar 6, 2020
    Copy the full SHA
    525b0d1 View commit details
    Browse the repository at this point in the history

  2. ocamlPackages.resource-pooling: 0.6 → 1.1 

    ocamlPackages.ocsigen-start: 1.8.0 → 2.7.0

(cherry picked from commit c589de9)
    @vbgl @nomeata
    vbgl authored and nomeata committed Mar 6, 2020
    Copy the full SHA
    0456880 View commit details
    Browse the repository at this point in the history

  3. js_of_ocaml: 3.4.0 -> 3.5.2 (#75766) 

    drive-by contributions, as I was playing around with this (it has better
support for the `num` library, it seems.)

js_of_ocaml: 3.4.0 -> 3.5.2
ocamlPackages.js_of_ocaml-ppx_deriving_json: use ppxlib-0.12.0
ocamlPackages.eliom: 6.8.0 → 6.10.1
ocamlPackages.ocsigen-toolkit: 2.2.0 → 2.5.0
ocamlPackages.ocsigen-start: 2.7.0 → 2.16.1

Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
(cherry picked from commit 2d2a5a9)
    @nomeata
    nomeata committed Mar 6, 2020
    Copy the full SHA
    6a8cdf7 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. firefox: Fix AArch64 build 

     * The 'arm.patch' patch doesn't apply anymore.
 * The 'build-arm-libopus.patch' patch isn't required anymore.
 * See the mozilla phabricator link for the added patch.

Additionally, we are now *always* undconditionally applying all patches
to all architectures. That is, unless they have undesirable
side-effects, but those might not be fit for inclusion.

By applying all patches all the time, they'll be removed or replaced
when they stop applying.

(cherry picked from commit d4446c5)
    @samueldr
    samueldr committed Mar 9, 2020
    Copy the full SHA
    6291285 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #82173 from samueldr/20.03/aarch64/firefox 

    [20.03] firefox: Fix AArch64 build
    @samueldr
    samueldr committed Mar 9, 2020
    Copy the full SHA
    da92e05 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #81882 from nomeata/js_of_ocaml-20.03 

    backport js_of_ocaml: 3.4.0 -> 3.5.2 (and other required changes)
    @vbgl
    vbgl committed Mar 9, 2020
    Copy the full SHA
    b357f9e View commit details
    Browse the repository at this point in the history