ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade to 22.05

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2022-05-31 11:21:19 +02:00
parent 117af6bf8c
commit 895939b377
Failed to extract signature
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
flake.lock generated
View File

@ -21,7 +21,7 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
], ],
"utils": [ "utils": [
"flake-utils-plus", "flake-utils-plus",
@ -73,17 +73,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653236640, "lastModified": 1653971985,
"narHash": "sha256-Bcfp3mXCT4rLGH8QFu21SAoOG0zb4CEIH4RI1w1m290=", "narHash": "sha256-BxahBocT7OuJkAOV3LwLTaAjhoBQOZnnpaVCswGVLXM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "6dadf0d6dd983d4fcb5c688e98340e1441a0a74d", "rev": "563a7a4b38efb5c99ef4638bfa8064136c05b19f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "6dadf0d6dd983d4fcb5c688e98340e1441a0a74d",
"type": "github" "type": "github"
} }
}, },
@ -158,16 +157,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1651519540, "lastModified": 1653937612,
"narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", "narHash": "sha256-HybwffYKOM3UwlY54ZVCZgX7o5xpp2KhbZyyOnvwFMo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.11", "ref": "release-22.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -219,11 +218,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1652510778, "lastModified": 1653936575,
"narHash": "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o=", "narHash": "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "65cd26eebbbf80eaf0d74092f09b737606cb4b5a", "rev": "daa14b89103b1246e8d7297ffe8ac5b4f4c8c45c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,16 +250,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653830209, "lastModified": 1653920503,
"narHash": "sha256-V+HnLKJzvk2HZcLUKt9z2puZ46vLo74chOakxbLfXek=", "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc257c49c495b2d0d7d40c5753a452d0abc8adf3", "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-21.11", "ref": "nixos-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -344,11 +343,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1653581809, "lastModified": 1653845079,
"narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", "narHash": "sha256-7ghaQZ+7JXLI9FgNH8+RQHAt3/ubT92j8NtjZleP6t4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "rev": "b62ada430501de88dfbb08cea4eb98ead3a5e3e7",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View File

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nix = { nix = {
@ -17,7 +17,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-21.11"; url = "github:nix-community/home-manager/release-22.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -27,7 +27,7 @@
}; };
emacs-overlay = { emacs-overlay = {
url = "github:nix-community/emacs-overlay?rev=6dadf0d6dd983d4fcb5c688e98340e1441a0a74d"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -48,9 +48,8 @@
comma = { comma = {
url = "github:nix-community/comma"; url = "github:nix-community/comma";
# TODO: change to nixpkgs when updating to NixOS-22.05;
inputs = { inputs = {
nixpkgs.follows = "nixpkgs-unstable"; nixpkgs.follows = "nixpkgs";
utils.follows = "flake-utils-plus/flake-utils"; utils.follows = "flake-utils-plus/flake-utils";
}; };
}; };

2
modules/emacs/default.nix
View File

@ -53,7 +53,7 @@ let
free-keys free-keys
highlight-indentation highlight-indentation
helm helm
# helm-bbdb helm-bbdb
helm-company helm-company
helm-flx helm-flx
helm-descbinds helm-descbinds