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

Commits on May 18, 2018

  1. gllvm: 1.2.0 -> 1.2.1

    @dtzWill
    dtzWill committed May 18, 2018
    Copy the full SHA
    208abdb View commit details

  2. wllvm: 1.2.0 -> 1.2.1 

    Also add myself as another maintainer.
    @dtzWill
    dtzWill committed May 18, 2018
    Copy the full SHA
    41ede7f View commit details

  3. Merge pull request #40733 from dtzWill/update/gllvm-wllvm-1.2.1 

    {g,w}llvm: 1.2.0 -> 1.2.1
    @dtzWill
    dtzWill authored May 18, 2018
    Copy the full SHA
    6a8aa56 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/development/tools/gllvm/default.nix
  2. +3 −3 pkgs/development/tools/wllvm/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/tools/gllvm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "gllvm-${version}";
version = "1.2.0";
version = "1.2.1";

goPackagePath = "github.com/SRI-CSL/gllvm";

src = fetchFromGitHub {
owner = "SRI-CSL";
repo = "gllvm";
rev = "v${version}";
sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is";
sha256 = "1rbvn7qhzb7xxqv0wrkwxq4sm657vsl6q7nwrfq2zwb21573811z";
};

meta = with stdenv.lib; {
6 changes: 3 additions & 3 deletions pkgs/development/tools/wllvm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ stdenv, python3Packages }:

python3Packages.buildPythonApplication rec {
version = "1.2.0";
version = "1.2.1";
pname = "wllvm";
name = "${pname}-${version}";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z";
sha256 = "1yr0gijhgbxx1sl5a8dygr3a8g5wfkh9rk4v789r2aplvcbanv5a";
};

meta = with stdenv.lib; {
homepage = https://github.com/travitch/whole-program-llvm;
description = "A wrapper script to build whole-program LLVM bitcode files";
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
maintainers = with maintainers; [ mic92 dtzWill ];
platforms = platforms.all;
};
}