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: 593e71889f87
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d83f1134b73
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 13, 2018

  1. libs3: 2015-04-23 -> 2017-06-01, fix build

    @xeji
    xeji committed Mar 13, 2018
    Copy the full SHA
    823b155 View commit details

Commits on Mar 17, 2018

  1. Merge pull request #36939 from xeji/p/libs3 

    libs3: 2015-04-23 -> 2017-06-01, fix build
    @gebner
    gebner authored Mar 17, 2018
    Copy the full SHA
    8d83f11 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 pkgs/development/libraries/libs3/default.nix
9 changes: 6 additions & 3 deletions pkgs/development/libraries/libs3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{ stdenv, fetchFromGitHub, curl, libxml2 }:

stdenv.mkDerivation {
name = "libs3-2015-04-23";
name = "libs3-2017-06-01";

src = fetchFromGitHub {
owner = "bji";
repo = "libs3";
rev = "11a4e976c28ba525e7d61fbc3867c345a2af1519";
sha256 = "0xjjwyw14sk9am6s2m25hxi55vmsrc2yiawd6ln2lvg59xjcr48i";
rev = "fd8b149044e429ad30dc4c918f0713cdd40aadd2";
sha256 = "0a4c9rsd3wildssvnvph6cd11adn0p3rd4l02z03lvxkjhm20gw3";
};

buildInputs = [ curl libxml2 ];

# added to fix build with gcc7, review on update
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];

DESTDIR = "\${out}";

meta = with stdenv.lib; {