mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
This commit is contained in:
Vladimír Čunát
commit
024407bf9a
@ -88,7 +88,8 @@ in
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Extra configuration text appended to <filename>ssh_config</filename>.
|
||||
Extra configuration text prepended to <filename>ssh_config</filename>. Other generated
|
||||
options will be added after a <code>Host *</code> pattern.
|
||||
See <citerefentry><refentrytitle>ssh_config</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
for help.
|
||||
'';
|
||||
@ -203,6 +204,11 @@ in
|
||||
# generation in the sshd service.
|
||||
environment.etc."ssh/ssh_config".text =
|
||||
''
|
||||
# Custom options from `extraConfig`, to override generated options
|
||||
${cfg.extraConfig}
|
||||
|
||||
# Generated options from other settings
|
||||
Host *
|
||||
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
|
||||
|
||||
${optionalString cfg.setXAuthLocation ''
|
||||
@ -213,8 +219,6 @@ in
|
||||
|
||||
${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
|
||||
${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"}
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
environment.etc."ssh/ssh_known_hosts".text = knownHostsText;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kakoune-unstable-${version}";
|
||||
name = "kakoune-${version}";
|
||||
version = "2019.01.20";
|
||||
src = fetchFromGitHub {
|
||||
repo = "kakoune";
|
||||
|
||||
@ -33,7 +33,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slic3r-prusa-edition-${version}";
|
||||
version = "1.41.2";
|
||||
version = "1.41.3";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "Slic3r";
|
||||
sha256 = "046ircwc0wr586v7106ys557ypslmyq9p4qgi34ads1d6bgxhlyy";
|
||||
sha256 = "145dfsv610c5p0sngab9z7lzbk5383pq9l26mrrpf1wxdlxgljpl";
|
||||
rev = "version_${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "1kbcn8yzgrn41d12806bsycnw6xyjbgv4d8nk0y4x2hymg34vc2k";
|
||||
sha256bin64 = "0irafrmz9c3s8bdkqkwhj96v090ynvvbs50qzcdmidw8iqh2x1f8";
|
||||
version = "73.0.3683.27";
|
||||
sha256 = "0gd426a9xcgs8a9286gavziysq6fw1ilaifsna396dbdm8b571wi";
|
||||
sha256bin64 = "05p20l0969rppbyn7965k78ccynng47rg7d7h7piqiwnm6ffg9yx";
|
||||
version = "73.0.3683.39";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "0gyzil473kn7mqpa1dp3pai0x7vk8rw2bkqr3z0p33fx2g7b7y5s";
|
||||
sha256bin64 = "1clr6xr08mmzmi71jy5ri4b2cp4qaf5apynbd9gnrp6qiy04rmn2";
|
||||
version = "73.0.3683.20";
|
||||
sha256 = "1yyzhw5zv803ysdj7zf0imdw9cf0mdlw30vphcb59a93nnvhkbb7";
|
||||
sha256bin64 = "1a1dswkfc4x2rslkb899fgywv5mfrmcp1d8wxy7h034504r8gy87";
|
||||
version = "74.0.3702.0";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "0fxavi4nwfiyb15lqm02vlq6kb8i4ipxnd7hp45bm7jdmhmgbnmj";
|
||||
sha256bin64 = "1gz1ga8d3a4q1n6bdb79wv8ldlksvj0mlnrs5k1safwzlv11prsx";
|
||||
version = "72.0.3626.96";
|
||||
sha256 = "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp";
|
||||
sha256bin64 = "0azyhnmdg3grladpkpsv67zxqiqf5a3x9qjfj8h831kh7i7m3gy8";
|
||||
version = "72.0.3626.109";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ with stdenv.lib;
|
||||
let
|
||||
bits = "x86_64";
|
||||
|
||||
version = "4.5.10";
|
||||
version = "4.7.1";
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
name = "Wavebox";
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
name = "wavebox-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
|
||||
sha256 = "0863x3gyzzbm6qs26j821b4iy596cc2h7ppdj6hq5rgr7c01ac9k";
|
||||
sha256 = "0kyi84wdvd5363vx7bhss3cmc8kfdkrs6h8q51hscrja3qabp0bg";
|
||||
};
|
||||
|
||||
# don't remove runtime deps
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dump1090-${version}";
|
||||
pname = "dump1090";
|
||||
version = "2014-10-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MalcolmRobb";
|
||||
repo = "dump1090";
|
||||
repo = pname;
|
||||
rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe";
|
||||
sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy";
|
||||
};
|
||||
@ -10,13 +10,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "sway";
|
||||
version = "1.0-rc2";
|
||||
version = "1.0-rc3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "sway";
|
||||
rev = version;
|
||||
sha256 = "052if3nagmwg5zh79nhrq75fbc9v2x950lcs1mal52p801qiv8f1";
|
||||
sha256 = "1ixwc1bg725x68qr84s8a5i4rlzc4svc52jgdw1yl5bgr6l1k5zc";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -783,7 +783,7 @@ rec {
|
||||
imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
|
||||
manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
|
||||
|
||||
for layerTar in $(cat ./layer-list); do
|
||||
for layerTar in $(tac ./layer-list); do
|
||||
layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
|
||||
imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
|
||||
imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
|
||||
|
||||
12
pkgs/development/compilers/ocaml/4.08.nix
Normal file
12
pkgs/development/compilers/ocaml/4.08.nix
Normal file
@ -0,0 +1,12 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "08";
|
||||
patch_version = "0+beta1";
|
||||
sha256 = "1jgvp4pyhrg27wqpsx88kacw3ymjiz44nms9lzbh5s8pp05z5f5f";
|
||||
|
||||
# If the executable is stripped it does not work
|
||||
dontStrip = true;
|
||||
|
||||
# Breaks build with Clang
|
||||
hardeningDisable = [ "strictoverflow" ];
|
||||
}
|
||||
@ -41,8 +41,10 @@ stdenv.mkDerivation (args // rec {
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = optionals useX11 [ "-x11lib" x11lib
|
||||
"-x11include" x11inc ]
|
||||
configureFlags = optionals useX11 (
|
||||
if stdenv.lib.versionAtLeast version "4.08"
|
||||
then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
|
||||
else [ "-x11lib" x11lib "-x11include" x11inc ])
|
||||
++ optional flambdaSupport "-flambda"
|
||||
;
|
||||
|
||||
|
||||
@ -1225,7 +1225,7 @@ self: super: {
|
||||
|
||||
# Use latest pandoc despite what LTS says.
|
||||
# Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
|
||||
pandoc = dontCheck super.pandoc_2_6;
|
||||
pandoc = doDistribute (dontCheck super.pandoc_2_6);
|
||||
pandoc-citeproc = self.pandoc-citeproc_0_16_1;
|
||||
|
||||
# https://github.com/qfpl/tasty-hedgehog/issues/24
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From cb5b020a8d38f77209d0472a0fea755299a8ec78 Mon Sep 17 00:00:00 2001
|
||||
From: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Date: Thu, 14 Feb 2019 15:02:18 -0800
|
||||
Subject: Revert "exec: load_script: don't blindly truncate shebang string"
|
||||
|
||||
This reverts commit 8099b047ecc431518b9bb6bdbba3549bbecdc343.
|
||||
|
||||
It turns out that people do actually depend on the shebang string being
|
||||
truncated, and on the fact that an interpreter (like perl) will often
|
||||
just re-interpret it entirely to get the full argument list.
|
||||
|
||||
Reported-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||
Acked-by: Kees Cook <keescook@chromium.org>
|
||||
Cc: Oleg Nesterov <oleg@redhat.com>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
fs/binfmt_script.c | 10 +++-------
|
||||
1 file changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
|
||||
index d0078cbb718b..7cde3f46ad26 100644
|
||||
--- a/fs/binfmt_script.c
|
||||
+++ b/fs/binfmt_script.c
|
||||
@@ -42,14 +42,10 @@ static int load_script(struct linux_binprm *bprm)
|
||||
fput(bprm->file);
|
||||
bprm->file = NULL;
|
||||
|
||||
- for (cp = bprm->buf+2;; cp++) {
|
||||
- if (cp >= bprm->buf + BINPRM_BUF_SIZE)
|
||||
- return -ENOEXEC;
|
||||
- if (!*cp || (*cp == '\n'))
|
||||
- break;
|
||||
- }
|
||||
+ bprm->buf[BINPRM_BUF_SIZE - 1] = '\0';
|
||||
+ if ((cp = strchr(bprm->buf, '\n')) == NULL)
|
||||
+ cp = bprm->buf+BINPRM_BUF_SIZE-1;
|
||||
*cp = '\0';
|
||||
-
|
||||
while (cp > bprm->buf) {
|
||||
cp--;
|
||||
if ((*cp == ' ') || (*cp == '\t'))
|
||||
--
|
||||
cgit 1.2-0.3.lf.el7
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.87-153";
|
||||
version = "4.14.94-155";
|
||||
|
||||
# modDirVersion needs to be x.y.z.
|
||||
modDirVersion = "4.14.87";
|
||||
modDirVersion = "4.14.94";
|
||||
|
||||
# branchVersion needs to be x.y.
|
||||
extraMeta.branch = "4.14";
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
owner = "hardkernel";
|
||||
repo = "linux";
|
||||
rev = version;
|
||||
sha256 = "1aj3l8pf3nl0mm4m5z4z4iqd72b0nqip4cajmhpfjmq8vkygcw5c";
|
||||
sha256 = "1jg4m17y5wkmfmw8y9y9nh14xzw6011gbzlckqabmbazcdpbmf9d";
|
||||
};
|
||||
|
||||
defconfig = "odroidxu4_defconfig";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.0-rc6";
|
||||
modDirVersion = "5.0.0-rc6";
|
||||
version = "5.0-rc7";
|
||||
modDirVersion = "5.0.0-rc7";
|
||||
extraMeta.branch = "5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
sha256 = "1315hkjwgm97kh98y8ynsf6fy1b6yf4b74ws6d4s7dls70qzl3yw";
|
||||
sha256 = "0x5jvv4n9l1gisc0q9m9r7173d9qwpl6crd59fbmasbmvi9lnp41";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
||||
@ -57,11 +57,4 @@ rec {
|
||||
sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
|
||||
};
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/53672
|
||||
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78
|
||||
interpreter-trunc = {
|
||||
name = "interpreter-trunc";
|
||||
patch = ./interpreter-trunc.patch;
|
||||
};
|
||||
}
|
||||
|
||||
@ -76,7 +76,8 @@ let
|
||||
postInstall =
|
||||
''
|
||||
moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
|
||||
moveToOutput "lib/*.a" "$out"
|
||||
moveToOutput "lib/libpgcommon.a" "$out"
|
||||
moveToOutput "lib/libpgport.a" "$out"
|
||||
moveToOutput "lib/libecpg*" "$out"
|
||||
|
||||
# Prevent a retained dependency on gcc-wrapper.
|
||||
@ -84,7 +85,7 @@ let
|
||||
|
||||
if [ -z "''${dontDisableStatic:-}" ]; then
|
||||
# Remove static libraries in case dynamic are available.
|
||||
for i in $out/lib/*.a; do
|
||||
for i in $out/lib/*.a $lib/lib/*.a; do
|
||||
name="$(basename "$i")"
|
||||
ext="${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "watchexec-${version}";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "watchexec";
|
||||
repo = "watchexec";
|
||||
rev = version;
|
||||
sha256 = "15fnf3r4pvl9gyvq0fy0l7p8xjaz44z9g4dzkn1l0fdhldib6z1c";
|
||||
sha256 = "0azfnqx5v1shsd7jdxzn41awh9dbjykv8h1isrambc86ygr1c1cy";
|
||||
};
|
||||
|
||||
cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j";
|
||||
|
||||
@ -173,7 +173,7 @@ in
|
||||
|
||||
dispad = callPackage ../tools/X11/dispad { };
|
||||
|
||||
dump1090 = callPackage ../applications/misc/dump1090 { };
|
||||
dump1090 = callPackage ../applications/radio/dump1090 { };
|
||||
|
||||
ebook2cw = callPackage ../applications/radio/ebook2cw { };
|
||||
|
||||
@ -14625,7 +14625,6 @@ in
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.interpreter-trunc
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -1072,6 +1072,8 @@ in let inherit (pkgs) callPackage; in rec
|
||||
|
||||
ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { });
|
||||
|
||||
ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { });
|
||||
|
||||
ocamlPackages_latest = ocamlPackages_4_07;
|
||||
|
||||
ocamlPackages = ocamlPackages_4_06;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user