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: 8d1d6454f38e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9c3bb10d9a51
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 28, 2020

  1. ocamlPackages.tsdl: 0.9.4 -> 0.9.7 

    From the release notes:
* Require OCaml 4.03 and handle stdlib deprecations.
* Drop result depency.
* Drop ocb-stubblr dependency

The library has also been re-licensed from BSD3 to ISC.
    @droyo @vbgl
    droyo authored and vbgl committed Apr 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    elseym Simon Waibl
    GPG key ID: 8696D1F9E5C020D2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9c3bb10 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/development/ocaml-modules/tsdl/default.nix
10 changes: 5 additions & 5 deletions pkgs/development/ocaml-modules/tsdl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }:

if !stdenv.lib.versionAtLeast ocaml.version "4.02"
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "tsdl is not available for OCaml ${ocaml.version}"
else

let
pname = "tsdl";
version = "0.9.4";
version = "0.9.7";
webpage = "https://erratique.ch/software/${pname}";
in

@@ -15,11 +15,11 @@ stdenv.mkDerivation {

src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2";
sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ];
buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ SDL2 ctypes ];

preConfigure = ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = webpage;
description = "Thin bindings to the cross-platform SDL library";
license = licenses.bsd3;
license = licenses.isc;
platforms = ocaml.meta.platforms or [];
};
}