Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ba9b9c9fa21
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad771371fb22
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 15, 2018

  1. salt: fix msgpack dependency 

    (cherry picked from commit ee8495c)
    @aneeshusa
    aneeshusa authored and Robert Schütz committed Apr 15, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bd1583b View commit details

  2. salt: 2017.7.2 -> 2017.7.4 

    Release notes: https://docs.saltstack.com/en/2017.7/topics/releases/2017.7.4.html

(cherry picked from commit e797e00)
    @aneeshusa
    aneeshusa authored and Robert Schütz committed Apr 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad77137 View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 pkgs/tools/admin/salt/default.nix
7 changes: 3 additions & 4 deletions pkgs/tools/admin/salt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,19 +8,18 @@

python2Packages.buildPythonApplication rec {
pname = "salt";
version = "2017.7.2";
name = "${pname}-${version}";
version = "2017.7.4";

src = python2Packages.fetchPypi {
inherit pname version;
sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz";
sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx";
};

propagatedBuildInputs = with python2Packages; [
futures
jinja2
markupsafe
msgpack
msgpack-python
pycrypto
pyyaml
pyzmq