diff options
author | Ingo Blechschmidt <iblech@speicherleck.de> | 2023-01-31 22:33:20 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-02-14 14:45:39 +0100 |
commit | 168d9a5f1e72dd109c53f844a9ba54795613276c (patch) | |
tree | c84255c940a3e2894f339bf0bbe34d4a3e403219 /pkgs/development/libraries/agda | |
parent | f29aaa7010e6ebd85f897a422fa6fec5f53c4a76 (diff) |
agda: 2.6.2.2 -> 2.6.3
Diffstat (limited to 'pkgs/development/libraries/agda')
4 files changed, 22 insertions, 16 deletions
diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 12bc6e7e4e192..ff520fb85ef31 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,21 +1,29 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.7.1"; + version = "0.1.7.1a"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "1acb693ad2nrmnn6jxsyrlkc0di3kk2ksj2w9wnyfxrgvfsil7rn"; + sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU="; }; - # Remove this once new version of agda-categories is released which - # directly references standard-library-1.7.1 postPatch = '' - substituteInPlace agda-categories.agda-lib \ - --replace 'standard-library-1.7' 'standard-library-1.7.1' + # Remove this once agda-categories incorporates this fix or once Agda's + # versioning system gets an overhaul in general. Right now there is no middle + # ground between "no version constraint" and "exact match down to patch". We + # do not want to need to change this postPatch directive on each minor + # version update of the stdlib, so we get rid of the version constraint + # altogether. + sed -Ei 's/standard-library-[0-9.]+/standard-library/' agda-categories.agda-lib + + # The Makefile of agda-categories uses git(1) instead of find(1) to + # determine the list of source files. We cannot use git, as $PWD will not + # be a valid Git working directory. + 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 ''; buildInputs = [ standard-library ]; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 693bad67d08ee..573b13d3b4f9d 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "compat-2.6.2"; + version = "unstable-2022-01-14"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = version; - sha256 = "0j2nip5fbn61fpkm3qz4dlazl4mzdv7qlgw9zm15bkcvaila0h14"; + rev = "3d143d6d0a3f75966602480665623e87233ff93e"; + hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8="; }; preConfigure = '' diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index a69edded5b3d2..5cd2a4a9a2329 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,17 +2,15 @@ mkDerivation rec { pname = "cubical"; - version = "0.4"; + version = "unstable-2023-02-09"; src = fetchFromGitHub { repo = pname; owner = "agda"; - rev = "v${version}"; - hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE="; + rev = "6b1ce0b67fd94693c1a3e340c8e8765380de0edc"; + hash = "sha256-XRCaW94oAgy2GOnFiI9c5A8mEx7AzlbT4pFd+PMmc9o="; }; - LC_ALL = "C.UTF-8"; - # The cubical library has several `Everything.agda` files, which are # compiled through the make file they provide. nativeBuildInputs = [ ghc ]; diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index bad3a02470e45..76f69f54d7191 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0khl12jvknsvjsq3l5cbp2b5qlw983qbymi1dcgfz9z0b92si3r0"; + hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; |