julian/hydra-jobs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: julian:83276ed0246bdb4410a2d99089fe11e792d3f4e6
Branches Tags
julian:main julian:flake-updates
..
compare: julian:main
Branches Tags
julian:flake-updates julian:main

1 Commits
83276ed024 ... main

Author SHA1 Message Date
Julian Mutter
3263a37074 workflow: push right after rebasing
Some checks failed
Update Nix Flake / update-flake (push) Failing after 19s
Details
2025-03-23 18:57:16 +01:00
2 changed files with 75 additions and 76 deletions
Expand all files Collapse all files

12
.gitea/workflows/update-flake.yaml
View File

@ -22,7 +22,7 @@ jobs:
git config user.name "Gitea Actions" git config user.name "Gitea Actions"
git config user.email "actions@gitea.local" git config user.email "actions@gitea.local"
- name: Merge main branch - name: Rebase from main branch
shell: bash shell: bash
run: | run: |
commits_ahead=$(git rev-list --count HEAD..origin/main) commits_ahead=$(git rev-list --count HEAD..origin/main)
@ -30,14 +30,14 @@ jobs:
git log --oneline -5 git log --oneline -5
echo "----------" echo "----------"
git log --oneline -5 origin/main git log --oneline -5 origin/main
echo .
if [ $commits_ahead -ne 0 ] if [ $commits_ahead -ne 0 ]
then then
git fetch origin git rebase -X theirs origin/main
git merge -X theirs --squash origin/main git push --force-with-lease origin flake-updates
git commit -m "Merge main branch squashed $(date -I)"
else else
echo "Merge not necessary" echo "Rebase not necessary"
fi fi
- name: Set up Nix - name: Set up Nix
@ -54,4 +54,4 @@ jobs:
git diff --cached --quiet && echo "No changes to commit." && exit 0 git diff --cached --quiet && echo "No changes to commit." && exit 0
git commit -m "Update flake.lock $(date -I)" git commit -m "Update flake.lock $(date -I)"
git push origin flake-updates git push --force-with-lease origin flake-updates

139
flake.lock generated
View File

@ -3,11 +3,11 @@
"alacritty-theme": { "alacritty-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742489164, "lastModified": 1740080741,
"narHash": "sha256-1KSItYOIPjJzltYZyL0nB4UtNWrjSNyihlBQp3VKaBg=", "narHash": "sha256-ROer+oqSY/Z5PAxZFJ5U9R+kMfWb596/1CuEWTcoMIk=",
"owner": "alacritty", "owner": "alacritty",
"repo": "alacritty-theme", "repo": "alacritty-theme",
"rev": "86c578469e2bf784faf6f916883bf48349ff4f6d", "rev": "687675f3f2245c80ff8bfe8180b0eb40dfc0bc86",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742213273, "lastModified": 1741282631,
"narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "rev": "81498562d0f53e613d30368bb5b076784fa86f80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -135,11 +135,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741473158, "lastModified": 1735644329,
"narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,16 +192,15 @@
"yazi-flavors": "yazi-flavors" "yazi-flavors": "yazi-flavors"
}, },
"locked": { "locked": {
"lastModified": 1742689896, "lastModified": 1741795856,
"narHash": "sha256-Htt3gg9GheC4y8V84oysLhmxMC/XfV8l2PrNxsT0BpQ=", "narHash": "sha256-uSLlzKO0JwWUduD6jBYZR4RU0fevhKd/oJ4BKnav3fI=",
"ref": "flake-updates", "ref": "refs/heads/master",
"rev": "6aa73c2dbd0ab8c6c0d9b1b2dc850c1a318fc154", "rev": "4745b90cea47b823a560fd43884a89529df0f2b1",
"revCount": 555, "revCount": 543,
"type": "git", "type": "git",
"url": "https://gitlab.julian-mutter.de/julian/dotfiles" "url": "https://gitlab.julian-mutter.de/julian/dotfiles"
}, },
"original": { "original": {
"ref": "flake-updates",
"type": "git", "type": "git",
"url": "https://gitlab.julian-mutter.de/julian/dotfiles" "url": "https://gitlab.julian-mutter.de/julian/dotfiles"
} }
@ -536,11 +535,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742655702, "lastModified": 1739757849,
"narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -592,11 +591,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742215578, "lastModified": 1738664950,
"narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +652,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1742681162, "lastModified": 1741788549,
"narHash": "sha256-kkWvzXU/w48eKqvKVvcE7rWAOH+MeT1ErIgqB7h0Eas=", "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "fdb7ca6c8fa3611ab04eccf129a515efd9852c73", "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -686,11 +685,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742550672, "lastModified": 1738966025,
"narHash": "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4=", "narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "7429a0ea78353dab6a7a9a3e8101db98a306957d", "rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -847,11 +846,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741534688, "lastModified": 1741123584,
"narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1009,11 +1008,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742204505, "lastModified": 1741597901,
"narHash": "sha256-sHBzuG9K/VrvOrcLd9GwoCLaQZDVedi/00YmFfdKq/A=", "narHash": "sha256-nLUTgXXcFFz+3pd3Khz1H4jUECqX5+OapNPGioPJRQs=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "bc1ecb8ca83507c764a3909f02f1acf53c033585", "rev": "8e0308dd7dd9cd3656866fb2387bc29052fd6d3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1031,11 +1030,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742655717, "lastModified": 1741791880,
"narHash": "sha256-p1815USOcTj+kPSw2XkK8eWG19NZXpCST9vYDVnQ144=", "narHash": "sha256-0nFAtEaSk0OZXIp3gjeK43e3drbzXjLLSye8RT6hKPU=",
"owner": "doronbehar", "owner": "doronbehar",
"repo": "nix-matlab", "repo": "nix-matlab",
"rev": "ddc7d6354cf54880c6d0748fdf7ad370a748f562", "rev": "a8ea92e365477727c924293255a143026e57a5ba",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -1070,11 +1069,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1742631601, "lastModified": 1741792691,
"narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "380ed15bcd6440606c6856db44a99140d422b46f", "rev": "e1f12151258b12c567f456d8248e4694e9390613",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1117,11 +1116,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1742422364, "lastModified": 1741513245,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1133,11 +1132,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742069588, "lastModified": 1741246872,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1161,11 +1160,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1742512142, "lastModified": 1741600792,
"narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1191,11 +1190,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1742045620, "lastModified": 1741533061,
"narHash": "sha256-zXkJRY/87TPX1vxlrF4941/GRHD3L+CFfe0/95dWT9o=", "narHash": "sha256-XQ5nJgVwYzH0mHqp3c/59+MLgnsXKoe/bUtkrB1BoCk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "b73beb7bb8c5ec5e559bb5222af9994e7ee4bdbd", "rev": "af8a201b44bd7ccadcdd143cb38b5adcffaddc25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1216,11 +1215,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741886583, "lastModified": 1739738736,
"narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "narHash": "sha256-Rl4Fw+3PsLTEzzUGlB8kePaiIersDbv5voAif3D6LoM=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "rev": "9ff62c8e1fbe5dc649dee680c7eb4935936c8ac3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1240,11 +1239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742058297, "lastModified": 1741379162,
"narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1297,11 +1296,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742577105, "lastModified": 1737048258,
"narHash": "sha256-1VFPRxydmDhq+CQogLeafh2zmNGKTMFYiV4y9NZXApo=", "narHash": "sha256-QcprTngXkN/XuaiSKrswJUHEV+Nz3dSzP6zcLq00Y48=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "94de09f4298233795996e17163ae6b987cdedbe9", "rev": "67d5dac0d1a1c0ae0beaf972881976a8b0908fd1",
"revCount": 75, "revCount": 73,
"type": "git", "type": "git",
"url": "https://gitlab.julian-mutter.de/julian/sheet-organizer" "url": "https://gitlab.julian-mutter.de/julian/sheet-organizer"
}, },
@ -1341,11 +1340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742595978, "lastModified": 1741644481,
"narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=", "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "b7756921b002de60fb66782effad3ce8bdb5b25d", "rev": "e653d71e82575a43fe9d228def8eddb73887b866",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1533,11 +1532,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741934139, "lastModified": 1737634991,
"narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1549,11 +1548,11 @@
"yazi-flavors": { "yazi-flavors": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742023253, "lastModified": 1741392393,
"narHash": "sha256-nhIhCMBqr4VSzesplQRF6Ik55b3Ljae0dN+TYbzQb5s=", "narHash": "sha256-iTMch0T933Tvofvo3ZzFwk+PNs+dsK0SrAIlJ03v73E=",
"owner": "yazi-rs", "owner": "yazi-rs",
"repo": "flavors", "repo": "flavors",
"rev": "68326b4ca4b5b66da3d4a4cce3050e5e950aade5", "rev": "b929df6bdb56536e14c1fc24c9659f441b961f28",
"type": "github" "type": "github"
}, },
"original": { "original": {