Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cakelisp: init at 0.1.0 #107439

Merged
merged 2 commits into from Jan 7, 2021
Merged

cakelisp: init at 0.1.0 #107439

merged 2 commits into from Jan 7, 2021

Conversation

sbond75
Copy link
Contributor

@sbond75 sbond75 commented Dec 23, 2020

Motivation for this change

Add cakelisp and add myself as a maintainer.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@siraben
Copy link
Member

siraben commented Dec 23, 2020

Result of nixpkgs-review pr 107439 run on x86_64-darwin 1

1 package built:
  • cakelisp

maintainers/maintainer-list.nix Show resolved Hide resolved
pkgs/development/compilers/cakelisp/default.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/cakelisp/default.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/cakelisp/default.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/cakelisp/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107439 run on x86_64-linux 1

1 package built:
  • cakelisp

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107439 run on x86_64-darwin 1

1 package built:
  • cakelisp

buildPhase should probably contain runHook preBuild and runHook postBuild.

installPhase should probably contain runHook preInstall and runHook postInstall.

gpl3 is a deprecated license, check if project uses gpl3Plus or gpl3Only and change meta.license accordingly.

@sbond75 sbond75 force-pushed the cakelisp branch 2 times, most recently from 6c65179 to 7cbaf0b Compare December 24, 2020 05:24
@siraben
Copy link
Member

siraben commented Dec 24, 2020

Tested on darwin, the chain of substituteInPlace seems unnecessary now.

diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix
index cff39bb76fb..1911307e07d 100644
--- a/pkgs/development/compilers/cakelisp/default.nix
+++ b/pkgs/development/compilers/cakelisp/default.nix
@@ -1,38 +1,27 @@
-{ stdenv, lib, fetchFromGitHub, clang, jam }:
+{ stdenv, fetchFromGitHub, gcc, jam }:
 
 stdenv.mkDerivation {
   pname = "cakelisp";
-  version = "unstable-2020-12-21";
+  version = "unstable-2020-12-23";
 
   src = fetchFromGitHub {
     owner = "makuto";
     repo = "cakelisp";
-    rev = "226bb4385a6fb6d61d37a5be8100004a140e5f65";
-    sha256 = "05fyj9a8m44kc3lzyqz4a8dnwa2rpcq981ryszsacywsng46nb01";
+    rev = "1754288817ea325b466a6b80d2c29beff6f5580a";
+    sha256 = "1l7vg4y3ysxdjk3hn8mbhcnw3k3lnpa268j39k8m0m7b45p6lgwa";
   };
 
   nativeBuildInputs = [ jam ];
 
-  buildInputs = [ clang ];
+  buildInputs = [ gcc ];
 
   postPatch = ''
-    substituteInPlace src/Logging.hpp --replace 'log;' 'gLog;'
-    substituteInPlace src/Logging.cpp --replace 'log =' 'gLog ='
-    substituteInPlace src/Utilities.cpp --replace 'log.' 'gLog.'
-    substituteInPlace src/Tokenizer.cpp --replace 'log.' 'gLog.'
-    substituteInPlace src/FileUtilities.cpp --replace 'log.' 'gLog.'
-    substituteInPlace src/Main.cpp --replace 'log.' 'gLog.'
-    substituteInPlace src/Evaluator.cpp --replace 'log.' 'gLog.'
-    substituteInPlace src/Writer.cpp --replace 'log.' 'gLog.'
-    substituteInPlace src/RunProcess.cpp --replace 'log.' 'gLog.'
-    substituteInPlace src/ModuleManager.cpp --replace 'log.' 'gLog.'
-
-    ${lib.optionalString stdenv.isDarwin "substituteInPlace Jamrules --replace 'OS_DEPENDENT_LINKFLAGS = --export-dynamic ;' 'OS_DEPENDENT_LINKFLAGS = -export_dynamic ;'"}
+    ${stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Jamrules --replace 'OS_DEPENDENT_LINKFLAGS = --export-dynamic ;' 'OS_DEPENDENT_LINKFLAGS = -export_dynamic ;'"}
 
     substituteInPlace runtime/HotReloading.cake \
-        --replace '"/usr/bin/clang++"' '"${clang}/bin/clang++"'
+        --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
     substituteInPlace src/ModuleManager.cpp \
-        --replace '"/usr/bin/clang++"' '"${clang}/bin/clang++"'
+        --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
   '';
 
   buildPhase = ''jam "-j$NIX_BUILD_CORES"'';

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107439 run on x86_64-linux 1

1 package built:
  • cakelisp

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107439 run on x86_64-darwin 1

1 package built:
  • cakelisp

@sbond75 sbond75 force-pushed the cakelisp branch 2 times, most recently from 87b4b6a to 083e6c1 Compare December 26, 2020 02:45
@siraben
Copy link
Member

siraben commented Jan 1, 2021

@sbond75 please update the version to v0.1.0 (and refresh the sha256) https://github.com/makuto/cakelisp/releases

@sbond75 sbond75 changed the title cakelisp: init at unstable-2020-12-21 cakelisp: init at 0.1.0 Jan 5, 2021
@siraben
Copy link
Member

siraben commented Jan 5, 2021

Result of nixpkgs-review pr 107439 run on x86_64-darwin 1

1 package built:
  • cakelisp

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants