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

Commits on Mar 7, 2019

  1. davix: 0.6.4 -> 0.7.2 

    Bump version to be compatible with OpenSSL 1.1.

cc #22357
    @andir
    andir committed Mar 7, 2019
    Copy the full SHA
    9db4b80 View commit details

Commits on Mar 18, 2019

  1. Merge pull request #57018 from andir/davix 

    davix: 0.6.4 -> 0.7.2
    @andir
    andir authored Mar 18, 2019
    Copy the full SHA
    f5c63cb View commit details
Showing with 13 additions and 11 deletions.
  1. +13 −11 pkgs/tools/networking/davix/default.nix
24 changes: 13 additions & 11 deletions pkgs/tools/networking/davix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, libxml2, boost }:
{ stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }:

stdenv.mkDerivation rec {
name = "davix-0.6.4";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ stdenv cmake openssl libxml2 boost ];
version = "0.7.2";
name = "davix-${version}";
nativeBuildInputs = [ cmake pkgconfig python3 ];
buildInputs = [ openssl libxml2 boost libuuid ];

src = fetchFromGitHub {
owner = "cern-it-sdc-id";
repo = "davix";
rev = "R_0_6_4";
sha256 = "10hg7rs6aams96d4ghldgkrrnikskdpmn8vy6hj5j0s17a2yms6q";
# using the url below since the 0.7.2 release did carry a broken CMake file,
# supposedly fixed in the next release
# https://github.com/cern-fts/davix/issues/40
src = fetchurl {
url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
sha256 = "1w1q7r6r5j5f23ra4qhx3x29w9z9xal23c2azazpfmcz88hkkmhz";
};


meta = with stdenv.lib; {
description = "Toolkit for Http-based file management";

longDescription = "Davix is a toolkit designed for file
longDescription = "Davix is a toolkit designed for file
operations with Http based protocols (WebDav, Amazon S3, ...).
Davix provides an API and a set of command line tools";

license = licenses.lgpl2Plus;
homepage = http://dmc.web.cern.ch/projects/davix/home;
maintainers = [ maintainers.adev ];
platforms = platforms.all;
};
};
}