commit dd23e181c8bfe6b2f7a9bc63cc94ce66e8aa6fe1 · pyrox.dev/nixpkgs

+4 -4

pkgs/development/compilers/elm/default.nix

···

       8
        
       let

     

       9
        
         fetchElmDeps = pkgs.callPackage ./lib/fetchElmDeps.nix { };

     

       10
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
         # Haskell packages that require ghc 9.6

     

       12
        
         hs96Pkgs = import ./packages/ghc9_6 {

     

       13
        
           inherit

     
···

       19
        
             ;

     

       20
        
         };

     

       21
        
       

     

       22
       -
         # Haskell packages that require ghc 9.4

     

       23
       -
         hs94Pkgs = import ./packages/ghc9_4 { inherit pkgs lib; };

     

       24
       -
       

     

       25
        
         # Patched, originally npm-downloaded, packages

     

       26
        
         patchedNodePkgs = import ./packages/node {

     

       27
        
           inherit

     
···

       34
        
       

     

       35
        
         assembleScope =

     

       36
        
           self: basics:

     

       37
       -
           (hs96Pkgs self).elmPkgs // (hs94Pkgs self).elmPkgs // (patchedNodePkgs self) // basics;

     

       38
        
       in

     

       39
        
       lib.makeScope pkgs.newScope (

     

       40
        
         self:

···

       8
        
       let

     

       9
        
         fetchElmDeps = pkgs.callPackage ./lib/fetchElmDeps.nix { };

     

       10
        
       

     

       11
       +
         # Haskell packages that require ghc 9.8

     

       12
       +
         hs98Pkgs = import ./packages/ghc9_8 { inherit pkgs lib; };

     

       13
       +
       

     

       14
        
         # Haskell packages that require ghc 9.6

     

       15
        
         hs96Pkgs = import ./packages/ghc9_6 {

     

       16
        
           inherit

     
···

       22
        
             ;

     

       23
        
         };

     

       24
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
         # Patched, originally npm-downloaded, packages

     

       26
        
         patchedNodePkgs = import ./packages/node {

     

       27
        
           inherit

     
···

       34
        
       

     

       35
        
         assembleScope =

     

       36
        
           self: basics:

     

       37
       +
           (hs98Pkgs self).elmPkgs // (hs96Pkgs self).elmPkgs // (patchedNodePkgs self) // basics;

     

       38
        
       in

     

       39
        
       lib.makeScope pkgs.newScope (

     

       40
        
         self:

-53

pkgs/development/compilers/elm/packages/ghc9_4/default.nix

···

       1
       -
       { pkgs, lib }:

     

       2
       -
       

     

       3
       -
       self:

     

       4
       -
       pkgs.haskell.packages.ghc94.override {

     

       5
       -
         overrides =

     

       6
       -
           self: super:

     

       7
       -
           let

     

       8
       -
             inherit (pkgs.haskell.lib.compose) justStaticExecutables overrideCabal doJailbreak;

     

       9
       -
             elmPkgs = {

     

       10
       -
               /*

     

       11
       -
                 The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:

     

       12
       -
                 `package/nix/build.sh`

     

       13
       -
               */

     

       14
       -
               elm-format = justStaticExecutables (

     

       15
       -
                 overrideCabal (drv: {

     

       16
       -
                   jailbreak = true;

     

       17
       -
                   doHaddock = false;

     

       18
       -
                   postPatch = ''

     

       19
       -
                     mkdir -p ./generated

     

       20
       -
                     cat <<EOHS > ./generated/Build_elm_format.hs

     

       21
       -
                     module Build_elm_format where

     

       22
       -
                     gitDescribe :: String

     

       23
       -
                     gitDescribe = "${drv.version}"

     

       24
       -
                     EOHS

     

       25
       -
                   '';

     

       26
       -
       

     

       27
       -
                   description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";

     

       28
       -
                   homepage = "https://github.com/avh4/elm-format";

     

       29
       -
                   license = lib.licenses.bsd3;

     

       30
       -
                   maintainers = with lib.maintainers; [

     

       31
       -
                     avh4

     

       32
       -
                     turbomack

     

       33
       -
                   ];

     

       34
       -
                 }) (self.callPackage ./elm-format/elm-format.nix { })

     

       35
       -
               );

     

       36
       -
             };

     

       37
       -
       

     

       38
       -
             fixHaddock = overrideCabal (_: {

     

       39
       -
               configureFlags = [ "--ghc-option=-Wno-error=unused-packages" ];

     

       40
       -
               doHaddock = false;

     

       41
       -
             });

     

       42
       -
           in

     

       43
       -
           elmPkgs

     

       44
       -
           // {

     

       45
       -
             inherit elmPkgs;

     

       46
       -
       

     

       47
       -
             # Needed for elm-format

     

       48
       -
             avh4-lib = fixHaddock (doJailbreak (self.callPackage ./elm-format/avh4-lib.nix { }));

     

       49
       -
             elm-format-lib = fixHaddock (doJailbreak (self.callPackage ./elm-format/elm-format-lib.nix { }));

     

       50
       -
             elm-format-test-lib = fixHaddock (self.callPackage ./elm-format/elm-format-test-lib.nix { });

     

       51
       -
             elm-format-markdown = fixHaddock (self.callPackage ./elm-format/elm-format-markdown.nix { });

     

       52
       -
           };

     

       53
       -
       }

+3 -4

pkgs/development/compilers/elm/packages/ghc9_4/elm-format/avh4-lib.nix pkgs/development/compilers/elm/packages/ghc9_8/elm-format/avh4-lib.nix

···

       13
        
         relude,

     

       14
        
         tasty,

     

       15
        
         tasty-discover,

     

       16
       -
         tasty-hspec,

     

       17
        
         tasty-hunit,

     

       18
        
         text,

     

       19
        
       }:

     
···

       22
        
         version = "0.0.0.1";

     

       23
        
         src = fetchgit {

     

       24
        
           url = "https://github.com/avh4/elm-format";

     

       25
       -
           sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";

     

       26
       -
           rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";

     

       27
        
           fetchSubmodules = true;

     

       28
        
         };

     

       29
        
         postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot";

     
···

       50
        
           process

     

       51
        
           relude

     

       52
        
           tasty

     

       53
       -
           tasty-hspec

     

       54
        
           tasty-hunit

     

       55
        
           text

     

       56
        
         ];

     

       57
        
         testToolDepends = [ tasty-discover ];

     

       0
        
       
     

       58
        
         description = "Common code for haskell projects";

     

       59
        
         license = lib.licenses.bsd3;

     

       60
        
       }

···

       13
        
         relude,

     

       14
        
         tasty,

     

       15
        
         tasty-discover,

     

       0
        
       
     

       16
        
         tasty-hunit,

     

       17
        
         text,

     

       18
        
       }:

     
···

       21
        
         version = "0.0.0.1";

     

       22
        
         src = fetchgit {

     

       23
        
           url = "https://github.com/avh4/elm-format";

     

       24
       +
           sha256 = "13i1wgva6p9zsx1a7sfb3skc0rv187isb920chkhljyh48c12k8l";

     

       25
       +
           rev = "d07fddc8c0eef412dba07be4ab8768d6abcca796";

     

       26
        
           fetchSubmodules = true;

     

       27
        
         };

     

       28
        
         postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot";

     
···

       49
        
           process

     

       50
        
           relude

     

       51
        
           tasty

     

       0
        
       
     

       52
        
           tasty-hunit

     

       53
        
           text

     

       54
        
         ];

     

       55
        
         testToolDepends = [ tasty-discover ];

     

       56
       +
         doHaddock = false;

     

       57
        
         description = "Common code for haskell projects";

     

       58
        
         license = lib.licenses.bsd3;

     

       59
        
       }

+3 -2

pkgs/development/compilers/elm/packages/ghc9_4/elm-format/elm-format-lib.nix pkgs/development/compilers/elm/packages/ghc9_8/elm-format/elm-format-lib.nix

···

       27
        
         version = "0.0.0.1";

     

       28
        
         src = fetchgit {

     

       29
        
           url = "https://github.com/avh4/elm-format";

     

       30
       -
           sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";

     

       31
       -
           rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";

     

       32
        
           fetchSubmodules = true;

     

       33
        
         };

     

       34
        
         postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot";

     
···

       67
        
           text

     

       68
        
         ];

     

       69
        
         testToolDepends = [ tasty-discover ];

     

       0
        
       
     

       70
        
         description = "Common code used by elm-format and elm-refactor";

     

       71
        
         license = lib.licenses.bsd3;

     

       72
        
       }

···

       27
        
         version = "0.0.0.1";

     

       28
        
         src = fetchgit {

     

       29
        
           url = "https://github.com/avh4/elm-format";

     

       30
       +
           sha256 = "13i1wgva6p9zsx1a7sfb3skc0rv187isb920chkhljyh48c12k8l";

     

       31
       +
           rev = "d07fddc8c0eef412dba07be4ab8768d6abcca796";

     

       32
        
           fetchSubmodules = true;

     

       33
        
         };

     

       34
        
         postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot";

     
···

       67
        
           text

     

       68
        
         ];

     

       69
        
         testToolDepends = [ tasty-discover ];

     

       70
       +
         doHaddock = false;

     

       71
        
         description = "Common code used by elm-format and elm-refactor";

     

       72
        
         license = lib.licenses.bsd3;

     

       73
        
       }

+3 -2

pkgs/development/compilers/elm/packages/ghc9_4/elm-format/elm-format-markdown.nix pkgs/development/compilers/elm/packages/ghc9_8/elm-format/elm-format-markdown.nix

···

       12
        
         version = "0.0.0.1";

     

       13
        
         src = fetchgit {

     

       14
        
           url = "https://github.com/avh4/elm-format";

     

       15
       -
           sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";

     

       16
       -
           rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";

     

       17
        
           fetchSubmodules = true;

     

       18
        
         };

     

       19
        
         postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot";

     
···

       23
        
           mtl

     

       24
        
           text

     

       25
        
         ];

     

       0
        
       
     

       26
        
         description = "Markdown parsing for Elm documentation comments";

     

       27
        
         license = lib.licenses.bsd3;

     

       28
        
       }

···

       12
        
         version = "0.0.0.1";

     

       13
        
         src = fetchgit {

     

       14
        
           url = "https://github.com/avh4/elm-format";

     

       15
       +
           sha256 = "13i1wgva6p9zsx1a7sfb3skc0rv187isb920chkhljyh48c12k8l";

     

       16
       +
           rev = "d07fddc8c0eef412dba07be4ab8768d6abcca796";

     

       17
        
           fetchSubmodules = true;

     

       18
        
         };

     

       19
        
         postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot";

     
···

       23
        
           mtl

     

       24
        
           text

     

       25
        
         ];

     

       26
       +
         doHaddock = false;

     

       27
        
         description = "Markdown parsing for Elm documentation comments";

     

       28
        
         license = lib.licenses.bsd3;

     

       29
        
       }

+3 -2

pkgs/development/compilers/elm/packages/ghc9_4/elm-format/elm-format-test-lib.nix pkgs/development/compilers/elm/packages/ghc9_8/elm-format/elm-format-test-lib.nix

···

       22
        
         version = "0.0.0.1";

     

       23
        
         src = fetchgit {

     

       24
        
           url = "https://github.com/avh4/elm-format";

     

       25
       -
           sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";

     

       26
       -
           rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";

     

       27
        
           fetchSubmodules = true;

     

       28
        
         };

     

       29
        
         postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot";

     
···

       56
        
           text

     

       57
        
         ];

     

       58
        
         testToolDepends = [ tasty-discover ];

     

       0
        
       
     

       59
        
         description = "Test helpers used by elm-format-tests and elm-refactor-tests";

     

       60
        
         license = lib.licenses.bsd3;

     

       61
        
       }

···

       22
        
         version = "0.0.0.1";

     

       23
        
         src = fetchgit {

     

       24
        
           url = "https://github.com/avh4/elm-format";

     

       25
       +
           sha256 = "13i1wgva6p9zsx1a7sfb3skc0rv187isb920chkhljyh48c12k8l";

     

       26
       +
           rev = "d07fddc8c0eef412dba07be4ab8768d6abcca796";

     

       27
        
           fetchSubmodules = true;

     

       28
        
         };

     

       29
        
         postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot";

     
···

       56
        
           text

     

       57
        
         ];

     

       58
        
         testToolDepends = [ tasty-discover ];

     

       59
       +
         doHaddock = false;

     

       60
        
         description = "Test helpers used by elm-format-tests and elm-refactor-tests";

     

       61
        
         license = lib.licenses.bsd3;

     

       62
        
       }

+15 -5

pkgs/development/compilers/elm/packages/ghc9_4/elm-format/elm-format.nix pkgs/development/compilers/elm/packages/ghc9_8/elm-format/elm-format.nix

···

       20
        
         tasty-quickcheck,

     

       21
        
         text,

     

       22
        
       }:

     

       23
       -
       mkDerivation {

     

       24
        
         pname = "elm-format";

     

       25
       -
         version = "0.8.7";

     

       26
        
         src = fetchgit {

     

       27
        
           url = "https://github.com/avh4/elm-format";

     

       28
       -
           sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi";

     

       29
       -
           rev = "b5cca4c26b473dab06e5d73b98148637e4770d45";

     

       30
        
           fetchSubmodules = true;

     

       31
        
         };

     

       32
        
         isLibrary = false;

     
···

       61
        
           tasty-quickcheck

     

       62
        
           text

     

       63
        
         ];

     

       0
        
       
     

       64
        
         homepage = "https://elm-lang.org";

     

       65
       -
         description = "Source code formatter for Elm";

     

       66
        
         license = lib.licenses.bsd3;

     

       67
        
         mainProgram = "elm-format";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       68
        
       }

···

       20
        
         tasty-quickcheck,

     

       21
        
         text,

     

       22
        
       }:

     

       23
       +
       mkDerivation rec {

     

       24
        
         pname = "elm-format";

     

       25
       +
         version = "0.8.8";

     

       26
        
         src = fetchgit {

     

       27
        
           url = "https://github.com/avh4/elm-format";

     

       28
       +
           sha256 = "0klhnfvy1l6mck46qwk6pp4d66cvj0m5w91ylghdcr4fb6ka1gp0";

     

       29
       +
           rev = "b06902f1e450f8be1e7b318caab7ccb1950893fa";

     

       30
        
           fetchSubmodules = true;

     

       31
        
         };

     

       32
        
         isLibrary = false;

     
···

       61
        
           tasty-quickcheck

     

       62
        
           text

     

       63
        
         ];

     

       64
       +
         doHaddock = false;

     

       65
        
         homepage = "https://elm-lang.org";

     

       66
       +
         description = "A source code formatter for Elm";

     

       67
        
         license = lib.licenses.bsd3;

     

       68
        
         mainProgram = "elm-format";

     

       69
       +
         postPatch = ''

     

       70
       +
           mkdir -p ./generated

     

       71
       +
           cat <<EOHS > ./generated/Build_elm_format.hs

     

       72
       +
           module Build_elm_format where

     

       73
       +
       

     

       74
       +
           gitDescribe :: String

     

       75
       +
           gitDescribe = "${version}"

     

       76
       +
           EOHS

     

       77
       +
         '';

     

       78
        
       }

+36

pkgs/development/compilers/elm/packages/ghc9_8/default.nix

···

       1
       +
       { pkgs, lib }:

     

       2
       +
       

     

       3
       +
       self:

     

       4
       +
       pkgs.haskell.packages.ghc98.override {

     

       5
       +
         overrides =

     

       6
       +
           self: super:

     

       7
       +
           let

     

       8
       +
             inherit (pkgs.haskell.lib.compose) justStaticExecutables overrideCabal;

     

       9
       +
       

     

       10
       +
             elmPkgs = {

     

       11
       +
               /*

     

       12
       +
                 The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:

     

       13
       +
                 `package/nix/build.sh`

     

       14
       +
               */

     

       15
       +
               elm-format = justStaticExecutables (

     

       16
       +
                 overrideCabal (drv: {

     

       17
       +
                   homepage = "https://github.com/avh4/elm-format";

     

       18
       +
                   maintainers = with lib.maintainers; [

     

       19
       +
                     avh4

     

       20
       +
                     turbomack

     

       21
       +
                   ];

     

       22
       +
                 }) (self.callPackage ./elm-format/elm-format.nix { })

     

       23
       +
               );

     

       24
       +
             };

     

       25
       +
           in

     

       26
       +
           elmPkgs

     

       27
       +
           // {

     

       28
       +
             inherit elmPkgs;

     

       29
       +
       

     

       30
       +
             # Needed for elm-format

     

       31
       +
             avh4-lib = self.callPackage ./elm-format/avh4-lib.nix { };

     

       32
       +
             elm-format-lib = self.callPackage ./elm-format/elm-format-lib.nix { };

     

       33
       +
             elm-format-test-lib = self.callPackage ./elm-format/elm-format-test-lib.nix { };

     

       34
       +
             elm-format-markdown = self.callPackage ./elm-format/elm-format-markdown.nix { };

     

       35
       +
           };

     

       36
       +
       }