Commit Graph

559328 Commits

Author SHA1 Message Date
Martin Weinelt
e8dd1cf066 Merge remote-tracking branch 'origin/staging-next' into staging 2023-12-12 14:13:07 +01:00
github-actions[bot]
2525630f4b
Merge master into staging-next 2023-12-12 12:01:27 +00:00
Thiago Kenji Okada
55ca793994
Merge pull request #273741 from VergeDX/lshw
lshw: fix static build
2023-12-12 12:00:20 +00:00
7c6f434c
ac12a78dfa
Merge pull request #273677 from philiptaron/clisp
clisp: fix build
2023-12-12 11:40:40 +00:00
ajs124
3d2227a072
Merge pull request #273651 from emilylange/loki
grafana-loki,promtail: 2.9.2 -> 2.9.3
2023-12-12 12:35:16 +01:00
emilylange
0ed60bbcd1 chromium: fix increased build time for non-cross-compilation builds
Having

```nix
host_toolchain = "//build/toolchain/linux/unbundle:host";
v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host";
```

on native, non-cross-compilation builds roughly doubles the build steps
and, by proxy, compute and time needed to build.

So to resolve this, we conditionally change those values depending on
whether we are cross-compiling or not.

Co-authored-by: Adam Joseph <adam@westernsemico.com>
2023-12-12 12:33:28 +01:00
emilylange
0eb389be6e chromium: move stray patches into ./patches directory 2023-12-12 12:33:28 +01:00
emilylange
b8927e2047 ungoogled-chromium: add ungoogled- prefix to chromium-unwrapped 2023-12-12 12:33:28 +01:00
Peter Hoeg
c979d0efb4 plasma5Packages.polonium: init at 0.6.0 2023-12-12 11:52:46 +01:00
Linus Heckemann
b169e74615
Merge pull request #273388 from NickCao/hydra-fix
hydra_unstable: add patch for fixing accessing git inputs on flakes
2023-12-12 11:51:54 +01:00
Vanilla
11a5040a48
lshw: fix static build 2023-12-12 17:59:44 +08:00
Felix Bühler
d92daec27e
ratman: migrate to prefetch-yarn-deps (#269285) 2023-12-12 10:48:10 +01:00
Vlad M
ecb742f56f
Merge pull request #273079 from kilianar/broot-1.30.0
broot: 1.29.0 -> 1.30.0
2023-12-12 11:36:47 +02:00
Francesco Gazzetta
a59c736495 warzone2100: fix fetch url
The previous url always redirects to the latest version.
See #272701 and https://github.com/Warzone2100/warzone2100/issues/3565.
2023-12-12 08:31:10 +00:00
Peder Bergebakken Sundt
898f355702
Merge pull request #273387 from arthsmn/sponsorblock-minimal
mpvScripts.sponsorblock-minimal: init at unstable-2023-08-20
2023-12-12 09:29:07 +01:00
Christoph Hrdinka
867e24babb
Merge pull request #272827 from r-ryantm/auto-update/nsd
nsd: 4.7.0 -> 4.8.0
2023-12-12 09:27:04 +01:00
Peder Bergebakken Sundt
33b221d12e
Merge pull request #272804 from Vonfry/update/tdlib-1.8.22
tdlib: 1.8.21 -> 1.8.22
2023-12-12 09:25:13 +01:00
Fabian Affolter
a46c5b471e
Merge pull request #273577 from fabaff/dependency-track-exporter
dependency-track-exporter: init at 0.1.2
2023-12-12 08:40:35 +01:00
Fabian Affolter
9c4a7e2fc4
Merge pull request #273661 from fabaff/checkov-bump
checkov: 3.1.31 -> 3.1.33
2023-12-12 08:21:09 +01:00
Pol Dellaiera
37aa0ada2c
Merge pull request #273173 from r-ryantm/auto-update/vtm
vtm: 0.9.16 -> 0.9.27
2023-12-12 08:20:26 +01:00
Pol Dellaiera
663f20da6e
Merge pull request #272835 from r-ryantm/auto-update/subnetcalc
subnetcalc: 2.4.22 -> 2.4.23
2023-12-12 08:20:10 +01:00
Yureka
73a4603df8 clickhouse: 23.10.3.5 -> 23.11.1.2711 2023-12-12 07:12:04 +00:00
Pol Dellaiera
b9e35d7dc4
Merge pull request #272448 from drupol/php/composer-builder/filter-bat
build-support/php: prevent the creation of symlinks of `bin` ending with `.bat`
2023-12-12 08:11:50 +01:00
Frederik Rietdijk
2feabab3d6
Merge pull request #273666 from adisbladis/setupcfg2nix-removal
python3.pkgs.buildsetupcfg: Remove
2023-12-12 08:04:52 +01:00
larsr
5d43a8764f
coqPackages.metacoq: update for coq 8.17 and 8.18 (#273541)
Also update default.nix to match the default.nix in
MetaCoq/metacoq:.nix/coq-overlays/metacoq/default.nix

Because some files have changed names, some version-dependent
building is required to keep building older versions.

And Metacoq's default.nix had older version checksums.
We use the more recent versions from nixpkgs for coq 8.14-8.16

Co-authored-by: Lars Rasmusson <Lars.Rasmusson@rise>
2023-12-12 07:19:37 +01:00
github-actions[bot]
43f7188eba
Merge master into staging-next 2023-12-12 06:00:54 +00:00
Pol Dellaiera
23959be581
Merge pull request #272204 from r-ryantm/auto-update/dsdcc
dsdcc: 1.9.4 -> 1.9.5
2023-12-12 05:34:53 +01:00
Pol Dellaiera
dac1e3d3e5
Merge pull request #272208 from r-ryantm/auto-update/fasm
fasm: 1.73.31 -> 1.73.32
2023-12-12 05:34:29 +01:00
Pol Dellaiera
d9b360c144
Merge pull request #273322 from r-ryantm/auto-update/zef
zef: 0.21.0 -> 0.21.1
2023-12-12 05:32:51 +01:00
Pol Dellaiera
edea031f96
Merge pull request #273349 from r-ryantm/auto-update/zrok
zrok: 0.4.15 -> 0.4.18
2023-12-12 05:32:23 +01:00
Dmitry Kalinkin
b576bc2681
apfel: 3.0.6 -> 3.1.0 (#273073) 2023-12-11 21:22:33 -05:00
Weijia Wang
d6a0fea30e
Merge pull request #273635 from pacien/add-meta-mainprogram-trivial
treewide-ish: set meta.mainProgram on a few packages
2023-12-12 02:48:33 +01:00
Weijia Wang
b75852df34
Merge pull request #273618 from pacien/i3-balance-workspace-add-mainprogram
i3-balance-workspace: add mainProgram
2023-12-12 02:47:53 +01:00
Weijia Wang
8f5df1373a
Merge pull request #273623 from pacien/rss2email-add-mainprogram
rss2email: add mainProgram
2023-12-12 02:47:33 +01:00
Weijia Wang
4ad2a5f1a1
Merge pull request #273423 from wegank/jigdo-refactor
jigdo: 0.7.3 -> 0.8.2, refactor
2023-12-12 02:46:56 +01:00
Weijia Wang
9c264295e1
Merge pull request #273364 from wegank/swfmill-darwin
swfmill: add darwin support
2023-12-12 02:37:59 +01:00
Weijia Wang
a143707fc8
Merge pull request #273597 from r-ryantm/auto-update/circt
circt: 1.59.0 -> 1.61.0
2023-12-12 02:22:03 +01:00
R. Ryantm
9ea88b16b1 erigon: 2.54.0 -> 2.55.1 2023-12-12 01:02:34 +00:00
Weijia Wang
aa13edf2dd
Merge pull request #273445 from wegank/bencode-stdenv
bencode: remove stdenv override
2023-12-12 01:58:32 +01:00
Weijia Wang
01cfd8b24f
Merge pull request #273628 from Anomalocaridid/footswitch
footswitch: unstable-2022-04-12 -> unstable-2023-10-10
2023-12-12 01:56:03 +01:00
Weijia Wang
5263c5b57e
Merge pull request #271709 from alven-shin/fix-pest-ide-tools
pest-ide-tools: fix package not building on Darwin
2023-12-12 01:53:47 +01:00
Weijia Wang
9c5db275ec
Merge pull request #273600 from wegank/diopser-gcc-13
diopser: fix build with gcc 11+
2023-12-12 01:52:37 +01:00
Weijia Wang
9a67c36f6d
Merge pull request #273382 from wegank/strelka-aarch64
strelka: add aarch64-linux support
2023-12-12 01:51:59 +01:00
Weijia Wang
f4a98e5a3e
Merge pull request #273601 from suntropez/platformsh_10_11
platformsh: 4.10.0 -> 4.11.4
2023-12-12 01:50:25 +01:00
Martin Weinelt
f603fc85b4
Merge pull request #273667 from mweinelt/firefox-121.0b9
firefox-{beta,devedition}-unwrapped: 121.0b5 -> 121.0b9
2023-12-12 01:49:05 +01:00
Dmitry Kalinkin
8f47b40246
yoda: 1.9.8 -> 1.9.9 (#273260) 2023-12-11 19:46:35 -05:00
Ilan Joselevich
729bd7499f
Merge pull request #265961 from 999eagle/feat/intiface-central
intiface-central: init at 2.5.3
2023-12-12 02:43:31 +02:00
Ilan Joselevich
1747ae1d9e
Merge pull request #272668 from r-ryantm/auto-update/rtx
rtx: 2023.11.2 -> 2023.12.18
2023-12-12 02:40:50 +02:00
Philip Taron
baed870448
clisp: fix build
Without this patch, the following build error occurs for me on NixOS:

```
$ nix-build -A clisp --check
<snipped>
Running phase: buildPhase
build flags: SHELL=/nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21/bin/bash
ln -s ../src/.gdbinit .gdbinit
rm -f build-aux
ln -s ../src/build-aux build-aux
mkdir -p gllib
test -f gllib/Makefile || sh config.status gllib/Makefile depfiles
cd gllib && make CFLAGS="-g -O2 -no-integrated-cpp -W -Wswitch -Wcomment -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wimplicit -Wno-sign-compare -Wno-format-nonliteral -Wno-shift-negative-value -O -fwrapv -pthread -fno-strict-aliasing -DNO_ASM -DENABLE_UNICODE -DMULTITHREAD -DPOSIX_THREADS -DDYNAMIC_FFI -DDYNAMIC_MODULES  -fPIC -DPIC " top_srcdir="/build/source/src"
make[1]: Entering directory '/build/source/builddir/gllib'
 cd /build/source/src && /nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21/bin/bash /build/source/src/build-aux/missing automake-1.16 --gnits gllib/Makefile
/build/source/src/build-aux/missing: line 81: automake-1.16: command not found
WARNING: 'automake-1.16' is missing on your system.
         You should only need it if you modified 'Makefile.am' or
         'configure.ac' or m4 files included by 'configure.ac'.
         The 'automake' program is part of the GNU Automake package:
         <https://www.gnu.org/software/automake>
         It also requires GNU Autoconf, GNU m4 and Perl in order to run:
         <https://www.gnu.org/software/autoconf>
         <https://www.gnu.org/software/m4/>
         <https://www.perl.org/>
make[1]: *** [Makefile:1333: ../../src/gllib/Makefile.in] Error 127
make[1]: Leaving directory '/build/source/builddir/gllib'
make: *** [Makefile:648: gllib/libgnu.a] Error 2
```

This message was also reproduced by @2xsaiko on their NAS machine.

I don't know why this error sometimes occurs and sometimes does not.
On my Ubuntu machines, this error does not occur, and instead it does this:

```
Running phase: buildPhase
build flags: SHELL=/nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21/bin/bash
ln -s ../src/.gdbinit .gdbinit
rm -f build-aux
ln -s ../src/build-aux build-aux
mkdir -p gllib
test -f gllib/Makefile || sh config.status gllib/Makefile depfiles
cd gllib && make CFLAGS="-g -O2 -no-integrated-cpp -W -Wswitch -Wcomment -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wimplicit -Wno-sign-compare -Wno-format-nonliteral -Wno-shift-negative-value -O -fwrapv -pthread -fno-strict-aliasing -DNO_ASM -DENABLE_UNICODE -DMULTITHREAD -DPOSIX_THREADS -DDYNAMIC_FFI -DDYNAMIC_MODULES  -fPIC -DPIC " top_srcdir="/build/source/src"
make[1]: Entering directory '/build/source/builddir/gllib'
make[2]: Entering directory '/build/source/builddir'
make[2]: Nothing to be done for 'am--refresh'.
make[2]: Leaving directory '/build/source/builddir'
cd .. && make  am--refresh
make[2]: Entering directory '/build/source/builddir'
make[2]: Nothing to be done for 'am--refresh'.
make[2]: Leaving directory '/build/source/builddir'
<snipped>
```

In any case, these changes work successfully on all platforms I've tested them on:

1. NixOS
2. Ubuntu 22.04
3. MacOS x86_64
4. MacOS aarch64
2023-12-11 16:28:32 -08:00
happysalada
3df2965698 bun: 1.0.15 -> 1.0.16 2023-12-12 00:10:15 +00:00