1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
nixpkgs/pkgs/misc
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
..
apulse apulse: 0.1.11 -> 0.1.11 git, enable tracing by default 2018-03-09 20:48:24 +00:00
base16-builder base16-builder: init 2017-09-30 01:01:03 +02:00
beep
cups Merge #35113: cups: upstream patch for a bug 2018-02-24 22:30:18 +01:00
drivers sc-controller: 0.4.0.2 -> 0.4.1 2018-03-01 00:28:46 +01:00
emulators Merge pull request #35057 from bignaux/qmc2 2018-03-10 13:07:45 +00:00
foldingathome
frescobaldi
ghostscript ghostscript: security 9.20 -> 9.22 2017-12-09 17:50:05 +01:00
gnash treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
gnuk
jackaudio libjack2: remove clang patch 2018-03-08 21:24:37 +01:00
libcardiacarrest libcardiacarrest: init at 11.0-6 2018-03-09 20:49:30 +00:00
lilypond lilypond: disable parallel building 2017-11-05 19:18:34 +01:00
logging/beats elk: 5.6.5 -> 5.6.6 2018-01-17 02:11:19 +01:00
long-shebang
mnemonicode
mxt-app Change many homepage urls from http to https #30636 2017-11-10 22:13:46 +01:00
my-env myEnvFun: fix sed script edit 2018-01-28 23:49:04 -08:00
phabricator
riscv-pk riscv-pk: Properly respect --prefix. 2018-02-20 10:29:43 -05:00
sailsd misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 2017-09-21 15:49:53 -04:00
screensavers Merge branch 'master' 2018-03-05 14:53:27 +01:00
seafile-shared seafile-shared: use recent vala + clean-up 2017-12-19 17:25:55 +01:00
solfege misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 2017-09-21 15:49:53 -04:00
sound-of-sorting
source-and-tags
talkfilters
themes deepin-gtk-theme: move to deepin meta package 2018-03-01 10:00:05 -03:00
tw-rs rust: update cargo builder to fetch registry dynamically 2017-10-23 00:30:47 +01:00
uboot buildUboot: add openssl to nativeBuildInputs 2017-12-23 04:31:11 +02:00
urbit urbit: 0.4 -> 0.4.5 2017-10-06 23:38:21 -07:00
vim-plugins [RDY] skim: init at 0.3.2 (#33561) 2018-03-03 15:39:16 +00:00
vscode-extensions vscode-extension-ms-python-python: Init at 0.8.0 2017-11-26 22:09:16 -05:00
xosd Change many homepage urls from http to https #30636 2017-11-10 22:13:46 +01:00