From 2ff4df069e639242032e9d4574babd3fa77e9789 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 15 Apr 2023 23:06:37 +0000 Subject: [PATCH] nix update: nixpkgs: 2023-04-13 -> 2023-04-16 (nixos-unstable) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/915c0fab841cc88045e00778b8e7fbdbdbd7d1aa' (2023-04-13) → 'github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db' (2023-04-16) • Updated input 'sops-nix': 'github:Mic92/sops-nix/00d5fd73756d424de5263b92235563bc06f2c6e1' (2023-04-11) → 'github:Mic92/sops-nix/de6514f8fe1b3c2b57307569a0898bc4be9ae1c5' (2023-04-17) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/e45cc0138829ad86e7ff17a76acf2d05e781e30a' (2023-04-09) → 'github:NixOS/nixpkgs/1040ce5f652b586da95dfd80d48a745e107b9eac' (2023-04-16) ``` --- flake.lock | 20 +++++++------- flake.nix | 26 ++++++++++++++----- .../2023-03-03-qtbase-cross-compile.patch | 13 ---------- nixpatches/list.nix | 13 +++++----- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 175d3f6a..cfdfff95 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1681005198, - "narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=", + "lastModified": 1681613598, + "narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e45cc0138829ad86e7ff17a76acf2d05e781e30a", + "rev": "1040ce5f652b586da95dfd80d48a745e107b9eac", "type": "github" }, "original": { @@ -82,16 +82,16 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1681365682, - "narHash": "sha256-hboxfU6YYRBZ6BRnBayIZA2VrdWKpAgeBhplQkBJ3rc=", + "lastModified": 1681648924, + "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "915c0fab841cc88045e00778b8e7fbdbdbd7d1aa", + "rev": "f294325aed382b66c7a188482101b0f336d1d7db", "type": "github" }, "original": { "owner": "nixos", - "ref": "staging-next", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -113,11 +113,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681209176, - "narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=", + "lastModified": 1681721408, + "narHash": "sha256-NWCbZKOQEXz1hA2YDFxdd+fVrrw9edbG1DvbbLf7KUY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "00d5fd73756d424de5263b92235563bc06f2c6e1", + "rev": "de6514f8fe1b3c2b57307569a0898bc4be9ae1c5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 86aee3ca..bbb2872e 100644 --- a/flake.nix +++ b/flake.nix @@ -26,14 +26,26 @@ # # nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11"; + # branch workflow: + # - daily: + # - nixos-unstable cut from master after enough packages have been built in caches. + # - every 6 hours: + # - master auto-merged into staging. + # - staging-next auto-merged into staging. + # - manually, approximately once per month: + # - staging-next is cut from staging. + # - staging-next merged into master. + # + # which branch to source from? + # - for everyday development, prefer `nixos-unstable` branch, as it provides good caching. + # - if need to test bleeding updates (e.g. if submitting code into staging): + # - use `staging-next` if it's been cut (i.e. if there's an active staging-next -> master PR) + # - use `staging` if no staging-next branch has been cut. + # # - # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next"; - - # nixpkgs = { - # url = "./nixpatches"; - # inputs.nixpkgs.follows = "nixpkgs-unpatched"; - # }; + nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next"; + # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging"; mobile-nixos = { # diff --git a/nixpatches/2023-03-03-qtbase-cross-compile.patch b/nixpatches/2023-03-03-qtbase-cross-compile.patch index f7289223..5ae86e4f 100644 --- a/nixpatches/2023-03-03-qtbase-cross-compile.patch +++ b/nixpatches/2023-03-03-qtbase-cross-compile.patch @@ -19,16 +19,3 @@ index e71b0a7613d..72779ac57a5 100644 ]; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ -diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix -index 28180d3b0ca..f14c73b10ee 100644 ---- a/pkgs/development/libraries/qt-6/qtModule.nix -+++ b/pkgs/development/libraries/qt-6/qtModule.nix -@@ -61,7 +61,7 @@ stdenv.mkDerivation (args // { - if [[ -z "$dontSyncQt" && -f sync.profile ]]; then - # FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs - # I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin -- ${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}" -+ perl ${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}" - fi - ''; - diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 0719d1ec..c2d79aff 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -32,19 +32,18 @@ # TODO: why doesn't this apply? # ./2023-03-04-ccache-cross-fix.patch - # 2023-03-28: jellyfin-media-player: 1.8.1 -> 1.9.0 - # TODO: i should review/approve this PR if it works - (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/220974.diff"; - hash = "sha256-AK/l0vteCEg/ae4E0dS1oWnlLI4xyeyLFJcqMgCQ4RI="; - }) - # 2023-04-11: bambu-studio: init at unstable-2023-01-11 (fetchpatch { url = "https://github.com/NixOS/nixpkgs/pull/206495.diff"; hash = "sha256-RbQzAtFTr7Nrk2YBcHpKQMYoPlFMVSXNl96B/lkKluQ="; }) + # 2023-04-18: obsidian: update electron_21 -> 24 (merged; waiting to reach downstream branches) + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/pull/226591.diff"; + hash = "sha256-5Nv529giGtsU9z1WPIxOOLNlAwCw2MCYEaHAap/E0NI="; + }) + # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). # using local package defn until stabilized