diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil')
8 files changed, 84 insertions, 24 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index 9b90cc053e1e..e498818d2e61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-15-g7cd2dd7"; + version = "unstable-2020-10-18"; + git-version = "0.0-26-gf27ada8"; gerbil-package = "mukn/ethereum"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; @@ -15,8 +15,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-ethereum"; - rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86"; - sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5"; + rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7"; + sha256 = "1lykjqim6a44whj1r8kkpiz68wghkfqx5vjlrc2ldxlmgd4r9gvd"; }; meta = { description = "Gerbil Ethereum: a Scheme alternative to web3.js"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix new file mode 100644 index 000000000000..336f5af89c3b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-libp2p"; + version = "unstable-2018-12-27"; + git-version = "2376b3f"; + gerbil-package = "vyzo"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; # Note: at *runtime*, depends on go-libp2p-daemon + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-libp2p"; + src = fetchFromGitHub { + owner = "vyzo"; + repo = "gerbil-libp2p"; + rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88"; + sha256 = "0jcy7hfg953078msigyfwp2g4ii44pi6q7vcpmq01cbbvxpxz6zw"; + }; + meta = { + description = "Gerbil libp2p: use libp2p from Gerbil"; + homepage = "https://github.com/vyzo/gerbil-libp2p"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix index 1be6684bf440..74485c19c2d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-persist"; - version = "unstable-2020-08-02"; - git-version = "0.0-4-ga3b2bd1"; + version = "unstable-2020-08-31"; + git-version = "0.0-8-gd211390"; gerbil-package = "clan/persist"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-persist"; - rev = "a3b2bd104612db0e4492737f09f72adea6684483"; - sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh"; + rev = "d211390c8a199cf2b8c7400cd98977524e960015"; + sha256 = "13s6ws8ziwalfp23nalss41qnz667z2712lr3y123sypm5n5axk7"; }; meta = { description = "Gerbil Persist: Persistent data and activities"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix index 55673368eead..c6580ea0c77a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-13-g1014154"; + version = "unstable-2020-10-17"; + git-version = "0.0-35-g44d490d"; gerbil-package = "clan/poo"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-poo"; - rev = "1014154fe4943dfbec7524666c831b601ba88559"; - sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97"; + rev = "44d490d95b9d1b5d54eaedf2602419af8e086837"; + sha256 = "082ndpy281saybcnp3bdidcibkk2ih6glrkbb5fdj1524ban4d0k"; }; meta = { description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix index e3f4bb0e0d25..9cb9954544c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -1,14 +1,16 @@ -{ pkgs, gccStdenv, callPackage, fetchFromGitHub }: +{ pkgs, lib, gccStdenv, callPackage, fetchFromGitHub }: # See ../gambit/build.nix regarding gccStdenv rec { # Gerbil libraries gerbilPackages-unstable = { + gerbil-libp2p = callPackage ./gerbil-libp2p.nix { }; gerbil-utils = callPackage ./gerbil-utils.nix { }; gerbil-crypto = callPackage ./gerbil-crypto.nix { }; gerbil-poo = callPackage ./gerbil-poo.nix { }; gerbil-persist = callPackage ./gerbil-persist.nix { }; gerbil-ethereum = callPackage ./gerbil-ethereum.nix { }; + smug-gerbil = callPackage ./smug-gerbil.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. @@ -23,6 +25,7 @@ rec { gambit-params ? pkgs.gambit-support.stable-params, gerbilInputs ? [], buildInputs ? [], + buildScript ? "./build.ss", softwareName ? ""} : let buildInputs_ = buildInputs; in gccStdenv.mkDerivation rec { @@ -33,8 +36,8 @@ rec { set -e ; if [ -n "${version-path}.ss" ] ; then echo -e '(import :clan/versioning${builtins.concatStringsSep "" - (map (x : if x.passthru.version-path != "" - then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "") + (map (x : lib.optionalString (x.passthru.version-path != "") + " :${x.passthru.gerbil-package}/${x.passthru.version-path}") gerbilInputs) })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss" fi @@ -50,7 +53,7 @@ rec { buildPhase = '' runHook preBuild - ./build.ss + ${buildScript} runHook postBuild ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix index 7e1a9bf05574..6d89e1181f2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-utils"; - version = "unstable-2020-08-02"; - git-version = "0.2-21-g7e7d053"; + version = "unstable-2020-10-18"; + git-version = "0.2-36-g8b481b7"; gerbil-package = "clan"; gerbil = gerbil-unstable; gambit-params = gambit-support.unstable-params; @@ -12,8 +12,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-utils"; - rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6"; - sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms"; + rev = "8b481b787e13e07e14d0718d670aab016131a090"; + sha256 = "0br8k5b2wcv4wcp65r2bfhji3af2qgqjspf41syqslq9awx47f3m"; }; meta = { description = "Gerbil Clan: Community curated Collection of Common Utilities"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix new file mode 100644 index 000000000000..732cdb500b9b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix @@ -0,0 +1,30 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "smug-gerbil"; + version = "unstable-2019-12-24"; + git-version = "95d60d4"; + gerbil-package = "drewc/smug"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = ""; #"version"; + softwareName = "Smug-Gerbil"; + src = fetchFromGitHub { + owner = "drewc"; + repo = "smug-gerbil"; + rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5"; + sha256 = "0ys07z78gq60z833si2j7xa1scqvbljlx1zb32vdf32f1b27c04j"; + }; + meta = { + description = "Super Monadic Über Go-into : Parsers and Gerbil Scheme"; + homepage = "https://github.com/drewc/smug-gerbil"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; + buildScript = '' + for i in primitive simple tokens smug ; do gxc -O $i.ss ; done + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix index 7b54438b5c9a..d4ff3ca7a98a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-08-02"; - git-version = "0.16-120-g3f248e13"; + version = "unstable-2020-11-05"; + git-version = "0.16-152-g808929ae"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "3f248e139dfa11be74284fc812253fbecafbaf31"; - sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh"; + rev = "808929aeb8823959191f35df53bc0c0150911b4b"; + sha256 = "0d9k2gkrs9qvlnk7xa3gjzs3gln3ydds7yd2313pvbw4q2lcz8iw"; }; inherit gambit-support; gambit = gambit-unstable; |