public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/NixOS/nixpkgs

Browse Source
This commit is contained in:
Eelco Dolstra 2018-07-09 12:35:36 +02:00
commit 6978f710da
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/digitalbitbox/default.nix
View File

@ -34,6 +34,6 @@ in
meta = { meta = {
doc = ./doc.xml; doc = ./doc.xml;
maintainers = with stdenv.lib.maintainers; [ vidbina ]; maintainers = with lib.maintainers; [ vidbina ];
}; };
} }

2
nixos/modules/services/logging/journalwatch.nix
View File

@ -241,6 +241,6 @@ in {
}; };
meta = { meta = {
maintainers = with stdenv.lib.maintainers; [ florianjacob ]; maintainers = with lib.maintainers; [ florianjacob ];
}; };
} }

2
nixos/modules/services/web-apps/matomo.nix
View File

@ -241,6 +241,6 @@ in {
meta = { meta = {
doc = ./matomo-doc.xml; doc = ./matomo-doc.xml;
maintainers = with stdenv.lib.maintainers; [ florianjacob ]; maintainers = with lib.maintainers; [ florianjacob ];
}; };
} }

2
nixos/modules/services/web-apps/nexus.nix
View File

@ -130,5 +130,5 @@ in
}; };
}; };
meta.maintainers = with stdenv.lib.maintainers; [ ironpinguin ]; meta.maintainers = with lib.maintainers; [ ironpinguin ];
} }

4
pkgs/applications/audio/lollypop/default.nix
View File

@ -3,14 +3,14 @@
, python36Packages, gnome3, glib, gst_all_1 }: , python36Packages, gnome3, glib, gst_all_1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.516"; version = "0.9.519";
name = "lollypop-${version}"; name = "lollypop-${version}";
src = fetchgit { src = fetchgit {
url = "https://gitlab.gnome.org/World/lollypop"; url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "0ln77cmcl5wi4xis9kmzg0knbykzwsd1n78rr7ff5y35m9p2zgrf"; sha256 = "1v4p59w4yf86djk7xv1xwbximpjm64wn42il090w7q1wy04my6fl";
}; };
nativeBuildInputs = with python36Packages; [ nativeBuildInputs = with python36Packages; [

10
pkgs/development/ruby-modules/solargraph/Gemfile.lock
View File

@ -8,16 +8,16 @@ GEM
jaro_winkler (1.5.1) jaro_winkler (1.5.1)
kramdown (1.17.0) kramdown (1.17.0)
mini_portile2 (2.3.0) mini_portile2 (2.3.0)
nokogiri (1.8.2) nokogiri (1.8.4)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
parallel (1.12.1) parallel (1.12.1)
parser (2.5.1.0) parser (2.5.1.0)
ast (~> 2.4.0) ast (~> 2.4.0)
powerpack (0.1.1) powerpack (0.1.2)
rainbow (3.0.0) rainbow (3.0.0)
reverse_markdown (1.1.0) reverse_markdown (1.1.0)
nokogiri nokogiri
rubocop (0.57.1) rubocop (0.58.0)
jaro_winkler (~> 1.5.1) jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.5) parser (>= 2.5)
@ -26,7 +26,7 @@ GEM
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0) ruby-progressbar (1.9.0)
solargraph (0.22.0) solargraph (0.23.3)
coderay (~> 1.1) coderay (~> 1.1)
eventmachine (~> 1.2, >= 1.2.5) eventmachine (~> 1.2, >= 1.2.5)
htmlentities (~> 4.3, >= 4.3.4) htmlentities (~> 4.3, >= 4.3.4)
@ -49,4 +49,4 @@ DEPENDENCIES
solargraph! solargraph!
BUNDLED WITH BUNDLED WITH
1.14.6 1.16.2

16
pkgs/development/ruby-modules/solargraph/gemset.nix
View File

@ -59,10 +59,10 @@
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
type = "gem"; type = "gem";
}; };
version = "1.8.2"; version = "1.8.4";
}; };
parallel = { parallel = {
source = { source = {
@ -84,10 +84,10 @@
powerpack = { powerpack = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
type = "gem"; type = "gem";
}; };
version = "0.1.1"; version = "0.1.2";
}; };
rainbow = { rainbow = {
source = { source = {
@ -110,10 +110,10 @@
dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1rm2fidc3zkxamfvn53aa6mz4rr0qx6fhcnxc83bn4myv59gw9dd"; sha256 = "091simr4pvxnkm472ixk5lqbnhgznvmhjpjf98ppbx1r68a4mcp3";
type = "gem"; type = "gem";
}; };
version = "0.57.1"; version = "0.58.0";
}; };
ruby-progressbar = { ruby-progressbar = {
source = { source = {
@ -127,10 +127,10 @@
dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1khj0bpyr7mwbjxd9x2al78rcw5k7s87ncrql5ml0ykqx57w7b7l"; sha256 = "1145g6x04fwmg8n51lsk7ybig31scndlj1i2i4lbrj9621bbqxfz";
type = "gem"; type = "gem";
}; };
version = "0.22.0"; version = "0.23.3";
}; };
thor = { thor = {
source = { source = {