Skip to content

Commit

Permalink
Use boost::format from the boost package
Browse files Browse the repository at this point in the history
Note that this only requires headers from boost so it doesn't add a
runtime dependency.

Also, use Nixpkgs 18.03.
  • Loading branch information
edolstra committed Mar 14, 2018
1 parent 56f2ed0 commit ca14b14
Show file tree
Hide file tree
Showing 23 changed files with 13 additions and 2,445 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
makefiles = \
local.mk \
src/boost/format/local.mk \
src/libutil/local.mk \
src/libstore/local.mk \
src/libmain/local.mk \
Expand Down
2 changes: 0 additions & 2 deletions local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ GLOBAL_CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I

$(foreach i, config.h $(call rwildcard, src/lib*, *.hh), \
$(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))

$(foreach i, $(call rwildcard, src/boost, *.hpp), $(eval $(call install-file-in, $(i), $(includedir)/nix/$(patsubst src/%/,%,$(dir $(i))), 0644)))
5 changes: 3 additions & 2 deletions release.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ nix ? builtins.fetchGit ./.
, nixpkgs ? builtins.fetchGit https://github.com/NixOS/nixpkgs.git
, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs.git; ref = "release-18.03"; }
, officialRelease ? false
, systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
}:
Expand Down Expand Up @@ -71,6 +71,7 @@ let
[ curl
bzip2 xz brotli
openssl pkgconfig sqlite boehmgc
boost

# Tests
git
Expand Down Expand Up @@ -192,7 +193,7 @@ let

doInstallCheck = true;

lcovFilter = [ "*/boost/*" "*-tab.*" "*/nlohmann/*" "*/linenoise/*" ];
lcovFilter = [ "*-tab.*" "*/nlohmann/*" "*/linenoise/*" ];

# We call `dot', and even though we just use it to
# syntax-check generated dot files, it still requires some
Expand Down
3 changes: 2 additions & 1 deletion shell.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ useClang ? false }:

with import <nixpkgs> {};
with import (builtins.fetchGit { url = https://github.com/NixOS/nixpkgs.git; ref = "release-18.03"; }) {};

with import ./release-common.nix { inherit pkgs; };

Expand All @@ -18,6 +18,7 @@ with import ./release-common.nix { inherit pkgs; };
customMemoryManagement = false;
})
autoreconfHook
boost

# For nix-perl
perl
Expand Down
38 changes: 0 additions & 38 deletions src/boost/assert.hpp

This file was deleted.

64 changes: 0 additions & 64 deletions src/boost/format.hpp

This file was deleted.

96 changes: 0 additions & 96 deletions src/boost/format/exceptions.hpp

This file was deleted.

Loading

0 comments on commit ca14b14

Please sign in to comment.