Unverified Commit ca0335c0 authored by Konstantin Astafurov's avatar Konstantin Astafurov Committed by Daniel Nagy
Browse files

chickenPackages_5: Remove ocaml dependency, switch to TOML

parent 3545373f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
**/deps.nix linguist-generated
**/deps.json linguist-generated
**/deps.toml lingust-generated
**/node-packages.nix linguist-generated

pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://call-cc.org/";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ corngood nagy ];
    maintainers = with lib.maintainers; [ corngood nagy konst-aa ];
    platforms = lib.platforms.unix;
    description = "A portable compiler for the Scheme programming language";
    longDescription = ''
+9 −10
Original line number Diff line number Diff line
{ lib, newScope, fetchzip }:
{ lib, newScope, fetchurl }:
let
  callPackage = newScope self;

  self = with lib; {
    pkgs = self;

    fetchegg = { name, version, sha256, ... }:
      fetchzip {
    fetchegg = { pname, version, sha256, ... }:
      fetchurl {
        inherit sha256;
        name = "chicken-${name}-${version}-source";
        url =
          "https://code.call-cc.org/egg-tarballs/5/${name}/${name}-${version}.tar.gz";
          "https://code.call-cc.org/egg-tarballs/5/${pname}/${pname}-${version}.tar.gz";
      };

    eggDerivation = callPackage ./eggDerivation.nix { };
@@ -19,21 +18,21 @@ let
      bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; };
    };

    chickenEggs = recurseIntoAttrs (mapAttrs (name:
    chickenEggs = recurseIntoAttrs (mapAttrs (pname:
      eggData@{ version, synopsis, dependencies, license, ... }:
      self.eggDerivation {
        name = "chicken-${name}-${version}";
        src = self.fetchegg (eggData // { inherit name; });
        name = "${pname}-${version}";
        src = self.fetchegg (eggData // { inherit pname; });
        buildInputs = map (x: self.chickenEggs.${x}) dependencies;
        meta.homepage =
          "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${name}/${version}";
          "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}";
        meta.description = synopsis;
        meta.license = (licenses // {
          "bsd-2-clause" = licenses.bsd2;
          "bsd-3-clause" = licenses.bsd3;
          "public-domain" = licenses.publicDomain;
        }).${license} or license;
      }) (importJSON ./deps.json));
      }) (importTOML ./deps.toml));

    egg2nix = callPackage ./egg2nix.nix { };
  };
+0 −5543

File deleted.

Preview size limit exceeded, changes collapsed.

+3879 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading