Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Guix
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

- ogs
- inf
- Guix
- Commits
15ddeff5

Commit 15ddeff5 authored 10 years ago by Ludovic Courtès

Downloads
- Patches
- Plain Diff

Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.

parent 828c0bec

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

nix/libstore/build.cc 1 addition, 0 deletions

nix/libstore/build.cc
nix/libstore/derivations.cc 13 additions, 3 deletions

nix/libstore/derivations.cc
nix/libstore/derivations.hh 2 additions, 2 deletions

nix/libstore/derivations.hh
nix/libstore/local-store.cc 30 additions, 3 deletions

nix/libstore/local-store.cc
nix/libstore/local-store.hh 15 additions, 4 deletions

nix/libstore/local-store.hh
nix/libstore/misc.cc 1 addition, 1 deletion

nix/libstore/misc.cc
nix/libstore/optimise-store.cc 67 additions, 9 deletions

nix/libstore/optimise-store.cc
nix/libutil/archive.cc 1 addition, 1 deletion

nix/libutil/archive.cc
nix/libutil/util.cc 1 addition, 1 deletion

nix/libutil/util.cc
nix/libutil/util.hh 2 additions, 0 deletions

nix/libutil/util.hh

with 133 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment