Unverified Commit 9fe5a035 authored by dunklecat's avatar dunklecat Committed by GitHub
Browse files

Merge branch 'NixOS:master' into master

parents 12efa44d fee23ab3

nixos/modules/services/x11/clight.nix

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,14 @@ in { 
  };



  config = mkIf cfg.enable {

    assertions = let

      inRange = v: l: r: v >= l && v <= r;

    in [

      { assertion = config.location.provider == "manual" ->

          inRange config.location.latitude (-90) 90 && inRange config.location.longitude (-180) 180;

        message = "You must specify a valid latitude and longitude if manually providing location"; }

    ];



    boot.kernelModules = [ "i2c_dev" ];

    environment.systemPackages = with pkgs; [ clight clightd ];

    services.dbus.packages = with pkgs; [ clight clightd ];

pkgs/development/tools/omnisharp-roslyn/create-deps.sh

+1 −2
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i bash -p msbuild -p jq -p xmlstarlet -p curl

#!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl

set -euo pipefail



cat << EOL
@@ -20,7 +20,6 @@ mapfile -t repos < <( 


msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \

        -p:RestoreNoCache=true -p:RestoreForce=true \

        -p:NuGetPackageVersion=5.9.1-rc.8 \

        src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2



cd "$tmpdir"

pkgs/development/tools/omnisharp-roslyn/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -68,26 +68,23 @@ let 
in stdenv.mkDerivation rec {



  pname = "omnisharp-roslyn";

  version = "1.37.12";

  version = "1.37.15";



  src = fetchFromGitHub {

    owner = "OmniSharp";

    repo = pname;

    rev = "v${version}";

    sha256 = "0gyy49v3pslr0l0q6h8hzah4s0iwkhkyckyrj3g2cg08w20b10gw";

    sha256 = "070wqs667si3f78fy6w4rrfm8qncnabg0yckjhll0yv1pzbj9q42";

  };



  nativeBuildInputs = [ makeWrapper msbuild ];



  # NuGetPackageVersion is overridden to be to be compatible with msbuild 16.10,

  # it needs to be kept in sync with ./create-deps.sh

  buildPhase = ''

    runHook preBuild



    HOME=$(pwd)/fake-home msbuild -r \

      -p:Configuration=Release \

      -p:RestoreConfigFile=${nuget-config} \

      -p:NuGetPackageVersion=5.9.1-rc.8 \

      src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj



    runHook postBuild

pkgs/development/tools/omnisharp-roslyn/deps.nix

+126 −134

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/servers/reproxy/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "reproxy";

  version = "0.8.0";

  version = "0.9.0";



  src = fetchFromGitHub {

    owner = "umputun";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-zwQZr6BbvJ2Ol5pCLkZ49j0j5KWTK0N8BybvTr8PPeg=";

    hash = "sha256-z10KfDwIwitiR6ei1xV9//zhH7DLTow1giEYyjh8FIg=";

  };



  postPatch = ''