Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasjm committed Dec 12, 2024
1 parent 8855a92 commit d43a01b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
description = "CodeDown languages";

inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
inputs.nixpkgs-master.url = "github:NixOS/nixpkgs/master";

inputs.flake-utils.url = "github:numtide/flake-utils";
Expand Down
12 changes: 6 additions & 6 deletions modules/kernels/bash/man-with-pages.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, makeWrapper, man, posix_man_pages }:
{ stdenv, makeWrapper, man, man-pages-posix }:

stdenv.mkDerivation {
name = "man-with-pages";

unpackPhase = "true";

buildInputs = [makeWrapper man posix_man_pages]; # man-pages
propagatedBuildInputs = [makeWrapper man posix_man_pages]; # man-pages
buildInputs = [makeWrapper man man-pages-posix]; # man-pages
propagatedBuildInputs = [makeWrapper man man-pages-posix]; # man-pages

buildPhase = ''
mkdir -p $out/bin
makeWrapper ${man}/bin/man $out/bin/man --set MANPATH "${posix_man_pages}/share/man"
'';
mkdir -p $out/bin
makeWrapper ${man}/bin/man $out/bin/man --set MANPATH "${man-pages-posix}/share/man"
'';

installPhase = "true";
}
8 changes: 4 additions & 4 deletions modules/kernels/haskell/compilers.nix
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@

warp_3_3_29 = null;

ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0.overrideScope (self: super: {
ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
});
# ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_12_0.overrideScope (self: super: {
# ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
# });

ghc-lib = self.ghc-lib_9_8_2_20240223;
# ghc-lib = self.ghc-lib_9_8_2_20240223;

# ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
};
Expand Down

0 comments on commit d43a01b

Please sign in to comment.