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: c53c9986bdc9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 501607e0ee52
Choose a head ref
  • 6 commits
  • 6 files changed
  • 2 contributors

Commits on Aug 10, 2018

  1. libdigidoc: 3.10.1.1212 -> 3.10.4

    @Mic92 @lukateras
    Mic92 authored and lukateras committed Aug 10, 2018
    Copy the full SHA
    bac254e View commit details

  2. libdigidocpp: 3.13.3.1365 -> 3.13.6

    @Mic92 @lukateras
    Mic92 authored and lukateras committed Aug 10, 2018
    Copy the full SHA
    6df851d View commit details

  3. qdigidoc: 3.12.0.1442 -> 3.13.6

    @lukateras
    lukateras committed Aug 10, 2018
    Copy the full SHA
    c47995a View commit details

  4. qdigidoc: enableParallelBuilding = false

    @lukateras
    lukateras committed Aug 10, 2018
    Copy the full SHA
    0264478 View commit details

  5. qdigidoc: fetch TSL info

    @lukateras
    lukateras committed Aug 10, 2018
    Copy the full SHA
    4b61b78 View commit details

Commits on Aug 11, 2018

  1. Merge pull request #43068 from yegortimoshenko/qdigidoc 

    libdigidoc, libdigidocpp, qdigidoc updates
    @lukateras
    lukateras authored Aug 11, 2018
    Copy the full SHA
    501607e View commit details
18 changes: 7 additions & 11 deletions pkgs/development/libraries/libdigidoc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,22 +2,18 @@

stdenv.mkDerivation rec {

version = "3.10.1.1212";
version = "3.10.4";
name = "libdigidoc-${version}";

src = fetchurl {
url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidoc/libdigidoc_3.10.1.1212.orig.tar.xz";
sha256 = "ad5e0603aea2e02977f17318cc93a53c3a19a815e57b2347d97136d11c110807";
url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz";
sha256 = "0w5wsaj2a5wss1r9j39bfsrkp3xz0w3v1gnr190v6k7l74l453w1";
};

unpackPhase = ''
mkdir src
tar xf $src -C src
cd src
'';
nativeBuildInputs = [ cmake ];

buildInputs = [ openssl pcsclite opensc libxml2 ];

buildInputs = [ cmake openssl pcsclite opensc libxml2 ];

meta = with stdenv.lib; {
description = "Library for creating DigiDoc signature files";
homepage = http://www.id.ee/;
24 changes: 10 additions & 14 deletions pkgs/development/libraries/libdigidocpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
, xercesc, xml-security-c, pkgconfig, xsd, zlib, vim }:
, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:

stdenv.mkDerivation rec {

version = "3.13.3.1365";
version = "3.13.6";
name = "libdigidocpp-${version}";

src = fetchurl {
url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz";
sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw";
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
sha256 = "1sdrj7664737k3kbnj2xrnilnx5ifj8hg42z8pxagb0j81x0pnqj";
};

unpackPhase = ''
mkdir src
tar xf $src -C src
cd src
'';
nativeBuildInputs = [ cmake pkgconfig xxd ];

buildInputs = [
libdigidoc minizip pcsclite opensc openssl xercesc
xml-security-c xsd zlib xalanc
];

buildInputs = [ cmake libdigidoc minizip pcsclite opensc openssl xercesc
xml-security-c pkgconfig xsd zlib vim
];

meta = with stdenv.lib; {
description = "Library for creating DigiDoc signature files";
homepage = http://www.id.ee/;
Loading