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: 74d245232838
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: e295fd813709
Choose a head ref
  • 7 commits
  • 4 files changed
  • 5 contributors

Commits on Jun 26, 2019

  1. conda: Remove version suffix 

    Currently the `conda-shell` binary is installed as
`conda-shell-4.6.14` which is not very friendly to type.

With this change the binary is simply installed as `conda-shell`.
    @adisbladis
    adisbladis committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    ce22805 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2019

  1. systemd: point to commit id instead of branch name 

    branch names are mutable, and with
NixOS/systemd#29 being merged in, the nixos-v242
branch advanced from 5c20aab77900f478fd380ab189787d80e4a35963 to
40eb070cb309ec09def0ecdeaf7514c702200835, causing systemd's
fetchFromGitHub to fail with a sha256sum mismatch (when not relying on
the cache).

Fix this, by pointing systemd.src to the commit id before the branch
advancement. This won't cause a rebuild, as the sha256 stayed the same.

Fast-forwarding systemd to 40eb070cb309ec09def0ecdeaf7514c702200835 will
be done in NixOS/nixpkgs#63784 , which also uses
the commit id, and not a branch name for rev.
    @flokli
    flokli committed Jun 29, 2019
    Configuration menu
    Copy the full SHA
    06b7c4a View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2019

  1. Merge pull request #63807 from adisbladis/conda-shell-noversion 

    conda: Remove version suffix
    @adisbladis
    adisbladis committed Jun 30, 2019
    Configuration menu
    Copy the full SHA
    5b09342 View commit details
    Browse the repository at this point in the history

  2. electron-cash: 4.0.2 -> 4.0.7

    @nyanloutre @Lassulus
    nyanloutre authored and Lassulus committed Jun 30, 2019
    Configuration menu
    Copy the full SHA
    17e0f36 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #63929 from flokli/nixos-v242-rev-commit-id 

    systemd: point to commit id instead of branch name
    @andir
    andir committed Jun 30, 2019
    Configuration menu
    Copy the full SHA
    bb3b6e2 View commit details
    Browse the repository at this point in the history

  4. radarr: 0.2.0.1344 -> 0.2.0.1358

    @nyanloutre
    nyanloutre authored and Matthieu Coudron committed Jun 30, 2019
    Configuration menu
    Copy the full SHA
    a1eec05 View commit details
    Browse the repository at this point in the history

  5. git-recent: 1.1.0 -> 1.1.1

    @jlesquembre
    jlesquembre authored and Matthieu Coudron committed Jun 30, 2019
    Configuration menu
    Copy the full SHA
    e295fd8 View commit details
    Browse the repository at this point in the history