3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1777 commits

Author SHA1 Message Date
Thiago Kenji Okada 33e333e2a6
Merge pull request #148910 from rasendubi/escrotum-2020-12-07
escrotum: 2019-06-10 -> 2020-12-07
2021-12-06 10:42:29 -03:00
Alexey Shmalko 9e8df69a9f
escrotum: 2019-06-10 -> 2020-12-07 2021-12-06 09:26:23 +02:00
Robert Helgesson f88b90f5c3 facedetect: use Python 3 2021-12-05 23:03:18 +01:00
Bobby Rong 6db1d43baf
Merge pull request #148094 from kira-bruneau/goverlay
goverlay: 0.6.4 → 0.7
2021-12-03 09:30:31 +08:00
Kira Bruneau 3151b3d717 goverlay: 0.6.4 → 0.7 2021-11-30 23:27:48 -05:00
github-actions[bot] 9c838c8b51
Merge master into staging-next 2021-11-28 00:02:51 +00:00
AndersonTorres 9440449acb aaphoto: set meta.broken to true in Darwin
It fails detecting OpenMP libraries.
2021-11-27 17:12:50 -03:00
AndersonTorres fc66ea690a aaphoto: init at 0.43.1 2021-11-27 17:12:49 -03:00
AndersonTorres 66236eeb4b flam3: 3.1.1 -> 3.1.1+date=2018-04-12 2021-11-27 17:12:49 -03:00
github-actions[bot] c39cd5f314
Merge master into staging-next 2021-11-26 00:01:38 +00:00
Kerstin Humm 1d2c379e3b
graphviz_2_32: remove
It is broken and their is no usage in current nixpkgs.

Also the notice about its necessity is from 2014:
08131bd5d5
2021-11-25 20:10:34 +01:00
Jonathan Ringer 4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
Conflicts:
	nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
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] a02cedf319
Merge staging-next into staging 2021-11-18 06:01:57 +00: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
Robert Hensing 9005cb8835
Merge pull request #145841 from l0b0/fix-indentation
Fix indentation
2021-11-18 00:38:59 +01: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
Victor Engmark 57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13: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