diff --git a/feedback.yaml b/feedback.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e015ddd9d1c81ea60266e31b8342ee2bdaf347ff
--- /dev/null
+++ b/feedback.yaml
@@ -0,0 +1,10 @@
+loops:
+ build:
+ command: nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake .
+ filter:
+ find: '*.nix'
+ check: nix flake check -L
+ gen:
+ command: nix run 'git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix?ref=refs/tags/0.10.0'
+ filter:
+ find: horizon.dhall
diff --git a/flake.lock b/flake.lock
index 508de5f1efb94c316c0905a88971aa1d810f5b5a..9ce30313ecadc67895fa1f77eb7d1ec966acd8b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1678379998,
- "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
+ "lastModified": 1683560683,
+ "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
+ "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
"type": "github"
},
"original": {
@@ -103,11 +103,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
- "lastModified": 1678375444,
- "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
+ "lastModified": 1682879489,
+ "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
+ "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github"
},
"original": {
@@ -120,11 +120,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1679198465,
- "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=",
+ "lastModified": 1683968890,
+ "narHash": "sha256-FuNtjMvT07cJydY5NRyRhIni/dEwkSkijmFEdsmqdkA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5a05160f7671434e1c833b1b01284b876e04eca4",
+ "rev": "ea11a3977f4cba013d8680667616be827c967ac0",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 3405c72618224a30787fe312b787dba19ee01aa5..bd2354b7c9af2d33ad49fc1e2d9b49df4ad48f9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,13 +39,13 @@
haskellLib = pkgs.haskell.lib.compose;
legacyPackages = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) {
- buildHaskellPackages = pkgs.haskell.packages.ghc944;
+ buildHaskellPackages = pkgs.haskell.packages.ghc945;
compilerConfig = pkgs.callPackage ./configuration/ghc.nix { inherit haskellLib; };
configurationArm = { pkgs, haskellLib }: self: super: { };
configurationCommon = import ./configuration/common.nix;
configurationDarwin = import ./configuration/darwin.nix;
configurationNix = { pkgs, haskellLib }: self: super: { };
- ghc = pkgs.haskell.compiler.ghc944;
+ ghc = pkgs.haskell.compiler.ghc945;
inherit haskellLib;
initialPackages = import ./initial-packages.nix;
nonHackagePackages = self: super: { };
diff --git a/horizon.dhall b/horizon.dhall
index 9f7dd59d7e35392df92a5043ade277be78e4d6c4..4463bf81e3d20ee7907e2b4ddf0985b261602b3e 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -350,7 +350,6 @@ let packages =
, fcf-containers = H.callHackage "fcf-containers" "0.8.0"
, feedback = H.callHackage "feedback" "0.1.0.1"
, file-embed = H.callHackage "file-embed" "0.0.15.0"
- , file-embed-lzma = H.callHackage "file-embed-lzma" "0.0.1"
, filelock = H.callHackage "filelock" "0.1.1.5"
, filemanip = H.callHackage "filemanip" "0.3.6.3"
, filepattern = H.callHackage "filepattern" "0.1.3"
@@ -731,7 +730,6 @@ let packages =
, lucid-svg = H.callHackage "lucid-svg" "0.7.1"
, lukko = H.callHackage "lukko" "0.1.1.3"
, lvar = H.callHackage "lvar" "0.1.0.0"
- , lzma = H.callHackage "lzma" "0.0.0.4"
, managed = H.callHackage "managed" "1.0.10"
, markdown = H.callHackage "markdown" "0.1.17.5"
, markdown-unlit = H.callHackage "markdown-unlit" "0.5.1"
@@ -991,25 +989,25 @@ let packages =
, servant =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant/")
, servant-auth = H.callHackage "servant-auth" "0.4.1.0"
, servant-auth-client = H.callHackage "servant-auth-client" "0.4.1.0"
, servant-auth-server =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-auth/servant-auth-server/")
, servant-blaze = H.callHackage "servant-blaze" "0.9.1"
, servant-client =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-client/")
, servant-client-core =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-client-core/")
, servant-docs = H.callHackage "servant-docs" "0.12"
, servant-effectful =
@@ -1020,7 +1018,7 @@ let packages =
, servant-foreign =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-foreign/")
, servant-lucid = H.callHackage "servant-lucid" "0.9.0.6"
, servant-multipart = H.callHackage "servant-multipart" "0.12.1"
@@ -1029,13 +1027,9 @@ let packages =
, servant-server =
H.callGit
"https://github.com/haskell-servant/servant"
- "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+ "7ae787371333556a7b84778631ed91d1d73e8370"
(Some "servant-server/")
, servant-static-th = H.callHackage "servant-static-th" "1.0.0.0"
- , servant-swagger = H.callHackage "servant-swagger" "1.1.11"
- , servant-swagger-ui = H.callHackage "servant-swagger-ui" "0.3.5.4.5.0"
- , servant-swagger-ui-core =
- H.callHackage "servant-swagger-ui-core" "0.3.5"
, servant-websockets = H.callHackage "servant-websockets" "2.0.0"
, setenv = H.callHackage "setenv" "0.1.1.3"
, setlocale = H.callHackage "setlocale" "1.0.0.10"
diff --git a/horizon.lock b/horizon.lock
index 58d64347f98c978e39ea2683bdc1edb8cd7593fb..e9f3f38d9e611d18b0e7378d1e714f4b7a28233a 100644
--- a/horizon.lock
+++ b/horizon.lock
@@ -1126,10 +1126,6 @@
, mapValue =
"d8e9de90539350c483b5c0c877aa74d6617a0a0960fa0ddfc68a515a16f12dcc"
}
-, { mapKey = "file-embed-lzma"
- , mapValue =
- "13d4ee5e0e9bc5f3c21269d3d129b31e0764302fd2708a8dbee01c484077f8ba"
- }
, { mapKey = "filelock"
, mapValue =
"f7bcf57b14747da3b182c2a854706148041cd6ca197b1604da59efb66dd4b689"
@@ -2282,10 +2278,6 @@
, mapValue =
"5ec7e0ed7bcb4e9506f4c09fd55f9b32d556c38bfe8e85a4b73e3e9ef9c99a41"
}
-, { mapKey = "lzma"
- , mapValue =
- "3f7ed56699d3f4730212b6e764d5d8291a0b14c6332f73267f601a845a9e950d"
- }
, { mapKey = "managed"
, mapValue =
"a58a60b854a97809ddecdc2c6472cabb94dbc068412a1c2fbfcca9959728b2bc"
@@ -3228,7 +3220,7 @@
}
, { mapKey = "servant"
, mapValue =
- "0d9b9fd3c7dad87590d8c2a5bee1f2f8b2e1a02815edbd238ce194951dd829a5"
+ "d34dee0d36f6b46c9e77d5b712de51ff7b1fd1ca0fcbf1a3bd660e9ae5caba58"
}
, { mapKey = "servant-auth"
, mapValue =
@@ -3240,7 +3232,7 @@
}
, { mapKey = "servant-auth-server"
, mapValue =
- "12661e3f795b50af9cbf92092b4a15335a8766bfe9ed5629c73aeefd941071a9"
+ "a9c11377b125655574babdaafa803c769a85d492ab743fc0483c144a1b894f4e"
}
, { mapKey = "servant-blaze"
, mapValue =
@@ -3248,11 +3240,11 @@
}
, { mapKey = "servant-client"
, mapValue =
- "cb115c85423a092d4ebecd30ea879f50df1f1e16eee95e47a644a6fc57fd412a"
+ "c929d1a849c60a8f9dc40b0a053502215b1d32cd42e0b1421e40380b309b63fc"
}
, { mapKey = "servant-client-core"
, mapValue =
- "d18463f13f2cb38ad49c576ef20dea98ca952484e825ec7638a5a37b638f8c75"
+ "fdd6563b22e001721f7c047964c1026d10abf5ec7f50d8b16cae4f3f72016309"
}
, { mapKey = "servant-docs"
, mapValue =
@@ -3264,7 +3256,7 @@
}
, { mapKey = "servant-foreign"
, mapValue =
- "adfd9a22e2eda6df507a38820063046d0d8aabfd15774193e2db40f591e2e1ea"
+ "97f2df673440eacab512e8b97ef65de790f781905530367b23e601d8bf95ee78"
}
, { mapKey = "servant-lucid"
, mapValue =
@@ -3284,24 +3276,12 @@
}
, { mapKey = "servant-server"
, mapValue =
- "1286a1b3abfc99fe31ff5aa179c52d396d78c82ccbd6ca2b5151628e024bb7ff"
+ "9a091d4f9107d66de309e5dcadb41860b38d44179e7f3fb7885909990a022331"
}
, { mapKey = "servant-static-th"
, mapValue =
"7efa33dfb317416d7a1b48495addf0056581c7875999b4537197b3c4db833ec0"
}
-, { mapKey = "servant-swagger"
- , mapValue =
- "0e451b7b42609bd095b9d882ef8754b99735e1f11d768efd9f4f88e4ee68eee3"
- }
-, { mapKey = "servant-swagger-ui"
- , mapValue =
- "e56f596211a5fa3208009db19e5a4e2ff9920ff08a00863984e99434129606c6"
- }
-, { mapKey = "servant-swagger-ui-core"
- , mapValue =
- "bcf6acda36b56682f597d49b27f6e1f596f8cd68404ef99edf0f3abf551fe357"
- }
, { mapKey = "servant-websockets"
, mapValue =
"55710614fc223a4b93dd749f59d0e08aa736a5d519afe8b9c2f06c53bb89ad1d"
diff --git a/initial-packages.nix b/initial-packages.nix
index 04f8b096fc097bc47ebcf640ee3d1cca82644ff4..6674c220803c2ffcadb93f576777e7bae71742c9 100644
--- a/initial-packages.nix
+++ b/initial-packages.nix
@@ -565,8 +565,6 @@ self: with pkgs.haskell.lib; {
file-embed = self.callPackage (./pkgs/file-embed.nix) { };
- file-embed-lzma = self.callPackage (./pkgs/file-embed-lzma.nix) { };
-
filelock = self.callPackage (./pkgs/filelock.nix) { };
filemanip = self.callPackage (./pkgs/filemanip.nix) { };
@@ -1143,8 +1141,6 @@ self: with pkgs.haskell.lib; {
lvar = self.callPackage (./pkgs/lvar.nix) { };
- lzma = self.callPackage (./pkgs/lzma.nix) { };
-
managed = self.callPackage (./pkgs/managed.nix) { };
markdown = self.callPackage (./pkgs/markdown.nix) { };
@@ -1647,12 +1643,6 @@ self: with pkgs.haskell.lib; {
servant-static-th = self.callPackage (./pkgs/servant-static-th.nix) { };
- servant-swagger = self.callPackage (./pkgs/servant-swagger.nix) { };
-
- servant-swagger-ui = self.callPackage (./pkgs/servant-swagger-ui.nix) { };
-
- servant-swagger-ui-core = self.callPackage (./pkgs/servant-swagger-ui-core.nix) { };
-
servant-websockets = self.callPackage (./pkgs/servant-websockets.nix) { };
setenv = self.callPackage (./pkgs/setenv.nix) { };
diff --git a/pkgs/file-embed-lzma.nix b/pkgs/file-embed-lzma.nix
deleted file mode 100644
index d146ed002a25c7b43fb863446927e13661a706fd..0000000000000000000000000000000000000000
--- a/pkgs/file-embed-lzma.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, base, bytestring, directory, filepath, lib, lzma
-, template-haskell, text, transformers
-}:
-mkDerivation {
- pname = "file-embed-lzma";
- version = "0.0.1";
- sha256 = "2922f1119566f7212a2bc2cbc143cf9c296073515aae5f4d829f580d657b81a6";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- base bytestring directory filepath lzma template-haskell text
- transformers
- ];
- testHaskellDepends = [ base bytestring ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = false;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/phadej/file-embed-lzma";
- description = "Use Template Haskell to embed (LZMA compressed) data";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/lzma.nix b/pkgs/lzma.nix
deleted file mode 100644
index 67f371ec46862c428bff945037c0e7e3052ec667..0000000000000000000000000000000000000000
--- a/pkgs/lzma.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, HUnit, QuickCheck, base, bytestring, lib, tasty
-, tasty-hunit, tasty-quickcheck, xz
-}:
-mkDerivation {
- pname = "lzma";
- version = "0.0.0.4";
- sha256 = "020d78ace1588910046c68d06d5c2b56331341e794b1c3115c3a5be54e0cc13b";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [ base bytestring ];
- librarySystemDepends = [ xz ];
- testHaskellDepends = [
- base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
- ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = false;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/hvr/lzma";
- description = "LZMA/XZ compression and decompression";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-auth-server.nix b/pkgs/servant-auth-server.nix
index 79117407716cdf2aab2fcb2e96bfdaa7728ebabf..a50c50e1dde9beb8a9c4a22b19d53b58f9ee3491 100644
--- a/pkgs/servant-auth-server.nix
+++ b/pkgs/servant-auth-server.nix
@@ -11,8 +11,8 @@ mkDerivation {
version = "0.4.7.0";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-auth/servant-auth-server/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
index 96d7ac8a7877d2c02e04498e33de55a5b6e193e9..0fa6af1ea7fee6375f4c43df7f895832fb1d7646 100644
--- a/pkgs/servant-client-core.nix
+++ b/pkgs/servant-client-core.nix
@@ -9,8 +9,8 @@ mkDerivation {
version = "0.19";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-client-core/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-client.nix b/pkgs/servant-client.nix
index 255c2ce30ccabf03e3419ab5680b77ff7e6c7cee..5c19aef1e6f1425c4a9a6d5e2a248e42bb63f3a2 100644
--- a/pkgs/servant-client.nix
+++ b/pkgs/servant-client.nix
@@ -3,7 +3,7 @@
, hspec, hspec-discover, http-api-data, http-client, http-media
, http-types, kan-extensions, lib, markdown-unlit, monad-control
, mtl, network, semigroupoids, servant, servant-client-core
-, servant-server, sop-core, stm, tdigest, text, time, transformers
+, servant-server, sop-core, stm, text, time, transformers
, transformers-base, transformers-compat, wai, warp
}:
mkDerivation {
@@ -11,8 +11,8 @@ mkDerivation {
version = "0.19";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-client/; echo source root reset to $sourceRoot";
@@ -29,7 +29,7 @@ mkDerivation {
aeson base base-compat bytestring entropy hspec http-api-data
http-client http-types HUnit kan-extensions markdown-unlit mtl
network QuickCheck servant servant-client-core servant-server
- sop-core stm tdigest text transformers transformers-compat wai warp
+ sop-core stm text transformers transformers-compat wai warp
];
testToolDepends = [ hspec-discover markdown-unlit ];
enableLibraryProfiling = true;
diff --git a/pkgs/servant-foreign.nix b/pkgs/servant-foreign.nix
index ef10ae6627c8a0b2a0a5943ff9e570dae3a3bf61..72379fd23ddfe141940f4b556d0d5c7ac0513acc 100644
--- a/pkgs/servant-foreign.nix
+++ b/pkgs/servant-foreign.nix
@@ -6,8 +6,8 @@ mkDerivation {
version = "0.15.4";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-foreign/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
index 3d6402ab9566918e36ff0d0b2bb39a27391bcef5..7a6f140ac8c72c8fd6a1110ec4785355ebaf3864 100644
--- a/pkgs/servant-server.nix
+++ b/pkgs/servant-server.nix
@@ -12,8 +12,8 @@ mkDerivation {
version = "0.19.2";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant-server/; echo source root reset to $sourceRoot";
diff --git a/pkgs/servant-swagger-ui-core.nix b/pkgs/servant-swagger-ui-core.nix
deleted file mode 100644
index 1583c2583b13953e5b2b57c4d8ea75bfca3520b5..0000000000000000000000000000000000000000
--- a/pkgs/servant-swagger-ui-core.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ mkDerivation, aeson, base, blaze-markup, bytestring, http-media
-, lib, servant, servant-blaze, servant-server, text, transformers
-, transformers-compat, wai-app-static
-}:
-mkDerivation {
- pname = "servant-swagger-ui-core";
- version = "0.3.5";
- sha256 = "ed0bf0b2fbdb1751350df6780335de00ae08dd90ac4728a88369f4b132cf7b32";
- revision = "6";
- editedCabalFile = "1lksxaxmw9ylimfkfcnqchrpqhmykhxa294kd2bwl1qs1rvyslfb";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- aeson base blaze-markup bytestring http-media servant servant-blaze
- servant-server text transformers transformers-compat wai-app-static
- ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = false;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/haskell-servant/servant-swagger-ui";
- description = "Servant swagger ui core components";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-swagger-ui.nix b/pkgs/servant-swagger-ui.nix
deleted file mode 100644
index cba61fad3f9234aeb3b4532732c2e848ce2f7425..0000000000000000000000000000000000000000
--- a/pkgs/servant-swagger-ui.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, file-embed-lzma, lib
-, servant, servant-server, servant-swagger-ui-core, text
-}:
-mkDerivation {
- pname = "servant-swagger-ui";
- version = "0.3.5.4.5.0";
- sha256 = "efa528edc055dc6c9e83dfdfe4b892be439bbcfb83a73847f6cfdb35c42f878b";
- revision = "4";
- editedCabalFile = "0nxyp77vqmwd7br5ag0zwc0rjwkxcriqcbfbg9cvlfdkp5d26wsp";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- libraryHaskellDepends = [
- aeson base bytestring file-embed-lzma servant servant-server
- servant-swagger-ui-core text
- ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = false;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/haskell-servant/servant-swagger-ui";
- description = "Servant swagger ui";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant-swagger.nix b/pkgs/servant-swagger.nix
deleted file mode 100644
index fcda411e80d67f76b3c95ded4293724d1af52728..0000000000000000000000000000000000000000
--- a/pkgs/servant-swagger.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ mkDerivation, Cabal, QuickCheck, aeson, aeson-pretty, base
-, base-compat, bytestring, cabal-doctest, directory, doctest
-, filepath, hspec, hspec-discover, http-media
-, insert-ordered-containers, lens, lens-aeson, lib, servant
-, singleton-bool, swagger2, template-haskell, text, time
-, unordered-containers, utf8-string, vector
-}:
-mkDerivation {
- pname = "servant-swagger";
- version = "1.1.11";
- sha256 = "f4b985007ab0520c177f8dcf7bfabf8cc88d480e087db5ea5b1d311c079676cf";
- revision = "1";
- editedCabalFile = "0g2hcf4zrkg8cailad87f3kiv1pnnyw453h9cslwc6kyfx9m3csn";
- isLibrary = true;
- isExecutable = false;
- enableSeparateDataOutput = false;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- aeson aeson-pretty base base-compat bytestring hspec http-media
- insert-ordered-containers lens QuickCheck servant singleton-bool
- swagger2 text unordered-containers
- ];
- testHaskellDepends = [
- aeson base base-compat directory doctest filepath hspec lens
- lens-aeson QuickCheck servant swagger2 template-haskell text time
- utf8-string vector
- ];
- testToolDepends = [ hspec-discover ];
- enableLibraryProfiling = true;
- enableExecutableProfiling = true;
- doHaddock = false;
- jailbreak = true;
- doCheck = false;
- doBenchmark = false;
- hyperlinkSource = false;
- homepage = "https://github.com/haskell-servant/servant/tree/master/servant-swagger#readme";
- description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
- license = lib.licenses.bsd3;
- broken = false;
-}
\ No newline at end of file
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
index 46d19bc72c9066f38542160a3acddf152777e049..b3d8fbe1be58305d870ba8c544ed916c1d2627be 100644
--- a/pkgs/servant.nix
+++ b/pkgs/servant.nix
@@ -10,8 +10,8 @@ mkDerivation {
version = "0.19.1";
src = fetchgit {
url = "https://github.com/haskell-servant/servant";
- sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
- rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+ sha256 = "0ck3l8nj42nan8abdzvkl4ynb2l9nhnsq2zjl24d7sgca860fi57";
+ rev = "7ae787371333556a7b84778631ed91d1d73e8370";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/servant/; echo source root reset to $sourceRoot";