Skip to content

Commit acdef5b

Browse files
committed
lock nixpkgs, try kotlin-native
1 parent 0c6d823 commit acdef5b

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff 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

.github/workflows/test.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

default.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
with (import <nixpkgs> {
1+
let pkgs = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/430a043a187872d8b065c073839997719b564611.tar.gz") {
22
overlays = [
33
(import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
44
];
5-
}); {
5+
});
6+
in with pkgs; {
67
# C, C++
7-
gcc = (callPackage ./gcc-luogu {}).gcc;
8+
gcc = (callPackage ./gcc-luogu { inherit pkgs; }).gcc;
89

910
# Rust
10-
rust = rust-bin.nightly.latest.default;
11+
rust = rust-bin.nightly."2021-08-23".default;
1112

1213
# Haskell
1314
inherit ghc;
@@ -39,7 +40,7 @@ with (import <nixpkgs> {
3940
# C#, F#, Visual Basic
4041
inherit mono;
4142

42-
# Java
43+
# Java 8
4344
inherit jdk8;
4445

4546
# OCaml
@@ -64,5 +65,5 @@ with (import <nixpkgs> {
6465
inherit kotlin;
6566

6667
# Kotlin/Native
67-
kotlin-native = callPackage ./kotlin-native {};
68+
kotlin-native = (callPackage ./kotlin-native { inherit pkgs; });
6869
}

kotlin-native/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ let
2020
export KONAN_DATA_DIR=$PWD/konan-data
2121
export PATH=$PATH:${jre}/bin:$PWD/build-bin
2222
cp -r bin build-bin
23-
patchShebangs --build build-bin
23+
patchShebangs build-bin
2424
kotlinc-native -Xcheck-dependencies
2525
rm -r build-bin
2626
'';
2727
installPhase = ''
2828
mkdir -p $out
2929
mv * $out
3030
rm $out/bin/kotlinc # kotlinc will be removed in the future
31+
patchShebangs bin
3132
'';
3233

3334
dontFixup = true;

0 commit comments

Comments
 (0)