Commit Graph

39 Commits

Author SHA1 Message Date
Sandro
72aeae54e5 Remove url literals 2022-01-24 13:28:21 +01:00
John Ericson
c123fee959 Add back flake-compat shell.nix
This was removed in the merge commit
adf2fbbdc2. I think this was a mistake
that occurred when resolving a conflict.
2020-07-17 14:58:59 +00:00
Eelco Dolstra
adf2fbbdc2 Merge remote-tracking branch 'origin/master' into flakes 2020-06-26 08:46:46 +02:00
Eelco Dolstra
5d69bbf3fe Simplify shell.nix and default.nix 2020-06-17 19:21:46 +02:00
Eelco Dolstra
9ce994d45e Remove rustfmt 2020-06-17 10:02:33 +02:00
Eelco Dolstra
7c39201bcb Remove the tarball job
Source tarballs are not very useful anymore. People who want to build
from source can also just build from the Git repository. Once upon a
time, the source tarball also saved users from needing a few
dependencies (e.g. bison and flex) but those are dwarfed by the other
dependencies, so it's no longer worth it.

Note: the release script should be updated to copy the vendoredCrates
tarball.
2020-03-13 18:05:22 +01:00
Eelco Dolstra
7cd9859e41 Add backward compatibility default.nix / shell.nix
This uses https://github.com/edolstra/flake-compat which is a bit more
general than #3366.
2020-02-25 14:51:08 +01:00
Eelco Dolstra
906afedd23 Use Nixpkgs 20.03 2020-02-19 12:32:45 +01:00
Eelco Dolstra
50cf77cecd Remove outdated shell.nix
Looks like this got accidentally revived after 204291f059.
2020-02-18 22:59:55 +01:00
Eelco Dolstra
583d06385d Build with large config Boehm GC 2020-02-18 17:57:10 +01:00
Eelco Dolstra
30c9ca3b05 Fix Nixpkgs dependency 2020-01-13 21:11:56 +01:00
Eelco Dolstra
a6f0bef0a7 Update to async/await-enabled tokio 2019-12-10 13:37:23 +01:00
Eelco Dolstra
11da5b2816 Add some Rust code 2019-11-26 22:07:28 +01:00
John Ericson
70cab0587d Switch to nixpkgs 19.09 2019-10-25 07:23:05 -04:00
Eelco Dolstra
14c877b4ab fetchGit -> fetchTarball
(cherry picked from commit cbfdea6857)
2019-05-17 22:28:03 +02:00
Eelco Dolstra
2f59b30251 Use Nixpkgs 19.03 2019-04-01 21:09:25 +02:00
Eelco Dolstra
6323b0729a Disable the S3 content-encoding patch
Since we're not using multi-part uploads at the moment, we can drop
this patch.
2018-11-01 15:18:38 +01:00
Eelco Dolstra
44a1b6c026 Fix build on non-x86_64-linux 2018-03-19 11:57:34 +01:00
Eelco Dolstra
c04bca3401 Factor out commonality between release.nix and shell.nix 2018-03-14 19:25:09 +01:00
Eelco Dolstra
ca14b14200 Use boost::format from the boost package
Note that this only requires headers from boost so it doesn't add a
runtime dependency.

Also, use Nixpkgs 18.03.
2018-03-14 19:24:04 +01:00
Eelco Dolstra
7f2c324ed1 Simplify build by including nlohmann/json.hpp 2017-12-04 17:11:36 +01:00
Eelco Dolstra
4dee01da7c fetchGit: Add a test 2017-11-03 13:55:30 +01:00
Eelco Dolstra
1969f357b7 Add fetchMercurial primop
E.g.

  $ nix eval '(fetchMercurial https://www.mercurial-scm.org/repo/hello)'
  { branch = "default"; outPath = "/nix/store/alvb9y1kfz42bjishqmyy3pphnrh1pfa-source"; rev = "82e55d328c8ca4ee16520036c0aaace03a5beb65"; revCount = 1; shortRev = "82e55d328c8c"; }

  $ nix eval '(fetchMercurial { url = https://www.mercurial-scm.org/repo/hello; rev = "0a04b987be5ae354b710cefeba0e2d9de7ad41a9"; })'
  { branch = "default"; outPath = "/nix/store/alvb9y1kfz42bjishqmyy3pphnrh1pfa-source"; rev = "0a04b987be5ae354b710cefeba0e2d9de7ad41a9"; revCount = 0; shortRev = "0a04b987be5a"; }

  $ nix eval '(fetchMercurial /tmp/unclean-hg-tree)'
  { branch = "default"; outPath = "/nix/store/cm750cdw1x8wfpm3jq7mz09r30l9r024-source"; rev = "0000000000000000000000000000000000000000"; revCount = 0; shortRev = "000000000000"; }
2017-11-01 17:45:32 +01:00
Eelco Dolstra
4af2611bd1 Allow builders to create activities
Actually, currently they can only create download activities. Thus,
downloads by builtins.fetchurl show up in the progress bar.
2017-08-21 12:18:46 +02:00
Eelco Dolstra
6cc6c15a2d Add a seccomp filter to prevent creating setuid/setgid binaries
This prevents builders from setting the S_ISUID or S_ISGID bits,
preventing users from using a nixbld* user to create a setuid/setgid
binary to interfere with subsequent builds under the same nixbld* uid.

This is based on aszlig's seccomp code
(47f587700d).

Reported by Linus Heckemann.
2017-05-29 16:14:10 +02:00
Eelco Dolstra
a2d92bb20e Add --with-sandbox-shell configure flag
And add a 116 KiB ash shell from busybox to the release build. This
helps to make sandbox builds work out of the box on non-NixOS systems
and with diverted stores.
2017-05-15 17:36:32 +02:00
Eelco Dolstra
c5f23f10a8 Replace readline by linenoise
Using linenoise avoids a license compatibility issue (#1356), is a lot
smaller and doesn't pull in ncurses.
2017-05-10 18:37:42 +02:00
Eelco Dolstra
73bba12d8b Check for libreadline 2017-04-28 16:53:56 +02:00
Eelco Dolstra
98a2adb135 Simplify building nix-perl in nix-shell 2017-04-26 17:04:45 +02:00
Eelco Dolstra
921a2aeb05 Make "nix repl" build 2017-04-25 18:48:40 +02:00
Eelco Dolstra
915f62fa19 shell.nix: Remove more dependencies
Thanks @copumpkin.
2017-04-10 17:23:15 +02:00
Eelco Dolstra
53edb55588 shell.nix: Remove obsolete flags 2017-04-10 11:50:01 +02:00
Eelco Dolstra
e8186085e0 Add support for brotli compression
Build logs on cache.nixos.org are compressed using Brotli (since this
allows them to be decompressed automatically by Chrome and Firefox),
so it's handy if "nix log" can decompress them.
2017-03-15 16:49:06 +01:00
Eelco Dolstra
1102c77919 shell.nix: Add a flag for using clang 2017-01-24 10:53:18 +01:00
Eelco Dolstra
11f0680f69 Revert "shell.nix: Add libseccomp"
This reverts commit 1df82b6245.
2016-12-19 11:52:18 +01:00
Eelco Dolstra
5278bb7c16 Merge branch 'master' of github.com:NixOS/nix 2016-12-15 12:31:52 +01:00
Eelco Dolstra
1df82b6245 shell.nix: Add libseccomp 2016-12-15 12:31:35 +01:00
Linus Heckemann
6b30e1462e Add missing DBD::SQLite to shell.nix 2016-12-11 17:13:18 +00:00
Eelco Dolstra
09191caea8 Add shell.nix 2016-12-06 17:17:29 +01:00