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: 93506c3a0b09
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: 409fd48e6420
Choose a head ref
  • 7 commits
  • 5 files changed
  • 3 contributors

Commits on Sep 21, 2018

  1. libusb1: Build everywhere, since MinGW works

    @Ericson2314
    Ericson2314 committed Sep 21, 2018
    Copy the full SHA
    452a81c View commit details

  2. fetchzip: Use unzip from buildPackages 

    Additionally, the manual path manipulation becomes no longer needed.
    @Ericson2314
    Ericson2314 committed Sep 21, 2018
    Copy the full SHA
    b972422 View commit details

  3. 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

(cherry picked from commit f6bc086)
    @LnL7
    LnL7 committed Sep 21, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    488a45d View commit details

  4. 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

(cherry picked from commit 709a828)
    @LnL7
    LnL7 committed Sep 21, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    61ce290 View commit details

  5. 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

(cherry picked from commit 33f8181)
    @LnL7
    LnL7 committed Sep 21, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5165dfe View commit details

  6. Merge pull request #47144 from obsidiansystems/windows-libusb 

    libusb1: Build everywhere, since MinGW works, for 18.09
    @Ericson2314
    Ericson2314 authored Sep 21, 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
    2ef1d08 View commit details

  7. Merge pull request #47146 from obsidiansystems/fetchzip-cross 

    fetchzip: Use unzip from buildPackages
    @Ericson2314
    Ericson2314 authored Sep 21, 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
    409fd48 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/docker/proxy.nix
View file
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
View file
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 ];
})
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libusb1/default.nix
View file
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 = [ ];
};
}
1 change: 1 addition & 0 deletions pkgs/misc/emulators/dolphin-emu/master.nix
View file
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" ];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/dico/default.nix
View file
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