From 2c0d2b64bf2f74711cdd6909c5348610a3a8fc99 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Fri, 26 Jan 2024 09:20:14 -0500 Subject: [PATCH 1/3] Fix generated note reference --- README.md | 2 +- transient-showcase.org | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 30c7039..6f490b8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Transient Showcase - + Code examples for interactive explanations of [transient](https://github.com/magit/transient). diff --git a/transient-showcase.org b/transient-showcase.org index 9c4c6a8..0e203cb 100644 --- a/transient-showcase.org +++ b/transient-showcase.org @@ -10,7 +10,7 @@ :END: #+begin_export html - + #+end_export Code examples for interactive explanations of [[https://github.com/magit/transient][transient]]. From 392e88b13ab01a4082b8bc1c66a5f6350f901c80 Mon Sep 17 00:00:00 2001 From: Psionik K <73710933+psionic-k@users.noreply.github.com> Date: Sun, 28 Jan 2024 18:06:12 +0900 Subject: [PATCH 2/3] update nix flake, emacs & packages versions Signed-off-by: Psionik K <73710933+psionic-k@users.noreply.github.com> --- .github/flake.nix | 4 ++-- .github/workflows/ci.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/flake.nix b/.github/flake.nix index 0a60940..79b756d 100644 --- a/.github/flake.nix +++ b/.github/flake.nix @@ -21,7 +21,7 @@ description = "This flake provides CI & local development dependencies"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=release-22.11"; + nixpkgs.url = "github:nixos/nixpkgs?ref=release-23.11"; flake-utils.url = "github:numtide/flake-utils"; emacs-overlay = { url = "github:nix-community/emacs-overlay"; @@ -42,7 +42,7 @@ emacsPackages = [ "emacs" - "emacsGit" # transient upstream changes may appear here + "emacs-unstable" # transient upstream changes may appear here ]; devShells = pkgs.lib.genAttrs emacsPackages (emacsPkg: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 341ea42..e79d0a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - emacsPkg: [ emacs, emacsGit ] + emacsPkg: [ emacs, emacs-unstable ] runs-on: ${{ matrix.os }} steps: From d5c52050c81f919699accbc087467892cb30be18 Mon Sep 17 00:00:00 2001 From: Psionik K <73710933+psionic-k@users.noreply.github.com> Date: Sun, 28 Jan 2024 18:06:26 +0900 Subject: [PATCH 3/3] generated Signed-off-by: Psionik K <73710933+psionic-k@users.noreply.github.com> --- .github/flake.lock | 57 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/.github/flake.lock b/.github/flake.lock index a033b73..bb196c1 100644 --- a/.github/flake.lock +++ b/.github/flake.lock @@ -7,14 +7,15 @@ ], "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1670637348, - "narHash": "sha256-4FLOEi02WS+St6i1MSUxGfA32FL1SFIpwWCDsABAZkk=", + "lastModified": 1706406538, + "narHash": "sha256-VmeZ0iaGJWkzYepUpkzHPz6vFvdB3YAPguZjwKPGueE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3a0b5dd7756173e63c2bbbe70dd5484a7463257d", + "rev": "d6d5dd09b6533a30e3b312f0f225bd3475733f23", "type": "github" }, "original": { @@ -24,12 +25,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -40,16 +44,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670482022, - "narHash": "sha256-xzzjWulnNMCSTEGosGaAg7sLsAtF7stA3sQljZ410/w=", + "lastModified": 1706387821, + "narHash": "sha256-9kDiEDdS3o6dZg4K7z24Mr095yY21Qxu0wdZqRHpqNs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c50e5b63e9d65ff0e70cc06b7042a72c6a6583bc", + "rev": "a93f891e7511780bd9172e69db574242acc79043", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-22.11", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -60,6 +80,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root",