Commit Graph

366 Commits

Author SHA1 Message Date
Vaibhav Sagar
13bce289b6 all-cabal-hashes: bump to 2018-04-19T00:28:09Z 2018-04-19 09:30:05 +08:00
Frederik Rietdijk
ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Peter Simons
120a7ffb55 hackage-db: update snapshot 2018-04-11 11:25:30 +02:00
Frederik Rietdijk
0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Jörg Thalheim
6b69f22f13 iana-etc: 20180108 -> 20180405 2018-04-07 08:27:40 +01:00
R. RyanTM
022b5bf693 osinfo-db: 20180311 -> 20180325
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/osinfo-db/versions.

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 20180325 with grep in /nix/store/sdr910akq1gsdl16247miad3846naixs-osinfo-db-20180325
- directory tree listing: https://gist.github.com/9b051f2ceaf735649e31d21d5881f6bd
2018-03-30 21:38:44 -07:00
Peter Simons
edd72a0736 hackage: update db snapshot 2018-03-29 20:46:32 +02:00
Peter Simons
eb8127a1d2 hackage: update db snapshot 2018-03-25 20:21:45 +02:00
Daiderd Jordan
e52250b33c
scowl: fix darwin build
/cc ZHF #36454
2018-03-25 15:24:35 +02:00
Ryan Mulligan
e6a3b5392d osinfo-db: 20170813 -> 20180311 (#37071)
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 20180311 with grep in /nix/store/2a26a2ic31kvg85krsqn5j1jnndhm70l-osinfo-db-20180311
- found 20180311 in filename of file in /nix/store/2a26a2ic31kvg85krsqn5j1jnndhm70l-osinfo-db-20180311
2018-03-23 14:51:12 -05:00
Michael Raskin
c940d2e1ac
Merge pull request #37158 from oxij/pkgs/tor-browsers
update tor browsers
2018-03-16 18:06:50 +00:00
taku0
16ee6b5ed9 nss: 3.34.1 -> 3.35; cacert.certdata2pem: 20160104 -> 20170717 2018-03-16 03:42:09 +00:00
Peter Simons
e14fa3f228 hackage: update db snapshot 2018-03-15 21:33:05 +01:00
Tuomas Tynkkynen
2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Peter Simons
1aaed17244 hackage: update database snapshot to latest version 2018-03-13 21:42:54 +01:00
Shea Levy
aabfda6d5d
Merge branch 'merge/master-to-staging-20180310' of git://github.com/oxij/nixpkgs into staging 2018-03-11 17:28:07 -04:00
mingchuan
cbf735e3f1
brise: change platforms to linux only 2018-03-11 23:46:05 +08:00
Michael Raskin
bf41b468ad
Merge pull request #35588 from xeji/cacert-unbundled
cacert: add output "unbundled" for individual certificates
2018-03-11 10:08:07 +00:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Ivan Solyankin
fed464103f libkkc-data: init at 0.2.7 2018-03-10 17:13:38 +03:00
Peter Simons
68fd23fbb2 hackage: update database snapshot to latest version 2018-03-06 21:24:50 +01:00
Peter Simons
18055971cb hackage: update database snapshot to latest version 2018-03-05 16:45:07 +01:00
Tuomas Tynkkynen
1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Peter Simons
e05c99cfda hackage: update database snapshot to latest version 2018-03-01 21:58:31 +01:00
Shea Levy
942855c8bd
tzdata: Fix cross-compilation 2018-02-28 15:01:33 -05:00
Tuomas Tynkkynen
34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Ryan Mulligan
f3ed511b44
media-player-info: 22 -> 23
Semi-automatic update. These checks were performed:

- built on NixOS
- found 23 with grep in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
- found 23 in filename of file in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
2018-02-27 23:54:09 +01:00
Vladimír Čunát
e2243a5ac9
Revert "Revert "Merge staging at '8d490ca9934d0' into master""
This reverts commit f5ce8f86df.
2018-02-26 22:54:48 +01:00
Vladimír Čunát
f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.
2018-02-26 22:53:18 +01:00
Peter Simons
0f7a7cb3d8 hackage: update db snapshot 2018-02-26 14:28:40 +01:00
Frederik Rietdijk
fc23242220 Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master 2018-02-26 13:05:32 +01:00
xeji
c9a1639e20 cacert: add output "unbundled"
which contains all certs, each in a separate file.
This output is not installed by default.
2018-02-25 23:48:54 +01:00
Tuomas Tynkkynen
ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02:00
Peter Simons
51c6ca0643 hackage: update database snapshot to latest version 2018-02-23 17:59:06 +01:00
Nikolay Amiantov
a984be41ab Merge branch 'master' into staging 2018-02-23 18:51:08 +03:00
volth
e28cf0cbfb
data/mime-types: make derivation fixed-output 2018-02-22 17:14:43 +00:00
Vladimír Čunát
2dd10ea013
Merge #34541: poppler: 0.56.0 -> 0.62.0 2018-02-22 00:49:59 +01:00
George Wilson
85701a15ae hackage: update all-cabal-hashes snapshot to Hackage at 2018-02-12T02:28:56Z 2018-02-12 13:40:55 +10:00
Jan Tojnar
a711891a83
poppler_data: 0.4.7 → 0.4.8 2018-02-03 01:01:44 +01:00
Michael Raskin
00cafb4c8d scowl: support installing just words.txt
The expression now supports having `words.txt` in some place without tens
and tens of megabytes of all the wordlist and spelling dictionaries. Set
`singleWordlist` parameter to the string of region and size settings. For
example:
```
scowl.override{singleWordlist = "en-gb-ise 60";}
```

Should be useful for #34486
2018-02-02 21:54:13 +01:00
Franz Pletz
cc98976b47
wireless-regdb: 2017.03.07 -> 2017.12.23 2018-01-28 18:52:23 +01:00
Peter Simons
809a09eb5e hackage: update all-cabal-hashes snapshot to Hackage at 2018-01-18T14:32:45Z 2018-01-18 17:01:33 +01:00
Tuomas Tynkkynen
67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
Tobias Geerinckx-Rice
0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Jörg Thalheim
efc17cbd21 iana-etc: 20171106 -> 20180108 2018-01-13 09:45:51 +00:00
Daiderd Jordan
6c39c9cbfa
tzdata: use addEnvHooks 2018-01-07 21:26:22 +01:00
Daiderd Jordan
406e162884
cacert: use addEnvHooks 2018-01-07 21:25:48 +01:00
Daiderd Jordan
5a02143c20
Merge pull request #33010 from LnL7/cacert-hook
cacert: add hook that sets SSL_CERT_FILE
2018-01-07 09:55:15 +01:00
Orivej Desh
679dbd0667
Merge pull request #32987 from romildo/upd.adapta-backgrounds
adapta-backgrounds: 0.5.1.1 -> 0.5.2.3
2018-01-06 02:27:00 +00:00
José Romildo Malaquias
bcf7218fde adapta-backgrounds: 0.5.1.1 -> 0.5.2.3 2018-01-01 07:15:17 -02:00