From 7bdacb3e39aba0ba1baffcc2fb7964fa74010dce Mon Sep 17 00:00:00 2001 From: Steven Shaw Date: Sun, 28 Jul 2019 07:33:00 +1000 Subject: [PATCH 1/2] maintainers: Add Steven Shaw --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e9c4c5c116..e1605466199 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5001,6 +5001,15 @@ github = "sternenseemann"; name = "Lukas Epple"; }; + steshaw = { + name = "Steven Shaw"; + email = "steven@steshaw.org"; + github = "steshaw"; + keys = [{ + longkeyid = "rsa4096/0x1D9A17DFD23DCB91"; + fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; + }]; + }; stesie = { email = "stesie@brokenpipe.de"; github = "stesie"; From 5bb88bbce2797e7ea40e345ff33c2e8e80e427a6 Mon Sep 17 00:00:00 2001 From: Steven Shaw Date: Sun, 28 Jul 2019 07:37:52 +1000 Subject: [PATCH 2/2] idrisPackages.sdl2: 2018-01-19 -> 0.1.1 Update to latest release which unbreaks the package. --- pkgs/development/idris-modules/sdl2.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index b0306040d73..e4a1fbae562 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -6,26 +6,33 @@ , SDL2 , SDL2_gfx }: -build-idris-package { +build-idris-package rec { name = "sdl2"; - version = "2018-01-19"; + version = "0.1.1"; idrisDeps = [ effects ]; - extraBuildInputs = [ pkgconfig SDL2 SDL2_gfx ]; + extraBuildInputs = [ + pkgconfig + SDL2 + SDL2_gfx + ]; + + prePatch = "patchShebangs ."; src = fetchFromGitHub { owner = "steshaw"; repo = "idris-sdl2"; - rev = "ebc36a0efb3e8086f2999120e7a8a8ac4952c6f6"; - sha256 = "060k0i1pjilrc4pcz7v70hbipaw2crz14yxjlyjlhn6qm03131q0"; + rev = version; + sha256 = sha256:1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a; }; meta = { description = "SDL2 binding for Idris"; homepage = https://github.com/steshaw/idris-sdl2; - maintainers = [ lib.maintainers.brainrape ]; - # Can't find file sdl2.o - broken = true; + maintainers = with lib.maintainers; [ + brainrape + steshaw + ]; }; }