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

Commits on Sep 5, 2019

  1. perkeep: 0.10.1 -> unstable-2019-07-29 

    0.10.1 is the latest release but it doesn't build with recent go versions
    @adisbladis
    adisbladis committed Sep 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a7dfe3f View commit details

  2. go-ethereum-classic: Drop package 

    It's unmaintained for years and doesn't build with Go 1.12
    @adisbladis
    adisbladis committed Sep 5, 2019

    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
    7814d35 View commit details

  3. fscrypt: 0.2.4 -> unstable-2019-08-29 

    Fix build with go 1.12
    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    aeef53e View commit details

  4. prometheus-snmp-exporter: 0.13.0 -> 0.15.0

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    a560ea3 View commit details

  5. prometheus_1: Build with go 1.12

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    3c22b23 View commit details

  6. diskrsync: unstable-2018-02-03 -> unstable-2019-01-02

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    2ff836f View commit details

  7. goa: Build with go 1.12

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    7e8573b View commit details

  8. dnscrypt-proxy2: Build with go 1.12

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    f942702 View commit details

  9. ipget: Build with go 1.12

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    416d11b View commit details

  10. notary: Build with go 1.12

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    4bca8b4 View commit details

  11. meguca: Build with go 1.12

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    137f947 View commit details

  12. tmsu: Build with go 1.12

    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    538a27b View commit details

  13. go_1_10: Drop package 

    It's unsupported by upstream.
    @adisbladis
    adisbladis committed Sep 5, 2019
    Copy the full SHA
    b611485 View commit details

Commits on Sep 6, 2019

  1. Merge pull request #68194 from adisbladis/drop-go-1_10 

    Drop unsupported go version 1.10
    @FRidh
    FRidh authored Sep 6, 2019
    Copy the full SHA
    9b92496 View commit details
24 changes: 0 additions & 24 deletions pkgs/applications/blockchains/go-ethereum-classic/default.nix
View file

This file was deleted.

39 changes: 0 additions & 39 deletions pkgs/applications/blockchains/go-ethereum-classic/deps.nix
View file

This file was deleted.

31 changes: 25 additions & 6 deletions pkgs/applications/misc/perkeep/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,37 @@
{ buildGo110Package, fetchzip, lib }:
{ buildGoPackage, fetchurl, fetchFromGitHub, lib }:

buildGo110Package rec {
let
gouiJS = fetchurl {
url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js";
sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g";
};

publisherJS = fetchurl {
url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js";
sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2";
};

in buildGoPackage rec {
name = "perkeep-${version}";
version = "0.10.1";
version = "unstable-2019-07-29";

src = fetchzip {
url = "https://perkeep.org/dl/perkeep-${version}-src.zip";
sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422";
src = fetchFromGitHub {
owner = "perkeep";
repo = "perkeep";
rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41";
sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg";
};

goPackagePath = "perkeep.org";

buildPhase = ''
cd "$NIX_BUILD_TOP/go/src/$goPackagePath"
# Skip network fetches
sed -i '/fetchAllJS/a if true { return nil }' make.go
cp ${publisherJS} app/publisher/publisher.js
cp ${gouiJS} server/perkeepd/ui/goui.js
go run make.go
'';

187 changes: 0 additions & 187 deletions pkgs/development/compilers/go/1.10.nix
View file

This file was deleted.

8 changes: 5 additions & 3 deletions pkgs/os-specific/linux/fscrypt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,15 +4,17 @@

buildGoPackage rec {
pname = "fscrypt";
version = "0.2.4";
version = "unstable-2019-08-29";

goPackagePath = "github.com/google/fscrypt";

goDeps = ./deps.nix;

src = fetchFromGitHub {
owner = "google";
repo = "fscrypt";
rev = "v${version}";
sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8";
rev = "8a3acda2011e9a080ee792c1e11646e6118a4930";
sha256 = "17h6r5lqiz0cw9vsixv48a1p78nd7bs1kncg6p4lfagl7kr5hpls";
};

buildInputs = [ pam ];
66 changes: 66 additions & 0 deletions pkgs/os-specific/linux/fscrypt/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading