Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 062cd3e87c31
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a40943822ad
Choose a head ref

Commits on May 18, 2020

  1. add enableSound parameter to dwarf-fortress derivation

    try hardcoding
    
    add back whitespace
    matthew-piziak committed May 18, 2020
    Copy the full SHA
    879778c View commit details

Commits on May 21, 2020

  1. fetchmail: 6.4.4 -> 6.4.5

    r-ryantm committed May 21, 2020
    Copy the full SHA
    5b4607a View commit details
  2. glusterfs: 7.5 -> 7.6

    r-ryantm committed May 21, 2020
    Copy the full SHA
    4e4616d View commit details
  3. goffice: 0.10.46 -> 0.10.47

    r-ryantm committed May 21, 2020
    Copy the full SHA
    65bd987 View commit details

Commits on May 22, 2020

  1. freeipmi: 1.6.4 -> 1.6.5

    lsix committed May 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    Copy the full SHA
    8b6e001 View commit details
  2. moodle: 3.8.2 -> 3.8.3

    r-ryantm committed May 22, 2020
    Copy the full SHA
    865f214 View commit details
  3. zenith: 0.8.2 -> 0.9.0

    bbigras committed May 22, 2020
    Copy the full SHA
    a3a285a View commit details
  4. Copy the full SHA
    9754e34 View commit details
  5. corerad: 0.2.4 -> 0.2.5

    mdlayher committed May 22, 2020
    Copy the full SHA
    f26bb6d View commit details
  6. Merge pull request #88627 from zowoq/podman

    podman: 1.9.2 -> 1.9.3
    marsam authored May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    81b9b23 View commit details
  7. Merge pull request #88185 from bbigras/zenith

    zenith: 0.8.2 -> 0.9.0
    marsam authored May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    44d9c9f View commit details

Commits on May 23, 2020

  1. cocoapods: 1.9.1 -> 1.9.2

    lilyball committed May 23, 2020
    Copy the full SHA
    c364ed7 View commit details
  2. Copy the full SHA
    30c5973 View commit details
  3. Merge pull request #88632 from mdlayher/mdl-corerad-0.2.5

    corerad: 0.2.4 -> 0.2.5
    marsam authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    992a34d View commit details
  4. Merge pull request #87915 from matthew-piziak/dwarf-fortress-enable-s…

    …ound
    
    add `enableSound` parameter to `dwarf-fortress` derivation
    adisbladis authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d8435f6 View commit details
  5. pcl: 1.10.1 -> 1.11.0

    r-ryantm committed May 23, 2020
    Copy the full SHA
    c1cb5fe View commit details
  6. Merge pull request #88524 from r-ryantm/auto-update/glusterfs

    glusterfs: 7.5 -> 7.6
    7c6f434c authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a07b630 View commit details
  7. Merge pull request #88586 from lsix/freeipmi-1.6.5

    freeipmi: 1.6.4 -> 1.6.5
    7c6f434c authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2854685 View commit details
  8. Merge pull request #88642 from r-ryantm/auto-update/pcl

    pcl: 1.10.1 -> 1.11.0
    nh2 authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    97da3e2 View commit details
  9. Merge pull request #88595 from r-ryantm/auto-update/moodle

    moodle: 3.8.2 -> 3.8.3
    nh2 authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e9d62a2 View commit details
  10. Merge pull request #88638 from lilyball/cocoapods

    cocoapods: 1.9.1 -> 1.9.2
    marsam authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f95b8cd View commit details
  11. Merge pull request #88529 from r-ryantm/auto-update/goffice

    goffice: 0.10.46 -> 0.10.47
    nh2 authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ac2655a View commit details
  12. Merge pull request #88508 from r-ryantm/auto-update/fetchmail

    fetchmail: 6.4.4 -> 6.4.5
    nh2 authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1a40943 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/fetchmail/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, openssl }:

let
version = "6.4.4";
version = "6.4.5";
in
stdenv.mkDerivation {
pname = "fetchmail";
inherit version;

src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "1smbydwfjq29a2l44g6mgj0cd412fz40gbq6vq0klm7pmgd606si";
sha256 = "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk";
};

buildInputs = [ openssl ];
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/podman/default.nix
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

buildGoModule rec {
pname = "podman";
version = "1.9.2";
version = "1.9.3";

src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "0jvqzn1q52z6aka98d2i3dyn2i8xld7xvmi2zfxgm9g53wdgi2g2";
sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s";
};

vendorSha256 = null;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/goffice/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "goffice";
version = "0.10.46";
version = "0.10.47";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9";
sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215";
};

nativeBuildInputs = [ pkgconfig intltool ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/pcl/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
}:

stdenv.mkDerivation rec {
name = "pcl-1.10.1";
name = "pcl-1.11.0";

src = fetchFromGitHub {
owner = "PointCloudLibrary";
repo = "pcl";
rev = name;
sha256 = "1i4zfcikvdl5z1s3lh0n46fgi42s9vbki4hfmy7656hamajfai0v";
sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g";
};

enableParallelBuilding = true;
24 changes: 12 additions & 12 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.1)
algoliasearch (1.27.2)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.1)
cocoapods (1.9.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.1)
cocoapods-core (= 1.9.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.1)
cocoapods-core (1.9.2)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
@@ -45,10 +45,10 @@ GEM
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.4.1)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
escape (0.0.4)
@@ -62,18 +62,18 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.0)
minitest (5.14.0)
minitest (5.14.1)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.3.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.15.0)
xcodeproj (1.16.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -87,4 +87,4 @@ DEPENDENCIES
cocoapods (>= 1.7.0.beta.1)!

BUNDLED WITH
1.17.3
2.1.4
22 changes: 11 additions & 11 deletions pkgs/development/mobile/cocoapods/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.1)
algoliasearch (1.27.2)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.1)
cocoapods (1.9.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.1)
cocoapods-core (= 1.9.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.1)
cocoapods-core (1.9.2)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
@@ -45,10 +45,10 @@ GEM
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.4.1)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
escape (0.0.4)
@@ -62,18 +62,18 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.0)
minitest (5.14.0)
minitest (5.14.1)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.3.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.15.0)
xcodeproj (1.16.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
40 changes: 20 additions & 20 deletions pkgs/development/mobile/cocoapods/gemset-beta.nix
Original file line number Diff line number Diff line change
@@ -5,21 +5,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i";
type = "gem";
};
version = "4.2.11.1";
version = "4.2.11.3";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj";
sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0";
type = "gem";
};
version = "1.27.1";
version = "1.27.2";
};
atomos = {
groups = ["default"];
@@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs";
sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36";
type = "gem";
};
version = "1.9.1";
version = "1.9.2";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc";
sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p";
type = "gem";
};
version = "1.9.1";
version = "1.9.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -130,20 +130,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw";
sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5";
type = "gem";
};
version = "1.4.1";
version = "1.5.0";
};
cocoapods-try = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj";
sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql";
type = "gem";
};
version = "1.1.0";
version = "1.2.0";
};
colored2 = {
groups = ["default"];
@@ -262,10 +262,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
type = "gem";
};
version = "5.14.0";
version = "5.14.1";
};
molinillo = {
groups = ["default"];
@@ -333,31 +333,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z";
sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi";
type = "gem";
};
version = "1.15.0";
version = "1.16.0";
};
}
42 changes: 22 additions & 20 deletions pkgs/development/mobile/cocoapods/gemset.nix
Original file line number Diff line number Diff line change
@@ -5,21 +5,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i";
type = "gem";
};
version = "4.2.11.1";
version = "4.2.11.3";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj";
sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0";
type = "gem";
};
version = "1.27.1";
version = "1.27.2";
};
atomos = {
source = {
@@ -55,21 +55,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs";
sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36";
type = "gem";
};
version = "1.9.1";
version = "1.9.2";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc";
sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p";
type = "gem";
};
version = "1.9.1";
version = "1.9.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -124,18 +124,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw";
sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5";
type = "gem";
};
version = "1.4.1";
version = "1.5.0";
};
cocoapods-try = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj";
sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql";
type = "gem";
};
version = "1.1.0";
version = "1.2.0";
};
colored2 = {
source = {
@@ -244,10 +246,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
type = "gem";
};
version = "5.14.0";
version = "5.14.1";
};
molinillo = {
source = {
@@ -305,31 +307,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z";
sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi";
type = "gem";
};
version = "1.15.0";
version = "1.16.0";
};
}
3 changes: 2 additions & 1 deletion pkgs/games/dwarf-fortress/lazy-pack.nix
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
, enableTruetype ? true
, enableFPS ? false
, enableTextMode ? false
, enableSound ? true
}:

with lib;
@@ -32,7 +33,7 @@ buildEnv {
paths = [
(dwarf-fortress.override {
inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme
enableIntro enableTruetype enableFPS enableTextMode;
enableIntro enableTruetype enableFPS enableTextMode enableSound;
})]
++ lib.optional enableDwarfTherapist dwarf-therapist
++ lib.optional enableLegendsBrowser legends-browser;
4 changes: 3 additions & 1 deletion pkgs/games/dwarf-fortress/wrapper/default.nix
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
, enableTruetype ? true
, enableFPS ? false
, enableTextMode ? false
, enableSound ? true
}:

let
@@ -67,7 +68,8 @@ let
substituteInPlace $out/data/init/init.txt \
--replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
--replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
--replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
--replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' \
--replace '[SOUND:YES]' '[SOUND:${unBool enableSound}]'
''));

env = buildEnv {
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/moodle/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, writeText }:

let
version = "3.8.2";
version = "3.8.3";
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
in

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "134vxsbslk7sfalmgcp744aygaxz2k080d14j8nkivk9zhplds53";
sha256 = "1anjv4gvbb6833j04a1b4aaysnl4h0x96sr1hhm4nm5kq2fimjd1";
};

phpConfig = writeText "config.php" ''
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/glusterfs/default.nix
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ let
# The command
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
# can help with finding new Python scripts.
version = "7.5";
version = "7.6";
name="${baseName}-${version}";
url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
sha256 = "1zahld2v1y920i0p25zcn15a593g3bl5sgnmhkdmn7kvk7mx4p93";
sha256 = "0zdcv2jk8dp67id8ic30mkn97ccp07jf20g7v09a5k31pw9aqyih";
};

buildInputs = [
10 changes: 4 additions & 6 deletions pkgs/tools/networking/corerad/default.nix
Original file line number Diff line number Diff line change
@@ -2,25 +2,23 @@

buildGoModule rec {
pname = "corerad";
version = "0.2.4";
version = "0.2.5";

src = fetchFromGitHub {
owner = "mdlayher";
repo = "corerad";
rev = "v${version}";
sha256 = "1r9kvz1ylrnfc7y5c4knqhx6xngh1p8j1axb8bd7h7p51c4i7jz2";
sha256 = "0fi9wgv5aj3ds3r5qjyi4pxnd56psrpdy2sz84jd0sz2w48x4k4p";
};

vendorSha256 = "0ncwf197dx6mqzg69mnyp0iyad585izmydm0yj8ikd0y8ngpx7a3";
vendorSha256 = "11r3vpimhik7y09gwb3p6pl0yf53hpaw24ry4a833fw8060rqp3q";

buildFlagsArray = ''
-ldflags=
-X github.com/mdlayher/corerad/internal/build.linkTimestamp=1589133047
-X github.com/mdlayher/corerad/internal/build.linkTimestamp=1590182656
-X github.com/mdlayher/corerad/internal/build.linkVersion=v${version}
'';

deleteVendor = true;

meta = with stdenv.lib; {
homepage = "https://github.com/mdlayher/corerad";
description = "CoreRAD extensible and observable IPv6 NDP RA daemon";
4 changes: 2 additions & 2 deletions pkgs/tools/system/freeipmi/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, libgcrypt, readline, libgpgerror }:

stdenv.mkDerivation rec {
version = "1.6.4";
version = "1.6.5";
pname = "freeipmi";

src = fetchurl {
url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
sha256 = "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5";
sha256 = "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1";
};

buildInputs = [ libgcrypt readline libgpgerror ];
13 changes: 0 additions & 13 deletions pkgs/tools/system/zenith/cargo-lock.patch

This file was deleted.

7 changes: 3 additions & 4 deletions pkgs/tools/system/zenith/default.nix
Original file line number Diff line number Diff line change
@@ -2,17 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "zenith";
version = "0.8.2";
version = "0.9.0";

src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
sha256 = "1s1l4nq4bsvi54i603faann8cp1409qa2ka7id0m38b3li8z2984";
sha256 = "1yfbr8zmcy7zp9s9cqv7qypj2vvhpq09r0398gr7ckjk6v70hhfg";
};

cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "0h6k7yf4hpfxnad46iv8gp3v3zc4x4p9yab40gr8xv8r1syf9f6g";
cargoSha256 = "1l4cjcpfghis983y31s54fzjppdnh3wa4anwi7bdsbyvqz3n3ywj";

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];