diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
| commit | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (patch) | |
| tree | 982675c7719f2060a550e80747dfa49c1a9d6b06 /pkgs/top-level/release.nix | |
| parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
| parent | 81760f32353fa7f309a49fda17d90f43ac1e9a42 (diff) | |
| download | nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.gz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.bz2 nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.lz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.xz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.zst nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3437f620c74..9ae5a9e1fbd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -192,7 +192,7 @@ let # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 - #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg; + #emacsPackages = packagePlatforms pkgs.emacsPackages; #rPackages = packagePlatforms pkgs.rPackages; ocamlPackages = { }; perlPackages = { }; |