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: 72a465f835cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 00577aef999f
Choose a head ref

Commits on Dec 16, 2020

  1. maintainers: add anhdle14

    anhdle14 committed Dec 16, 2020

    Unverified

    No user is associated with the committer email.
    Copy the full SHA
    b5fd71f View commit details

Commits on Jan 3, 2021

  1. bc-python-hcl2: init at 0.3.11

    Co-authored-by: Guillaume Girol <symphorien@users.noreply.github.com>
    anhdle14 and symphorien committed Jan 3, 2021

    Unverified

    No user is associated with the committer email.
    Copy the full SHA
    90b522e View commit details
  2. deep_merge: init at 0.0.4

    Co-authored-by: Guillaume Girol <symphorien@users.noreply.github.com>
    anhdle14 and symphorien committed Jan 3, 2021

    Unverified

    No user is associated with the committer email.
    Copy the full SHA
    7dc9da6 View commit details

Commits on Jan 14, 2021

  1. checkov: init at 1.0.674

    anhdle14 committed Jan 14, 2021
    Copy the full SHA
    a0a4feb View commit details

Commits on Jan 15, 2021

  1. Revert "Merge pull request #105709 from CajuM/symbiflow"

    This reverts commit 02828f9, reversing
    changes made to f0a7fce.
    thoughtpolice committed Jan 15, 2021
    Copy the full SHA
    ca27105 View commit details
  2. maintainers: add mcaju

    Câju Mihai-Drosi authored and thoughtpolice committed Jan 15, 2021
    Copy the full SHA
    5ffd4e1 View commit details
  3. ghdl: 0.37 -> unstable-2021.01.14

    This unreleased version of GHDL fixes a bunch of bugs. It also contains
    a few internal API changes for synthesis support -- required by the GHDL
    yosys plugin.
    
    Ideally, we can just remove this when 0.38 comes out.
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Jan 15, 2021
    Copy the full SHA
    51d1125 View commit details
  4. yosys: enable loading "out of band" plugins

    By default, when yosys looks for plugins with the `-m` flag or `plugin`
    command, it always looks in `YOSYS_PREFIX/share/yosys/plugins` for a
    `.so` file, and loads that.
    
    By design, this is intended to be a single, global, mutable location
    such as `/usr/share/yosys/...` on disk, and plugins are supposed to
    install their `.so` files here after yosys is installed, and they all
    coexist together. Obviously, this won't work for us, but users might
    expect these plugins to still work. More importantly, they won't want to
    add special cases to their build systems.
    
    Instead, to allow Nix users to use yosys plugins with the same UX (e.g.
    natively call `plugin bluespec` or `-m ghdl`), we add a patch to yosys
    that allows it to search a new `NIX_YOSYS_PLUGIN_DIRS` search path
    environment variable. In tandem, we add a setup hook that adds to this
    search path if a package has a `$out/share/yosys/plugins` directory.
    
    Thus, it's enough to just include `yosys`, and any package that has a
    yosys plugin in `$out/share/yosys/plugins`, and you can load it with
    `-m` or the `plugin` command.
    
    We could use a style like the haskellPackages set, where the set of
    packages are "encased" in a lambda, and we pass packages that are
    compatible with that version of the compiler:
    
        haskell.packages.ghc8102.ghcWithPackages (p: with p; [ ... ])
    
    but, realistically, there will probably only ever be one version of
    yosys and one set of compatible plugins, so this seems overdone.
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Jan 15, 2021
    Copy the full SHA
    2660037 View commit details
  5. Copy the full SHA
    c32f5b2 View commit details
  6. init: experimental yosys-{bluespec, ghdl} plugins

    These plugins can be included in a closure, along with the `yosys`
    derivation, and they will be automatically picked up for use. For
    example, this allows you to include 'yosys-bluespec' in your
    `buildInputs`, and then immediately run:
    
        $ nix-shell -p yosys yosys-bluespec yosys-ghdl
        $ yosys -m bluespec -p 'help read_bluespec'
        $ yosys -m ghdl -p 'help ghdl'
    
    These two plugins are a bit experimental, admittedly, but they are good,
    clean examples of how to write and use the yosys plugin infrastructure,
    and make it easy to test updates, etc.
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Jan 15, 2021
    Copy the full SHA
    ec1830e View commit details
  7. yosys: cherry-pick some minor fixes (cf d81e4d9)

    d81e4d9 contained some minor fixes to the yosys derivation
    that make it a little easier to read and maintain. Incorporate those.
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Jan 15, 2021
    Copy the full SHA
    365ef90 View commit details
  8. yosys: some more small fixes from review feedback

    Fixes up the usage of patches/postInstall. Also removes `stdenv.lib` and
    other minor tweaks.
    
    Based on feedback from Sandro and Mihai.
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Jan 15, 2021
    Copy the full SHA
    9a951db View commit details
  9. Copy the full SHA
    eb5ef67 View commit details
  10. Copy the full SHA
    a646165 View commit details

Commits on Jan 16, 2021

  1. Copy the full SHA
    5edf616 View commit details
  2. Copy the full SHA
    8dd78bb View commit details
  3. Copy the full SHA
    0964932 View commit details
  4. Copy the full SHA
    bcdca92 View commit details
  5. Copy the full SHA
    20566f7 View commit details
  6. Merge pull request #109461 from thoughtpolice/nixpkgs/yosys-plugins

    yosys: add support for loading plugins, revert symbiflow changes
    thoughtpolice authored Jan 16, 2021
    Copy the full SHA
    d18e537 View commit details
  7. Merge pull request #109469 from domenkozar/pkgs.nixos-rebuild

    move nixos-rebuild into pkgs
    domenkozar authored Jan 16, 2021
    Copy the full SHA
    d3afdf9 View commit details
  8. audacity: 2.4.1 -> 2.4.2

    A few other things:
     - prep for transition to gtk3 when audacity recommends it
     - we drop the runtime linking with lame as audacity is picking it up on
       its own
     - on linux, add a number of missing dependencies.
     - use a newer (recommended) wxwidgets
     - add a patch (merged upstream) that makes audacity follow XDG for file locations
    peterhoeg committed Jan 16, 2021
    Copy the full SHA
    249db9f View commit details
  9. Copy the full SHA
    a9bb543 View commit details
  10. Merge pull request #109502 from danieldk/1password-gui-0.9.8

    _1password-gui: 0.9.7 -> 0.9.8
    SuperSandro2000 authored Jan 16, 2021
    Copy the full SHA
    046e4ed View commit details
  11. Copy the full SHA
    abb4941 View commit details
  12. Merge pull request #109485 from r-ryantm/auto-update/python3.7-ipyvue

    python37Packages.ipyvue: 1.4.1 -> 1.5.0
    SuperSandro2000 authored Jan 16, 2021
    Copy the full SHA
    51397fb View commit details
  13. Merge pull request #109496 from r-ryantm/auto-update/python3.7-google…

    …-cloud-spanner
    
    python37Packages.google-cloud-spanner: 2.1.0 -> 3.0.0
    SuperSandro2000 authored Jan 16, 2021
    Copy the full SHA
    82d4fe2 View commit details
  14. Merge pull request #109492 from bbigras/mtail

    mtail: 3.0.0-rc38 -> 3.0.0-rc41
    SuperSandro2000 authored Jan 16, 2021
    Copy the full SHA
    ff9818d View commit details
  15. Copy the full SHA
    b96633c View commit details
  16. Copy the full SHA
    3464ca4 View commit details
  17. Merge pull request #107028 from anhdle14/checkov-1.0.674

    checkov: init at 1.0.674
    symphorien authored Jan 16, 2021
    Copy the full SHA
    afd7b55 View commit details
  18. Copy the full SHA
    2445824 View commit details
  19. Copy the full SHA
    00577ae View commit details
Showing with 1,306 additions and 1,505 deletions.
  1. +10 −0 maintainers/maintainer-list.nix
  2. +1 −11 nixos/modules/installer/tools/tools.nix
  3. +1 −1 pkgs/applications/audio/AMB-plugins/default.nix
  4. +1 −1 pkgs/applications/audio/FIL-plugins/default.nix
  5. +102 −20 pkgs/applications/audio/audacity/default.nix
  6. +1 −1 pkgs/applications/audio/mi2ly/default.nix
  7. +1 −1 pkgs/applications/graphics/rapcad/default.nix
  8. +1 −1 pkgs/applications/misc/slmenu/default.nix
  9. +1 −1 pkgs/applications/misc/vifm/default.nix
  10. +1 −1 pkgs/data/fonts/tempora-lgc/default.nix
  11. +1 −1 pkgs/data/fonts/unscii/default.nix
  12. +0 −43 pkgs/data/misc/prjxray-db/default.nix
  13. +0 −47 pkgs/data/misc/symbiflow-arch-defs/default.nix
  14. +1 −1 pkgs/development/beam-modules/pc/default.nix
  15. +1 −1 pkgs/development/compilers/abcl/default.nix
  16. +1 −1 pkgs/development/compilers/clasp/default.nix
  17. +9 −7 pkgs/development/compilers/ghdl/default.nix
  18. +1 −1 pkgs/development/compilers/obliv-c/default.nix
  19. +0 −29 pkgs/development/compilers/prjxray-tools/default.nix
  20. +0 −40 pkgs/development/compilers/symbiflow-vtr/default.nix
  21. +0 −37 pkgs/development/compilers/symbiflow-yosys-plugins/default.nix
  22. +0 −37 pkgs/development/compilers/symbiflow-yosys/default.nix
  23. +13 −17 pkgs/development/compilers/yosys/default.nix
  24. +34 −0 pkgs/development/compilers/yosys/plugin-search-dirs.patch
  25. +32 −0 pkgs/development/compilers/yosys/plugins/bluespec.nix
  26. +31 −0 pkgs/development/compilers/yosys/plugins/ghdl.nix
  27. +5 −0 pkgs/development/compilers/yosys/setup-hook.sh
  28. +1 −1 pkgs/development/interpreters/icon-lang/default.nix
  29. +1 −1 pkgs/development/interpreters/rebol/default.nix
  30. +1 −1 pkgs/development/interpreters/unicon-lang/default.nix
  31. +1 −1 pkgs/development/libraries/arb/default.nix
  32. +1 −1 pkgs/development/libraries/cddlib/default.nix
  33. +1 −1 pkgs/development/libraries/dxflib/default.nix
  34. +1 −1 pkgs/development/libraries/eclib/default.nix
  35. +1 −1 pkgs/development/libraries/fflas-ffpack/default.nix
  36. +1 −1 pkgs/development/libraries/flint/default.nix
  37. +1 −1 pkgs/development/libraries/fplll/20160331.nix
  38. +1 −1 pkgs/development/libraries/fplll/default.nix
  39. +1 −1 pkgs/development/libraries/gf2x/default.nix
  40. +1 −1 pkgs/development/libraries/givaro/3.7.nix
  41. +1 −1 pkgs/development/libraries/givaro/3.nix
  42. +1 −1 pkgs/development/libraries/givaro/default.nix
  43. +1 −1 pkgs/development/libraries/gle/default.nix
  44. +1 −1 pkgs/development/libraries/qtinstaller/default.nix
  45. +1 −1 pkgs/development/libraries/tachyon/default.nix
  46. +1 −1 pkgs/development/lisp-modules/asdf/2.26.nix
  47. +1 −1 pkgs/development/lisp-modules/asdf/3.1.nix
  48. +1 −1 pkgs/development/lisp-modules/asdf/default.nix
  49. +1 −1 pkgs/development/lisp-modules/clwrapper/default.nix
  50. +1 −1 pkgs/development/lisp-modules/lisp-packages.nix
  51. +1 −1 pkgs/development/perl-modules/Percona-Toolkit/default.nix
  52. +49 −0 pkgs/development/python-modules/bc-python-hcl2/default.nix
  53. +24 −0 pkgs/development/python-modules/deep_merge/default.nix
  54. +2 −2 pkgs/development/python-modules/google-cloud-spanner/default.nix
  55. +2 −2 pkgs/development/python-modules/ipyvue/default.nix
  56. +0 −44 pkgs/development/python-modules/python-prjxray/default.nix
  57. +1 −1 pkgs/development/python-modules/spark_parser/default.nix
  58. +0 −27 pkgs/development/python-modules/symbiflow-fasm/default.nix
  59. +0 −36 pkgs/development/python-modules/textx/default.nix
  60. +0 −45 pkgs/development/python-modules/xc-fasm/default.nix
  61. +77 −0 pkgs/development/tools/analysis/checkov/default.nix
  62. +1 −0 pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
  63. +4 −4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
  64. +10 −0 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
  65. +4 −4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
  66. +4 −4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
  67. +4 −4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
  68. +4 −4 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
  69. +4 −0 pkgs/development/tools/parsing/tree-sitter/update.nix
  70. +14 −0 pkgs/os-specific/linux/nixos-rebuild/default.nix
  71. 0 {nixos/modules/installer/tools → pkgs/os-specific/linux/nixos-rebuild}/nixos-rebuild.sh
  72. +1 −1 pkgs/os-specific/linux/sinit/default.nix
  73. +1 −1 pkgs/servers/http/nix-binary-cache/default.nix
  74. +3 −3 pkgs/servers/monitoring/mtail/default.nix
  75. +1 −1 pkgs/servers/nosql/apache-jena/binary.nix
  76. +1 −1 pkgs/servers/nosql/apache-jena/fuseki-binary.nix
  77. +2 −2 pkgs/servers/web-apps/hedgedoc/default.nix
  78. +1 −1 pkgs/servers/web-apps/hedgedoc/package.json
  79. +400 −479 pkgs/servers/web-apps/hedgedoc/yarn.lock
  80. +400 −488 pkgs/servers/web-apps/hedgedoc/yarn.nix
  81. +1 −1 pkgs/tools/X11/ratmen/default.nix
  82. +1 −1 pkgs/tools/X11/skippy-xd/default.nix
  83. +2 −2 pkgs/tools/audio/abcmidi/default.nix
  84. +2 −2 pkgs/tools/security/1password-gui/default.nix
  85. +9 −13 pkgs/top-level/all-packages.nix
  86. +4 −8 pkgs/top-level/python-packages.nix
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -610,6 +610,16 @@
githubId = 11699655;
name = "Stanislas Lange";
};
anhdle14 = {
name = "Le Anh Duc";
email = "anhdle14@icloud.com";
github = "anhdle14";
githubId = 9645992;
keys = [{
longkeyid = "rsa4096/0x0299AFF9ECBB5169";
fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169";
}];
};
ankhers = {
email = "me@ankhers.dev";
github = "ankhers";
12 changes: 1 addition & 11 deletions nixos/modules/installer/tools/tools.nix
Original file line number Diff line number Diff line change
@@ -28,17 +28,7 @@ let
];
};

nixos-rebuild =
let fallback = import ./nix-fallback-paths.nix; in
makeProg {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
inherit (pkgs) runtimeShell;
nix = config.nix.package.out;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
path = makeBinPath [ pkgs.jq ];
};
nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };

nixos-generate-config = makeProg {
name = "nixos-generate-config";
2 changes: 1 addition & 1 deletion pkgs/applications/audio/AMB-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preInstall="mkdir -p $out/lib/ladspa";

meta = {
description = ''A set of ambisonics ladspa plugins'';
description = "A set of ambisonics ladspa plugins";
longDescription = ''
Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders.
'';
2 changes: 1 addition & 1 deletion pkgs/applications/audio/FIL-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preInstall="mkdir -p $out/lib/ladspa";

meta = {
description = ''a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed'';
description = "a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed";
longDescription = ''
Each section has an active/bypass switch, frequency, bandwidth and gain controls.
There is also a global bypass switch and gain control.
122 changes: 102 additions & 20 deletions pkgs/applications/audio/audacity/default.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,79 @@
{ lib, stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
cmake
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, wxGTK
, pkg-config
, python3
, gettext
, file
, libvorbis
, libmad
, libjack2
, lv2
, lilv
, serd
, sord
, sratom
, suil
, alsaLib
, libsndfile
, soxr
, flac
, twolame
, expat
, libid3tag
, libopus
, ffmpeg
, soundtouch
, pcre /*, portaudio - given up fighting their portaudio.patch */
, at-spi2-core ? null
, dbus ? null
, epoxy ? null
, libXdmcp ? null
, libXtst ? null
, libpthreadstubs ? null
, libselinux ? null
, libsepol ? null
, libxkbcommon ? null
, utillinux ? null
}:

with stdenv.lib;
# TODO
# - as of 2.4.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions
# - detach sbsms

stdenv.mkDerivation rec {
version = "2.4.1";
pname = "audacity";
version = "2.4.2";

src = fetchzip {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn";
src = fetchFromGitHub {
owner = "audacity";
repo = "audacity";
rev = "Audacity-${version}";
sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI=";
};

cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
patches = [
(fetchpatch {
url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch";
sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc=";
name = "audacity_xdg_paths.patch";
})
];

# audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually
# this file *should* be generated by cmake but as of 2.4.2 isn't yet
postPatch = ''
touch src/RevisionIdent.h
'';

# workaround for a broken cmake. Drop it with a later version to see if it works.
# https://github.com/NixOS/nixpkgs/issues/94905
cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES=";

# audacity only looks for ffmpeg at runtime, so we need to link it in manually
NIX_LDFLAGS = toString [
# LAME
"-lmp3lame"
# ffmpeg
"-lavcodec"
"-lavdevice"
@@ -35,14 +86,45 @@ stdenv.mkDerivation rec {
"-lswscale"
];

nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ cmake gettext pkg-config python3 ];

buildInputs = [
file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
ffmpeg_3 libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms
alsaLib
expat
ffmpeg
file
flac
libid3tag
libjack2
libmad
libopus
libsndfile
libvorbis
lilv
lv2
pcre
serd
sord
soundtouch
soxr
sratom
suil
twolame
wxGTK
wxGTK.gtk
] ++ lib.optionals stdenv.isLinux [
at-spi2-core
dbus
epoxy
libXdmcp
libXtst
libpthreadstubs
libxkbcommon
libselinux
libsepol
utillinux
];

dontDisableStatic = true;
doCheck = false; # Test fails

meta = with lib; {
2 changes: 1 addition & 1 deletion pkgs/applications/audio/mi2ly/default.nix
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ stdenv.mkDerivation {

meta = {
inherit (s) version;
description = ''MIDI to Lilypond converter'';
description = "MIDI to Lilypond converter";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/rapcad/default.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
description = ''Constructive solid geometry package'';
description = "Constructive solid geometry package";
broken = true; # 2018-04-11
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/slmenu/default.nix
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
makeFlags = [ "PREFIX=$(out)" ];
meta = {
inherit (s) version;
description = ''A console dmenu-like tool'';
description = "A console dmenu-like tool";
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
2 changes: 1 addition & 1 deletion pkgs/applications/misc/vifm/default.nix
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
'';

meta = with lib; {
description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}'';
description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}";
maintainers = with maintainers; [ raskin ];
platforms = if mediaSupport then platforms.linux else platforms.unix;
license = licenses.gpl2;
2 changes: 1 addition & 1 deletion pkgs/data/fonts/tempora-lgc/default.nix
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw";

meta = {
description = ''Tempora font'';
description = "Tempora font";
license = lib.licenses.gpl2 ;
maintainers = [lib.maintainers.raskin];
};
2 changes: 1 addition & 1 deletion pkgs/data/fonts/unscii/default.nix
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

meta = {
inherit version;
description = ''Bitmapped character-art-friendly Unicode fonts'';
description = "Bitmapped character-art-friendly Unicode fonts";
# Basically GPL2+ with font exception — because of the Unifont-augmented
# version. The reduced version is public domain.
license = "http://unifoundry.com/LICENSE.txt";
43 changes: 0 additions & 43 deletions pkgs/data/misc/prjxray-db/default.nix

This file was deleted.

47 changes: 0 additions & 47 deletions pkgs/data/misc/symbiflow-arch-defs/default.nix

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/development/beam-modules/pc/default.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ buildHex {
sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0";

meta = {
description = ''a rebar3 port compiler for native code'';
description = "a rebar3 port compiler for native code";
license = stdenv.lib.licenses.mit;
homepage = "https://github.com/blt/port_compiler";
};
2 changes: 1 addition & 1 deletion pkgs/development/compilers/abcl/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [jre ant jdk jre];
meta = {
inherit version;
description = ''A JVM-based Common Lisp implementation'';
description = "A JVM-based Common Lisp implementation";
license = stdenv.lib.licenses.gpl3 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
2 changes: 1 addition & 1 deletion pkgs/development/compilers/clasp/default.nix
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {

meta = {
inherit version;
description = ''A Common Lisp implementation based on LLVM with C++ integration'';
description = "A Common Lisp implementation based on LLVM with C++ integration";
license = stdenv.lib.licenses.lgpl21Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
Loading