Commit graph

227193 commits

Author SHA1 Message Date
Matthew Bauer 982a17a48e nixos/ipfs: always expose sockets 2020-06-12 17:15:34 -05:00
Matthew Bauer fa06d8f961 nixos/ipfs: actually use upstream systemd units 2020-06-12 17:15:34 -05:00
Matthew Bauer b36ef706fb nixos/ipfs: add startWhenNeeded option
This makes it possible to only start IPFS when needed. So a user’s
IPFS daemon only starts when they actually use it.

A few important warnings though:

  - This probably shouldn’t be mixed with services.ipfs.autoMount
    since you want /ipfs and /ipns aren’t activated like this
  - ipfs.socket assumes that you are using ports 5001 and 8080 for the
    API and gateway respectively. We could do some parsing to figure
    out what is in apiAddress and gatewayAddress, but that’s kind of
    difficult given the nonstandard address format.
  - Apparently? this doesn’t work with the --api commands used in the tests.

Of course you can always start automatically with startWhenNeeded =
false, or just running ‘systemctl start ipfs.service’.

Tested with the following test (modified from tests/ipfs.nix):

  import ./make-test-python.nix ({ pkgs, ...} : {
    name = "ipfs";

    nodes.machine = { ... }: {
      services.ipfs = {
        enable = true;
        startWhenNeeded = true;
      };
    };

    testScript = ''
      start_all()

      machine.wait_until_succeeds("ipfs id")
      ipfs_hash = machine.succeed("echo fnord | ipfs add | awk '{ print $2 }'")

      machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
    '';
  })

Fixes #90145

Update nixos/modules/services/network-filesystems/ipfs.nix

Co-authored-by: Florian Klink <flokli@flokli.de>
2020-06-12 17:15:27 -05:00
Matthew Bauer c5f40198f3 nixos/ipfs: consolidate services into one ipfs.service
Previously we had three services for different config flavors. This is
confusing because only one instance of IPFS can run on a host / port
combination at once. So move all into ipfs.service, which contains the
configuration specified in services.ipfs.

Also remove the env wrapper and just use systemd env configuration.
2020-06-11 15:27:22 -05:00
Matthew Bauer 74ff433320 nixos/ipfs: remove unused auto migrate feature 2020-06-11 14:32:06 -05:00
Matthew Bauer c8a2e63242 ipfs: copy systemd support files to output 2020-06-11 14:16:16 -05:00
Oleksii Filonenko ac3128f22d
Merge pull request #88967 from Frostman/hugo-0.71.1 2020-05-26 23:07:25 +03:00
Lassulus 7e80329ba5
Merge pull request #81913 from helsinki-systems/upd/mstflint
mstflint: 4.4 -> 4.14
2020-05-26 21:59:30 +02:00
Dmitry Kalinkin 7a36742c36
Merge pull request #88957 from Mindavi/nomacs/maintainer-change
Nomacs/maintainer change
2020-05-26 15:53:50 -04:00
Dmitry Kalinkin 5035c65a60
Merge pull request #88476 from veprbl/pr/rivet3
rivet: 2.7.2 -> 3.1.1
2020-05-26 15:52:08 -04:00
Lassulus 75e8502e8f
Merge pull request #88624 from helsinki-systems/upd/gnustep
gnustep: update
2020-05-26 21:43:21 +02:00
Sergey Lukjanov 95724ecee7 hugo: 0.71.0 -> 0.71.1 2020-05-26 12:25:58 -07:00
Jörg Thalheim 84cc13177e
Merge pull request #88949 from magnetophon/mu 2020-05-26 19:58:52 +01:00
Lassulus dcb996ddcc
Merge pull request #66003 from lambda-11235/taisei
taisei: init at 1.3
2020-05-26 20:55:44 +02:00
Michael Howell c21cbf22d0
buildRustCrate: Replace hyphen with underscore in env variables (#88054)
* Add test case for include dir
* buildRustCrate: replace hyphen with underscore in env

This fixes a bug that prevents encoding_c from building.
2020-05-26 20:52:18 +02:00
Lassulus 0300b47dd5
Merge pull request #66427 from pacien/pure-prompt-1.10.3
pure-prompt: init at 1.12.0
2020-05-26 20:44:58 +02:00
Max Wittig 9a714d249e
gitlab-runner: 12.10.2 -> 13.0.0 (#88935) 2020-05-26 18:28:13 +00:00
Rick van Schijndel 5b32225cc1 nomacs: remove unused patch
This patch became obsolete in the previous update, so can be removed.
2020-05-26 19:56:37 +02:00
Rick van Schijndel 0cf8e1d645 maintainers: remove @ahmedtd 2020-05-26 19:56:24 +02:00
Rick van Schijndel 7042530075 nomacs: remove old maintainer, add myself as maintainer
The old maintainer @ahmedtd sent me the following email:

Title: Are you interested in being the NixPkgs maintainer for nomacs?
Body: I don't run NixOS anymore, so I can't really build or check the PRs.
2020-05-26 19:44:00 +02:00
Shahrukh Khan 72066757c8
fastlane: 2.128.1 -> 2.148.1 (#88924) 2020-05-26 08:14:23 -07:00
Bart Brouns f5b7d763e1 mu: 1.4.6 -> 1.4.7 2020-05-26 17:01:13 +02:00
WilliButz 5f63bf75a3
Merge pull request #88938 from WilliButz/update-grafana
grafana: 7.0.0 -> 7.0.1
2020-05-26 16:37:28 +02:00
WilliButz 364caba346
grafana: 7.0.0 -> 7.0.1 2020-05-26 15:10:17 +02:00
Mario Rodas 612d330c67
Merge pull request #88908 from r-ryantm/auto-update/jetty
jetty: 9.4.26.v20200117 -> 9.4.29.v20200521
2020-05-26 07:56:04 -05:00
Mario Rodas dcd698989a
Merge pull request #88932 from r-ryantm/auto-update/parallel
parallel: 20200422 -> 20200522
2020-05-26 07:52:07 -05:00
Mario Rodas e8c9df0d66
Merge pull request #88926 from davidtwco/pastel-0.8.0
pastel: 0.7.1 -> 0.8.0
2020-05-26 07:50:28 -05:00
Nick Hu ebdbc688a5
Merge pull request #88651 from r-ryantm/auto-update/profile-sync-daemon
profile-sync-daemon: 6.38 -> 6.40
2020-05-26 13:48:28 +01:00
Nick Hu 1acb028ca0
Merge pull request #88036 from NickHu/prezto
zsh-prezto: 2019-03-18 -> 2020-05-02
2020-05-26 13:15:31 +01:00
Nick Hu 90779e4d64
zsh-prezto: 2019-03-18 -> 2020-05-20 2020-05-26 12:53:26 +01:00
Nick Hu bf0b10fbdd
Merge pull request #78361 from NickHu/mopidy
mopidy-mpris: init at 3.0.1  mopidy-somafm: init at 2.0.0  mopidy-youtube: 2.0.2 -> 3.0  mopidy-gmusic: 3.0.0 -> 4.0.0
2020-05-26 12:39:53 +01:00
R. RyanTM eaa7841734 parallel: 20200422 -> 20200522 2020-05-26 10:16:58 +00:00
Eelco Dolstra fdecd9eeda nixFlakes: 2.4pre20200501_941f952 -> 2.4pre20200521_00b562c 2020-05-26 11:14:35 +02:00
David Wood fbd2638376
pastel: 0.7.1 -> 0.8.0 2020-05-26 09:41:09 +01:00
Lancelot SIX 9f11766df5
Merge pull request #84606 from lsix/nano-4.9.2
nano: 4.9.1 -> 4.9.2
2020-05-26 09:12:57 +01:00
Oleksii Filonenko a454940919
Merge pull request #88918 from sikmir/nnn
nnn: 3.1 -> 3.2
2020-05-26 10:53:58 +03:00
Jörg Thalheim fcea61d1fb
Merge pull request #84515 from doronbehar/improve-ecryptfs
ecryptfs: enable building without python2 support
2020-05-26 08:47:16 +01:00
Jörg Thalheim f76f13b1a7
Merge pull request #88645 from wchresta/master 2020-05-26 08:24:36 +01:00
Nikolay Korotkiy 336db1f7c2
nnn: 3.1 -> 3.2 2020-05-26 09:16:47 +03:00
sternenseemann 9d33cb414a ocamlPackages.curly: init at 2019-11-14 2020-05-26 08:09:07 +02:00
Benjamin Hipple d3082a31cd
Merge pull request #87544 from bcdarwin/vtk-8
vtk: 7.1.1 -> 8.2.0
2020-05-26 00:24:28 -04:00
R. RyanTM c13c38c75a jetty: 9.4.26.v20200117 -> 9.4.29.v20200521 2020-05-25 23:49:59 +00:00
Mario Rodas 204ea0bfb7
zoxide: make fzf optional 2020-05-25 04:20:00 -05:00
Benjamin Hipple 82fbcf6ac3
Merge pull request #80458 from bcdarwin/pytorch-metric-learning
python3Packages.pytorch-metric-learning: init at 0.9.81
2020-05-25 21:09:15 -04:00
Ben Darwin b20f22d4cd python3Packages.pytorch-metric-learning: init at 0.9.81 2020-05-25 20:56:03 -04:00
Benjamin Hipple cd9fb17b75
Merge pull request #76997 from bcdarwin/skorch
python3Packages.skorch: init at 0.8.0
2020-05-25 20:51:03 -04:00
Jan Tojnar aa364b90d4
Merge pull request #75237 from r-ryantm/auto-update/gmic
gmic: 2.7.5 -> 2.8.0
2020-05-26 02:43:58 +02:00
Jan Tojnar 8a25e3dfd9
Merge pull request #88890 from r-ryantm/auto-update/gnome-software
gnome3.gnome-software: 3.36.0 -> 3.36.1
2020-05-26 02:42:14 +02:00
Jan Tojnar 1c0b497768
Merge pull request #88883 from r-ryantm/auto-update/gexiv2
gexiv2: 0.12.0 -> 0.12.1
2020-05-26 02:39:05 +02:00
Ben Darwin 710a48751a skorch: init at 0.8.0 2020-05-25 20:31:11 -04:00