From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.5 Received: by atuin.qyliss.net (Postfix, from userid 496) id B557F60F; Wed, 30 Jun 2021 15:34:48 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 3A01159E; Wed, 30 Jun 2021 15:34:35 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id B05EC464; Wed, 30 Jun 2021 15:34:32 +0000 (UTC) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2081.outbound.protection.outlook.com [40.92.18.81]) by atuin.qyliss.net (Postfix) with ESMTPS id A6B33462 for ; Wed, 30 Jun 2021 15:34:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bksHmldLz+iIZSE3Ukysjqv2P5rc5AXnJUsbJF/9zhZbA9dUhqo6jINn4w5IlxKWc/qJ4y8EvJblwSDXYB//q+nzqwDI6wuE2D7qh2YRmYqk7YOzU719ZinX0Vfn8iLKp85ti6hEyo1sXlpe2YaQAoNsu8FLHpAHM6sNq4ypBnUkURtFn5C/ATsN/AMSaADr7C2SYmnzYzStTIN0hceJN1be8gTjAFf7Vzeqtkoh/l4WSKEXzyi3tn7JJZoX+Z8VFKUHWBs36LFyzs1lB2nujO0X3Jx84oX6e8eJLuhdLDAsP2DyxMybLiWbHanpiW8qfCY+rMamUHaGR6xddjCusw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jg89wY5beMj6T45o9y6zoJZ3o3CzxapjtPKr5hVkSGk=; b=Z3m8vpkYubieTgvQVF+Dc4MmPvWzcy8STTf03W0TdefmJEhzyoeO+XaxRFJ0fG8XmCLXSJ3BMtsu/dkF04ancvvREu7b1f7o4i/ALGo7iQUlUUBNuQZaL/SXjfNS4TLKykCFtvoo+4kFU8RJ4VxCkRUnnhJODvw9E7RsStLUuGFWqKZZ3ZxP27WVb7tjgSgYgpLPtjv1XK5Z9mqnM9V4PSp856CRA1ZLiRG00Cx9bBdSL6afemVGv/emEuDvpdlCHuf0viBtRqLWfcq9KY7sjaBIEl2v0dMwgn9XEgezBjzKLNuFZoyY6QjPj5WhqTqs7q0i2r1FykYKg6T+K0L3ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jg89wY5beMj6T45o9y6zoJZ3o3CzxapjtPKr5hVkSGk=; b=LCWwzApQzJ4Af3opty2riowcScABSUM/wDBXpC0nfrRMgVceaJ5rqHVo948c8ENt4ZZ4n7A6wEVc0NyMAPOKPJ3iVri3xiOecWcw9SOo/MB/9CMjO9rjp3poTiaAeIdS50nEI5sx9eeStKj4S+4rj7G3r63V8i6mMOu8oT+T1qyX/FeOxAF2Nyg4O3PFKDT52X5g89VIj2tjCRxVeG9VwR5Zk3wjSpr9pCPzzwEM012VLBFQe+TNC5mqriCzu/puefPqgcW6/EW1jt18rOD1GmWO07SoMUBpZSxiTfSE5kds1R12RsJ1BU3YEfGNZB2xjrJwQPrqPtB0uHqAay3xdw== Received: from SJ0PR03MB5581.namprd03.prod.outlook.com (2603:10b6:a03:27b::20) by SJ0PR03MB5565.namprd03.prod.outlook.com (2603:10b6:a03:27a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19; Wed, 30 Jun 2021 15:34:25 +0000 Received: from SJ0PR03MB5581.namprd03.prod.outlook.com ([fe80::6d2c:60f7:5584:579a]) by SJ0PR03MB5581.namprd03.prod.outlook.com ([fe80::6d2c:60f7:5584:579a%9]) with mapi id 15.20.4264.026; Wed, 30 Jun 2021 15:34:25 +0000 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 To: "Alyssa Ross" , Subject: Re: [PATCH nixpkgs 1/2] chromiumOSPackages.modemmanager-next: fix libqmi From: "Cole Helbling" Date: Wed, 30 Jun 2021 08:32:54 -0700 Message-ID: In-Reply-To: <20210630092021.58387-2-hi@alyssa.is> X-TMN: [ufIY/JJb+uj/qhaX9hFZbMEgGGG6EPdJ] X-ClientProxiedBy: BY5PR16CA0020.namprd16.prod.outlook.com (2603:10b6:a03:1a0::33) To SJ0PR03MB5581.namprd03.prod.outlook.com (2603:10b6:a03:27b::20) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (73.48.197.220) by BY5PR16CA0020.namprd16.prod.outlook.com (2603:10b6:a03:1a0::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Wed, 30 Jun 2021 15:34:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 238f3841-42aa-47c6-e9ab-08d93bdc8a98 X-MS-TrafficTypeDiagnostic: SJ0PR03MB5565: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: thZQh02VO30PSn0jxij8FuF9IXEtXx+ZvZG3Dn5Q6BqpaXFe7Sy0qcdgMq6Hz9h8MBOwyHjR+9o+WF17HVfqh8xozDBXy/q7ccT9mZYjYiClVrIgnWSdozTSHI11RBgmR+5EgDoc311c7HSTalMjxXtGiRxvqxXe22rRwHgIk6rbAXHuf1flfGyEggxHPXTV7NfDnoSVcIAwSZjcpmTHBv3o3N6vJSoMeT/L8Yj2zvRRdpqgJZmgo3xVHXfuc86u9B9zE38TkFez7HwkBE1cwvkxLLh5qAepneeyof7hn2JRaqR3cVMGLlCAEmQE2Dfpk5Dj2OhhqcQyYeLMzMxHoOyp0FZpe51NlDmocMXAA7uSCPcu6vuHeQSWYslVH5GfznZVl6eARhUO9qukjScQzHB6Z9YDVQEDBQXplO7zRullYnG/kVa+HQyyleB0OUPw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j7h6EThXOPmWwNvmFJPi1Qzh5nhoqGHh3Ofhqo1vejECQwtaF8xxmFj8wDQYqdyIUrXoi28sj5+rpGgs6Nv+gEcTB9/U+XOYariZQfqpS83gEntXk4YujcMZxOnHIf3yqnoC2Ilf+ghXHsNr8k8MTg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 238f3841-42aa-47c6-e9ab-08d93bdc8a98 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB5581.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 15:34:25.6265 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR03MB5565 Message-ID-Hash: QSWTZYBT67E4NMBJ4X5IJGT54KO2LX4S X-Message-ID-Hash: QSWTZYBT67E4NMBJ4X5IJGT54KO2LX4S X-MailFrom: cole.e.helbling@outlook.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Wed Jun 30, 2021 at 2:20 AM PDT, Alyssa Ross wrote: > We need to remove the upstream version, to replace it here with the > CrOS version, and also we need to provide the CrOS version as a build > input, not a native build input. > --- > .../linux/chromium-os/modem-manager/next.nix | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix b/= pkgs/os-specific/linux/chromium-os/modem-manager/next.nix > index d40b2c9292e..a2239a0b9c8 100644 > --- a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix > +++ b/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix > @@ -3,7 +3,12 @@ > }: > =20 > modemmanager.overrideAttrs ( > - { pname, nativeBuildInputs ? [], passthru ? {}, meta ? {}, ... }: > + { pname > + , nativeBuildInputs ? [], buildInputs ? [] > + , passthru ? {}, meta ? {} > + , ... > + }: > + > { > pname =3D "${pname}-chromiumos-next-unstable"; > version =3D "2019-10-17"; > @@ -12,7 +17,10 @@ modemmanager.overrideAttrs ( > upstreamInfo.components."src/third_party/modemmanager-next"; > =20 > nativeBuildInputs =3D nativeBuildInputs ++ > - [ autoreconfHook autoconf-archive libqmi libxslt ]; > + [ autoreconfHook autoconf-archive libxslt ]; > + > + buildInputs =3D [ libqmi ] > + ++ lib.filter (x: x ? pname && x.pname !=3D "libqmi") buildInputs; Is having two "libqmi"s really that big of a deal? Is there a scenario wher= e this prevents e.g. mixing versions or something? Seems like it'd be easier = to just `inherit buildInputs` or `buildInputs =3D buildInputs` (latter for fut= ure extensibility). > =20 > passthru =3D passthru // { > updateScript =3D ../update.py; > --=20 > 2.31.1