Commit Graph
9575 Commits
Author SHA1 Message Date
github-actions[bot] b152812791 Merge staging-next into staging 2021-04-01 00:15:44 +00:00
Pascal Bach 6ccc27d216 Merge pull request #117654 from r-ryantm/auto-update/plantuml
plantuml: 1.2021.2 -> 1.2021.3
2021-03-31 22:15:26 +02:00
volth 7d252394cc rrdtool: add passthru.perlModule
... so it can be used in `perl.withPackages`

A bit tricky though, because rrdtool is not in `perlPackages`
```nix
perl.withPackages(p: [ (rrdtool.override{ inherit (p) perl; }) ])
```
2021-03-31 21:35:38 +02:00
rnhmjoj 61b7cab481 treewide: use perl.withPackages when possible
Since 03eaa48 added perl.withPackages, there is a canonical way to
create a perl interpreter from a list of libraries, for use in script
shebangs or generic build inputs. This method is declarative (what we
are doing is clear), produces short shebangs[1] and needs not to wrap
existing scripts.

Unfortunately there are a few exceptions that I've found:

  1. Scripts that are calling perl with the -T switch. This makes perl
  ignore PERL5LIB, which is what perl.withPackages is using to inform
  the interpreter of the library paths.

  2. Perl packages that depends on libraries in their own path. This
  is not possible because perl.withPackages works at build time. The
  workaround is to add `-I $out/${perl.libPrefix}` to the shebang.

In all other cases I propose to switch to perl.withPackages.

[1]: https://lwn.net/Articles/779997/
2021-03-31 21:35:37 +02:00
github-actions[bot] 4da7569841 Merge staging-next into staging 2021-03-31 12:06:29 +00:00
Frederik Rietdijk 9b9e9cff00 Merge pull request #117015 from NixOS/staging-next
Staging next
2021-03-31 12:42:19 +02:00
Fabian Affolter 6cd0a4baf0 Merge pull request #118035 from r-ryantm/auto-update/chezmoi
chezmoi: 2.0.4 -> 2.0.5
2021-03-31 09:14:51 +02:00
github-actions[bot] cb1554f24c Merge staging-next into staging 2021-03-31 00:12:32 +00:00
github-actions[bot] 4ba71fb819 Merge master into staging-next 2021-03-31 00:12:29 +00:00
zowoq 124564d5d2 youtube-dl: 2021.03.25 -> 2021.03.31
https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.31
2021-03-31 06:32:00 +10:00
R. RyanTM 5e003946be tmux-xpanes: 4.1.2 -> 4.1.3 2021-03-30 19:19:46 +00:00
github-actions[bot] 01b3d1558f Merge staging-next into staging 2021-03-30 18:15:09 +00:00
github-actions[bot] f555f95ed8 Merge master into staging-next 2021-03-30 18:15:05 +00:00
Sandro 7d0dad76ef Merge pull request #116936 from hercules-ci/logstash-jdk 2021-03-30 17:22:21 +02:00
Sandro c58c862bf7 Merge pull request #118060 from r-ryantm/auto-update/grex
grex: 1.1.0 -> 1.2.0
2021-03-30 16:05:26 +02:00
R. RyanTM 78ff084075 grex: 1.1.0 -> 1.2.0 2021-03-30 12:46:10 +00:00
github-actions[bot] d466353dd5 Merge staging-next into staging 2021-03-30 12:06:28 +00:00
github-actions[bot] c9e9ff786b Merge master into staging-next 2021-03-30 12:06:24 +00:00
R. RyanTM b3a564176a chezmoi: 2.0.4 -> 2.0.5 2021-03-30 09:43:32 +00:00
Sandro 96f66a5159 Merge pull request #117980 from superherointj/package-tfk8s-v0.1.3
tfk8s: 0.1.2 -> 0.1.3
2021-03-30 10:45:37 +02:00
Sandro 5af7428666 Merge pull request #117958 from ivan/tmux-parallel-building
tmux: enable parallel building
2021-03-30 09:45:26 +02:00
github-actions[bot] 2d211c7a3a Merge staging-next into staging 2021-03-30 06:05:44 +00:00
github-actions[bot] ce7cdafed9 Merge master into staging-next 2021-03-30 06:05:42 +00:00
R. RyanTM 63dc77958d parallel: 20210222 -> 20210322 2021-03-29 23:00:59 -04:00
José Romildo Malaquias 5f4a67abb1 Merge pull request #117572 from r-ryantm/auto-update/jdupes
jdupes: 1.19.1 -> 1.19.2
2021-03-29 23:41:35 -03:00
superherointj 66e40900d3 tfk8s: 0.1.2 -> 0.1.3 2021-03-29 18:05:29 -03:00
Ivan Kozik 6d4741efbe tmux: enable parallel building 2021-03-29 17:57:39 +00:00
github-actions[bot] 884cf463fd Merge staging-next into staging 2021-03-29 12:06:29 +00:00
github-actions[bot] b1788736fd Merge master into staging-next 2021-03-29 12:06:25 +00:00
Sandro adc045cd08 Merge pull request #117915 from zhaofengli/dptrp1-setuptools 2021-03-29 14:06:16 +02:00
Zhaofeng Li a866a76d42 dpt-rp1-py: Add setuptools to propagatedBuildInputs 2021-03-29 00:59:14 -07:00
zowoq c4fbc272a7 miniserve: 0.12.1 -> 0.13.0
https://github.com/svenstaro/miniserve/releases/tag/v0.13.0
2021-03-29 17:25:54 +10:00
github-actions[bot] f311dede4c Merge staging-next into staging 2021-03-29 00:15:53 +00:00
github-actions[bot] d495e7527f Merge master into staging-next 2021-03-29 00:15:48 +00:00
Anderson Torres b9753491a3 Merge pull request #117912 from AndersonTorres/new-urjtag
urjtag: 2019.12 -> 2021.03
2021-03-28 19:56:47 -03:00
Maximilian Bosch c2836eb953 Merge pull request #117809 from mayflower/graylog-4
graylog: improve JRE handling
2021-03-28 23:47:26 +02:00
AndersonTorres 950085c3dd urjtag: 2019.12 -> 2021.03 2021-03-28 18:46:30 -03:00
Robert Helgesson f0c01da492 svtplay-dl: 3.0 -> 3.3
PR #117907
2021-03-28 22:27:21 +02:00
Robert Scott 152c3eed2e Merge pull request #117777 from r-ryantm/auto-update/goreleaser
goreleaser: 0.160.0 -> 0.161.1
2021-03-28 21:03:26 +01:00
Linus Heckemann 22de3c19e7 graylog: improve JRE handling
Since the upstream graylogctl script will prefer finding its java
executable based on JAVA_HOME, we now set this instead of PATH in
order to allow it to find the JRE. By setting it conditionally on it
not already being set, we allow selecting a different JRE at runtime.

We also explicitly use openjdk11, which supports the
UseConcMarkSweepGC option which graylog insists on using.
2021-03-28 14:37:28 +02:00
github-actions[bot] 2ed7687b19 Merge staging-next into staging 2021-03-28 00:15:43 +00:00
github-actions[bot] 732dc6ef8f Merge master into staging-next 2021-03-28 00:15:41 +00:00
Fabian Affolter f6d072dcde Merge pull request #117762 from r-ryantm/auto-update/chezmoi
chezmoi: 2.0.3 -> 2.0.4
2021-03-28 01:08:08 +01:00
R. RyanTM cb231de72b miniserve: 0.12.0 -> 0.12.1 2021-03-28 05:58:12 +10:00
github-actions[bot] bef3b9438a Merge staging-next into staging 2021-03-27 18:14:11 +00:00
github-actions[bot] 95c24d591a Merge master into staging-next 2021-03-27 18:14:08 +00:00
R. RyanTM f12df7e100 lazydocker: 0.10 -> 0.12 2021-03-27 15:04:19 +00:00
R. RyanTM b858559f86 goreleaser: 0.160.0 -> 0.161.1 2021-03-27 11:39:21 +00:00
R. RyanTM 886d435212 chezmoi: 2.0.3 -> 2.0.4 2021-03-27 07:40:09 +00:00
github-actions[bot] 33d1f480ac Merge staging-next into staging 2021-03-26 18:13:57 +00:00