Merge pull request #104503 from maralorn/enable-cachix

cachix: Fix building on hydra and reenable
This commit is contained in:
Domen Kožar 2020-11-21 20:27:58 +01:00 committed by GitHub
commit 7886d7c6de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 419 deletions

View file

@ -1500,4 +1500,21 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;
# 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released
# https://github.com/cachix/cachix/pull/331
cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74";
stripLen = 2;
extraPrefix = "";
includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
});
cachix = appendPatch super.cachix (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
stripLen = 2;
extraPrefix = "";
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -86,20 +86,6 @@ self: super: {
foundation = dontCheck super.foundation;
vault = dontHaddock super.vault;
servant = unmarkBroken super.servant;
servant-auth = unmarkBroken super.servant-auth;
servant-conduit = unmarkBroken super.servant-conduit;
servant-auth-client = unmarkBroken super.servant-auth-client;
servant-client = unmarkBroken super.servant-client;
servant-client-core = unmarkBroken super.servant-client-core;
servant-auth-server = unmarkBroken super.servant-auth-server;
servant-auth-swagger = unmarkBroken super.servant-auth-swagger;
servant-swagger = unmarkBroken super.servant-swagger;
servant-blaze = unmarkBroken super.servant-blaze;
servant-swagger-ui-core = unmarkBroken super.servant-swagger-ui-core;
swagger2 = unmarkBroken super.swagger2;
cachix-api = unmarkBroken super.cachix-api;
# https://github.com/snapframework/snap-core/issues/288
snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; });

View file

@ -3722,8 +3722,6 @@ broken-packages:
- cache-polysemy
- cached
- caching
- cachix
- cachix-api
- cacophony
- cafeteria-prelude
- caffegraph
@ -6151,7 +6149,6 @@ broken-packages:
- hedgehog-gen-json
- hedgehog-generic
- hedgehog-golden
- hedgehog-servant
- Hedi
- hedis-config
- hedis-pile
@ -6699,7 +6696,6 @@ broken-packages:
- http-io-streams
- http-kinder
- http-listen
- http-media
- http-monad
- http-pony
- http-pony-serve-wai
@ -8009,7 +8005,6 @@ broken-packages:
- mu-protobuf
- mu-rpc
- mu-schema
- mu-servant-server
- mu-tracing
- MuCheck
- MuCheck-Hspec
@ -8093,9 +8088,6 @@ broken-packages:
- nagios-plugin-ekg
- nakadi-client
- named-lock
- named-servant
- named-servant-client
- named-servant-server
- named-sop
- namelist
- namespace
@ -9131,7 +9123,6 @@ broken-packages:
- rclient
- rdioh
- react-flux
- react-flux-servant
- react-haskell
- react-tutorial-haskell-server
- reaction-logic
@ -9341,7 +9332,6 @@ broken-packages:
- rfc-prelude
- rfc-psql
- rfc-redis
- rfc-servant
- rg
- rhythm-game-tutorial
- rib
@ -9379,7 +9369,6 @@ broken-packages:
- rncryptor
- rob
- robin
- roboservant
- robots-txt
- roc-cluster
- roc-cluster-demo
@ -9607,124 +9596,6 @@ broken-packages:
- serpentine
- serv
- serv-wai
- servant
- servant-aeson-specs
- servant-auth
- servant-auth-client
- servant-auth-cookie
- servant-auth-docs
- servant-auth-hmac
- servant-auth-server
- servant-auth-swagger
- servant-auth-token
- servant-auth-token-acid
- servant-auth-token-api
- servant-auth-token-leveldb
- servant-auth-token-persistent
- servant-auth-token-rocksdb
- servant-auth-wordpress
- servant-avro
- servant-blaze
- servant-cassava
- servant-checked-exceptions
- servant-checked-exceptions-core
- servant-cli
- servant-client
- servant-client-core
- servant-client-js
- servant-client-namedargs
- servant-conduit
- servant-csharp
- servant-db
- servant-db-postgresql
- servant-dhall
- servant-docs
- servant-docs-simple
- servant-ede
- servant-ekg
- servant-elm
- servant-errors
- servant-examples
- servant-exceptions
- servant-fiat-content
- servant-flatten
- servant-foreign
- servant-generate
- servant-generic
- servant-github
- servant-github-webhook
- servant-haxl-client
- servant-hmac-auth
- servant-http-streams
- servant-http2-client
- servant-iCalendar
- servant-jquery
- servant-js
- servant-jsonrpc
- servant-jsonrpc-client
- servant-jsonrpc-server
- servant-JuicyPixels
- servant-kotlin
- servant-lucid
- servant-machines
- servant-match
- servant-matrix-param
- servant-mock
- servant-multipart
- servant-named
- servant-namedargs
- servant-nix
- servant-openapi3
- servant-options
- servant-pagination
- servant-pandoc
- servant-pipes
- servant-pool
- servant-postgresql
- servant-proto-lens
- servant-purescript
- servant-pushbullet-client
- servant-py
- servant-quickcheck
- servant-rawm
- servant-rawm-client
- servant-rawm-docs
- servant-rawm-server
- servant-reason
- servant-reflex
- servant-router
- servant-ruby
- servant-scotty
- servant-seo
- servant-serf
- servant-server
- servant-server-namedargs
- servant-smsc-ru
- servant-snap
- servant-stache
- servant-static-th
- servant-streaming
- servant-streaming-client
- servant-streaming-docs
- servant-streaming-server
- servant-subscriber
- servant-swagger
- servant-swagger-tags
- servant-swagger-ui
- servant-swagger-ui-core
- servant-swagger-ui-jensoleg
- servant-swagger-ui-redoc
- servant-to-elm
- servant-tracing
- servant-waargonaut
- servant-wasm
- servant-websockets
- servant-xml
- servant-yaml
- servant-zeppelin
- servant-zeppelin-client
- servant-zeppelin-server
- servant-zeppelin-swagger
- server-generic
- serversession-backend-acid-state
- serversession-backend-persistent
@ -10291,7 +10162,6 @@ broken-packages:
- svndump
- swagger-petstore
- swagger-test
- swagger2
- swapper
- swearjure
- sweet-egison
@ -10625,7 +10495,6 @@ broken-packages:
- tomato-rubato-openal
- toml
- tonatona-google-server-api
- tonatona-servant
- too-many-cells
- toodles
- top
@ -10850,7 +10719,6 @@ broken-packages:
- uniquely-represented-sets
- units-attoparsec
- unittyped
- unitym-servant
- unitym-yesod
- universal-binary
- universe-th
@ -10998,7 +10866,6 @@ broken-packages:
- verilog
- verismith
- versioning
- versioning-servant
- vflow-types
- vfr-waypoints
- vgrep
@ -11335,7 +11202,6 @@ broken-packages:
- yam-datasource
- yam-logger
- yam-redis
- yam-servant
- yam-transaction
- yam-transaction-odbc
- yam-web

File diff suppressed because it is too large Load diff

View file

@ -12301,7 +12301,7 @@ in
c-blosc = callPackage ../development/libraries/c-blosc { };
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.justStaticExecutables (haskell.lib.unmarkBroken haskell.packages.ghc883.cachix);
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };

View file

@ -62,7 +62,7 @@ let
# jobs.stack.x86_64-darwin
jobs.stdenv.x86_64-darwin
jobs.vim.x86_64-darwin
# jobs.cachix.x86_64-darwin
jobs.cachix.x86_64-darwin
# UI apps
# jobs.firefox-unwrapped.x86_64-darwin
@ -105,7 +105,7 @@ let
jobs.nix-info-tested.x86_64-linux
# Ensure that X11/GTK are in order.
jobs.thunderbird.x86_64-linux
# jobs.cachix.x86_64-linux
jobs.cachix.x86_64-linux
/*
jobs.tests.cc-wrapper.x86_64-linux