diff options
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/appimagekit/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/package-management/gx/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/package-management/gx/deps.nix | 246 | ||||
-rw-r--r-- | pkgs/tools/package-management/gx/go/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-doc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixpkgs-review/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixui/default.nix | 44 | ||||
-rwxr-xr-x | pkgs/tools/package-management/nixui/generate.sh | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixui/nixui.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixui/node-packages.nix | 108 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixui/pkg.json | 3 |
15 files changed, 58 insertions, 455 deletions
diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 620a0b05a95..3118b784334 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -37,6 +37,11 @@ let cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] . ''; + # Workaround build failure on -fno-common toolchains: + # ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8): + # multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 60fbdd4941f..0384cbce772 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,20 +1,19 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gx"; - version = "0.14.1"; - - goPackagePath = "github.com/whyrusleeping/gx"; + version = "0.14.3"; src = fetchFromGitHub { owner = "whyrusleeping"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha"; + rev = "v${version}"; + sha256 = "sha256-jGtUsb2gm8dN45wniD+PYoUlk8m1ssrfj1a7PPYEYuo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-6tdVpMztaBjoQRVG2vaUWuvnPq05zjbNAX9HBiC50t0="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A packaging tool built around IPFS"; diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix deleted file mode 100644 index 766e58775b4..00000000000 --- a/pkgs/tools/package-management/gx/deps.nix +++ /dev/null @@ -1,246 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "3c1074078d32d767e08ab2c8564867292da86926"; - sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcd"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcd"; - rev = "67e573d211ace594f1366b4ce9d39726c4b19bd0"; - sha256 = "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "07eab6a8298cf32fac45cceaac59424f98421bbc"; - sha256 = "1l2v9yq74qsiq3q7kii091rzx67jx6isz5szs27hyhsdwvy0y2p7"; - }; - } - { - goPackagePath = "github.com/gxed/hashland"; - fetch = { - type = "git"; - url = "https://github.com/gxed/hashland"; - rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8"; - sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-api"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-api"; - rev = "b4fd7838d9771414868cb78fa8c4f97e47cad013"; - sha256 = "1kb0ja6bji9q1ly66hx3490mjmk3w56zpwl9c0pkfy6da9x4dkyr"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-files"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-files"; - rev = "90d206a6f3947f904673ebffd376a2dcbbd84942"; - sha256 = "0bq6lciqba362lqmszjf1x33qwdpfrfik6r680iqr5c4sybywzqv"; - }; - } - { - goPackagePath = "github.com/libp2p/go-flow-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-flow-metrics"; - rev = "7e5a55af485341567f98d6847a373eb5ddcdcd43"; - sha256 = "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-crypto"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-crypto"; - rev = "3120e9f9526fe05f2d3905961a5e0701b85579d9"; - sha256 = "05i8jcfmk51zln634x782jvjmmn5l11104ylzqfnjxgjibz9pyd7"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-metrics"; - rev = "2d5733beaa2a9fdd05ef696d7a734aa61549fb2a"; - sha256 = "1g59z1mn483npmzgdyxn5w7w1k94phi5lgqkw3lq8i1b2jdy5mci"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-peer"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-peer"; - rev = "d3df4bca884d7a9c2d350c8120240db3c2b0f2ee"; - sha256 = "0hn75dnr80f846jj38bpcjw5z73iw292ygcqsfbghvdrwl2pf5xm"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-protocol"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-protocol"; - rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b"; - sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld"; - }; - } - { - goPackagePath = "github.com/minio/blake2b-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/blake2b-simd"; - rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; - sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "51976451ce1942acbb55707a983ed232fa027110"; - sha256 = "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/mr-tron/base58"; - fetch = { - type = "git"; - url = "https://github.com/mr-tron/base58"; - rev = "c8897612421d88a51012eaa53bf7267686173ae5"; - sha256 = "10lr50ia7xccfdvg772f7nb2azn81djcpnckhblhwq6l6a1fpm48"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr"; - rev = "ec8630b6b7436b5d7f6c1c2366d3d7214d1b29e2"; - sha256 = "1npx4d3scj087a54m6my2xnd0wga8bkklswnbhzghwhhpsgmy800"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr-net"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr-net"; - rev = "f0af4033635f1241179700537dacdc04f2803df8"; - sha256 = "0s90ix09mm6dc8319l48g3zhnjl1mkih168wsdh6fdf73801lhg5"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multihash"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multihash"; - rev = "a91e75d03bf4dba801af7b159c8b2aa7b5f47ea8"; - sha256 = "1xvj944qg17vmdgzhyn5qryqrksyxi1q188f91my52wfkz23qmmm"; - }; - } - { - goPackagePath = "github.com/sabhiram/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/sabhiram/go-gitignore"; - rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e"; - sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b"; - sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/json-filter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/json-filter"; - rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b"; - sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/progmeter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/progmeter"; - rev = "f3e57218a75b913eff88d49a52c1debf9684ea04"; - sha256 = "0xs8rz6yhpvj9512c5v3b8dwr2kivywnyyfxzdfbr6fy1xc8zskb"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/stump"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/stump"; - rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5"; - sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/tar-utils"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/tar-utils"; - rev = "8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc"; - sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "3d3f9f413869b949e48070b5bc593aa22cc2b8f2"; - sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; - sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; - }; - } -] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index ad4435c9e2d..bc5b90993a6 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,7 +1,5 @@ # This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub -, gx -}: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx-go"; @@ -18,13 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - extraSrcs = [ - { - goPackagePath = gx.goPackagePath; - src = gx.src; - } - ]; - meta = with lib; { description = "A tool for importing go packages into gx"; homepage = "https://github.com/whyrusleeping/gx-go"; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 882275eca44..defbcdf6e1b 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-H8FNOOjHMUW2wIUfoDhS3eH2AgxxD0LAuX4J9SJyJhg="; + sha256 = "sha256-bijcLIRBfoqirwz98Q3uQjHXSOaaqZECfav4TUvCuxg="; }; doCheck = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-BTMFoZ8HqbgUXkVyydOkcQZ10TLE8KsGRdt+xhBKJVc="; + cargoSha256 = "sha256-LpcAMsBeNa2GDGN7+9rTtkQluPfHSnAxanRtDtRahzc="; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 2fb514cf293..7e3f489b084 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "0.0.6"; + version = "2.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-NCUVRiZqg9JgS+hlAczvPDb0M5uIwyyqhdKe5K1P360="; + hash = "sha256-fN9D1rqJ4UFmCykTK8cU0oPWqN3wR8m9/zQ6fwVdBcY="; }; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 1cf2beb2bbb..25684ef3a7a 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub , version , suffix ? "" +, curl , sha256 ? null , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; } , patches ? [ ] @@ -23,7 +24,6 @@ in , bzip2 , callPackage , coreutils -, curl , editline , flex , gnutar diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7c26bddb835..7837f7cc7aa 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,6 +1,7 @@ { lib , aws-sdk-cpp , boehmgc +, curl , callPackage , fetchFromGitHub , fetchurl @@ -31,7 +32,7 @@ let common = args: callPackage - (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) + (import ./common.nix ({ inherit lib fetchFromGitHub curl; } // args)) { inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; @@ -85,7 +86,12 @@ in lib.makeExtensible (self: { sha256 = "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o="; }; - stable = self.nix_2_8; + nix_2_9 = common { + version = "2.9.1"; + sha256 = "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g="; + }; + + stable = self.nix_2_9; unstable = self.stable; }) diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 2ec98b82c69..21118870bfa 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -6,6 +6,18 @@ let inherit (poetry2nix.mkPoetryPackages { projectDir = ./python-env; python = python2; + overrides = [ + poetry2nix.defaultPoetryOverrides + (self: super: { + pyjwt = super.pyjwt.overridePythonAttrs (old: { + meta = old.meta // { + knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [ + "CVE-2022-29217" + ]; + }; + }); + }) + ]; }) python; pythonPackages = python.pkgs; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index d21c9b3c568..e65d28a6af9 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,24 +1,36 @@ { lib , python3 , fetchFromGitHub -, nix + +, bubblewrap +, cacert , git +, nix + +, withSandboxSupport ? false }: python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.6.4"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "sha256-6vKMaCTilPXd8K3AuLqtYInVyyFhdun0o9cX1WRMmWo="; + sha256 = "sha256-hGOcLrVPb+bSNA72ZfKE9Mjm2dr/qnuaCkjveHXPcws="; }; - makeWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.makeBinPath [ nix git ]}" - ]; + makeWrapperArgs = + let + binPath = [ nix git ] ++ lib.optional withSandboxSupport bubblewrap; + in + [ + "--prefix PATH : ${lib.makeBinPath binPath}" + "--set NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt" + # we don't have any runtime deps but nix-review shells might inject unwanted dependencies + "--unset PYTHONPATH" + ]; doCheck = false; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix deleted file mode 100644 index c5aef5c1754..00000000000 --- a/pkgs/tools/package-management/nixui/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem -, writeScript }: -let - nixui = (import ./nixui.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - })."nixui-git+https://github.com/matejc/nixui.git#0.2.1"; - script = writeScript "nixui" '' - #! ${stdenv.shell} - export PATH="${nix}/bin:\$PATH" - ${node_webkit}/bin/nw ${nixui}/lib/node_modules/nixui/ - ''; - desktop = makeDesktopItem { - name = "nixui"; - exec = script; - icon = "${nixui}/lib/node_modules/nixui/img/128.png"; - desktopName = "NixUI"; - genericName = "NixUI"; - }; -in -stdenv.mkDerivation rec { - pname = "nixui"; - version = "0.2.1"; - src = fetchFromGitHub { - owner = "matejc"; - repo = "nixui"; - rev = version; - sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s="; - }; - installPhase = '' - mkdir -p $out/bin - ln -s ${script} $out/bin/nixui - - mkdir -p $out/share/applications - ln -s ${desktop}/share/applications/* $out/share/applications/ - ''; - meta = { - description = "NodeWebkit user interface for Nix"; - homepage = "https://github.com/matejc/nixui"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.matejc ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh deleted file mode 100755 index fcb610c9d3b..00000000000 --- a/pkgs/tools/package-management/nixui/generate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -exec node2nix --nodejs-10 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix deleted file mode 100644 index e6ff9b78d38..00000000000 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix deleted file mode 100644 index 89362dbec09..00000000000 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ /dev/null @@ -1,108 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; - "binary-search-tree-0.2.4" = { - name = "binary-search-tree"; - packageName = "binary-search-tree"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz"; - sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510"; - }; - }; - "isnumber-1.0.0" = { - name = "isnumber"; - packageName = "isnumber"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz"; - sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; - }; - }; - "mkdirp-0.3.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - }; - "nedb-1.0.2" = { - name = "nedb"; - packageName = "nedb"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz"; - sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; - }; - }; - "underscore-1.12.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz"; - sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="; - }; - }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - }; - }; -in -{ - "nixui-git+https://github.com/matejc/nixui.git#0.2.1" = nodeEnv.buildNodePackage { - name = "nixui"; - packageName = "nixui"; - version = "0.2.1"; - src = fetchgit { - url = "https://github.com/matejc/nixui.git"; - rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38"; - sha256 = "2a2b1dcd9201e306242688c6c86f520ac47ef5de841ae0d7ea6ae8ff2889c3ab"; - }; - dependencies = [ - sources."async-0.2.10" - (sources."binary-search-tree-0.2.4" // { - dependencies = [ - sources."underscore-1.4.4" - ]; - }) - sources."isnumber-1.0.0" - sources."mkdirp-0.3.5" - (sources."nedb-1.0.2" // { - dependencies = [ - sources."underscore-1.4.4" - ]; - }) - sources."underscore-1.12.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "nix-env frontend written with Polymer"; - homepage = "https://github.com/matejc/nixui"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/tools/package-management/nixui/pkg.json b/pkgs/tools/package-management/nixui/pkg.json deleted file mode 100644 index 39aceb5b0e1..00000000000 --- a/pkgs/tools/package-management/nixui/pkg.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "nixui": "git+https://github.com/matejc/nixui.git#0.2.1" } -] |