From b64814c8c14f2a25913432359c4c0385a889c87a Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 18 Jun 2024 23:29:08 -0700 Subject: [PATCH] Make a working 2.90.0-rc1 overlay --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- overlay.nix | 33 +++++---------------------------- pins.json | 2 +- update_pins.py | 2 +- 5 files changed, 16 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index b742e34..9e0c457 100644 --- a/flake.lock +++ b/flake.lock @@ -36,24 +36,24 @@ "lix": { "flake": false, "locked": { - "lastModified": 1717036385, - "narHash": "sha256-dJprPH+cA6Ce7j3/ffPiJRKLrLFngko2nEtOEt+LU5I=", - "rev": "562ff516ab27b8e98490646dd30ac96e7e2c36bb", + "lastModified": 1718419213, + "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=", + "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/562ff516ab27b8e98490646dd30ac96e7e2c36bb.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz" } }, "nixpkgs": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6a83ec1..b6f0a73 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.lix = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + url = "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"; flake = false; }; inputs.flake-utils.url = "github:numtide/flake-utils"; diff --git a/overlay.nix b/overlay.nix index 2a7b6b0..b7c0244 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,39 +1,16 @@ { lix, versionSuffix ? "" }: final: prev: let - boehmgc-patched = ((final.boehmgc.override { - enableLargeConfig = true; - }).overrideAttrs (o: { - # cherrypick: boehmgc: disable tests on aarch64-linux - # https://github.com/NixOS/nixpkgs/pull/309418 - doCheck = !((final.stdenv.isDarwin && final.stdenv.isx86_64) || (final.stdenv.isLinux && final.stdenv.isAarch64)); - - patches = (o.patches or [ ]) ++ [ - # for clown reasons this version is newer than the one in lix, we should - # fix this and update our nixpkgs pin - (prev.path + "/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch") - ] ++ final.lib.optionals (final.lib.versionOlder o.version "8.2.6") [ - # https://github.com/ivmai/bdwgc/pull/586 - (builtins.path { path = lix + "/boehmgc-traceable_allocator-public.diff"; name = "boehmgc-traceable_allocator-public.patch"; }) - ]; - }) - ); - - lixFunctionArgs = builtins.functionArgs (import (lix + "/package.nix")); - # fix up build-release-notes being required in older versions of Lix. - lixPackageBuildReleaseNotes = - if lixFunctionArgs.build-release-notes or true - then { } - else { build-release-notes = null; }; - # This is kind of scary to not override the nix version to pretend to be # 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI # usage. # https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121 lixPkg = final.callPackage (lix + "/package.nix") ({ - versionSuffix = "-lix${versionSuffix}"; - boehmgc-nix = boehmgc-patched; - } // lixPackageBuildReleaseNotes); + # versionSuffix = "-lix${versionSuffix}"; + # FIXME: do this more sensibly for future releases + # https://git.lix.systems/lix-project/lix/issues/406 + officialRelease = true; + }); # These packages depend on Nix features that Lix does not support overridelist_2_18 = [ diff --git a/pins.json b/pins.json index 2dec285..ddb50af 100644 --- a/pins.json +++ b/pins.json @@ -1 +1 @@ -{"nix-eval-jobs": {"kind": "tarball", "rev": "d05f8e86a91aa8b212657ffeec3f3dc38f93d354", "nar_hash": "sha256-fVlYlyQUfrmQNM/2w1+LiV2AMGdU8g3y/ZauRTThKio=", "locked_url": "https://git.lix.systems/api/v1/repos/lix-project/nix-eval-jobs/archive/d05f8e86a91aa8b212657ffeec3f3dc38f93d354.tar.gz?rev=d05f8e86a91aa8b212657ffeec3f3dc38f93d354", "url": "https://git.lix.systems/lix-project/nix-eval-jobs/archive/main.tar.gz"}} \ No newline at end of file +{"nix-eval-jobs": {"kind": "tarball", "rev": "9c23772cf25e0d891bef70b7bcb7df36239672a5", "nar_hash": "sha256-oT273pDmYzzI7ACAFUOcsxtT6y34V5KF7VBSqTza7j8=", "locked_url": "https://git.lix.systems/api/v1/repos/lix-project/nix-eval-jobs/archive/9c23772cf25e0d891bef70b7bcb7df36239672a5.tar.gz?rev=9c23772cf25e0d891bef70b7bcb7df36239672a5", "url": "https://git.lix.systems/lix-project/nix-eval-jobs/archive/release-2.90.tar.gz"}} \ No newline at end of file diff --git a/update_pins.py b/update_pins.py index e037fc5..356fe1a 100755 --- a/update_pins.py +++ b/update_pins.py @@ -147,7 +147,7 @@ def lock_git(url, branch) -> GitPinSerialized: PINS = { 'nix-eval-jobs': - TarballPinSpec('https://git.lix.systems/lix-project/nix-eval-jobs/archive/main.tar.gz') + TarballPinSpec('https://git.lix.systems/lix-project/nix-eval-jobs/archive/release-2.90.tar.gz') }