Commit graph

1540 commits

Author SHA1 Message Date
Matthew Bauer
3ed3aa0884
Merge pull request #126305 from andersk/mesa-demos-data
mesa-demos: Configure --with-system-data-files
2021-06-10 13:29:09 -05:00
Sandro
1ff2de3b13
Merge pull request #125981 from musfay/glmark2
glmark2: 2017-09-01 -> 2021.02
2021-06-09 15:21:16 +02:00
Mustafa Çalışkan
ef12ba0d04
glmark2: 2017-09-01 -> 2021.02 2021-06-09 14:33:35 +03:00
Anders Kaseorg
b3f37af994 mesa-demos: Configure --with-system-data-files
Fixes #126301.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-06-08 21:03:03 -07:00
R. RyanTM
fc48487637 astc-encoder: 2.5 -> 3.0 2021-06-03 13:45:06 +00:00
Mitsuhiro Nakamura
b9bf2ab441 feedgnuplot: 1.51 -> 1.58 2021-05-28 20:52:39 +09:00
Mitsuhiro Nakamura
75176e353c feedgnuplot: fix perl shebang 2021-05-28 20:52:39 +09:00
R. RyanTM
88c0658236 gifski: 1.4.0 -> 1.4.3 2021-04-28 11:01:05 +00:00
Ryan Mulligan
8c0828e4ce
Merge pull request #124104 from r-ryantm/auto-update/agi
agi: 1.1.0-dev-20210517 -> 1.1.0-dev-20210521
2021-05-25 11:27:45 -07:00
R. RyanTM
3dc662d5cb agi: 1.1.0-dev-20210517 -> 1.1.0-dev-20210521 2021-05-23 06:03:49 +00:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
Sandro
55aa5e870c
Merge pull request #123226 from pacien/ldgallery-fix-darwin-build 2021-05-22 15:51:52 +02:00
pacien
eb01e51938 ldgallery: fix darwin build
This adds a missing build dependency for building on Darwin.

GitHub: fixes #122681
2021-05-22 15:27:17 +02:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
R. RyanTM
aaa5b24921 agi: 1.1.0-dev-20210514 -> 1.1.0-dev-20210517 2021-05-20 14:47:44 -07:00
github-actions[bot]
8a5e4be6b6
Merge master into staging-next 2021-05-19 18:34:10 +00:00
R. RyanTM
54a5d41968 agi: 1.1.0-dev-20210513 -> 1.1.0-dev-20210514 2021-05-19 10:46:17 -07:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Stéphan Kochen
df51504424 pikchr: fix darwin build 2021-05-18 11:46:51 +02:00
Sandro
f85bc843c2
Merge pull request #122759 from dotlambda/mono6 2021-05-18 01:25:35 +02:00
Jonathan Ringer
c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Michael Raskin
70b37f9bf2
Merge pull request #123340 from dotlambda/cfdg-ffmpeg
cfdg: use ffmpeg instead of ffmpeg_3
2021-05-17 11:04:55 +00:00
Robert Schütz
d9252ffa69 cfdg: use ffmpeg instead of ffmpeg_3 2021-05-17 11:40:22 +02:00
github-actions[bot]
3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Martin Weinelt
7bd65d54f7 treewide: remove nand0p as maintainer
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.

- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
  maintainer-list, which they didn't reply to.
2021-05-17 01:50:49 +02:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging 2021-05-16 01:01:01 +00:00
github-actions[bot]
b484cef365
Merge master into staging-next 2021-05-16 01:00:58 +00:00
Sandro
8c756df77e
Merge pull request #122935 from r-ryantm/auto-update/agi
agi: 1.1.0-dev-20210507 -> 1.1.0-dev-20210513
2021-05-15 21:34:05 +02:00
github-actions[bot]
78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Jonathan Ringer
0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Stéphan Kochen
bb24db68aa
dmtx-utils: fix darwin build (#123033) 2021-05-14 17:34:07 -04:00
R. RyanTM
f3b5e9c76d agi: 1.1.0-dev-20210507 -> 1.1.0-dev-20210513 2021-05-14 01:21:17 +00:00
Robert Schütz
d099e7558e mono: 5 -> 6 2021-05-12 21:32:40 +02:00
github-actions[bot]
b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Martin Weinelt
a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
Sandro
76e3279009
Merge pull request #122636 from rmcgibbo/vips
vips: fix darwin
2021-05-12 18:15:41 +02:00
github-actions[bot]
e2cf474986
Merge staging-next into staging 2021-05-12 06:21:36 +00:00
github-actions[bot]
d8fb37f470
Merge master into staging-next 2021-05-12 06:21:33 +00:00
davidak
4beb9ae883
Merge pull request #122465 from MetaDark/mangohud
mangohud: 0.4.1 → 0.6.1
2021-05-12 07:49:01 +02:00
Robert T. McGibbon
c7b3d9522b vips: fix darwin 2021-05-11 16:54:27 -04:00
Kira Bruneau
c3a52c2a27 mangohud: 0.4.1 → 0.6.1 2021-05-11 12:52:12 -04:00
Jan Tojnar
7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
github-actions[bot]
10e16ec9ab
Merge master into staging-next 2021-05-11 06:20:33 +00:00
R. RyanTM
4b9a7b96dc agi: 1.1.0-dev-20210506 -> 1.1.0-dev-20210507 2021-05-11 00:34:00 +00:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
github-actions[bot]
450e66080b
Merge master into staging-next 2021-05-09 18:23:01 +00:00
Ryan Mulligan
b64ef0127c
Merge pull request #121967 from r-ryantm/auto-update/agi
agi: 1.1.0-dev-20210504 -> 1.1.0-dev-20210506
2021-05-09 10:46:46 -07:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00