Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
18ca52de87
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
|
@ -28,7 +28,7 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
|
|||
- made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
|
||||
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
|
||||
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
|
||||
- [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)
|
||||
- [22.05 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2205-release-notes)
|
||||
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
|
||||
- [ ] (Module updates) Added a release notes entry if the change is significant
|
||||
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
|
||||
|
|
|
|||
33
.github/workflows/editorconfig.yml
vendored
33
.github/workflows/editorconfig.yml
vendored
|
|
@ -13,30 +13,33 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- name: Get list of changed files from PR
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
echo 'PR_DIFF<<EOF' >> $GITHUB_ENV
|
||||
gh api \
|
||||
repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \
|
||||
| jq '.[] | select(.status != "removed") | .filename' \
|
||||
>> $GITHUB_ENV
|
||||
echo 'EOF' >> $GITHUB_ENV
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
if: env.PR_DIFF
|
||||
- uses: cachix/install-nix-action@v16
|
||||
if: env.PR_DIFF
|
||||
with:
|
||||
# nixpkgs commit is pinned so that it doesn't break
|
||||
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz
|
||||
- name: install editorconfig-checker
|
||||
run: nix-env -iA editorconfig-checker -f '<nixpkgs>'
|
||||
- name: Get list of changed files from PR
|
||||
run: |
|
||||
git fetch origin --depth 1 ${{ github.event.pull_request.head.sha }}
|
||||
git checkout ${{ github.event.pull_request.head.sha }}
|
||||
|
||||
git fetch origin --depth 1 ${{ github.event.pull_request.base.sha }}
|
||||
git checkout ${{ github.event.pull_request.base.sha }}
|
||||
|
||||
git fetch origin --depth 1 pull/${{ github.event.pull_request.number }}/merge
|
||||
# check this out last as editorconfig should check this commit
|
||||
git checkout FETCH_HEAD
|
||||
|
||||
# everything except --diff-filter=D (deleted)
|
||||
git diff --diff-filter=ACMRTUXB --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > $HOME/changed_files
|
||||
if: env.PR_DIFF
|
||||
- name: Checking EditorConfig
|
||||
if: env.PR_DIFF
|
||||
run: |
|
||||
cat $HOME/changed_files | xargs -r editorconfig-checker -disable-indent-size
|
||||
echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size
|
||||
- if: ${{ failure() }}
|
||||
run: |
|
||||
echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."
|
||||
|
|
|
|||
|
|
@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi
|
|||
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
|
||||
|
||||
1. Take note of the commits in which the change was introduced into `master` branch.
|
||||
2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`.
|
||||
2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`.
|
||||
3. Create a branch for your change, e.g. `git checkout -b backport`.
|
||||
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
|
||||
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
|
||||
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-21.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[21.11]`.
|
||||
6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
|
||||
|
||||
## Criteria for Backporting changes
|
||||
|
|
@ -68,17 +68,17 @@ Anything that does not cause user or downstream dependency regressions can be ba
|
|||
- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
|
||||
- Security critical applications (E.g. `firefox`)
|
||||
|
||||
## Generating 21.11 Release Notes
|
||||
## Generating 22.05 Release Notes
|
||||
|
||||
(This section also applies to backporting 21.05 release notes: substitute "rl-2111" for "rl-2105".)
|
||||
(This section also applies to backporting 21.11 release notes: substitute "rl-2205" for "rl-2111".)
|
||||
|
||||
Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document.
|
||||
|
||||
Steps for updating 21.11 Release notes:
|
||||
Steps for updating 22.05 Release notes:
|
||||
|
||||
1. Edit `nixos/doc/manual/release-notes/rl-2111.section.md` with the desired changes
|
||||
2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2111.section.xml`
|
||||
3. Include changes to `rl-2111.section.md` and `rl-2111.section.xml` in the same commit.
|
||||
1. Edit `nixos/doc/manual/release-notes/rl-2205.section.md` with the desired changes
|
||||
2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2205.section.xml`
|
||||
3. Include changes to `rl-2205.section.md` and `rl-2205.section.xml` in the same commit.
|
||||
|
||||
## Reviewing contributions
|
||||
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
|
|||
system, [Hydra](https://hydra.nixos.org/).
|
||||
|
||||
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
|
||||
* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05)
|
||||
* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)
|
||||
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
|
||||
* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents)
|
||||
* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)
|
||||
|
||||
Artifacts successfully built with Hydra are published to cache at
|
||||
https://cache.nixos.org/. When successful build and test criteria are
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<listitem>
|
||||
<para>
|
||||
<emphasis>Stable channels</emphasis>, such as
|
||||
<link xlink:href="https://nixos.org/channels/nixos-21.05"><literal>nixos-21.05</literal></link>.
|
||||
<link xlink:href="https://nixos.org/channels/nixos-21.11"><literal>nixos-21.11</literal></link>.
|
||||
These only get conservative bug fixes and package upgrades. For
|
||||
instance, a channel update may cause the Linux kernel on your
|
||||
system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix),
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
<listitem>
|
||||
<para>
|
||||
<emphasis>Small channels</emphasis>, such as
|
||||
<link xlink:href="https://nixos.org/channels/nixos-21.05-small"><literal>nixos-21.05-small</literal></link>
|
||||
<link xlink:href="https://nixos.org/channels/nixos-21.11-small"><literal>nixos-21.11-small</literal></link>
|
||||
or
|
||||
<link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>.
|
||||
These are identical to the stable and unstable channels
|
||||
|
|
@ -60,8 +60,8 @@
|
|||
<para>
|
||||
When you first install NixOS, you’re automatically subscribed to the
|
||||
NixOS channel that corresponds to your installation source. For
|
||||
instance, if you installed from a 21.05 ISO, you will be subscribed
|
||||
to the <literal>nixos-21.05</literal> channel. To see which NixOS
|
||||
instance, if you installed from a 21.11 ISO, you will be subscribed
|
||||
to the <literal>nixos-21.11</literal> channel. To see which NixOS
|
||||
channel you’re subscribed to, run the following as root:
|
||||
</para>
|
||||
<programlisting>
|
||||
|
|
@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable
|
|||
</programlisting>
|
||||
<para>
|
||||
(Be sure to include the <literal>nixos</literal> parameter at the
|
||||
end.) For instance, to use the NixOS 21.05 stable channel:
|
||||
end.) For instance, to use the NixOS 21.11 stable channel:
|
||||
</para>
|
||||
<programlisting>
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
|
||||
</programlisting>
|
||||
<para>
|
||||
If you have a server, you may want to use the <quote>small</quote>
|
||||
channel instead:
|
||||
</para>
|
||||
<programlisting>
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
|
||||
</programlisting>
|
||||
<para>
|
||||
And if you want to live on the bleeding edge:
|
||||
|
|
@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true;
|
|||
also specify a channel explicitly, e.g.
|
||||
</para>
|
||||
<programlisting language="bash">
|
||||
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05;
|
||||
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
|
||||
</programlisting>
|
||||
</section>
|
||||
</chapter>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.11">
|
||||
<title>Release 21.11 (“Porcupine”, 2021.11/??)</title>
|
||||
<title>Release 21.11 (“Porcupine”, 2021/11/30)</title>
|
||||
<para>
|
||||
In addition to numerous new and upgraded packages, this release has
|
||||
the following highlights:
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
kOps now defaults to 1.21.1, which uses containerd as the
|
||||
kops now defaults to 1.21.1, which uses containerd as the
|
||||
default runtime.
|
||||
</para>
|
||||
</listitem>
|
||||
|
|
@ -84,13 +84,13 @@
|
|||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Activation scripts can now opt int to be run when running
|
||||
<literal>nixos-rebuild dry-activate</literal> and detect the
|
||||
dry activation by reading <literal>$NIXOS_ACTION</literal>.
|
||||
This allows activation scripts to output what they would
|
||||
change if the activation was really run. The users/modules
|
||||
activation script supports this and outputs some of is
|
||||
actions.
|
||||
Activation scripts can now, optionally, be run during a
|
||||
<literal>nixos-rebuild dry-activate</literal> and can detect
|
||||
the dry activation by reading
|
||||
<literal>$NIXOS_ACTION</literal>. This allows activation
|
||||
scripts to output what they would change if the activation was
|
||||
really run. The users/modules activation script supports this
|
||||
and outputs some of is actions.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated
|
|||
automatically from NixOS's Git repository after certain tests have
|
||||
passed and all packages have been built. These channels are:
|
||||
|
||||
- *Stable channels*, such as [`nixos-21.05`](https://nixos.org/channels/nixos-21.05).
|
||||
- *Stable channels*, such as [`nixos-21.11`](https://nixos.org/channels/nixos-21.11).
|
||||
These only get conservative bug fixes and package upgrades. For
|
||||
instance, a channel update may cause the Linux kernel on your system
|
||||
to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not
|
||||
|
|
@ -19,7 +19,7 @@ passed and all packages have been built. These channels are:
|
|||
radical changes between channel updates. It's not recommended for
|
||||
production systems.
|
||||
|
||||
- *Small channels*, such as [`nixos-21.05-small`](https://nixos.org/channels/nixos-21.05-small)
|
||||
- *Small channels*, such as [`nixos-21.11-small`](https://nixos.org/channels/nixos-21.11-small)
|
||||
or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small).
|
||||
These are identical to the stable and unstable channels described above,
|
||||
except that they contain fewer binary packages. This means they get updated
|
||||
|
|
@ -38,8 +38,8 @@ newest supported stable release.
|
|||
|
||||
When you first install NixOS, you're automatically subscribed to the
|
||||
NixOS channel that corresponds to your installation source. For
|
||||
instance, if you installed from a 21.05 ISO, you will be subscribed to
|
||||
the `nixos-21.05` channel. To see which NixOS channel you're subscribed
|
||||
instance, if you installed from a 21.11 ISO, you will be subscribed to
|
||||
the `nixos-21.11` channel. To see which NixOS channel you're subscribed
|
||||
to, run the following as root:
|
||||
|
||||
```ShellSession
|
||||
|
|
@ -54,16 +54,16 @@ To switch to a different NixOS channel, do
|
|||
```
|
||||
|
||||
(Be sure to include the `nixos` parameter at the end.) For instance, to
|
||||
use the NixOS 21.05 stable channel:
|
||||
use the NixOS 21.11 stable channel:
|
||||
|
||||
```ShellSession
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
|
||||
```
|
||||
|
||||
If you have a server, you may want to use the "small" channel instead:
|
||||
|
||||
```ShellSession
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos
|
||||
# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
|
||||
```
|
||||
|
||||
And if you want to live on the bleeding edge:
|
||||
|
|
@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel
|
|||
modules. You can also specify a channel explicitly, e.g.
|
||||
|
||||
```nix
|
||||
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05;
|
||||
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Release 21.11 (“Porcupine”, 2021.11/??) {#sec-release-21.11}
|
||||
# Release 21.11 (“Porcupine”, 2021/11/30) {#sec-release-21.11}
|
||||
|
||||
In addition to numerous new and upgraded packages, this release has the following highlights:
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- PHP now defaults to PHP 8.0, updated from 7.4.
|
||||
|
||||
- kOps now defaults to 1.21.1, which uses containerd as the default runtime.
|
||||
- kops now defaults to 1.21.1, which uses containerd as the default runtime.
|
||||
|
||||
- `python3` now defaults to Python 3.9, updated from Python 3.8.
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- Hadoop now defaults to Hadoop 3, updated from 2.
|
||||
- JournalNode, ZKFS and HTTPFS services have been added.
|
||||
|
||||
- Activation scripts can now opt int to be run when running `nixos-rebuild dry-activate` and detect the dry activation by reading `$NIXOS_ACTION`.
|
||||
- Activation scripts can now, optionally, be run during a `nixos-rebuild dry-activate` and can detect the dry activation by reading `$NIXOS_ACTION`.
|
||||
This allows activation scripts to output what they would change if the activation was really run.
|
||||
The users/modules activation script supports this and outputs some of is actions.
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,5 @@ with lib;
|
|||
boot.loader.systemd-boot.consoleMode = mkDefault "1";
|
||||
|
||||
# TODO Find reasonable defaults X11 & wayland
|
||||
services.xserver.dpi = lib.mkDefault 192;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -354,8 +354,8 @@ let
|
|||
createPartitions = ''
|
||||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||
+ " mkpart primary ext2 1M 50MB" # /boot
|
||||
+ " mkpart primary linux-swap 50M 1024M"
|
||||
+ " mkpart primary ext2 1M 100MB" # /boot
|
||||
+ " mkpart primary linux-swap 100M 1024M"
|
||||
+ " mkpart primary 1024M -1s", # LUKS
|
||||
"udevadm settle",
|
||||
"mkswap /dev/vda2 -L swap",
|
||||
|
|
@ -456,9 +456,9 @@ in {
|
|||
createPartitions = ''
|
||||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel gpt"
|
||||
+ " mkpart ESP fat32 1M 50MiB" # /boot
|
||||
+ " mkpart ESP fat32 1M 100MiB" # /boot
|
||||
+ " set 1 boot on"
|
||||
+ " mkpart primary linux-swap 50MiB 1024MiB"
|
||||
+ " mkpart primary linux-swap 100MiB 1024MiB"
|
||||
+ " mkpart primary ext2 1024MiB -1MiB", # /
|
||||
"udevadm settle",
|
||||
"mkswap /dev/vda2 -L swap",
|
||||
|
|
@ -483,8 +483,8 @@ in {
|
|||
createPartitions = ''
|
||||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||
+ " mkpart primary ext2 1M 50MB" # /boot
|
||||
+ " mkpart primary linux-swap 50MB 1024M"
|
||||
+ " mkpart primary ext2 1M 100MB" # /boot
|
||||
+ " mkpart primary linux-swap 100MB 1024M"
|
||||
+ " mkpart primary ext2 1024M -1s", # /
|
||||
"udevadm settle",
|
||||
"mkswap /dev/vda2 -L swap",
|
||||
|
|
@ -503,8 +503,8 @@ in {
|
|||
createPartitions = ''
|
||||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||
+ " mkpart primary ext2 1M 50MB" # /boot
|
||||
+ " mkpart primary linux-swap 50MB 1024M"
|
||||
+ " mkpart primary ext2 1M 100MB" # /boot
|
||||
+ " mkpart primary linux-swap 100MB 1024M"
|
||||
+ " mkpart primary ext2 1024M -1s", # /
|
||||
"udevadm settle",
|
||||
"mkswap /dev/vda2 -L swap",
|
||||
|
|
@ -599,8 +599,8 @@ in {
|
|||
createPartitions = ''
|
||||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda -- mklabel msdos"
|
||||
+ " mkpart primary ext2 1M 50MB" # /boot
|
||||
+ " mkpart primary linux-swap 50M 1024M"
|
||||
+ " mkpart primary ext2 1M 100MB" # /boot
|
||||
+ " mkpart primary linux-swap 100M 1024M"
|
||||
+ " mkpart primary 1024M 1280M" # LUKS with keyfile
|
||||
+ " mkpart primary 1280M -1s",
|
||||
"udevadm settle",
|
||||
|
|
@ -674,8 +674,8 @@ in {
|
|||
machine.succeed(
|
||||
"flock /dev/vda parted --script /dev/vda --"
|
||||
+ " mklabel msdos"
|
||||
+ " mkpart primary ext2 1M 50MB" # /boot
|
||||
+ " mkpart primary 50MB 512MB " # swap
|
||||
+ " mkpart primary ext2 1M 100MB" # /boot
|
||||
+ " mkpart primary 100MB 512MB " # swap
|
||||
+ " mkpart primary 512MB 1024MB" # Cache (typically SSD)
|
||||
+ " mkpart primary 1024MB -1s ", # Backing device (typically HDD)
|
||||
"modprobe bcache",
|
||||
|
|
|
|||
6
pkgs/build-support/emacs/mk-wrapper-subdirs.el
Normal file
6
pkgs/build-support/emacs/mk-wrapper-subdirs.el
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
(defmacro mk-subdirs-expr (path)
|
||||
`(setq load-path
|
||||
(delete-dups (append '(,path)
|
||||
',(let ((default-directory path))
|
||||
(normal-top-level-add-subdirs-to-load-path))
|
||||
load-path))))
|
||||
|
|
@ -165,8 +165,13 @@ runCommand
|
|||
(add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/")
|
||||
''}
|
||||
EOF
|
||||
# Link subdirs.el from the emacs distribution
|
||||
ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs
|
||||
|
||||
# Generate a subdirs.el that statically adds all subdirectories to load-path.
|
||||
$emacs/bin/emacs \
|
||||
--batch \
|
||||
--load ${./mk-wrapper-subdirs.el} \
|
||||
--eval "(prin1 (macroexpand-1 '(mk-subdirs-expr \"$out/share/emacs/site-lisp\")))" \
|
||||
> "$subdirs"
|
||||
|
||||
# Byte-compiling improves start-up time only slightly, but costs nothing.
|
||||
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ stdenv.mkDerivation {
|
|||
src = fetchFromGitHub {
|
||||
owner = "frogatto";
|
||||
repo = "frogatto";
|
||||
# master branch as of 2020-12-17
|
||||
rev = "8b0f2bc8f9f172f6225b8e0d806552cb94f35e2a";
|
||||
sha256 = "09nrna9l1zj2ma2bazdhdvphwy570kfz4br4xgpwq21rsjrvrqiy";
|
||||
# master branch as of 2021-11-29
|
||||
rev = "82d3dafa0cfeaad016a427bdbc729eb9509748f1";
|
||||
sha256 = "0fmwn584xl0vafcsh72b4xnryfqyjxk5zhmymg5i8rzp6h03n8xq";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -744,7 +744,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-DiCQpgyz0iNEm6gjaJU5IGdsQISHhPqlDQBzZafngjY=";
|
||||
cargoSha256 = "sha256-XFo3FLaeLnXVQAEZol9PipqYYZ9C1z23S/qijxf0uIE=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
|
|
|||
Loading…
Reference in a new issue