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: 1f6e46ff968a
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: 9e693a074d0c
Choose a head ref
  • 11 commits
  • 8 files changed
  • 11 contributors

Commits on Mar 24, 2019

  1. ghcjs-ng: unbreak

    @vaibhavsagar
    vaibhavsagar committed Mar 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e4975aa View commit details

Commits on Mar 25, 2019

  1. ponyc: 0.27.0 -> 0.28.0 

    https://www.ponylang.io/blog/2019/03/0.28.0-released/
    @dtzWill
    dtzWill committed Mar 25, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ee2beac View commit details

  2. pkgsMusl, pkgsi686Linux, pkgsStatic: fix infinite recursion with over… 

    …lays

Consider example:

$ nix-instantiate ./nixos -A system --arg configuration '
    {
      boot.isContainer = true;
      nixpkgs.overlays = [ (self: super: {
        nix = self.pkgsStatic.nix;
      }) ];
    }'

When resolving package through overlays, we figure out that

  nix == self.pkgsStatic.nix
  =>
  nix == (import <nixpkgs> { inherit overlays; }).nix
  =>
  nix == (import <nixpkgs> { overlays = [(self: super: { nix = self.pkgsStatic.nix; })];}).nix

and we enter infinite recursion of nixpkgs evaluations.

The proper fix should terminate recursion by assigning self fixpoint
to inner custom package set. But I get infinite recursion somehow, so
I use `super`. It is less correct modulo deep custom overrides, but behaves
correctly for simple cases and doesn't OOM evaluator.

Fixes NixOS/nixpkgs#57984
    @danbst
    danbst committed Mar 25, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f729038 View commit details

  3. lazygit: 0.5 -> 0.7.2

    @basilgood
    basilgood committed Mar 25, 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
    6272132 View commit details

  4. Merge pull request #58192 from vaibhavsagar/unbreak-ghcjs-ng 

    ghcjs-ng: unbreak
    @Ericson2314
    Ericson2314 authored Mar 25, 2019
    Copy the full SHA
    725b549 View commit details

  5. Merge pull request #58246 from danbst/infinite-recursion-otherPackage… 

    …Sets

pkgsMusl, pkgsi686Linux, pkgsStatic: fix infinite recursion with overlays
    @matthewbauer
    matthewbauer authored Mar 25, 2019
    Copy the full SHA
    5f32434 View commit details

  6. tdesktop: 1.6.2 -> 1.6.3 

    tdesktopPackages.preview: 1.6.2 -> 1.6.3
    @primeos
    primeos committed Mar 25, 2019
    Copy the full SHA
    698a3f7 View commit details

  7. evince: enable postscript support

    @gebner
    gebner committed Mar 25, 2019
    Copy the full SHA
    fa35597 View commit details

  8. Merge pull request #58235 from dtzWill/update/ponyc-0.28.0 

    ponyc: 0.27.0 -> 0.28.0
    @dtzWill
    dtzWill authored Mar 25, 2019
    Copy the full SHA
    5eb3edc View commit details

  9. citrix_receiver: remove old versions 

    The versions 13.8.0 and 13.9.{0,1} will be EOLed before the end of 19.03
and should be dropped.

To provide an easy upgrade path, all unsupported versions will throw an
evaluation error. All versions that are about the be EOLed can be added
there as well.

For now, all of those deprecated versions are still referenced in
`all-packages.nix`, but should be removed before the next release.

See also https://www.citrix.co.uk/support/product-lifecycle/milestones/receiver.html
    @Ma27 @obadz
    Ma27 authored and obadz committed Mar 25, 2019
    Copy the full SHA
    d4a570a View commit details

  10. Merge pull request #58253 from plumelo/feature/lazygit-0.7.2 

    lazygit: 0.5 -> 0.7.2
    @etu
    etu authored Mar 25, 2019
    Copy the full SHA
    9e693a0 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
version = "1.6.2";
sha256Hash = "1vkcwlr9mmn9ns02has2qb4x1qgx3a9hjh3k5x7k57n3v7k2a7x2";
version = "1.6.3";
sha256Hash = "1bm0m1y3cf0zmaasz1wfkbz5fy9wm7ivyjn9bzs87yrvlj9x7wqz";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "429149";
archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli";
65 changes: 22 additions & 43 deletions pkgs/applications/networking/remote/citrix-receiver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -38,51 +38,30 @@ let
};
});

versionInfo = {
"13.8.0" = {
major = "13";
minor = "8";
patch = "0";
x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931";
x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7";
x64suffix = "10299729";
x86suffix = "10299729";
homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html;
};

"13.9.0" = {
major = "13";
minor = "9";
patch = "0";
x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9";
x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag";
x64suffix = "102";
x86suffix = "102";
homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh*
};

"13.9.1" = {
major = "13";
minor = "9";
patch = "1";
x64hash = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC";
x86hash = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483";
x64suffix = "6";
x86suffix = "6";
homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-1391.html;
versionInfo = let
supportedVersions = {
"13.10.0" = {
major = "13";
minor = "10";
patch = "0";
x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA";
x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4";
x64suffix = "20";
x86suffix = "20";
homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
};
};

"13.10.0" = {
major = "13";
minor = "10";
patch = "0";
x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA";
x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4";
x64suffix = "20";
x86suffix = "20";
homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
};
};
# break an evaluation for old Citrix versions rather than exiting with
# an "attribute name not found" error to avoid confusion.
deprecatedVersions = let
versions = [ "13.8.0" "13.9.0" "13.9.1" ];
in
lib.listToAttrs
(lib.flip map versions
(v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}")));
in
deprecatedVersions // supportedVersions;

citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
stdenv.mkDerivation rec {
1 change: 1 addition & 0 deletions pkgs/desktops/gnome-3/core/evince/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {

configureFlags = [
"--disable-nautilus" # Do not build nautilus plugin
"--enable-ps"
"--enable-introspection"
(if supportXPS then "--enable-xps" else "--disable-xps")
];
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghcjs-ng/common-overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -5,4 +5,5 @@ in self: super: {
ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
system-fileio = doJailbreak super.system-fileio;
}
1 change: 0 additions & 1 deletion pkgs/development/compilers/ghcjs-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -105,6 +105,5 @@ in stdenv.mkDerivation {

meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
meta.maintainers = [lib.maintainers.elvishjerricco];
meta.broken = true;
meta.hydraPlatforms = [];
}
8 changes: 4 additions & 4 deletions pkgs/development/compilers/ponyc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
cc ? stdenv.cc, lto ? !stdenv.isDarwin }:

stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.27.0";
pname = "ponyc";
version = "0.28.0";

src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
repo = pname;
rev = version;
sha256 = "11vdfvv9xirfi92y7zza9pqimfx33w74vw7rg5n7l60qqc8y2cla";
sha256 = "011qxhiq75j6d37ws4nb6a8bdfw2cvlcsb2fgdkn1hx2xb81h6wc";
};

buildInputs = [ llvm makeWrapper which ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/lazygit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "lazygit-${version}";
version = "0.5";
version = "0.7.2";

goPackagePath = "github.com/jesseduffield/lazygit";

src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazygit";
rev = "v${version}";
sha256 = "0xgda2b5p26ya15kq83502f8vh18kl05hl40k0lsfqx3m7pnidn1";
sha256 = "1b5mzmxw715cx7b0n22hvrpk0dbavzypljc7skwmh8k1nlx935jj";
};

postPatch = ''
9 changes: 9 additions & 0 deletions pkgs/top-level/stage.nix
View file
Original file line number Diff line number Diff line change
@@ -135,6 +135,9 @@ let
# default GNU libc on Linux systems. Non-Linux systems are not
# supported.
pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
overlays = [ (self': super': {
pkgsMusl = super';
})] ++ overlays;
${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // {
@@ -151,6 +154,9 @@ let
# All packages built for i686 Linux.
# Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun {
overlays = [ (self': super': {
pkgsi686Linux = super';
})] ++ overlays;
${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // {
@@ -176,6 +182,9 @@ let
# Fully static packages.
# Currently uses Musl on Linux (couldn’t get static glibc to work).
pkgsStatic = nixpkgsFun ({
overlays = [ (self': super': {
pkgsStatic = super';
})] ++ overlays;
crossOverlays = [ (import ./static.nix) ];
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
crossSystem = {