diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
| commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
| tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/libraries/agda | |
| parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
| parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
| download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/agda')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/agda/1lab/default.nix | 18 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix b/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix index 4d39fa0325f2..3e8f3f0de318 100644 --- a/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2023-12-04"; + version = "unstable-2024-03-07"; src = fetchFromGitHub { owner = "plt-amy"; repo = pname; - rev = "47c2a96220b4d14419e5ddb973bc1fa06933e723"; - hash = "sha256-0U6s6sXdynk2IWRBDXBJCf7Gc+gE8AhR1PXZl0DS4yU="; + rev = "d698f21793c4815082c94d174b9eafae912abb1a"; + hash = "sha256-v8avF9zNNz32kLuAacPdEVeUI9rjn6JCiWPzkXfzBS0="; }; postPatch = '' @@ -17,12 +17,20 @@ mkDerivation rec { # Remove verbosity options as they make Agda take longer and use more memory. shopt -s globstar extglob - sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' src/**/*.@(agda|lagda.md) + files=(src/**/*.@(agda|lagda.md)) + sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' "''${files[@]}" + + # Generate all-pages manually instead of building the build script. + mkdir -p _build + for f in "''${files[@]}"; do + f=''${f#src/} f=''${f%%.*} f=''${f//\//.} + echo "open import $f" + done > _build/all-pages.agda ''; libraryName = "1lab"; libraryFile = "1lab.agda-lib"; - everythingFile = "src/index.lagda.md"; + everythingFile = "_build/all-pages.agda"; meta = with lib; { description = diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix index 11c129badd64..311bdd595c68 100644 --- a/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix @@ -26,10 +26,6 @@ mkDerivation rec { find src -name '*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda ''; - # agda: Heap exhausted; - # agda: Current maximum heap size is 4294967296 bytes (4096 MB). - GHCRTS = "-M5G"; - buildInputs = [ standard-library ]; meta = with lib; { |