Commit graph

2885 commits

Author SHA1 Message Date
Ben Wolsieffer
d50bcaa816 uboot: sheevplug and guruplug: use mainline U-Boot
These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.

(cherry picked from commit 01020b3263)
(cherry picked from commit 48ade50d8ece09d3ff732b07f0facdcd78084ac3)
2018-05-13 16:12:08 -04:00
Ben Wolsieffer
2a450cec19 uboot: add patch to increase maximum path length in extlinux.conf
This fixes problems with cross compiled kernels failing to boot.

(cherry picked from commit 1f4bb8c61d)
(cherry picked from commit 828fdd61b9b5ae0d3c9253309f3d115210348096)
2018-05-13 16:09:00 -04:00
Ben Wolsieffer
d29202bc48 uboot: 2017.11 -> 2018.03, cross fixes
(cherry picked from commit 5804547243)
(cherry picked from commit 7c46833b047710f220971d7d7d3b1dbe6fed805b)
2018-05-13 16:09:00 -04:00
Frederik Rietdijk
658b7c3f2e Merge master into staging 2018-05-13 12:13:25 +02:00
John Ericson
2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
José Romildo Malaquias
70ef1faa25 materia-theme: unset $name in install script
- install.sh uses a global environment variable called $name, if defined,
to name the theme. This is an issue because nix sets this variable to
the package name.

- Replace gnome-themes-standard to gnome-themes-extra.
2018-05-12 18:42:02 -03:00
R. RyanTM
6a0ec8d8cc adapta-gtk-theme: 3.93.1.1 -> 3.93.1.14
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/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.)
- directory tree listing: https://gist.github.com/0aedec168a2b1c219c86840c99bb541f
2018-05-12 15:32:46 +02:00
John Ericson
ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Matthew Bauer
352f8cb6b6 retroarch: fix on macOS 2018-05-10 23:58:12 -05:00
John Ericson
67db915a43 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 16:35:04 -04:00
José Romildo Malaquias
461903974e theme-jade1: init at 3.2 2018-05-10 14:46:32 -03:00
John Ericson
42f6e7c4e4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 12:04:17 -04:00
Frederik Rietdijk
64c8c6dcb3 Merge master into staging 2018-05-10 09:30:56 +02:00
José Romildo Malaquias
2b9db24768 zuki-themes: 3.26-1 -> 3.28-1 2018-05-09 20:03:48 -03:00
José Romildo Malaquias
e745d087c6 plano-theme: 3.24-3 -> 3.28-1 2018-05-09 16:44:28 -03:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Jörg Thalheim
2326fd2d53
Merge pull request #39404 from dwe11er/wine-vulkan
wine: add vulkanSupport option
2018-05-07 16:25:50 +01:00
Joachim F
7a39cb90a1
Merge pull request #39685 from ikervagyok/wine37
wine-{Unstable,Staging}: 3.5 -> 3.7
2018-05-06 09:47:46 +00:00
Raymond Gauthier
5146fad639 vscode-extension-ms-vscode-cpptools: 0.12.3 -> 0.16.1 2018-05-05 00:58:54 -04:00
xeji
b1e20c9d4e
Merge pull request #39797 from r-ryantm/auto-update/adapta-gtk-theme
adapta-gtk-theme: 3.93.0.258 -> 3.93.1.1
2018-05-05 00:57:22 +02:00
xeji
344978064f
Merge pull request #39939 from romildo/upd.obsidian-2
theme-obsidian2: init at 2.5
2018-05-05 00:44:02 +02:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Justin Bauer
b45ef79b74
Merge pull request #39907 from matthewbauer/work
Miscellaneous cleanups
2018-05-03 13:33:42 -05:00
José Romildo Malaquias
bfb3232a13 theme-obsidian2: init at 2.5 2018-05-03 15:19:54 -03:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Ben Creasy
d98146985c vim-utils: update plugin generation instruction
Currently the pager is a problem but in general fetching
all these plugins is inefficient for the general case.
2018-05-02 22:31:53 -07:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Matthew Justin Bauer
d85795a1c7
Merge pull request #39437 from LumiGuide/fix-source-and-tags
source-and-tags: fix default.nix
2018-05-01 10:21:07 -05:00
Matthew Justin Bauer
b6a771f670
Merge pull request #39793 from ryantm/https
treewide: http to https
2018-05-01 02:05:55 -05:00
Cray Elliott
800c46b24b dolphinEmuMaster: 20171218 -> 20180430
also fix build
2018-04-30 23:46:14 -07:00
R. RyanTM
d13572817e adapta-gtk-theme: 3.93.0.258 -> 3.93.1.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/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.)
- directory tree listing: https://gist.github.com/5796929fde76fddc1465d9cfbc2ace7b
2018-04-30 23:32:00 -07:00
Ryan Mulligan
038a0c9a60 treewide: http to https 2018-04-30 21:39:20 -07:00
xeji
89d2dbb363
Merge pull request #39625 from bgamari/bump-hplip
hplip: 3.17.11 -> 3.18.3
2018-04-30 18:50:27 +02:00
Lengyel Balazs
87b51a1e67 wine-{Unstable,Staging}: 3.5 -> 3.7 2018-04-29 22:22:19 +02:00
Ben Gamari
8a07916fa9 hplip: 3.17.11 -> 3.18.3 2018-04-29 15:19:10 -04:00
Jörg Thalheim
3ccb77b8a2
Merge pull request #39511 from steveeJ/sj-add-kyocera-drivers
cups-kyodialog3: init at 8.1601
2018-04-28 19:54:06 +01:00
Jörg Thalheim
ea5787ad52 cups-kyodialog3: use autoPatchelfHook, add missing qt4 2018-04-28 13:02:20 +01:00
Jörg Thalheim
4071b64ae4
Merge pull request #38883 from romildo/new.onestepback
onestepback: init at 0.98
2018-04-28 13:01:25 +01:00
Profpatsch
b90104ea0e lib/debug: fix use-sites of deprecated debug functions 2018-04-27 18:59:39 +02:00
Stefan Junker
c600f02e43 cups-kyodialog3: init at 8.1601 2018-04-26 00:24:37 +02:00
José Romildo Malaquias
524b29471b onestepback: init at 0.98 2018-04-25 16:03:09 -03:00
Daiderd Jordan
e609551090
vim-nix: 2018-04-15 -> 2018-04-24 2018-04-25 18:48:16 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Bas van Dijk
40bb3374e9 source-and-tags: fix default.nix
Tested by observing that the following command produces a correctly
looking TAGS file:

$ nix-shell -E 'let pkgs = import ./. {}; in pkgs.myEnvFun {name = "myEnvFun-htags-test"; buildInputs = [(pkgs.sourceAndTags.sourceWithTagsDerivation (pkgs.sourceAndTags.addHasktagsTaggingInfo pkgs.haskellPackages.scientific).passthru.sourceWithTags)];}' --run 'cat $TAG_FILES'
2018-04-24 23:12:40 +02:00
Matthew Justin Bauer
ab7aaf1b94
Revert "libretro.mame: 2017-06-04 -> 2017-03-02" 2018-04-24 13:54:12 -05:00
Marcin Falkiewicz
0fad5f7a84 wine: add Vulkan support 2018-04-24 14:47:12 +02:00
R. RyanTM
69746047cd sc-controller: 0.4.1 -> 0.4.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc -h’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc --help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped -h’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped --help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped help’ got 0 exit code
- found 0.4.2 with grep in /nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2
- directory tree listing: https://gist.github.com/3f673ef175fbb295f67a2384aef61ede
2018-04-23 08:27:39 -07:00
Jörg Thalheim
93c2a6cfd1
Merge pull request #39252 from r-ryantm/auto-update/cups-filters
cups-filters: 1.20.2 -> 1.20.3
2018-04-21 12:44:30 +01:00
Jörg Thalheim
ca462164a9
Merge pull request #39274 from r-ryantm/auto-update/adapta-gtk-theme
adapta-gtk-theme: 3.93.0.225 -> 3.93.0.258
2018-04-21 10:19:08 +01:00
R. RyanTM
f373be6ebf adapta-gtk-theme: 3.93.0.225 -> 3.93.0.258
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/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.)
- directory tree listing: https://gist.github.com/213ec110793554e28f0630639c2d18bc
2018-04-20 11:28:04 -07:00
R. RyanTM
07900ec4aa cups-filters: 1.20.2 -> 1.20.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip -h’ got 0 exit code
- ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip --help’ got 0 exit code
- found 1.20.3 with grep in /nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3
- directory tree listing: https://gist.github.com/aa62a318dc23326b357322da3e567915
2018-04-20 07:00:24 -07:00
Peter Hoeg
cf7a3a70de Revert "beep: fix for CVE-2018-0492"
This reverts commit 12ce0db1bf.
2018-04-20 08:50:31 +08:00
Will Dietz
4f273627a1 tree-wide: fix instance of "meta.maintainer" -> "meta.maintainers"
Encountered one of these when using check-meta, did a quick
search to find other instances.
2018-04-19 10:41:12 -05:00
Peter Hoeg
12ce0db1bf beep: fix for CVE-2018-0492 2018-04-19 16:11:49 +08:00
LightDiscord
dc48e68221
vscode: fix files with space(s) #39112 2018-04-18 19:07:05 +02:00
Michael Raskin
b5ca7fefc4
Merge pull request #39032 from r-ryantm/auto-update/xscreensaver
xscreensaver: 5.38 -> 5.39
2018-04-18 15:42:02 +00:00
Bas van Dijk
9c8fa9729c elk6: 6.2.3 -> 6.2.4 2018-04-18 00:38:48 +02:00
Bas van Dijk
1593ff3f51 elk5: 5.6.8 -> 5.6.9 2018-04-18 00:38:48 +02:00
Bas van Dijk
54e6c0e7ae elk6: 6.2.2 -> 6.2.3 2018-04-18 00:32:57 +02:00
Bas van Dijk
b3e94a2385 elk6: 6.1.2 -> 6.2.2 2018-04-18 00:32:57 +02:00
Bas van Dijk
390abceb2b elk5: 5.6.6 -> 5.6.8 2018-04-18 00:32:57 +02:00
Daiderd Jordan
7d80c755e8
vim-plugins: disable pager in example command
Fixes #38748
2018-04-17 20:44:49 +02:00
Daiderd Jordan
4dc3b71377
vim-plugins: update 2018-04-17 20:43:03 +02:00
Ryan Mulligan
0f239f6557 fs-uae: 2.8.3 -> 2.8.4 (#37295)
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae --help` got 0 exit code
- ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae --version` and found version 2.8.4
- ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae --help` and found version 2.8.4
- ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae-device-helper -h` got 0 exit code
- ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae-device-helper --help` got 0 exit code
- ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae-device-helper help` got 0 exit code
- found 2.8.4 with grep in /nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4
- directory tree listing: https://gist.github.com/6996324bf1e34d7108f74089af68c981
2018-04-17 10:43:58 -05:00
Matthew Justin Bauer
1edf668a1c
Merge pull request #36790 from pjan/tmux-plugins
adds tmuxPlugins
2018-04-17 10:24:10 -05:00
Matthew Justin Bauer
84085651f6
Merge pull request #37203 from ryantm/auto-update/jack1
jack1: 0.124.1 -> 0.125.0
2018-04-17 10:18:05 -05:00
R. RyanTM
27ca928dc8 xscreensaver: 5.38 -> 5.39
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xscreensaver/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 5.39 with grep in /nix/store/gbzmzb9nq2frp4q1mmz2946gzcx536v3-xscreensaver-5.39
- directory tree listing: https://gist.github.com/aa36e0385c0160a833c83693ce83be28
2018-04-16 18:34:43 -07:00
Daiderd Jordan
1935782c00
vim-plugins: add bats.vim 2018-04-15 20:15:39 +02:00
Matthew Justin Bauer
064d4bfee1
Merge pull request #38476 from coreyoconnor/wine-3.5
wine-unstable: 3.4 -> 3.5 (and staging likewise)
2018-04-14 23:26:54 -05:00
Maximilian Bosch
4314d14ea0
i3lock-pixeled: 1.1.0 -> 1.2.0
Simple feature release with some improvements.
See https://github.com/Ma27/i3lock-pixeled/releases/tag/1.2.0
2018-04-14 23:43:25 +02:00
Jörg Thalheim
8d0791c720
Merge pull request #38898 from r-ryantm/auto-update/gutenprint
gutenprint: 5.2.13 -> 5.2.14
2018-04-14 09:22:23 +01:00
Julien Dehos
25edf5ad52 julia-vim: init at 2018-03-27 2018-04-13 15:22:18 +02:00
R. RyanTM
f5c30005f5 gutenprint: 5.2.13 -> 5.2.14
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/escputil -h’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/escputil --help’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/testpattern -h’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/testpattern --help’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/testpattern help’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppd.5.2 -h’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppd.5.2 help’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppdupdate -h’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppdupdate --help’ got 0 exit code
- ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppdupdate help’ got 0 exit code
- found 5.2.14 with grep in /nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14
- directory tree listing: https://gist.github.com/6d652f72cb774ccd13cc489d708ad63d
2018-04-13 05:03:51 -07:00
José Romildo Malaquias
1a525eeab1 numix-solarized: 20160919 -> 20170810 2018-04-12 18:56:41 -03:00
Pascal Wittmann
7427b58266 Switch suckless.org URLs to https
(cherry picked from commit 22f212537f475565f67a07b869f9cceea2022191)
2018-04-11 15:11:55 +02:00
Robert Schütz
80fc5f2a24 Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
Matthew Justin Bauer
bfda2d470c
Merge pull request #32605 from xrvdg/hl1110
hl1110 : init at 3.0.1-1
2018-04-09 14:32:35 -05:00
Matthew Justin Bauer
5df54f9e29
Merge pull request #33919 from samueldr/feature/hll2390dw-cups
hll2390dw-cups: init at 4.0.0-1
2018-04-09 14:28:34 -05:00
Jörg Thalheim
849a685970 vimPlugins.colors-solarized: add old alias back 2018-04-09 18:33:35 +01:00
Jörg Thalheim
a2cd838280 vimPlugins.UltiSnips: add old alias back 2018-04-09 18:20:23 +01:00
Frederik Rietdijk
0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Jörg Thalheim
60b5384780 vimPlugins.surround: fix typo (was sourround) 2018-04-09 09:20:01 +01:00
Matthew Justin Bauer
e05cd54603
Merge pull request #38308 from ikervagyok/wine
wine: 3.4 -> 3.5
2018-04-08 21:29:20 -05:00
Jörg Thalheim
73df91ea37 vimPlugins.matchit-zip: remove unpack phase 2018-04-08 22:27:17 +01:00
Jörg Thalheim
77303e90a6 vimPlugins.cpsm: wants ncurses 2018-04-08 22:26:53 +01:00
Jörg Thalheim
99c27720ed vimPlugins: sort plugin name list alphabetically 2018-04-08 22:14:36 +01:00
Jörg Thalheim
260d90d936 vimPlugins: use github https links
git protocol is insecure and does not work behind proxies.
Therefore prefix github: before every name
2018-04-08 22:11:11 +01:00
Frederik Rietdijk
595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
Jörg Thalheim
d6765af468
Merge pull request #38599 from r-ryantm/auto-update/adapta-gtk-theme
adapta-gtk-theme: 3.93.0.174 -> 3.93.0.225
2018-04-08 09:29:45 +01:00
R. RyanTM
dfcbd477be adapta-gtk-theme: 3.93.0.174 -> 3.93.0.225
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/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.)
- directory tree listing: https://gist.github.com/3865bcde7ac7faabba940e89c5114260
2018-04-07 21:28:05 -07:00
Matthias Beyer
ce1c1e3093 Remove maintainership
With this patch I remove myself as a maintainer for all packages I
currently maintain.

This is due the fact that I will be basically off the grid from May 2018
until early 2019, as I will be on a trip through north america.

I will revert this patch as soon as I'm back, as I plan to continue
contributing to nixpkgs then.
But as I cannot maintain anything during that time, I'd like to get this
patch merged.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2018-04-06 10:57:19 +02:00
Frederik Rietdijk
a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Corey O'Connor
cbcb9eb909 wine: 3.4 -> 3.5 (and staging likewise) 2018-04-05 08:57:50 -07:00
Graham Christensen
8f33464ca7
nixos docs: syntax highlight
- Rectifies diverging CSS by combining
   nixos/nixpkgs docs CSS
 - Moves our custom Highlight.js loader in to
   the hljs package
 - Switches the nixos docs to use SVG
   callouts too
2018-04-05 07:54:01 -04:00
Frederik Rietdijk
23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Guillaume Maudoux
f338e4c3db cups-filters: remove myself from maintainers 2018-04-03 22:46:27 +02:00
adisbladis
729cd0352d
Merge pull request #38294 from r-ryantm/auto-update/cups-filters
cups-filters: 1.20.1 -> 1.20.2
2018-04-03 23:56:07 +08:00
Tuomas Tynkkynen
747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Lengyel Balazs
7e97675fa1 wine: 3.4 -> 3.5 2018-04-01 22:12:14 +02:00
R. RyanTM
37275927ae cups-filters: 1.20.1 -> 1.20.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cups-filters/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 1.20.2 with grep in /nix/store/zbwgknzkhih8rlcizp4s5yi5kinjfv5w-cups-filters-1.20.2
- directory tree listing: https://gist.github.com/a1bcdc4c27ed6a03fa20b81303aaa036
2018-04-01 03:43:40 -07:00