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: e372ab46265a
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: 3748c250bbf5
Choose a head ref
  • 18 commits
  • 13 files changed
  • 11 contributors

Commits on Sep 20, 2018

  1. dolphinEmuMaster: mark broken on darwin

    The default version isn't enabled on darwin either, however it did work
    at some point.
    
        /tmp/nix-build-dolphin-emu-2018-08-17.drv-0/source/Source/Core/Core/NetPlayServer.cpp:1180:26: error: unknown type name 'lzo_uint32_t'; did you mean 'lzo_uint32'?
          std::vector<u8> wrkmem(LZO1X_1_MEM_COMPRESS);
    
    /cc ZHF #45961
    LnL7 committed Sep 20, 2018
    Copy the full SHA
    f6bc086 View commit details
  2. dico: mark linux only.

    Never built successfully.
    
        Undefined symbols for architecture x86_64:
          "_rpl_strerror", referenced from:
              _default_print_diag in libgrecs.a(diag.o)
              _grecs_symtab_strerror in libgrecs.a(symtab.o)
              _parse_inet in libgrecs.a(sockaddr.o)
        ld: symbol(s) not found for architecture x86_64
    
    /cc ZHF #45961
    LnL7 committed Sep 20, 2018
    Copy the full SHA
    709a828 View commit details
  3. docker-proxy: mark linux only

    Unlike docker (cli only) this probably won't work on darwin.
    
        github.com/docker/libnetwork/networkdb
        can't load package: package github.com/docker/libnetwork/ns: build constraints exclude all Go files in /private/tmp/nix-build-docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.drv-0/go/src/github.com/docker/libnetwork/ns
    
    /cc ZHF #45961
    LnL7 committed Sep 20, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    33f8181 View commit details

Commits on Sep 21, 2018

  1. numix-cursor-theme: 20160110 -> 1.1 (#47016)

    romildo authored and xeji committed Sep 21, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    e2ed4f3 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    Copy the full SHA
    452a81c View commit details
  3. clipgrab: 3.6.9 -> 3.7.0 (#47082)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/clipgrab/versions
    r-ryantm authored and xeji committed Sep 21, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    45de159 View commit details
  4. libretro.mame: 2017-03-02 -> 2018-09-13

    Fixes build of the MAME libretro core.
    
    Closes #47137.
    
    Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
    hrdinka committed Sep 21, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    da84efc View commit details
  5. fetchzip: Use unzip from buildPackages

    Additionally, the manual path manipulation becomes no longer needed.
    Ericson2314 committed Sep 21, 2018
    Copy the full SHA
    b972422 View commit details
  6. Copy the full SHA
    73862bf View commit details
  7. s-tui: 0.7.5 -> 0.8.2 (#47133)

    dtzWill authored and xeji committed Sep 21, 2018
    Copy the full SHA
    203b0ac View commit details
  8. Copy the full SHA
    d7b8f68 View commit details
  9. Merge pull request #47051 from LnL7/darwin-broken-d

    broken darwin packages (d)
    LnL7 authored Sep 21, 2018
    Copy the full SHA
    1a1a5af View commit details
  10. Merge pull request #47143 from obsidiansystems/windows-libusb

    libusb1: Build everywhere, since MinGW works
    Ericson2314 authored Sep 21, 2018
    Copy the full SHA
    a948796 View commit details
  11. lgogdownloader: 3.3 -> 3.4 (#47039)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/lgogdownloader/versions
    r-ryantm authored and xeji committed Sep 21, 2018
    Copy the full SHA
    3ac97c0 View commit details
  12. Merge pull request #47145 from obsidiansystems/fetchzip-cross

    fetchzip: Use unzip from buildPackages
    Ericson2314 authored Sep 21, 2018
    Copy the full SHA
    aba5f49 View commit details
  13. Copy the full SHA
    a526719 View commit details
  14. Copy the full SHA
    eb3bb7c View commit details
  15. Merge pull request #47149 from NixOS/revert-47093-auto-update/burp

    Revert "burp: 2.1.32 -> 2.2.4"
    ryantm authored Sep 21, 2018
    Copy the full SHA
    3748c25 View commit details
Original file line number Diff line number Diff line change
@@ -55,11 +55,11 @@ let

in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.16.1";
version = "1.16.2";

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1qlibn6k5zbjw9bni2l20qx58jcpwrl99awdmgha1fzmpjkn6bl5";
sha256 = "1j1785sc8pmrhi8yhlv4brxn7zrd33skgkkvzfl60nqkh2nybh3y";
};

phases = [ "unpackPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/applications/video/clipgrab/default.nix
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
name = "clipgrab-${version}";
version = "3.6.9";
version = "3.7.0";

src = fetchurl {
sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v";
sha256 = "0rx12218yy6h27z3xsmmxfsw8ldlsf4y862adkz6ybrygppsaib4";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${name}.tar.gz";
};
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/docker/proxy.nix
Original file line number Diff line number Diff line change
@@ -24,6 +24,6 @@ buildGoPackage rec {
license = licenses.asl20;
homepage = https://github.com/docker/libnetwork;
maintainers = with maintainers; [vdemeester];
platforms = docker.meta.platforms;
platforms = platforms.linux;
};
}
11 changes: 5 additions & 6 deletions pkgs/build-support/fetchzip/default.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
, name ? "source"
, ... } @ args:

lib.overrideDerivation (fetchurl ({
(fetchurl ({
inherit name;

recursiveHash = true;
@@ -23,8 +23,6 @@ lib.overrideDerivation (fetchurl ({

postFetch =
''
export PATH=${unzip}/bin:$PATH
unpackDir="$TMPDIR/unpack"
mkdir "$unpackDir"
cd "$unpackDir"
@@ -48,6 +46,7 @@ lib.overrideDerivation (fetchurl ({
mv "$unpackDir" "$out"
'') #*/
+ extraPostFetch;
} // removeAttrs args [ "stripRoot" "extraPostFetch" ]))
# Hackety-hack: we actually need unzip hooks, too
(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
# Hackety-hack: we actually need unzip hooks, too
nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];
})
19 changes: 11 additions & 8 deletions pkgs/data/icons/numix-cursor-theme/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchFromGitHub, inkscape, xcursorgen }:

stdenv.mkDerivation rec {
version = "20160110";

version = "1.1";
package-name = "numix-cursor-theme";

name = "${package-name}-${version}";

src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = "e92186d9df47c04d4e0a778eb6941ef58590b179";
sha256 = "1sr4pisgrn3632phsiny2fyr2ib6l51fnjdsanmh9ampagl4ly7g";
rev = "v${version}";
sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi";
};

dontBuild = true;
nativeBuildInputs = [ inkscape xcursorgen ];

buildPhase = ''
patchShebangs .
HOME=$TMP ./build.sh
'';

installPhase = ''
install -dm 755 $out/share/icons
cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/
cp -dr --no-preserve='ownership' Numix-Cursor{,-Light} $out/share/icons/
'';

meta = with stdenv.lib; {
6 changes: 6 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
@@ -1130,4 +1130,10 @@ self: super: {
safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; };
safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; };

# https://github.com/adinapoli/mandrill/pull/52
mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
});

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libusb1/default.nix
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.libusb.info;
description = "User-space USB library";
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.all;
maintainers = [ ];
};
}
14 changes: 8 additions & 6 deletions pkgs/development/python-modules/dependency-injector/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, six }:
{ stdenv, buildPythonPackage, fetchPypi, six, unittest2 }:

buildPythonPackage rec {
pname = "dependency-injector";
version = "3.13.1";
version = "3.13.2";

src = fetchPypi {
inherit pname version;
sha256 = "0bmcgdfjavgxdzkb904q968ig1x44arvpj2m4rpm5nc9vhhgq43q";
sha256 = "0kgb40qspibr1x8ksv0whrr7v0jy20dnqzmc591hm2y4kwzl5hdw";
};

# TODO: Enable tests after upstream merges https://github.com/ets-labs/python-dependency-injector/pull/204
doCheck = false;

propagatedBuildInputs = [ six ];
checkInputs = [ unittest2 ];

checkPhase = ''
unit2 discover tests/unit
'';

meta = with stdenv.lib; {
description = "Dependency injection microframework for Python";
4 changes: 2 additions & 2 deletions pkgs/games/lgogdownloader/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
name = "lgogdownloader-${version}";
version = "3.3";
version = "3.4";

src = fetchFromGitHub {
owner = "Sude-";
repo = "lgogdownloader";
rev = "v${version}";
sha256 = "056idwwxjcp2zjqk5h7l3py1h45sax4vbsm93bz9shnfx1s1h3gc";
sha256 = "155vnz4w2v5d3yihwzq8yi406g19kc7banzlarhlcp3j11riwd24";
};

nativeBuildInputs = [ cmake pkgconfig help2man ];
1 change: 1 addition & 0 deletions pkgs/misc/emulators/dolphin-emu/master.nix
Original file line number Diff line number Diff line change
@@ -78,6 +78,7 @@ in stdenv.mkDerivation rec {
branch = "master";
# x86_32 is an unsupported platform.
# Enable generic build if you really want a JIT-less binary.
broken = stdenv.isDarwin;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/retroarch/cores.nix
Original file line number Diff line number Diff line change
@@ -234,8 +234,8 @@ in with stdenv.lib.licenses;
core = "mame";
src = fetchRetro {
repo = "mame";
rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e";
sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
rev = "9f9e6b6c9bde4d50c72e9a5c80496a1fec6b8aa9";
sha256 = "0lfj8bjchkcvyb5x0x29cg10fkfklxndk80947k4qfysclijxpkv";
};
description = "Port of MAME to libretro";
license = gpl2Plus;
2 changes: 1 addition & 1 deletion pkgs/servers/dico/default.nix
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/dico/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
platforms = platforms.linux;

longDescription = ''
GNU Dico is a flexible modular implementation of DICT server
4 changes: 2 additions & 2 deletions pkgs/tools/system/s-tui/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "s-tui";
version = "0.7.5";
version = "0.8.2";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "01w5jh0p66jk4h3cmif4glq42zv44zhziczxjwazkd034rp8dnv9";
sha256 = "18bn0bpnrljx11gj95m2x5hlsnb8jkivlm6b1xx035ldgj1svgzh";
};

propagatedBuildInputs = with pythonPackages; [