Skip to content

Commit d2d9070

Browse files
committed
upgrade nixpkgs
1 parent 28c2fff commit d2d9070

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

nix/configuration.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ in {
567567
zip
568568
unzip
569569
pciutils
570+
docker-client
570571
docker-compose
571572
htop
572573
lsof

nix/sources.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@
55
"homepage": "https://input-output-hk.github.io/haskell.nix",
66
"owner": "input-output-hk",
77
"repo": "haskell.nix",
8-
"rev": "c9a0b679f6ebfbb3542e23e188ce6139a842b933",
9-
"sha256": "1dqwv7p37g30qv6zyhlhvyi60bap21asgdh9a5ka6n5cr46n52sb",
8+
"rev": "55b597cbba1d472959b6b9ce9a0881fad1a9b297",
9+
"sha256": "196hp2jd5y4kafnwbsbws327wg5g88hw4knqfvx0vfxp9q8dv1hc",
1010
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/haskell.nix/archive/c9a0b679f6ebfbb3542e23e188ce6139a842b933.tar.gz",
11+
"url": "https://github.com/input-output-hk/haskell.nix/archive/55b597cbba1d472959b6b9ce9a0881fad1a9b297.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"newpkgs": {
15-
"branch": "release-24.05",
15+
"branch": "release-24.11",
1616
"description": "Nix Packages collection",
1717
"homepage": "",
1818
"owner": "NixOS",
1919
"repo": "nixpkgs",
20-
"rev": "ade5beb99e18b4d14873b980e0cac0beb58c85c9",
21-
"sha256": "0fs53jzabj05i6z91br3bpxz68z66qn5pr1wcb2jw81nah3nrarg",
20+
"rev": "32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b",
21+
"sha256": "0y3ap96m352id5r3kj8i7xcslpy4sg350nbyipzbihgjdvr8hnwa",
2222
"type": "tarball",
23-
"url": "https://github.com/NixOS/nixpkgs/archive/ade5beb99e18b4d14873b980e0cac0beb58c85c9.tar.gz",
23+
"url": "https://github.com/NixOS/nixpkgs/archive/32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b.tar.gz",
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"nixpkgs": {
27-
"branch": "release-24.05",
27+
"branch": "release-24.11",
2828
"description": "Nix Packages collection",
2929
"homepage": "",
3030
"owner": "NixOS",
3131
"repo": "nixpkgs",
32-
"rev": "ade5beb99e18b4d14873b980e0cac0beb58c85c9",
33-
"sha256": "0fs53jzabj05i6z91br3bpxz68z66qn5pr1wcb2jw81nah3nrarg",
32+
"rev": "32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b",
33+
"sha256": "0y3ap96m352id5r3kj8i7xcslpy4sg350nbyipzbihgjdvr8hnwa",
3434
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/ade5beb99e18b4d14873b980e0cac0beb58c85c9.tar.gz",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/32a1c7b1a5c57a9c9810bcdc8d7141b92fd0cb6b.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"nixpkgs-unstable": {
@@ -41,10 +41,10 @@
4141
"homepage": "",
4242
"owner": "NixOS",
4343
"repo": "nixpkgs",
44-
"rev": "85f7e662eda4fa3a995556527c87b2524b691933",
45-
"sha256": "1p8qam6pixcin63wai3y55bcyfi1i8525s1hh17177cqchh1j117",
44+
"rev": "93ff48c9be84a76319dac293733df09bbbe3f25c",
45+
"sha256": "038m7932v4z0zn2lk7k7mbqbank30q84r1viyhchw9pcm3aq3q23",
4646
"type": "tarball",
47-
"url": "https://github.com/NixOS/nixpkgs/archive/85f7e662eda4fa3a995556527c87b2524b691933.tar.gz",
47+
"url": "https://github.com/NixOS/nixpkgs/archive/93ff48c9be84a76319dac293733df09bbbe3f25c.tar.gz",
4848
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949
}
5050
}

prv

Submodule prv updated from c7a52cc to 200d188

pub/vi/nix/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ in
5050
customRC =
5151
''
5252
set runtimepath+=${vi-src}
53-
let $PATH.=':${silver-searcher}/bin:${nodejs}/bin:${less}/bin:${lesspipeWrapper}/bin:${python311Packages.grip}/bin:${xdg_utils}/bin:${git}/bin:${jre8}/bin'
53+
let $PATH.=':${silver-searcher}/bin:${nodejs}/bin:${less}/bin:${lesspipeWrapper}/bin:${python311Packages.grip}/bin:${xdg-utils}/bin:${git}/bin:${jre8}/bin'
5454
let g:vimBackground = '${vimBackground}'
5555
let g:vimColorScheme = '${vimColorScheme}'
5656
let g:languagetool_jar='${languagetool}/share/languagetool-commandline.jar'

pub/vi/nix/shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ in
44
{
55
mini ? true,
66
vimBackground ? "light",
7-
vimColorScheme ? "everforest",
7+
vimColorScheme ? "PaperColor",
88
}:
99
with pkgs; let
1010
pkg = import ./. {

pub/vi/vimrc.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,8 @@ endif
387387

388388
syntax on
389389
set t_Co=256
390-
exe 'colorscheme ' . get(g:, "vimColorScheme", "everforest")
390+
set notermguicolors
391+
exe 'colorscheme ' . get(g:, "vimColorScheme", "PaperColor")
391392
nnoremap <silent> <esc> :noh<return><esc>
392393
nnoremap <esc>^[ <esc>^[
393394
nnoremap <space> <Nop>

0 commit comments

Comments
 (0)