serokell/xrefcheck
1
1
Fork 0
mirror of https://github.com/serokell/xrefcheck.git synced 2024-09-17 16:37:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from serokell/yorickvp/bump-hs-nix

Browse Source 
xrefcheck.nix: bump hs.nix, remove unneccesary flags
This commit is contained in:
Alexander Bantyev 2020-04-10 01:47:34 +03:00 committed by GitHub
commit 30c0c860ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix/sources.json
View File

@ -5,10 +5,10 @@
"homepage": "https://input-output-hk.github.io/haskell.nix",
"owner": "input-output-hk",
"repo": "haskell.nix",
"rev": "b6a8a97249624583498d37541b0ca85d72a8e4db",
"sha256": "12n2na5b9pjwnmrdpk9dbi7m9zv6bhc647vf4rf557z5zz7dq6j4",
"rev": "0933c58908816bca525fbf8873abdbc3e072a87e",
"sha256": "1shgaaqj0j2d5f7967xssp69nn6dv34dfvkvqkiakb99ggycgdyg",
"type": "tarball",
"url": "https://github.com/input-output-hk/haskell.nix/archive/b6a8a97249624583498d37541b0ca85d72a8e4db.tar.gz",
"url": "https://github.com/input-output-hk/haskell.nix/archive/0933c58908816bca525fbf8873abdbc3e072a87e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {

27
xrefcheck.nix
View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2019 Serokell <https://serokell.io>
# SPDX-FileCopyrightText: 2020 Serokell <https://serokell.io>
#
# SPDX-License-Identifier: MPL-2.0
@ -6,30 +6,15 @@
let
sources = import ./nix/sources.nix;
nixpkgs = import sources.nixpkgs (import sources."haskell.nix");
hn = if static then
nixpkgs.pkgsCross.musl64.haskell-nix
else
nixpkgs.haskell-nix;
project = hn.stackProject {
src = hn.haskellLib.cleanGit { src = ./.; };
modules = [
{
pkgs = if static then nixpkgs.pkgsCross.musl64 else nixpkgs;
project = pkgs.haskell-nix.stackProject {
src = pkgs.haskell-nix.haskellLib.cleanGit { src = ./.; };
modules = [{
packages.xrefcheck = {
package.ghcOptions = "-Werror";
configureFlags =
with nixpkgs.pkgsStatic;
configureFlags = with pkgs;
lib.optionals static [
"--disable-executable-dynamic"
"--disable-shared"
"--ghc-option=-optl=-pthread"
"--ghc-option=-optl=-static"
"--ghc-option=-optl=-lc"
"--ghc-option=-optl=-lz"
"--ghc-option=-optl=-lgmp"
"--ghc-option=-optl=-lffi"
"--ghc-option=-optl=-L${gmp6}/lib"
"--ghc-option=-optl=-L${zlib.static}/lib"
"--ghc-option=-optl=-L${libffi}/lib"
];
};
}];