mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-14 10:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint warnings raised by deadnix (#1540)

Browse Source
This commit is contained in:
Vaibhav Sagar 2024-12-01 22:18:48 +11:00 committed by GitHub
parent 4677c23fca
commit 6053b7ed65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flake.nix
View File

@ -17,8 +17,7 @@
outputs = { self, nixpkgs24_05, nixpkgsMaster, flake-utils, hls, nix-filter, ... }:
flake-utils.lib.eachDefaultSystem (system: let
baseOverlay = self: super: { inherit nix-filter; };
pkgs24_05 = import nixpkgs24_05 { inherit system; overlays = [baseOverlay]; };
baseOverlay = _self: _super: { inherit nix-filter; };
pkgsMaster = import nixpkgsMaster { inherit system; overlays = [baseOverlay]; };
jupyterlab = pkgsMaster.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);

4
nix/ihaskell-overlay.nix
View File

@ -5,7 +5,7 @@
, enableHlint
}:
self: super:
self: _super:
let
ihaskell-src = callPackage ./ihaskell-src.nix {};
@ -32,7 +32,7 @@ in
in
if enableHlint
then baseIhaskell
else baseIhaskell.overrideScope (self: super: { hlint = null; });
else baseIhaskell.overrideScope (_self: _super: { hlint = null; });
ghc-parser = self.callCabal2nix "ghc-parser" (builtins.path { path = ../ghc-parser; name = "ghc-parser-src"; }) {};
ipython-kernel = self.callCabal2nix "ipython-kernel" (builtins.path { path = ../ipython-kernel; name = "ipython-kernel-src"; }) {};

8
nix/mkDevShell.nix
View File

@ -1,14 +1,14 @@
{ pkgs
, hls
, system
, version
# , hls
# , system
# , version
, haskellPackages
, ihaskellOverlay
}:
let
compilerVersion = builtins.substring 3 100 version;
# compilerVersion = builtins.substring 3 100 version;
devIHaskell = haskellPackages.developPackage {
root = pkgs.lib.cleanSource ../.;

4
nix/overlay-9.10.nix
View File

@ -1,4 +1,4 @@
sel: sup: {
_sel: sup: {
haskell = sup.haskell // {
packages = sup.haskell.packages // {
ghc910 = sup.haskell.packages.ghc910.override {
@ -10,7 +10,7 @@ sel: sup: {
primitive = sup.haskell.lib.doJailbreak super.primitive;
call-stack = sup.haskell.lib.dontCheck super.call-stack;
doctest = sup.haskell.lib.doJailbreak (sup.haskell.lib.dontCheck super.doctest);
hashable = sup.haskell.lib.doJailbreak (super.hashable.overrideScope(sel: sup: {
hashable = sup.haskell.lib.doJailbreak (super.hashable.overrideScope(_sel: _sup: {
os-string = null;
}));
ChasingBottoms = sup.haskell.lib.doJailbreak super.ChasingBottoms;

4
nix/overlay-9.6.nix
View File

@ -1,8 +1,8 @@
sel: sup: {
_sel: sup: {
haskell = sup.haskell // {
packages = sup.haskell.packages // {
ghc96 = sup.haskell.packages.ghc96.override {
overrides = self: super: {
overrides = self: _super: {
plot = self.callHackage "plot" "0.2.3.12" {};

4
nix/overlay-9.8.nix
View File

@ -1,9 +1,9 @@
sel: sup: {
_sel: sup: {
haskell = sup.haskell // {
packages = sup.haskell.packages // {
ghc98 = sup.haskell.packages.ghc98.override {
overrides = self: super: {
ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: {
ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: _super: {
ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
});