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

Commits on Jun 1, 2018

  1. {g,w}llvm: 1.2.1 -> 1.2.2 

    (these are released together, at least currently)
    @dtzWill
    dtzWill committed Jun 1, 2018
    Copy the full SHA
    eefb003 View commit details

  2. gllvm: should work on "all" platforms, indicate this

    @dtzWill
    dtzWill committed Jun 1, 2018
    Copy the full SHA
    1feffb1 View commit details

  3. Merge pull request #41372 from dtzWill/update/gllvm-wllvm-1.2.2 

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

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

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

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

meta = with stdenv.lib; {
homepage = https://github.com/SRI-CSL/gllvm;
description = "Whole Program LLVM: wllvm ported to go";
license = licenses.bsd3;
maintainers = with maintainers; [ dtzWill ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/tools/wllvm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, python3Packages }:

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

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

meta = with stdenv.lib; {