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: a2c2c385be38
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: b8bf4e406be5
Choose a head ref
  • 7 commits
  • 4 files changed
  • 4 contributors

Commits on Jun 7, 2019

  1. goxel: 0.8.3 -> 0.9.0 

    https://github.com/guillaumechereau/goxel/releases/tag/v0.9.0
    @dtzWill
    dtzWill committed Jun 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5ff9102 View commit details

Commits on Jun 9, 2019

  1. ansible: 2.7.6 -> 2.8.1

    @gabibbo97 @marsam
    gabibbo97 authored and marsam committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    646ed20 View commit details

  2. ansible_2_7: 2.7.10 -> 2.7.11

    @marsam
    marsam committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    69a4514 View commit details

  3. ansible_2_6: 2.6.15 -> 2.6.17

    @marsam
    marsam committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e38bbb0 View commit details

  4. ansible_2_5: drop 

    Ansible 2.5 has reached EOL in May 21, 2019
https://access.redhat.com/support/policy/updates/ansible-engine
    @marsam
    marsam committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    30f2074 View commit details

  5. Merge pull request #61664 from gabibbo97/ansible_2.8.0 

    ansible: 2.7.6 -> 2.8.1
    @marsam
    marsam authored Jun 9, 2019

    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
    e49c77f View commit details

  6. goxel: 0.8.3 -> 0.9.0 (#62807) 

    goxel: 0.8.3 -> 0.9.0
    @dywedir
    dywedir authored Jun 9, 2019

    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
    b8bf4e4 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/goxel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
name = "goxel-${version}";
version = "0.8.3";
version = "0.9.0";

src = fetchFromGitHub {
owner = "guillaumechereau";
repo = "goxel";
rev = "v${version}";
sha256 = "03hyy0i65zdplggaxlndgyvffvnb9g5kvxq2qbicirvz5zcsghk2";
sha256 = "1vd1vw5pplm4ig9f5gwnbvndnag1h7j0jj0cnj78gpiv96qak2vw";
};

patches = [ ./disable-imgui_ini.patch ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ansible/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@

buildPythonPackage rec {
pname = "ansible";
version = "2.7.9";
version = "2.8.1";

src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf";
sha256 = "0ia4x17ywym3r1m96ar4h0wc2xlylhbjp6x4wzwkh4p2i0x1vmg1";
};

prePatch = ''
14 changes: 7 additions & 7 deletions pkgs/tools/admin/ansible/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,25 +3,25 @@
{
ansible = with python3Packages; toPythonApplication ansible;

ansible_2_7 = with python3Packages; toPythonApplication ansible;
ansible_2_8 = with python3Packages; toPythonApplication ansible;

ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
pname = "ansible";
version = "2.6.15";
version = "2.7.11";

src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "1l4ji9sryfn0l651hy6cf5zqq8fpwi956c7qzjm4sihz5ps6wyhd";
sha256 = "0zipzm9al6k74h88b6zkddpcbxqs4cms7lidid6wn1vx3d3dxrp7";
};
}));

ansible_2_5 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
pname = "ansible";
version = "2.5.15";
version = "2.6.17";

src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "1w9wfv1s2jq6vkx1hm6n69zwxv2pgjj7nidyg452miwh684jpg7z";
sha256 = "0ixr3g1nb02xblqyk87bzag8sj8phy37m24xflabfl1k2zfh0313";
};
}));
}
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8745,7 +8745,6 @@ in

inherit (callPackage ../tools/admin/ansible { })
ansible
ansible_2_5
ansible_2_6
ansible_2_7;