Commit Graph
535555 Commits
Author SHA1 Message Date
Bjørn Forsman 4de69110fa quartus-prime-lite: modelsim: fix compiling encrypted device models
LD_PRELOADing libudev breaks compiling encrypted device models in
ModelSim, so only use LD_PRELOAD for non-ModelSim wrappers.

Before:

  $ "$(NIXPKGS_ALLOW_UNFREE=1 nix-build -A quartus-prime-lite)/bin/vlog" "$(NIXPKGS_ALLOW_UNFREE=1 nix-build -A quartus-prime-lite.unwrapped)/modelsim_ase/altera/verilog/src/arriav_atoms_ncrypt.v"
  [...]
  ** Error: /nix/store/szcr2q24izqvhz7ybalar43y5xdg172a-quartus-prime-lite-unwrapped-20.1.1.720/modelsim_ase/altera/verilog/src/arriav_atoms_ncrypt.v(38): (vlog-2163) Macro `<protected> is undefined.
  ** Error: /nix/store/szcr2q24izqvhz7ybalar43y5xdg172a-quartus-prime-lite-unwrapped-20.1.1.720/modelsim_ase/altera/verilog/src/arriav_atoms_ncrypt.v(38): (vlog-2163) Macro `<protected> is undefined.
  ** Error: (vlog-13069) /nix/store/szcr2q24izqvhz7ybalar43y5xdg172a-quartus-prime-lite-unwrapped-20.1.1.720/modelsim_ase/altera/verilog/src/arriav_atoms_ncrypt.v(38): syntax error in protected region.
  [...]
  Errors: 4, Warnings: 0

After:

  $ "$(NIXPKGS_ALLOW_UNFREE=1 nix-build -A quartus-prime-lite)/bin/vlog" "$(NIXPKGS_ALLOW_UNFREE=1 nix-build -A quartus-prime-lite.unwrapped)/modelsim_ase/altera/verilog/src/arriav_atoms_ncrypt.v"
  [...]
  Errors: 0, Warnings: 0
2023-10-13 17:21:42 +02:00
Bjørn Forsman 7fe9476618 quartus-prime-lite: move passthru towards end
Coding style.
2023-10-13 17:21:42 +02:00
Bjørn Forsman 04413f50b9 quartus-prime-lite: buildFHSEnvChroot -> buildFHSEnv
The former is deprecated. The latter is implemented with
buildFHSEnvBubblewrap. The reason this package was switched to
buildFHSEnvChroot in the first place[1] is fixed by passing `multiArch =
true` (which brings e.g. 32-bit dynamic loader /lib/ld-linux.so.2).

[1] Commit cae417d315 ("quartus-prime: use buildFHSEnvChroot")
2023-10-13 17:21:42 +02:00
Bjørn Forsman 169dc22b96 quartus-prime-lite: don't overwrite LD_PRELOAD
Instead, merge the user provided LD_PRELOAD environment variable with
the hardcoded libudev.so.1 entry. User provided libs are loaded first.
2023-10-13 17:21:42 +02:00
Bjørn Forsman b201c54346 quartus-prime-lite: eliminate two unneeded execve syscalls
* Set LD_PRELOAD in the profile snippet to eliminate one execve() for `env`.
* Set runScript to "" to eliminate one execve() for bash.
2023-10-13 17:21:42 +02:00
Bjørn Forsman e19a5b040c quartus-prime-lite: expose all of quartus/bin/*
* Upstream recommends it (adding $QUARTUS_ROOTDIR/bin to $PATH).
* It's cool that nixpkgs *can* do these tricks (only expose a subset of
  programs), but in this case I don't think it's a good idea. For
  example, before this change I was missing the `jtagconfig` program.
* This increases the number of programs in .../bin from 29 to 80.
2023-10-13 17:21:42 +02:00
Bjørn Forsman f7c180ee1e quartus-prime-lite: add vcom, vdel, vmap
These are useful for Modelsim scripting.
2023-10-13 17:21:42 +02:00
Bjørn Forsman 5428524354 quartus-prime-lite: add lmutil
It's tool to check the validity of licenses, and vsim suggests running
it when it has issues validating a license. (At least in Quartus
22.1.2.)
2023-10-13 17:21:42 +02:00
Bjørn Forsman 9069ffe15f quartus-prime-lite: add /lib/ld-lsb*.so.3 dynamic loaders to FHS env
(In preparation for adding lmutil.)

Quartus is a mix of 32- and 64-bit programs, and these "lsb" loaders are
required by some of the unwrapped binaries:

  $ find /nix/store/HASH-quartus-prime-lite-unwrapped-20.1.1.720 -type f -executable | xargs -n1 patchelf --print-interpreter |& grep "ld-lsb" | sort -u
  /lib64/ld-lsb-x86-64.so.3
  /lib/ld-lsb.so.3
2023-10-13 17:21:42 +02:00
Bjørn Forsman 61893a949e quartus-prime-lite: list progs to wrap in sh instead of Nix
This opens up for using sh globbing (and possibly wrapping *all*
programs), something which is not possible when the program list is
coded in Nix.
2023-10-13 17:21:42 +02:00
Bjørn Forsman b74de9ec5f quartus-prime-lite: lower case local shell variables
Upper case shell variables are generally for internal variables (SHELL,
BASH_VERSION) or environment variables (PAGER, EDITOR). Other variables
should be lower case.
2023-10-13 17:21:42 +02:00
Bjørn Forsman 83f590a588 quartus-prime-lite: run mkdir as needed
Instead of maintaining both a list of executables to wrap and their
directory names, extract the directory names from the executables and
run mkdir as needed. Keep DRY.
2023-10-13 17:21:42 +02:00
Pol DellaieraandGitHub 948c4d7de2 Merge pull request #260702 from NixOS/projecteur/add-nixos-module
nixos/modules/projecteur: init
2023-10-13 17:11:05 +02:00
Maximilian BoschandGitHub 35f6dbe7fc Merge pull request #259967 from Ma27/nextcloud-cleanups
nextcloud: 27.1.0 -> 27.1.2, update nginx, drop nextcloud25
2023-10-13 16:40:40 +02:00
Mario RodasandGitHub 5bdf6eccd7 Merge pull request #260757 from r-ryantm/auto-update/grpc-client-cli
grpc-client-cli: 1.18.0 -> 1.19.0
2023-10-13 08:57:10 -05:00
Weijia WangandGitHub 7546bc6180 Merge pull request #259450 from npulidomateo/reinit-typora
Reinit typora
2023-10-13 15:56:55 +02:00
Mario RodasandGitHub 9034d4788e Merge pull request #259813 from figsoda/component
cargo-component: unstable-2023-09-20 -> 0.2.0
2023-10-13 08:55:39 -05:00
Mario RodasandGitHub af90946e22 Merge pull request #260462 from figsoda/oranda
oranda: 0.4.1 -> 0.5.0
2023-10-13 08:55:08 -05:00
Robert HensingandGitHub bb0b182cce Merge pull request #260535 from hercules-ci/fix-functionArgs-after-makeOverridable
lib.makeOverridable: fix functionArgs on returned function
2023-10-13 15:54:54 +02:00
Mario RodasandGitHub a087f3aaa0 Merge pull request #260711 from figsoda/argc
argc: 1.10.0 -> 1.11.0
2023-10-13 08:53:55 -05:00
Mario RodasandGitHub a1729f9be7 Merge pull request #260739 from bcdarwin/update-python3-monai
python310Packages.monai: 1.2.0 -> 1.3.0
2023-10-13 08:52:12 -05:00
Mario RodasandGitHub 39b83ca2b8 Merge pull request #259739 from nagy/nagy/pikchr
pikchr: unstable-2022-12-07 -> unstable-2023-08-30
2023-10-13 08:51:18 -05:00
Mario RodasandGitHub 1c6d53048f Merge pull request #260785 from jetpack-io/master
devbox: 0.5.13 -> 0.6.0
2023-10-13 08:49:58 -05:00
Mario RodasandGitHub aff6d2d6f4 Merge pull request #260805 from r-ryantm/auto-update/protonmail-bridge
protonmail-bridge: 3.4.2 -> 3.5.1
2023-10-13 08:48:44 -05:00
Weijia WangandGitHub 3246934249 Merge pull request #260856 from onny/wordpress-update4
wordpress6_3: 6.3.1 -> 6.3.2
2023-10-13 15:45:22 +02:00
Mario RodasandGitHub 2a3493854e Merge pull request #260709 from figsoda/shuttle
cargo-shuttle: 0.29.0 -> 0.29.1
2023-10-13 08:44:56 -05:00
Mario RodasandGitHub e2a5b04c83 Merge pull request #260713 from figsoda/typos
typos: 1.16.18 -> 1.16.19
2023-10-13 08:44:38 -05:00
Mario RodasandGitHub a0acbbbf67 Merge pull request #260626 from marsam/update-timescaledb
postgresqlPackages.timescaledb: 2.12.0 -> 2.12.1
2023-10-13 08:42:37 -05:00
Mario RodasandGitHub b52131dbbe Merge pull request #260793 from r-ryantm/auto-update/postgresql11JitPackages.tds_fdw
postgresql11JitPackages.tds_fdw: unstable-2023-07-20 -> unstable-2023-09-28
2023-10-13 08:41:54 -05:00
maxineandGitHub 397cf6b928 Merge pull request #260761 from r-ryantm/auto-update/kubernetes-helm
kubernetes-helm: 3.13.0 -> 3.13.1
2023-10-13 15:41:23 +02:00
maxineandGitHub ba924045d6 Merge pull request #260845 from trofi/fheroes2-update
fheroes2: 1.0.8 -> 1.0.9
2023-10-13 15:40:51 +02:00
Mario RodasandGitHub 0870f06ef8 Merge pull request #260792 from r-ryantm/auto-update/postgresql11JitPackages.pg_cron
postgresql11JitPackages.pg_cron: 1.6.0 -> 1.6.1
2023-10-13 08:40:36 -05:00
Mario RodasandGitHub 6904d47700 Merge pull request #260790 from marsam/update-terraform-ls
terraform-ls: 0.32.1 -> 0.32.2
2023-10-13 08:40:08 -05:00
maxineandGitHub 00ee862b86 Merge pull request #260454 from aykevl/tinygo-clang-headers
tinygo: clean up Clang header path patch
2023-10-13 15:39:45 +02:00
Weijia WangandGitHub fa14c19880 Merge pull request #255728 from r-ryantm/auto-update/alpine-make-vm-image
alpine-make-vm-image: 0.11.1 -> 0.12.0
2023-10-13 15:29:04 +02:00
Matthieu CoudronandGitHub 922a4d82c5 Merge pull request #260759 from mrcjkb/toml-edit
luaPackages: add some lua packages
2023-10-13 15:28:36 +02:00
Weijia WangandGitHub ab50cb748a Merge pull request #259427 from r-ryantm/auto-update/kustomize-sops
kustomize-sops: 4.2.1 -> 4.2.3
2023-10-13 15:26:33 +02:00
Weijia WangandGitHub c3b791240c Merge pull request #260550 from r-ryantm/auto-update/ocamlPackages.mirage-crypto
ocamlPackages.mirage-crypto: 0.11.1 -> 0.11.2
2023-10-13 15:22:40 +02:00
Nick CaoandGitHub 7cb6a4964d Merge pull request #260717 from NickCao/edk2-pytool-library
python310Packages.edk2-pytool-library: 0.19.0 -> 0.19.1
2023-10-13 09:14:48 -04:00
Nick CaoandGitHub 7a19dc764a Merge pull request #260833 from fabaff/pylgnetcast-bump
python311Packages.pylgnetcast: 0.3.7 -> 0.3.8
2023-10-13 09:14:26 -04:00
Weijia WangandGitHub 6c04de8b3d Merge pull request #259947 from katexochen/uplosi/init
uplosi: init at 0.1.1
2023-10-13 15:14:10 +02:00
Nick CaoandGitHub 78e5eb015a Merge pull request #260828 from fabaff/asyncwhois-bump
python311Packages.asyncwhois: 1.0.7 -> 1.0.8
2023-10-13 09:13:32 -04:00
Nick CaoandGitHub fdaac55143 Merge pull request #260832 from fabaff/cloudsplaining-bump
python311Packages.cloudsplaining: 0.6.1 -> 0.6.2
2023-10-13 09:12:07 -04:00
Nick CaoandGitHub d1ee273d12 Merge pull request #260836 from fabaff/reolink-aio-bump
python311Packages.reolink-aio: 0.7.10 -> 0.7.11
2023-10-13 09:11:41 -04:00
Nick CaoandGitHub 358c8b7119 Merge pull request #260861 from fabaff/alterx-bump
alterx: 0.0.1 -> 0.0.3
2023-10-13 09:11:10 -04:00
Nick CaoandGitHub 2096e8be9f Merge pull request #260860 from fabaff/checkov-bump
checkov: 2.5.7 -> 2.5.8
2023-10-13 09:10:03 -04:00
Marc Jakobi 3425b6cee6 luaPackages: use overrides for toml and toml-edit 2023-10-13 15:06:28 +02:00
Weijia WangandGitHub 0f7196a028 Merge pull request #257865 from r-ryantm/auto-update/python310Packages.torchsde
python310Packages.torchsde: 0.2.4 -> 0.2.6
2023-10-13 15:05:53 +02:00
Weijia WangandGitHub 72c8828be7 Merge pull request #258156 from r-ryantm/auto-update/netpbm
netpbm: 11.3.5 -> 11.4.2
2023-10-13 15:05:02 +02:00
Marc Jakobi d986e93072 sol2: use finalAttrs to reference version 2023-10-13 14:50:05 +02:00