commit 30eb01e120bfa3180542bf6fade9b35c970913f8 · pyrox.dev/nixpkgs

+4 -3

doc/languages-frameworks/emscripten.section.md

···

       41
       41
        
       (pkgs.zlib.override {

     

       42
       42
        
         stdenv = pkgs.emscriptenStdenv;

     

       43
       43
        
       }).overrideAttrs

     

       44
       44
       -
         (old: rec {

     

       44
       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
       122
       -
       pkgs.buildEmscriptenPackage rec {

     

       123
       123
       -
         name = "xmlmirror";

     

       122
       122
       +
       pkgs.buildEmscriptenPackage {

     

       123
       123
       +
         pname = "xmlmirror";

     

       124
       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
       31
       -
         packageOverrides =

     

       32
       32
       -
           pkgs: with pkgs; rec {

     

       33
       33
       -
             myEmacsConfig = writeText "default.el" ''

     

       34
       34
       -
               (eval-when-compile

     

       35
       35
       -
                 (require 'use-package))

     

       31
       31
       +
         packageOverrides = pkgs: {

     

       32
       32
       +
           myEmacsConfig = pkgs.writeText "default.el" ''

     

       33
       33
       +
             (eval-when-compile

     

       34
       34
       +
               (require 'use-package))

     

       36
       35
        
       

     

       37
       37
       -
               ;; load some packages

     

       36
       36
       +
             ;; load some packages

     

       38
       37
        
       

     

       39
       39
       -
               (use-package company

     

       40
       40
       -
                 :bind ("<C-tab>" . company-complete)

     

       41
       41
       -
                 :diminish company-mode

     

       42
       42
       -
                 :commands (company-mode global-company-mode)

     

       43
       43
       -
                 :defer 1

     

       44
       44
       -
                 :config

     

       45
       45
       -
                 (global-company-mode))

     

       38
       38
       +
             (use-package company

     

       39
       39
       +
               :bind ("<C-tab>" . company-complete)

     

       40
       40
       +
               :diminish company-mode

     

       41
       41
       +
               :commands (company-mode global-company-mode)

     

       42
       42
       +
               :defer 1

     

       43
       43
       +
               :config

     

       44
       44
       +
               (global-company-mode))

     

       46
       45
        
       

     

       47
       47
       -
               (use-package counsel

     

       48
       48
       -
                 :commands (counsel-descbinds)

     

       49
       49
       -
                 :bind (([remap execute-extended-command] . counsel-M-x)

     

       50
       50
       -
                        ("C-x C-f" . counsel-find-file)

     

       51
       51
       -
                        ("C-c g" . counsel-git)

     

       52
       52
       -
                        ("C-c j" . counsel-git-grep)

     

       53
       53
       -
                        ("C-c k" . counsel-ag)

     

       54
       54
       -
                        ("C-x l" . counsel-locate)

     

       55
       55
       -
                        ("M-y" . counsel-yank-pop)))

     

       46
       46
       +
             (use-package counsel

     

       47
       47
       +
               :commands (counsel-descbinds)

     

       48
       48
       +
               :bind (([remap execute-extended-command] . counsel-M-x)

     

       49
       49
       +
                      ("C-x C-f" . counsel-find-file)

     

       50
       50
       +
                      ("C-c g" . counsel-git)

     

       51
       51
       +
                      ("C-c j" . counsel-git-grep)

     

       52
       52
       +
                      ("C-c k" . counsel-ag)

     

       53
       53
       +
                      ("C-x l" . counsel-locate)

     

       54
       54
       +
                      ("M-y" . counsel-yank-pop)))

     

       56
       55
        
       

     

       57
       57
       -
               (use-package flycheck

     

       58
       58
       -
                 :defer 2

     

       59
       59
       -
                 :config (global-flycheck-mode))

     

       56
       56
       +
             (use-package flycheck

     

       57
       57
       +
               :defer 2

     

       58
       58
       +
               :config (global-flycheck-mode))

     

       60
       59
        
       

     

       61
       61
       -
               (use-package ivy

     

       62
       62
       -
                 :defer 1

     

       63
       63
       -
                 :bind (("C-c C-r" . ivy-resume)

     

       64
       64
       -
                        ("C-x C-b" . ivy-switch-buffer)

     

       65
       65
       -
                        :map ivy-minibuffer-map

     

       66
       66
       -
                        ("C-j" . ivy-call))

     

       67
       67
       -
                 :diminish ivy-mode

     

       68
       68
       -
                 :commands ivy-mode

     

       69
       69
       -
                 :config

     

       70
       70
       -
                 (ivy-mode 1))

     

       60
       60
       +
             (use-package ivy

     

       61
       61
       +
               :defer 1

     

       62
       62
       +
               :bind (("C-c C-r" . ivy-resume)

     

       63
       63
       +
                      ("C-x C-b" . ivy-switch-buffer)

     

       64
       64
       +
                      :map ivy-minibuffer-map

     

       65
       65
       +
                      ("C-j" . ivy-call))

     

       66
       66
       +
               :diminish ivy-mode

     

       67
       67
       +
               :commands ivy-mode

     

       68
       68
       +
               :config

     

       69
       69
       +
               (ivy-mode 1))

     

       71
       70
        
       

     

       72
       72
       -
               (use-package magit

     

       73
       73
       -
                 :defer

     

       74
       74
       -
                 :if (executable-find "git")

     

       75
       75
       -
                 :bind (("C-x g" . magit-status)

     

       76
       76
       -
                        ("C-x G" . magit-dispatch-popup))

     

       77
       77
       -
                 :init

     

       78
       78
       -
                 (setq magit-completing-read-function 'ivy-completing-read))

     

       71
       71
       +
             (use-package magit

     

       72
       72
       +
               :defer

     

       73
       73
       +
               :if (executable-find "git")

     

       74
       74
       +
               :bind (("C-x g" . magit-status)

     

       75
       75
       +
                      ("C-x G" . magit-dispatch-popup))

     

       76
       76
       +
               :init

     

       77
       77
       +
               (setq magit-completing-read-function 'ivy-completing-read))

     

       79
       78
        
       

     

       80
       80
       -
               (use-package projectile

     

       81
       81
       -
                 :commands projectile-mode

     

       82
       82
       -
                 :bind-keymap ("C-c p" . projectile-command-map)

     

       83
       83
       -
                 :defer 5

     

       84
       84
       -
                 :config

     

       85
       85
       -
                 (projectile-global-mode))

     

       86
       86
       -
             '';

     

       79
       79
       +
             (use-package projectile

     

       80
       80
       +
               :commands projectile-mode

     

       81
       81
       +
               :bind-keymap ("C-c p" . projectile-command-map)

     

       82
       82
       +
               :defer 5

     

       83
       83
       +
               :config

     

       84
       84
       +
               (projectile-global-mode))

     

       85
       85
       +
           '';

     

       87
       86
        
       

     

       88
       88
       -
             myEmacs = emacs.pkgs.withPackages (

     

       89
       89
       -
               epkgs:

     

       90
       90
       -
               (with epkgs.melpaStablePackages; [

     

       91
       91
       -
                 (runCommand "default.el" { } ''

     

       92
       92
       -
                   mkdir -p $out/share/emacs/site-lisp

     

       93
       93
       -
                   cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el

     

       94
       94
       -
                 '')

     

       95
       95
       -
                 company

     

       96
       96
       -
                 counsel

     

       97
       97
       -
                 flycheck

     

       98
       98
       -
                 ivy

     

       99
       99
       -
                 magit

     

       100
       100
       -
                 projectile

     

       101
       101
       -
                 use-package

     

       102
       102
       -
               ])

     

       103
       103
       -
             );

     

       104
       104
       -
           };

     

       87
       87
       +
           myEmacs = emacs.pkgs.withPackages (

     

       88
       88
       +
             epkgs:

     

       89
       89
       +
             (with epkgs.melpaStablePackages; [

     

       90
       90
       +
               (runCommand "default.el" { } ''

     

       91
       91
       +
                 mkdir -p $out/share/emacs/site-lisp

     

       92
       92
       +
                 cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el

     

       93
       93
       +
               '')

     

       94
       94
       +
               company

     

       95
       95
       +
               counsel

     

       96
       96
       +
               flycheck

     

       97
       97
       +
               ivy

     

       98
       98
       +
               magit

     

       99
       99
       +
               projectile

     

       100
       100
       +
               use-package

     

       101
       101
       +
             ])

     

       102
       102
       +
           );

     

       103
       103
       +
         };

     

       105
       104
        
       }

     

       106
       105
        
       ```

     

       107
       106

+79 -81

doc/using/configuration.chapter.md

···

       300
       300
        
       

     

       301
       301
        
       ```nix

     

       302
       302
        
       {

     

       303
       303
       -
         packageOverrides =

     

       304
       304
       -
           pkgs: with pkgs; rec {

     

       305
       305
       -
             myProfile = writeText "my-profile" ''

     

       306
       306
       -
               export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin

     

       307
       307
       -
               export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man

     

       308
       308
       -
             '';

     

       309
       309
       -
             myPackages = pkgs.buildEnv {

     

       310
       310
       -
               name = "my-packages";

     

       311
       311
       -
               paths = [

     

       312
       312
       -
                 (runCommand "profile" { } ''

     

       313
       313
       -
                   mkdir -p $out/etc/profile.d

     

       314
       314
       -
                   cp ${myProfile} $out/etc/profile.d/my-profile.sh

     

       315
       315
       -
                 '')

     

       316
       316
       -
                 aspell

     

       317
       317
       -
                 bc

     

       318
       318
       -
                 coreutils

     

       319
       319
       -
                 ffmpeg

     

       320
       320
       -
                 man

     

       321
       321
       -
                 nix

     

       322
       322
       -
                 emscripten

     

       323
       323
       -
                 jq

     

       324
       324
       -
                 nox

     

       325
       325
       -
                 silver-searcher

     

       326
       326
       -
               ];

     

       327
       327
       -
               pathsToLink = [

     

       328
       328
       -
                 "/share/man"

     

       329
       329
       -
                 "/share/doc"

     

       330
       330
       -
                 "/bin"

     

       331
       331
       -
                 "/etc"

     

       332
       332
       -
               ];

     

       333
       333
       -
               extraOutputsToInstall = [

     

       334
       334
       -
                 "man"

     

       335
       335
       -
                 "doc"

     

       336
       336
       -
               ];

     

       337
       337
       -
             };

     

       303
       303
       +
         packageOverrides = pkgs: {

     

       304
       304
       +
           myProfile = pkgs.writeText "my-profile" ''

     

       305
       305
       +
             export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin

     

       306
       306
       +
             export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man

     

       307
       307
       +
           '';

     

       308
       308
       +
           myPackages = pkgs.buildEnv {

     

       309
       309
       +
             name = "my-packages";

     

       310
       310
       +
             paths = with pkgs; [

     

       311
       311
       +
               (runCommand "profile" { } ''

     

       312
       312
       +
                 mkdir -p $out/etc/profile.d

     

       313
       313
       +
                 cp ${myProfile} $out/etc/profile.d/my-profile.sh

     

       314
       314
       +
               '')

     

       315
       315
       +
               aspell

     

       316
       316
       +
               bc

     

       317
       317
       +
               coreutils

     

       318
       318
       +
               ffmpeg

     

       319
       319
       +
               man

     

       320
       320
       +
               nix

     

       321
       321
       +
               emscripten

     

       322
       322
       +
               jq

     

       323
       323
       +
               nox

     

       324
       324
       +
               silver-searcher

     

       325
       325
       +
             ];

     

       326
       326
       +
             pathsToLink = [

     

       327
       327
       +
               "/share/man"

     

       328
       328
       +
               "/share/doc"

     

       329
       329
       +
               "/bin"

     

       330
       330
       +
               "/etc"

     

       331
       331
       +
             ];

     

       332
       332
       +
             extraOutputsToInstall = [

     

       333
       333
       +
               "man"

     

       334
       334
       +
               "doc"

     

       335
       335
       +
             ];

     

       338
       336
        
           };

     

       337
       337
       +
         };

     

       339
       338
        
       }

     

       340
       339
        
       ```

     

       341
       340
        
       

     
···

       360
       359
        
       

     

       361
       360
        
       ```nix

     

       362
       361
        
       {

     

       363
       363
       -
         packageOverrides =

     

       364
       364
       -
           pkgs: with pkgs; rec {

     

       365
       365
       -
             myProfile = writeText "my-profile" ''

     

       366
       366
       -
               export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin

     

       367
       367
       -
               export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man

     

       368
       368
       -
               export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info

     

       362
       362
       +
         packageOverrides = pkgs: {

     

       363
       363
       +
           myProfile = pkgs.writeText "my-profile" ''

     

       364
       364
       +
             export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin

     

       365
       365
       +
             export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man

     

       366
       366
       +
             export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info

     

       367
       367
       +
           '';

     

       368
       368
       +
           myPackages = pkgs.buildEnv {

     

       369
       369
       +
             name = "my-packages";

     

       370
       370
       +
             paths = with pkgs; [

     

       371
       371
       +
               (runCommand "profile" { } ''

     

       372
       372
       +
                 mkdir -p $out/etc/profile.d

     

       373
       373
       +
                 cp ${myProfile} $out/etc/profile.d/my-profile.sh

     

       374
       374
       +
               '')

     

       375
       375
       +
               aspell

     

       376
       376
       +
               bc

     

       377
       377
       +
               coreutils

     

       378
       378
       +
               ffmpeg

     

       379
       379
       +
               man

     

       380
       380
       +
               nix

     

       381
       381
       +
               emscripten

     

       382
       382
       +
               jq

     

       383
       383
       +
               nox

     

       384
       384
       +
               silver-searcher

     

       385
       385
       +
               texinfoInteractive

     

       386
       386
       +
             ];

     

       387
       387
       +
             pathsToLink = [

     

       388
       388
       +
               "/share/man"

     

       389
       389
       +
               "/share/doc"

     

       390
       390
       +
               "/share/info"

     

       391
       391
       +
               "/bin"

     

       392
       392
       +
               "/etc"

     

       393
       393
       +
             ];

     

       394
       394
       +
             extraOutputsToInstall = [

     

       395
       395
       +
               "man"

     

       396
       396
       +
               "doc"

     

       397
       397
       +
               "info"

     

       398
       398
       +
             ];

     

       399
       399
       +
             postBuild = ''

     

       400
       400
       +
               if [ -x $out/bin/install-info -a -w $out/share/info ]; then

     

       401
       401
       +
                 shopt -s nullglob

     

       402
       402
       +
                 for i in $out/share/info/*.info $out/share/info/*.info.gz; do

     

       403
       403
       +
                     $out/bin/install-info $i $out/share/info/dir

     

       404
       404
       +
                 done

     

       405
       405
       +
               fi

     

       369
       406
        
             '';

     

       370
       370
       -
             myPackages = pkgs.buildEnv {

     

       371
       371
       -
               name = "my-packages";

     

       372
       372
       -
               paths = [

     

       373
       373
       -
                 (runCommand "profile" { } ''

     

       374
       374
       -
                   mkdir -p $out/etc/profile.d

     

       375
       375
       -
                   cp ${myProfile} $out/etc/profile.d/my-profile.sh

     

       376
       376
       -
                 '')

     

       377
       377
       -
                 aspell

     

       378
       378
       -
                 bc

     

       379
       379
       -
                 coreutils

     

       380
       380
       -
                 ffmpeg

     

       381
       381
       -
                 man

     

       382
       382
       -
                 nix

     

       383
       383
       -
                 emscripten

     

       384
       384
       -
                 jq

     

       385
       385
       -
                 nox

     

       386
       386
       -
                 silver-searcher

     

       387
       387
       -
                 texinfoInteractive

     

       388
       388
       -
               ];

     

       389
       389
       -
               pathsToLink = [

     

       390
       390
       -
                 "/share/man"

     

       391
       391
       -
                 "/share/doc"

     

       392
       392
       -
                 "/share/info"

     

       393
       393
       -
                 "/bin"

     

       394
       394
       -
                 "/etc"

     

       395
       395
       -
               ];

     

       396
       396
       -
               extraOutputsToInstall = [

     

       397
       397
       -
                 "man"

     

       398
       398
       -
                 "doc"

     

       399
       399
       -
                 "info"

     

       400
       400
       -
               ];

     

       401
       401
       -
               postBuild = ''

     

       402
       402
       -
                 if [ -x $out/bin/install-info -a -w $out/share/info ]; then

     

       403
       403
       -
                   shopt -s nullglob

     

       404
       404
       -
                   for i in $out/share/info/*.info $out/share/info/*.info.gz; do

     

       405
       405
       -
                       $out/bin/install-info $i $out/share/info/dir

     

       406
       406
       -
                   done

     

       407
       407
       -
                 fi

     

       408
       408
       -
               '';

     

       409
       409
       -
             };

     

       410
       407
        
           };

     

       408
       408
       +
         };

     

       411
       409
        
       }

     

       412
       410
        
       ```

     

       413
       411