diff --git a/.forgejo/workflows/npins-update.yaml b/.forgejo/workflows/npins-update.yaml index e75d5c5..557845e 100644 --- a/.forgejo/workflows/npins-update.yaml +++ b/.forgejo/workflows/npins-update.yaml @@ -584,35 +584,6 @@ jobs: -o simple | grep \"$COMMIT_MESSAGE dgnum-chores\") ]; then\n tea pr create --description \"Automatic npins update\" --title \"$COMMIT_MESSAGE\" --head \"$GIT_UPDATE_BRANCH\"\n fi\nfi\n" - nix-patches: - runs-on: nix - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - token: ${{ secrets.TEA_DGNUM_CHORES_TOKEN }} - - env: - GIT_UPDATE_BRANCH: npins-updates/nix-patches - name: Switch to a new branch - run: "if git ls-remote --exit-code --heads origin \"refs/heads/$GIT_UPDATE_BRANCH\"\ - ; then\n git switch \"$GIT_UPDATE_BRANCH\"\n git rebase main\n echo \"\ - EXISTING_BRANCH=1\" >> $GITHUB_ENV\nelse\n git switch -C \"$GIT_UPDATE_BRANCH\"\ - \nfi\n" - - env: - COMMIT_MESSAGE: 'chore(npins): Update nix-patches' - GIT_UPDATE_BRANCH: npins-updates/nix-patches - name: Open a PR if updates are present - run: "npins update nix-patches\n\nif [ ! -z \"$(git diff --name-only)\" ]; then\n\ - \ echo \"[+] Changes detected, pushing updates.\"\n\n git add npins\n\n\ - \ if [ -n \"$EXISTING_BRANCH\" ]; then\n git commit --amend --no-edit\n\ - \ git push --force\n else\n git commit --message \"$COMMIT_MESSAGE\"\ - \n git push -u origin \"$GIT_UPDATE_BRANCH\"\n fi\n\n # Connect to the - server with the cli\n tea login add -n dgnum-chores -t \"${{ secrets.TEA_DGNUM_CHORES_TOKEN - }}\" -u https://git.dgnum.eu\n\n # Create a pull request if needed\n # i.e. - no PR with the same title exists\n if [ -z $(tea pr ls -f='title,author' - -o simple | grep \"$COMMIT_MESSAGE dgnum-chores\") ]; then\n tea pr create - --description \"Automatic npins update\" --title \"$COMMIT_MESSAGE\" --head - \"$GIT_UPDATE_BRANCH\"\n fi\nfi\n" nix-pkgs: runs-on: nix steps: diff --git a/npins/sources.json b/npins/sources.json index 948b4d4..970d014 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -234,26 +234,12 @@ "type": "Git", "repository": { "type": "Git", - "url": "https://git.hubrecht.ovh/hubrecht/nix-modules.git" + "url": "https://git.hubrecht.ovh/hubrecht/nix-modules" }, - "branch": "main", - "revision": "75e8d70a051dd19d126b5248b62f61d6f8ce4361", + "branch": "dgnum", + "revision": "f3bfda88cf5ca652baa8577da491f9427d98fe5e", "url": null, - "hash": "0yx5by3v2cshiidyh27n75lcqy9d1kk5zz5mchmfv63s9p0cjzqn" - }, - "nix-patches": { - "type": "GitRelease", - "repository": { - "type": "Git", - "url": "https://git.hubrecht.ovh/hubrecht/nix-patches" - }, - "pre_releases": false, - "version_upper_bound": null, - "release_prefix": null, - "version": "v0.5.0", - "revision": "e11ba20945f4a867f09d84343c37328288f274b4", - "url": null, - "hash": "1c6cc44pwlg3ky6cnwhkml8ci77fw3sgjhwvqg0f6igxxf2fqv9v" + "hash": "1jh8wqlz1bv3b5crfhyvqnh4gjjsyzvs3q0iys6iwq0l337ddgvx" }, "nix-pkgs": { "type": "Git", @@ -261,10 +247,10 @@ "type": "Git", "url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs" }, - "branch": "main", - "revision": "cc01e1c2a6ecb1e38fde35ee54995a6a639fb057", + "branch": "dgnum", + "revision": "304abd514dfe07bce4b368b1f384bfd598d61183", "url": null, - "hash": "17a9vlwrk9365ccyl7a5xspqsn9wizcpwdpvr3qdimvq4fpwhjal" + "hash": null }, "nix-reuse": { "type": "GitRelease", @@ -364,4 +350,4 @@ } }, "version": 3 -} \ No newline at end of file +}