Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use chez-racket from mainline Nixpkgs #2219

Merged
merged 1 commit into from
Dec 30, 2021
Merged

Use chez-racket from mainline Nixpkgs #2219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 11 additions & 27 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
url = "github:redfish64/idris2-mode";
flake = false;
};
# FIXME: Remove this when https://github.com/NixOS/nixpkgs/pull/131833 gets merged
inputs.nixpkgs-chez-racket.url = "github:L-as/nixpkgs?ref=chez-racket";
inputs.nixpkgs.url = "github:NixOS/nixpkgs";

outputs = { self, nixpkgs, nixpkgs-chez-racket, flake-utils, idris-emacs-src }:
outputs = { self, nixpkgs, flake-utils, idris-emacs-src }:
let
idris2-version = "0.5.1";
lib = import ./nix/lib.nix;
Expand All @@ -30,7 +29,7 @@
pkgs = import nixpkgs { inherit config system overlays; };
chez = if system == "x86_64-linux"
then pkgs.chez
else pkgs.callPackage "${nixpkgs-chez-racket}/pkgs/development/compilers/chez-racket" { inherit (pkgs.darwin) cctools; };
else pkgs.chez-racket; # TODO: Should this always be the default?
idris2Pkg = pkgs.callPackage ./nix/package.nix {
inherit idris2-version chez;
srcRev = self.shortRev or "dirty";
Expand Down