From b38556ea7f7aca7c625db9dff49888045004168a Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 30 Jun 2020 15:17:29 +0200 Subject: gnu: guix: Update to 1.1.0-13.26611f56fb. * gnu/packages/package-management.scm (guix): Update to 1.1.0-13.26611f56fb --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index bfecf110ca..068d46566c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "c00564192a9924ab2218c243342963aba89d67d1") - (revision 12)) + (commit "26611f56fb1108de8205667fa9318b61794d0c9c") + (revision 13)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "008ywpdkc5f2jh25x6rr9glzvq4a6qih7v73w5dbxscpddx5c5g2")) + "15m8pamy1hmk3y7yq2da70nmng2xycwpyl2dgnpfp4aif2ynvirv")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 6b77e7352d638297cdd43c3f8c4babc3162226c4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 09:00:53 +0200 Subject: gnu: guix: Update to 1.1.0-14.5bd8033. * gnu/packages/package-management.scm (guix): Update to 1.1.0-14.5bd8033. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 068d46566c..cee0231b62 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "26611f56fb1108de8205667fa9318b61794d0c9c") - (revision 13)) + (commit "5bd803339d664b59eac34e049e944950c526f6e9") + (revision 14)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "15m8pamy1hmk3y7yq2da70nmng2xycwpyl2dgnpfp4aif2ynvirv")) + "0lj8ahy3kq2ijn5dps19gw31kiry4d724bc8cpprxhlpxa834icr")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 044cffdf34c506d2f9f1fbbc07462f29d3edaf54 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 09:54:22 +0200 Subject: gnu: guix-minimal: Remove as failing and unused. * gnu/packages/package-management.scm (guix-minimal): Remove it. --- gnu/packages/package-management.scm | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index cee0231b62..ac2842c810 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -478,22 +478,6 @@ (define-public guile2.2-guix (define-public guile3.0-guix (deprecated-package "guile3.0-guix" guix)) -(define-public guix-minimal - ;; A version of Guix which is built with the minimal set of dependencies, as - ;; outlined in the README "Requirements" section. Intended as a CI job, so - ;; marked as hidden. - (hidden-package - (package - (inherit guix) - (name "guix-minimal") - (inputs - `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guix)))) - (propagated-inputs - (fold alist-delete - (package-propagated-inputs guix) - '("guile-ssh")))))) - (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical generated file." -- cgit v1.2.3 From 6c59eb1da2eec29f730e82f31218f4f3e1b3c6a0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 12:01:45 +0200 Subject: Revert "gnu: guix-minimal: Remove as failing and unused." This reverts commit 044cffdf34c506d2f9f1fbbc07462f29d3edaf54. --- gnu/packages/package-management.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ac2842c810..261a55fa14 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -478,6 +478,23 @@ (define-public guile2.2-guix (define-public guile3.0-guix (deprecated-package "guile3.0-guix" guix)) +(define-public guix-minimal + ;; A version of Guix which is built with the minimal set of dependencies, as + ;; outlined in the README "Requirements" section. Intended as a CI job, so + ;; marked as hidden. + (hidden-package + (package + (inherit guix) + (name "guix-minimal") + (native-inputs + (fold alist-delete + (package-native-inputs guix) + '("guile-ssh"))) + (propagated-inputs + (fold alist-delete + (package-propagated-inputs guix) + '("guile-ssh")))))) + (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical generated file." -- cgit v1.2.3 From d3eee3c0643a20ba06941ba45d9d27146a8b634d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 13:01:36 +0200 Subject: gnu: guix: Update to 1.1.0-15.03deb1e. * gnu/packages/package-management.scm (guix): Update to 1.1.0-15.03deb1e. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 261a55fa14..0af4704e52 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "5bd803339d664b59eac34e049e944950c526f6e9") - (revision 14)) + (commit "03deb1e891b8a8b21888e5e047017fd6a3ea7a5f") + (revision 15)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0lj8ahy3kq2ijn5dps19gw31kiry4d724bc8cpprxhlpxa834icr")) + "1c1hf7hnlr4dv05lxqmqfpqdr40cajh1ykrd2rsxjv09iq7yw1q4")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b919d4048e72f8e5740606cdb3dac0592de21f36 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 2 Jul 2020 13:50:51 +0200 Subject: gnu: guix: Update to 1.1.0-16.d3eee3c. * gnu/packages/package-management.scm (guix): Update to 1.1.0-16.d3eee3c. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0af4704e52..44fd0c16b2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "03deb1e891b8a8b21888e5e047017fd6a3ea7a5f") - (revision 15)) + (commit "d3eee3c0643a20ba06941ba45d9d27146a8b634d") + (revision 16)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1c1hf7hnlr4dv05lxqmqfpqdr40cajh1ykrd2rsxjv09iq7yw1q4")) + "1waw4pggijhxwwdi9v9nq8p2har5cvnbvlxvq8abn4g1qw6xdrz5")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b9478f333b8501d9e1404530a325ba6de1dde997 Mon Sep 17 00:00:00 2001 From: Allan Adair Date: Thu, 2 Jul 2020 11:25:07 +0200 Subject: gnu: flatpak: Update to 1.8.0. * gnu/packages/package-management.scm (flatpak): Update to 1.8.0, [native-inputs]: add "python-pyparsing". Signed-off-by: Mathieu Othacehe --- gnu/packages/package-management.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 44fd0c16b2..9986976cc6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1130,7 +1130,7 @@ (define-public libostree (define-public flatpak (package (name "flatpak") - (version "1.6.3") + (version "1.8.0") (source (origin (method url-fetch) @@ -1138,7 +1138,7 @@ (define-public flatpak version "/flatpak-" version ".tar.xz")) (sha256 (base32 - "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji")))) + "0d4x79z96r60rc2gnf415da7z9x1my5hdyjdlklfiwll57jbqr23")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. @@ -1190,6 +1190,7 @@ (define-public flatpak ("libcap" ,libcap) ("pkg-config" ,pkg-config) ("python" ,python) + ("python-pyparsing" ,python-pyparsing) ("socat" ,socat) ("which" ,which))) (propagated-inputs `(("glib-networking" ,glib-networking) -- cgit v1.2.3 From 6680880f9b8dceb4f2f3f91bd2b13c659b53835e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Jul 2020 00:16:02 +0200 Subject: gnu: guix: Update to 1.1.0-17.36a1925. * gnu/packages/package-management.scm (guix): Update to 1.1.0-17.36a1925. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9986976cc6..6e86305504 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "d3eee3c0643a20ba06941ba45d9d27146a8b634d") - (revision 16)) + (commit "36a1925f21ee6787d8b80025f1b96238309f4b96") + (revision 17)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1waw4pggijhxwwdi9v9nq8p2har5cvnbvlxvq8abn4g1qw6xdrz5")) + "05f7w6hyl1bw58q1fph9ws17rx0zgs638mrsxwz026bwjyy2xxr0")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 3a27a3dc8fbaf78a639d3e44267cd21c9adb9a7f Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 15 Jul 2020 23:08:36 -0600 Subject: gnu: guix-jupyter: Correct kernel search location. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gnu/packages/package-management.scm: guix-jupyter: [phases]: Use guile 3.0 instead of 2.2. Signed-off-by: Ludovic Courtès --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6e86305504..68a2e6e203 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2020 Jesse Gibbons ;;; ;;; This file is part of GNU Guix. ;;; @@ -982,7 +983,7 @@ (define-public guix-jupyter "-s") "\",\n\t\t\"")) (("guix-jupyter-kernel.scm") - (string-append out "/share/guile/site/2.2/" + (string-append out "/share/guile/site/3.0/" "guix-jupyter-kernel.scm"))) #t)))))) (native-inputs -- cgit v1.2.3