Make the tests indifferent about user channels

[pinch] / README

diff --git a/README b/README
index 5c451076bb15236488d376599f1d8aa9c6b9fb32..80dcdce3df0ef96f253891f8e1b4ab874ff033d7 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,9 @@
+# Deprecated
+
+Now that [flakes][https://nixos.wiki/wiki/Flakes] are more or less ready for
+general use, this is mostly of historical interest.
+
+

 # Pinch
 
 PIN CHannels - a simple drop-in replacement for `nix-channel --update`.
 # Pinch
 
 PIN CHannels - a simple drop-in replacement for `nix-channel --update`.


@@ -27,8 +33,19 @@ The first "pin" command will add these fields to the file:
 
 The second "update" command applies these changes to your nix channels, like `nix-channel --update` does.
 
 
 The second "update" command applies these changes to your nix channels, like `nix-channel --update` does.
 

-Advantages over nix-channel:
-
-    * Deploy the exact same channel content to multiple machines.
-    * Store your pin file in revision control for more powerful rollback mechanism than `nix-channel --rollback`.
-    * Channel contents are verified by hash before being installed.
+### Feature comparison
+
+| Feature                      | nix-channel | [require.nix][] | [niv][] | [flakes][] | pinch |
+| ---------------------------- | :---------: | :-------------: | :-----: | :--------: | :---: |
+| Same version across machines |      -      |        yes      |   yes   |     yes    |  yes  |
+| Verifies hashes              |      -      |         ?       |   yes   |     yes    |  yes  |
+| Fetch from git               |      -      |         ?       |   yes   |     yes    |  yes  |
+| Fetch from git with ssh key  |      -      |         ?       |   yes   |     yes?   |  yes  |
+| command_not_found_handle     |     yes     |         ?       |    -    |     yes    |  yes  |
+| Verifies tarball == git repo |      -      |         -       |    -    |      -     |  yes  |
+| Rejects force pushes         |      -      |         -       |    -    |      -     |  yes  |
+| Ready to use today           |     yes     |         -       |   yes   |     yes    |  yes  |
+
+[require.nix]: https://www.youtube.com/watch?v=DHOLjsyXPtM
+[niv]: https://github.com/nmattia/niv
+[flakes]: https://github.com/nixos/rfcs/pull/49