nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11529 commits 20 branches 0 tags 68 MiB
Commit graph

11529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra caf5172945
Merge pull request #6136 from matthewbauer/profile-upgrade-verbosity 
Add verbosity to nix profile upgrade
 2022-02-21 22:30:47 +01:00
Eelco Dolstra 3848a8edb8
Merge pull request #6139 from edolstra/no-std-aliases 
Remove std aliases
 2022-02-21 18:18:42 +01:00
Eelco Dolstra 8ffb09a08a Fix macOS build 2022-02-21 17:14:22 +01:00
Matthew Bauer 3cd958849b
Apply suggestions from code review 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2022-02-21 10:04:04 -06:00
Eelco Dolstra b98ce19544
Merge pull request #6138 from nmattia/nm-clarify-manpath 
Document usage of MANPATH in nix-profile.sh
 2022-02-21 16:54:01 +01:00
Eelco Dolstra 36c7b12f33 Remove std::string alias 2022-02-21 16:37:25 +01:00
Eelco Dolstra 1ac2664472 Remove std::vector alias 2022-02-21 16:32:34 +01:00
Eelco Dolstra fe9afb65bb Remove std::set alias 2022-02-21 16:28:23 +01:00
Eelco Dolstra afcdc7606c Remove std::list alias 2022-02-21 16:25:12 +01:00
Eelco Dolstra e2422c4582
Merge pull request #6052 from hercules-ci/issue-3294-fix-interruptCallback-deadlock 
Fix deadlocked nix-daemon zombies on darwin #3294
 2022-02-21 16:21:45 +01:00
Robert Hensing ddb6740e7d triggerInterrupt: Refactor to use break 2022-02-21 15:43:43 +01:00
Nicolas Mattia 44b7d104b4 Document usage of MANPATH in nix-profile.sh 
While trying to figure out how `nix-env`/`nix profile` work I had a hard
time understand how man pages were being installed.

Took me quite some time to figure this out, thought it might be useful
to others too!
 2022-02-21 13:35:55 +01:00
Eelco Dolstra f22b9e72f5
Merge pull request #6120 from mayflower/print-full-names 
path-info: use full store paths when we have them
 2022-02-21 11:03:20 +01:00
Matthew Bauer 61295b910f Add verbosity to nix profile upgrade 
Followup of https://github.com/NixOS/nix/pull/6086. This time adding a
warning if no packages are upgraded.
 2022-02-20 23:46:11 -06:00
Linus Heckemann dbdc63bc41 path-info: use full store paths when we have them 
Fixes #5645
 2022-02-19 00:32:05 +01:00
Eelco Dolstra 9bc03adbba
Integrate push-docker.sh into the release script 
This also makes sure that we get the Docker images from the same Hydra
eval, rather than the latest build from job/nix/.../dockerImage, which
may not be the same.
 2022-02-18 13:58:01 +01:00
Eelco Dolstra 50e3840f14
Merge remote-tracking branch 'origin/script-to-make-docker-release' 2022-02-18 10:55:07 +01:00
Eelco Dolstra 26e99c817c
Merge pull request #6114 from Radvendii/welcomeText 
add release notes for welcomeText
 2022-02-18 10:52:03 +01:00
Rok Garbas f0de5fb8e7
remove the manifest before creating them 2022-02-18 00:32:38 +01:00
Rok Garbas bf435664d7
Merge remote-tracking branch 'origin/master' into script-to-make-docker-release 2022-02-18 00:15:23 +01:00
Taeer Bar-Yam 219fa2e43d add release notes for welcomeText 2022-02-17 15:17:20 -05:00
Eelco Dolstra a768e85e2f
Merge pull request #6103 from Radvendii/welcomeText 
add descriptive output when creating templates
 2022-02-17 21:06:10 +01:00
Taeer Bar-Yam f56dd3a36b make flake template welcomeText markdown 2022-02-17 13:59:32 -05:00
Eelco Dolstra b24d541c34
Merge pull request #6110 from layus/patch-2 
Create daemon-socket folder during install
 2022-02-17 13:00:20 +01:00
Guillaume Maudoux 1bec333788
Create to daemon-socket folder during install 2022-02-17 09:32:15 +01:00
Eelco Dolstra aa5b83d93c InputScheme::fetch(): Return a StorePath instead of a Tree 2022-02-16 11:14:01 +01:00
Eelco Dolstra 2d6d9a28eb addToStoreFromDump(): Take std::string_view 2022-02-16 11:02:35 +01:00
Eelco Dolstra f450edc78b
Merge pull request #6104 from rrbutani/master 
Fix formatting for options with "machine-specific" defaults
 2022-02-16 10:47:51 +01:00
Rahul Butani d82cf4a016
manual: fix formatting for options with "machine-specific" defaults 2022-02-15 15:44:05 -06:00
Taeer Bar-Yam f3a2940e70 add descriptive output when creating templates 
this includes a `welcomeText` attribute which can be set in the
template, as well as outputing which files were created.
 2022-02-15 11:50:14 -05:00
Eelco Dolstra 94992a9196
Merge pull request #6100 from edolstra/installables-cleanup 
InstallableFlake: Default attr paths cleanup
 2022-02-14 22:06:11 +01:00
Eelco Dolstra 023e459777 InstallableFlake: Default attr paths cleanup 
This removes some duplicated logic, and fixes "nix bundle" parsing its
installable twice.
 2022-02-14 21:06:11 +01:00
Eelco Dolstra 744a101a36
Merge pull request #6092 from Kha/sandbox-wo-userns 
Fix using sandbox without user namespaces
 2022-02-14 11:40:08 +01:00
Sebastian Ullrich c437e1326d Fix using sandbox without user namespaces 2022-02-12 16:28:36 +01:00
Eelco Dolstra 4d67ecbbb2
Merge pull request #6085 from edolstra/fix-flake-defaults 
parseInstallables(): Don't try the flake attr path prefixes when no fragment is specified
 2022-02-11 18:00:00 +01:00
Eelco Dolstra 36845dc9a3
Merge pull request #6086 from tomberek/profile_remove 
profile: add verbosity
 2022-02-11 16:47:11 +01:00
Tom Bereknyei 270fb5f192 profile: add verbosity 
warn if there are no matches and give notice of removing packages as
they are found
 2022-02-11 10:44:33 -05:00
Eelco Dolstra cdc90c2776 parseInstallables(): Don't try the flake attr path prefixes when no fragment is specified 
Fixes #5880.
 2022-02-11 15:50:12 +01:00
Eelco Dolstra d2f9a081b8 flake.nix: Fix indent 2022-02-11 14:45:46 +01:00
Eelco Dolstra 5b809f9e0e check-hydra-status.sh: Ignore unfinished builds 2022-02-10 21:15:07 +01:00
Eelco Dolstra b8d57e2883 check-hydra-status.sh: Improve error behaviour 2022-02-10 11:10:58 +01:00
Eelco Dolstra 52f52319ad
Merge pull request #6067 from trofi/revert-6060-prefer-inplace-libs 
Revert "mk: prefert inplace library paths to system ones (take 2)"
 2022-02-09 14:24:54 +01:00
Sergei Trofimovich 28b9bd784c
Revert "mk: prefert inplace library paths to system ones (take 2)" 2022-02-09 13:00:53 +00:00
Eelco Dolstra 0b3d8e1a29
Merge pull request #6060 from trofi/prefer-inplace-libs 
mk: prefert inplace library paths to system ones (take 2)
 2022-02-08 19:49:21 +01:00
Sergei Trofimovich 579dcbabd5 mk: prefert inplace library paths to system ones (take 2) 
It's a second attempt to merge the change. Previous attempt
was reverted in b976b34a5b.
Since then underlying failure exposed by original change was
fixed by https://github.com/NixOS/nix/pull/5354.

Below goes description of original change:

The link failure happens on a system with stable nix-2.3.15
installed in /usr/lib64 (it's libutil.so API differs from master):

```
LANG=C make V=1
g++ -o /home/slyfox/dev/git/nix/src/libstore/libnixstore.so \
    -shared -L/usr/lib64 -Wl,--no-copy-dt-needed-entries \
    src/libstore/binary-cache-store.o ... src/libstore/uds-remote-store.o \
    -lsqlite3 -lcurl -lsodium -pthread -ldl -lseccomp -Wl,-z,defs -Wl,-soname=libnixstore.so
      -Wl,-rpath,/home/slyfox/dev/git/nix/src/libutil -Lsrc/libutil -lnixutil
ld: src/libstore/binary-cache-store.o: in function `nix::BinaryCacheStore::BinaryCacheStore(
    std::map<std::__cxx11::basic_string<char, std::char_traits<char>, ...
nix/src/libstore/binary-cache-store.cc:30: undefined reference to `nix::readFile(
    std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)' ...
...
```

This happens due to `-L/usr/lib64 -Lsrc/libutil` search path ordering.
The change turns it into `-Lsrc/libutil -L/usr/lib64`.

Closes: https://github.com/NixOS/nix/issues/3087
 2022-02-07 23:39:33 +00:00
Eelco Dolstra 7c64a9dfd4
Merge pull request #6054 from lincolnauster/lf-reporterr 
repl/load-flake: throw error if path isn't specified
 2022-02-07 20:44:10 +01:00
Eelco Dolstra 725817c223
Merge pull request #6057 from trofi/fix-daemon-crashes 
Make sure no exceptions leave ignoreException()
 2022-02-07 20:42:19 +01:00
Sergei Trofimovich 3ec02deb20 Make sure no exceptions leave ignoreException() 
I noticed that occasional Ctrl-C leaves *.lock files around.
`nix-daemon`'s journal logs contained crashes like:

    nix-daemon[30416]: terminate called after throwing an instance of 'nix::SysError'
    nix-daemon[30416]:   what():  error: writing to file: Broken pipe

And core dump backtraces pointed at `teriminate()` call from
destructors:

    ...
    _Unwind_Resume ()
    nix::ignoreException() ()
    nix::LocalDerivationGoal::~LocalDerivationGoal()
    ...

    void ignoreException()
    {
        try {
            throw;
        } catch (std::exception & e) {
            printError("error (ignored): %1%", e.what());
        }
    }

The crashes happen when client side closes early and printError() throws
an IO error.

The change wraps `ignoreException()` into blanket `try { ... } catch (...) {}`.

Closes: https://github.com/NixOS/nix/issues/6046
 2022-02-07 16:20:56 +00:00
lincoln auster b1abfcd0c2
fix markup 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2022-02-07 08:35:50 -07:00
Eelco Dolstra 97e02c23bd Fix 'basic_string::_M_construct null not valid' in interrupted download 
Fixes #5985.
 2022-02-07 10:53:47 +01:00