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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f55a63329d6e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a2412a765f76
Choose a head ref
  • 8 commits
  • 11 files changed
  • 1 contributor

Commits on Nov 20, 2018

  1. caddy: 0.11.0 -> 0.11.1

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    eea3c6b View commit details

  2. lazygit: 0.4 -> 0.5

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    5fcb1de View commit details

  3. prometheus-alertmanager: 0.15.2 -> 0.15.3

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    3cd66c1 View commit details

  4. gx: 0.12.0 -> 0.14.1

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    4f6f92c View commit details

  5. gx-go: 1.5.0 -> 1.9.0

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    907d46b View commit details

  6. ipfs: 0.4.17 -> 0.4.18

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    90e56d7 View commit details

  7. ipfs-cluster: 0.5.0 -> 0.7.0

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    899659c View commit details

  8. collectd: 5.8.0 -> 5.8.1

    @fpletz
    fpletz committed Nov 20, 2018
    Copy the full SHA
    a2412a7 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/networking/ipfs-cluster/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,23 +2,23 @@

buildGoPackage rec {
name = "ipfs-cluster-${version}";
version = "0.5.0";
version = "0.7.0";
rev = "v${version}";

goPackagePath = "github.com/ipfs/ipfs-cluster";

extraSrcPaths = [
(fetchgx {
inherit name src;
sha256 = "0jwz3kd07i5fs0sxds80j8d338skhgxgxra377qxsk0cr2hhj2vm";
sha256 = "19ljx4q9msrv5wwyd85l01l320lhwgma5z3b756ldgj9fs8p9ph6";
})
];

src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
inherit rev;
sha256 = "132whjyplcifq8747hcdrgbc0amhp618dg049jq5nyslcxfgdypm";
sha256 = "1zqy4zzi33z16fny1dnhqa8z7czrggvbxdxs750gxzbnd9vqzda1";
};

nativeBuildInputs = [ gx-go ];
6 changes: 3 additions & 3 deletions pkgs/applications/networking/ipfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,23 +2,23 @@

buildGoPackage rec {
name = "ipfs-${version}";
version = "0.4.17";
version = "0.4.18";
rev = "v${version}";

goPackagePath = "github.com/ipfs/go-ipfs";

extraSrcPaths = [
(fetchgx {
inherit name src;
sha256 = "0grdgnr67r3qh0ppc3flrhcw8zlvx10mxypd8q2mhkil9w4dpcna";
sha256 = "05d5m6c2i2kl4rvb0hddyqbidn76ljr2zryi8v2r9i8dbi0164gm";
})
];

src = fetchFromGitHub {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
sha256 = "18skmchdqd54wfqhibscqvc360l5ig6vmxd73ivf3bcpj3zvgq7q";
sha256 = "0h4j18qpycfmmlhb9khvhbk8c1zqajflvw8gk3l8j7wxrxh5j2s6";
};

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/tools/lazygit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "lazygit-${version}";
version = "0.4";
version = "0.5";

goPackagePath = "github.com/jesseduffield/lazygit";

src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazygit";
rev = "v${version}";
sha256 = "0piljnwv778z7zc1pglkidiys1a3yv4d7z9wsrcj1nszlcn3ifyz";
sha256 = "0xgda2b5p26ya15kq83502f8vh18kl05hl40k0lsfqx3m7pnidn1";
};

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/servers/caddy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
name = "caddy-${version}";
version = "0.11.0";
version = "0.11.1";

goPackagePath = "github.com/mholt/caddy";

@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "mholt";
repo = "caddy";
rev = "v${version}";
sha256 = "0lvzvsblw4zpdfigaad4y577wfh7skx1ln5xhiz0k7vaqfj96ijy";
sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l";
};

buildFlagsArray = ''
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/prometheus/alertmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
name = "alertmanager-${version}";
version = "0.15.2";
version = "0.15.3";
rev = "v${version}";

goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
sha256 = "1r4j22jnxayicz9hn0pwm77cgzzywr5haq0hwz6sx5j2xwjmnwm7";
sha256 = "037wwfadb9rp1592v8bkqcsy9ym4gbhkg3pz6a6fzirg65d29aia";
};

# Tests exist, but seem to clash with the firewall.
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/gx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@

buildGoPackage rec {
name = "gx-${version}";
version = "0.12.0";
version = "0.14.1";
rev = "refs/tags/v${version}";

goPackagePath = "github.com/whyrusleeping/gx";

src = fetchgit {
inherit rev;
url = "https://github.com/whyrusleeping/gx";
sha256 = "0pvf0j14xnzy01fxilja8xbki0i0g7h7y20jzw74ds5a7ywsdx8r";
sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha";
};

goDeps = ./deps.nix;
Loading