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: 8fcf9926fae6
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: bda5f7964b09
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 8, 2020

  1. terraform: 0.12.18 -> 0.12.19 

    Changelog: https://github.com/hashicorp/terraform/releases/tag/v0.12.19
    @marsam
    marsam committed Jan 8, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    starcraft66 Tristan
    GPG key ID: 86886FC44C72EAA1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ab9bb4 View commit details

Commits on Jan 9, 2020

  1. ocamlPackages.ppxfind: dontStrip for all versions

    @anmonteiro @marsam
    anmonteiro authored and marsam committed Jan 9, 2020
    Copy the full SHA
    b8c0e8b View commit details

  2. duplicati: 2.0.4.5 -> 2.0.4.23

    @domenkozar
    domenkozar committed Jan 9, 2020
    Copy the full SHA
    6cd31dd View commit details

  3. Merge pull request #77353 from anmonteiro/patch-3 

    ocamlPackages.ppxfind: dontStrip for all versions
    @marsam
    marsam authored Jan 9, 2020
    Copy the full SHA
    7fe737d View commit details

  4. Merge pull request #77350 from marsam/update-terraform 

    terraform: 0.12.18 -> 0.12.19
    @marsam
    marsam authored Jan 9, 2020
    Copy the full SHA
    bda5f79 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/terraform/default.nix
View file
Original file line number Diff line number Diff line change
@@ -112,8 +112,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;

terraform_0_12 = pluggable (generic {
version = "0.12.18";
sha256 = "1p2rvs9dw2rzzggf3q2lifwbd82b7xb3jpb4yz5nmggn5g22qlc1";
version = "0.12.19";
sha256 = "067gzxysz8r2myj3rh0vwrs0pmbgb21jxlmawlf4v0lkjnhj6kwv";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
5 changes: 4 additions & 1 deletion pkgs/development/ocaml-modules/ppxfind/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:
{ stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:

buildDunePackage (rec {
pname = "ppxfind";
@@ -12,6 +12,9 @@ buildDunePackage (rec {

buildInputs = [ ocaml-migrate-parsetree ];

# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;

meta = {
homepage = "https://github.com/diml/ppxfind";
description = "ocamlfind ppx tool";
6 changes: 3 additions & 3 deletions pkgs/tools/backup/duplicati/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "duplicati";
version = "2.0.4.5";
version = "2.0.4.23";
channel = "beta";
build_date = "2018-11-28";
build_date = "2019-07-14";

src = fetchzip {
url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
sha256 = "118rhzm8vk1092214vq7kxnmrnz4jl32lk8j90965a8pg05m53gn";
sha256 = "1m2448vgl1fc2hkxkyasvdfgl728rqv16b41niznv5rsxv5643w2";
stripRoot = false;
};