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: c89cbdcd48bf
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: 3be43b748386
Choose a head ref
10 contributors

Commits on Dec 10, 2018

  1. nixos/nvidia: fix inverted assertion

    @thefloweringash
    thefloweringash committed Dec 10, 2018
    Copy the full SHA
    f233280 View commit details

  2. railcar: init at 1.0.4 

    Co-authored-by: Alyssa Ross <hi@alyssa.is>
    @spacekookie @alyssais
    spacekookie and alyssais committed Dec 10, 2018
    Copy the full SHA
    7641a13 View commit details

Commits on Dec 11, 2018

  1. railcar: add reference to upstream patch

    @rasendubi
    rasendubi committed Dec 11, 2018
    Copy the full SHA
    e376aec View commit details

  2. syncthing: fix build (#51866) 

    ###### Motivation for this change

fixes #51825 

###### Things done

<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->

- [x] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
- Built on platform(s)
   - [x] NixOS
   - [ ] macOS
   - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Assured whether relevant documentation is up to date
- [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

---
    @Mic92
    Mic92 authored Dec 11, 2018
    Copy the full SHA
    643fabf View commit details

  3. Merge pull request #51838 from spacekookie/railcar 

    railcar: init at 1.0.4
    @rasendubi
    rasendubi authored Dec 11, 2018
    Copy the full SHA
    ebd47d7 View commit details

  4. php: init at 7.3.0

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    ff7192d View commit details

  5. unit: add php module 7.3

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    6c8b7ac View commit details

  6. php71: 7.1.24 -> 7.1.25

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    374be65 View commit details

  7. php72: 7.2.12 -> 7.2.13

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    f80e7df View commit details

  8. php: add custom options

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    b5137de View commit details

  9. unit: update php module config

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    bfe31df View commit details

  10. php: fix bug 71041

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    45ef74c View commit details

  11. php: fix build php 7.3 in Darwin

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    80f4d5d View commit details

  12. phpPackages.apcu: 5.1.11 -> 5.1.15

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    c120d94 View commit details

  13. phpPackages.apcu_bc: fix build with php73

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    23190fb View commit details

  14. phpPackages.imagick: fix build with php73

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    cea4312 View commit details

  15. phpPackages.igbinary: 2.0.4 -> 2.0.8

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    6a34ad0 View commit details

  16. phpPackages.v8js: 1.4.1 -> 2.1.0

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    6a9f31f View commit details

  17. phpPackages.yaml: 2.0.2 -> 2.0.4

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    2fb2d1f View commit details

  18. phpPackages: disable build with php73

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    b0b623e View commit details

  19. phpPackages.xdebug: fix build with php73

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    43b2734 View commit details

  20. phpPackages.memcached: fix build with php73

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    72b3cea View commit details

  21. phpPackages.couchbase: 2.3.4 -> 2.6.0

    @Izorkin @fpletz
    Izorkin authored and fpletz committed Dec 11, 2018
    Copy the full SHA
    3c15573 View commit details

  22. Merge pull request #51738 from Izorkin/php73 

    php: update php packages
    @fpletz
    fpletz authored Dec 11, 2018
    Copy the full SHA
    10d9fe7 View commit details

  23. vboxExtpack: Fix the sha256 to be hex. 

    It does not work if the sha256 is not hex, it fails because VBoxExtPackHelperApp requires to be given a hex hash.
See NixOS/nixpkgs#34846 where the same problem was fixed some time ago.
    @ambrop72
    ambrop72 committed Dec 11, 2018
    Copy the full SHA
    22acb2e View commit details

  24. Merge #51836: nixos/nvidia: fix inverted assertion

    @vcunat
    vcunat committed Dec 11, 2018
    Copy the full SHA
    ac19d5e View commit details

  25. Merge pull request #51878 from ambrop72/vbox-extpack-hash-fix 

    vboxExtpack: Fix the sha256 to be hex.
    @markuskowa
    markuskowa authored Dec 11, 2018
    Copy the full SHA
    3be43b7 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/hardware/video/nvidia.nix
View file
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ in
config = mkIf enabled {
assertions = [
{
assertion = config.services.xserver.displayManager.gdm.wayland;
assertion = !config.services.xserver.displayManager.gdm.wayland;
message = "NVIDIA drivers don't support wayland";
}
{
38 changes: 22 additions & 16 deletions pkgs/applications/networking/syncthing/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, lib, go, procps, removeReferencesTo, fetchFromGitHub }:
{ buildGoPackage, fetchpatch, stdenv, lib, procps, fetchFromGitHub }:

let
common = { stname, target, patches ? [], postInstall ? "" }:
stdenv.mkDerivation rec {
common = { stname, target, postInstall ? "" }:
buildGoPackage rec {
version = "0.14.52";
name = "${stname}-${version}";

@@ -13,29 +13,36 @@ let
sha256 = "1qzzbqfyjqlgzysyf6dr0xsm3gn35irmllxjjd94v169swvkk5kd";
};

inherit patches;
goPackagePath = "github.com/syncthing/syncthing";

buildInputs = [ go ];
nativeBuildInputs = [ removeReferencesTo ];
patches = [
./add-stcli-target.patch
(fetchpatch {
url = "https://github.com/syncthing/syncthing/commit/e7072feeb7669948c3e43f55d21aec15481c33ba.patch";
sha256 = "1pcybww2vdx45zhd1sd53v7fp40vfgkwqgy8flv7hxw2paq8hxd4";
})
];
BUILD_USER="nix";
BUILD_HOST="nix";

buildPhase = ''
# Syncthing expects that it is checked out in $GOPATH, if that variable is
# set. Since this isn't true when we're fetching source, we can explicitly
# unset it and force Syncthing to set up a temporary one for us.
env GOPATH= BUILD_USER=nix BUILD_HOST=nix go run build.go -no-upgrade -version v${version} build ${target}
runHook preBuild
pushd go/src/${goPackagePath}
go run build.go -no-upgrade -version v${version} build ${target}
popd
runHook postBuild
'';

installPhase = ''
install -Dm755 ${target} $out/bin/${target}
pushd go/src/${goPackagePath}
runHook preInstall
install -Dm755 ${target} $bin/bin/${target}
runHook postInstall
popd
'';

inherit postInstall;

preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
'';

meta = with lib; {
homepage = https://www.syncthing.net/;
description = "Open Source Continuous File Synchronization";
@@ -79,7 +86,6 @@ in {
syncthing-cli = common {
stname = "syncthing-cli";

patches = [ ./add-stcli-target.patch ];
target = "stcli";
};

Loading