diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/agda/cubical | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/agda/cubical')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/agda/cubical/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix b/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix index 4cbbf5305094..5cd2a4a9a232 100644 --- a/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix @@ -1,25 +1,23 @@ -{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: +{ lib, mkDerivation, fetchFromGitHub, ghc }: mkDerivation rec { pname = "cubical"; - version = "0.4prec3e097a"; + version = "unstable-2023-02-09"; src = fetchFromGitHub { repo = pname; owner = "agda"; - rev = "c3e097a98c84083550fa31101346bd42a0501add"; - sha256 = "101cni2a9xvia1mglb94z61jm8xk9r5kc1sn44cri0qsmk1zbqxs"; + rev = "6b1ce0b67fd94693c1a3e340c8e8765380de0edc"; + hash = "sha256-XRCaW94oAgy2GOnFiI9c5A8mEx7AzlbT4pFd+PMmc9o="; }; - LC_ALL = "en_US.UTF-8"; - - preConfigure = ''export AGDA_EXEC=agda''; - # The cubical library has several `Everything.agda` files, which are # compiled through the make file they provide. - nativeBuildInputs = [ ghc glibcLocales ]; + nativeBuildInputs = [ ghc ]; buildPhase = '' + runHook preBuild make + runHook postBuild ''; meta = with lib; { @@ -28,6 +26,6 @@ mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ alexarice ryanorendorff ]; + maintainers = with maintainers; [ alexarice ryanorendorff ncfavier ]; }; } |