diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-05-19 23:21:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 23:21:48 -0400 |
| commit | 4f3017799f6e368cae4e7750c2fb0870c69b87eb (patch) | |
| tree | 1128e2a71cff9d91fba63ab58986b98f9a91691d | |
| parent | 69232bc088d517abd1a7d49b7dbbafc04b783c6a (diff) | |
| parent | aef6544c13cd75ba6a348b92e941dfa45711ce02 (diff) | |
| download | nixlib-4f3017799f6e368cae4e7750c2fb0870c69b87eb.tar nixlib-4f3017799f6e368cae4e7750c2fb0870c69b87eb.tar.gz nixlib-4f3017799f6e368cae4e7750c2fb0870c69b87eb.tar.bz2 nixlib-4f3017799f6e368cae4e7750c2fb0870c69b87eb.tar.lz nixlib-4f3017799f6e368cae4e7750c2fb0870c69b87eb.tar.xz nixlib-4f3017799f6e368cae4e7750c2fb0870c69b87eb.tar.zst nixlib-4f3017799f6e368cae4e7750c2fb0870c69b87eb.zip | |
Merge pull request #88205 from kthielen/hobbes/upgrade
hobbes: 2020-03-10 -> 2020-05-19
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/hobbes/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 055f1286c8d4..af9fc01df046 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4168,6 +4168,12 @@ githubId = 10544; name = "Giuluo Eulisse"; }; + kthielen = { + email = "kthielen@gmail.com"; + github = "kthielen"; + githubId = 1409287; + name = "Kalani Thielen"; + }; ktor = { email = "kruszewsky@gmail.com"; github = "ktor"; diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index b56afc0a4351..5fd9d314c5e0 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { name = "hobbes"; - version = "unstable-2020-03-10"; + version = "unstable-2020-05-19"; src = fetchFromGitHub { owner = "morgan-stanley"; repo = "hobbes"; - rev = "ae956df9da3f3b24630bc1757dfaa2a8952db07a"; - sha256 = "1a0lb87vb0qcp5wy6swk4jcc88l7vhy6iflsk7zplw547mbjhjsy"; + rev = "3d80a46b44a362a97a6b963a2bf788fd1f67ade1"; + sha256 = "03m915g3283z2nfdr03dj5k76wn917knfqxb0xj3qinbl4cka2p1"; }; nativeBuildInputs = [ @@ -33,8 +33,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/Morgan-Stanley/hobbes"; license = licenses.asl20; - maintainers = [ maintainers.thmzlt ]; + maintainers = with maintainers; [ kthielen thmzlt ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e5f9d8f888b..c0fe4be256fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -183,7 +183,7 @@ in glade = callPackage ../development/tools/glade { }; - hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. + hobbes = callPackage ../development/tools/hobbes { }; proto-contrib = callPackage ../development/tools/proto-contrib {}; |