bug#30760: guix system init broken on non GuixSD

2018-03-10 Thread Tomáš Čech 

On Sat, Mar 10, 2018 at 12:19:52AM +0100, Ludovic Courtès wrote:

Danny Milosavljevic  skribis:


[huge build]

The current tradeoff is to make that diagnostic based on the running
kernel, even if it’s an approximation.


Ah, good point.


If that’s fine with you I’d like to fix this bug with the conservative
patch below.


Sure, looks good.


Pushed as 8d5c14edf5a6d01f859b1aa00c836ffdb5ddecf4.


I'm afraid that now it leads to:

Backtrace:
12 (primitive-load "/usr/bin/guix")
In guix/ui.scm:
1501:12 11 (run-guix-command _ . _)
In ice-9/boot-9.scm:
  829:9 10 (catch _ _ # …)
  829:9  9 (catch _ _ # …)
In guix/scripts/system.scm:
 1180:8  8 (_)
 1052:6  7 (process-action _ _ _)
In guix/store.scm:
1443:24  6 (run-with-store _ _ #:guile-for-build _ #:system _ # _)
In guix/scripts/system.scm:
1065:13  5 (_ _)
  764:4  4 (perform-action init #< kernel: # …)
In srfi/srfi-1.scm:
  640:9  3 (for-each # …)
In gnu/system/linux-initrd.scm:
  360:4  2 (check-device-initrd-modules "/dev/nvme0n1p2" ("ahci" …) …)
In ice-9/boot-9.scm:
  829:9  1 (catch system-error # …)
In gnu/system/linux-initrd.scm:
  361:6  0 (_)

gnu/system/linux-initrd.scm:361:6: known-module-aliases: unbound variable


This is part of my config:

(initrd (lambda (file-system . rest)
 (raw-initrd file-systems
 #:linux linux-x1-sw1
 #:linux-modules '()
 #:helper-packages '(linux-firmware-initrd-x1-sw1)
 #:mapped-devices mapped-devices)))


I don't have any modules to be loaded in initrd, kernel is compiled
using my configuration which fits my needs and follows the HW it will run on.

S_W


signature.asc
Description: Digital signature

bug#30710: guix graph gives duplicate nodes

2018-03-10 Thread Hartmut Goebel 
On Fri, 09 Mar 2018 23:59:26 +0100 l...@gnu.org (Ludovic Courtès) wrote:
>
>> Good catch!  I implemented what you suggest above in commit
>> 464f5447396fcec9b43f7eab71d5d42b522a157f.

Thanks, this solved the issue only partially: On my "kde-plasma" branch:

$ ./pre-inst-env guix graph plasma-workspace | grep autoconf
  "133094208" [label = "autoconf-wrapper-2.69", shape = box, fontname =
Helvetica];
  "133094976" [label = "autoconf-2.69", shape = box, fontname = Helvetica];
  "152772352" [label = "autoconf-wrapper-2.69", shape = box, fontname =
Helvetica];
  "152420544" [label = "autoconf-2.69", shape = box, fontname = Helvetica];

There are other packages, which are duplicate but don't have a factory
AFAIK:

$ ./pre-inst-env guix graph plasma-workspace | grep kbus
  "130257472" [label = "kdbusaddons-5.42.0", shape = box, fontname =
Helvetica];
  "148171200" [label = "kdbusaddons-5.42.0", shape = box, fontname =
Helvetica];

-- 
Regards
Hartmut Goebel

| Hartmut Goebel  | h.goe...@crazy-compilers.com   |
| www.crazy-compilers.com | compilers which you thought are impossible |

bug#30667: 'guix system vm' must keep mount_tag-length limited below 32 bytes for --expose and --share

2018-03-10 Thread Björn Höfling 
On Thu, 08 Mar 2018 11:56:57 +0100
l...@gnu.org (Ludovic Courtès) wrote:

> Hi Björn,
> 
> Björn Höfling  skribis:
> 
> > I prepared a QEMU VM with:
> >
> > ./pre-inst-env  guix system vm \
> > --expose=/home/bjoern/digikam-testpool/=/image-pool \
> > ../guix-systems/digikam-test.scm
> >
> > Starting the VM it complained:
> >  
> > $> /gnu/store/zg5a42vcz4qf6h3yrdrijyaxkbhr967s-run-vm.sh   
> > qemu-system-x86_64: -virtfs
> > local,path=/home/bjoern/digikam-testpool/,security_model=none,mount_tag=TAG_home_bjoern_digikam-testpool_:
> > mount tag 'TAG_home_bjoern_digikam-testpool_' (33 bytes) is longer
> > than maximum (31 bytes)  
> 
> Fixed in dffc5ab5e47e45b94188828205c8d567994926ad, thanks!
> 
> Ludo’.

Tested. Works. Thanks for fixing it!

Björn


pgpTpHvXYyAni.pgp
Description: OpenPGP digital signature

bug#30524: [PATCH] gnu: java-jeromq: Fix tests.

2018-03-10 Thread Gábor Boskovits 
* gnu/packages/patches/java-jeromq-fix-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/java.scm (java-jeromq)[source](patches): Add it.
[arguments](#test-exclude): Disable more failing tests.
---
 gnu/local.mk |   1 +
 gnu/packages/java.scm|  11 +-
 gnu/packages/patches/java-jeromq-fix-tests.patch | 253 +++
 3 files changed, 263 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/java-jeromq-fix-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9684d949f..2bae3660c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -782,6 +782,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/intltool-perl-compatibility.patch   \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch\
   %D%/packages/patches/jacal-fix-texinfo.patch \
+  %D%/packages/patches/java-jeromq-fix-tests.patch \
   %D%/packages/patches/java-powermock-fix-java-files.patch \
   %D%/packages/patches/java-xerces-bootclasspath.patch \
   %D%/packages/patches/java-xerces-build_dont_unzip.patch  \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0f8c04e8b..85a8c9b3a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8117,7 +8117,8 @@ protocol-independent framework to build mail and 
messaging applications.")
   (file-name (string-append name "-" version "-checkout"))
   (sha256
(base32
-"1gxkp7lv2ahymgrqdw94ncq54bmp4m4sw5m1x9gkp7l5bxn0xsyj"
+"1gxkp7lv2ahymgrqdw94ncq54bmp4m4sw5m1x9gkp7l5bxn0xsyj"))
+  (patches (search-patches "java-jeromq-fix-tests.patch"
 (build-system ant-build-system)
 (arguments
  `(#:jar-name "java-jeromq.jar"
@@ -8131,7 +8132,13 @@ protocol-independent framework to build mail and 
messaging applications.")
  ;; Failures
  "**/DealerSpecTest.java"
  "**/CustomDecoderTest.java"
- "**/CustomEncoderTest.java")))
+ "**/CustomEncoderTest.java"
+ "**/ConnectRidTest.java"
+ "**/ReqSpecTest.java"
+ "**/PushPullSpecTest.java"
+ "**/PubSubHwmTest.java"
+ "**/RouterSpecTest.java"
+ "**/ProxyTest.java")))
 (inputs
  `(("java-jnacl" ,java-jnacl)))
 (native-inputs
diff --git a/gnu/packages/patches/java-jeromq-fix-tests.patch 
b/gnu/packages/patches/java-jeromq-fix-tests.patch
new file mode 100644
index 0..5466b9270
--- /dev/null
+++ b/gnu/packages/patches/java-jeromq-fix-tests.patch
@@ -0,0 +1,253 @@
+From 5803aadd3f209eba1ffbb2cf7bf16778019dbee1 Mon Sep 17 00:00:00 2001
+From: fredoboulo 
+Date: Fri, 23 Feb 2018 23:55:57 +0100
+Subject: [PATCH] Fix #524 : V1 and V2 protocol downgrades handle received data
+ in handshake buffer
+
+This patch is upstream pull request, see:
+https://gihub.com/zeromq/jeromq/pull/527.
+
+It is merged on commit c2afa9c, and we can drop it on the
+0.4.4 release.
+
+---
+ src/main/java/zmq/io/StreamEngine.java| 21 ++--
+ src/test/java/zmq/io/AbstractProtocolVersion.java | 41 +--
+ src/test/java/zmq/io/V0ProtocolTest.java  | 12 +++
+ src/test/java/zmq/io/V1ProtocolTest.java  | 16 +++--
+ src/test/java/zmq/io/V2ProtocolTest.java  | 16 +++--
+ 5 files changed, 81 insertions(+), 25 deletions(-)
+
+diff --git a/src/main/java/zmq/io/StreamEngine.java 
b/src/main/java/zmq/io/StreamEngine.java
+index b8933c92..fe2f2d8d 100644
+--- a/src/main/java/zmq/io/StreamEngine.java
 b/src/main/java/zmq/io/StreamEngine.java
+@@ -816,9 +816,7 @@ private boolean handshake()
+ assert (bufferSize == headerSize);
+ 
+ //  Make sure the decoder sees the data we have already received.
+-greetingRecv.flip();
+-inpos = greetingRecv;
+-insize = greetingRecv.limit();
++decodeDataAfterHandshake(0);
+ 
+ //  To allow for interoperability with peers that do not forward
+ //  their subscriptions, we inject a phantom subscription message
+@@ -846,6 +844,8 @@ else if (greetingRecv.get(revisionPos) == 
Protocol.V1.revision) {
+ }
+ encoder = new V1Encoder(errno, Config.OUT_BATCH_SIZE.getValue());
+ decoder = new V1Decoder(errno, Config.IN_BATCH_SIZE.getValue(), 
options.maxMsgSize, options.allocator);
++
++decodeDataAfterHandshake(V2_GREETING_SIZE);
+ }
+ else if (greetingRecv.get(revisionPos) == Protocol.V2.revision) {
+ //  ZMTP/2.0 framing.
+@@ -859,6 +859,8 @@ else if (greetingRecv.get(revisionPos) == 
Protocol.V2.revision) {
+ }
+ encoder = new V2Encoder(errno, Config.OUT_BATCH_SIZE.getValue());
+ decoder = new V2Decoder(errno,