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: 1e1491900d8c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f36cf5638095
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 30, 2020

  1. silicon: init at 0.3.0

    @evanjs @marsam
    evanjs authored and marsam committed Jan 30, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 325649BCA6D53027
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    776ad2f View commit details

Commits on Jan 31, 2020

  1. Merge pull request #78795 from evanjs/silicon-init 

    silicon: init at 0.3.0
    @marsam
    marsam authored Jan 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f36cf56 View commit details
Showing with 50 additions and 0 deletions.
  1. +46 −0 pkgs/tools/misc/silicon/default.nix
  2. +4 −0 pkgs/top-level/all-packages.nix
46 changes: 46 additions & 0 deletions pkgs/tools/misc/silicon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkgconfig
, cmake
, llvmPackages
, expat
, freetype
, libxcb
, python3
, AppKit
, CoreText
, Security
}:

rustPlatform.buildRustPackage rec {
pname = "silicon";
version = "0.3.0";

src = fetchFromGitHub {
owner = "Aloxaf";
repo = "silicon";
rev = "v${version}";
sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy";
};

cargoSha256 = "11b9i1aa36wc7mg2lsvmkiisl23mjkg02xcvlb7zdangwzbv13sq";

buildInputs = [ llvmPackages.libclang expat freetype ]
++ lib.optionals stdenv.isLinux [ libxcb ]
++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ];

nativeBuildInputs = [ cmake pkgconfig ]
++ lib.optionals stdenv.isLinux [ python3 ];

LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

meta = with lib; {
description = "Create beautiful image of your source code.";
homepage = "https://github.com/Aloxaf/silicon";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ evanjs ];
platforms = platforms.all;
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10562,6 +10562,10 @@ in

sigrok-cli = callPackage ../development/tools/sigrok-cli { };

silicon = callPackage ../tools/misc/silicon {
inherit (darwin.apple_sdk.frameworks) AppKit CoreText Security;
};

simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { };

slimerjs = callPackage ../development/tools/slimerjs {};