From c091b809cac3f099d01c9d01d6031c8b180d4d9d Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 22 Aug 2021 10:24:21 +0900 Subject: [PATCH 1/2] haskellPackages.hasura-ekg-core: unbreak by adding overrides This also similarly fixes haskellPackages.hasura-ekg-core. --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e39efa48b307..8f45269c3008 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1302,6 +1302,17 @@ self: super: { doHaddock = false; version = "2.0.7"; }); + hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: { + hspec = dontCheck self.hspec_2_8_3; + hspec-core = dontCheck self.hspec-core_2_8_3; + hspec-discover = dontCheck super.hspec-discover_2_8_3; + }); + hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: { + ekg-core = self.hasura-ekg-core; + hspec = dontCheck self.hspec_2_8_3; + hspec-core = dontCheck self.hspec-core_2_8_3; + hspec-discover = dontCheck super.hspec-discover_2_8_3; + }); pg-client = overrideCabal (super.pg-client.override { resource-pool = self.hasura-resource-pool; }) (drv: { From d72da4088431070c917a13bea2ac0b31f06a4afa Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 22 Aug 2021 10:25:09 +0900 Subject: [PATCH 2/2] hasura-graphql-engine: add lassulus as maintainer for all dependencies --- pkgs/development/misc/haskell/hasura/ci-info.nix | 1 + pkgs/development/misc/haskell/hasura/ekg-core.nix | 1 + pkgs/development/misc/haskell/hasura/ekg-json.nix | 1 + .../misc/haskell/hasura/graphql-parser.nix | 1 + pkgs/development/misc/haskell/hasura/pg-client.nix | 1 + pkgs/development/misc/haskell/hasura/pool.nix | 1 + pkgs/development/misc/haskell/hasura/update.sh | 12 ++++++------ 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/misc/haskell/hasura/ci-info.nix b/pkgs/development/misc/haskell/hasura/ci-info.nix index ce16c9c17f0a..21b78ca76b34 100644 --- a/pkgs/development/misc/haskell/hasura/ci-info.nix +++ b/pkgs/development/misc/haskell/hasura/ci-info.nix @@ -21,4 +21,5 @@ mkDerivation { prePatch = "hpack"; homepage = "https://github.com/hasura/ci-info-hs#readme"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/ekg-core.nix b/pkgs/development/misc/haskell/hasura/ekg-core.nix index 5fa8a21aa4ec..6a9b1157021e 100644 --- a/pkgs/development/misc/haskell/hasura/ekg-core.nix +++ b/pkgs/development/misc/haskell/hasura/ekg-core.nix @@ -30,4 +30,5 @@ mkDerivation { homepage = "https://github.com/tibbe/ekg-core"; description = "Tracking of system metrics"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/ekg-json.nix b/pkgs/development/misc/haskell/hasura/ekg-json.nix index 0225ee6e7832..e115e2c40b9d 100644 --- a/pkgs/development/misc/haskell/hasura/ekg-json.nix +++ b/pkgs/development/misc/haskell/hasura/ekg-json.nix @@ -18,4 +18,5 @@ mkDerivation { homepage = "https://github.com/tibbe/ekg-json"; description = "JSON encoding of ekg metrics"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser.nix index f8cee5fe2c10..0033584a1593 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix @@ -29,4 +29,5 @@ mkDerivation { homepage = "https://github.com/hasura/graphql-parser-hs"; description = "A native Haskell GraphQL parser"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/pg-client.nix b/pkgs/development/misc/haskell/hasura/pg-client.nix index 0f1d9a8cf943..d1eb5e156e6c 100644 --- a/pkgs/development/misc/haskell/hasura/pg-client.nix +++ b/pkgs/development/misc/haskell/hasura/pg-client.nix @@ -32,4 +32,5 @@ mkDerivation { ]; homepage = "https://github.com/hasura/platform"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix index 72127ad8d326..a12d61f0fe21 100644 --- a/pkgs/development/misc/haskell/hasura/pool.nix +++ b/pkgs/development/misc/haskell/hasura/pool.nix @@ -20,4 +20,5 @@ mkDerivation { homepage = "http://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh index c1744d5fdbfc..77a5d5fc6dea 100755 --- a/pkgs/development/misc/haskell/hasura/update.sh +++ b/pkgs/development/misc/haskell/hasura/update.sh @@ -40,42 +40,42 @@ echo "Running cabal2nix and outputting to ${parser_derivation_file}..." echo "# This has been automatically generated by the script" > "$parser_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$parser_derivation_file" -cabal2nix "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file" +cabal2nix --maintainer lassulus "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file" echo "Running cabal2nix and outputting to ${ciinfo_derivation_file}..." echo "# This has been automatically generated by the script" > "$ciinfo_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$ciinfo_derivation_file" -cabal2nix "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file" +cabal2nix --maintainer lassulus "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file" echo "Running cabal2nix and outputting to ${pgclient_derivation_file}..." echo "# This has been automatically generated by the script" > "$pgclient_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$pgclient_derivation_file" -cabal2nix "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file" +cabal2nix --maintainer lassulus "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file" echo "Running cabal2nix and outputting to ${pool_derivation_file}..." echo "# This has been automatically generated by the script" > "$pool_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$pool_derivation_file" -cabal2nix "https://github.com/hasura/pool.git" >> "$pool_derivation_file" +cabal2nix --maintainer lassulus "https://github.com/hasura/pool.git" >> "$pool_derivation_file" echo "Running cabal2nix and outputting to ${ekgcore_derivation_file}..." echo "# This has been automatically generated by the script" > "$ekgcore_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$ekgcore_derivation_file" -cabal2nix "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file" +cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file" echo "Running cabal2nix and outputting to ${ekgjson_derivation_file}..." echo "# This has been automatically generated by the script" > "$ekgjson_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$ekgjson_derivation_file" -cabal2nix "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file" +cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file" echo "###################" echo "please update pkgs/servers/hasura/cli.nix vendorSha256"