Merge pull request #173265 from adisbladis/systemfd-0_4_0

systemfd: 0.3.0 -> 0.4.0

pkgs/development/tools/systemfd/Cargo.nix

@@ -1,215 +0,0 @@
-# Generated by carnix 0.10.0: carnix generate-nix
-{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
-with buildRustCrateHelpers;
-let inherit (lib.lists) fold;
-    inherit (lib.attrsets) recursiveUpdate;
-in
-rec {
-  crates = cratesIO;
-  systemfd = crates.crates.systemfd."0.3.0" deps;
-  __all = [ (systemfd {}) ];
-  deps.aho_corasick."0.6.4" = {
-    memchr = "2.0.1";
-  };
-  deps.ansi_term."0.11.0" = {
-    winapi = "0.3.4";
-  };
-  deps.atty."0.2.10" = {
-    termion = "1.5.1";
-    libc = "0.2.40";
-    winapi = "0.3.4";
-  };
-  deps.backtrace."0.3.7" = {
-    cfg_if = "0.1.3";
-    rustc_demangle = "0.1.8";
-    backtrace_sys = "0.1.16";
-    libc = "0.2.40";
-    winapi = "0.3.4";
-  };
-  deps.backtrace_sys."0.1.16" = {
-    libc = "0.2.40";
-    cc = "1.0.15";
-  };
-  deps.bitflags."1.0.3" = {};
-  deps.byteorder."1.2.3" = {};
-  deps.bytes."0.4.7" = {
-    byteorder = "1.2.3";
-    iovec = "0.1.2";
-  };
-  deps.cc."1.0.15" = {};
-  deps.cfg_if."0.1.3" = {};
-  deps.clap."2.31.2" = {
-    atty = "0.2.10";
-    bitflags = "1.0.3";
-    strsim = "0.7.0";
-    textwrap = "0.9.0";
-    unicode_width = "0.1.4";
-    vec_map = "0.8.1";
-    ansi_term = "0.11.0";
-  };
-  deps.clicolors_control."0.2.0" = {
-    lazy_static = "0.2.11";
-    libc = "0.2.40";
-    kernel32_sys = "0.2.2";
-    winapi = "0.3.4";
-  };
-  deps.console."0.6.1" = {
-    clicolors_control = "0.2.0";
-    lazy_static = "0.2.11";
-    libc = "0.2.40";
-    parking_lot = "0.5.5";
-    regex = "0.2.11";
-    unicode_width = "0.1.4";
-    termios = "0.2.2";
-    winapi = "0.3.4";
-  };
-  deps.failure."0.1.1" = {
-    backtrace = "0.3.7";
-    failure_derive = "0.1.1";
-  };
-  deps.failure_derive."0.1.1" = {
-    quote = "0.3.15";
-    syn = "0.11.11";
-    synstructure = "0.6.1";
-  };
-  deps.fuchsia_zircon."0.3.3" = {
-    bitflags = "1.0.3";
-    fuchsia_zircon_sys = "0.3.3";
-  };
-  deps.fuchsia_zircon_sys."0.3.3" = {};
-  deps.gcc."0.3.54" = {};
-  deps.iovec."0.1.2" = {
-    libc = "0.2.40";
-    winapi = "0.2.8";
-  };
-  deps.kernel32_sys."0.2.2" = {
-    winapi = "0.2.8";
-    winapi_build = "0.1.1";
-  };
-  deps.lazy_static."0.2.11" = {};
-  deps.lazy_static."1.0.0" = {};
-  deps.libc."0.2.40" = {};
-  deps.memchr."2.0.1" = {
-    libc = "0.2.40";
-  };
-  deps.nix."0.10.0" = {
-    bitflags = "1.0.3";
-    bytes = "0.4.7";
-    cfg_if = "0.1.3";
-    libc = "0.2.40";
-    void = "1.0.2";
-  };
-  deps.owning_ref."0.3.3" = {
-    stable_deref_trait = "1.0.0";
-  };
-  deps.parking_lot."0.5.5" = {
-    owning_ref = "0.3.3";
-    parking_lot_core = "0.2.14";
-  };
-  deps.parking_lot_core."0.2.14" = {
-    rand = "0.4.2";
-    smallvec = "0.6.1";
-    libc = "0.2.40";
-    winapi = "0.3.4";
-  };
-  deps.quote."0.3.15" = {};
-  deps.rand."0.4.2" = {
-    fuchsia_zircon = "0.3.3";
-    libc = "0.2.40";
-    winapi = "0.3.4";
-  };
-  deps.redox_syscall."0.1.37" = {};
-  deps.redox_termios."0.1.1" = {
-    redox_syscall = "0.1.37";
-  };
-  deps.regex."0.2.11" = {
-    aho_corasick = "0.6.4";
-    memchr = "2.0.1";
-    regex_syntax = "0.5.6";
-    thread_local = "0.3.5";
-    utf8_ranges = "1.0.0";
-  };
-  deps.regex."1.0.0" = {
-    aho_corasick = "0.6.4";
-    memchr = "2.0.1";
-    regex_syntax = "0.6.0";
-    thread_local = "0.3.5";
-    utf8_ranges = "1.0.0";
-  };
-  deps.regex_syntax."0.5.6" = {
-    ucd_util = "0.1.1";
-  };
-  deps.regex_syntax."0.6.0" = {
-    ucd_util = "0.1.1";
-  };
-  deps.rustc_demangle."0.1.8" = {};
-  deps.smallvec."0.6.1" = {};
-  deps.socket2."0.3.5" = {
-    cfg_if = "0.1.3";
-    libc = "0.2.40";
-    winapi = "0.3.4";
-  };
-  deps.stable_deref_trait."1.0.0" = {};
-  deps.strsim."0.7.0" = {};
-  deps.syn."0.11.11" = {
-    quote = "0.3.15";
-    synom = "0.11.3";
-    unicode_xid = "0.0.4";
-  };
-  deps.synom."0.11.3" = {
-    unicode_xid = "0.0.4";
-  };
-  deps.synstructure."0.6.1" = {
-    quote = "0.3.15";
-    syn = "0.11.11";
-  };
-  deps.systemfd."0.3.0" = {
-    clap = "2.31.2";
-    console = "0.6.1";
-    failure = "0.1.1";
-    failure_derive = "0.1.1";
-    lazy_static = "1.0.0";
-    libc = "0.2.40";
-    regex = "1.0.0";
-    nix = "0.10.0";
-    socket2 = "0.3.5";
-    uuid = "0.6.3";
-    winapi = "0.3.4";
-  };
-  deps.termion."1.5.1" = {
-    libc = "0.2.40";
-    redox_syscall = "0.1.37";
-    redox_termios = "0.1.1";
-  };
-  deps.termios."0.2.2" = {
-    libc = "0.2.40";
-  };
-  deps.textwrap."0.9.0" = {
-    unicode_width = "0.1.4";
-  };
-  deps.thread_local."0.3.5" = {
-    lazy_static = "1.0.0";
-    unreachable = "1.0.0";
-  };
-  deps.ucd_util."0.1.1" = {};
-  deps.unicode_width."0.1.4" = {};
-  deps.unicode_xid."0.0.4" = {};
-  deps.unreachable."1.0.0" = {
-    void = "1.0.2";
-  };
-  deps.utf8_ranges."1.0.0" = {};
-  deps.uuid."0.6.3" = {
-    cfg_if = "0.1.3";
-    rand = "0.4.2";
-  };
-  deps.vec_map."0.8.1" = {};
-  deps.void."1.0.2" = {};
-  deps.winapi."0.2.8" = {};
-  deps.winapi."0.3.4" = {
-    winapi_i686_pc_windows_gnu = "0.4.0";
-    winapi_x86_64_pc_windows_gnu = "0.4.0";
-  };
-  deps.winapi_build."0.1.1" = {};
-  deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
-  deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
-}

pkgs/development/tools/systemfd/crates-io.list

@@ -1,62 +0,0 @@
-aho-corasick-0.6.4
-ansi_term-0.11.0
-atty-0.2.10
-backtrace-0.3.7
-backtrace-sys-0.1.16
-bitflags-1.0.3
-byteorder-1.2.3
-bytes-0.4.7
-cc-1.0.15
-cfg-if-0.1.3
-clap-2.31.2
-clicolors-control-0.2.0
-console-0.6.1
-failure-0.1.1
-failure_derive-0.1.1
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-gcc-0.3.54
-iovec-0.1.2
-kernel32-sys-0.2.2
-lazy_static-0.2.11
-lazy_static-1.0.0
-libc-0.2.40
-memchr-2.0.1
-nix-0.10.0
-owning_ref-0.3.3
-parking_lot-0.5.5
-parking_lot_core-0.2.14
-quote-0.3.15
-rand-0.4.2
-redox_syscall-0.1.37
-redox_termios-0.1.1
-regex-0.2.11
-regex-1.0.0
-regex-syntax-0.5.6
-regex-syntax-0.6.0
-rustc-demangle-0.1.8
-smallvec-0.6.1
-socket2-0.3.5
-stable_deref_trait-1.0.0
-strsim-0.7.0
-syn-0.11.11
-synom-0.11.3
-synstructure-0.6.1
-systemfd-0.3.0
-termion-1.5.1
-termios-0.2.2
-textwrap-0.9.0
-thread_local-0.3.5
-ucd-util-0.1.1
-unicode-width-0.1.4
-unicode-xid-0.0.4
-unreachable-1.0.0
-utf8-ranges-1.0.0
-uuid-0.6.3
-vec_map-0.8.1
-void-1.0.2
-winapi-0.2.8
-winapi-0.3.4
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0

pkgs/development/tools/systemfd/default.nix

@@ -1,18 +1,32 @@
-{ lib, fetchgit, darwin, buildPlatform
+{ lib
-, buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }:
+, fetchFromGitHub
+, rustPlatform
+}:
+
+let
+  version = "0.4.0";
+
+in
+rustPlatform.buildRustPackage {
+
+  pname = "systemfd";
+  inherit version;
+
+  src = fetchFromGitHub {
+    repo = "systemfd";
+    owner = "mitsuhiko";
+    rev = version;
+    sha256 = "sha256-HUJgYPD4C9fMUYKpzmIy9gDT6HAZDWw1JLMKLgzRQTY=";
+  };
+
+  cargoSha256 = "sha256-UhfE9Q5E79rN2mjkNB5IAN/J0fbpoy9CmM6ojHQcFP0=";
 
-((import ./Cargo.nix {
-  inherit lib buildPlatform buildRustCrate buildRustCrateHelpers fetchgit;
-  cratesIO = import ./crates-io.nix { inherit lib buildRustCrate buildRustCrateHelpers; };
-}).systemfd {}).override {
-  crateOverrides = defaultCrateOverrides // {
-    systemfd = attrs: {
   meta = {
     description = "A convenient helper for passing sockets into another process";
     homepage = "https://github.com/mitsuhiko/systemfd";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.adisbladis ];
+    platforms = lib.platforms.unix;
   };
-    };
+
-  };
 }