diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:03:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:03:26 +0200 |
| commit | 2e4b4e33002f28c0a2551c1cde09632ac2987008 (patch) | |
| tree | 4e96356d858101b1f8dfecd528d4436e15506cb9 /pkgs/build-support | |
| parent | c8d064eec16122db9a727c0bba971c2bf80a6bc0 (diff) | |
| parent | 1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/fetchmavenartifact/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 25f068cd3fa08..1f2fbd8068e7b 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -174,7 +174,7 @@ runCommand mkdir -p $out/share # Link icons and desktop files into place - for dir in applications icons info man; do + for dir in applications icons info man emacs; do ln -s $emacs/share/$dir $out/share/$dir done '' diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index d7ad406943be5..583a9ea396cfa 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -3,7 +3,7 @@ { fetchurl, stdenv }: let defaultRepos = [ - "http://central.maven.org/maven2" + "http://repo1.maven.org/maven2" "http://oss.sonatype.org/content/repositories/releases" "http://oss.sonatype.org/content/repositories/public" "http://repo.typesafe.com/typesafe/releases" diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 4e8b0aa99a8f1..0eba8816b6387 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -426,7 +426,6 @@ # Maven Central maven = [ "https://repo1.maven.org/maven2/" - "https://central.maven.org/maven2/" ]; # Alsa Project |