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: 08b49cfc5435
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4c58afd1a2ee
Choose a head ref
  • 19 commits
  • 21 files changed
  • 11 contributors

Commits on Mar 7, 2017

  1. grub2: Make EFI grub work on aarch64 

    (cherry picked from commit a9a7067)
    @dezgeg
    dezgeg committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    0ccfb44 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2017

  1. gplates: use boost 160 

    update 161 changed reference parameters for optional
https://hydra.nixos.org/build/49707856/nixlog/1
http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html

(cherry picked from commit e17d3d4)
    @rardiol @dezgeg
    rardiol authored and dezgeg committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    ade5837 View commit details
    Browse the repository at this point in the history

  2. libp11: Fetch src from GitHub 

    (cherry picked from commit c8402dd)
    @dezgeg
    dezgeg committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    c5a10ac View commit details
    Browse the repository at this point in the history

  3. mess: Mark broken 

    Even fixing the source urls doesn't make it build.

(cherry picked from commit 413bc03)
    @dezgeg
    dezgeg committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    2461c29 View commit details
    Browse the repository at this point in the history

  4. networking/bonds: fix examples 

    After the change of the bonding options, the examples were not quite correct.
The diff is over-the top because the new `let` needs everything indented.

Also add a small docstring to the `networkd` attr in the networking test.

(cherry picked from commit 22c2651)
    @Profpatsch @globin
    Profpatsch authored and globin committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    9dc3f75 View commit details
    Browse the repository at this point in the history

  5. purple-facebook: 2016-04-09 -> 0.9.0 

    (cherry picked from commit 2df1d3f)
    @Mic92 @globin
    Mic92 authored and globin committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    c554a0c View commit details
    Browse the repository at this point in the history

  6. haskellPackages.streaming-eversion: dontCheck 

    (cherry picked from commit fb5369d)
    @rickynils
    rickynils committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    a6209c2 View commit details
    Browse the repository at this point in the history

  7. delve: Disable on i686 

    (cherry picked from commit a3a21a7)
    @dezgeg
    dezgeg committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    6c0b236 View commit details
    Browse the repository at this point in the history

  8. gtkglextmm: Mark as broken 

    No release since 2010. Build broken. Sounds like a library, but no
users. GNOME 2 stuff.

http://hydra.nixos.org/build/49554500/nixlog/3
(cherry picked from commit 8dce538)
    @dezgeg
    dezgeg committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    b89623e View commit details
    Browse the repository at this point in the history

  9. raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303 

    (cherry picked from commit 5f5b871)
    @dezgeg
    dezgeg committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    cdd5709 View commit details
    Browse the repository at this point in the history

  10. corebird: missing dependencies (glib_networking) 

    (cherry picked from commit 7771db2)
    @jensbin @Mic92
    jensbin authored and Mic92 committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    1efa074 View commit details
    Browse the repository at this point in the history

  11. missing dconf in buildInput 

    (cherry picked from commit 6fb6450)
    @jensbin @Mic92
    jensbin authored and Mic92 committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    74af380 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2017

  1. primus: fix if nvidia is not used 

    Fixes #23628

(cherry picked from commit f36b721)
    @abbradar
    abbradar committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    1478639 View commit details
    Browse the repository at this point in the history

  2. torbrowser: 6.5 -> 6.5.1 

    (cherry picked from commit 74f8e0f)
    @joachifm @globin
    joachifm authored and globin committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    b9e4091 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-17.03' into staging-17.03

    @globin
    globin committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    5bef185 View commit details
    Browse the repository at this point in the history

  4. icu: 57.1 -> 58.2 

    Firefox requires new version of the icu to build:
```
checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 57.1
configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```

(cherry picked from commit 28598c0)
    @rasendubi @globin
    rasendubi authored and globin committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    b602a30 View commit details
    Browse the repository at this point in the history

  5. sqlite: 3.16.2 -> 3.17.0 

    Firefox requires the latest sqlite to build:
```
checking for sqlite3 >= 3.17.0... Requested 'sqlite3 >= 3.17.0' but version of SQLite is 3.16.2
configure: error: Library requirements (sqlite3 >= 3.17.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```

(cherry picked from commit d4bb1c7)
    @rasendubi @globin
    rasendubi authored and globin committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    feb38d4 View commit details
    Browse the repository at this point in the history

  6. nss: 3.28.1 -> 3.28.3 

    This should fix firefox build, which fails due to nss being too old.

(cherry picked from commit cb67055)
    @rasendubi @globin
    rasendubi authored and globin committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    ebdb543 View commit details
    Browse the repository at this point in the history

  7. firefox, firefox-bin: 51.0.1 -> 52.0, firefox-esr: 45.7esr -> 52.0esr 

    (cherry picked from commit a24aaae)
    @taku0 @globin
    taku0 authored and globin committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    4c58afd View commit details
    Browse the repository at this point in the history