JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263,756 Commits 2 Branches 0 Tags 12 GiB
1062246907
Commit Graph

69 Commits

Author SHA1 Message Date
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
 2020-10-26 08:19:17 +01:00
Jan Tojnar
b4a6714571
Merge branch 'staging-next' into staging 2020-04-13 18:54:59 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Tor Hedin Brønner
cd00bc2ccd atk: 2.35.1 -> 2.36.0 2020-04-08 09:52:36 +02:00
Tor Hedin Brønner
37e51f7c51
atk: 2.34.1 -> 2.35.1 2020-03-24 07:10:42 +01:00
Matthew Bauer
ebdd644836 atk: needs glib in nativeBuildInputs 2020-03-06 00:45:46 -05:00
Tor Hedin Brønner
0e341a35e5 atk: 2.32.0 → 2.34.1 
Fix .pc file requires gobject:
https://gitlab.gnome.org/GNOME/atk/merge_requests/30
 2019-09-30 19:39:37 +02:00
R. RyanTM
680012bd22 atk: 2.30.0 -> 2.32.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/atk/versions
 2019-03-15 10:23:44 -07:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package 
camelCase package name was a huge inconsistency in GNOME package set.
 2018-12-02 12:42:29 +01:00
Jan Tojnar
3c31467c9d
atk: 2.28.1 → 2.30.0 2018-11-30 21:33:53 +01:00
Jan Tojnar
5cc18c4781
gnome3: remove versionBranch attribute 
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
 2018-10-05 02:17:19 +02:00
Matthew Bauer
c605d171bb treewide: remove lintl references 
libintl should be used directly, not through NIX_LDFLAGS.
 2018-05-16 01:02:31 -05:00
Shea Levy
0f854cd2d1
Merge branch 'master' into staging 2018-03-24 01:34:53 -04:00
Daiderd Jordan
2700690f17
atk: fix darwin install_name 2018-03-23 23:08:15 +01:00
Matthew Bauer
ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Jan Tojnar
a5bc51fa2a
atk: port to meson 2018-03-22 07:46:47 +01:00
Ryan Mulligan
b81e300dbd atk: 2.26.1 -> 2.28.1 
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.28.1 with grep in /nix/store/gqr774xsr2qkb7g7s5zz56lyvdf0qm0c-atk-2.28.1
- found 2.28.1 in filename of file in /nix/store/gqr774xsr2qkb7g7s5zz56lyvdf0qm0c-atk-2.28.1
 2018-03-13 23:35:25 -07:00
Jan Tojnar
5b970e47fa
atk: add updateScript 2018-03-04 20:05:53 +01:00
Jan Tojnar
79dd83d466
atk: do not propagate gi 2017-12-22 23:27:34 +01:00
Jan Tojnar
77a8e8e167
atk: 2.26.0 → 2.26.1 2017-12-04 02:07:56 +01:00
Vladimír Čunát
81a074fbd6
atk: 2.22.0 -> 2.26.0 2017-09-24 11:28:30 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Vladimír Čunát
cf205e4630
atk: 2.20.0 -> 2.22.0 
That's the gnome-3.22 version.
 2016-12-03 12:38:35 +01:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Vladimír Čunát
6352251cbe atk: update 2.18.0 -> 2.20.0 2016-05-22 12:10:41 +02:00
Vladimír Čunát
787f322540 $docdev fixups: mostly to avoid empty output 
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
 2015-10-28 18:58:06 +01:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Luca Bruno
63ccbf55b2 atk: 2.16.0 -> 2.18.0 2015-09-25 10:48:40 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Luca Bruno
db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Vladimír Čunát
5cad555ab1 gtk3 stack: go back to gnome-3.12 branches for now 2014-11-14 23:32:28 +01:00
Vladimír Čunát
3ecd4dcf72 gtk3 stack libs: update all to gnome-3.14 branches 
All NEWS look safe and relatively quiet.
 2014-10-23 10:51:54 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát
151ac5ab9e gtk+3 core stack: update to 3.12 2014-03-27 20:53:50 +01:00
Vladimír Čunát
68430cf3d7 Merge branch master into x-updates 
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
 2013-11-16 20:32:44 +01:00
Eelco Dolstra
58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Mathijs Kwik
f4903d890e Merge branch 'master' into x-updates 2013-11-01 08:35:16 +01:00
Mathijs Kwik
db83d9a35b Merge branch 'master' into multiple-outputs 2013-11-01 08:29:09 +01:00
Vladimír Čunát
cb8fff57c1 update gtk deps, on GNOME-3.10 branches now 2013-10-05 21:25:53 +02:00
Bjørn Forsman
28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Mathijs Kwik
1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
 2013-09-11 10:53:31 +02:00
Vladimír Čunát
7fbcc56260 add introspection into GTK libs (part of #517) 
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
 2013-08-04 21:11:24 +02:00
Eelco Dolstra
552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-25 18:42:56 +02:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal
7e52e251e8 atk: add libintlOrEmpty as build input 2013-06-13 16:30:27 +10:00
Eelco Dolstra
99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-09 00:41:27 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
8406a62973 gtk3: core platform update (versions from GNOME 3.8) 2013-03-29 02:22:29 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00