From d27e67743931d352e5857b605d44657668fa9013 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 4 Jun 2024 21:14:49 +0200 Subject: all: jump to nixpkgs 24.05 this does a lot of things, most of which are maintenance: - sources update - adjust newly-renamed options - swap some packages that were removed / renamed - update nomsring to newer default ghc - remove the deprecated lib.mdDoc from modules/*.nix - disable the nixpkgs mollysocket module so my own keeps evaluating - bundle the package definition of hikari & wlroots 0.15, which nixpkgs has removed as unmaintained (in fairness, they are unmaintained) --- npins/sources.json | 55 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'npins') diff --git a/npins/sources.json b/npins/sources.json index 7d43fa1..dd64c1f 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -18,9 +18,9 @@ "url": "https://stuebinm.eu/git/bahnhof.name" }, "branch": "main", - "revision": "0c05c14574ed301c1f80ceeb5edabc34e47feffb", + "revision": "8a4723f12fb220204d0aa5ebde8fb65214ad1b47", "url": null, - "hash": "0vmvxypsxxlj2zxmssgpjfqmbs5lkc7vq1cfchc6pkszrywydg0g" + "hash": "0lbraq56vqlisv98hp6ck8bj6z83psqmnq17c647ln498hjp7i4c" }, "blog": { "type": "Git", @@ -53,6 +53,7 @@ }, "pre_releases": false, "version_upper_bound": null, + "release_prefix": null, "version": "v1.0.0", "revision": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "url": "https://api.github.com/repos/numtide/flake-utils/tarball/v1.0.0", @@ -76,10 +77,10 @@ "owner": "nix-community", "repo": "home-manager" }, - "branch": "release-23.11", - "revision": "2c78a57c544dd19b07442350727ced097e1aa6e6", - "url": "https://github.com/nix-community/home-manager/archive/2c78a57c544dd19b07442350727ced097e1aa6e6.tar.gz", - "hash": "1zb4qsyn7l1zdiv1kjx07jvgnakpsifc62fxcim50w3ni27cwxk3" + "branch": "release-24.05", + "revision": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "url": "https://github.com/nix-community/home-manager/archive/a631666f5ec18271e86a5cde998cba68c33d9ac6.tar.gz", + "hash": "13b22rkylwg4jwqmhyypkyjzm4algk5y43kfwwnb96wxmrqrplxc" }, "isabelle-utils": { "type": "Git", @@ -99,9 +100,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/lix" }, "branch": "main", - "revision": "0b91a4b0ec79c27ee36d8a7e2afd7737cb825b65", + "revision": "c55e93ca23eae608f2ff80e940f35f5daa6b4f7f", "url": null, - "hash": "17q366k4iqaphf5f3938b40lx801wvlb3nllpmdj2a2z71jxw7jq" + "hash": "1bs3gva6jmj83by30s3ar0r8cgn6m2912flaip41y5d6am2jcdaa" }, "lix-nixos-module": { "type": "Git", @@ -110,9 +111,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/nixos-module" }, "branch": "main", - "revision": "12b457c433c8d0e81f614c894be34f5bb4c54f99", + "revision": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb", "url": null, - "hash": "12y0435v5gnm5bc6nnj8sb0vg70aa4pj44h7v5xgr6kpgnbf63al" + "hash": "1vdwka8bjcm02ar2cgqf11p13am3w62ki2k1ljn54qmhzk3970lf" }, "nixpkgs": { "type": "Git", @@ -121,10 +122,10 @@ "owner": "NixOS", "repo": "nixpkgs" }, - "branch": "nixos-23.11", - "revision": "9d29cd266cebf80234c98dd0b87256b6be0af44e", - "url": "https://github.com/NixOS/nixpkgs/archive/9d29cd266cebf80234c98dd0b87256b6be0af44e.tar.gz", - "hash": "0bkrjx4x6sy4g9kmcddhlwrl4cpm4yvj7cljd7b8crf7kxpvaaf6" + "branch": "nixos-24.05", + "revision": "805a384895c696f802a9bf5bf4720f37385df547", + "url": "https://github.com/NixOS/nixpkgs/archive/805a384895c696f802a9bf5bf4720f37385df547.tar.gz", + "hash": "1q7y5ygr805l5axcjhn0rn3wj8zrwbrr0c6a8xd981zh8iccmx0p" }, "nixpkgs-unstable": { "type": "Git", @@ -134,9 +135,9 @@ "repo": "nixpkgs" }, "branch": "nixpkgs-unstable", - "revision": "e2dd4e18cc1c7314e24154331bae07df76eb582f", - "url": "https://github.com/NixOS/nixpkgs/archive/e2dd4e18cc1c7314e24154331bae07df76eb582f.tar.gz", - "hash": "19zbxf7rb787jvyrfhl4z9sn3aisd6xvx6ikybbi75ym9sy39jds" + "revision": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", + "url": "https://github.com/NixOS/nixpkgs/archive/4a4ecb0ab415c9fccfb005567a215e6a9564cdf5.tar.gz", + "hash": "15fwgghwlzq0x4i7q4i36ys1slzgfmdjsw8c2ilqnm5mz89rl9bq" }, "ntfy-matrix-bot": { "type": "Git", @@ -168,9 +169,9 @@ "repo": "rust-overlay" }, "branch": "master", - "revision": "8ef3f6a8f5af867ab5f75fc86fbd934a6351820b", - "url": "https://github.com/oxalica/rust-overlay/archive/8ef3f6a8f5af867ab5f75fc86fbd934a6351820b.tar.gz", - "hash": "0ibalz3camr9fxrmfxf6asbdbxgkh8iifd2qnxb0xzizka9wr33x" + "revision": "025e1742de4fa75b3fb63818bd9726d17da6a102", + "url": "https://github.com/oxalica/rust-overlay/archive/025e1742de4fa75b3fb63818bd9726d17da6a102.tar.gz", + "hash": "1agph0jrrz4dx3k025psvg9h0zbls8imr0wivrgnhczihwgfliy3" }, "showrt": { "type": "Git", @@ -190,10 +191,10 @@ "repo_path": "simple-nixos-mailserver/nixos-mailserver", "server": "https://gitlab.com/" }, - "branch": "nixos-23.11", - "revision": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", - "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=e47f3719f1db3e0961a4358d4cb234a0acaa7baf", - "hash": "122vm4n3gkvlkqmlskiq749bhwfd0r71v6vcmg1bbyg4998brvx8" + "branch": "nixos-24.05", + "revision": "b51ae1a235353ffdfa9f5874e6aea32e367a5739", + "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=b51ae1a235353ffdfa9f5874e6aea32e367a5739", + "hash": "0w97jdxjyavx78q32dda9mf93lzq7qcvj0kjl5lr8knyrjqm562h" }, "sops-nix": { "type": "Git", @@ -203,9 +204,9 @@ "repo": "sops-nix" }, "branch": "master", - "revision": "962797a8d7f15ed7033031731d0bb77244839960", - "url": "https://github.com/Mic92/sops-nix/archive/962797a8d7f15ed7033031731d0bb77244839960.tar.gz", - "hash": "0mbq58xik1dbxcbqf1sz42nq2h6i3h68d7iy4izllrivl1syh0mh" + "revision": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", + "url": "https://github.com/Mic92/sops-nix/archive/ab2a43b0d21d1d37d4d5726a892f714eaeb4b075.tar.gz", + "hash": "0421fifd50fxb0k0mir68rs78v7ljmhkbdpzsp4lmr9hmxzvd43i" }, "traveltext": { "type": "Git", -- cgit v1.2.3