Commit Graph

1762 Commits

Author SHA1 Message Date
github-actions[bot]
28641f51dc
Merge master into staging-next 2021-11-22 18:01:08 +00:00
Bobby Rong
bd5bb0b250
Merge pull request #146988 from teto/wdisplays
wdisplays: set metaProgram
2021-11-22 22:07:34 +08:00
Matthieu Coudron
90e60e6529 wdisplays: set metaProgram 2021-11-22 12:31:06 +01:00
github-actions[bot]
18ad263272
Merge master into staging-next 2021-11-21 18:01:07 +00:00
Ryan Burns
2175b157ac treewide: refactor isi686 && isx86_64 -> isx86 2021-11-20 17:50:41 -08:00
github-actions[bot]
385e4f8531
Merge master into staging-next 2021-11-18 06:01:22 +00:00
jgart
50bbc006ba svgcleaner: Remove deprecated package. 2021-11-17 22:51:20 -05:00
github-actions[bot]
90829d83e5
Merge master into staging-next 2021-11-17 00:01:49 +00:00
Martin Weinelt
37fa1e7c1d treewide: pass and inherit writeShellScript in node2nix packages 2021-11-16 16:08:23 +01:00
github-actions[bot]
cfaff97318
Merge staging-next into staging 2021-11-15 18:01:43 +00:00
Domen Kožar
147de63ed8
Merge pull request #146087 from starcraft66/pngcheck-darwin
pngcheck: build on darwin and take ownership
2021-11-15 06:37:50 -06:00
Tristan Gosselin-Hane
d4fbff9d64 pngcheck: take ownership 2021-11-15 01:59:06 -05:00
Tristan Gosselin-Hane
75322a3817 pngcheck: enable building on darwin 2021-11-15 01:58:37 -05:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
github-actions[bot]
bc35dc4f3b
Merge master into staging-next 2021-11-14 12:01:23 +00:00
Michael Weiss
983f488688
Merge pull request #145891 from primeos/updates/wallutils/5.10.0
wallutils: 5.9.0 -> 5.10.0
2021-11-14 11:58:15 +01:00
Michael Weiss
830a13f2e5
wallutils: remove myself as maintainer 2021-11-14 11:09:34 +01:00
Michael Weiss
2812d0802a
wallutils: 5.9.0 -> 5.10.0 2021-11-14 11:06:48 +01:00
Alyssa Ross
26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
sternenseemann
1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
Nikolay Korotkiy
1493e60f77
pngquant: fix cross-compilation 2021-11-12 22:10:58 +03:00
Alyssa Ross
3c710c46b1
graphviz: fix cross 2021-11-12 17:19:02 +00:00
github-actions[bot]
fd8fae936e
Merge staging-next into staging 2021-11-12 06:02:01 +00:00
github-actions[bot]
9a30ed0017
Merge master into staging-next 2021-11-12 06:01:24 +00:00
Kerstin Humm
bb799694db
epoxy: rename to libepoxy
https://github.com/NixOS/nixpkgs/issues/145040
2021-11-11 05:55:32 +01:00
github-actions[bot]
07e8aeb3a0
Merge master into haskell-updates 2021-11-11 00:07:11 +00:00
github-actions[bot]
62b9b0d9e8
Merge staging-next into staging 2021-11-11 00:02:20 +00:00
github-actions[bot]
b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Felix Bühler
f5c12e8311
treewide: replace '-git' packages with 'unstable-' in version (#145396) 2021-11-10 16:21:47 -05:00
github-actions[bot]
5e2757bf32
Merge staging-next into staging 2021-11-10 18:02:01 +00:00
github-actions[bot]
259e08cd22
Merge master into staging-next 2021-11-10 18:01:21 +00:00
Thiago Kenji Okada
9db32decb5
Merge pull request #144668 from liji-canva/master
perceptualdiff: set "meta.platforms = platforms.unix"
2021-11-10 10:46:18 -03:00
Liji Yu
93c293ed21 perceptualdiff: set "meta.platforms = platforms.unix" 2021-11-10 12:18:31 +11:00
github-actions[bot]
da2c9c6eab
Merge master into haskell-updates 2021-11-10 00:07:08 +00:00
github-actions[bot]
56736d0fbc
Merge staging-next into staging 2021-11-09 18:02:05 +00:00
github-actions[bot]
7414a16ee5
Merge master into staging-next 2021-11-09 18:01:23 +00:00
Mario Rodas
30f982bc81
Merge pull request #144907 from kira-bruneau/goverlay
goverlay: 0.6.3 → 0.6.4
2021-11-09 07:20:18 -05:00
github-actions[bot]
b0e58bafbe
Merge master into haskell-updates 2021-11-08 00:07:25 +00:00
github-actions[bot]
ba6336466e
Merge staging-next into staging 2021-11-07 18:01:44 +00:00
github-actions[bot]
14f1b9f2ac
Merge master into staging-next 2021-11-07 18:01:14 +00:00
Ellie Hermaszewska
15ae25f36c
haskell: switch from haskell.lib to haskell.lib.compose 2021-11-07 20:18:45 +08:00
Randy Eckenrode
4dcf909d04
pngout: 20150319 -> 20200115
- Also include support for additional architectures: aarch64-linux,
  armv7l-linux, and x86_64-darwin; and
- Change license to `unfreeRedistributable` per the 2021-01-16
  update on Ken’s utility page allowing non-commercial redistribution.
2021-11-06 23:19:58 -04:00
Kira Bruneau
c56c434dba goverlay: 0.6.3 → 0.6.4 2021-11-06 13:04:23 -04:00
Sandro Jäckel
41892fdd64
graphviz: remove xorg null override 2021-11-05 21:10:03 +01:00
Artturin
74dbb75ea4 graphviz: fix build with strictDeps 2021-11-05 19:57:03 +02:00
github-actions[bot]
e92f6f6da8
Merge staging-next into staging 2021-10-31 18:01:34 +00:00
github-actions[bot]
7ca1d48ff2
Merge master into staging-next 2021-10-31 18:01:01 +00:00
Artturi
50f4571c35
Merge pull request #137011 from kira-bruneau/goverlay 2021-10-31 19:32:52 +02:00
Robert Scott
4bb4e58849
Merge pull request #143140 from r-ryantm/auto-update/netpbm
netpbm: 10.92.0 -> 10.96.2
2021-10-31 16:08:29 +00:00
github-actions[bot]
062a1496d6
Merge staging-next into staging 2021-10-30 18:01:37 +00:00