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: 1906fc5bd10a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2ba59c0f8eed
Choose a head ref
  • 20 commits
  • 29 files changed
  • 11 contributors

Commits on Apr 29, 2020

  1. systemd: regenerate patches 

    It seems nix is much more permissive in applying patches than git am.

These patches were regenerated by running
`git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`,
and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch`
where necessary.
    @flokli
    flokli committed Apr 29, 2020
    Copy the full SHA
    a3082bc View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. systemd: 245.3 -> 245.5 

    Also, update 0005-Add-some-NixOS-specific-unit-directories.patch to
explain how and where these paths are being used.
    @flokli
    flokli committed Apr 30, 2020
    Copy the full SHA
    eb73b71 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Merge staging into staging

    @FRidh
    FRidh committed May 1, 2020
    Copy the full SHA
    d02e477 View commit details
    Browse the repository at this point in the history

  2. libfilezilla: 0.19.3 -> 0.21.0

    @peterhoeg
    peterhoeg committed May 1, 2020
    Copy the full SHA
    0a2faff View commit details
    Browse the repository at this point in the history

  3. filezilla: 3.46.3 -> 3.48.0

    @peterhoeg
    peterhoeg committed May 1, 2020
    Copy the full SHA
    78cc331 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #86363 from flokli/systemd-245.5 

    systemd: 245.3 -> 245.5
    @flokli
    flokli committed May 1, 2020
    Copy the full SHA
    b0aa80e View commit details
    Browse the repository at this point in the history

Commits on May 2, 2020

  1. Merge pull request #86217 from peterhoeg/u/filezilla_3_48 

    filezilla: 3.46.3 -> 3.48.0
    @peterhoeg
    peterhoeg committed May 2, 2020
    Copy the full SHA
    2092ed1 View commit details
    Browse the repository at this point in the history

  2. gst-plugins-bad: fix compilation with opencv 4.3

    @lblasc
    lblasc committed May 2, 2020
    Copy the full SHA
    e7d3d3b View commit details
    Browse the repository at this point in the history

  3. Merge staging-next into staging

    @FRidh
    FRidh committed May 2, 2020
    Copy the full SHA
    22ea1b9 View commit details
    Browse the repository at this point in the history

  4. openh264: 2.0.0 -> 2.1.0

    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed May 2, 2020
    Copy the full SHA
    91a69a7 View commit details
    Browse the repository at this point in the history

  5. libndctl: 67 -> 68

    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed May 2, 2020
    Copy the full SHA
    2099ca6 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2020

  1. niss: 3.51 -> 3.52

    @andir
    andir committed May 3, 2020
    Copy the full SHA
    bce5268 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. Merge pull request #86690 from andir/staging/nss-3.52 

    nss: 3.51 -> 3.52
    @andir
    andir committed May 4, 2020
    Copy the full SHA
    ddae4f2 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. meson: 0.54.0 → 0.54.1 

    mesonbuild/meson@0.54.0...0.54.1
    @jtojnar
    jtojnar committed May 5, 2020
    Copy the full SHA
    1a9c35d View commit details
    Browse the repository at this point in the history

  2. libjpeg_turbo: fix race in tests 

    Fixes:

12/151 Test  #46: jpegtran-shared-icc ...............................***Failed    0.03 sec
Premature end of JPEG file
JPEG datastream contains no image

63/151 Test  #47: jpegtran-shared-icc-cmp ...........................***Failed    0.12 sec
Could not obtain MD5 sum: No such file or directory

The following tests FAILED:
         46 - jpegtran-shared-icc (Failed)
         47 - jpegtran-shared-icc-cmp (Failed)

Example build: https://hydra.nixos.org/build/117594627
    @thefloweringash
    thefloweringash committed May 5, 2020
    Copy the full SHA
    969ae81 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #86405 from lblasc/gst-plugins-bad-fix

    @Mic92
    Mic92 committed May 5, 2020
    Copy the full SHA
    18a6a77 View commit details
    Browse the repository at this point in the history

  4. go: 1.14.1 -> 1.14.2

    @Mic92
    Mic92 committed May 5, 2020
    Copy the full SHA
    416caeb View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Merge pull request #84801 from Mic92/go

    @Mic92
    Mic92 committed May 6, 2020
    Copy the full SHA
    b0f4952 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' into staging-next

    @vcunat
    vcunat committed May 6, 2020
    Copy the full SHA
    e8d3c15 View commit details
    Browse the repository at this point in the history

  3. Revert "gst_all_1.gst-plugins-bad: fix build after opencv4 update" 

    This reverts commit 1906fc5.
After 18a6a77 it isn't needed anymore.
    @vcunat
    vcunat committed May 6, 2020
    Copy the full SHA
    2ba59c0 View commit details
    Browse the repository at this point in the history