# HG changeset patch # User Evan Hanson # Date 1669069699 -46800 # Tue Nov 22 11:28:19 2022 +1300 # Node ID bea5370f4954a9f47afe52576064b29a66d6302f # Parent 01a4bda36a6bfb3e716635e6ff44ea948bce10c5 Update Nix config and install test dependencies during build diff --git a/.builds/nixos.yml b/.builds/nixos.yml --- a/.builds/nixos.yml +++ b/.builds/nixos.yml @@ -1,13 +1,11 @@ image: nixos/latest repositories: - nixpkgs: https://nixos.org/channels/nixos-20.09 + nixpkgs: https://nixos.org/channels/nixpkgs-unstable +environment: + NIX_CONFIG: experimental-features = nix-command flakes sources: - hg+https://hg.sr.ht/~evhan/sq tasks: - - build: | - cd sq - nix-build --out-link ~/result - ~/result/bin/sq --version - test: | cd sq - nix-shell --run "chicken-install -test" + nix develop -f default.nix -c chicken-install -test diff --git a/.envrc b/.envrc --- a/.envrc +++ b/.envrc @@ -1,8 +1,3 @@ source_up -if type lorri &>/dev/null; then - echo "direnv: using lorri from PATH ($(type -p lorri))" - eval "$(lorri direnv)" -else - use nix -fi +use_nix diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -5,6 +5,7 @@ *.link *.o *.so +./.direnv/ ./chicken/ ./result/ ./sq diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -1,8 +1,9 @@ let - eggsHash = "sha256:16fpd1r7bsxddgi12issv1iz5rr1737hlj66akfv8l4gjgw5g1x8"; + eggsHash = "sha256-12K64Uhx8JW+nvK6pw/Sd4Ecak4F/YNJMT3+Rp9cudY="; in { - pkgs ? import (import ./nix/sources.nix).nixpkgs {}, - beaker ? import (fetchTarball https://git.sr.ht/~evhan/beaker/archive/0.0.13.tar.gz) { inherit pkgs; } + sources ? import ./nix/sources.nix, + pkgs ? import sources.nixpkgs {}, + beaker ? import (fetchTarball https://git.sr.ht/~evhan/beaker/archive/0.0.14.tar.gz) { inherit pkgs; } }: with pkgs; with beaker; eggProgram { name = "sq"; diff --git a/nix/sources.json b/nix/sources.json --- a/nix/sources.json +++ b/nix/sources.json @@ -1,16 +1,4 @@ { - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e", - "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "nixpkgs": { "branch": "nixos-21.05", "description": "Nix Packages collection", diff --git a/sq.egg.lock b/sq.egg.lock --- a/sq.egg.lock +++ b/sq.egg.lock @@ -1,14 +1,17 @@ +("matchable" "1.1") ("srfi-18" "0.1.6") -("srfi-13" "0.3") -("begin-syntax" "0.2.1") -("srfi-60" "0.7") -("simple-exceptions" "1.3.1") +("simple-tests" "3.1") +("srfi-60" "0.7.1") +("r7rs" "1.0.7") ("srfi-145" "0.1") -("r7rs" "1.0.3") -("matchable" "1.1") -("bitwise-utils" "1.2.0") -("optimism" "0.1.0") -("module-declarations" "0.2.1") +("miscmacros" "1.0") +("simple-exceptions" "1.3.1") ("srfi-1" "0.5.1") ("srfi-14" "0.2.1") -("miscmacros" "1.0") +("module-declarations" "0.2.1") +("srfi-13" "0.3.3") +("compile-file" "1.3") +("test" "1.2") +("begin-syntax" "0.2.1") +("optimism" "0.1.0") +("bitwise-utils" "1.2.5")