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: 710e28bdd8a1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1b9556f87ba
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 13, 2019

  1. ocamlPackages.ocsigen_server: 2.11.0 → 2.15.0 

    ocamlPackages.ssl: 0.5.5 → 0.5.9
    @vbgl
    vbgl committed Oct 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e1b9556 View commit details
Showing with 13 additions and 17 deletions.
  1. +2 −2 pkgs/development/ocaml-modules/ocsigen-server/default.nix
  2. +11 −15 pkgs/development/ocaml-modules/ssl/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/ocsigen-server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,14 +13,14 @@ let mkpath = p: n:
in

stdenv.mkDerivation rec {
version = "2.11.0";
version = "2.15.0";
pname = "ocsigenserver";

src = fetchFromGitHub {
owner = "ocsigen";
repo = "ocsigenserver";
rev = version;
sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2";
sha256 = "15qdkxcbl9c1bbn0fh9awjw0hjn7r6awcn288a9vyxln7icdbifw";
};

buildInputs = [ which makeWrapper ocaml findlib
26 changes: 11 additions & 15 deletions pkgs/development/ocaml-modules/ssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
{ stdenv, fetchzip, which, openssl, ocaml, findlib }:
{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ssl-${version}";
version = "0.5.5";
buildDunePackage rec {
pname = "ssl";
version = "0.5.9";

src = fetchzip {
url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz";
sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-ssl";
rev = version;
sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0";
};

buildInputs = [which ocaml findlib];

nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [openssl];

dontAddPrefix = true;

createFindlibDestdir = true;

meta = {
homepage = http://savonet.rastageeks.org/;
description = "OCaml bindings for libssl ";
license = "LGPL+link exception";
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
lib.maintainers.z77z
];
};
}