From 77def225cb60ae7c35ae9c82034aababed016f50 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 31 Dec 2024 00:52:44 +0000 Subject: [PATCH] tests.haskell.setBuildTarget: avoid `lib.fileset` --- pkgs/test/haskell/setBuildTarget/default.nix | 14 +++----------- pkgs/test/haskell/setBuildTarget/{ => src}/Bar.hs | 0 pkgs/test/haskell/setBuildTarget/{ => src}/Foo.hs | 0 .../test/haskell/setBuildTarget/{ => src}/Setup.hs | 0 .../{ => src}/haskell-setBuildTarget.cabal | 0 5 files changed, 3 insertions(+), 11 deletions(-) rename pkgs/test/haskell/setBuildTarget/{ => src}/Bar.hs (100%) rename pkgs/test/haskell/setBuildTarget/{ => src}/Foo.hs (100%) rename pkgs/test/haskell/setBuildTarget/{ => src}/Setup.hs (100%) rename pkgs/test/haskell/setBuildTarget/{ => src}/haskell-setBuildTarget.cabal (100%) diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index 012bce8541e6..68f9b25dba75 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -1,7 +1,7 @@ { pkgs, haskellPackages }: let - # This can be regenerated by running `cabal2nix .` in the current directory. + # This can be regenerated by running `cabal2nix ./src` in the current directory. pkgDef = { mkDerivation, @@ -11,19 +11,11 @@ let mkDerivation { pname = "haskell-setBuildTarget"; version = "0.1.0.0"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./haskell-setBuildTarget.cabal - ./Bar.hs - ./Foo.hs - ./Setup.hs - ]; - }; + src = ./src; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; - license = lib.licenses.bsd3; + license = "unknown"; }; drv = haskellPackages.callPackage pkgDef { }; diff --git a/pkgs/test/haskell/setBuildTarget/Bar.hs b/pkgs/test/haskell/setBuildTarget/src/Bar.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Bar.hs rename to pkgs/test/haskell/setBuildTarget/src/Bar.hs diff --git a/pkgs/test/haskell/setBuildTarget/Foo.hs b/pkgs/test/haskell/setBuildTarget/src/Foo.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Foo.hs rename to pkgs/test/haskell/setBuildTarget/src/Foo.hs diff --git a/pkgs/test/haskell/setBuildTarget/Setup.hs b/pkgs/test/haskell/setBuildTarget/src/Setup.hs similarity index 100% rename from pkgs/test/haskell/setBuildTarget/Setup.hs rename to pkgs/test/haskell/setBuildTarget/src/Setup.hs diff --git a/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal similarity index 100% rename from pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal rename to pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal