Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
commit
79d5c004d9
|
|
@ -398,6 +398,19 @@ with lib.maintainers; {
|
|||
shortName = "Linux Kernel";
|
||||
};
|
||||
|
||||
llvm = {
|
||||
members = [
|
||||
ericson2314
|
||||
sternenseemann
|
||||
lovek323
|
||||
dtzWill
|
||||
primeos
|
||||
];
|
||||
scope = "Maintain LLVM package sets and related packages";
|
||||
shortName = "LLVM";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
lumiguide = {
|
||||
# Verify additions by approval of an already existing member of the team.
|
||||
members = [
|
||||
|
|
|
|||
|
|
@ -71,6 +71,17 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
credentials = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Credentials envs used to configure nomad secrets.
|
||||
'';
|
||||
type = types.attrsOf types.str;
|
||||
default = { };
|
||||
|
||||
example = {
|
||||
logs_remote_write_password = "/run/keys/nomad_write_password";
|
||||
};
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = format.type;
|
||||
|
|
@ -148,7 +159,8 @@ in
|
|||
};
|
||||
in
|
||||
"${cfg.package}/bin/nomad agent -config=/etc/nomad.json -plugin-dir=${pluginsDir}/bin" +
|
||||
concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths;
|
||||
concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths +
|
||||
concatMapStrings (key: " -config=\${CREDENTIALS_DIRECTORY}/${key}") (lib.attrNames cfg.credentials);
|
||||
KillMode = "process";
|
||||
KillSignal = "SIGINT";
|
||||
LimitNOFILE = 65536;
|
||||
|
|
@ -157,6 +169,7 @@ in
|
|||
Restart = "on-failure";
|
||||
RestartSec = 2;
|
||||
TasksMax = "infinity";
|
||||
LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials;
|
||||
}
|
||||
(mkIf cfg.enableDocker {
|
||||
SupplementaryGroups = "docker"; # space-separated string
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snd";
|
||||
version = "22.5";
|
||||
version = "23.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
||||
sha256 = "sha256-a/nYq6Cfbx93jfA6I8it+U0U36dOAFSpRis32spPks4=";
|
||||
sha256 = "sha256-WnQtXr1IcOpNJBrSvLf2rNu2XPs8JU01LWsQSzvvivA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec {
|
|||
pname = "orpie";
|
||||
version = "1.6.1";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pelzlpj";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec {
|
|||
pname = "anders";
|
||||
version = "1.1.1";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "groupoid";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec {
|
|||
sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
gen sedlex extlib dune-build-info linenoise
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
}:
|
||||
|
||||
let
|
||||
goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo118Module; };
|
||||
|
||||
|
|
@ -113,7 +114,7 @@ stdenv.mkDerivation rec {
|
|||
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go";
|
||||
GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
}:
|
||||
|
||||
let
|
||||
goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo119Module; };
|
||||
|
||||
|
|
@ -113,7 +114,7 @@ stdenv.mkDerivation rec {
|
|||
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go";
|
||||
GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
}:
|
||||
|
||||
let
|
||||
goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap117.nix { };
|
||||
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap117.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo120Module; };
|
||||
|
||||
|
|
@ -113,7 +114,7 @@ stdenv.mkDerivation rec {
|
|||
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go";
|
||||
GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ let
|
|||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
maintainers = lib.teams.llvm.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,9 +0,0 @@
|
|||
diff -Nuar ocaml-3.11.1/ocamldoc/remove_DEBUG ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG
|
||||
--- ocaml-3.11.1/ocamldoc/remove_DEBUG 2004-04-15 18:18:52.000000000 +0200
|
||||
+++ ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG 2011-01-01 17:37:07.000000000 +0100
|
||||
@@ -18,4 +18,4 @@
|
||||
# respecting the cpp # line annotation conventions
|
||||
|
||||
echo "# 1 \"$1\""
|
||||
-LC_ALL=C sed -e '/DEBUG/s/.*//' "$1"
|
||||
+grep -v 'DEBUG' "$1"
|
||||
|
|
@ -1,240 +0,0 @@
|
|||
http://caml.inria.fr/mantis/view.php?id=4849
|
||||
|
||||
diff -bur ocaml-3.11.1/asmcomp/mips/arch.ml my_ocaml/asmcomp/mips/arch.ml
|
||||
--- asmcomp/mips/arch.ml 2002-11-29 16:03:36.000000000 +0100
|
||||
+++ asmcomp/mips/arch.ml 2009-08-09 23:18:31.000000000 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
let big_endian =
|
||||
match Config.system with
|
||||
- "ultrix" -> false
|
||||
+ "ultrix" | "gnu" -> false
|
||||
| "irix" -> true
|
||||
| _ -> fatal_error "Arch_mips.big_endian"
|
||||
|
||||
diff -bur ocaml-3.11.1/asmcomp/mips/emit.mlp my_ocaml/asmcomp/mips/emit.mlp
|
||||
--- asmcomp/mips/emit.mlp 2004-01-05 21:25:56.000000000 +0100
|
||||
+++ asmcomp/mips/emit.mlp 2009-08-23 12:11:58.000000000 +0200
|
||||
@@ -58,7 +58,7 @@
|
||||
!stack_offset +
|
||||
4 * num_stack_slots.(0) + 8 * num_stack_slots.(1) +
|
||||
(if !contains_calls then if !uses_gp then 8 else 4 else 0) in
|
||||
- Misc.align size 16
|
||||
+ Misc.align size 16 (* n32 require quadword alignment *)
|
||||
|
||||
let slot_offset loc cl =
|
||||
match loc with
|
||||
@@ -252,7 +252,7 @@
|
||||
| Lop(Icall_ind) ->
|
||||
` move $25, {emit_reg i.arg.(0)}\n`;
|
||||
liveregs i live_25;
|
||||
- ` jal {emit_reg i.arg.(0)}\n`;
|
||||
+ ` jal $25\n`; (* {emit_reg i.arg.(0)}\n; Equivalent but avoids "Warning: MIPS PIC call to register other than $25" on GNU as *)
|
||||
`{record_frame i.live}\n`
|
||||
| Lop(Icall_imm s) ->
|
||||
liveregs i 0;
|
||||
@@ -269,7 +269,7 @@
|
||||
liveregs i 0;
|
||||
` move $25, {emit_reg i.arg.(0)}\n`;
|
||||
liveregs i live_25;
|
||||
- ` j {emit_reg i.arg.(0)}\n`
|
||||
+ ` j $25\n`
|
||||
| Lop(Itailcall_imm s) ->
|
||||
if s = !function_name then begin
|
||||
` b {emit_label !tailrec_entry_point}\n`
|
||||
@@ -277,11 +277,11 @@
|
||||
let n = frame_size() in
|
||||
if !contains_calls then
|
||||
` lw $31, {emit_int(n - 4)}($sp)\n`;
|
||||
+ ` la $25, {emit_symbol s}\n`; (* Rxd: put before gp restore *)
|
||||
if !uses_gp then
|
||||
` lw $gp, {emit_int(n - 8)}($sp)\n`;
|
||||
if n > 0 then
|
||||
` addu $sp, $sp, {emit_int n}\n`;
|
||||
- ` la $25, {emit_symbol s}\n`;
|
||||
liveregs i live_25;
|
||||
` j $25\n`
|
||||
end
|
||||
@@ -305,8 +305,13 @@
|
||||
begin match chunk with
|
||||
Double_u ->
|
||||
(* Destination is not 8-aligned, hence cannot use l.d *)
|
||||
+ if big_endian then begin
|
||||
` ldl $24, {emit_addressing addr i.arg 0}\n`;
|
||||
- ` ldr $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n`;
|
||||
+ ` ldr $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n`
|
||||
+ end else begin
|
||||
+ ` ldl $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n`;
|
||||
+ ` ldr $24, {emit_addressing addr i.arg 0}\n`
|
||||
+ end;
|
||||
` dmtc1 $24, {emit_reg dest}\n`
|
||||
| Single ->
|
||||
` l.s {emit_reg dest}, {emit_addressing addr i.arg 0}\n`;
|
||||
@@ -328,8 +333,13 @@
|
||||
Double_u ->
|
||||
(* Destination is not 8-aligned, hence cannot use l.d *)
|
||||
` dmfc1 $24, {emit_reg src}\n`;
|
||||
+ if big_endian then begin
|
||||
` sdl $24, {emit_addressing addr i.arg 1}\n`;
|
||||
` sdr $24, {emit_addressing (offset_addressing addr 7) i.arg 1}\n`
|
||||
+ end else begin
|
||||
+ ` sdl $24, {emit_addressing (offset_addressing addr 7) i.arg 1}\n`;
|
||||
+ ` sdr $24, {emit_addressing addr i.arg 1}\n`
|
||||
+ end
|
||||
| Single ->
|
||||
` cvt.s.d $f31, {emit_reg src}\n`;
|
||||
` s.s $f31, {emit_addressing addr i.arg 1}\n`
|
||||
@@ -552,6 +562,7 @@
|
||||
(* There are really two groups of registers:
|
||||
$sp and $30 always point to stack locations
|
||||
$2 - $21 never point to stack locations. *)
|
||||
+ if Config.system = "irix" then begin
|
||||
` .noalias $2,$sp; .noalias $2,$30; .noalias $3,$sp; .noalias $3,$30\n`;
|
||||
` .noalias $4,$sp; .noalias $4,$30; .noalias $5,$sp; .noalias $5,$30\n`;
|
||||
` .noalias $6,$sp; .noalias $6,$30; .noalias $7,$sp; .noalias $7,$30\n`;
|
||||
@@ -561,7 +572,8 @@
|
||||
` .noalias $14,$sp; .noalias $14,$30; .noalias $15,$sp; .noalias $15,$30\n`;
|
||||
` .noalias $16,$sp; .noalias $16,$30; .noalias $17,$sp; .noalias $17,$30\n`;
|
||||
` .noalias $18,$sp; .noalias $18,$30; .noalias $19,$sp; .noalias $19,$30\n`;
|
||||
- ` .noalias $20,$sp; .noalias $20,$30; .noalias $21,$sp; .noalias $21,$30\n\n`;
|
||||
+ ` .noalias $20,$sp; .noalias $20,$30; .noalias $21,$sp; .noalias $21,$30\n\n`
|
||||
+ end;
|
||||
let lbl_begin = Compilenv.make_symbol (Some "data_begin") in
|
||||
` .data\n`;
|
||||
` .globl {emit_symbol lbl_begin}\n`;
|
||||
diff -bur ocaml-3.11.1/asmrun/mips.s my_ocaml/asmrun/mips.s
|
||||
--- asmrun/mips.s 2004-07-13 14:18:53.000000000 +0200
|
||||
+++ asmrun/mips.s 2009-08-20 09:34:36.000000000 +0200
|
||||
@@ -187,7 +187,7 @@
|
||||
sw $30, caml_exception_pointer
|
||||
/* Call C function */
|
||||
move $25, $24
|
||||
- jal $24
|
||||
+ jal $25 /* Rxd: $24 replaced by $25 to avoid this "Warning: MIPS PIC call to register other than $25" ? */
|
||||
/* Reload return address, alloc ptr, alloc limit */
|
||||
lw $31, 0($16) /* caml_last_return_address */
|
||||
lw $22, 0($17) /* caml_young_ptr */
|
||||
@@ -254,7 +254,7 @@
|
||||
sw $0, caml_last_return_address
|
||||
/* Call the Caml code */
|
||||
move $25, $24
|
||||
- jal $24
|
||||
+ jal $25 /* Rxd: 24 replaced by 25 */
|
||||
$104:
|
||||
/* Pop the trap frame, restoring caml_exception_pointer */
|
||||
lw $24, 0($sp)
|
||||
@@ -384,3 +384,8 @@
|
||||
.word $104 /* return address into callback */
|
||||
.half -1 /* negative frame size => use callback link */
|
||||
.half 0 /* no roots here */
|
||||
+
|
||||
+#if defined(SYS_linux)
|
||||
+ /* Mark stack as non-executable, PR#4564 */
|
||||
+ .section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
diff -bur ocaml-3.11.1/configure my_ocaml/configure
|
||||
--- configure 2009-05-20 17:33:09.000000000 +0200
|
||||
+++ configure 2009-08-23 10:55:44.000000000 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
verbose=no
|
||||
withcurses=yes
|
||||
withsharedlibs=yes
|
||||
-gcc_warnings="-Wall"
|
||||
+gcc_warnings="-W -Wall"
|
||||
partialld="ld -r"
|
||||
|
||||
# Try to turn internationalization off, can cause config.guess to malfunction!
|
||||
@@ -292,6 +292,9 @@
|
||||
# (For those who want to force "cc -64")
|
||||
# Turn off warning "unused library"
|
||||
bytecclinkopts="-Wl,-woff,84";;
|
||||
+ gcc*,mips64el-*)
|
||||
+ bytecccompopts=""
|
||||
+ bytecclinkopts="-fno-defer-pop $gcc_warnings -Wl,-O1 -Wl,--as-needed";;
|
||||
*,alpha*-*-unicos*)
|
||||
# For the Cray T3E
|
||||
bytecccompopts="-DUMK";;
|
||||
@@ -468,6 +471,8 @@
|
||||
echo "64-bit integers must be doubleword-aligned."
|
||||
echo "#define ARCH_ALIGN_INT64" >> m.h
|
||||
fi;;
|
||||
+ mips64el-*)
|
||||
+ echo "#define ARCH_ALIGN_INT64" >> m.h;;
|
||||
*)
|
||||
sh ./runtest int64align.c
|
||||
case $? in
|
||||
@@ -636,6 +641,7 @@
|
||||
fi;;
|
||||
i[3456]86-*-gnu*) arch=i386; system=gnu;;
|
||||
mips-*-irix6*) arch=mips; system=irix;;
|
||||
+ mips*-gnu*) arch=mips; system=gnu;;
|
||||
hppa1.1-*-hpux*) arch=hppa; system=hpux;;
|
||||
hppa2.0*-*-hpux*) arch=hppa; system=hpux;;
|
||||
hppa*-*-linux*) arch=hppa; system=linux;;
|
||||
@@ -672,7 +678,7 @@
|
||||
if test -z "$ccoption"; then
|
||||
case "$arch,$system,$cc" in
|
||||
alpha,digital,gcc*) nativecc=cc;;
|
||||
- mips,*,gcc*) nativecc=cc;;
|
||||
+ mips,irix,gcc*) nativecc=cc;;
|
||||
*) nativecc="$bytecc";;
|
||||
esac
|
||||
else
|
||||
@@ -687,6 +693,9 @@
|
||||
alpha,cc*,digital,*) nativecccompopts=-std1;;
|
||||
mips,cc*,irix,*) nativecccompopts=-n32
|
||||
nativecclinkopts="-n32 -Wl,-woff,84";;
|
||||
+ mips,gcc*,gnu,mips64el-*)
|
||||
+ nativecccompopts="$gcc_warnings -fPIC"
|
||||
+ nativecclinkopts="--as-needed";;
|
||||
*,*,nextstep,*) nativecccompopts="$gcc_warnings -U__GNUC__ -posix"
|
||||
nativecclinkopts="-posix";;
|
||||
*,*,rhapsody,*darwin[1-5].*)
|
||||
@@ -725,6 +734,8 @@
|
||||
aspp='gcc -c -Wa,-xexplicit';;
|
||||
mips,*,irix) as='as -n32 -O2 -nocpp -g0'
|
||||
aspp='as -n32 -O2';;
|
||||
+ mips,*,gnu) as='as -KPIC'
|
||||
+ aspp='gcc -c -fPIC';; # got bus error without fPIC ?
|
||||
power,*,elf) as='as -u -m ppc'
|
||||
aspp='gcc -c';;
|
||||
power,*,bsd) as='as'
|
||||
@@ -756,6 +767,7 @@
|
||||
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
|
||||
amd64,*,linux) profiling='prof';;
|
||||
amd64,*,gnu) profiling='prof';;
|
||||
+ mips,*,gnu) profiling='prof';;
|
||||
*) profiling='noprof';;
|
||||
esac
|
||||
|
||||
diff -bur ocaml-3.11.1/asmcomp/mips/proc.ml my_ocaml/asmcomp/mips/proc.ml
|
||||
--- asmcomp/mips/proc.ml 2007-10-30 13:37:16.000000000 +0100
|
||||
+++ asmcomp/mips/proc.ml 2010-03-18 08:08:06.000000000 +0100
|
||||
@@ -114,7 +114,7 @@
|
||||
incr int
|
||||
end else begin
|
||||
loc.(i) <- stack_slot (make_stack !ofs) ty;
|
||||
- ofs := !ofs + size_int
|
||||
+ ofs := !ofs + 8
|
||||
end
|
||||
| Float ->
|
||||
if !float <= last_float then begin
|
||||
@@ -143,7 +143,7 @@
|
||||
or float regs $f12...$f19. Each argument "consumes" both one slot
|
||||
in the int register file and one slot in the float register file.
|
||||
Extra arguments are passed on stack, in a 64-bits slot, right-justified
|
||||
- (i.e. at +4 from natural address). *)
|
||||
+ (i.e. at +4 from natural address for big endians). *)
|
||||
|
||||
let loc_external_arguments arg =
|
||||
let loc = Array.create (Array.length arg) Reg.dummy in
|
||||
@@ -158,7 +158,7 @@
|
||||
end else begin
|
||||
begin match arg.(i).typ with
|
||||
Float -> loc.(i) <- stack_slot (Outgoing !ofs) Float
|
||||
- | ty -> loc.(i) <- stack_slot (Outgoing (!ofs + 4)) ty
|
||||
+ | ty -> loc.(i) <- stack_slot (Outgoing (!ofs + (if big_endian then 4 else 0))) ty
|
||||
end;
|
||||
ofs := !ofs + 8
|
||||
end
|
||||
|
||||
|
|
@ -308,6 +308,9 @@ self: super: ({
|
|||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
|
||||
}) (disableCabalFlag "fixity-th" super.fourmolu);
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/149692
|
||||
Agda = removeConfigureFlag "-foptimise-heavily" super.Agda;
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin
|
||||
|
||||
# tests appear to be failing to link or something:
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exiv2";
|
||||
version = "0.27.5";
|
||||
version = "0.27.6";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" "man" "static" ];
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "exiv2";
|
||||
repo = "exiv2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5kdzw/YzpYldfHjUSPOzu3gW2TPgxt8Oxs0LZDFphgA=";
|
||||
sha256 = "sha256-Ddy605EQhsATzmdhN3Zq+2ksYMrHEfucA+IqezYmjo4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -62,9 +62,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
# Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake.
|
||||
checkTarget = "tests";
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs ../test/
|
||||
mkdir ../test/tmp
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virglrenderer";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2";
|
||||
sha256 = "uKHxPhKAMwg3E1GeTJNryd8K/nYQnx8r1eB3uME6LUQ=";
|
||||
sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c=";
|
||||
};
|
||||
|
||||
buildInputs = [ libGLU libepoxy libX11 libdrm mesa ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ssl";
|
||||
version = "0.5.12";
|
||||
version = "0.5.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-ssl";
|
||||
rev = version;
|
||||
sha256 = "sha256-cQUJ7t7C9R74lDy1/lt+up4E5CogiPbeZpaDveDzJ7c=";
|
||||
sha256 = "sha256-Ws7QZOvZVy0QixMiBFJZEOnYzYlCWrZ1d95gOp/a5a0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flufl.lock";
|
||||
version = "7.1";
|
||||
version = "7.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Qxt/6PZhKZIA/2elOLrJNxchgcHtOm76bSiTS0i4oSw=";
|
||||
sha256 = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pdm-pep517 ];
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTestPaths = [
|
||||
# Requires credentials
|
||||
"tests/system/test_aggregation_query.py"
|
||||
"tests/system/test_allocate_reserve_ids.py"
|
||||
"tests/system/test_query.py"
|
||||
"tests/system/test_put.py"
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyro-ppl";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-Pt1DgbAg0S6KtQ6+ApjHpo0VC4oCT5mK2G/ax6MI1Q4=";
|
||||
hash = "sha256-dm+tYeUt9IiF3pbUEhPaH46MG3ns8witUxifzRXBy0E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.97.0";
|
||||
version = "0.102.0";
|
||||
pname = "jbang";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||
sha256 = "sha256-36yDwNHnDY/wA/juD2e8hf3Xm22aWcNy3SqAhN8FCo8=";
|
||||
sha256 = "sha256-5T0MQ1b1kA7MVm2drNbUdK6CitTjT76ORPN/BJmsmsM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "obelisk";
|
||||
version = "0.6.0";
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lelio-Brun";
|
||||
repo = pname;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, ocaml
|
||||
, buildDunePackage
|
||||
, fix
|
||||
, menhirLib
|
||||
|
|
@ -7,12 +8,15 @@
|
|||
, gitUpdater
|
||||
}:
|
||||
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
|
||||
"ocaml-recovery-parser is not available for OCaml ${ocaml.version}"
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-recovery-parser";
|
||||
version = "0.2.4";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "serokell";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
ocamlPackages.buildDunePackage {
|
||||
pname = "opam-installer";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
inherit (opam) version src;
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -27,16 +27,16 @@ in
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "berglas";
|
||||
version = "0.6.2";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aLsrrK+z080qn7L2zggA8yD+QqLaSRJLTjWQnFKFogQ=";
|
||||
sha256 = "sha256-A4TUVNsiWODH8jJzV4AYchIQjDWXysJbFPYQ5W63T08=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HjZT0jezJzoEvXuzrjoTv/zSex+xDuGoP1h82CIlX14=";
|
||||
vendorSha256 = "sha256-jJuwfP0zJ70r62IFTPsXBCAEKDcuBwHsBR24jGx/IqY=";
|
||||
|
||||
postPatch = skipTestsCommand;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parallel";
|
||||
version = "20220322";
|
||||
version = "20221122";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-35PM9qn1Ka0hJrcEKu8EhmA+k4x3tAWTnEFwLTik5tg=";
|
||||
sha256 = "sha256-qj2dIkNN8UjWk/GmIyMxoSZym2oi0vcmGxf7qa2ZU50=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl procps ];
|
||||
|
||||
preInstall = ''
|
||||
patchShebangs ./src/parallel
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/parallel \
|
||||
--prefix PATH : "${lib.makeBinPath [ procps perl coreutils ]}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages
|
||||
{ lib, stdenv, fetchFromGitHub, ruby, dune_3, ocamlPackages
|
||||
, ipaexfont, junicode, lmodern, lmmath
|
||||
}:
|
||||
let
|
||||
|
|
@ -28,7 +28,7 @@ let
|
|||
rev = "v1.4.2+satysfi";
|
||||
sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl";
|
||||
};
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
nativeBuildInputs = [ ocamlPackages.cppo ];
|
||||
propagatedBuildInputs = [ ocamlPackages.biniou ];
|
||||
inherit (ocamlPackages.yojson) meta;
|
||||
|
|
@ -53,7 +53,7 @@ in
|
|||
|
||||
DUNE_PROFILE = "release";
|
||||
|
||||
nativeBuildInputs = [ ruby dune_2 ];
|
||||
nativeBuildInputs = [ ruby dune_3 ];
|
||||
|
||||
buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [
|
||||
ocaml findlib menhir menhirLib
|
||||
|
|
|
|||
Loading…
Reference in a new issue