Skip to content

Commit 31deefe

Browse files
authored
% nix run github:astro/deadnix -- --edit --no-lambda-pattern-names --exclude ./materialized (input-output-hk#1756)
1 parent 3eacd03 commit 31deefe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+76
-173
lines changed

builder/comp-builder.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ let
620620
lib.optionals (builtins.compareVersions defaults.ghc.version "9.4.1" >= 0)
621621
[ buildPackages.gcc-unwrapped
622622
# Find the versions of mcfgthreads used by stdenv.cc
623-
(pkgs.threadsCrossFor or (x: { package = pkgs.windows.mcfgthreads; }) pkgs.stdenv.cc.version).package
623+
(pkgs.threadsCrossFor or (_x: { package = pkgs.windows.mcfgthreads; }) pkgs.stdenv.cc.version).package
624624
])}; do
625625
find "$p" -iname '*.dll' -exec ln -s {} $out/bin \;
626626
done

builder/haddock-builder.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@ let
121121
'';
122122

123123
installPhase =
124-
let
125-
target-pkg-and-db = "${ghc.targetPrefix}ghc-pkg -v0 --package-db $out/package.conf.d";
126-
in ''
124+
''
127125
html="dist/doc/html/${package.identifier.name}"
128126
129127
if [ -d "$html" ]; then

builder/make-config-files.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ let
3737
# pkg id for z-{pkg name}-z-{sublib name}. As we do not provide the
3838
# sublib name to exactDep, as we don't have access to it at the call-site,
3939
# we resort to a bit of globbing, which (as pkg db's should contain only
40-
# a single package) work.
41-
42-
getLibComponent = dep:
43-
dep.components.library # Regular package dependency
44-
or dep; # or a sublib
40+
# a single package) work. # or a sublib
4541

4642
# Work our suitable packageCfgDir subdirectory
4743
isGhcjs = ghc.isGhcjs or false;

ci-lib.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rec {
2020
# Keep derivations and attrsets with 'recurseForDerivations'. This ensures that we match the
2121
# derivations that Hercules will see, and prevents Hydra from trying to pick up all sorts of bad stuff
2222
# (like attrsets that contain themselves!).
23-
filterDerivations = filterAttrsOnlyRecursive (n: attrs: lib.isDerivation attrs || attrs.recurseForDerivations or false);
23+
filterDerivations = filterAttrsOnlyRecursive (_n: attrs: lib.isDerivation attrs || attrs.recurseForDerivations or false);
2424

2525
# A version of 'filterAttrsRecursive' that doesn't recurse into derivations. This prevents us from going into an infinite
2626
# loop with the 'out' attribute on derivations.

ci.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# set checkMaterialization as per top-level argument
3232
overlays = [
3333
haskellNix.overlay
34-
(final: prev: {
34+
(_final: prev: {
3535
haskell-nix = prev.haskell-nix // {
3636
inherit checkMaterialization;
3737
};
@@ -62,7 +62,7 @@
6262
(system != "aarch64-linux" || (
6363
!builtins.elem compiler-nix-name ["ghc865" "ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901" "ghc921" "ghc922"]
6464
)))
65-
(builtins.mapAttrs (compiler-nix-name: runTests: {
65+
(builtins.mapAttrs (_compiler-nix-name: runTests: {
6666
inherit runTests;
6767
}) (
6868
# GHC version to cache and whether to run the tests against them.

compiler/ghc/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ let
113113
let targetLibffi = targetPackages.libffi or libffi; in
114114
# we need to set `dontDisableStatic` for musl for libffi to work.
115115
if stdenv.targetPlatform.isMusl
116-
then targetLibffi.overrideAttrs (old: { dontDisableStatic = true; })
116+
then targetLibffi.overrideAttrs (_old: { dontDisableStatic = true; })
117117
else targetLibffi;
118118

119119
targetGmp = targetPackages.gmp or gmp;

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ let
5555
# coming from internal.compat
5656
overlays = [ self.overlay ]
5757
++ lib.optional checkMaterialization
58-
(final: prev: {
58+
(_final: prev: {
5959
haskell-nix = prev.haskell-nix // {
6060
checkMaterialization = true;
6161
};

docs/tutorials/getting-started-flakes/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" ] (system:
88
let
99
overlays = [ haskellNix.overlay
10-
(final: prev: {
10+
(final: _prev: {
1111
# This overlay adds our project to pkgs
1212
helloProject =
1313
final.haskell-nix.project' {

hix/init/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
flake-utils.lib.eachSystem supportedSystems (system:
1616
let
1717
overlays = [ haskellNix.overlay
18-
(final: prev: {
18+
(final: _prev: {
1919
hixProject =
2020
final.haskell-nix.hix.project {
2121
src = ./.;

hix/project/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
flake-utils.lib.eachSystem [ "EVAL_SYSTEM" ] (system:
1111
let
1212
overlays = [ haskellNix.overlay
13-
(final: prev: {
13+
(final: _prev: {
1414
hixProject =
1515
final.haskell-nix.hix.project {
1616
inherit src;

0 commit comments

Comments
 (0)