lol

doc: remove useless `rec`

+148 -150
+4 -3
doc/languages-frameworks/emscripten.section.md
··· 41 41 (pkgs.zlib.override { 42 42 stdenv = pkgs.emscriptenStdenv; 43 43 }).overrideAttrs 44 - (old: rec { 44 + (old: { 45 45 buildInputs = old.buildInputs ++ [ pkg-config ]; 46 46 # we need to reset this setting! 47 47 env = (old.env or { }) // { ··· 119 119 This `xmlmirror` example features an Emscripten package that is defined completely from this context and no `pkgs.zlib.override` is used. 120 120 121 121 ```nix 122 - pkgs.buildEmscriptenPackage rec { 123 - name = "xmlmirror"; 122 + pkgs.buildEmscriptenPackage { 123 + pname = "xmlmirror"; 124 + version = "1.2.3"; 124 125 125 126 buildInputs = [ 126 127 pkg-config
+65 -66
doc/packages/emacs.section.md
··· 28 28 29 29 ```nix 30 30 { 31 - packageOverrides = 32 - pkgs: with pkgs; rec { 33 - myEmacsConfig = writeText "default.el" '' 34 - (eval-when-compile 35 - (require 'use-package)) 31 + packageOverrides = pkgs: { 32 + myEmacsConfig = pkgs.writeText "default.el" '' 33 + (eval-when-compile 34 + (require 'use-package)) 36 35 37 - ;; load some packages 36 + ;; load some packages 38 37 39 - (use-package company 40 - :bind ("<C-tab>" . company-complete) 41 - :diminish company-mode 42 - :commands (company-mode global-company-mode) 43 - :defer 1 44 - :config 45 - (global-company-mode)) 38 + (use-package company 39 + :bind ("<C-tab>" . company-complete) 40 + :diminish company-mode 41 + :commands (company-mode global-company-mode) 42 + :defer 1 43 + :config 44 + (global-company-mode)) 46 45 47 - (use-package counsel 48 - :commands (counsel-descbinds) 49 - :bind (([remap execute-extended-command] . counsel-M-x) 50 - ("C-x C-f" . counsel-find-file) 51 - ("C-c g" . counsel-git) 52 - ("C-c j" . counsel-git-grep) 53 - ("C-c k" . counsel-ag) 54 - ("C-x l" . counsel-locate) 55 - ("M-y" . counsel-yank-pop))) 46 + (use-package counsel 47 + :commands (counsel-descbinds) 48 + :bind (([remap execute-extended-command] . counsel-M-x) 49 + ("C-x C-f" . counsel-find-file) 50 + ("C-c g" . counsel-git) 51 + ("C-c j" . counsel-git-grep) 52 + ("C-c k" . counsel-ag) 53 + ("C-x l" . counsel-locate) 54 + ("M-y" . counsel-yank-pop))) 56 55 57 - (use-package flycheck 58 - :defer 2 59 - :config (global-flycheck-mode)) 56 + (use-package flycheck 57 + :defer 2 58 + :config (global-flycheck-mode)) 60 59 61 - (use-package ivy 62 - :defer 1 63 - :bind (("C-c C-r" . ivy-resume) 64 - ("C-x C-b" . ivy-switch-buffer) 65 - :map ivy-minibuffer-map 66 - ("C-j" . ivy-call)) 67 - :diminish ivy-mode 68 - :commands ivy-mode 69 - :config 70 - (ivy-mode 1)) 60 + (use-package ivy 61 + :defer 1 62 + :bind (("C-c C-r" . ivy-resume) 63 + ("C-x C-b" . ivy-switch-buffer) 64 + :map ivy-minibuffer-map 65 + ("C-j" . ivy-call)) 66 + :diminish ivy-mode 67 + :commands ivy-mode 68 + :config 69 + (ivy-mode 1)) 71 70 72 - (use-package magit 73 - :defer 74 - :if (executable-find "git") 75 - :bind (("C-x g" . magit-status) 76 - ("C-x G" . magit-dispatch-popup)) 77 - :init 78 - (setq magit-completing-read-function 'ivy-completing-read)) 71 + (use-package magit 72 + :defer 73 + :if (executable-find "git") 74 + :bind (("C-x g" . magit-status) 75 + ("C-x G" . magit-dispatch-popup)) 76 + :init 77 + (setq magit-completing-read-function 'ivy-completing-read)) 79 78 80 - (use-package projectile 81 - :commands projectile-mode 82 - :bind-keymap ("C-c p" . projectile-command-map) 83 - :defer 5 84 - :config 85 - (projectile-global-mode)) 86 - ''; 79 + (use-package projectile 80 + :commands projectile-mode 81 + :bind-keymap ("C-c p" . projectile-command-map) 82 + :defer 5 83 + :config 84 + (projectile-global-mode)) 85 + ''; 87 86 88 - myEmacs = emacs.pkgs.withPackages ( 89 - epkgs: 90 - (with epkgs.melpaStablePackages; [ 91 - (runCommand "default.el" { } '' 92 - mkdir -p $out/share/emacs/site-lisp 93 - cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el 94 - '') 95 - company 96 - counsel 97 - flycheck 98 - ivy 99 - magit 100 - projectile 101 - use-package 102 - ]) 103 - ); 104 - }; 87 + myEmacs = emacs.pkgs.withPackages ( 88 + epkgs: 89 + (with epkgs.melpaStablePackages; [ 90 + (runCommand "default.el" { } '' 91 + mkdir -p $out/share/emacs/site-lisp 92 + cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el 93 + '') 94 + company 95 + counsel 96 + flycheck 97 + ivy 98 + magit 99 + projectile 100 + use-package 101 + ]) 102 + ); 103 + }; 105 104 } 106 105 ``` 107 106
+79 -81
doc/using/configuration.chapter.md
··· 300 300 301 301 ```nix 302 302 { 303 - packageOverrides = 304 - pkgs: with pkgs; rec { 305 - myProfile = writeText "my-profile" '' 306 - export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin 307 - export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man 308 - ''; 309 - myPackages = pkgs.buildEnv { 310 - name = "my-packages"; 311 - paths = [ 312 - (runCommand "profile" { } '' 313 - mkdir -p $out/etc/profile.d 314 - cp ${myProfile} $out/etc/profile.d/my-profile.sh 315 - '') 316 - aspell 317 - bc 318 - coreutils 319 - ffmpeg 320 - man 321 - nix 322 - emscripten 323 - jq 324 - nox 325 - silver-searcher 326 - ]; 327 - pathsToLink = [ 328 - "/share/man" 329 - "/share/doc" 330 - "/bin" 331 - "/etc" 332 - ]; 333 - extraOutputsToInstall = [ 334 - "man" 335 - "doc" 336 - ]; 337 - }; 303 + packageOverrides = pkgs: { 304 + myProfile = pkgs.writeText "my-profile" '' 305 + export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin 306 + export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man 307 + ''; 308 + myPackages = pkgs.buildEnv { 309 + name = "my-packages"; 310 + paths = with pkgs; [ 311 + (runCommand "profile" { } '' 312 + mkdir -p $out/etc/profile.d 313 + cp ${myProfile} $out/etc/profile.d/my-profile.sh 314 + '') 315 + aspell 316 + bc 317 + coreutils 318 + ffmpeg 319 + man 320 + nix 321 + emscripten 322 + jq 323 + nox 324 + silver-searcher 325 + ]; 326 + pathsToLink = [ 327 + "/share/man" 328 + "/share/doc" 329 + "/bin" 330 + "/etc" 331 + ]; 332 + extraOutputsToInstall = [ 333 + "man" 334 + "doc" 335 + ]; 338 336 }; 337 + }; 339 338 } 340 339 ``` 341 340 ··· 360 359 361 360 ```nix 362 361 { 363 - packageOverrides = 364 - pkgs: with pkgs; rec { 365 - myProfile = writeText "my-profile" '' 366 - export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin 367 - export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man 368 - export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info 362 + packageOverrides = pkgs: { 363 + myProfile = pkgs.writeText "my-profile" '' 364 + export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin 365 + export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man 366 + export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info 367 + ''; 368 + myPackages = pkgs.buildEnv { 369 + name = "my-packages"; 370 + paths = with pkgs; [ 371 + (runCommand "profile" { } '' 372 + mkdir -p $out/etc/profile.d 373 + cp ${myProfile} $out/etc/profile.d/my-profile.sh 374 + '') 375 + aspell 376 + bc 377 + coreutils 378 + ffmpeg 379 + man 380 + nix 381 + emscripten 382 + jq 383 + nox 384 + silver-searcher 385 + texinfoInteractive 386 + ]; 387 + pathsToLink = [ 388 + "/share/man" 389 + "/share/doc" 390 + "/share/info" 391 + "/bin" 392 + "/etc" 393 + ]; 394 + extraOutputsToInstall = [ 395 + "man" 396 + "doc" 397 + "info" 398 + ]; 399 + postBuild = '' 400 + if [ -x $out/bin/install-info -a -w $out/share/info ]; then 401 + shopt -s nullglob 402 + for i in $out/share/info/*.info $out/share/info/*.info.gz; do 403 + $out/bin/install-info $i $out/share/info/dir 404 + done 405 + fi 369 406 ''; 370 - myPackages = pkgs.buildEnv { 371 - name = "my-packages"; 372 - paths = [ 373 - (runCommand "profile" { } '' 374 - mkdir -p $out/etc/profile.d 375 - cp ${myProfile} $out/etc/profile.d/my-profile.sh 376 - '') 377 - aspell 378 - bc 379 - coreutils 380 - ffmpeg 381 - man 382 - nix 383 - emscripten 384 - jq 385 - nox 386 - silver-searcher 387 - texinfoInteractive 388 - ]; 389 - pathsToLink = [ 390 - "/share/man" 391 - "/share/doc" 392 - "/share/info" 393 - "/bin" 394 - "/etc" 395 - ]; 396 - extraOutputsToInstall = [ 397 - "man" 398 - "doc" 399 - "info" 400 - ]; 401 - postBuild = '' 402 - if [ -x $out/bin/install-info -a -w $out/share/info ]; then 403 - shopt -s nullglob 404 - for i in $out/share/info/*.info $out/share/info/*.info.gz; do 405 - $out/bin/install-info $i $out/share/info/dir 406 - done 407 - fi 408 - ''; 409 - }; 410 407 }; 408 + }; 411 409 } 412 410 ``` 413 411