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: 4e8f32012384
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: 67b6e5639126
Choose a head ref
  • 7 commits
  • 6 files changed
  • 1 contributor

Commits on Jul 21, 2020

  1. ios-deploy: move out of nodePackages 

    This doesn’t need nodePackages to work, so we can move it to
pkgs/os-specific/darwin. Note that it still requires xcodebuild to
work.
    @matthewbauer
    matthewbauer committed Jul 21, 2020
    Copy the full SHA
    10aa776 View commit details

Commits on Jul 28, 2020

  1. undmg: 1.0.3 -> 1.0.5

    @matthewbauer
    matthewbauer committed Jul 28, 2020
    Copy the full SHA
    ec80ae2 View commit details

Commits on Jul 31, 2020

  1. nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[] 

    Without distributedBuilds, you can’t use buildMachines flag.

Fixes #56593
    @matthewbauer
    matthewbauer committed Jul 31, 2020
    Copy the full SHA
    250885d View commit details

  2. Merge pull request #93541 from matthewbauer/ios-deploy-update 

    ios-deploy: move out of nodePackages
    @matthewbauer
    matthewbauer authored Jul 31, 2020

    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
    5a741d1 View commit details

  3. Merge pull request #94106 from matthewbauer/undmg-1-0-5 

    undmg: 1.0.3 -> 1.0.5
    @matthewbauer
    matthewbauer authored Jul 31, 2020

    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
    d861d3b View commit details

  4. Merge pull request #92415 from matthewbauer/nix-daemon-distributed-bu… 

    …ilds

Add assertion on distributedBuilds & buildMachines != []
    @matthewbauer
    matthewbauer authored Jul 31, 2020
    Copy the full SHA
    ed1423b View commit details

  5. nixos/nix-daemon.nix: fix nix.distributedBuilds assertion

    @matthewbauer
    matthewbauer committed Jul 31, 2020
    Copy the full SHA
    67b6e56 View commit details
7 changes: 7 additions & 0 deletions nixos/modules/services/misc/nix-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -500,6 +500,13 @@ in

config = {

assertions = [
{
assertion = config.nix.distributedBuilds || config.nix.buildMachines == [];
message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines";
}
];

nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];

11 changes: 0 additions & 11 deletions pkgs/development/node-packages/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,17 +43,6 @@ let
name = "bitwarden-cli-${drv.version}";
});

ios-deploy = super.ios-deploy.override (drv: {
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ];
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
meta.platforms = [ pkgs.lib.platforms.darwin ];
});

fast-cli = super."fast-cli-1.x".override {
preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
1 change: 0 additions & 1 deletion pkgs/development/node-packages/node-packages.json
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,6 @@
, "indium"
, "insect"
, "ionic"
, "ios-deploy"
, { "iosevka-build-deps": "../../data/fonts/iosevka" }
, "jake"
, "javascript-typescript-langserver"
35 changes: 35 additions & 0 deletions pkgs/os-specific/darwin/ios-deploy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ lib, stdenvNoCC, rsync, fetchFromGitHub }:

# Note this is impure, using system XCode to build ios-deploy. We
# should have a special flag for users to enable this.

let version = "1.11.0";
in stdenvNoCC.mkDerivation {
pname = "ios-deploy";
inherit version;
src = fetchFromGitHub {
owner = "ios-control";
repo = "ios-deploy";
rev = version;
sha256 = "0hqwikdrcnslx4kkw9b0n7n443gzn2gbrw15pp2fnkcw5s0698sc";
};
nativeBuildInputs = [ rsync ];
buildPhase = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
xcodebuild -configuration Release SYMROOT=build OBJROOT=$tmp
'';
checkPhase = ''
xcodebuild test -scheme ios-deploy-tests -configuration Release SYMROOT=build
'';
installPhase = ''
install -D build/Release/ios-deploy $out/bin/ios-deploy
'';
meta = {
platforms = lib.platforms.darwin;
description = "Install and debug iOS apps from the command line. Designed to work on un-jailbroken devices";
license = lib.licenses.gpl3;
};
}
5 changes: 2 additions & 3 deletions pkgs/tools/archivers/undmg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, zlib, bzip2 }:

stdenv.mkDerivation rec {
version = "1.0.3";
version = "1.0.5";
pname = "undmg";

src = fetchFromGitHub {
owner = "matthewbauer";
repo = "undmg";
rev = "v${version}";
sha256 = "1pxqw92h2w75d4jwiihwnkhnsfk09cddh3flgrqwh9r3ry14fgbb";

sha256 = "0yz5fniaa5z33d8bdzgr263957r1c9l99237y2p8k0hdid207la1";
};

buildInputs = [ zlib bzip2 ];
2 changes: 2 additions & 0 deletions pkgs/top-level/darwin-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -86,4 +86,6 @@ in

libtapi = callPackage ../os-specific/darwin/libtapi {};

ios-deploy = callPackage ../os-specific/darwin/ios-deploy {};

})