From 451c38b7d6017434a2a06646f1da6ef1e6ca4614 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 2 Apr 2020 12:10:35 +0200 Subject: gnu: docker: Provide version string to docker service. Fixes . Reported by Pierre Neidhardt . * gnu/packages/docker.scm (docker)[configure]: Provide version string. [install]: Install versioned binary. --- gnu/packages/docker.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 69dee2b856..c95ca3f9d7 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -503,6 +503,7 @@ built-in registry server of Docker.") (replace 'configure (lambda _ (setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version)) + (setenv "VERSION" (string-append ,%docker-version "-ce")) ;; Automatically use bundled dependencies. ;; TODO: Unbundle - see file "vendor.conf". (setenv "AUTO_GOPATH" "1") @@ -540,7 +541,9 @@ built-in registry server of Docker.") (let* ((out (assoc-ref outputs "out")) (out-bin (string-append out "/bin"))) (install-file "bundles/dynbinary-daemon/dockerd" out-bin) - (install-file "bundles/dynbinary-daemon/dockerd-dev" out-bin) + (install-file (string-append "bundles/dynbinary-daemon/dockerd-" + (getenv "VERSION")) + out-bin) #t)))))) (inputs `(("btrfs-progs" ,btrfs-progs) -- cgit v1.2.3 ix/log/gnu/packages/cpp.scm'>
path: root/gnu/packages/cpp.scm
AgeCommit message (Expand)Author
2020-03-29gnu: xtl: Update to 0.6.13....Tobias Geerinckx-Rice
2020-03-25gnu: abseil-cpp: Update to 20200225.1....Ricardo Wurmus
2020-03-06Do not record store file name in cpp.scm....Vagrant Cascadian
2020-03-04gnu: Add abseil-cpp....Roel Janssen
2020-02-23gnu: Add tweeny....nixo
2019-12-19gnu: catch-framework2: Update to 2.1.2....Ricardo Wurmus
2019-12-16Revert "gnu: ccls: Configure using -isystem for header files."...Brett Gilio
2019-12-16Revert "gnu: ccls: Adjust indentation"...Brett Gilio
2019-12-16gnu: ccls: Adjust indentation...Brett Gilio
2019-12-16gnu: ccls: Configure using -isystem for header files....Brett Gilio
2019-12-04gnu: Remove duplicate nlohmann-json-cpp package....Marius Bakke
2019-12-02gnu: ccls: Update to 0.20190823.5....Brett Gilio
2019-12-01gnu: Add sobjectizer....Jan Wielkiewicz
2019-11-21gnu: json-modern-cxx: Update to 3.7.3....Marius Bakke
2019-11-15gnu: Add cpplint....Mathieu Othacehe
2019-11-03gnu: xtl: Update to 0.6.8....Tobias Geerinckx-Rice
2019-10-22gnu: Add gperftools....Pierre Neidhardt
2019-10-12gnu: json-modern-cxx: Update to 3.7.0....Marius Bakke
2019-10-01Merge branch 'master' into core-updatesLudovic Courtès
2019-09-28gnu: xtl: Update to 0.6.7....Tobias Geerinckx-Rice
2019-09-26gnu: Add ccls....Mathieu Othacehe
2019-06-07gnu: dashel: Don't use unstable tarball....Tobias Geerinckx-Rice
2019-06-07gnu: xsimd: Update to 7.2.3....Tobias Geerinckx-Rice
2019-06-07gnu: xsimd: Don't use unstable tarball....Tobias Geerinckx-Rice
2019-05-11gnu: xtl: Update to 0.6.4....Tobias Geerinckx-Rice
2019-04-19gnu: rct: Be more idiomatic....Leo Famulari