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: 9179c1449db7
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: 20c4986c4dd9
Choose a head ref
  • 8 commits
  • 3 files changed
  • 7 contributors

Commits on Oct 3, 2018

  1. opensm: 3.3.20 -> 3.3.21 

    Old git source repository was dead. Switched to GitHub
    @markuskowa
    markuskowa committed Oct 3, 2018
    Copy the full SHA
    ced5563 View commit details

Commits on Oct 8, 2018

  1. opensm: use native shell to run autogen.sh

    @markuskowa
    markuskowa committed Oct 8, 2018
    Copy the full SHA
    e6c947a View commit details

Commits on Oct 9, 2018

  1. helmfile: update from 0.19.0 to 0.40.1

    @edude03
    edude03 committed Oct 9, 2018
    Copy the full SHA
    a0e4102 View commit details

Commits on Oct 11, 2018

  1. php71: 7.1.22 -> 7.1.23 

    Changelog: https://secure.php.net/ChangeLog-7.php#7.1.23
    @etu
    etu committed Oct 11, 2018
    Copy the full SHA
    36e3fdd View commit details

  2. php72: 7.2.10 -> 7.2.11 

    Changelog: https://secure.php.net/ChangeLog-7.php#7.2.11
    @etu
    etu committed Oct 11, 2018
    Copy the full SHA
    b9773bd View commit details

Commits on Oct 13, 2018

  1. Merge pull request #47732 from markuskowa/opensm-up 

    opensm: 3.3.20 -> 3.3.21
    @7c6f434c
    7c6f434c authored Oct 13, 2018
    Copy the full SHA
    c60e8f4 View commit details

  2. Merge pull request #48100 from tenx-tech/feature/upgrade-helmfile 

    helmfile: update from 0.19.0 to 0.40.1
    @nlewo
    nlewo authored Oct 13, 2018
    Copy the full SHA
    276b99a View commit details

  3. Merge pull request #48228 from etu/php-upgrades 

    php: 7.1.22 -> 7.1.23, 7.2.10 -> 7.2.11
    @xeji
    xeji authored Oct 13, 2018
    Copy the full SHA
    20c4986 View commit details
Showing with 25 additions and 14 deletions.
  1. +7 −2 pkgs/applications/networking/cluster/helmfile/default.nix
  2. +5 −5 pkgs/development/interpreters/php/default.nix
  3. +13 −7 pkgs/tools/networking/opensm/default.nix
9 changes: 7 additions & 2 deletions pkgs/applications/networking/cluster/helmfile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:

let version = "0.19.0"; in
let version = "0.40.1"; in

buildGoPackage {
name = "helmfile-${version}";
@@ -9,13 +9,18 @@ buildGoPackage {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd";
sha256 = "02ir10070rpayv9s53anldwjy5ggl268shgf085d188wl6vshaiv";
};

goPackagePath = "github.com/roboll/helmfile";

nativeBuildInputs = [ makeWrapper ];

buildFlagsArray = ''
-ldflags=
-X main.Version=${version}
'';

postInstall = ''
wrapProgram $bin/bin/helmfile \
--prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
10 changes: 5 additions & 5 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -227,7 +227,7 @@ in {
# We can't update the darwin versions because they simply don't compile at
# all due to a bug in the intl extensions.
#
# The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10.
# The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10, 7.2.11.

php71 = generic (
if stdenv.isDarwin then
@@ -237,8 +237,8 @@ in {
}
else
{
version = "7.1.22";
sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
version = "7.1.23";
sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d";
}
);

@@ -250,8 +250,8 @@ in {
}
else
{
version = "7.2.10";
sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
version = "7.2.11";
sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa";
}
);
}
20 changes: 13 additions & 7 deletions pkgs/tools/networking/opensm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex, rdma-core }:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }:

stdenv.mkDerivation rec {
name = "opensm-${version}";
version = "3.3.20";
version = "3.3.21";

src = fetchgit {
url = git://git.openfabrics.org/~halr/opensm.git;
rev = name;
sha256 = "1hlrn5z32yd4w8bj4z6bsfv84pk178s4rnppbabyjqv1rg3c58wl";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "opensm";
rev = "${version}";
sha256 = "0iikw28vslxq3baq9qmmw08yay7l524wciz7dv7km09ylcbx23b7";
};

nativeBuildInputs = [ autoconf automake libtool bison flex ];

buildInputs = [ rdma-core ];

preConfigure = "bash ./autogen.sh";
preConfigure = ''
patchShebangs ./autogen.sh
./autogen.sh
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "Infiniband subnet manager";