Commit acdef5b

committed

lock nixpkgs, try kotlin-native

1 parent 0c6d823 commit acdef5bCopy full SHA for acdef5b

File tree

+25

-25

lines changed

+25

-25

lines changed

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,16 @@`
	`1`	`+name: "Build"`
	`2`	`+on:`
	`3`	`+ push:`
	`4`	`+jobs:`
	`5`	`+ build:`
	`6`	`+ runs-on: ubuntu-latest`
	`7`	`+ steps:`
	`8`	`+ - uses: actions/checkout@v2.3.4`
	`9`	`+ - uses: cachix/install-nix-action@v13`
	`10`	`+ with:`
	`11`	`+ nix_path: nixpkgs=channel:nixos-unstable`
	`12`	`+ - uses: cachix/cachix-action@v9`
	`13`	`+ with:`
	`14`	`+ name: soha`
	`15`	`+ authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'`
	`16`	`+ - run: nix-build`

Lines changed: 0 additions & 18 deletions

This file was deleted.

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`		`-with(import <nixpkgs> {`
	`1`	`+letpkgs=(import (fetchTarball"https://github.com/NixOS/nixpkgs/archive/430a043a187872d8b065c073839997719b564611.tar.gz") {`
`2`	`2`	`overlays = [`
`3`	`3`	`(import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))`
`4`	`4`	`];`
`5`		`-}); {`
	`5`	`+});`
	`6`	`+in with pkgs; {`
`6`	`7`	`# C, C++`
`7`		`- gcc = (callPackage ./gcc-luogu {}).gcc;`
	`8`	`+ gcc = (callPackage ./gcc-luogu {inheritpkgs;}).gcc;`
`8`	`9`
`9`	`10`	`# Rust`
`10`		`- rust = rust-bin.nightly.latest.default;`
	`11`	`+ rust = rust-bin.nightly."2021-08-23".default;`
`11`	`12`
`12`	`13`	`# Haskell`
`13`	`14`	`inherit ghc;`
`@@ -39,7 +40,7 @@ with (import <nixpkgs> {`
`39`	`40`	`# C#, F#, Visual Basic`
`40`	`41`	`inherit mono;`
`41`	`42`
`42`		`- # Java`
	`43`	`+ # Java 8`
`43`	`44`	`inherit jdk8;`
`44`	`45`
`45`	`46`	`# OCaml`
`@@ -64,5 +65,5 @@ with (import <nixpkgs> {`
`64`	`65`	`inherit kotlin;`
`65`	`66`
`66`	`67`	`# Kotlin/Native`
`67`		`- kotlin-native = callPackage ./kotlin-native {};`
	`68`	`+ kotlin-native = (callPackage ./kotlin-native {inheritpkgs;});`
`68`	`69`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,15 @@ let`
`20`	`20`	`export KONAN_DATA_DIR=$PWD/konan-data`
`21`	`21`	`export PATH=$PATH:${jre}/bin:$PWD/build-bin`
`22`	`22`	`cp -r bin build-bin`
`23`		`- patchShebangs --build build-bin`
	`23`	`+ patchShebangs build-bin`
`24`	`24`	`kotlinc-native -Xcheck-dependencies`
`25`	`25`	`rm -r build-bin`
`26`	`26`	`'';`
`27`	`27`	`installPhase = ''`
`28`	`28`	`mkdir -p $out`
`29`	`29`	`mv * $out`
`30`	`30`	`rm $out/bin/kotlinc # kotlinc will be removed in the future`
	`31`	`+ patchShebangs bin`
`31`	`32`	`'';`
`32`	`33`
`33`	`34`	`dontFixup = true;`

Comments

(0)