diff --git a/Makefile b/Makefile index c8fe3068..a8db5736 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,10 @@ nix: .PHONY: nixdeps nixdeps: + @echo '| Application | Version |' + @echo '| - | - |' @nix-instantiate nix 2> /dev/null \ - | sed -n 's;/nix/store/[[:alnum:]]\{32\}-\(.*\)-\(.*\).drv\(!bin\)\{0,1\};\1 (\2);p' \ + | sed -n 's;/nix/store/[[:alnum:]]\{32\}-\(.*\)-\(.*\).drv\(!bin\)\{0,1\};| \1 | v\2 |;p' \ | sort .PHONY: nixpkgs diff --git a/README.md b/README.md index 6f2a4f51..de4bd639 100644 --- a/README.md +++ b/README.md @@ -37,28 +37,28 @@ keeping track of the running processes. The following technology stack is currently being used: -| Application |  Purpose | Version | -| ----------------- | ---------------------- | ---------- | -| [Kubernetes][10] | Cluster Orchestration | v1.15.4 | -| [CRI-O][11] | Container Runtime | v1.16.0 | -| [runc][12] | Container Runtime | v1.0.0-rc9 | -| [cri-tools][13] | CRI Manipulation Tool | v1.15.0 | -| [CNI Plugins][14] | Container Networking | v0.8.2 | -| [etcd][15] | Database Backend | v3.3.13 | -| [CoreDNS][16] | Kubernetes DNS Support | v1.6.5 | - -[10]: https://github.com/kubernetes/kubernetes -[11]: https://github.com/cri-o/cri-o -[12]: https://github.com/opencontainers/runc -[13]: https://github.com/kubernetes-sigs/cri-tools -[14]: https://github.com/containernetworking/plugins -[15]: https://github.com/etcd-io/etcd -[16]: https://github.com/coredns/coredns - -Some other tools are not explicitly mentioned here, like [CFSSL][17] for the -certificate generation. - -[17]: https://github.com/cloudflare/cfssl +| Application | Version | +| --------------- | ------------ | +| cfssl | v1.3.2 | +| cni-plugins | v0.8.3 | +| conmon | v2.0.2 | +| conntrack-tools | v1.4.5 | +| cri-o | v1.16.0 | +| cri-tools | v1.15.0 | +| etcd | v3.3.13 | +| iproute2 | v5.3.0 | +| iptables | v1.8.3 | +| kmod | v26 | +| kubernetes | v1.15.4 | +| nss-cacert | v3.46.1 | +| podman | v1.6.3 | +| runc | v1.0.0-rc9 | +| socat | v1.7.3.3 | +| sysctl | v1003.1-2008 | +| util-linux | v2.33.2 | + +Some other tools are not explicitly mentioned here, because they are no +first-level dependencies. ### Single Dependency diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index 5811faae..ea35d3a7 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/nixos/nixpkgs", - "rev": "f28fad5e2fe777534f1c2719a40e69812085dfe5", - "date": "2019-11-06T19:30:58+01:00", - "sha256": "0qb021c3y2k1ai0vvadv9cd6vacj0lsd5xv2a4ir1hhn0pnc5g59", + "rev": "db3beda6b56563777254156351b9bed349cf7d07", + "date": "2019-11-14T08:59:11+01:00", + "sha256": "0lkxj9pkzwxbihn3j5nyk61814m5kshpziagdzicxlns1gn1295i", "fetchSubmodules": false }