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: 16308b591f8a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 36e15cd6e7d5
Choose a head ref
  • 9 commits
  • 3 files changed
  • 5 contributors

Commits on Mar 8, 2021

  1. network-manager: 1.26.0 -> 1.26.6

    @amaxine @github-actions
    amaxine authored and github-actions[bot] committed Mar 8, 2021
    Copy the full SHA
    ea868fe View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Merge pull request #115414 from maxeaubrey/20.09_network-manager-1.26.6 

    [20.09] network-manager: 1.26.0 -> 1.26.6
    @worldofpeace
    worldofpeace committed Mar 15, 2021
    Copy the full SHA
    d496d57 View commit details
    Browse the repository at this point in the history

  2. imagemagick: move expression from default.nix to 6.x.nix 

    This makes backporting version bumps easier.

See also #116363 (comment)
    @erictapen
    erictapen committed Mar 15, 2021
    Copy the full SHA
    de114cf View commit details
    Browse the repository at this point in the history

  3. imagemagick6: 6.9.11-60 -> 6.9.12-1 (#113998) 

    (cherry picked from commit 7ac6fbf)
    @dotlambda @erictapen
    dotlambda authored and erictapen committed Mar 15, 2021
    Copy the full SHA
    19d9aa0 View commit details
    Browse the repository at this point in the history

  4. imagemagick6: 6.9.12-1 -> 6.9.12-3 

    (cherry picked from commit 3210e91)
    @erictapen
    erictapen committed Mar 15, 2021
    Copy the full SHA
    9e99bce View commit details
    Browse the repository at this point in the history

  5. imagemagick6: add erictapen as maintainer 

    (cherry picked from commit c528ddd)
    @erictapen
    erictapen committed Mar 15, 2021
    Copy the full SHA
    2c1513f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #116363 from erictapen/20.09/imagemagick-6.9.12-3 

    [20.09] imagemagick: 6.9.11-60 -> 6.9.12-3
    @dotlambda
    dotlambda committed Mar 15, 2021
    Copy the full SHA
    40a38db View commit details
    Browse the repository at this point in the history

  7. Merge branch 'release-20.09' into staging-20.09

    @vcunat
    vcunat committed Mar 15, 2021
    Copy the full SHA
    d82ff86 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Merge branch 'staging-20.09' into release-20.09 

    Rebuilds are almost finished now:
https://hydra.nixos.org/eval/1655556
    @vcunat
    vcunat committed Mar 16, 2021
    Copy the full SHA
    36e15cd View commit details
    Browse the repository at this point in the history