PapaTutuWawa/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake: Bump nixpkgs

Browse Source
This commit is contained in:
PapaTutuWawa 2022-01-06 13:25:26 +01:00
parent a94e9bcef3
commit a7ce2b9372
3 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
flake.lock
View File

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1634404028, "lastModified": 1640802000,
"narHash": "sha256-JyP2Y6JCCYvUcVz7CXX5pXUfTGTU4GX51Yza82BgMfk=", "narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "53aa91b4170da35a96fab1577c9a34bc0da44e27", "rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
}, },
"emacs": { "emacs": {
"locked": { "locked": {
"lastModified": 1638668516, "lastModified": 1641205295,
"narHash": "sha256-u67dzO+HVWlimD6OSXSajvkU6/c7fGp4faC48uCln7k=", "narHash": "sha256-DG1JHIBWfLu9wLXcyRyHeQCmbWjtHNKMWSEjJQrYfAU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "bd45e439c084c145d67272419eaf96b978f5c2ce", "rev": "150c09f3e3029b4d2f0ceecee2bf3d5148404767",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1634851050, "lastModified": 1638122382,
"narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,11 +68,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1638571010, "lastModified": 1641121012,
"narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=", "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "781d25b315def05cd7ede3765226c54216f0b1fe", "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1634544068, "lastModified": 1638281721,
"narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=", "narHash": "sha256-d3vAVFG6zov9NwjSuYntBiD+I5KjJLwX09c7uAzbONI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f", "rev": "7329ffc6e911106494183557fc249180d5422929",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +103,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1636812815, "lastModified": 1640808801,
"narHash": "sha256-OG4/4cD2sGNM+ROaYhczwUJ3YCtzaIgX96rFjCs85JE=", "narHash": "sha256-iHo8vyuYyhbk5MGfwn/7IahF8dBAwUYTZga4u0UsqPQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "00df1e57bb9c7551b45a11c70f5472d0cbfbfff7", "rev": "29d781b47b0ee6014abd541c132c647d18ab098e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,41 +121,57 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1629707199, "lastModified": 1639947939,
"narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=", "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"owner": "nmattia", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "df71f5e4babda41cd919a8684b72218e2e809fa9", "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nmattia", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1635881984, "lastModified": 1640686209,
"narHash": "sha256-m6qai5HI+5/4uqSAiR1JceKQrimu/H3iOOn3BXWw3Rc=", "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixos-hardware_2": {
"locked": {
"lastModified": 1637957946,
"narHash": "sha256-zhAql8UR2R/88VCEjvzoVpcFi3k4gkhJayNuYNZaWMY=",
"owner": "ostylk", "owner": "ostylk",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b4238e8fb309c2d4ea1038423e9c47c5005aa0e6", "rev": "bf27ac0017bb06c950f2f59a1213329382cb47c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ostylk", "owner": "ostylk",
"ref": "surface-test", "ref": "surface-update",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1638198142, "lastModified": 1638698569,
"narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
"path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source", "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
"rev": "8a308775674e178495767df90c419425474582a1", "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -165,11 +181,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1636800699, "lastModified": 1640540585,
"narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=", "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fa862644fc15ecb525eb8cd0a60276f1c340c7c", "rev": "ac169ec6371f0d835542db654a65e0f2feb07838",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,11 +197,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1638698569, "lastModified": 1641210259,
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=", "narHash": "sha256-O7oWcTw9WY/gbZPPqDpNYOAeT4bOK+1rtYC9ZaevTT0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35", "rev": "18c84ea816348e2a098390101b92d1e39a9dbd45",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,10 +226,10 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1638198142, "lastModified": 1638698569,
"narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
"path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source", "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
"rev": "8a308775674e178495767df90c419425474582a1", "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -223,11 +239,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1636855248, "lastModified": 1640653651,
"narHash": "sha256-ISyGm3p9uNvSqsgguK6+Pr0IDJ3pik14wTHZXfF3e/s=", "narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2", "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,10 +255,10 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1638198142, "lastModified": 1638698569,
"narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
"path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source", "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
"rev": "8a308775674e178495767df90c419425474582a1", "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -252,11 +268,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1638564543, "lastModified": 1640929225,
"narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=", "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4", "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,11 +284,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1638683309, "lastModified": 1641198127,
"narHash": "sha256-KH8l/3/Ptvw4t7fzMO9hb5RmrAK7KNiFM9hqBG1YgMs=", "narHash": "sha256-V5beyGlEIPoA5tGRHR8HKgUNOfq2Pk/pMRJsTDe5aH0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "64e93e9e68325ed12029732bac269ada92ff65f5", "rev": "f3540de5479a029dbf289232611800e3a83c6913",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,17 +303,17 @@
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware_2",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"rnix-lsp": "rnix-lsp" "rnix-lsp": "rnix-lsp"
}, },
"locked": { "locked": {
"lastModified": 1636987186, "lastModified": 1641167986,
"narHash": "sha256-uJ0Px5gvwtXF+HoGhMnN6Sel30XFcJUhhZfqXPFh6/A=", "narHash": "sha256-3rsvxh53szG4Bsi+Z9soKUeQ0mkPIIXRKLcd7ixhGH8=",
"ref": "master", "ref": "master",
"rev": "44b8e77f43d9aadf31d8d696cf514784cc6a01eb", "rev": "f433548e1182c66e5fe403b80dc213a09c630455",
"revCount": 143, "revCount": 155,
"type": "git", "type": "git",
"url": "https://dev.ostylk.de/NixDistro/Config" "url": "https://dev.ostylk.de/NixDistro/Config"
}, },
@ -313,11 +329,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1636977689, "lastModified": 1640347520,
"narHash": "sha256-pQmAxKBoEhC851iRsowMErz9CYiJxGpARjhPeSapH1Y=", "narHash": "sha256-UkieGBW9ap0pQbumYoG60Ed+BpzMRGuLQ6Zb41u7Fkk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "rnix-lsp", "repo": "rnix-lsp",
"rev": "9462b0d20325a06f7e43b5a0469ec2c92e60f5fe", "rev": "d7cc2887ac9e65dd01715aac472edbf46b93ed31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,6 +348,7 @@
"emacs": "emacs", "emacs": "emacs",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nur": "nur", "nur": "nur",
"ostylk": "ostylk", "ostylk": "ostylk",
@ -340,11 +357,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1638564543, "lastModified": 1640929225,
"narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=", "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4", "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -4,12 +4,12 @@
inputs = { inputs = {
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
#nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/master";
stable.url = "github:nixos/nixpkgs/nixos-21.05"; stable.url = "github:nixos/nixpkgs/nixos-21.05";
emacs.url = "github:nix-community/emacs-overlay"; emacs.url = "github:nix-community/emacs-overlay";
nur.url = "github:nix-community/nur"; nur.url = "github:nix-community/nur";
ostylk.url = "git+https://dev.ostylk.de/NixDistro/Config"; ostylk.url = "git+https://dev.ostylk.de/NixDistro/Config";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };
outputs = { outputs = {

18
overlays/simple.nix
View File

@ -1,24 +1,14 @@
final: prev: final: prev:
let {
# NOTE: For some reason --fs-screen-name and --screen-name are not in /*
# 0.33.1. So wait and then remove this. mpv = prev.wrapMpv mpv {
mpv-git = prev.mpv-unwrapped.overrideAttrs (old: {
version = "0.34.0";
src = builtins.fetchGit {
url = "https://github.com/mpv-player/mpv.git";
ref = "master";
rev = "0b56e1c00a57fdb767674462c299a5c973a9e373";
};
patches = [];
});
in {
mpv = prev.wrapMpv mpv-git {
# Prevent the need for prefixing mpv with DRI_PRIME=1 # Prevent the need for prefixing mpv with DRI_PRIME=1
extraMakeWrapperArgs = [ extraMakeWrapperArgs = [
"--set" "DRI_PRIME" "1" "--set" "DRI_PRIME" "1"
]; ];
}; };
*/
gajim = prev.gajim.overrideAttrs (old: { gajim = prev.gajim.overrideAttrs (old: {
# Enable notification sounds # Enable notification sounds