Compare commits

..

No commits in common. "bc072038b0c0556c31be1a9b4e846c9ce4893bfd" and "893b92a863d115dcf4687491c405634333c89ef9" have entirely different histories.

5 changed files with 30 additions and 59 deletions

View file

@ -1,26 +0,0 @@
name: "Test ed template MacOS"
on:
workflow_dispatch: # allows manual triggering
push:
branches:
- 'update_rde'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v6
- uses: cachix/install-nix-action@v31
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v17
with:
name: rde
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
extraPullNames: rstats-on-nix, nix-community
- run: nix build ./templates/ed

View file

@ -23,7 +23,8 @@ jobs:
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
extraPullNames: rstats-on-nix, nix-community extraPullNames: rstats-on-nix, nix-community
- run: cd templates/rde/ && nix develop -c p-updateDeps - run: cd templates/rde/ && nix develop -c p-updateDeps
- name: Update ed flake.lock - run: cd templates/ed/ && nix develop -c updateR
- name: Update n flake.lock
uses: DeterminateSystems/update-flake-lock@v28 uses: DeterminateSystems/update-flake-lock@v28
with: with:
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776413584, "lastModified": 1771462351,
"narHash": "sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E=", "narHash": "sha256-N3mUOwFwGBaFomNdlWuCRftzqy+h9Io8PJGcMVtJJsY=",
"owner": "dwinkler1", "owner": "dwinkler1",
"repo": "fran", "repo": "fran",
"rev": "da09626e4dd8f0f57078b3a04e0443a8c20defa1", "rev": "7b8fbbcd0c55df98795a9e34621e6224b6713b5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,16 +22,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776877367, "lastModified": 1775811116,
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -45,20 +45,18 @@
"nixpkgs" "nixpkgs"
], ],
"plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references", "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
"plugins-r": [ "plugins-r": "plugins-r",
"plugins-r"
],
"rixpkgs": [ "rixpkgs": [
"rixpkgs" "rixpkgs"
], ],
"wrappers": "wrappers" "wrappers": "wrappers"
}, },
"locked": { "locked": {
"lastModified": 1776413627, "lastModified": 1775085146,
"narHash": "sha256-pU3u7T4MqpjUWxflNvd4i47FURp756L7nMRL8MV+QEw=", "narHash": "sha256-6hRdCsXZhWi0ZzkGdMmCjuOagOkTBowT4/nR7H/CsSI=",
"owner": "dwinkler1", "owner": "dwinkler1",
"repo": "nvimConfig", "repo": "nvimConfig",
"rev": "2617face3b1be40534d2cae7f0a374a062b3710d", "rev": "38d3d49665bc65bc2b0ab82270e9296a94a19c8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,16 +84,15 @@
"plugins-r": { "plugins-r": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769881528, "lastModified": 1774957049,
"narHash": "sha256-oQSHHu6filJkAyH94yEvyTVuxA+5MU2dMOEAnsIjJKQ=", "narHash": "sha256-qfT4htOqZI+JEM2t3I/iuGu2XPu7vNmu4Fkj+2seKgE=",
"owner": "R-nvim", "owner": "R-nvim",
"repo": "R.nvim", "repo": "R.nvim",
"rev": "958b472d763cb258927c7ef69af4fd9945cc5469", "rev": "5b9c870fbb5c61126d30e6b277695d6f3c54da5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "R-nvim", "owner": "R-nvim",
"ref": "v0.99.3",
"repo": "R.nvim", "repo": "R.nvim",
"type": "github" "type": "github"
} }
@ -121,7 +118,6 @@
"fran": "fran", "fran": "fran",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nvimConfig": "nvimConfig", "nvimConfig": "nvimConfig",
"plugins-r": "plugins-r",
"rixpkgs": "rixpkgs" "rixpkgs": "rixpkgs"
} }
}, },
@ -133,11 +129,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776375800, "lastModified": 1774879171,
"narHash": "sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8=", "narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=",
"owner": "BirdeeHub", "owner": "BirdeeHub",
"repo": "nix-wrapper-modules", "repo": "nix-wrapper-modules",
"rev": "f11469ca69068bac13d9e163b2bd268cc06dff57", "rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776413584, "lastModified": 1771462351,
"narHash": "sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E=", "narHash": "sha256-N3mUOwFwGBaFomNdlWuCRftzqy+h9Io8PJGcMVtJJsY=",
"owner": "dwinkler1", "owner": "dwinkler1",
"repo": "fran", "repo": "fran",
"rev": "da09626e4dd8f0f57078b3a04e0443a8c20defa1", "rev": "7b8fbbcd0c55df98795a9e34621e6224b6713b5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1777077449, "lastModified": 1775811116,
"narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,16 +138,16 @@
}, },
"rixpkgs": { "rixpkgs": {
"locked": { "locked": {
"lastModified": 1776958221, "lastModified": 1775479062,
"narHash": "sha256-cOHLrMWifj8HQMIG6gMhGowwPAkyX/kijDx38wK8kUM=", "narHash": "sha256-hbH7uuftiG3KhWGigTEzu0ucIJOa+iDroSDgMN7fOJE=",
"owner": "rstats-on-nix", "owner": "rstats-on-nix",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db90c554b7172188324b84deea35ed5975e20e44", "rev": "577e9cf0442e030ac9f891cb3e56af9a208c8e20",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rstats-on-nix", "owner": "rstats-on-nix",
"ref": "2026-04-22", "ref": "2026-04-06",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -219,7 +219,7 @@
}); });
}; };
inputs = { inputs = {
rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-04-22"; rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-04-06";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixCats = { nixCats = {
url = "github:dwinkler1/nixCatsConfig"; url = "github:dwinkler1/nixCatsConfig";