Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 817c086642e7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a53b98248d7
Choose a head ref
  • 18 commits
  • 17 files changed
  • 14 contributors

Commits on Mar 22, 2018

  1. perlPackages.perlldap: init at 0.65 

    This package provides the Net::LDAP module and replaces the old
version 0.4001 NetLDAP package.
    @limeytexan
    limeytexan committed Mar 22, 2018
    Copy the full SHA
    43775ce View commit details

Commits on Mar 29, 2018

  1. urlwatch: 2.8 -> 2.9 

    Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/urlwatch/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/2rxia8pnparqbq5fim3w2wkzd80dpnd6-urlwatch-2.9/bin/.urlwatch-wrapped -h` got 0 exit code
- ran `/nix/store/2rxia8pnparqbq5fim3w2wkzd80dpnd6-urlwatch-2.9/bin/.urlwatch-wrapped --help` got 0 exit code
- ran `/nix/store/2rxia8pnparqbq5fim3w2wkzd80dpnd6-urlwatch-2.9/bin/.urlwatch-wrapped --version` and found version 2.9
- ran `/nix/store/2rxia8pnparqbq5fim3w2wkzd80dpnd6-urlwatch-2.9/bin/urlwatch -h` got 0 exit code
- ran `/nix/store/2rxia8pnparqbq5fim3w2wkzd80dpnd6-urlwatch-2.9/bin/urlwatch --help` got 0 exit code
- ran `/nix/store/2rxia8pnparqbq5fim3w2wkzd80dpnd6-urlwatch-2.9/bin/urlwatch --version` and found version 2.9
- found 2.9 with grep in /nix/store/2rxia8pnparqbq5fim3w2wkzd80dpnd6-urlwatch-2.9
- directory tree listing: https://gist.github.com/0eda6a1b4d363b26b50e23e30e7a5397
    @ryantm
    ryantm committed Mar 29, 2018
    Copy the full SHA
    efcec64 View commit details

Commits on Mar 31, 2018

  1. pmd: 6.1.0 -> 6.2.0 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pmd/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.2.0 with grep in /nix/store/flm3k0shklh231zj06ksx2h0zvb1kvp5-pmd-6.2.0
- found 6.2.0 in filename of file in /nix/store/flm3k0shklh231zj06ksx2h0zvb1kvp5-pmd-6.2.0
- directory tree listing: https://gist.github.com/99fc1a75766445dbe9a6459e2fe10750
    R. RyanTM committed Mar 31, 2018
    Copy the full SHA
    ca3c49c View commit details

Commits on Apr 2, 2018

  1. Fix GHCJS 7.10

    @ElvishJerricco
    ElvishJerricco committed Apr 2, 2018
    Copy the full SHA
    774253e View commit details

  2. Adding create-cycle-app 

    Adding create-cycle-app

Fixing removed modules
    @nyarly
    nyarly committed Apr 2, 2018
    Copy the full SHA
    4bf9fc7 View commit details

Commits on Apr 3, 2018

  1. mailutils: disable parallel building 

    to avoid sporadic build failures
    @xeji
    xeji committed Apr 3, 2018
    Copy the full SHA
    b913e36 View commit details

  2. tectonic: fix darwin build

    @mbode
    mbode committed Apr 3, 2018
    Copy the full SHA
    8f2102d View commit details

  3. gnomeExtensions.dash-to-dock: 62 → 63

    @jtojnar
    jtojnar committed Apr 3, 2018
    Copy the full SHA
    e362dd6 View commit details

  4. Merge pull request #38314 from ElvishJerricco/fix-ghcjs-7.10 

    Fix GHCJS 7.10
    @peti
    peti authored Apr 3, 2018
    Copy the full SHA
    97e891a View commit details

  5. Merge pull request #38381 from xeji/p/mailutils 

    mailutils: disable parallel building
    @matthewbauer
    matthewbauer authored Apr 3, 2018
    Copy the full SHA
    3bbea5c View commit details

  6. Merge pull request #38164 from r-ryantm/auto-update/pmd 

    pmd: 6.1.0 -> 6.2.0
    @matthewbauer
    matthewbauer authored Apr 3, 2018
    Copy the full SHA
    60f8df2 View commit details

  7. Merge pull request #38046 from ryantm/auto-update/urlwatch 

    urlwatch: 2.8 -> 2.9
    @matthewbauer
    matthewbauer authored Apr 3, 2018
    Copy the full SHA
    b3788ff View commit details

  8. Merge pull request #37603 from limeytexan/perlPackages.perlldap 

    perlPackages.perlldap: init at 0.65
    @matthewbauer
    matthewbauer authored Apr 3, 2018
    Copy the full SHA
    b8420be View commit details

  9. parity: new release 1.10.0 (#37618) 

    * parity: 1.8.11 -> 1.9.5

* parity-beta: 1.9.4 -> 1.10.0

* parity: patch fixes
    @akru @matthewbauer
    akru authored and matthewbauer committed Apr 3, 2018
    Copy the full SHA
    d305c24 View commit details

  10. Merge pull request #38384 from mbode/tectonic_darwin 

    tectonic: fix darwin build
    @LnL7
    LnL7 authored Apr 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: BE743C5DD7703515
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc1d4ad View commit details

  11. sysvinit: 2.88dsf -> 2.89 

    Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/sysvinit/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/n54idc6ddkgkwnbbg8y6avb5wvzb5s34-sysvinit-2.89/bin/last help` got 0 exit code
- ran `/nix/store/n54idc6ddkgkwnbbg8y6avb5wvzb5s34-sysvinit-2.89/bin/utmpdump -h` got 0 exit code
- ran `/nix/store/n54idc6ddkgkwnbbg8y6avb5wvzb5s34-sysvinit-2.89/bin/wall help` got 0 exit code
- found 2.89 with grep in /nix/store/n54idc6ddkgkwnbbg8y6avb5wvzb5s34-sysvinit-2.89
- directory tree listing: https://gist.github.com/6fdc40b90f12b6caa767385d367da4d9
    @ryantm @matthewbauer
    ryantm authored and matthewbauer committed Apr 3, 2018
    Copy the full SHA
    b705ac6 View commit details

  12. Merge pull request #38077 from nyarly/create-cycle-app 

    (create-cycle-app): init at 4.0.0
    @7c6f434c
    7c6f434c authored Apr 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    yorickvP Yorick
    GPG key ID: D8D3CC6D951384DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    713b0f7 View commit details

  13. openjdk10: Use included cacerts

    @NeQuissimus
    NeQuissimus committed Apr 3, 2018

    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
    5a53b98 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/altcoins/parity/beta.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let
version = "1.9.4";
sha256 = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f";
cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3";
patches = [ ./patches/vendored-sources-1.9.patch ];
version = "1.10.0";
sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g";
cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m";
patches = [ ./patches/vendored-sources-1.10.patch ];
in
import ./parity.nix { inherit version sha256 cargoSha256 patches; }
8 changes: 4 additions & 4 deletions pkgs/applications/altcoins/parity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let
version = "1.8.11";
sha256 = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k";
cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi";
patches = [ ./patches/vendored-sources-1.8.patch ];
version = "1.9.5";
sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7";
cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva";
patches = [ ./patches/vendored-sources-1.9.patch ];
in
import ./parity.nix { inherit version sha256 cargoSha256 patches; }
52 changes: 35 additions & 17 deletions ...parity/patches/vendored-sources-1.8.patch → ...arity/patches/vendored-sources-1.10.patch
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,47 @@
diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 000000000..8dddda426
--- /dev/null
index 72652ad2f..b21c6aa7b 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -0,0 +1,94 @@
@@ -1,3 +1,113 @@
[target.x86_64-pc-windows-msvc]
# Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
rustflags = ["-Ctarget-feature=+crt-static"]
+
+[source."https://github.com/alexcrichton/mio-named-pipes"]
+git = "https://github.com/alexcrichton/mio-named-pipes"
+branch = "master"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"]
+git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"
+rev = "bd25b41cd642c6b822d820dded3aa601a29aa079"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"]
+git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"
+rev = "4b6f112412716cd05123d32eeb7fda448288a6c6"
+replace-with = "vendored-sources"
+
+[source."https://github.com/nikvolf/parity-tokio-ipc"]
+git = "https://github.com/nikvolf/parity-tokio-ipc"
+branch = "master"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/nikvolf/tokio-named-pipes"]
+git = "https://github.com/nikvolf/tokio-named-pipes"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/parity-js/dapp-wallet.git"]
+git = "https://github.com/parity-js/dapp-wallet.git"
+rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87"
+replace-with = "vendored-sources"
+
+[source."https://github.com/parity-js/shell.git"]
+git = "https://github.com/parity-js/shell.git"
+rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/bn"]
+git = "https://github.com/paritytech/bn"
+branch = "master"
@@ -34,14 +57,9 @@ index 000000000..8dddda426
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/js-precompiled.git"]
+git = "https://github.com/paritytech/js-precompiled.git"
+branch = "stable"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/jsonrpc.git"]
+git = "https://github.com/paritytech/jsonrpc.git"
+branch = "parity-1.8"
+branch = "parity-1.10"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/libusb-rs"]
@@ -54,11 +72,6 @@ index 000000000..8dddda426
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/nanomsg.rs.git"]
+git = "https://github.com/paritytech/nanomsg.rs.git"
+branch = "parity-1.7"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/rust-ctrlc.git"]
+git = "https://github.com/paritytech/rust-ctrlc.git"
+branch = "master"
@@ -89,6 +102,11 @@ index 000000000..8dddda426
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/wasmi"]
+git = "https://github.com/paritytech/wasmi"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/tailhook/rotor"]
+git = "https://github.com/tailhook/rotor"
+branch = "master"
12 changes: 6 additions & 6 deletions pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@ index 000000000..0efb69724
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"]
+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"
+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"]
+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"]
+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"
+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"]
+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"
+branch = "master"
+replace-with = "vendored-sources"
+
@@ -90,8 +90,8 @@ index 000000000..0efb69724
+branch = "master"
+replace-with = "vendored-sources"
+
+[source."https://github.com/pepyakin/wasmi"]
+git = "https://github.com/pepyakin/wasmi"
+[source."https://github.com/paritytech/wasmi"]
+git = "https://github.com/paritytech/wasmi"
+branch = "master"
+replace-with = "vendored-sources"
+
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "gnome-shell-dash-to-dock-${version}";
version = "v62";
version = "v63";

src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
rev = "extensions.gnome.org-" + version;
sha256 = "1kmf7vxhd1c1zgaim1pwmcmsg0kffng7hcl5gfcy5qb5yvb4dy5d";
sha256 = "140ih4l3nn2lbgw684xjvkhqxflr1xg2vm1m46z632bb0y3py4yg";
};

nativeBuildInputs = [
1 change: 0 additions & 1 deletion pkgs/development/compilers/ghcjs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@

bootPkgs.callPackage ./base.nix {
inherit bootPkgs cabal-install;
broken = true; # https://hydra.nixos.org/build/70552553
}
7 changes: 0 additions & 7 deletions pkgs/development/compilers/openjdk/10.nix
View file
Original file line number Diff line number Diff line change
@@ -135,13 +135,6 @@ let
fi
done
# Generate certificates.
(
cd $jre/lib/openjdk/jre/lib/security
rm cacerts
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
)
ln -s $out/lib/openjdk/bin $out/bin
ln -s $jre/lib/openjdk/jre/bin $jre/bin
ln -s $jre/lib/openjdk/jre $out/jre
11 changes: 11 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file
Original file line number Diff line number Diff line change
@@ -219,4 +219,15 @@ self: super: {
chr-pretty = doJailbreak super.chr-pretty;
chr-parse = doJailbreak super.chr-parse;

# The autogenerated Nix expressions don't take into
# account `if impl(ghc >= x.y)`, which is a common method to depend
# on `semigroups` or `fail` when building with GHC < 8.0.
system-filepath = addBuildDepend super.system-filepath self.semigroups;
haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups;
free = addBuildDepend super.free self.fail;

# Newer versions don't build without base-4.9
resourcet = self.resourcet_1_1_11;
conduit = self.conduit_1_2_13_1;

}
13 changes: 0 additions & 13 deletions pkgs/development/haskell-modules/configuration-ghcjs.nix
View file
Original file line number Diff line number Diff line change
@@ -53,19 +53,6 @@ self: super:
terminfo = self.terminfo_0_4_0_2;
xhtml = self.xhtml_3000_2_1;

# Cabal isn't part of the stage1 packages which form the default package-db
# that GHCJS provides.
# Almost all packages require Cabal to build their Setup.hs,
# but usually they don't declare it explicitly as they don't need to for normal GHC.
# To account for that we add Cabal by default.
mkDerivation = args: super.mkDerivation (args // {
setupHaskellDepends = (args.setupHaskellDepends or []) ++
(if args.pname == "Cabal" then [ ]
# Break the dependency cycle between Cabal and hscolour
else if args.pname == "hscolour" then [ (dontHyperlinkSource self.Cabal) ]
else [ self.Cabal ]);
});

## OTHER PACKAGES

# haddock throws the error: No input file(s).
1 change: 1 addition & 0 deletions pkgs/development/node-packages/node-packages-v8.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
"bower"
, "coffee-script"
, "create-cycle-app"
, "dat"
, "grunt-cli"
, "mocha"
Loading