Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cc30c161ee12
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a5556867ea2
Choose a head ref

Commits on Oct 26, 2020

  1. linbox: backport upstream fixes

    References:
    linbox-team/linbox@f78117d
    linbox-team/linbox@4ff828e
    
    Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
    omasanori committed Oct 26, 2020
    Copy the full SHA
    e0fecf4 View commit details

Commits on Nov 1, 2020

  1. openjdk: 11.0.8 -> 11.0.9

    asbachb committed Nov 1, 2020
    Copy the full SHA
    e659537 View commit details
  2. Copy the full SHA
    5db66b2 View commit details
  3. stunnel service: fix servers example

    examples incorrectly had 'enable' set, the option is not defined
    and reproducing would error out
    martinetd committed Nov 1, 2020
    Copy the full SHA
    05eef80 View commit details

Commits on Nov 2, 2020

  1. stunnel: make servers accept more lenient

    stunnel config's accept syntax is [host:]port -- this is required to e.g. listen on ipv6
    where one would set :::port
    martinetd committed Nov 2, 2020
    Copy the full SHA
    1fb2990 View commit details

Commits on Nov 3, 2020

  1. sbt: Add update script

    NeQuissimus committed Nov 3, 2020
    Copy the full SHA
    d92254f View commit details
  2. sbt: 1.4.0 → 1.4.2

    NeQuissimus committed Nov 3, 2020
    Copy the full SHA
    8d279bb View commit details
  3. olm: 3.1.5 -> 3.2.1

    r-ryantm committed Nov 3, 2020
    Copy the full SHA
    fd12c2e View commit details

Commits on Nov 4, 2020

  1. padthv1: 0.9.17 -> 0.9.18

    r-ryantm committed Nov 4, 2020
    Copy the full SHA
    fe2094a View commit details
  2. Copy the full SHA
    566c701 View commit details
  3. pam_gnupg: 0.1 -> 0.2

    r-ryantm committed Nov 4, 2020
    Copy the full SHA
    0e3c2cd View commit details
  4. Copy the full SHA
    365c7bd View commit details
  5. Copy the full SHA
    6391d3c View commit details
  6. Copy the full SHA
    834e2ae View commit details
  7. procs: 0.10.4 -> 0.10.5

    r-ryantm committed Nov 4, 2020
    Copy the full SHA
    d06be7f View commit details
  8. pspg: 3.1.3 -> 3.1.5

    r-ryantm committed Nov 4, 2020
    Copy the full SHA
    157889a View commit details
  9. Copy the full SHA
    c30745e View commit details
  10. Support virtio_scsi devices on nixos-generate-config

    Victor Nawothnig authored and FRidh committed Nov 4, 2020
    Copy the full SHA
    27e9328 View commit details
  11. sonobuoy: Fixes wrong "v" behaviour

    Adjust the generated manifests by placing the character v in the sonobuoy version, successfully pulling the image within the cluster and running smoothly.
    
    Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
    bryanasdev000 authored and FRidh committed Nov 4, 2020
    Copy the full SHA
    22dd82c View commit details
  12. Copy the full SHA
    7a75852 View commit details
  13. slirp4netns: 1.1.4 -> 1.1.6

    Signed-off-by: Sascha Grunert <sgrunert@suse.com>
    saschagrunert authored and zowoq committed Nov 4, 2020
    Copy the full SHA
    6fc9aca View commit details
  14. Copy the full SHA
    d4905b1 View commit details
  15. Copy the full SHA
    b6c4306 View commit details
  16. Merge pull request #101207 from NixOS/staging-next

    Staging next
    FRidh authored Nov 4, 2020
    Copy the full SHA
    49cd730 View commit details
  17. precice: 2.1.0 -> 2.1.1

    r-ryantm committed Nov 4, 2020
    Copy the full SHA
    7b405fa View commit details
  18. openxray: 730-july-preview -> 784-october-preview

    gnidorah authored and FRidh committed Nov 4, 2020
    Copy the full SHA
    c2bd0a4 View commit details
  19. Copy the full SHA
    f5adeda View commit details
  20. Copy the full SHA
    d116fe2 View commit details
  21. Merge pull request #102738 from r-ryantm/auto-update/pulseeffects

    pulseeffects: 4.8.1 -> 4.8.2
    jtojnar authored Nov 4, 2020
    Copy the full SHA
    f838052 View commit details
  22. iosevka-bin: Use iosevka's meta

    The two packages have the same metadata, except for the maintainers.
    AluisioASG committed Nov 4, 2020
    Copy the full SHA
    988f0cf View commit details
  23. iosevka-bin: move update script

    Move bin.nix's update script to update-bin.sh so it doesn't conflict
    with default.nix's update script.
    AluisioASG committed Nov 4, 2020
    Copy the full SHA
    e237f23 View commit details
  24. iosevka: 3.2.2 -> 3.7.1; fetch source through nodePackages

    Previously we used nodePackages only to fetch Iosevka's build
    dependencies and then fetched the source code ourselves.  Updates
    involved changing the version and hashes in the `iosevka` derivation and
    then running node-packages/generate.sh to update the build dependencies,
    which in turns updates *all* of node-packages.nix.
    
    A new proposed policy for handling node-packages.nix updates involves
    batching those updates.  Previously, that would mean `iosevka` and its
    build dependencies could end up out of sync until the batched update was
    run.
    
    To work with the new policy, we now fetch Iosevka's source code (and
    not only its dependencies) through nodePackages.  Updates are done by
    changing the source URL in node-packages.json, which eventually becomes
    part of an update of node-packages.nix, which is then propagated to
    `iosevka` itself.
    
    One con of this strategy is that errors can not be caught directly
    after the update, but only after node-packages.nix is regenerated.
    AluisioASG committed Nov 4, 2020
    Copy the full SHA
    e6bc641 View commit details
  25. iosevka: add update script

    As outlined in the previous commit, we just need to update the source
    URL in node-packages.json, and wait for node-packages.nix to be rebuilt
    from it.
    AluisioASG committed Nov 4, 2020
    Copy the full SHA
    26ce7f2 View commit details
  26. iosevka: remove dependency on otfcc

    As of Iosevka 3.7.0, otfcc is no longer used.  I haven't checked if
    the situation has changed since [2017] but this should make Iosevka
    available on aarch64-linux and *-darwin.
    
    [2017]: #31835 (comment)
    AluisioASG committed Nov 4, 2020
    Copy the full SHA
    08fd340 View commit details
  27. Copy the full SHA
    1ade372 View commit details
  28. gpxsee: 7.33 → 7.35

    sikmir committed Nov 4, 2020
    Copy the full SHA
    dda8bdc View commit details
  29. btc1: remove

    freezeboy committed Nov 4, 2020
    Copy the full SHA
    dc0f5ed View commit details
  30. Copy the full SHA
    013dc4c View commit details
  31. nodePackages: update

    AluisioASG committed Nov 4, 2020
    Copy the full SHA
    7d15aa4 View commit details
  32. Merge pull request #102726 from r-ryantm/auto-update/pspg

    pspg: 3.1.3 -> 3.1.5
    marsam authored Nov 4, 2020
    Copy the full SHA
    fc5c3ba View commit details
  33. llvm_11: Add myself as maintainer

    Because I maintain Chromium which always requires the most recent LLVM
    release (would be good to get notified on any PRs/issues, especially
    since I seem to end up merging most of the PRs anyway).
    
    See #100725.
    primeos committed Nov 4, 2020
    Copy the full SHA
    58c7684 View commit details
  34. Merge pull request #102714 from r-ryantm/auto-update/procs

    procs: 0.10.4 -> 0.10.5
    marsam authored Nov 4, 2020
    Copy the full SHA
    f2e9192 View commit details
  35. Merge pull request #101902 from sikmir/gpxsee

    gpxsee: 7.33 → 7.35
    kevincox authored Nov 4, 2020
    Copy the full SHA
    2802d2a View commit details
  36. Revert "Disable the metrics job"

    This reverts commit c54308d.
    The machine has been back for some time.
    vcunat committed Nov 4, 2020
    Copy the full SHA
    20baaf1 View commit details
  37. libical: disable rest of failing tests

    likely caused by tzdata bump
    jtojnar committed Nov 4, 2020
    Copy the full SHA
    0d32565 View commit details
  38. zoneminder: 1.34.16 -> 1.34.22

    andir committed Nov 4, 2020
    Copy the full SHA
    4d563ba View commit details
  39. Copy the full SHA
    f1c65de View commit details
  40. Merge pull request #102742 from r-ryantm/auto-update/precice

    precice: 2.1.0 -> 2.1.1
    ryantm authored Nov 4, 2020
    Copy the full SHA
    e334732 View commit details
  41. Merge pull request #102707 from r-ryantm/auto-update/picard-tools

    picard-tools: 2.23.4 -> 2.23.8
    ryantm authored Nov 4, 2020
    Copy the full SHA
    ba3fc8b View commit details
  42. Merge pull request #102696 from r-ryantm/auto-update/pam_gnupg

    pam_gnupg: 0.1 -> 0.2
    ryantm authored Nov 4, 2020
    Copy the full SHA
    d1d2a00 View commit details
Showing with 925 additions and 701 deletions.
  1. +5 −0 nixos/doc/manual/release-notes/rl-2103.xml
  2. +5 −0 nixos/modules/installer/tools/nixos-generate-config.pl
  3. +6 −3 nixos/modules/services/networking/stunnel.nix
  4. +1 −0 nixos/tests/all-tests.nix
  5. +18 −0 nixos/tests/sbt.nix
  6. +2 −2 pkgs/applications/audio/padthv1/default.nix
  7. +2 −2 pkgs/applications/audio/pianobooster/default.nix
  8. +2 −2 pkgs/applications/audio/pulseeffects/default.nix
  9. +0 −41 pkgs/applications/blockchains/btc1.nix
  10. +4 −5 pkgs/applications/misc/gpxsee/default.nix
  11. +2 −2 pkgs/applications/misc/pdfsam-basic/default.nix
  12. +1 −1 pkgs/applications/networking/cluster/sonobuoy/default.nix
  13. +1 −0 pkgs/applications/networking/cluster/terraform-providers/default.nix
  14. +26 −0 pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix
  15. +2 −2 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  16. +2 −2 pkgs/applications/science/biology/picard-tools/default.nix
  17. +7 −3 pkgs/applications/science/logic/lean/default.nix
  18. +6 −12 pkgs/data/fonts/iosevka/bin.nix
  19. +27 −15 pkgs/data/fonts/iosevka/default.nix
  20. +0 −28 pkgs/data/fonts/iosevka/package.json
  21. +5 −5 pkgs/data/fonts/iosevka/{update.sh → update-bin.sh}
  22. +21 −0 pkgs/data/fonts/iosevka/update-default.sh
  23. +1 −1 pkgs/data/themes/canta/default.nix
  24. +6 −1 pkgs/desktops/plasma-5/kwin/default.nix
  25. +1 −1 pkgs/development/compilers/llvm/11/llvm.nix
  26. +3 −3 pkgs/development/compilers/openjdk/11.nix
  27. +18 −18 pkgs/development/compilers/openjdk/8.nix
  28. +3 −3 pkgs/development/interpreters/clojure/babashka.nix
  29. +2 −2 pkgs/development/libraries/intel-media-driver/default.nix
  30. +1 −1 pkgs/development/libraries/libical/default.nix
  31. +15 −2 pkgs/development/libraries/linbox/default.nix
  32. +13 −0 pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
  33. +2 −2 pkgs/development/libraries/olm/default.nix
  34. +2 −2 pkgs/development/libraries/precice/default.nix
  35. +1 −1 pkgs/development/node-packages/node-packages.json
  36. +627 −423 pkgs/development/node-packages/node-packages.nix
  37. +2 −2 pkgs/development/php-packages/event/default.nix
  38. +2 −2 pkgs/development/php-packages/php-cs-fixer/default.nix
  39. +2 −2 pkgs/development/python-modules/bitarray/default.nix
  40. +2 −2 pkgs/development/python-modules/breathe/default.nix
  41. +2 −2 pkgs/development/python-modules/btchip/default.nix
  42. +2 −2 pkgs/development/python-modules/cbor2/default.nix
  43. +2 −2 pkgs/development/python-modules/cssselect2/default.nix
  44. +0 −40 pkgs/development/python-modules/smugline/default.nix
  45. +0 −21 pkgs/development/python-modules/smugpy/default.nix
  46. +35 −3 pkgs/development/tools/build-managers/sbt/default.nix
  47. +3 −3 pkgs/development/tools/clj-kondo/default.nix
  48. +2 −2 pkgs/games/openxray/default.nix
  49. +8 −0 pkgs/os-specific/linux/open-iscsi/default.nix
  50. +2 −2 pkgs/os-specific/linux/pam_gnupg/default.nix
  51. +3 −3 pkgs/servers/zoneminder/default.nix
  52. +3 −3 pkgs/tools/admin/procs/default.nix
  53. +4 −4 pkgs/tools/misc/onefetch/default.nix
  54. +2 −2 pkgs/tools/misc/phoronix-test-suite/default.nix
  55. +2 −2 pkgs/tools/misc/pspg/default.nix
  56. +2 −2 pkgs/tools/networking/slirp4netns/default.nix
  57. +2 −2 pkgs/tools/package-management/packagekit/qt.nix
  58. +2 −0 pkgs/top-level/aliases.nix
  59. +0 −8 pkgs/top-level/all-packages.nix
  60. +0 −4 pkgs/top-level/python-packages.nix
  61. +1 −1 pkgs/top-level/release.nix
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-2103.xml
Original file line number Diff line number Diff line change
@@ -124,6 +124,11 @@
<literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
</para>
</listitem>
<listitem>
<para>
<package>btc1</package> has been abandoned upstream, and removed.
</para>
</listitem>
<listitem>
<para>
<package>riak-cs</package> package removed along with <varname>services.riak-cs</varname> module.
5 changes: 5 additions & 0 deletions nixos/modules/installer/tools/nixos-generate-config.pl
Original file line number Diff line number Diff line change
@@ -183,6 +183,11 @@ sub pciCheck {
push @imports, "(modulesPath + \"/hardware/network/broadcom-43xx.nix\")";
}

# In case this is a virtio scsi device, we need to explicitly make this available.
if ($vendor eq "0x1af4" && $device eq "0x1004") {
push @initrdAvailableKernelModules, "virtio_scsi";
}

# Can't rely on $module here, since the module may not be loaded
# due to missing firmware. Ideally we would check modules.pcimap
# here.
9 changes: 6 additions & 3 deletions nixos/modules/services/networking/stunnel.nix
Original file line number Diff line number Diff line change
@@ -16,8 +16,12 @@ let
serverConfig = {
options = {
accept = mkOption {
type = types.int;
description = "On which port stunnel should listen for incoming TLS connections.";
type = types.either types.str types.int;
description = ''
On which [host:]port stunnel should listen for incoming TLS connections.
Note that unlike other softwares stunnel ipv6 address need no brackets,
so to listen on all IPv6 addresses on port 1234 one would use ':::1234'.
'';
};

connect = mkOption {
@@ -129,7 +133,6 @@ in
type = with types; attrsOf (submodule serverConfig);
example = {
fancyWebserver = {
enable = true;
accept = 443;
connect = 8080;
cert = "/path/to/pem/file";
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
@@ -311,6 +311,7 @@ in
rxe = handleTest ./rxe.nix {};
samba = handleTest ./samba.nix {};
sanoid = handleTest ./sanoid.nix {};
sbt = handleTest ./sbt.nix {};
sddm = handleTest ./sddm.nix {};
service-runner = handleTest ./service-runner.nix {};
shadowsocks = handleTest ./shadowsocks {};
18 changes: 18 additions & 0 deletions nixos/tests/sbt.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "sbt";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};

machine = { pkgs, ... }:
{
environment.systemPackages = [ pkgs.sbt ];
};

testScript =
''
machine.succeed(
"(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version} (this may take some time)'"
)
'';
})
4 changes: 2 additions & 2 deletions pkgs/applications/audio/padthv1/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

mkDerivation rec {
pname = "padthv1";
version = "0.9.17";
version = "0.9.18";

src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
sha256 = "098fk8fwcgssnfr1gilqg8g17zvch62lrn3rqsswpzbr3an5adb3";
sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5";
};

buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/pianobooster/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkg-config, qttools
, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi
, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook
}:

stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj";
};

nativeBuildInputs = [ cmake pkg-config qttools ];
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];

buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ];

4 changes: 2 additions & 2 deletions pkgs/applications/audio/pulseeffects/default.nix
Original file line number Diff line number Diff line change
@@ -44,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
version = "4.8.1";
version = "4.8.2";

src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6";
sha256 = "19h47mrxjm6x83pqcxfsshf48kd1babfk0kwdy1c7fjri7kj0g0s";
};

nativeBuildInputs = [
41 changes: 0 additions & 41 deletions pkgs/applications/blockchains/btc1.nix

This file was deleted.

9 changes: 4 additions & 5 deletions pkgs/applications/misc/gpxsee/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

mkDerivation rec {
pname = "gpxsee";
version = "7.33";
version = "7.35";

src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "1k4zl7knlpwxrpqk1axkmy8x12915z15h3q2sjnx3jcnx6qw73ja";
sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5";
};

patches = (substituteAll {
@@ -29,15 +29,14 @@ mkDerivation rec {
wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = "https://www.gpxsee.org/";
description = "GPS log file viewer and analyzer";
longDescription = ''
GPXSee is a Qt-based GPS log file viewer and analyzer that supports
all common GPS log file formats.
'';
homepage = "https://www.gpxsee.org/";
changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
license = licenses.gpl3;
maintainers = with maintainers; [ womfoo sikmir ];
platforms = with platforms; linux ++ darwin;
4 changes: 2 additions & 2 deletions pkgs/applications/misc/pdfsam-basic/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "pdfsam-basic";
version = "4.1.4";
version = "4.2.0";

src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
sha256 = "1gw3cmc8c1xxc55bm71v1dz9x9560lbhx9nkwprarhxlmn0m0zzp";
sha256 = "0dhwaadk2qw7avpfnw0mgqv3yhjsm4qm88yyy4w24a3cqzrvb56g";
};

unpackPhase = ''
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/sonobuoy/default.nix
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ buildGoModule rec {
let t = goPackagePath;
in ''
-ldflags=
-s -X ${t}/pkg/buildinfo.Version=${version}
-s -X ${t}/pkg/buildinfo.Version=v${version}
-X ${t}/pkg/buildinfo.GitSHA=${rev}
-X ${t}/pkg/buildDate=unknown
'';
Original file line number Diff line number Diff line change
@@ -167,6 +167,7 @@ let
hcloud = callPackage ./hcloud {};
keycloak = callPackage ./keycloak {};
libvirt = callPackage ./libvirt {};
linuxbox = callPackage ./linuxbox {};
lxd = callPackage ./lxd {};
shell = callPackage ./shell {};
vpsadmin = callPackage ./vpsadmin {};
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "terraform-provider-linuxbox";
version = "0.3.11";

src = fetchFromGitHub {
owner = "numtide";
repo = pname;
rev = "v${version}";
sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39";
};

vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k";

postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}";

passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox";

meta = with stdenv.lib; {
homepage = "https://github.com/numtide/terraform-provider-linuxbox";
description = "Basic building block for Seed DevOps";
license = licenses.bsd3;
maintainers = with maintainers; [ zimbatm ];
};
}
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.37.2"; # Please backport all updates to the stable channel.
version = "1.37.3"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0n4g2fh1ibw6fl5vbnnchx2vafasqrq8rl9w0ch7lai665zkxsk3";
sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/science/biology/picard-tools/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "picard-tools";
version = "2.23.4";
version = "2.23.8";

src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "0xg4nbx02a2kckr6p8pqjpv5rmp95bkmglgm1bma6f77s7hkab7q";
sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2";
};

nativeBuildInputs = [ makeWrapper ];
10 changes: 7 additions & 3 deletions pkgs/applications/science/logic/lean/default.nix
Original file line number Diff line number Diff line change
@@ -15,9 +15,13 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp ];
enableParallelBuilding = true;

preConfigure = ''
cd src
'';
cmakeDir = "../src";

# Running the tests is required to build the *.olean files for the core
# library.
doCheck = true;

postPatch = "patchShebangs .";

postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/bin/leanpkg \
18 changes: 6 additions & 12 deletions pkgs/data/fonts/iosevka/bin.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, unzip
{ stdenv, lib, fetchurl, iosevka, unzip
, variant ? ""
}:

@@ -29,17 +29,11 @@ in stdenv.mkDerivation rec {
unzip -d $out/share/fonts/truetype $src
'';

meta = with lib; {
homepage = "https://be5invis.github.io/Iosevka/";
downloadPage = "https://github.com/be5invis/Iosevka/releases";
description = ''
Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.cstrahan ];
meta = iosevka.meta // {
maintainers = with lib.maintainers; [
cstrahan
];
};

passthru.updateScript = ./update.sh;
passthru.updateScript = ./update-bin.sh;
}
Loading