auto-upgrade: store flake input refs #80

pederbs · 2024-09-15T20:31:19+02:00

pederbs commented

2024-09-15 20:31:19 +02:00

o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o

$ cat $(nix build '.#nixosConfigurations.bicep.config.environment.etc."current-system-flake-inputs.json".source' --print-out-paths)
warning: Git tree '/home/pbsds/repos/pvv-nixos-config' is dirty
{
  "disko": {
    "lastModified": 1725242307,
    "lastModifiedDate": "20240902015827",
    "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=",
    "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a",
    "shortRev": "96073e6",
    "store-path": "/nix/store/dhm38fdr68ixk8sj83xj9qs0x3q2xbdq-source"
  },
  "grzegorz": {
    "lastModified": 1716065905,
    "lastModifiedDate": "20240518205825",
    "narHash": "sha256-08uhxBzfakfhl/ooc+gMzDupWKYvTeyQZwuvB1SBS7A=",
    "rev": "0481aef6553ae9aee86e4edb4ca0ed4f2eba2058",
    "shortRev": "0481aef",
    "store-path": "/nix/store/xdx2i5vwr3w0lv1w2lsaf3fqf5ymsakx-source"
  },
  "grzegorz-clients": {
    "lastModified": 1716115695,
    "lastModifiedDate": "20240519104815",
    "narHash": "sha256-aI65l4x+U5v3i/nfn6N3eW5IZodmf4pyAByE7vTJh8I=",
    "rev": "b9444658fbb39cd1bf1c61ee5a1d5f0641c49abe",
    "shortRev": "b944465",
    "store-path": "/nix/store/d2q2h7hzrzan67cag2pv42yrsm3p9zdz-source"
  },
  "matrix-next": {
    "lastModified": 1717234745,
    "lastModifiedDate": "20240601093905",
    "narHash": "sha256-MFyKRdw4WQD6V3vRGbP6MYbtJhZp712zwzjW6YiOBYM=",
    "rev": "d7dc42c9bbb155c5e4aa2f0985d0df75ce978456",
    "shortRev": "d7dc42c",
    "store-path": "/nix/store/ylp1kfps3qs9rnbzz8h9284kwy3lbxjn-source"
  },
  "minecraft-data": {
    "lastModified": 1725277886,
    "lastModifiedDate": "20240902115126",
    "narHash": "sha256-Fw4VbbE3EfypQWSgPDFfvVH47BHeg3ptsO715NlUM8Q=",
    "rev": "1b4087bd3322a2e2ba84271c8fcc013e6b641a58",
    "revCount": 2,
    "shortRev": "1b4087b",
    "store-path": "/nix/store/zyyrzkz8c4n4xq2i5bgjrxvasc00vih4-source",
    "submodules": false
  },
  "nix-gitea-themes": {
    "lastModified": 1714416973,
    "lastModifiedDate": "20240429185613",
    "narHash": "sha256-aZUcvXjdETUC6wVQpWDVjLUzwpDAEca8yR0ITDeK39o=",
    "rev": "2b23c0ba8aae68d3cb6789f0f6e4891cef26cc6d",
    "revCount": 6,
    "shortRev": "2b23c0b",
    "store-path": "/nix/store/qja8dw3p4ig3xb0i94rdnn9asad5x37v-source",
    "submodules": false
  },
  "nixpkgs": {
    "lastModified": 1725198597,
    "lastModifiedDate": "20240901134957",
    "narHash": "sha256-w3sjCEbnc242ByJ18uebzgjFZY3QU7dZhmLwPsJIZJs=",
    "rev": "3524b030c839db4ea4ba16737789c6fb8a1769c6",
    "shortRev": "3524b03",
    "store-path": "/nix/store/yk45x27azq4x6dxsw26xxpfbpp5fgr9d-source"
  },
  "nixpkgs-unstable": {
    "lastModified": 1725183711,
    "lastModifiedDate": "20240901094151",
    "narHash": "sha256-gkjg8FfjL92azt3gzZUm1+v+U4y+wbQE630uIf4Aybo=",
    "rev": "a2c345850e5e1d96c62e7fa8ca6c9d77ebad1c37",
    "shortRev": "a2c3458",
    "store-path": "/nix/store/qsbriar0zphlbqa76qbqawlxm1lmlf7j-source"
  },
  "pvv-calendar-bot": {
    "lastModified": 1723850344,
    "lastModifiedDate": "20240816231904",
    "narHash": "sha256-aT37O9l9eclWEnqxASVNBL1dKwDHZUOqdbA4VO9DJvw=",
    "rev": "38b66677ab8c01aee10cd59e745af9ce3ea88092",
    "revCount": 19,
    "shortRev": "38b6667",
    "store-path": "/nix/store/xisg0h1z8j9s5l4vf6pgpixnqyjqdxiq-source",
    "submodules": false
  },
  "pvv-nettsiden": {
    "lastModified": 1725212759,
    "lastModifiedDate": "20240901174559",
    "narHash": "sha256-yZBsefIarFUEhFRj+rCGMp9Zvag3MCafqV/JfGVRVwc=",
    "rev": "e7b66b4bc6a89bab74bac45b87e9434f5165355f",
    "revCount": 473,
    "shortRev": "e7b66b4",
    "store-path": "/nix/store/78rpy9i2s9dl5arx2crkzb4y2ld3nn9m-source",
    "submodules": false
  },
  "self": {
    "dirtyRev": "f6ffcb2d688d8cc58428da27234c1368e3e9256b-dirty",
    "dirtyShortRev": "f6ffcb2-dirty",
    "lastModified": 1726424527,
    "lastModifiedDate": "20240915182207",
    "narHash": "sha256-Nc7BE3eVLGzjAYJHW5aS3wmnrOOg9FufB1iclcPNgBk=",
    "store-path": "/nix/store/nk2nx4zpmig6hv51haidcc2rx7zwry6j-source",
    "submodules": false
  },
  "sops-nix": {
    "lastModified": 1725201042,
    "lastModifiedDate": "20240901143042",
    "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
    "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
    "shortRev": "5db5921",
    "store-path": "/nix/store/7fzxw5qnfzw8daqvd70qbav75sn7zfrd-source"
  }
}

o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o

o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o ```shell $ cat $(nix build '.#nixosConfigurations.bicep.config.environment.etc."current-system-flake-inputs.json".source' --print-out-paths) warning: Git tree '/home/pbsds/repos/pvv-nixos-config' is dirty { "disko": { "lastModified": 1725242307, "lastModifiedDate": "20240902015827", "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=", "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a", "shortRev": "96073e6", "store-path": "/nix/store/dhm38fdr68ixk8sj83xj9qs0x3q2xbdq-source" }, "grzegorz": { "lastModified": 1716065905, "lastModifiedDate": "20240518205825", "narHash": "sha256-08uhxBzfakfhl/ooc+gMzDupWKYvTeyQZwuvB1SBS7A=", "rev": "0481aef6553ae9aee86e4edb4ca0ed4f2eba2058", "shortRev": "0481aef", "store-path": "/nix/store/xdx2i5vwr3w0lv1w2lsaf3fqf5ymsakx-source" }, "grzegorz-clients": { "lastModified": 1716115695, "lastModifiedDate": "20240519104815", "narHash": "sha256-aI65l4x+U5v3i/nfn6N3eW5IZodmf4pyAByE7vTJh8I=", "rev": "b9444658fbb39cd1bf1c61ee5a1d5f0641c49abe", "shortRev": "b944465", "store-path": "/nix/store/d2q2h7hzrzan67cag2pv42yrsm3p9zdz-source" }, "matrix-next": { "lastModified": 1717234745, "lastModifiedDate": "20240601093905", "narHash": "sha256-MFyKRdw4WQD6V3vRGbP6MYbtJhZp712zwzjW6YiOBYM=", "rev": "d7dc42c9bbb155c5e4aa2f0985d0df75ce978456", "shortRev": "d7dc42c", "store-path": "/nix/store/ylp1kfps3qs9rnbzz8h9284kwy3lbxjn-source" }, "minecraft-data": { "lastModified": 1725277886, "lastModifiedDate": "20240902115126", "narHash": "sha256-Fw4VbbE3EfypQWSgPDFfvVH47BHeg3ptsO715NlUM8Q=", "rev": "1b4087bd3322a2e2ba84271c8fcc013e6b641a58", "revCount": 2, "shortRev": "1b4087b", "store-path": "/nix/store/zyyrzkz8c4n4xq2i5bgjrxvasc00vih4-source", "submodules": false }, "nix-gitea-themes": { "lastModified": 1714416973, "lastModifiedDate": "20240429185613", "narHash": "sha256-aZUcvXjdETUC6wVQpWDVjLUzwpDAEca8yR0ITDeK39o=", "rev": "2b23c0ba8aae68d3cb6789f0f6e4891cef26cc6d", "revCount": 6, "shortRev": "2b23c0b", "store-path": "/nix/store/qja8dw3p4ig3xb0i94rdnn9asad5x37v-source", "submodules": false }, "nixpkgs": { "lastModified": 1725198597, "lastModifiedDate": "20240901134957", "narHash": "sha256-w3sjCEbnc242ByJ18uebzgjFZY3QU7dZhmLwPsJIZJs=", "rev": "3524b030c839db4ea4ba16737789c6fb8a1769c6", "shortRev": "3524b03", "store-path": "/nix/store/yk45x27azq4x6dxsw26xxpfbpp5fgr9d-source" }, "nixpkgs-unstable": { "lastModified": 1725183711, "lastModifiedDate": "20240901094151", "narHash": "sha256-gkjg8FfjL92azt3gzZUm1+v+U4y+wbQE630uIf4Aybo=", "rev": "a2c345850e5e1d96c62e7fa8ca6c9d77ebad1c37", "shortRev": "a2c3458", "store-path": "/nix/store/qsbriar0zphlbqa76qbqawlxm1lmlf7j-source" }, "pvv-calendar-bot": { "lastModified": 1723850344, "lastModifiedDate": "20240816231904", "narHash": "sha256-aT37O9l9eclWEnqxASVNBL1dKwDHZUOqdbA4VO9DJvw=", "rev": "38b66677ab8c01aee10cd59e745af9ce3ea88092", "revCount": 19, "shortRev": "38b6667", "store-path": "/nix/store/xisg0h1z8j9s5l4vf6pgpixnqyjqdxiq-source", "submodules": false }, "pvv-nettsiden": { "lastModified": 1725212759, "lastModifiedDate": "20240901174559", "narHash": "sha256-yZBsefIarFUEhFRj+rCGMp9Zvag3MCafqV/JfGVRVwc=", "rev": "e7b66b4bc6a89bab74bac45b87e9434f5165355f", "revCount": 473, "shortRev": "e7b66b4", "store-path": "/nix/store/78rpy9i2s9dl5arx2crkzb4y2ld3nn9m-source", "submodules": false }, "self": { "dirtyRev": "f6ffcb2d688d8cc58428da27234c1368e3e9256b-dirty", "dirtyShortRev": "f6ffcb2-dirty", "lastModified": 1726424527, "lastModifiedDate": "20240915182207", "narHash": "sha256-Nc7BE3eVLGzjAYJHW5aS3wmnrOOg9FufB1iclcPNgBk=", "store-path": "/nix/store/nk2nx4zpmig6hv51haidcc2rx7zwry6j-source", "submodules": false }, "sops-nix": { "lastModified": 1725201042, "lastModifiedDate": "20240901143042", "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", "shortRev": "5db5921", "store-path": "/nix/store/7fzxw5qnfzw8daqvd70qbav75sn7zfrd-source" } } ``` o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o o( ❛ᴗ❛ )o

pederbs added 1 commit 2024-09-15 20:31:19 +02:00

f6ffcb2d68 auto-upgrade: store flake input refs

oysteikt reviewed 2024-09-15 23:18:03 +02:00

base/services/auto-upgrade.nix Outdated

						
				@ -16,0 +19,4 @@

				    = pkgs.writers.writeJSON "flake-inputs.json" (

				      lib.flip lib.mapAttrs inputs (name: input:

				        # inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like a derivation

				        lib.filterAttrs (key: val: !builtins.elem key ["outPath"]) (input.sourceInfo or {})

oysteikt commented

2024-09-15 23:18:03 +02:00

Maybe this could be simplified?

lib.removeAttrs (input.sourceInfo or {} // { store-path = input.outPath; }) [ "outPath" ]

Maybe this could be simplified? ``` lib.removeAttrs (input.sourceInfo or {} // { store-path = input.outPath; }) [ "outPath" ] ```

pederbs commented

2024-09-16 02:50:57 +02:00

i was looking for that library function, but my search for "filterAttrs" turned up empty

pederbs marked this conversation as resolved

pederbs force-pushed retain-flake-inputs from f6ffcb2d68 to 4913b22ab9

2024-09-16 02:51:28 +02:00

Compare

danio commented

2024-09-16 23:14:57 +02:00

I ❤️ the last modified date stuff

oysteikt approved these changes 2024-09-21 22:04:18 +02:00

pederbs merged commit 2861f939b7 into main

2024-09-21 22:19:19 +02:00

pederbs referenced this issue from a commit

2024-09-21 22:19:20 +02:00

Merge pull request 'auto-upgrade: store flake input refs' (!80) from retain-flake-inputs into main

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Drift/pvv-nixos-config#80