Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f6bfb371cba2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e4d710b1c94b
Choose a head ref
  • 19 commits
  • 15 files changed
  • 12 contributors

Commits on May 6, 2020

  1. vdagent: fixing 90s timeout on shutdown

    sjau committed May 6, 2020
    Copy the full SHA
    facbf40 View commit details

Commits on May 8, 2020

  1. dockerTools.buildImage: Preserve environment variables from the paren… 

    …t image
    @utdemir
    utdemir committed May 8, 2020
    Copy the full SHA
    f5a90a7 View commit details

Commits on May 11, 2020

  1. elpa-packages: 2020-05-11

    @rasendubi
    rasendubi committed May 11, 2020

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    7f50c31 View commit details

  2. melpa-packages: 2020-05-11

    @rasendubi
    rasendubi committed May 11, 2020

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    4fc6c5e View commit details

  3. melpa-packages: mention update-from-overlay script

    @rasendubi
    rasendubi committed May 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f90f557 View commit details

Commits on May 15, 2020

  1. r-statmod: Add libiconv to buildInputs

    @mcwitt
    mcwitt committed May 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5b3f0c4 View commit details

  2. bs-platform: 7.3.1 -> 7.3.2

    @anmonteiro
    anmonteiro committed May 15, 2020
    Copy the full SHA
    90e5b2a View commit details

  3. gitAndTools.git-absorb: 0.5.0 -> 0.6.0

    @marsam
    marsam committed May 15, 2020
    Copy the full SHA
    415e3ec View commit details

  4. Merge pull request #87860 from mcwitt/mcwitt/statmod-add-libiconv 

    r-statmod: Add libiconv to buildInputs
    @peti
    peti authored May 15, 2020
    Copy the full SHA
    c956b59 View commit details

  5. Merge pull request #87253 from utdemir/dockertools-preserve-env 

    Preserve environment variables from the parent image on dockerTools.buildImage
    @nlewo
    nlewo authored May 15, 2020
    Copy the full SHA
    98a723e View commit details

  6. Sylk: 2.7.0 -> 2.7.2

    @leenaars
    leenaars committed May 15, 2020
    Copy the full SHA
    0a4f1bc View commit details

  7. Merge pull request #85853 from sjau/vdagent_timeout 

    vdagent: fixing 90s timeout on shutdown
    @Mic92
    Mic92 authored May 15, 2020
    Copy the full SHA
    4de5006 View commit details

  8. Merge pull request #87862 from anmonteiro/anmonteiro/bs-platform-7.3.2

    @Mic92
    Mic92 authored May 15, 2020
    Copy the full SHA
    9b3129e View commit details

  9. Merge pull request #87873 from leenaars/sylk272 

    Sylk: 2.7.0 -> 2.7.2
    @Mic92
    Mic92 authored May 15, 2020
    Copy the full SHA
    84f5d69 View commit details

  10. Merge pull request #87874 from marsam/update-git-absorb 

    gitAndTools.git-absorb: 0.5.0 -> 0.6.0
    @Mic92
    Mic92 authored May 15, 2020
    Copy the full SHA
    2ab9b44 View commit details

  11. gopls: 0.4.0 -> 0.4.1

    @cryptix
    cryptix committed May 15, 2020
    Copy the full SHA
    24a6c81 View commit details

  12. darktable: Remove doc directory from output 

    It puts very generic file names in the store like
`$out/share/doc/README.md` which has a high risk of collisions.
    @adisbladis
    adisbladis committed May 15, 2020
    Copy the full SHA
    730133e View commit details

  13. Merge pull request #87876 from cryptix/update-gopls

    @Mic92
    Mic92 authored May 15, 2020
    Copy the full SHA
    2645339 View commit details

  14. Merge pull request #87409 from rasendubi/melpa-2020-05-09 

    melpa-packages: 2020-05-11
    @adisbladis
    adisbladis authored May 15, 2020
    Copy the full SHA
    e4d710b View commit details
10 changes: 10 additions & 0 deletions nixos/tests/docker-tools.nix
View file
Original file line number Diff line number Diff line change
@@ -124,6 +124,16 @@ import ./make-test-python.nix ({ pkgs, ... }: {
f"docker run --rm ${examples.layersOrder.imageName} cat /tmp/layer{index}"
)
with subtest("Ensure environment variables are correctly inherited"):
docker.succeed(
"docker load --input='${examples.environmentVariables}'"
)
out = docker.succeed("docker run --rm ${examples.environmentVariables.imageName} env")
env = out.splitlines()
assert "FROM_PARENT=true" in env, "envvars from the parent should be preserved"
assert "FROM_CHILD=true" in env, "envvars from the child should be preserved"
assert "LAST_LAYER=child" in env, "envvars from the child should take priority"
with subtest("Ensure image with only 2 layers can be loaded"):
docker.succeed(
"docker load --input='${examples.two-layered-image}'"
93 changes: 54 additions & 39 deletions pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions pkgs/applications/editors/emacs-modes/elpa-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,16 @@ To update the list of packages from MELPA,
2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`.
3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix`
## Update from overlay
Alternatively, run the following command:
./update-from-overlay
It will update both melpa and elpa packages using
https://github.com/nix-community/emacs-overlay. It's almost
instantenous and formats commits for you.
*/

{ lib, stdenv, texinfo }:
10 changes: 10 additions & 0 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,16 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json`
## Update from overlay
Alternatively, run the following command:
./update-from-overlay
It will update both melpa and elpa packages using
https://github.com/nix-community/emacs-overlay. It's almost
instantenous and formats commits for you.
*/

{ lib, external, pkgs }: variant: self: let
Loading