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: 1769af7a287f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6afb73a98495
Choose a head ref
  • 15 commits
  • 17 files changed
  • 11 contributors

Commits on Mar 13, 2018

  1. androidStudioPackages.beta: 3.1.0.12 -> 3.1.0.14 

    (cherry picked from commit 310a665)
    @primeos @fpletz
    primeos authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    a14d18e View commit details
    Browse the repository at this point in the history

  2. androidStudioPackages.{dev,canary}: init at 3.2.0.5 

    Switch the naming scheme to the channel names.

(cherry picked from commit 74d9226)
    @primeos @fpletz
    primeos authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    2271731 View commit details
    Browse the repository at this point in the history

  3. i3: 4.14.1 -> 4.15 

    (cherry picked from commit cfa4c06)
    @magnetophon @fpletz
    magnetophon authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    75f8209 View commit details
    Browse the repository at this point in the history

  4. overmind: init at 1.1.1 

    (cherry picked from commit ce78db7)
    @adisbladis @fpletz
    adisbladis authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    06e99e0 View commit details
    Browse the repository at this point in the history

  5. metrics: fixup sed expr to work with Nix 2 

    (cherry picked from commit 5eb07e2)
    @dtzWill @fpletz
    dtzWill authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    1f9ffb4 View commit details
    Browse the repository at this point in the history

  6. dockerTools: add an onTopOfPulledImage example 

    This allows to test if a pulled image can be updated by using our
Docker tools.

(cherry picked from commit e8f452f)
    @nlewo @fpletz
    nlewo authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    7ad7c97 View commit details
    Browse the repository at this point in the history

  7. tests/docker-tools: add onTopOfPulledImage test 

    (cherry picked from commit bc1e8f9)
    @nlewo @fpletz
    nlewo authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    763ec32 View commit details
    Browse the repository at this point in the history

  8. sambaMaster: 4.8.0_2018-01-25 -> 2018-03-09 

    (cherry picked from commit da45e8d)
    @fpletz
    Luke Adams authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    9a02553 View commit details
    Browse the repository at this point in the history

  9. conan: Fix build 

    conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.

(cherry picked from commit 5fdfe61)
    @timokau @fpletz
    timokau authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    570cf67 View commit details
    Browse the repository at this point in the history

  10. qemu-vm: removes warning when running build-vm 

    get rid of deprecated qemu commands

(cherry picked from commit b7a2333)
    @teto @fpletz
    teto authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    2c8a6a8 View commit details
    Browse the repository at this point in the history

  11. build-vm: remove trailing dot from script path 

    Allow to double click/middle click paste path a bit quicker.

(cherry picked from commit 7b7860f)
    @teto @fpletz
    teto authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    3264fe5 View commit details
    Browse the repository at this point in the history

  12. grub-install.pl: more details on blkid failure 

    (cherry picked from commit c476d2f)
    @teto @fpletz
    teto authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    075908d View commit details
    Browse the repository at this point in the history

  13. altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0 (#36715) 

    * altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0

* Update default.nix

(cherry picked from commit bfc75b5)
    @Lassulus @fpletz
    Lassulus authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    66ed242 View commit details
    Browse the repository at this point in the history

  14. samba: 4.7.4 -> 4.7.5 

    Also, fix kerberos dependency to include krb5kdc

(cherry picked from commit a14df21)
    @NeQuissimus @fpletz
    NeQuissimus authored and fpletz committed Mar 13, 2018
    Copy the full SHA
    b7a4c0e View commit details
    Browse the repository at this point in the history

  15. samba: 4.7.5 -> 4.7.6 for multiple CVEs 

    Fixes CVE-2018-1050, CVE-2018-1057.

(cherry picked from commit d2582dc)
    @fpletz
    fpletz committed Mar 13, 2018
    Copy the full SHA
    6afb73a View commit details
    Browse the repository at this point in the history