From 517c52ec2e6d55553cee8df6fefda6d0cb022c41 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 2 Aug 2018 21:20:21 +0200 Subject: [PATCH 001/248] postgresql: always create the $out/bin directory This is needed because some PostgreSQL plugins don't have a bin directory. If only these plugins are listed in cfg.extraPlugins buildEnv will turn $out/bin into a symbolic link to ${pg}/bin. Lateron we try to rm $out/bin/{pg_config,postgres,pg_ctl} which will then fail because $out/bin will be read-only. --- nixos/modules/services/databases/postgresql.nix | 5 ++++- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 1 - pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 1 - pkgs/servers/sql/postgresql/ext/pgjwt.nix | 1 - pkgs/servers/sql/postgresql/ext/pgroonga.nix | 1 - pkgs/servers/sql/postgresql/ext/pgrouting.nix | 1 - pkgs/servers/sql/postgresql/ext/plv8.nix | 1 - pkgs/servers/sql/postgresql/ext/timescaledb.nix | 7 ------- pkgs/servers/sql/postgresql/ext/tsearch_extras.nix | 1 - 9 files changed, 4 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 87b236dd5fd1..197932c2f6c8 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -12,10 +12,13 @@ let else pkgs.buildEnv { name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}"; paths = [ pg pg.lib ] ++ cfg.extraPlugins; + # We include /bin to ensure the $out/bin directory is created which is + # needed because we'll be removing files from that directory in postBuild + # below. See #22653 + pathsToLink = [ "/" "/bin" ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' - mkdir -p $out/bin rm $out/bin/{pg_config,postgres,pg_ctl} cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl} wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 494e6dbac4f4..8a31d1981291 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 mkdir -p $out/{lib,share/extension} cp *.so $out/lib diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 32945c9fa62b..aa204eec5a6d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { buildInputs = [ postgresql gcc ]; buildPhase = "USE_PGXS=1 make"; installPhase = '' - mkdir -p $out/bin # for buildEnv to setup proper symlinks install -D pg_similarity.so -t $out/lib/ install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index ab7ba8943a7b..3185e2265744 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { buildPhase = ":"; installPhase = '' - mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory mkdir -p $out/share/extension cp pg*sql *.control $out/share/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 2fc190d8e009..c07153e1971d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { makeFlags = [ "HAVE_MSGPACK=1" ]; installPhase = '' - mkdir -p $out/bin install -D pgroonga.so -t $out/lib/ install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 722c70b2e89a..bdb3fcae3dc0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653 install -D lib/*.so -t $out/lib install -D sql/pgrouting--${version}.sql -t $out/share/extension install -D sql/common/pgrouting.control -t $out/share/extension diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index b6446f292c6c..603349d9d654 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { buildPhase = "make -f Makefile.shared all"; installPhase = '' - mkdir -p $out/bin install -D plv8*.so -t $out/lib install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension ''; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 9a664bc25188..d6986f936bb0 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -34,13 +34,6 @@ stdenv.mkDerivation rec { done ''; - postInstall = '' - # work around an annoying bug, by creating $out/bin, so buildEnv doesn't freak out later - # see https://github.com/NixOS/nixpkgs/issues/22653 - - mkdir -p $out/bin - ''; - meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = https://www.timescale.com/; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index b43a9c51be0c..8b9e9322b479 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ postgresql ]; installPhase = '' - mkdir -p $out/bin install -D tsearch_extras.so -t $out/lib/ install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension ''; From b20cdceaecbee4ebd1d7e6677a9cd333e40d8805 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Sat, 15 Jun 2019 21:38:26 -0400 Subject: [PATCH 002/248] chrome-export: init at 2.0.2 --- pkgs/tools/misc/chrome-export/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/chrome-export/default.nix diff --git a/pkgs/tools/misc/chrome-export/default.nix b/pkgs/tools/misc/chrome-export/default.nix new file mode 100644 index 000000000000..8639f6f6f794 --- /dev/null +++ b/pkgs/tools/misc/chrome-export/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "chrome-export"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "bdesham"; + repo = pname; + rev = "v${version}"; + sha256 = "0p1914wfjggjavw7a0dh2nb7z97z3wrkwrpwxkdc2pj5w5lv405m"; + }; + + buildInputs = [ python3 ]; + + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + cp export-chrome-bookmarks export-chrome-history $out/bin + mkdir -p $out/share/man/man1 + cp man_pages/*.1 $out/share/man/man1 + ''; + doInstallCheck = true; + installCheckPhase = '' + bash test/run_tests $out/bin + ''; + + meta = with stdenv.lib; { + description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files"; + homepage = "https://github.com/bdesham/chrome-export"; + license = [ licenses.isc ]; + maintainers = [ maintainers.bdesham ]; + platforms = python3.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b81ca38714d..39e495562f6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24155,6 +24155,8 @@ in vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; + chrome-export = callPackage ../tools/misc/chrome-export {}; + chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; From 9c0915e88ef0225bfafbfa1b92678d847aab2662 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 6 Jul 2019 23:08:55 +0200 Subject: [PATCH 003/248] blockbook: init at 0.3.1 --- pkgs/servers/blockbook/default.nix | 51 +++++ pkgs/servers/blockbook/deps.nix | 309 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 362 insertions(+) create mode 100644 pkgs/servers/blockbook/default.nix create mode 100644 pkgs/servers/blockbook/deps.nix diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix new file mode 100644 index 000000000000..6a1d8a75cc1a --- /dev/null +++ b/pkgs/servers/blockbook/default.nix @@ -0,0 +1,51 @@ +{ buildGoPackage +, lib +, fetchFromGitHub +, rocksdb +, bzip2 +, zlib +, packr +, snappy +, pkg-config +, zeromq +, lz4 +}: + +buildGoPackage rec { + pname = "blockbook"; + version = "0.3.1"; + + goPackagePath = "blockbook"; + + src = fetchFromGitHub { + owner = "trezor"; + repo = "blockbook"; + rev = "v${version}"; + sha256 = "0qgd1f3b4vavw55mvpvwvlya39dx1c3kjsc7n46nn7kpc152jv1l"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ bzip2 zlib snappy zeromq lz4 ]; + + nativeBuildInputs = [ pkg-config packr ]; + + preBuild = '' + export CGO_CFLAGS="-I${rocksdb}/include" + export CGO_LDFLAGS="-L${rocksdb}/lib -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4" + packr clean && packr + ''; + + postInstall = '' + rm $bin/bin/{scripts,templates,trezor-common} + ''; + + meta = with lib; { + description = "Trezor address/account balance backend"; + homepage = "https://github.com/trezor/blockbook"; + license = licenses.agpl3; + maintainers = with maintainers; [ mmahut ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/servers/blockbook/deps.nix b/pkgs/servers/blockbook/deps.nix new file mode 100644 index 000000000000..90ff098581a2 --- /dev/null +++ b/pkgs/servers/blockbook/deps.nix @@ -0,0 +1,309 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Groestlcoin/go-groestl-hash"; + fetch = { + type = "git"; + url = "https://github.com/Groestlcoin/go-groestl-hash"; + rev = "790653ac190c4029ee200e82a8f21b5d1afaf7d6"; + sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/bsm/go-vlq"; + fetch = { + type = "git"; + url = "https://github.com/bsm/go-vlq"; + rev = "ec6e8d4f5f4ec0f6e808ffc7f4dcc7516d4d7d49"; + sha256 = "13nhgpigaqdvcksi6jrav0rqr5mzqkx3wrsans9ql89nva51r9sz"; + }; + } + { + goPackagePath = "github.com/martinboehm/btcd"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/btcd"; + rev = "8e7c0427fee5d4778c5d4eb987150369e3ca1d0e"; + sha256 = "10fwzl8hzqpsq1rk5iz3xs8hbn3wqans12hszvlxlmm2xb0f6z9b"; + }; + } + { + goPackagePath = "github.com/btcsuite/btclog"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btclog"; + rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; + sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; + }; + } + { + goPackagePath = "github.com/deckarep/golang-set"; + fetch = { + type = "git"; + url = "https://github.com/deckarep/golang-set"; + rev = "1d4478f51bed434f1dadf96dcd9b43aabac66795"; + sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff"; + }; + } + { + goPackagePath = "github.com/ethereum/go-ethereum"; + fetch = { + type = "git"; + url = "https://github.com/ethereum/go-ethereum"; + rev = "8bbe72075e4e16442c4e28d999edee12e294329e"; + sha256 = "0q0w0vz85d94wym3xni8y22vly886j6g6zn9hizcww1nanvk4nl6"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"; + sha256 = "0irkqifyj84cbnq4n66ax2r591id2285diw5hzcz2k3bga8d8lqr"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "5a2cbb54c4e7d482e3f518c56f1f86f133d5204f"; + sha256 = "0hs62w1bv96zzfqqmnq18w71v0kmh4qrqpkf2y8qngvwgan761gd"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; + sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "553a641470496b2327abcac10b36396bd98e45c9"; + sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + { + goPackagePath = "github.com/martinboehm/bchutil"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/bchutil"; + rev = "6373f11b6efe1ea81e8713b8788a695b2c144d38"; + sha256 = "1wp7ixa0n0jj7y9phxm6p3fymc2555fb2k71s91jhis14fil2jim"; + }; + } + { + goPackagePath = "github.com/martinboehm/btcutil"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/btcutil"; + rev = "225ed00dbbd5cb8d8b3949a0ee7c9ea540754585"; + sha256 = "0dn5s6h1524q38glp6fcdws97lyvmchq26dhbd3dqazrq61dhdvy"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; + sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; + }; + } + { + goPackagePath = "github.com/martinboehm/golang-socketio"; + fetch = { + type = "git"; + url = "https://github.com/martinboehm/golang-socketio"; + rev = "f60b0a8befde091474a624a8ffd81ee9912957b3"; + sha256 = "1zln03qgzzbkr7zwm7ah1iikjdnipacp60bbg9lzkxsdcw2h1vd5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; + sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; + }; + } + { + goPackagePath = "github.com/mr-tron/base58"; + fetch = { + type = "git"; + url = "https://github.com/mr-tron/base58"; + rev = "c1bdf7c52f59d6685ca597b9955a443ff95eeee6"; + sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8"; + }; + } + { + goPackagePath = "github.com/pebbe/zmq4"; + fetch = { + type = "git"; + url = "https://github.com/pebbe/zmq4"; + rev = "5b443b6471cea4b4f9f85025530c04c93233f76a"; + sha256 = "0vnwlabrlrzszqyfbw4vypalhsxi4l4ywcbjhfhwl1fpvcph5dar"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; + sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6"; + sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; + sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; + }; + } + { + goPackagePath = "github.com/rs/cors"; + fetch = { + type = "git"; + url = "https://github.com/rs/cors"; + rev = "feef513b9575b32f84bafa580aad89b011259019"; + sha256 = "0wjm0yjsnxhnp6924mq8v04srqa8sxrlnd7rkb19h4j6b9zagsik"; + }; + } + { + goPackagePath = "github.com/schancel/cashaddr-converter"; + fetch = { + type = "git"; + url = "https://github.com/schancel/cashaddr-converter"; + rev = "0a38f5822f795dc3727b4caacc298e02938d9eb1"; + sha256 = "0d0dsn029yckgjp26vkmg7r476hb6b9ayf2njcgdi648ln8rrad8"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "714f901b98fdb3aa954b4193d8cbd64a28d80cad"; + sha256 = "0fn70vzqmww5v2xy0lamc319vrmfpza085d196cffhfw0jzw9i18"; + }; + } + { + goPackagePath = "github.com/tecbot/gorocksdb"; + fetch = { + type = "git"; + url = "https://github.com/tecbot/gorocksdb"; + rev = "214b6b7bc0f06812ab5602fdc502a3e619916f38"; + sha256 = "1mqpp14z4igr9jip39flpd7nf4rhr3z85y8mg74jjl1yrnwrwsld"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "d6449816ce06963d9d136eee5a56fca5b0616e7e"; + sha256 = "17dkprbbk84q165275zwhcn0s6pcarigq37zlhsxj23pq2qz3aqy"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; + sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; + }; + } + { + goPackagePath = "gopkg.in/karalabe/cookiejar.v2"; + fetch = { + type = "git"; + url = "https://github.com/karalabe/cookiejar"; + rev = "8dcd6a7f4951f6ff3ee9cbb919a06d8925822e57"; + sha256 = "1dbizcklsfn6b5i182nf9pgkk4ac8jnmq8zix73si7x2n53wyb3b"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/npipe.v2"; + fetch = { + type = "git"; + url = "https://github.com/natefinch/npipe"; + rev = "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6"; + sha256 = "1qplrvhks05pay169d9lph3hl7apdam4vj1kx3yzik7cphx6b24f"; + }; + } +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 001214093ee6..8c9e7465574d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1050,6 +1050,8 @@ in blink = callPackage ../applications/networking/instant-messengers/blink { }; + blockbook = callPackage ../servers/blockbook { }; + blockhash = callPackage ../tools/graphics/blockhash { }; bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; From d363da72cc8e102d46af74c2eb9aa7bb839b5174 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Thu, 11 Jul 2019 17:10:55 +0200 Subject: [PATCH 004/248] bazel: Use --distdir for prefetched repositories --distdir is now used in the installCheckPhase for prefetched repositories. That's simpler, more robust and easier to extend in the future. Note that `name` argument of fetchurl was removed because it changed the basename of the generated file and bazel uses this basename for its cache behavior. --- .../tools/build-managers/bazel/default.nix | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index bad0023eef32..8d7a8199240d 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -33,7 +33,6 @@ let let srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - name = d.name; urls = d.urls; sha256 = d.sha256; }); @@ -339,8 +338,8 @@ stdenv.mkDerivation rec { # add nix environment vars to .bazelrc cat >> .bazelrc < Date: Sun, 7 Jul 2019 21:18:37 +0200 Subject: [PATCH 005/248] trivial-builders: support '/' in writeTextDir Before one would get the following error nix-repl> pkgs.writeTextDir "share/my-file" "foo" error: invalid character '/' in name 'share/my-file' Fixes #50347 --- pkgs/build-support/trivial-builders.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5706a98f6008..0bfe14a85393 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -94,17 +94,21 @@ rec { /* * Writes a text file to nix store in a specific directory with no - * optional parameters available. Name passed is the destination. + * optional parameters available. * * Example: - * # Writes contents of file to /nix/store// + * # Writes contents of file to /nix/store//share/my-file * writeTextDir "share/my-file" * '' * Contents of File * ''; * */ - writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";}; + writeTextDir = path: text: writeTextFile { + inherit text; + name = builtins.baseNameOf path; + destination = "/${path}"; + }; /* * Writes a text file to /nix/store/ and marks the file as From 3a1111b1726c0a1aad567d8a9bbbf049b2651a14 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 14 Jul 2019 09:42:25 +0800 Subject: [PATCH 006/248] youtube-dl: 2019.07.12 -> 2019.07.14 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a5dcad2b1195..b802af902b34 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.07.12"; + version = "2019.07.14"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1mf8nh972hjpxj01q37jghj32rv21y91fpbwwsqmbmh65dr4k1dn"; + sha256 = "000ll06zg0x1mdvpjgfi398xmwvvy845lkf5zwdhkdr1mqfv85a6"; }; nativeBuildInputs = [ makeWrapper ]; From 8f2d6a5709aa89f91dbac5b8a81e1b2457becd06 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 14 Jul 2019 14:52:00 +0900 Subject: [PATCH 007/248] rust-cbindgen: 0.8.3 -> 0.8.7 --- pkgs/development/tools/rust/cbindgen/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index bce1e273cc41..ca4b6825a38f 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,19 +2,22 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.3"; + version = "0.8.7"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1"; + sha256 = "040rivayr0dgmrhlly5827c850xbr0j5ngiy6rvwyba5j9iv2x0y"; }; cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # https://github.com/eqrion/cbindgen/issues/338 + RUSTC_BOOTSTRAP = 1; + meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; homepage = https://github.com/eqrion/cbindgen; From 48b2dfeca9e548cc8b5c3798483abfe578cfd98b Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 14 Jul 2019 14:52:19 +0900 Subject: [PATCH 008/248] nss: 3.44 -> 3.44.1 --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index f3fc4caf3154..b410686865f2 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.44"; + version = "3.44.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; - sha256 = "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5"; + sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From cdf1a522cacfb209e340af9d51c2ac4dd84e7124 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 25 Apr 2019 22:39:07 -0400 Subject: [PATCH 009/248] haskell/lib: Introduce markUnbroken helper As discussed in #59409, this is quite useful now since we mark things as broken so liberally. --- pkgs/development/haskell-modules/lib.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 35f56a12560a..aebab7b6f040 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -163,6 +163,7 @@ rec { markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; }); unmarkBroken = drv: overrideCabal drv (drv: { broken = false; }); markBrokenVersion = version: drv: assert drv.version == version; markBroken drv; + markUnbroken = drv: overrideCabal drv (drv: { broken = false; }); enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; }); disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; }); From ffc44dccdbca8315f4fd1a0def319c264a3c7c3f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:32:37 -0400 Subject: [PATCH 010/248] pythonPackages.asciitree: init at 0.3.3 --- .../python-modules/asciitree/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/asciitree/default.nix diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix new file mode 100644 index 000000000000..74b78d4a1664 --- /dev/null +++ b/pkgs/development/python-modules/asciitree/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "asciitree"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "mbr"; + repo = pname; + rev = version; + sha256 = "071wlpyi8pa262sj9xdy0zbj163z84dasxad363z3sfndqxw78h1"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Draws ASCII trees"; + homepage = https://github.com/mbr/asciitree; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ed5c7753f08..cf4f5dd06435 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -177,6 +177,8 @@ in { asciimatics = callPackage ../development/python-modules/asciimatics { }; + asciitree = callPackage ../development/python-modules/asciitree { }; + ase = callPackage ../development/python-modules/ase { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; From bd21da208b4b689f3d536c6fbf9f1e2bfe3b5918 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:33:25 -0400 Subject: [PATCH 011/248] pythonPackages.diskcache: init at 4.0.0 --- .../python-modules/diskcache/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/diskcache/default.nix diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix new file mode 100644 index 000000000000..a62393b7bafc --- /dev/null +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tox +}: + +buildPythonPackage rec { + pname = "diskcache"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c20b58ed07d03bbfba793f823d1fc27a61e590371fe6011fa1319a25c028cd1"; + }; + + checkInputs = [ + tox + ]; + + meta = with lib; { + description = "Disk and file backed persistent cache"; + homepage = https://www.grantjenks.com/docs/diskcache/; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf4f5dd06435..57a96ce52f44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5613,6 +5613,8 @@ in { node-semver = callPackage ../development/python-modules/node-semver { }; + diskcache = callPackage ../development/python-modules/diskcache { }; + distro = callPackage ../development/python-modules/distro { }; bz2file = callPackage ../development/python-modules/bz2file { }; From 3c4b88e4d1a316ccd56b81bf5f00ea41420ff749 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:33:44 -0400 Subject: [PATCH 012/248] pythonPackages.showit: init at 1.1.4 --- .../python-modules/showit/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/showit/default.nix diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix new file mode 100644 index 000000000000..4060b1a4fc51 --- /dev/null +++ b/pkgs/development/python-modules/showit/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, matplotlib +, pytest +}: + +buildPythonPackage rec { + pname = "showit"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "freeman-lab"; + repo = pname; + rev = "ef76425797c71fbe3795b4302c49ab5be6b0bacb"; # no tags in repo + sha256 = "0xd8isrlwwxlgji90lly1sq4l2a37rqvhsmyhv7bd3aj1dyjmdr6"; + }; + + propagatedBuildInputs = [ + numpy + matplotlib + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "simple and sensible display of images"; + homepage = https://github.com/freeman-lab/showit; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57a96ce52f44..34c2a94a45ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4463,6 +4463,8 @@ in { should-dsl = callPackage ../development/python-modules/should-dsl { }; + showit = callPackage ../development/python-modules/showit { }; + simplejson = callPackage ../development/python-modules/simplejson { }; simplekml = callPackage ../development/python-modules/simplekml { }; From ce2e58b978dcefbd0c026d217c355ea7dad763c6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:34:03 -0400 Subject: [PATCH 013/248] pythonPackages.regional: init at 1.1.2 --- .../python-modules/regional/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/regional/default.nix diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix new file mode 100644 index 000000000000..5f2aee1b42af --- /dev/null +++ b/pkgs/development/python-modules/regional/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, matplotlib +, pytest +}: + +buildPythonPackage rec { + pname = "regional"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "freeman-lab"; + repo = pname; + rev = "e3a29c58982e5cd3d5700131ac96e5e0b84fb981"; # no tags in repo + sha256 = "03qgm35q9sa5cy0kkw4bj60zfylw0isfzb96nlhdfrsigzs2zkxv"; + }; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Simple manipualtion and display of spatial regions"; + homepage = https://github.com/freeman-lab/regional; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34c2a94a45ea..60c3bf7fbab5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2461,6 +2461,8 @@ in { regex = callPackage ../development/python-modules/regex { }; + regional = callPackage ../development/python-modules/regional { }; + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; pywatchman = callPackage ../development/python-modules/pywatchman { }; From 535979fa494aa1d433f023a3bfa455d87f2a9a43 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:34:25 -0400 Subject: [PATCH 014/248] pythonPackages.slicedimage: init at 3.2.0 --- .../python-modules/slicedimage/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/slicedimage/default.nix diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix new file mode 100644 index 000000000000..3b9aa19062be --- /dev/null +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, boto3 +, diskcache +, enum34 +, packaging +, pathlib +, numpy +, requests +, scikitimage +, six +, pytest +, isPy27 +}: + +buildPythonPackage rec { + pname = "slicedimage"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "adab09457e22465f05998fdcf8ea14179185f8e780a4021526ba163dd476cd02"; + }; + + propagatedBuildInputs = [ + boto3 + diskcache + packaging + numpy + requests + scikitimage + six + ] ++ lib.optionals isPy27 [ pathlib enum34 ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Library to access sliced imaging data"; + homepage = https://github.com/spacetx/slicedimage; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60c3bf7fbab5..8425cd28270f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -959,6 +959,8 @@ in { slackclient = callPackage ../development/python-modules/slackclient { }; + slicedimage = callPackage ../development/python-modules/slicedimage { }; + slicerator = callPackage ../development/python-modules/slicerator { }; slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; From 715f7d72dd231c8e22ac1114ba8885ce2c53a9bc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:34:46 -0400 Subject: [PATCH 015/248] pythonPackages.starfish: init at 0.1.3 --- .../python-modules/starfish/default.nix | 89 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/development/python-modules/starfish/default.nix diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix new file mode 100644 index 000000000000..d7989d80e8e0 --- /dev/null +++ b/pkgs/development/python-modules/starfish/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, dataclasses +, jsonschema +, matplotlib +, numpy +, pandas +, regional +, semantic-version +, scikitimage +, scikitlearn +, scipy +, showit +, slicedimage +, sympy +, tqdm +, trackpy +, validators +, xarray +, ipywidgets +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "starfish"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "19bec2a869affbca0a7e3fc0aee1b9978ff7f0f1a2a8551c2d4ae148a7ddc251"; + }; + + propagatedBuildInputs = [ + click + jsonschema + matplotlib + numpy + pandas + regional + semantic-version + scikitimage + scikitlearn + scipy + showit + slicedimage + sympy + tqdm + trackpy + validators + xarray + ipywidgets + ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; + + checkInputs = [ + pytest + ]; + + postConfigure = '' + substituteInPlace REQUIREMENTS.txt \ + --replace "slicedimage==3.1.1" "slicedimage" + ''; + + checkPhase = '' + # a few tests < 5% require + rm -rf starfish/test/full_pipelines/* + pytest starfish \ + --ignore starfish/core/config/test/test_config.py \ + --ignore starfish/core/experiment/builder/test/test_build.py \ + --ignore starfish/core/experiment/test/test_experiment.py \ + --ignore starfish/core/image/_filter/test/test_reduce.py \ + --ignore starfish/core/image/_registration/_apply_transform/test/test_warp.py \ + --ignore starfish/core/image/_registration/_learn_transform/test/test_translation.py \ + --ignore starfish/core/image/_registration/test/test_transforms_list.py \ + --ignore starfish/core/imagestack/test/test_max_proj.py \ + --ignore starfish/core/recipe/test/test_recipe.py \ + --ignore starfish/core/recipe/test/test_runnable.py \ + --ignore starfish/core/test/test_profiler.py + ''; + + meta = with lib; { + description = "Pipelines and pipeline components for the analysis of image-based transcriptomics data"; + homepage = https://spacetx-starfish.readthedocs.io/en/latest/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8425cd28270f..568d16456c7c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2499,6 +2499,8 @@ in { statsd = callPackage ../development/python-modules/statsd { }; + starfish = callPackage ../development/python-modules/starfish { }; + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; random2 = callPackage ../development/python-modules/random2 { }; From af412fcef480fd7abef1a8c0c4166515f0b02025 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:35:05 -0400 Subject: [PATCH 016/248] pythonPackages.trackpy: init at 0.4.1 --- .../python-modules/trackpy/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/trackpy/default.nix diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix new file mode 100644 index 000000000000..2e26679ebf2a --- /dev/null +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, six +, pandas +, pyyaml +, matplotlib +, pytest +}: + +buildPythonPackage rec { + pname = "trackpy"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "soft-matter"; + repo = pname; + rev = "v${version}"; + sha256 = "01fdv93f6z16gypmvqnlbjmcih7dmr7a63n5w9swmp11x3if4iyq"; + }; + + propagatedBuildInputs = [ + numpy + scipy + six + pandas + pyyaml + matplotlib + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + ${stdenv.lib.optionalString (stdenv.isDarwin) '' + # specifically needed for darwin + export HOME=$(mktemp -d) + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + ''} + + pytest trackpy --ignore trackpy/tests/test_motion.py \ + --ignore trackpy/tests/test_feature_saving.py \ + --ignore trackpy/tests/test_feature.py \ + --ignore trackpy/tests/test_legacy_linking.py + ''; + + meta = with stdenv.lib; { + description = "Particle-tracking toolkit"; + homepage = https://github.com/soft-matter/trackpy; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 568d16456c7c..d18338d4cdcc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4988,6 +4988,8 @@ in { traceback2 = callPackage ../development/python-modules/traceback2 { }; + trackpy = callPackage ../development/python-modules/trackpy { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; upass = callPackage ../development/python-modules/upass { }; From bf3dec9150b888fb0bf273f3a9011147e968dc86 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 12 Jul 2019 23:35:21 -0400 Subject: [PATCH 017/248] pythonPackages.validators: init at 0.13.0 --- .../python-modules/validators/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/validators/default.nix diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix new file mode 100644 index 000000000000..bbcca388c93a --- /dev/null +++ b/pkgs/development/python-modules/validators/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, decorator +, pytest +, isort +, flake8 +}: + +buildPythonPackage rec { + pname = "validators"; + version = "0.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea9bf8bf22aa692c205e12830d90b3b93950e5122d22bed9eb2f2fece0bba298"; + }; + + propagatedBuildInputs = [ + six + decorator + ]; + + checkInputs = [ + pytest + flake8 + isort + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python Data Validation for Humans™"; + homepage = https://github.com/kvesteri/validators; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d18338d4cdcc..2e3b9b7d8077 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2519,6 +2519,8 @@ in { zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; + validators = callPackage ../development/python-modules/validators { }; + validictory = callPackage ../development/python-modules/validictory { }; validate-email = callPackage ../development/python-modules/validate-email { }; From 0c436f8ca153f06e05e3e2780322a064e6e2697d Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 14 Jul 2019 14:54:14 +0900 Subject: [PATCH 018/248] firefox: 67.0.4 -> 68.0 --- pkgs/applications/networking/browsers/firefox/common.nix | 5 ++++- .../applications/networking/browsers/firefox/packages.nix | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 29b12c9fec09..f464972a9df2 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -4,7 +4,7 @@ , isIceCatLike ? false, icversion ? null , isTorBrowserLike ? false, tbversion ? null }: -{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper @@ -164,12 +164,15 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' + '' + lib.optionalString (lib.versionAtLeast ffversion "68") '' + rm -rf obj-x86_64-pc-linux-gnu ''; nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ] ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 93449288075b..90cd526897aa 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub, python3, overrideCC, gccStdenv, gcc6 }: +{ lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }: let @@ -17,18 +17,16 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "67.0.4"; + ffversion = "68.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3krwkc90m320a74vjyzlrxs4jc63cykbmpgisac9kv8m9n0bis5i1yf0dl9n14d9p4p541wvzhqygx7byj6mnvkhbk5b2l0nlvwias2"; + sha512 = "0pg8ww2ldlvdlri0zrzv20x69x00gxshr4afq62pnz7rgrnppkdd0pw5snflisgvpxq1syxcrg5750wz1k4bfjwnyq47jk9h3fzddpw"; }; patches = [ ./no-buildconfig-ffx65.patch ]; - extraNativeBuildInputs = [ python3 ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; From 75d4e64fad0c917f7e7aab8c4bbbe311b8064fba Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 14 Jul 2019 14:54:55 +0900 Subject: [PATCH 019/248] firefox-esr: 60.7.2esr -> 68.0esr --- .../networking/browsers/firefox/packages.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 90cd526897aa..b7fd775a6754 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -71,6 +71,7 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; ffversion = "60.7.2esr"; + src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; sha512 = "0mw5dgrxd5vj6cngd9v3dy6hzdsg82s0cs9fabhrzrl1dy3pqdkccqqnj9r0hxwmcrdgca3s35i5lwwmlljagq6nyb5q6qv4fzv0n0j"; @@ -96,6 +97,28 @@ rec { }; }; + firefox-esr-68 = common rec { + pname = "firefox-esr"; + ffversion = "68.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "29iqxxwkz2zgk2ppgq05w0bhs8c0938gina5s8brmwn6zn15nv379pa82a9djpzjryl6c5ff0hk0z7gx6n3xvf7w7ky9010h9il0kbg"; + }; + + patches = [ + ./no-buildconfig-ffx65.patch + ]; + + meta = firefox.meta // { + description = "A web browser built from Firefox Extended Support Release source tree"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-68-unwrapped"; + versionSuffix = "esr"; + versionKey = "ffversion"; + }; + }; + } // (let iccommon = args: common (args // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b56dbe6c156..d6decd65d924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18080,6 +18080,7 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; + firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; tor-browser-unwrapped = firefoxPackages.tor-browser; icecat-unwrapped = firefoxPackages.icecat; @@ -18087,7 +18088,8 @@ in firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; }; firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { }; firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { }; - firefox-esr = firefox-esr-60; + firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; + firefox-esr = firefox-esr-68; icecat = wrapFirefox icecat-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { From bcd1072cebb20ca287516f43172f971f28c9e99a Mon Sep 17 00:00:00 2001 From: Jan Hrnko Date: Mon, 15 Jul 2019 11:14:00 +0200 Subject: [PATCH 020/248] Add protobuf to enable Trezor support --- pkgs/applications/altcoins/monero/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 9a4aa2e0a28a..f351c9fa5043 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -2,6 +2,7 @@ , cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, hidapi +, python3Packages , CoreData, IOKit, PCSC }: @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline libsodium hidapi + python3Packages.protobuf ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ From 538c8aebd8bceb828977dc0c79f5a17a314f43e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 15 Jul 2019 13:36:21 +0200 Subject: [PATCH 021/248] firefox-esr-60: 60.7.2esr -> 60.8.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b7fd775a6754..93b6843e5f20 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -70,11 +70,11 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.7.2esr"; + ffversion = "60.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0mw5dgrxd5vj6cngd9v3dy6hzdsg82s0cs9fabhrzrl1dy3pqdkccqqnj9r0hxwmcrdgca3s35i5lwwmlljagq6nyb5q6qv4fzv0n0j"; + sha512 = "0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54"; }; patches = [ From eb55dd5e6bbb1514a0ad534040845d9450df18a5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jul 2019 20:28:26 +0800 Subject: [PATCH 022/248] nixos/systemd: 242 supports Type = exec --- nixos/modules/system/boot/systemd-unit-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 63f974b704f3..ee4ae845a7d5 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -6,7 +6,7 @@ with import ./systemd-lib.nix { inherit config lib pkgs; }; let checkService = checkUnitConfig "Service" [ (assertValueOneOf "Type" [ - "simple" "forking" "oneshot" "dbus" "notify" "idle" + "exec" "simple" "forking" "oneshot" "dbus" "notify" "idle" ]) (assertValueOneOf "Restart" [ "no" "on-success" "on-failure" "on-abnormal" "on-abort" "always" From a11755dab76b24d656002980f6368ddc7168c403 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 05:39:02 -0700 Subject: [PATCH 023/248] fanficfare: 3.8.0 -> 3.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fanficfare/versions --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index efe126fe042d..c1345fc9537f 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.8.0"; + version = "3.9.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1lwzg1mghjfggjyf35vqakfwkd4xcvcx2xfqnz0m3imlxk729kdl"; + sha256 = "0326fh72nihq4svgw7zvacij193ya66p102y1c7glpjq75kcx6a1"; }; propagatedBuildInputs = with python3Packages; [ From 5a224feb46c396fa17e2c3be143f0481177c6940 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 10:17:07 -0700 Subject: [PATCH 024/248] intel-media-driver: 19.1.0 -> 19.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/intel-media-driver/versions --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 0ee66c9050cb..e549067b11f0 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "intel-media-driver-${version}"; - version = "19.1.0"; + version = "19.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "072ry87h1lds14fqb2sfz3n2sssvacamaxv2gj4nd8agnzbwizn7"; + sha256 = "118cg1grzm62lppaygvh7mgxn23bicjkwjwpxhbyqs9g6yhdj3p8"; }; cmakeFlags = [ From 01b90dce78ee3906def0fc8d800217a3f9f40aa7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 15 Jul 2019 20:18:49 +0300 Subject: [PATCH 025/248] resolvconf service: init This is a refactor of how resolvconf is managed on NixOS. We split it into a separate service which is enabled internally depending on whether we want /etc/resolv.conf to be managed by it. Various services now take advantage of those configuration options. We also now use systemd instead of activation scripts to update resolv.conf. NetworkManager now uses the right option for rc-manager DNS automatically, so the configuration option shouldn't be exposed. --- nixos/modules/config/networking.nix | 104 ------------ nixos/modules/config/resolvconf.nix | 149 ++++++++++++++++++ nixos/modules/module-list.nix | 1 + nixos/modules/rename.nix | 6 + nixos/modules/services/networking/bind.nix | 4 +- nixos/modules/services/networking/dnsmasq.nix | 11 +- .../services/networking/networkmanager.nix | 24 +-- nixos/modules/services/networking/rdnssd.nix | 5 + nixos/modules/services/networking/unbound.nix | 2 + nixos/modules/system/boot/resolved.nix | 43 +++-- nixos/modules/system/boot/stage-2.nix | 9 +- .../tasks/network-interfaces-scripted.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 1 - 13 files changed, 216 insertions(+), 145 deletions(-) create mode 100644 nixos/modules/config/resolvconf.nix diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index eab4e73e19a1..4b9086022ed5 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -7,16 +7,6 @@ with lib; let cfg = config.networking; - dnsmasqResolve = config.services.dnsmasq.enable && - config.services.dnsmasq.resolveLocalQueries; - hasLocalResolver = config.services.bind.enable || - config.services.unbound.enable || - dnsmasqResolve; - - resolvconfOptions = cfg.resolvconfOptions - ++ optional cfg.dnsSingleRequest "single-request" - ++ optional cfg.dnsExtensionMechanism "edns0"; - localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1"; localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1"; @@ -64,48 +54,6 @@ in ''; }; - networking.dnsSingleRequest = lib.mkOption { - type = types.bool; - default = false; - description = '' - Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA) - address queries at the same time, from the same port. Sometimes upstream - routers will systemically drop the ipv4 queries. The symptom of this problem is - that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The - workaround for this is to specify the option 'single-request' in - /etc/resolv.conf. This option enables that. - ''; - }; - - networking.dnsExtensionMechanism = lib.mkOption { - type = types.bool; - default = true; - description = '' - Enable the edns0 option in resolv.conf. With - that option set, glibc supports use of the extension mechanisms for - DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, - which does not work without it. - ''; - }; - - networking.extraResolvconfConf = lib.mkOption { - type = types.lines; - default = ""; - example = "libc=NO"; - description = '' - Extra configuration to append to resolvconf.conf. - ''; - }; - - networking.resolvconfOptions = lib.mkOption { - type = types.listOf types.str; - default = []; - example = [ "ndots:1" "rotate" ]; - description = '' - Set the options in /etc/resolv.conf. - ''; - }; - networking.timeServers = mkOption { default = [ "0.nixos.pool.ntp.org" @@ -240,35 +188,6 @@ in # /etc/host.conf: resolver configuration file "host.conf".text = cfg.hostConf; - # /etc/resolvconf.conf: Configuration for openresolv. - "resolvconf.conf".text = - '' - # This is the default, but we must set it here to prevent - # a collision with an apparently unrelated environment - # variable with the same name exported by dhcpcd. - interface_order='lo lo[0-9]*' - '' + optionalString config.services.nscd.enable '' - # Invalidate the nscd cache whenever resolv.conf is - # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' - '' + optionalString (length resolvconfOptions > 0) '' - # Options as described in resolv.conf(5) - resolv_conf_options='${concatStringsSep " " resolvconfOptions}' - '' + optionalString hasLocalResolver '' - # This hosts runs a full-blown DNS resolver. - name_servers='127.0.0.1' - '' + optionalString dnsmasqResolve '' - dnsmasq_conf=/etc/dnsmasq-conf.conf - dnsmasq_resolv=/etc/dnsmasq-resolv.conf - '' + cfg.extraResolvconfConf + '' - ''; - - } // optionalAttrs config.services.resolved.enable { - # symlink the dynamic stub resolver of resolv.conf as recommended by upstream: - # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf - "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf"; - } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) { - "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") { # /etc/rpc: RPC program numbers. "rpc".source = pkgs.glibc.out + "/etc/rpc"; @@ -295,29 +214,6 @@ in # Install the proxy environment variables environment.sessionVariables = cfg.proxy.envVars; - # This is needed when /etc/resolv.conf is being overriden by networkd - # and other configurations. If the file is destroyed by an environment - # activation then it must be rebuilt so that applications which interface - # with /etc/resolv.conf directly don't break. - system.activationScripts.resolvconf = stringAfter [ "etc" "specialfs" "var" ] - '' - # Systemd resolved controls its own resolv.conf - rm -f /run/resolvconf/interfaces/systemd - ${optionalString config.services.resolved.enable '' - rm -rf /run/resolvconf/interfaces - mkdir -p /run/resolvconf/interfaces - ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd - ''} - - # Make sure resolv.conf is up to date if not managed manually, by systemd or - # by NetworkManager - ${optionalString (!config.environment.etc?"resolv.conf" && - (cfg.networkmanager.enable -> - cfg.networkmanager.rc-manager == "resolvconf")) '' - ${pkgs.openresolv}/bin/resolvconf -u - ''} - ''; - }; } diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix new file mode 100644 index 000000000000..406c6a7ac329 --- /dev/null +++ b/nixos/modules/config/resolvconf.nix @@ -0,0 +1,149 @@ +# /etc files related to networking, such as /etc/services. + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.networking.resolvconf; + + resolvconfOptions = cfg.extraOptions + ++ optional cfg.dnsSingleRequest "single-request" + ++ optional cfg.dnsExtensionMechanism "edns0"; + + configText = + '' + # This is the default, but we must set it here to prevent + # a collision with an apparently unrelated environment + # variable with the same name exported by dhcpcd. + interface_order='lo lo[0-9]*' + '' + optionalString config.services.nscd.enable '' + # Invalidate the nscd cache whenever resolv.conf is + # regenerated. + libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' + '' + optionalString (length resolvconfOptions > 0) '' + # Options as described in resolv.conf(5) + resolv_conf_options='${concatStringsSep " " resolvconfOptions}' + '' + optionalString cfg.useLocalResolver '' + # This hosts runs a full-blown DNS resolver. + name_servers='127.0.0.1' + '' + cfg.extraConfig; + +in + +{ + + options = { + + networking.resolvconf = { + + enable = mkOption { + type = types.bool; + default = false; + internal = true; + description = '' + DNS configuration is managed by resolvconf. + ''; + }; + + useHostResolvConf = mkOption { + type = types.bool; + default = false; + description = '' + In containers, whether to use the + resolv.conf supplied by the host. + ''; + }; + + dnsSingleRequest = lib.mkOption { + type = types.bool; + default = false; + description = '' + Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA) + address queries at the same time, from the same port. Sometimes upstream + routers will systemically drop the ipv4 queries. The symptom of this problem is + that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The + workaround for this is to specify the option 'single-request' in + /etc/resolv.conf. This option enables that. + ''; + }; + + dnsExtensionMechanism = mkOption { + type = types.bool; + default = true; + description = '' + Enable the edns0 option in resolv.conf. With + that option set, glibc supports use of the extension mechanisms for + DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, + which does not work without it. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = "libc=NO"; + description = '' + Extra configuration to append to resolvconf.conf. + ''; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ndots:1" "rotate" ]; + description = '' + Set the options in /etc/resolv.conf. + ''; + }; + + useLocalResolver = mkOption { + type = types.bool; + default = false; + description = '' + Use local DNS server for resolving. + ''; + }; + + }; + + }; + + config = mkMerge [ + { + networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf"); + + environment.etc."resolvconf.conf".text = + if !cfg.enable then + # Force-stop any attempts to use resolvconf + '' + echo "resolvconf is disabled on this system but was used anyway:" >&2 + echo "$0 $*" >&2 + exit 1 + '' + else configText; + } + + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.openresolv ]; + + systemd.services.resolvconf = { + description = "resolvconf update"; + + before = [ "network-pre.target" ]; + wants = [ "network-pre.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."resolvconf.conf".source ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.openresolv}/bin/resolvconf -u"; + RemainAfterExit = true; + }; + }; + + }) + ]; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1d1995eda25a..ba9ea9d28248 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -25,6 +25,7 @@ ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix + ./config/resolvconf.nix ./config/shells-environment.nix ./config/swap.nix ./config/sysctl.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1b77a895d717..ca8db9a1a48e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -244,6 +244,12 @@ with lib; # KSM (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ]) + # resolvconf + (mkRenamedOptionModule [ "networking" "dnsSingleRequest" ] [ "networking" "resolvconf" "dnsSingleRequest" ]) + (mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ]) + (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) + (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) + ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" "snmpExporter" "unifiExporter" "varnishExporter" ] diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 7f89cff22329..2097b9a31639 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -168,7 +168,9 @@ in ###### implementation - config = mkIf config.services.bind.enable { + config = mkIf cfg.enable { + + networking.resolvconf.useLocalResolver = mkDefault true; users.users = singleton { name = bindUser; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 24d16046c63e..714a5903bff1 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -79,7 +79,7 @@ in ###### implementation - config = mkIf config.services.dnsmasq.enable { + config = mkIf cfg.enable { networking.nameservers = optional cfg.resolveLocalQueries "127.0.0.1"; @@ -92,6 +92,15 @@ in description = "Dnsmasq daemon user"; }; + networking.resolvconf = mkIf cfg.resolveLocalQueries { + useLocalResolver = mkDefault true; + + extraConfig = '' + dnsmasq_conf=/etc/dnsmasq-conf.conf + dnsmasq_resolv=/etc/dnsmasq-resolv.conf + ''; + }; + systemd.services.dnsmasq = { description = "Dnsmasq Daemon"; after = [ "network.target" "systemd-resolved.service" ]; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f1f8c9722e02..49d46456c044 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -17,7 +17,8 @@ let plugins=keyfile dhcp=${cfg.dhcp} dns=${cfg.dns} - rc-manager=${cfg.rc-manager} + # If resolvconf is disabled that means that resolv.conf is managed by some other module. + rc-manager=${if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"} [keyfile] ${optionalString (cfg.unmanaged != []) @@ -268,25 +269,6 @@ in { ''; }; - rc-manager = mkOption { - type = types.enum [ "symlink" "file" "resolvconf" "netconfig" "unmanaged" "none" ]; - default = "resolvconf"; - description = '' - Set the resolv.conf management mode. - - - A description of these modes can be found in the main section of - - https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html - - or in - - NetworkManager.conf - 5 - . - ''; - }; - dispatcherScripts = mkOption { type = types.listOf (types.submodule { options = { @@ -512,7 +494,7 @@ in { networking = { useDHCP = false; # use mkDefault to trigger the assertion about the conflict above - wireless.enable = lib.mkDefault false; + wireless.enable = mkDefault false; }; security.polkit.extraConfig = polkitConf; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index 887772f6e5f0..bccab805beeb 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -35,6 +35,11 @@ in config = mkIf config.services.rdnssd.enable { + assertions = [{ + assertion = config.networking.resolvconf.enable; + message = "rdnssd needs resolvconf to work (probably something sets up a static resolv.conf)"; + }]; + systemd.services.rdnssd = { description = "RDNSS daemon"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 1a35979ad44c..3cf82e8839bb 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -101,6 +101,8 @@ in isSystemUser = true; }; + networking.resolvconf.useLocalResolver = mkDefault true; + systemd.services.unbound = { description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 5c66cf4a6e6e..3ea96f8e4645 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -3,6 +3,10 @@ with lib; let cfg = config.services.resolved; + + dnsmasqResolve = config.services.dnsmasq.enable && + config.services.dnsmasq.resolveLocalQueries; + in { @@ -126,6 +130,12 @@ in config = mkIf cfg.enable { + assertions = [ + { assertion = !config.networking.useHostResolvConf; + message = "Using host resolv.conf is not supported with systemd-resolved"; + } + ]; + systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ]; @@ -135,21 +145,30 @@ in restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; }; - environment.etc."systemd/resolved.conf".text = '' - [Resolve] - ${optionalString (config.networking.nameservers != []) - "DNS=${concatStringsSep " " config.networking.nameservers}"} - ${optionalString (cfg.fallbackDns != []) - "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} - ${optionalString (cfg.domains != []) - "Domains=${concatStringsSep " " cfg.domains}"} - LLMNR=${cfg.llmnr} - DNSSEC=${cfg.dnssec} - ${config.services.resolved.extraConfig} - ''; + environment.etc = { + "systemd/resolved.conf".text = '' + [Resolve] + ${optionalString (config.networking.nameservers != []) + "DNS=${concatStringsSep " " config.networking.nameservers}"} + ${optionalString (cfg.fallbackDns != []) + "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} + ${optionalString (cfg.domains != []) + "Domains=${concatStringsSep " " cfg.domains}"} + LLMNR=${cfg.llmnr} + DNSSEC=${cfg.dnssec} + ${config.services.resolved.extraConfig} + ''; + + # symlink the dynamic stub resolver of resolv.conf as recommended by upstream: + # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf + "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf"; + } // optionalAttrs dnsmasqResolve { + "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; + }; # If networkmanager is enabled, ask it to interface with resolved. networking.networkmanager.dns = "systemd-resolved"; + }; } diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index 55e6b19c67fd..6b0b47227301 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -4,19 +4,20 @@ with lib; let + useHostResolvConf = config.networking.resolvconf.enable && config.networking.useHostResolvConf; + bootStage2 = pkgs.substituteAll { src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; shell = "${pkgs.bash}/bin/bash"; isExecutable = true; inherit (config.nix) readOnlyStore; - inherit (config.networking) useHostResolvConf; + inherit useHostResolvConf; inherit (config.system.build) earlyMountScript; - path = lib.makeBinPath [ + path = lib.makeBinPath ([ pkgs.coreutils pkgs.utillinux - pkgs.openresolv - ]; + ] ++ lib.optional useHostResolvConf pkgs.openresolv); fsPackagesPath = lib.makeBinPath config.system.fsPackages; postBootCommands = pkgs.writeText "local-cmds" '' diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index c12ada7a030a..2b8a7944dc36 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -103,7 +103,7 @@ let script = '' - ${optionalString (!config.environment.etc?"resolv.conf") '' + ${optionalString config.networking.resolvconf.enable '' # Set the static DNS configuration, if given. ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static < Date: Mon, 15 Jul 2019 11:48:55 -0700 Subject: [PATCH 026/248] libcdaudio: 0.99.12 -> 0.99.12p2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcdaudio/versions --- pkgs/development/libraries/libcdaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index 218eaeea571a..c48818972b58 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libcdaudio-0.99.12"; + name = "libcdaudio-0.99.12p2"; src = fetchurl { - url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz ; - sha256 = "1g3ba1n12g8h7pps0vlxx8di6cmf108mbcvbl6hj8x71ndkglygb" ; + url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz ; + sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz" ; }; meta = { From 1d0ef760a64e588036cafc4c9b20a994b6a8d2f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 11:57:51 -0700 Subject: [PATCH 027/248] libgweather: 3.32.1 -> 3.32.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libgweather/versions --- pkgs/development/libraries/libgweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 3300e9b1d680..5e35a43fb9d4 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.32.1"; + version = "3.32.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1079d26y8d2zaw9w50l9scqjhbrynpdd6kyaa32x4393f7nih8hw"; + sha256 = "00iwbllh8dmnqch0ysng9xhkzzs3ir9jl9f4hp41vbvg1pq5zv98"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; From 542f3d77e23c68cae7fcaa06b93ed2dbef1624f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 12:54:49 -0700 Subject: [PATCH 028/248] libraw: 0.19.2 -> 0.19.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 1a998c044359..5eb8049437c9 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.19.2"; + version = "0.19.3"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0"; + sha256 = "0xs1qb6pcvc4c43fy5xi3nkqxcif77gakkw99irf0fc5iccdd5px"; }; outputs = [ "out" "lib" "dev" "doc" ]; From b8a4f1eb97fd2c5689d60e63c3ed40ea3636857d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 18:27:29 -0700 Subject: [PATCH 029/248] multipath-tools: 0.8.1 -> 0.8.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/multipath-tools/versions --- pkgs/os-specific/linux/multipath-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 0e90a0814767..078f894f73eb 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "multipath-tools-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { name = "${name}.tar.gz"; url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz"; - sha256 = "0669zl4dpai63dl04lf8vpwnpsff6qf19fifxfc4frawnh699k95"; + sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s"; }; postPatch = '' From c19bf2e7253e51b0dc2aa10d18714f7691eac9d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 19:19:34 -0700 Subject: [PATCH 030/248] osl: 1.10.5 -> 1.10.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openshadinglanguage/versions --- pkgs/development/compilers/osl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index ff4e387f07e7..e4d3398476e6 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.5"; - sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi"; + rev = "Release-1.10.6"; + sha256 = "1g8g853iq56knlvn1hdsck78by3843vyly9wji5ip41r6i2s0zla"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; From 3e4e93d72837fd2b9bd161532bc24b4ae5d70678 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 16 Jul 2019 10:35:29 +0800 Subject: [PATCH 031/248] youtube-dl: 2019.07.14 -> 2019.07.16 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b802af902b34..f9b16e5870d1 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.07.14"; + version = "2019.07.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "000ll06zg0x1mdvpjgfi398xmwvvy845lkf5zwdhkdr1mqfv85a6"; + sha256 = "06qd6z9swx8aw9v7vi85q44hmzxgy8wx18a9ljfhx7l7wjpm99ky"; }; nativeBuildInputs = [ makeWrapper ]; From 50ba9f4385f25875a1e2904fdc0610680e7792ac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Jul 2019 21:49:38 -0500 Subject: [PATCH 032/248] wtf: 0.11.0 -> 0.17.1 --- pkgs/applications/misc/wtf/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 13e4ed81a592..02fc2f3a5758 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,26 +1,24 @@ -{ buildGoModule +{ buildGoPackage , fetchFromGitHub , lib }: -buildGoModule rec { +buildGoPackage rec { pname = "wtf"; - version = "0.11.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "1b671jhf3xaaisgpiad5apmvwkp40qr2hm4n21m0ya7k5ckps09z"; + sha256 = "1qiwl6z5rraspjqry8dwnx8fgl9vv70sn5kgvh8074vl651yjq8c"; }; - modSha256 = "0as736nnx7ci4w9gdp27g55g6dny9bh1fryz3g89gxm2sa2nlb9l"; - - buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; + goPackagePath = "github.com/wtfutil/wtf"; meta = with lib; { description = "The personal information dashboard for your terminal"; - homepage = http://wtfutil.com/; + homepage = "https://wtfutil.com/"; license = licenses.mpl20; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; From def82e9685a6b406ffa16351388d6008b17af427 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 20:15:10 -0700 Subject: [PATCH 033/248] parlatype: 1.6-beta -> 1.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/parlatype/versions --- pkgs/applications/audio/parlatype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index c00a79cb98b9..1eb8b416a9aa 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "1.6-beta"; + version = "1.6.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "0bi0djic9kf178s7vl3y83v4rzhvynlvyf64n94fy80n2f100dj9"; + sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2"; }; nativeBuildInputs = [ From b44996fe05f29f35fcff2f7a13b439a9ab365259 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 20:20:04 -0700 Subject: [PATCH 034/248] ocserv: 0.12.3 -> 0.12.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ocserv/versions --- pkgs/tools/networking/ocserv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 805c4bd55207..094bebe628f6 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ocserv-${version}"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "072256099l1c6p7dvvzp0gyafh1zvmmgmnpy0fcmv9sy80qg3p44"; + sha256 = "0lybz93ah6n5b82ywshhmsmf65im8rk6gkxnzxfbxpqxra79j517"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 8c52d00e4aab8f98abba88d75eff8e14bd3fd868 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 20:28:11 -0700 Subject: [PATCH 035/248] openttd: 1.9.1 -> 1.9.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openttd/versions --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 2fd27d2f9d63..91969a335f8f 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; - sha256 = "1r8i6yzgww7aw8iibqagahg1gqgw7305g07agy0dpszzvp0mi0gz"; + sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From 5aa42409dee76dd6cb030642407ac2606b667f1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 21:12:51 -0700 Subject: [PATCH 036/248] pagemon: 0.01.14 -> 0.01.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pagemon/versions --- pkgs/os-specific/linux/pagemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 9354811fd6f3..da2f73ec1b38 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.14"; + version = "0.01.15"; src = fetchFromGitHub { - sha256 = "1gkyfn1jbrs6w83sxa33csj62a6pyqqsmn92932qf7ns6y00dyk4"; + sha256 = "0vbwpyik26zavpqsanmg8p7snk44nyz66flvkkqmhwx1ada9d181"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; From b7fc14d8e60aa49297ba35c950f1b98999d6e747 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 21:46:51 -0700 Subject: [PATCH 037/248] picard-tools: 2.20.2 -> 2.20.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/picard-tools/versions --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 5fc222bb2993..d58b4bf8c4d7 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.20.2"; + version = "2.20.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0qpc6pi3fmzv8rs5cmk3dd4clrkzbrngsl384b5g0y7471lhavbi"; + sha256 = "0qgj062c983w6qlgfkj6in5cl5rmvpak7rdwmjg2gv972kcfs7lp"; }; nativeBuildInputs = [ makeWrapper ]; From be23a4397a590a7ef815acc0cc821f278b75c82a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 22:03:27 -0700 Subject: [PATCH 038/248] pkgconf: 1.6.1 -> 1.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pkgconf/versions --- pkgs/development/tools/misc/pkgconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 43d86966694f..e4a6416129e8 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.6.1"; + version = "1.6.3"; src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1310va0nm8iyb4ghgz9qlx7qb00iha1523hq1zbgj0c98cwfxf92"; + sha256 = "04525vv0y849vvc2pi60g5wd9fjp1wbhra2lniifi82y1ldv7w31"; }; meta = with stdenv.lib; { From dccd1e9d052b4275b87f307156e195e1f6073714 Mon Sep 17 00:00:00 2001 From: cw Date: Thu, 11 Jul 2019 07:29:36 +0200 Subject: [PATCH 039/248] gocryptfs: 1.6.1 -> 1.7 - Use pname instead of name - Add patch for Darwin build --- pkgs/tools/filesystems/gocryptfs/default.nix | 14 +-- pkgs/tools/filesystems/gocryptfs/deps.nix | 89 +++---------------- ...unix2syscall_darwin.go-build-failure.patch | 14 +++ 3 files changed, 36 insertions(+), 81 deletions(-) create mode 100644 pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index d923dba0bc0a..0e48da746b83 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -2,13 +2,13 @@ { stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: let - version = "v1.6.1"; goFuseVersion = with stdenv.lib; substring 0 7 (head (filter ( d: d.goPackagePath == "github.com/hanwen/go-fuse" ) (import ./deps.nix))).fetch.rev; in buildGoPackage rec { - name = "gocryptfs-${version}"; + pname = "gocryptfs"; + version = "1.7"; # TODO: Drop `patches` with next release. Remove `fix-unix2syscall_darwin.go-build-failure.patch`. goPackagePath = "github.com/rfjakob/gocryptfs"; @@ -17,11 +17,15 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "rfjakob"; - repo = "gocryptfs"; - rev = version; - sha256 = "0aqbl25g48b4jp6l09k6kic6w3p0q7d9ip2wvrcvh8lhnrbdkhzd"; + repo = pname; + rev = "v${version}"; + sha256 = "1sr3i73haw07faqpw785cdda2kna8q3a0zhwab1p3i935rvp4qaa"; }; + # Fixes build on darwin + # Source: https://github.com/rfjakob/gocryptfs/commit/b1468a732fa26550f2a6f8a21cc7bd47b65a8c96 + patches = [ ./fix-unix2syscall_darwin.go-build-failure.patch ]; + postPatch = "rm -r tests"; buildFlagsArray = '' diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix index 2589b41a0a5e..50f6e89908e9 100644 --- a/pkgs/tools/filesystems/gocryptfs/deps.nix +++ b/pkgs/tools/filesystems/gocryptfs/deps.nix @@ -1,39 +1,12 @@ # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ - { - goPackagePath = "github.com/conejoninja/hid"; - fetch = { - type = "git"; - url = "https://github.com/conejoninja/hid"; - rev = "3a959b87ebefc18767a31fa567eea402eb37239e"; - sha256 = "1i1x7fhs3g9a48h2wxjczshx7gzmj9p6pd71l22ky998zgjadlim"; - }; - } - { - goPackagePath = "github.com/conejoninja/tesoro"; - fetch = { - type = "git"; - url = "https://github.com/conejoninja/tesoro"; - rev = "e0e839b6a6f14bce56d1bfac9a86311a1646a6a3"; - sha256 = "19q1ibj6l6pk2a3iwcyrj60sscvkqw450psd9zdflvb293cjsx8v"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } { goPackagePath = "github.com/hanwen/go-fuse"; fetch = { type = "git"; url = "https://github.com/hanwen/go-fuse"; - rev = "95c6370914ac7822973d1893680e878e156f8d70"; - sha256 = "1h701c1hxrw7ljh7kc0rjx18bfw2mzdbpmqqilb5wb0ngpdjpqxp"; + rev = "a533f0a5a633cccc0928c81985b13fa24407a211"; + sha256 = "0kc2jjjyhnrd934jn7hzfx8kd4z2yq5yblwrxr6xcjjql1vb1n9k"; }; } { @@ -41,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/jacobsa/crypto"; - rev = "c73681c634de898c869684602cf0c0d2ce938c4d"; - sha256 = "02jbiy6szshbzcmp4j3gpc577hrhikxqvm4kzxixp27k9f2cx5si"; + rev = "d95898ceee0769dac9bf74c46f8f68d3d3d79100"; + sha256 = "0dgcvms7if672f09y0cj49n711i9r0609p5f1s27i53yah4qlm19"; }; } { @@ -50,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/xattr"; - rev = "f5b647e257e19d63831e7c7adb95dfb79d9ff4d9"; - sha256 = "0cqxibbfllhs6ffxq65gn08088g7g7aw752p9g3vbnj35jk2p8i9"; + rev = "7782c2d6871d6e659e1563dc19c86b845264a6fc"; + sha256 = "1j3z5b9nwgkxia925rkiq8n5avhf4zhmsdbpn2s3xb16a2w66prd"; }; } { @@ -63,40 +36,13 @@ sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; }; } - { - goPackagePath = "github.com/trezor/trezord-go"; - fetch = { - type = "git"; - url = "https://github.com/trezor/trezord-go"; - rev = "bae9c40e5d71c459bde056d42d4b19ab318c90c2"; - sha256 = "12j7b4vjs8n68214zrh5ivpqm3fcifk27bj6rszd9x2839nk3hy8"; - }; - } - { - goPackagePath = "github.com/xaionaro-go/cryptoWallet"; - fetch = { - type = "git"; - url = "https://github.com/xaionaro-go/cryptoWallet"; - rev = "47f9f6877e4324a8bc47fc5661c32d2fe6d29586"; - sha256 = "14h2vnl2jm2wj10znizdf2f0mxsk27rsjskjw5qffy8nf5a0i3i6"; - }; - } - { - goPackagePath = "github.com/zserge/hid"; - fetch = { - type = "git"; - url = "https://github.com/zserge/hid"; - rev = "c86e7adeabafd6fcb3371ad64d6ed366b04d55db"; - sha256 = "1y2zqndq6mafgsdai5gnkw4g8dzl9vmjcxq0i8xspaj4dmck19c4"; - }; - } { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; - sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; + rev = "8dd112bcdc25174059e45e07517d9fc663123347"; + sha256 = "0gbcz7gxmgg88s28vb90dsp1vdq0har7zvg2adsqbp8bm05x9q6b"; }; } { @@ -104,8 +50,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + rev = "e225da77a7e68af35c70ccbf71af2b83e6acac3c"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; }; } { @@ -113,17 +59,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; - sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; + rev = "61b9204099cb1bebc803c9ffb9b2d3acd9d457d9"; + sha256 = "110carnw1rxk9awbcdbg5is0zl28vynm649y7rza36pg1vlv8rrh"; }; } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } -] \ No newline at end of file +] diff --git a/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch b/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch new file mode 100644 index 000000000000..1adbc2c4d232 --- /dev/null +++ b/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch @@ -0,0 +1,14 @@ +--- a/internal/syscallcompat/unix2syscall_darwin.go ++++ b/internal/syscallcompat/unix2syscall_darwin.go +@@ -19,8 +19,8 @@ func Unix2syscall(u unix.Stat_t) syscall.Stat_t { + Size: u.Size, + Blksize: u.Blksize, + Blocks: u.Blocks, +- Atimespec: syscall.Timespec(u.Atimespec), +- Mtimespec: syscall.Timespec(u.Mtimespec), +- Ctimespec: syscall.Timespec(u.Ctimespec), ++ Atimespec: syscall.Timespec(u.Atim), ++ Mtimespec: syscall.Timespec(u.Mtim), ++ Ctimespec: syscall.Timespec(u.Ctim), + } + } From 06f3c7a1a30531dc92c263890f0af7584f3b5ec4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 23:47:59 -0700 Subject: [PATCH 040/248] pius: 2.2.7 -> 3.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pius/versions --- pkgs/tools/security/pius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index fba92bd47acb..f82f705fc8ee 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, pythonPackages, gnupg, perl }: -let version = "2.2.7"; in +let version = "3.0.0"; in pythonPackages.buildPythonApplication { name = "pius-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "jaymzh"; repo = "pius"; rev = "v${version}"; - sha256 = "1kjj44lf9di4ylvmc949dxncllzd8afp0yknr3152dmxkw1vl127"; + sha256 = "0l87dx7n6iwy8alxnhvval8h1kl4da6a59hsilbi65c6bpj4dh3y"; }; patchPhase = '' From 59b46cb3052bb65986adaf7ead3b18caa6858769 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 01:05:28 -0700 Subject: [PATCH 041/248] python37Packages.pex: 1.6.7 -> 1.6.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pex/versions --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 4d064af18fa7..1e61992b49d6 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.7"; + version = "1.6.8"; src = fetchPypi { inherit pname version; - sha256 = "1hg30y8b4b96r4skhz2qmsp7li1izcg8854q3fi48rks0kcfx5fw"; + sha256 = "1zibkc074dvk69bkiipfzn2l9glgzs26g16j2ny5lzq320wqszkj"; }; nativeBuildInputs = [ setuptools ]; From baa4768dbee8394564d556300bea83d9a4f9039b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 01:45:15 -0700 Subject: [PATCH 042/248] python37Packages.geopandas: 0.5.0 -> 0.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-geopandas/versions --- pkgs/development/python-modules/geopandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 25a5e7e3ed5d..a9ac85e6248b 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.5.0"; + version = "0.5.1"; name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0gmqksjgxrng52jvjk0ylkpsg0qriygb10b7n80l28kdz6c0givj"; + sha256 = "1j665fpkyfib17z0hn3bg2j96pbkgd36yfif6jyia4yn6g76hlfg"; }; checkInputs = [ pytest Rtree ]; From 39bd9f76a5a031e325fb60f34c60239b61f746b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 01:53:47 -0700 Subject: [PATCH 043/248] python37Packages.django_taggit: 0.23.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-django-taggit/versions --- pkgs/development/python-modules/django_taggit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 569df7f72469..b454fc321084 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "0.23.0"; + version = "1.1.0"; disabled = pythonOlder "2.7"; src = fetchPypi { inherit pname version; - sha256 = "a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce"; + sha256 = "044fzcpmns90kaxdi49qczlam4xsi8rl73rpfwvxx1gkcqzidgq1"; }; propagatedBuildInputs = [ isort django ]; From c834f25f9b92b92617af34e20c9d3c5295911041 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 02:01:53 -0700 Subject: [PATCH 044/248] python37Packages.micawber: 0.4.1 -> 0.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-micawber/versions --- pkgs/development/python-modules/micawber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index d3b5c79e967a..bc94202a070b 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "002g31h4fcrrlfcrcbqa94aggszadm0p91c28n19vgssinmbz0ia"; + sha256 = "0vk4xkby306f79gkwrn3cx94qdqil285dand8kb6lnlsdi90sb25"; }; propagatedBuildInputs = [ beautifulsoup4 ]; From 662fcf6a405d97b31ec9c56e3ebe7b479b84111c Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 2 Jul 2019 13:22:17 +0200 Subject: [PATCH 045/248] build-mix: partially revert nixpkgs#25655 --- pkgs/development/beam-modules/build-mix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index abe3c9e5122f..d947acc3ea68 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -63,7 +63,7 @@ let export MIX_ENV=prod export MIX_NO_DEPS=1 - mix compile ${debugInfoFlag} + mix compile ${debugInfoFlag} --no-deps-check runHook postBuild '' From 4708662ebea8422156637c5bf50a46db34e69e4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 00:50:39 -0700 Subject: [PATCH 046/248] python37Packages.mahotas: 1.4.5 -> 1.4.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-mahotas/versions --- pkgs/development/python-modules/mahotas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 34e2260109be..101468da09f4 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mahotas"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "0dm34751w1441lxq00219fqlqix5qrgc18wp1wgp7xivlz3czzcz"; + sha256 = "1a3nzxb7is8n7lpxwq1fw3fr03qflig334rb1zzr2znjrhq6g94b"; }; # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed From 8f4fabd8c590b1dcd5ca4ec3ca44d6078c1dfa7d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jul 2019 02:29:59 -0700 Subject: [PATCH 047/248] pythonPackages.knack: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/knack/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index f8427cd7d177..c3025311e105 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "1kxxj9m2mvva9rz11m6pgdg0mi712d28faj4633rl23qa53sh7i8"; + sha256 = "08g15kwfppdr7vhbsg6qclpqbf11d9k3hwgrmvhh5fa1jrk95b5i"; }; propagatedBuildInputs = [ @@ -40,9 +40,8 @@ buildPythonPackage rec { pytest ]; - # tries to make a '/homeless-shelter' dir checkPhase = '' - pytest -k 'not test_cli_exapp1' + HOME=$TMPDIR pytest . ''; meta = with lib; { From d440ddd95ae96e34b6a5f928c24984dcc814ed6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 03:04:34 -0700 Subject: [PATCH 048/248] python37Packages.josepy: 1.1.0 -> 1.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-josepy/versions --- pkgs/development/python-modules/josepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index f968b9fbd9f5..d3b5ad79d6c2 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "fb5c62c77d26e04df29cb5ecd01b9ce69b6fcc9e521eb1ca193b7faa2afa7086"; + sha256 = "1lq2s1649zinfii9ccl1wk6aqpaj35r8xwz44020ylp9ky1rmv4w"; }; propagatedBuildInputs = [ From ae796cea5d91b6d884344147d979787a245bfa26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 03:23:54 -0700 Subject: [PATCH 049/248] python37Packages.flask-paginate: 0.5.2 -> 0.5.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-flask-paginate/versions --- pkgs/development/python-modules/flask-paginate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index a2c372c8beeb..52dd77c83916 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "ebc896bf6e8d7a414e3efba0bd0770a8f73dcd7023f99e849c64164287e36e9b"; + sha256 = "15plwkmi6i7p85q2vgyvmn0l4c2h7pj4mmiziwghyyqbd1rc0dr2"; }; propagatedBuildInputs = [ flask ]; From 2f02fed0d7b395da9bc46338c746d7e482f105b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 03:55:33 -0700 Subject: [PATCH 050/248] python37Packages.google_cloud_kms: 1.0.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-google-cloud-kms/versions --- pkgs/development/python-modules/google_cloud_kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index d4052a227bb4..383ed1bdbb90 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2167e1c599ea1d9fed96d317ad817d0b37497460c70f11aafa13a24ede7c9c35"; + sha256 = "0ypn95swjj93kvdcrvmijmh3vzpr499a3krk923a86m8vlcwcvjm"; }; checkInputs = [ pytest mock ]; From 49ca44cf17d8f21494a7721fc275e4029bf49b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 16 Jul 2019 13:52:27 +0200 Subject: [PATCH 051/248] knot-dns: 2.8.2 -> 2.8.3 (maintenance) --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index a646fb0b7a46..718028b2bc0c 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "00d24361a2406392c508904fad943536bae6369981686b4951378fc1c9a5a137"; + sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad"; }; outputs = [ "bin" "out" "dev" ]; From 7b4510430923c370754f84620369bfa8c3efb619 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 05:13:37 -0700 Subject: [PATCH 052/248] python37Packages.fitbit: 0.3.0 -> 0.3.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-fitbit/versions --- pkgs/development/python-modules/fitbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index 93bf4716073f..ef4859a749a0 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "fitbit"; - version = "0.3.0"; + version = "0.3.1"; checkInputs = [ coverage freezegun mock requests-mock sphinx ]; propagatedBuildInputs = [ dateutil requests_oauthlib ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { rev = version; owner = "orcasgit"; repo = "python-fitbit"; - sha256 = "0s1kp4qcxvxghqf9nb71843slm4r5lhl2rlvj3yvhbby3cqs4g84"; + sha256 = "1w2lpgf6bs5nbnmslppaf4lbhr9cj6grg0a525xv41jip7iy3vfn"; }; postPatch = '' From bd98f3521c13ec5520b46d306bc64d1cb87a9fc0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 16 Jul 2019 02:19:51 +0300 Subject: [PATCH 053/248] bazel: drop absolute Python path Without this Bazel always picks Python 3 which breaks Python 2 packages. Strangely enough just dropping this patch works, with all `bazel.tests` passing. --- .../tools/build-managers/bazel/default.nix | 11 ++++------- .../build-managers/bazel/python-stub-path-fix.patch | 13 ------------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bazel/python-stub-path-fix.patch diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index bad0023eef32..f52b2e79fe1a 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -136,8 +136,6 @@ stdenv.mkDerivation rec { # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. ./trim-last-argument-to-gcc-if-empty.patch - - ./python-stub-path-fix.patch ] ++ lib.optional enableNixHacks ./nix-hacks.patch; @@ -220,13 +218,13 @@ stdenv.mkDerivation rec { cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; }; java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; }; protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; }; - pythonBinPath = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; }; + pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; }; bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; }; # update the list of workspace dependencies @@ -310,9 +308,8 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute python's stub shebang to plain python path. (see TODO add pr URL) # See also `postFixup` where python is added to $out/nix-support - substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ - --replace "/usr/bin/env python" "${python3}/bin/python" \ - --replace "NIX_STORE_PYTHON_PATH" "${python3}/bin/python" \ + patchShebangs src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ + --replace "#!/usr/bin/env python" "#!${python3}/bin/python" # md5sum is part of coreutils sed -i 's|/sbin/md5|md5sum|' \ diff --git a/pkgs/development/tools/build-managers/bazel/python-stub-path-fix.patch b/pkgs/development/tools/build-managers/bazel/python-stub-path-fix.patch deleted file mode 100644 index cbc4192d2d9b..000000000000 --- a/pkgs/development/tools/build-managers/bazel/python-stub-path-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -index dac21c9a83..69b11c283f 100644 ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -@@ -67,7 +67,7 @@ def FindPythonBinary(module_space): - return os.path.join(module_space, PYTHON_BINARY) - else: - # Case 4: Path has to be looked up in the search path. -- return SearchPath(PYTHON_BINARY) -+ return "NIX_STORE_PYTHON_PATH" - - def CreatePythonPathEntries(python_imports, module_space): - parts = python_imports.split(':'); From 680ee0a45ae747a0a1f85b7d886e3eb8055c44f4 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Tue, 16 Jul 2019 13:51:26 +0100 Subject: [PATCH 054/248] pius: switch to Python 3 pius 3.0.0 requires Python 3. --- pkgs/tools/security/pius/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index f82f705fc8ee..fed63390d284 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,7 +1,7 @@ -{ fetchFromGitHub, stdenv, pythonPackages, gnupg, perl }: +{ fetchFromGitHub, stdenv, python3Packages, gnupg, perl }: let version = "3.0.0"; in -pythonPackages.buildPythonApplication { +python3Packages.buildPythonApplication { name = "pius-${version}"; namePrefix = ""; @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication { ''; nativeBuildInputs = [ perl ]; - propagatedBuildInputs = with pythonPackages; [ six ]; + propagatedBuildInputs = with python3Packages; [ six ]; meta = { homepage = https://www.phildev.net/pius/; From d914be56a24abce1a06c5952aad50b1f419f5944 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Tue, 16 Jul 2019 13:52:41 +0100 Subject: [PATCH 055/248] pius: dependency on package 'six' is no longer needed --- pkgs/tools/security/pius/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index fed63390d284..e9e8c102eaf6 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -19,7 +19,6 @@ python3Packages.buildPythonApplication { ''; nativeBuildInputs = [ perl ]; - propagatedBuildInputs = with python3Packages; [ six ]; meta = { homepage = https://www.phildev.net/pius/; From 97ef23794b57a54b9df4398e0c77946e5dc841bf Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Tue, 16 Jul 2019 13:54:58 +0100 Subject: [PATCH 056/248] pius: use pname+version instead of name --- pkgs/tools/security/pius/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index e9e8c102eaf6..6ae69505f066 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -2,8 +2,9 @@ let version = "3.0.0"; in python3Packages.buildPythonApplication { - name = "pius-${version}"; + pname = "pius"; namePrefix = ""; + inherit version; src = fetchFromGitHub { owner = "jaymzh"; From 5e54487080f82505fbd96b0c9a1bf5f0a1f7d0a1 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Tue, 16 Jul 2019 14:28:49 +0100 Subject: [PATCH 057/248] pius: perl should be a runtime dependency, not a build-time one Since 61bc03c017f18e2fe54d209ae8ba8a42033b9564, patch-shebangs now distinguishes between build-time and runtime dependencies. Prior to this commit, perl was not being placed in patch-shebangs' search path when it is run during the fixup phase. --- pkgs/tools/security/pius/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 6ae69505f066..5aa4ad47d42b 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication { done ''; - nativeBuildInputs = [ perl ]; + buildInputs = [ perl ]; meta = { homepage = https://www.phildev.net/pius/; From 24fda481c377b8b4aa72743101a19a364f4b6d78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 06:52:57 -0700 Subject: [PATCH 058/248] qsynth: 0.5.6 -> 0.5.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qsynth/versions --- pkgs/applications/audio/qsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index b146513d7350..82e003b2bea3 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6"; + sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6"; }; nativeBuildInputs = [ autoconf pkgconfig ]; From 1808b1eb67b039d4027a935aa090e585bf9e50c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 10 Feb 2019 18:30:16 +0100 Subject: [PATCH 059/248] mumsi: Init at git-2019-02-10 --- pkgs/development/libraries/mumlib/default.nix | 28 +++++++++++++++++++ pkgs/servers/mumsi/default.nix | 27 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/development/libraries/mumlib/default.nix create mode 100644 pkgs/servers/mumsi/default.nix diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix new file mode 100644 index 000000000000..7117599d15ec --- /dev/null +++ b/pkgs/development/libraries/mumlib/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, boost, openssl, log4cpp, libopus, protobuf }: +with lib; stdenv.mkDerivation rec { + pname = "mumlib"; + version = "unstable-2018-12-12"; + + src = fetchFromGitHub { + owner = "slomkowski"; + repo = "mumlib"; + rev = "f91720de264c0ab5e02bb30deafc5c4b2c245eac"; + sha256 = "0p29z8379dp2ra0420x8xjp4d3r2mf680lj38xmlc8npdzqjqjdp"; + }; + + buildInputs = [ boost openssl libopus protobuf log4cpp ]; + nativeBuildInputs = [ cmake pkgconfig ]; + installPhase = '' + install -Dm555 libmumlib.so $out/lib/libmumlib.so + cp -a ../include $out + ''; + + meta = { + description = "Fairy simple Mumble library written in C++, using boost::asio asynchronous networking framework"; + homepage = "https://github.com/slomkowski/mumlib"; + maintainers = with maintainers; [ das_j ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix new file mode 100644 index 000000000000..4465febf39a9 --- /dev/null +++ b/pkgs/servers/mumsi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost +, log4cpp, pjsip, openssl, alsaLib, mumlib }: +with lib; stdenv.mkDerivation rec { + pname = "mumsi"; + version = "unstable-2018-12-12"; + + src = fetchFromGitHub { + owner = "slomkowski"; + repo = "mumsi"; + rev = "961b75792f8da22fb5502e39edb286e32172d0b0"; + sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk"; + }; + + buildInputs = [ boost log4cpp pkgconfig pjsip mumlib openssl alsaLib ]; + nativeBuildInputs = [ cmake pkgconfig ]; + installPhase = '' + install -Dm555 mumsi $out/bin/mumsi + ''; + + meta = { + description = "SIP to Mumble gateway/bridge using PJSUA stack"; + homepage = "https://github.com/slomkowski/mumsi"; + maintainers = with maintainers; [ das_j ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa09eed2c0c0..9366457591ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12404,6 +12404,8 @@ in mueval = callPackage ../development/tools/haskell/mueval { }; + mumlib = callPackage ../development/libraries/mumlib { }; + muparser = callPackage ../development/libraries/muparser { }; mygpoclient = pythonPackages.mygpoclient; @@ -14436,6 +14438,8 @@ in mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; + mumsi = callPackage ../servers/mumsi { }; + myserver = callPackage ../servers/http/myserver { }; nas = callPackage ../servers/nas { }; From 2d1870a3d0274f239c4f3e8c432b5db8beec71b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 07:54:17 -0700 Subject: [PATCH 060/248] python37Packages.texttable: 1.6.1 -> 1.6.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-texttable/versions --- pkgs/development/python-modules/texttable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 395deff22261..1d55d6aff30a 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "2b60a5304ccfbeac80ffae7350d7c2f5d7a24e9aab5036d0f82489746419d9b2"; + sha256 = "1x5l77akfc20x52jma9573qp8l8r07q103pm4l0pbizvh4vp1wzg"; }; meta = { From 5ef740182b5e9a0abd6c29274ce3190adb6f901c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 08:20:24 -0700 Subject: [PATCH 061/248] python37Packages.Wand: 0.5.4 -> 0.5.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-wand/versions --- pkgs/development/python-modules/Wand/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 18e5c80615a4..18c42dbc126b 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "e2e08e19a37c61e85eaa307fe319889af46fe4cac6c23e3ae668b96be3e497ff"; + sha256 = "1qjwqshcrfsa2a0j9bk0w01y857idzic1bj202p9cpar3xsjjw69"; }; postPatch = '' From 950da6263f7f861246ac284e45f51ff0073e9d8d Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Thu, 11 Jul 2019 17:10:38 +0200 Subject: [PATCH 062/248] bazel: 0.27.0 -> 0.28.0 --- .../tools/build-managers/bazel/default.nix | 12 ++- .../tools/build-managers/bazel/src-deps.json | 87 ++++++++++++++----- 2 files changed, 76 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8d7a8199240d..b20d75558d2f 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -19,11 +19,11 @@ }: let - version = "0.27.0"; + version = "0.28.0"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0yn662dzgfr8ls4avfl12k5sr4f210bab12wml18bh4sjlxhs263"; + sha256 = "26ad8cdadd413b8432cf46d9fc3801e8db85d9922f85dd8a7f5a92fec876557f"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -41,12 +41,13 @@ let srcs.io_bazel_skydoc srcs.bazel_skylib srcs.io_bazel_rules_sass + srcs.platforms (if stdenv.hostPlatform.isDarwin then srcs.${"java_tools_javac11_darwin-v2.0.zip"} else srcs.${"java_tools_javac11_linux-v2.0.zip"}) srcs.${"coverage_output_generator-v1.0.zip"} srcs.build_bazel_rules_nodejs - srcs.${"android_tools_pkg-0.4.tar.gz"} + srcs.${"android_tools_pkg-0.7.tar.gz"} ]); distDir = runCommand "bazel-deps" {} '' @@ -331,6 +332,11 @@ stdenv.mkDerivation rec { substituteInPlace tools/build_rules/test_rules.bzl \ --replace /bin/bash ${customBash}/bin/bash + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${customBash}/bin/bash + done # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json index a0d07f1a68d4..fc3fe13f5809 100644 --- a/pkgs/development/tools/build-managers/bazel/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/src-deps.json @@ -7,12 +7,20 @@ "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" ] }, - "2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz": { - "name": "2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz", - "sha256": "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f", + "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz": { + "name": "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", + "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz" + ] + }, + "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { + "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" ] }, "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { @@ -23,11 +31,11 @@ "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" ] }, - "android_tools_pkg-0.4.tar.gz": { - "name": "android_tools_pkg-0.4.tar.gz", - "sha256": "331e7706f2bcae8a68057d8ddd3e3f1574bca26c67c65802fc4a8ac6164fa912", + "android_tools_pkg-0.7.tar.gz": { + "name": "android_tools_pkg-0.7.tar.gz", + "sha256": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.4.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz" ] }, "bazel_j2objc": { @@ -41,11 +49,11 @@ }, "bazel_rbe_toolchains": { "name": "bazel_rbe_toolchains", - "sha256": "f575778fb1366718f5e1204200ecf35796c558998c15303945d351f0b42669e5", - "strip_prefix": "bazel_rbe_toolchains-f50471a57cd05a313a953fa54756db6e8fd93673", + "sha256": "e2b8644caa15235a488e831264e5dcb014e2cdf3b697319bc1e9d6b0fff0b4b9", + "strip_prefix": "bazel_rbe_toolchains-01529a65d21abdf71635ff0c2472043a567ecded", "urls": [ - "https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/f50471a57cd05a313a953fa54756db6e8fd93673.tar.gz", - "https://github.com/buchgr/bazel_rbe_toolchains/archive/f50471a57cd05a313a953fa54756db6e8fd93673.tar.gz" + "https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz", + "https://github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz" ] }, "bazel_skylib": { @@ -127,11 +135,11 @@ }, "io_bazel_skydoc": { "name": "io_bazel_skydoc", - "sha256": "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f", - "strip_prefix": "skydoc-2d9566b21fbe405acf5f7bf77eda30df72a4744c", + "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534", + "strip_prefix": "skydoc-1ca560df1cf6e280f987af2f8d08a5edc7ac6b54", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz" ] }, "java_tools_javac11_darwin-v2.0.zip": { @@ -169,6 +177,13 @@ "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11.zip" ] }, + "java_tools_langtools_javac12": { + "name": "java_tools_langtools_javac12", + "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip" + ] + }, "java_tools_langtools_javac9": { "name": "java_tools_langtools_javac9", "sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864", @@ -235,11 +250,27 @@ ] }, "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", "name": "openjdk_linux_aarch64", - "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", + "sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e", "urls": [ - "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz", - "http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" ] }, "openjdk_linux_minimal": { @@ -306,6 +337,15 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" ] }, + "platforms": { + "name": "platforms", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + ] + }, "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", @@ -369,6 +409,13 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" ] }, + "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": { + "name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" + ] + }, "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": { "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz", "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87", From 003ffbe7d6d07c4fcd8f5ca41065736aa53171f0 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 16 Jul 2019 17:58:24 +0200 Subject: [PATCH 063/248] wavpack: CVE-2018-19840 --- pkgs/development/libraries/wavpack/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 7163e2a87d7d..aa45b72d4dd1 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -49,6 +49,11 @@ stdenv.mkDerivation rec { name = "CVE-2019-11498-4.patch"; sha256 = "0qdw071b14hmxkjw6kn83d8hzq89l3hqh64pl1f1wb8m51w5xfg7"; }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/070ef6f138956d9ea9612e69586152339dbefe51.patch"; + name = "CVE-2018-19840.patch"; + sha256 = "08y27py8hnki74ad8wbknnd36vj5pzzcm2vk3ngcbsjnj7x5mffz"; + }) ]; meta = with stdenv.lib; { From 71a37531906732665ada409d00e501085f9d4394 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 16 Jul 2019 18:00:18 +0200 Subject: [PATCH 064/248] wavpack: CVE-2018-19841 --- pkgs/development/libraries/wavpack/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index aa45b72d4dd1..adfce3ea50b7 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -54,6 +54,11 @@ stdenv.mkDerivation rec { name = "CVE-2018-19840.patch"; sha256 = "08y27py8hnki74ad8wbknnd36vj5pzzcm2vk3ngcbsjnj7x5mffz"; }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bba5389dc598a92bdf2b297c3ea34620b6679b5b.patch"; + name = "CVE-2018-19841.patch"; + sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy"; + }) ]; meta = with stdenv.lib; { From d0823eba2c245e978f87c3c8fbf39b3ef4fea4c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 09:05:21 -0700 Subject: [PATCH 065/248] python37Packages.typing-extensions: 3.7.2 -> 3.7.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-typing_extensions/versions --- pkgs/development/python-modules/typing-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index daaafbd7b3ec..ef5fed689122 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.7.2"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "0wfsv71pvkyf2na938l579jh0v3kzl6g744ijgnahcwd4d9x0b7v"; + sha256 = "15bx773a5zkk4hkwjl8nb5f8y5741vyyqb9q3jac6kxm1frk5mif"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; From 487da714bf3263f93b789c966c9108dd18db4cea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 09:36:26 -0700 Subject: [PATCH 066/248] python37Packages.pysaml2: 4.7.0 -> 4.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pysaml2/versions --- pkgs/development/python-modules/pysaml2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 9512fce4f452..1528623aa0ec 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "4.7.0"; + version = "4.8.0"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "1bpfvy2xd3aqf79ihglmxlxnv7406184p99h5mn5h9ifs54vvhhl"; + sha256 = "1nnmk7apg169bawqi06jbx3p0x4sq12kszzl7k6j39273hqq5ii4"; }; patches = [ From a5311930e1d398c591e88060383b69b5b3966741 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 09:54:32 -0700 Subject: [PATCH 067/248] python37Packages.s3fs: 0.2.1 -> 0.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-s3fs/versions --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 0a974133252e..157549a6f175 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "2146aae91ba3a06d7bfa7130688219599f8696d2825fb00f62923bb56f6e7ed3"; + sha256 = "1l3vdy3h6l03kjjzq1vq7h252749f8dg7kkz65s890y4xxvjxlyw"; }; buildInputs = [ docutils ]; From fb71cabd46ae6a83ad33d225a0a724f4ab095ae0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 10:06:19 -0700 Subject: [PATCH 068/248] python37Packages.yapf: 0.27.0 -> 0.28.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-yapf/versions --- pkgs/development/python-modules/yapf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 78e97014189b..abff04f23729 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.27.0"; + version = "0.28.0"; src = fetchPypi { inherit pname version; - sha256 = "18a7n85xv0qrab2ck94kw92ncjq2l8vl0k34pm22rjvd8h6gixil"; + sha256 = "06x409cgr5im9cppzypj1kqy1fsry906vn5slv7i9hd7fshvd53g"; }; meta = with stdenv.lib; { From a5a6c2654fa70c95714fa8877891b18ca56f879e Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 16 Jul 2019 19:27:25 +0200 Subject: [PATCH 069/248] sickgear: 0.18.14 -> 0.20.0 --- pkgs/servers/sickbeard/sickgear.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 7a0994ef814b..1b7a57e8b507 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.18.14"; + version = "0.20.0"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0sw436zbsaxwy58lfkgw6gb6hapxxxl4wipkpzd80dgaz7bvd7c3"; + sha256 = "1zg95szvfbmwinx1z5nlbmyck7ximvyna0x71yflmadkgf88nv0k"; }; dontBuild = true; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -R {autoProcessTV,gui,lib,sickbeard,SickBeard.py} $out/ + cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py,SickBeard.py} $out/ makeWrapper $out/SickBeard.py $out/bin/sickgear ''; @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; license = licenses.gpl3; homepage = "https://github.com/SickGear/SickGear"; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ rembo10 ]; }; } From 2e4fe8db89be78313282fbe002d8ea921931dbe8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 11:04:15 -0700 Subject: [PATCH 070/248] pgbouncer: 1.9.0 -> 1.10.0 (#64869) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pgbouncer/versions --- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index ef8b77ad1176..3b4a0543e189 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgbouncer-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; - sha256 = "012zh9l68r1ramrd66yam6y3al0i85dvvg4wwwkn6qwq6dhskv1r"; + sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q"; }; buildInputs = [ libevent openssl ]; From f612ab79002c546d668c4f4ee3d5321fc814b838 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 11:25:21 -0700 Subject: [PATCH 071/248] python37Packages.jupytext: 1.1.3 -> 1.1.7 (#64898) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-jupytext/versions --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index f7ac30c28c51..66e792276971 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.1.3"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "1klcx333kpgb5gbaasmz07brqjxvls3l5dpj0kv9cfsd76cq17yh"; + sha256 = "0g365j22gbmq4x60l06id5930aywzy1dx2s25109nqq2l2cxc7ws"; }; propagatedBuildInputs = [ From ee0b884675a11af1e6f0cb33c30819203b4291e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 11:25:42 -0700 Subject: [PATCH 072/248] qdirstat: 1.5 -> 1.5.90 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qdirstat/versions --- pkgs/applications/misc/qdirstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index abf4bb054621..a45f12293fd8 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,7 +3,7 @@ , makeWrapper, perlPackages }: let - version = "1.5"; + version = "1.5.90"; in stdenv.mkDerivation rec { name = "qdirstat-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = "${version}"; - sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc"; + sha256 = "161jzii5p0dflbpixibn3yhp13smjf6aw802rz1q4879s12gqdq6"; }; nativeBuildInputs = [ qmake makeWrapper ]; From 1cf88a612a9e8131ff0920940a11e038e324d07e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 12:02:15 -0700 Subject: [PATCH 073/248] sc-controller: 0.4.6.1 -> 0.4.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sc-controller/versions --- pkgs/misc/drivers/sc-controller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 764e60ac13ba..b977b2c0c15e 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.6.1"; + version = "0.4.7"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "1kcqsnrlwl4s94j6ahgkz3w4sy9hsr95y624zab6g10w0fl5sqrc"; + sha256 = "1dskjh5qcjf4x21n4nk1zvdfivbgimsrc2lq1id85bibzps29499"; }; nativeBuildInputs = [ wrapGAppsHook ]; From b2032beb07169d17133e84e6f76d6719fd88ad89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 12:08:24 -0700 Subject: [PATCH 074/248] slurm: 19.05.0.1 -> 19.05.1.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/slurm/versions --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index b1233b764647..c18e71977d87 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "19.05.0.1"; + version = "19.05.1.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "0cc1lac7x00s1zz8p9sbaj6zg4yf4ngr0ldszhpxpvykhx9wzfay"; + sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k"; }; outputs = [ "out" "dev" ]; From 2110e1bdd8a8a03d2d784672a9d1e9d1b7b64614 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 12:14:56 -0700 Subject: [PATCH 075/248] SDL2_image: 2.0.4 -> 2.0.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sdl2_image/versions --- pkgs/development/libraries/SDL2_image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index a2ef54cc136b..ba33b1fbc1de 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL2_image-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7"; + sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libwebp libXpm zlib ] From a02449824e55431d8dd2420d8d77623bf849deec Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Fri, 28 Jun 2019 13:19:56 +0200 Subject: [PATCH 076/248] guardian-agent: init at 0.7.2-beta --- .../networking/guardian-agent/default.nix | 44 ++++++++++++++ pkgs/tools/networking/guardian-agent/deps.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 104 insertions(+) create mode 100644 pkgs/tools/networking/guardian-agent/default.nix create mode 100644 pkgs/tools/networking/guardian-agent/deps.nix diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix new file mode 100644 index 000000000000..a5e8dc10d341 --- /dev/null +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -0,0 +1,44 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +, autossh +, makeWrapper +}: + +buildGoPackage rec { + pname = "guardian-agent"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "StanfordSNR"; + repo = pname; + rev = "v${version}-beta"; + sha256 = "05269y944hcabn6dqa66387rdhx81vcqcyjv6m1hdbz5ba8j7mqn"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + goPackagePath = "github.com/StanfordSNR/guardian-agent"; + + goDeps = ./deps.nix; + + postInstall = '' + mkdir -p $bin/bin $out/share/doc/${pname} + cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/ + cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent + ''; + + postFixup = '' + wrapProgram $bin/bin/sga-guard \ + --prefix PATH : "$bin/bin" \ + --prefix PATH : "${autossh}/bin" + ''; + + meta = with lib; { + description = "Secure ssh-agent forwarding for Mosh and SSH"; + homepage = "https://github.com/StanfordSNR/guardian-agent"; + license = licenses.bsd3; + maintainers = with maintainers; [ mmahut ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/guardian-agent/deps.nix b/pkgs/tools/networking/guardian-agent/deps.nix new file mode 100644 index 000000000000..950a346ce8be --- /dev/null +++ b/pkgs/tools/networking/guardian-agent/deps.nix @@ -0,0 +1,58 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/hashicorp/yamux"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/yamux"; + rev = "2f1d1f20f75d5404f53b9edf6b53ed5505508675"; + sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/sternhenri/interact"; + fetch = { + type = "git"; + url = "https://github.com/sternhenri/interact"; + rev = "dfeb9ef2030483f98cee2c86f5775fe6c729f10b"; + sha256 = "00b09fyy9zhv11mbzm18ngg765g0gyb23bmr4fc83i09w912if7j"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "04f50cda93cbb67f2afa353c52f342100e80e625"; + sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://github.com/StanfordSNR/crypto"; + rev = "e451cabda2acd7a416728ee89b75975b8b0c90d7"; + sha256 = "0aj6fc0i1dm6rdgr1mlv2pl4s0i6sj821k2p4gig45h5mn06mhpz"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "c0795c8afcf41dd1d786bebce68636c199b3bb45"; + sha256 = "0xsmr17mrpm9kx34zfzzirwy0n459h975x49p41fs2f6ly6lk9vp"; + }; + } + +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b2f881fc1e4..971c3bf2a47f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18317,6 +18317,8 @@ in guake = callPackage ../applications/misc/guake { }; + guardian-agent = callPackage ../tools/networking/guardian-agent { }; + guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; }; From db599c86c5fa2669b0f658344d7d5ad3064986f8 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 16 Jul 2019 15:39:08 +0200 Subject: [PATCH 077/248] cypress: init at 3.4.0 --- pkgs/development/web/cypress/default.nix | 40 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/web/cypress/default.nix diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix new file mode 100644 index 000000000000..e36b950f1f20 --- /dev/null +++ b/pkgs/development/web/cypress/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip }: + +stdenv.mkDerivation rec{ + pname = "cypress"; + version = "3.4.0"; + + src = fetchzip { + url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; + sha256 = "1j59az9j37a61ryvh975bc7bj43qi3dq0871fyambh1j2mby00qn"; + }; + + # don't remove runtime deps + dontPatchELF = true; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = with xorg; [ + libXScrnSaver libXdamage libXtst + ] ++ [ + nss gtk2 alsaLib gnome2.GConf gtk3 unzip + ]; + + runtimeDependencies = [ udev.lib ]; + + installPhase = '' + mkdir -p $out/bin $out/opt/cypress + cp -vr * $out/opt/cypress/ + # Let's create the file binary_state ourselves to make the npm package happy on initial verification. + echo '{"verified": true}' > $out/opt/cypress/binary_state.json + ln -s $out/opt/cypress/Cypress $out/bin/Cypress + ''; + + meta = with stdenv.lib; { + description = "Fast, easy and reliable testing for anything that runs in a browser"; + homepage = "https://www.cypress.io"; + license = licenses.mit; + platforms = ["x86_64-linux"]; + maintainers = with maintainers; [ tweber mmahut ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa09eed2c0c0..c5ca8079d1d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10237,6 +10237,8 @@ in cxxtest = callPackage ../development/libraries/cxxtest { }; + cypress = callPackage ../development/web/cypress { }; + cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; }; From e7e690b6431441d389d34b9935dc7b7b68582045 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 16 Jul 2019 16:31:36 -0400 Subject: [PATCH 078/248] pythonPackages.texttable: update homepage --- pkgs/development/python-modules/texttable/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 1d55d6aff30a..a8c20a0eeaca 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { sha256 = "1x5l77akfc20x52jma9573qp8l8r07q103pm4l0pbizvh4vp1wzg"; }; - meta = { + meta = with lib; { description = "A module to generate a formatted text table, using ASCII characters"; - homepage = http://foutaise.org/code/; - license = lib.licenses.lgpl2; + homepage = "https://github.com/foutaise/texttable"; + license = licenses.lgpl2; }; -} \ No newline at end of file +} From 38ec5055494ec88883e0033b7078ae6d45ced85a Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 16 Jul 2019 16:14:35 +0200 Subject: [PATCH 079/248] libosinfo: CVE-2019-13313 Fixes #64660 --- pkgs/development/libraries/libosinfo/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 04f0db030bb0..b971c8924f36 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: @@ -21,6 +21,17 @@ stdenv.mkDerivation rec { patches = [ ./osinfo-db-data-dir.patch + # https://nvd.nist.gov/vuln/detail/CVE-2019-13313 + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/commit/3654abee6ead9f11f8bb9ba8fc71efd6fa4dabbc.patch"; + name = "CVE-2019-13313-1.patch"; + sha256 = "1lybywfj6b41zfjk33ap90bab5l84lf5y3kif7vd2b6wq5r91rcn"; + }) + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/commit/08fb8316b4ac42fe74c1fa5ca0ac593222cdf81a.patch"; + name = "CVE-2019-13313-2.patch"; + sha256 = "1f6rhkrgy3j8nmidk97wnz6p35zs1dsd63d3np76q7qs7ra74w9z"; + }) ]; postPatch = '' From 53d9338c9ee5847db472f51bec18836b01ebd249 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:09:05 -0400 Subject: [PATCH 080/248] pythonPackages.azure-common: refactor --- .../python-modules/azure-common/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 7634be181047..3b25ce6bcfbd 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -4,6 +4,7 @@ , azure-nspkg , isPyPy , python +, isPy3k }: buildPythonPackage rec { @@ -17,16 +18,20 @@ buildPythonPackage rec { sha256 = "25d696d2affbf5fe9b13aebe66271fce545e673e7e1eeaaec2d73599ba639d63"; }; - propagatedBuildInputs = [ azure-nspkg ]; + propagatedBuildInputs = [ + azure-nspkg + ]; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; + doCheck = false; + meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + description = "This is the Microsoft Azure common code"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From b0403da8596e62f7adf6c1ce2fa566b942cdfd29 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:17:22 -0400 Subject: [PATCH 081/248] pythonPackages.azure-mgmt-common: refactor sha differs from what is offered via pip, echo statement no longer necessary, updated metadata --- .../azure-mgmt-common/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index c11b8707cb10..e948afd91cfd 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -6,6 +6,7 @@ , azure-mgmt-nspkg , requests , msrestazure +, isPy3k }: buildPythonPackage rec { @@ -15,20 +16,26 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; + sha256 = "c63812c13d9f36615c07f874bc602b733bb516f1ed62ab73189b8f71c6bfbfe6"; }; - propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-nspkg + requests + msrestazure + ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; + doCheck = false; + meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + description = "This is the Microsoft Azure Resource Management common code"; + homepage = https://pypi.org/project/azure-mgmt-common; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From 3f669b4e54f3e39367179493f009db84fd6b2d48 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:22:42 -0400 Subject: [PATCH 082/248] pythonPackages.azure-mgmt-compute: 4.4.0 -> 5.0.0 --- .../azure-mgmt-compute/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index ffd2ea11d7c3..3df307242cf4 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -1,31 +1,37 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , python , azure-mgmt-common +, isPy3k }: buildPythonPackage rec { - version = "4.4.0"; + version = "5.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00"; + sha256 = "1zdypc8f825n60341ai2482rwgsc7l8dpr691j8hqz571l80y85w"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + propagatedBuildInputs = [ + azure-mgmt-common + ]; - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Compute Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-compute; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From 51eac934607580088e6a50451cc6e0dc1a959a06 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:23:48 -0400 Subject: [PATCH 083/248] pythonPackages.azure-mgmt-network: 2.5.1 -> 2.6.0 --- .../azure-mgmt-network/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 63457d6f5423..29266aea7ee2 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -1,31 +1,37 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , azure-mgmt-common , python +, isPy3k }: buildPythonPackage rec { - version = "2.5.1"; + version = "2.6.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45"; + sha256 = "0166646703389374736cbe045ffb874e08796407ea0b1b5d441143b054a47e09"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + propagatedBuildInputs = [ + azure-mgmt-common + ]; - meta = with pkgs.lib; { + # has no tests + doCheck = false; + + meta = with lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/network?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From 707a567ebdcb0e6585d95bc5cd93d1cd3dd2dfef Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:25:41 -0400 Subject: [PATCH 084/248] pythonPackages.azure-mgmt-resource: refactor Removed doCheck and updated metadata --- .../python-modules/azure-mgmt-resource/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index e5f5b38509f4..3689f85f2250 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , azure-mgmt-common +, isPy3k }: @@ -16,17 +17,20 @@ buildPythonPackage rec { sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; + # has no tests + doCheck = false; + meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/resources?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From 5ea3e9cac05169962d711f4dcb0dad9af784663b Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:27:10 -0400 Subject: [PATCH 085/248] pythonPackages.azure-mgmt-storage: refactor Removed doCheck and updated metadata --- .../azure-mgmt-storage/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 12d10d8ac477..0f4c6b101e04 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -1,31 +1,35 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , python , azure-mgmt-common +, isPy3k }: buildPythonPackage rec { - version = "3.1.1"; + version = "3.3.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f"; + sha256 = "1kffay8hr8h3hf78wb1kisvffpwxsxy6lixbgh9dbv0p781sgyh6"; }; - postInstall = '' + postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Storage Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/storage?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From d0aac32018294e5a33d15b620084ea99e741fe92 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:29:02 -0400 Subject: [PATCH 086/248] pythonPackages.azure-servicemanagement-legacy: 0.20.6 -> 0.20.7 --- .../default.nix | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index 8148fe78e53c..6a0c04c58cc9 100644 --- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -1,31 +1,37 @@ -{ pkgs +{ lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , azure-common , requests -, python }: buildPythonPackage rec { - version = "0.20.6"; + version = "0.20.7"; pname = "azure-servicemanagement-legacy"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "c883ff8fa3d4f4cb7b9344e8cb7d92a9feca2aa5efd596237aeea89e5c10981d"; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "ab01fc1f23462f130c69f46505524b88101023dc"; + sha256 = "0w2bm9hkwy1m94l8r2klnpqn4192y8bir3z8bymxgfx9y0b1mn2q"; }; - propagatedBuildInputs = [ azure-common requests ]; - - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + preBuild = '' + cd ./azure-servicemanagement-legacy ''; - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + propagatedBuildInputs = [ + azure-common + requests + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Management Legacy Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-servicemanagement-legacy; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From d5dadfa05958a002275de2452b4c086f15d4a0eb Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:29:58 -0400 Subject: [PATCH 087/248] pythonPackages.azure-storage-blob: refactor sha does not match what is offered via pip- also updated metadata --- .../development/python-modules/azure-storage-blob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 2531c440daf4..2c00d78a7188 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0b15dzy75fml994gdfmaw5qcyij15gvh968mk3hg94d1wxwai1zi"; + sha256 = "f187a878e7a191f4e098159904f72b4146cf70e1aabaf6484ab4ba72fc6f252c"; }; propagatedBuildInputs = [ @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Client library for Microsoft Azure Storage services containing the blob service APIs"; homepage = https://github.com/Azure/azure-storage-python/tree/master/azure-storage-blob; license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai ]; + maintainers = with maintainers; [ cmcdragonkai mwilsoninsight ]; }; } From a18f5138e1f95e34350ba448e7d8e86dbb193780 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:39:20 -0400 Subject: [PATCH 088/248] pythonPackages.azure-applicationinsights: init at 0.1.0 --- .../azure-applicationinsights/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/azure-applicationinsights/default.nix diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix new file mode 100644 index 000000000000..74f7cf61b13a --- /dev/null +++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, msrest +}: + +buildPythonPackage rec { + pname = "azure-applicationinsights"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "6e1839169bb6ffd2d2c21ee3f4afbdd068ea428ad47cf884ea3167ecf7fd0859"; + }; + + propagatedBuildInputs = [ + azure-common + msrest + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Application Insights Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-applicotioninsights; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8e85d775f5d..32f5cb1eb141 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -242,6 +242,8 @@ in { azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 7ca7dfcd2c79ca19e71ee127399108453a71b824 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:41:12 -0400 Subject: [PATCH 089/248] pythonPackages.azure-batch: init at 6.0.1 --- .../python-modules/azure-batch/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-batch/default.nix diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix new file mode 100644 index 000000000000..35ba2d25d5ab --- /dev/null +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, azure-common +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-batch"; + version = "6.0.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "d5b0de3db0058cd69baf30e059874094abf865e24ccd82e3cd25f3a48b9676d1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Batch Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/batch?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32f5cb1eb141..e892923a022c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -244,6 +244,8 @@ in { azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; + azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 4bd2b34ba9c8378f4519e6e96e6b466b85448fd7 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:43:31 -0400 Subject: [PATCH 090/248] pythonPackages.uamqp: init at 1.1.0 --- .../python-modules/uamqp/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/uamqp/default.nix diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix new file mode 100644 index 000000000000..b7f244730b1c --- /dev/null +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, openssl +, six +, certifi +, enum34 +, isPy3k +}: + +buildPythonPackage rec { + pname = "uamqp"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d3d4ff94bf290adb82fe8c19af709a21294bac9b27c821b9110165a34b922015"; + }; + + buildInputs = [ + openssl + certifi + six + ] ++ lib.optionals (!isPy3k) [ + enum34 + ]; + + nativeBuildInputs = [ + cmake + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "An AMQP 1.0 client library for Python"; + homepage = https://github.com/Azure/azure-uamqp-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e892923a022c..2c12a29c8c9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1008,6 +1008,8 @@ in { toggl-cli = callPackage ../development/python-modules/toggl-cli { }; + uamqp = callPackage ../development/python-modules/uamqp { }; + unifi = callPackage ../development/python-modules/unifi { }; uvloop = callPackage ../development/python-modules/uvloop { }; From 44bbc6632abc7c676a13d0c5c3d4a5563e3186c5 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:47:23 -0400 Subject: [PATCH 091/248] pythonPackages.azure-cosmosdb-nspkg: init at 2.0.2 --- .../azure-cosmosdb-nspkg/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix new file mode 100644 index 000000000000..fef2614e1aed --- /dev/null +++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-nspkg +}: + +buildPythonPackage rec { + pname = "azure-cosmosdb-nspkg"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8"; + }; + + propagatedBuildInputs = [ + azure-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure CosmosDB namespace package"; + homepage = https://github.com/Azure/azure-cosmos-table-python/tree/master/azure-cosmosdb-nspkg; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c12a29c8c9d..859422ee11a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -246,6 +246,8 @@ in { azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From ca147f91d278f3e20dafc5cfe345c0cf64eeb0a4 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:49:15 -0400 Subject: [PATCH 092/248] pythonPackages.azure-cosmosdb-table: init at 1.0.5 --- .../azure-cosmosdb-table/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/azure-cosmosdb-table/default.nix diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix new file mode 100644 index 000000000000..6a5d54b82989 --- /dev/null +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, azure-common +, azure-storage-common +, azure-cosmosdb-nspkg +, futures +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-cosmosdb-table"; + version = "1.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "4a34c2c792036afc2a3811f4440ab967351e9ceee6542cc96453b63c678c0145"; + }; + + propagatedBuildInputs = [ + cryptography + azure-common + azure-storage-common + azure-cosmosdb-nspkg + ] ++ lib.optionals (!isPy3k) [ + futures + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Log Analytics Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/cosmosdb?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 859422ee11a2..d5e153395d99 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -248,6 +248,8 @@ in { azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; + azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From c2d4ae671ee29b3854ffcab97c96b08d8cefeca1 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:51:03 -0400 Subject: [PATCH 093/248] pythonPackages.azure-datalake-store: init at 0.0.45 --- .../azure-datalake-store/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/azure-datalake-store/default.nix diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix new file mode 100644 index 000000000000..508fa8bf87ec --- /dev/null +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, adal +, azure-common +, futures +, pathlib2 +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-datalake-store"; + version = "0.0.45"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k2wkpdv30wjmi53zdcsa5xfqw8gyak39na73ja6rb7wy8196wbd"; + }; + + propagatedBuildInputs = [ + requests + adal + azure-common + ] ++ lib.optionals (!isPy3k) [ + futures + pathlib2 + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This project is the Python filesystem library for Azure Data Lake Store"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/data-lake-store?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5e153395d99..a9a4a6ca6b05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -250,6 +250,8 @@ in { azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; + azure-datalake-store = callPackage ../development/python-modules/azure-datalake-store { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 850e7d62f0d029bac6b4bf07a865b28c00385e72 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:52:15 -0400 Subject: [PATCH 094/248] pythonPackages.azure-eventgrid: init at 1.2.0 --- .../azure-eventgrid/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-eventgrid/default.nix diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix new file mode 100644 index 000000000000..79449c328b0d --- /dev/null +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, azure-common +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-eventgrid"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7ebbe1c4266ba176aa4969d9755c08f10b89848ad50fb0bfd16fa82e29234f95"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-grid?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9a4a6ca6b05..599b967a69a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -252,6 +252,8 @@ in { azure-datalake-store = callPackage ../development/python-modules/azure-datalake-store { }; + azure-eventgrid = callPackage ../development/python-modules/azure-eventgrid { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 7eafb0a2c1f2dd501cd345c9551bddc502743a2d Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:53:30 -0400 Subject: [PATCH 095/248] pythonPackages.azure-graphrbac: init at 0.61.0 --- .../azure-graphrbac/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-graphrbac/default.nix diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix new file mode 100644 index 000000000000..c47c10f1418d --- /dev/null +++ b/pkgs/development/python-modules/azure-graphrbac/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +}: + +buildPythonPackage rec { + version = "0.61.0"; + pname = "azure-graphrbac"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "4ab27db29d730e4d35f420466500f8ee60a26a8151dbd121a6c353ccd9d4ee55"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Graph RBAC Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-graphrbac; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 599b967a69a4..e1259e6d103e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -254,6 +254,8 @@ in { azure-eventgrid = callPackage ../development/python-modules/azure-eventgrid { }; + azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 83347ee08b12aab15a45327903f1f831c2e3dd62 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:54:49 -0400 Subject: [PATCH 096/248] pythonPackages.azure-keyvault: init at 1.1.0 --- .../python-modules/azure-keyvault/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-keyvault/default.nix diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix new file mode 100644 index 000000000000..ed0fe138769e --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-nspkg +, msrest +, msrestazure +, cryptography +}: + +buildPythonPackage rec { + pname = "azure-keyvault"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49"; + }; + + propagatedBuildInputs = [ + azure-common + azure-nspkg + msrest + msrestazure + cryptography + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Key Vault Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/key-vault?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1259e6d103e..d53fc3210042 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -256,6 +256,8 @@ in { azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { }; + azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 56a49133bd459aa71a69792bbe28f794f9a8fcba Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:55:48 -0400 Subject: [PATCH 097/248] pythonPackages.azure-loganalytics: init at 0.1.0 --- .../azure-loganalytics/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/azure-loganalytics/default.nix diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix new file mode 100644 index 000000000000..6a2b57052cce --- /dev/null +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, azure-common +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "azure-loganalytics"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e"; + }; + + propagatedBuildInputs = [ + msrest + azure-common + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Log Analytics Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/loganalytics/client?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d53fc3210042..863ea6b90952 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -258,6 +258,8 @@ in { azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 1921e318731578ab43591f0b0f5d458064430086 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 17:56:48 -0400 Subject: [PATCH 098/248] pythonPackages.azure-servicebus: init at 0.50.0 --- .../azure-servicebus/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-servicebus/default.nix diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix new file mode 100644 index 000000000000..e8683a68e295 --- /dev/null +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, uamqp +, azure-common +, msrestazure +, futures +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-servicebus"; + version = "0.50.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c5864cfc69402e3e2897e61b3bd224ade28d9e33dad849e4bd6afad26a3d2786"; + }; + + buildInputs = [ + uamqp + azure-common + msrestazure + ] ++ lib.optionals (!isPy3k) [ + futures + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Bus Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/free/master/azure-servicebus; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 863ea6b90952..307041a701cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -260,6 +260,8 @@ in { azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; + azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 7495918f3a07fa32517c098dd8ec0b42ddaea7c9 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:09:21 -0400 Subject: [PATCH 099/248] pythonPackages.azure-servicefabric: init at 6.4.0.0 --- .../azure-servicefabric/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +++++++++-------- 2 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/azure-servicefabric/default.nix diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix new file mode 100644 index 000000000000..6b9ac45ad979 --- /dev/null +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, msrest +}: + +buildPythonPackage rec { + pname = "azure-servicefabric"; + version = "6.4.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f049e8c4a179f1277f2ec60158f88caf14a50f7df491fc6841e360cd61746da1"; + }; + + propagatedBuildInputs = [ + azure-common + msrest + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This project provides a client library in Python that makes it easy to consume Microsoft Azure Storage services"; + homepage = https://pypi.org/project/azure-servicefabric; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 307041a701cc..52440c9e2f73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -262,6 +262,22 @@ in { azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; + azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; + + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; + + azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; + + azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; + + azure-storage = callPackage ../development/python-modules/azure-storage { }; + + azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; + + azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; + + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; @@ -274,20 +290,6 @@ in { azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; - azure-storage = callPackage ../development/python-modules/azure-storage { }; - - azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - - azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - - azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - - azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - - azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - - azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; From 58ec74f20ad4bcdbf37cbcdab147b74dd37ab6ac Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:13:10 -0400 Subject: [PATCH 100/248] pythonPackages.azure-mgmt-advisor: init at 2.0.1 --- .../azure-mgmt-advisor/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-advisor/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix new file mode 100644 index 000000000000..c24230952801 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, isPy3k +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-advisor"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1929d6d5ba49d055fdc806e981b93cf75ea42ba35f78222aaf42d8dcf29d4ef3"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Advisor Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-advisor; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52440c9e2f73..28d2eb962da2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -278,6 +278,8 @@ in { azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; + azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 467db0f247356f5c94d72a7bbea94f80bc6f5957 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:14:31 -0400 Subject: [PATCH 101/248] pythonPackages.azure-mgmt-applicationinsights: init at 0.2.0 --- .../default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix new file mode 100644 index 000000000000..d7e27eabf645 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-applicationinsights"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1hm6s7vym1y072jqypjgbhps8lza1d5kb8qcpyxnw4zsmsvshdp5"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Application Insights Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-applicationinsights; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28d2eb962da2..4e51ea06f471 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -280,6 +280,8 @@ in { azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; + azure-mgmt-applicationinsights = callPackage ../development/python-modules/azure-mgmt-applicationinsights { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 4a9487c0f0b71ce95b707cecc6ede7152e540f13 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:16:09 -0400 Subject: [PATCH 102/248] pythonPackages.azure-mgmt-authorization: init at 0.51.1 --- .../azure-mgmt-authorization/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-authorization/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix new file mode 100644 index 000000000000..c94620e0b15f --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-authorization"; + version = "0.51.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "d2789e21c6b85591b38d5d4e9b835b6546824c14e14aaa366da0ef50a95d2478"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Authorization Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-authorization; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e51ea06f471..d85be9d157fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -282,6 +282,8 @@ in { azure-mgmt-applicationinsights = callPackage ../development/python-modules/azure-mgmt-applicationinsights { }; + azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From c156da6feabf1d5bb3d5ae3679b51a0327ebd8fb Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:17:23 -0400 Subject: [PATCH 103/248] pythonPackages.azure-mgmt-batch: init at 6.0.0 --- .../azure-mgmt-batch/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-batch/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix new file mode 100644 index 000000000000..67fe9c568eac --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-batch"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Batch Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-batch; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d85be9d157fe..92c46ddeb29b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,6 +284,8 @@ in { azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; + azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 3fb174eb0e10b9f8b994f2e08314ce6394f430d5 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:18:25 -0400 Subject: [PATCH 104/248] pythonPackages.azure-mgmt-batchai: init at 2.0.0 --- .../azure-mgmt-batchai/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-batchai/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix new file mode 100644 index 000000000000..faa4d5bc39aa --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-mgmt-nspkg +, msrestazure +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-batchai"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Batch AI Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-batchai; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92c46ddeb29b..6c13a81837bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -286,6 +286,8 @@ in { azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; + azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From f638c312055ef36e6a21ccaf3e795161cf5fea13 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:19:45 -0400 Subject: [PATCH 105/248] pythonPackages.azure-mgmt-billing: init at 0.2.0 --- .../azure-mgmt-billing/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-billing/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix new file mode 100644 index 000000000000..c79f9a5a73e3 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, msrestazure +, azure-common +, azure-mgmt-nspkg +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-billing"; + version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f"; + sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4"; + }; + + preBuild = '' + cd ./azure-mgmt-billing + ''; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Billing Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-billing; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c13a81837bd..48dfeaac16d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -288,6 +288,8 @@ in { azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { }; + azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 6463d3c0c8cf94543df273a69d6b05a6abaeef1b Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:20:44 -0400 Subject: [PATCH 106/248] pythonPackages.azure-mgmt-cdn: init at 3.1.0 --- .../python-modules/azure-mgmt-cdn/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-cdn/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix new file mode 100644 index 000000000000..7ad279380824 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-cdn"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0cdbe0914aec544884ef681e31950efa548d9bec6d6dc354e00c3dbdab9e76e3"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure CDN Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cdn; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48dfeaac16d3..862d72e769b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -290,6 +290,8 @@ in { azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { }; + azure-mgmt-cdn = callPackage ../development/python-modules/azure-mgmt-cdn { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 55deab5467e6c725b6916cdd899596a02586d065 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:22:23 -0400 Subject: [PATCH 107/248] pythonPackages.azure-mgmt-cognitiveservices: init at 4.0.0 --- .../azure-mgmt-cognitiveservices/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix new file mode 100644 index 000000000000..d0ebe0470ae2 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-mgmt-nspkg +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-mgmt-cognitiveservices"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "05zbgy1d6mschqv6y14byr4nwdnv48x9skx4rbsbz1fcqqx3j2sd"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Cognitive Services Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cognitiveservices; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 862d72e769b7..ade162afbead 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -292,6 +292,8 @@ in { azure-mgmt-cdn = callPackage ../development/python-modules/azure-mgmt-cdn { }; + azure-mgmt-cognitiveservices = callPackage ../development/python-modules/azure-mgmt-cognitiveservices { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 0ed848dbfd39d77e000b842a84316b24db7dcdfe Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:23:46 -0400 Subject: [PATCH 108/248] pythonPackages.azure-mgmt-commerce: init at 1.0.1 --- .../azure-mgmt-commerce/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-commerce/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix new file mode 100644 index 000000000000..86e323be1686 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, msrestazure +, azure-common +, azure-mgmt-nspkg +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-commerce"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f"; + sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4"; + }; + + preBuild = '' + cd ./azure-mgmt-commerce + ''; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Commerce Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-commerce; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ade162afbead..c5f058bde9de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -294,6 +294,8 @@ in { azure-mgmt-cognitiveservices = callPackage ../development/python-modules/azure-mgmt-cognitiveservices { }; + azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 9d757d6a18a7c19944a609521fabd491eeb929e2 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:25:37 -0400 Subject: [PATCH 109/248] pythonPackages.azure-mgmt-consumption: init at 3.0.0 --- .../azure-mgmt-consumption/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-consumption/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix new file mode 100644 index 000000000000..d074f45cce55 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-consumption"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0nqgywknpj2a69an5yrn0c32fk01v5gi05za7dlf4ivwr9s4np83"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Consumption Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-consumption; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5f058bde9de..062c6188567b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -300,6 +300,8 @@ in { azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; + azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 1478e0082bb2de7b31cfd057390058c2ff644ad5 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:27:18 -0400 Subject: [PATCH 110/248] pythonPackages.azure-mgmt-containerinstance: init at 1.4.1 --- .../azure-mgmt-containerinstance/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix new file mode 100644 index 000000000000..e32182225f11 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-containerinstance"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "87919f3e618ec0a40fd163d763113eef908e78c50d8b76bf4dd795444cb069fd"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Container Instance Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-containerinstance; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 062c6188567b..1a274e77a2f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -302,6 +302,8 @@ in { azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; + azure-mgmt-containerinstance = callPackage ../development/python-modules/azure-mgmt-containerinstance { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From d67a687af87f2ed6c2b3797c756c087f084b2538 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:33:44 -0400 Subject: [PATCH 111/248] pythonPackages.azure-mgmt-containerservice: init at 5.3.0 --- .../azure-mgmt-containerservice/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-containerservice/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix new file mode 100644 index 000000000000..5e68ef2d3837 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-containerservice"; + version = "5.3.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1dhni22n85x76709mvjmby8i8hvginzniq1dna6f5cidfcalc0vs"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Container Service Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-containerservice; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a274e77a2f1..d1413a2c412b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -304,6 +304,8 @@ in { azure-mgmt-containerinstance = callPackage ../development/python-modules/azure-mgmt-containerinstance { }; + azure-mgmt-containerservice = callPackage ../development/python-modules/azure-mgmt-containerservice { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 6925685ecc713a5bdb724eb6241da8a88161bf71 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:34:43 -0400 Subject: [PATCH 112/248] pythonPackages.azure-mgmt-cosmosdb: init at 0.6.0 --- .../azure-mgmt-cosmosdb/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix new file mode 100644 index 000000000000..6741686b0d4e --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-cosmosdb"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0g4znanx540p983gzr55z0n0jyzfnzmnzlshl92hm4gldwjdd91d"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Cosmos DB Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-cosmosdb; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1413a2c412b..9f45892c859e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -306,6 +306,8 @@ in { azure-mgmt-containerservice = callPackage ../development/python-modules/azure-mgmt-containerservice { }; + azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 09c1cdd9ca1bd5900f680f07c9775865e759758c Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:35:30 -0400 Subject: [PATCH 113/248] pythonPackages.azure-mgmt-datafactory: init at 0.7.0 --- .../azure-mgmt-datafactory/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-datafactory/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix new file mode 100644 index 000000000000..7d028a61a550 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datafactory"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7a50da8415e316bd3be0c90ff7e2bffee2afb959aefea23b5923f22dd7094a37"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Factory Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datafactory; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f45892c859e..2c366e781504 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -308,6 +308,8 @@ in { azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; + azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From d2167a14188575c74b56385e17e29186fe7e34be Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:36:14 -0400 Subject: [PATCH 114/248] pythonPackages.azure-mgmt-datalake-analytics: init at 0.6.0 --- .../azure-mgmt-datalake-analytics/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix new file mode 100644 index 000000000000..31cfdf0e6d57 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-datalake-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datalake-analytics"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0d64c4689a67d6138eb9ffbaff2eda2bace7d30b846401673183dcb42714de8f"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-datalake-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Lake Analytics Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-analytics; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c366e781504..f4fd2a04baed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -310,6 +310,8 @@ in { azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; + azure-mgmt-datalake-analytics = callPackage ../development/python-modules/azure-mgmt-datalake-analytics { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 8150b33ef15fcddb1530d411a165a830233db631 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:36:55 -0400 Subject: [PATCH 115/248] pythonPackages.azure-mgmt-datalake-nspkg: init at 3.0.1 --- .../azure-mgmt-datalake-nspkg/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix new file mode 100644 index 000000000000..0df7d65374a8 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datalake-nspkg"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "deb192ba422f8b3ec272ce4e88736796f216f28ea5b03f28331d784b7a3f4880"; + }; + + propagatedBuildInputs = [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Lake Management namespace package"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-nspkg; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4fd2a04baed..e8e5dc5e4416 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -312,6 +312,8 @@ in { azure-mgmt-datalake-analytics = callPackage ../development/python-modules/azure-mgmt-datalake-analytics { }; + azure-mgmt-datalake-nspkg = callPackage ../development/python-modules/azure-mgmt-datalake-nspkg { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From f1a822058fd97800c5ed46af709304e3f4cfd82a Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:37:37 -0400 Subject: [PATCH 116/248] pythonPackages.azure-mgmt-datalake-store: init at 0.5.0 --- .../azure-mgmt-datalake-store/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix new file mode 100644 index 000000000000..ce28d0a77490 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-datalake-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datalake-store"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-datalake-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Lake Store Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datalake-store; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8e5dc5e4416..39ba7e1fb2c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -314,6 +314,8 @@ in { azure-mgmt-datalake-nspkg = callPackage ../development/python-modules/azure-mgmt-datalake-nspkg { }; + azure-mgmt-datalake-store = callPackage ../development/python-modules/azure-mgmt-datalake-store { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 7c81a1de3ca0903d048bb1cdeb0e73b7ed7068ea Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:38:15 -0400 Subject: [PATCH 117/248] pythonPackages.azure-mgmt-datamigration: init at 2.1.0 --- .../azure-mgmt-datamigration/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-datamigration/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix new file mode 100644 index 000000000000..26b900299772 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-datamigration"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "49e6e68093e2d647c1c54a4027dee5b1d57f7e7c21480ae386c55cb3d5fa14bc"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Data Migration Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-datamigration; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39ba7e1fb2c1..070cfae072e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -316,6 +316,8 @@ in { azure-mgmt-datalake-store = callPackage ../development/python-modules/azure-mgmt-datalake-store { }; + azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 27034c57dda3e40dd52eb80c24b0e49a4d7393bc Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:38:51 -0400 Subject: [PATCH 118/248] pythonPackages.azure-mgmt-devspaces: init at 0.1.0 --- .../azure-mgmt-devspaces/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-devspaces/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix new file mode 100644 index 000000000000..f5830f01ac9b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-devspaces"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "4710dd59fc219ebfa4272dbbad58bf62093b52ce22bfd32a5c0279d2149471b5"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Dev Spaces Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-devspaces; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 070cfae072e7..a5763fcdabc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -318,6 +318,8 @@ in { azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { }; + azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From d6e8770db812d7d67ed758b6ef7b7ecbf298a1bb Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:39:27 -0400 Subject: [PATCH 119/248] pythonPackages.azure-mgmt-devtestlabs: init at 3.0.0 --- .../azure-mgmt-devtestlabs/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix new file mode 100644 index 000000000000..f5d60a74b60e --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-devtestlabs"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure DevTestLabs Management Client Library"; + homepage = https://github.com/Azure/sdk-for-python/tree/master/azure-mgmt-devtestlabs; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5763fcdabc3..b54ded7e267d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -320,6 +320,8 @@ in { azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { }; + azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 1c61953e30de1e493569ca95cb8a7b6ede9a24b8 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:40:09 -0400 Subject: [PATCH 120/248] pythonPackages.azure-mgmt-dns: init at 2.1.0 --- .../python-modules/azure-mgmt-dns/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-dns/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix new file mode 100644 index 000000000000..6f802eb61444 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, python +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-dns"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "3730b1b3f545a5aa43c0fff07418b362a789eb7d81286e2bed90ffef88bfa5d0"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure DNS Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/dns?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b54ded7e267d..3c154baf9c21 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -322,6 +322,8 @@ in { azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { }; + azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From fcbd76193da1e60e6583e1261286bff5ee03f61d Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:40:50 -0400 Subject: [PATCH 121/248] pythonPackages.azure-mgmt-eventgrid: init at 2.0.0 --- .../azure-mgmt-eventgrid/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix new file mode 100644 index 000000000000..8887a8b27768 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-eventgrid"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "9a1da1085d39163b13dee14215b02f18eab93ede10ffe83dc6030ecf2163d2f1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure EventGrid Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-grid?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c154baf9c21..393b93bc8133 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -324,6 +324,8 @@ in { azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; + azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 0652652f9a9c3034858c2618403a5ac4eb8503c4 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:41:33 -0400 Subject: [PATCH 122/248] pythonPackages.azure-mgmt-eventhub: init at 2.6.0 --- .../azure-mgmt-eventhub/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-eventhub/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix new file mode 100644 index 000000000000..1c0c3c5a866b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-eventhub"; + version = "2.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure EventHub Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/event-hub?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 393b93bc8133..886e96ff8688 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -326,6 +326,8 @@ in { azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; + azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 977d109254e8249b2e899067828bdee9199ee033 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:42:15 -0400 Subject: [PATCH 123/248] pythonPackages.azure-mgmt-hanaonazure: init at 0.6.0 --- .../azure-mgmt-hanaonazure/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix new file mode 100644 index 000000000000..26247a7eb396 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-hanaonazure"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1spsy6g5z4nb1y1gfz0p1ykybi76qbig8j22zvmws59329b3br5h"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure SAP Hana on Azure Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/hanaonazure?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 886e96ff8688..1d181c5881bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -328,6 +328,8 @@ in { azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { }; + azure-mgmt-hanaonazure = callPackage ../development/python-modules/azure-mgmt-hanaonazure { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From ee699b77076a9ee1ac9c01639f3905a007cb8883 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:43:05 -0400 Subject: [PATCH 124/248] pythonPackages.azure-mgmt-iotcentral: init at 1.0.0 --- .../azure-mgmt-iotcentral/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix new file mode 100644 index 000000000000..9509911709be --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-iotcentral"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "9aac88ed1f993965015f4e9986931fc08798e09d7b864928681a7cebff053de8"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure IoTCentral Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/iot?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d181c5881bc..f86cb4f1930d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -330,6 +330,8 @@ in { azure-mgmt-hanaonazure = callPackage ../development/python-modules/azure-mgmt-hanaonazure { }; + azure-mgmt-iotcentral = callPackage ../development/python-modules/azure-mgmt-iotcentral { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From e3c2f073e0d68e9531959f78eb164e346162db67 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:43:37 -0400 Subject: [PATCH 125/248] pythonPackages.azure-mgmt-iothub: init at 0.8.2 --- .../azure-mgmt-iothub/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-iothub/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix new file mode 100644 index 000000000000..aac5ef06e914 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-iothub"; + version = "0.8.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure IoTHub Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/iot?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f86cb4f1930d..8fabe491fc3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -332,6 +332,8 @@ in { azure-mgmt-iotcentral = callPackage ../development/python-modules/azure-mgmt-iotcentral { }; + azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 2c5b10afa487323ece64e7066f27ca90556e968c Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:44:13 -0400 Subject: [PATCH 126/248] pythonPackages.azure-mgmt-iothubprovisioningservices: init at 0.2.0 --- .../default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix new file mode 100644 index 000000000000..502ddccd6670 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-iothubprovisioningservices"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure IoTHub Provisioning Services Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/iot?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8fabe491fc3a..987b1b65f276 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -334,6 +334,8 @@ in { azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; + azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From d412d0545717793ba449225951a53e4a851221c4 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:44:52 -0400 Subject: [PATCH 127/248] pythonPackages.azure-mgmt-keyvault: init at 1.1.0 --- .../azure-mgmt-keyvault/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-keyvault/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix new file mode 100644 index 000000000000..3b786cbf7600 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-keyvault"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "05a15327a922441d2ba32add50a35c7f1b9225727cbdd3eeb98bc656e4684099"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Key Vault Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/key-vault?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 987b1b65f276..17811e489592 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -336,6 +336,8 @@ in { azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From d169f956a7cf3ad39f1069e63898e817a4842aeb Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:45:23 -0400 Subject: [PATCH 128/248] pythonPackages.azure-mgmt-loganalytics: init at 0.2.0 --- .../azure-mgmt-loganalytics/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix new file mode 100644 index 000000000000..3473b6e86b4b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-loganalytics"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c7315ff0ee4d618fb38dca68548ef4023a7a20ce00efe27eb2105a5426237d86"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Log Analytics Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-loganalytics; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17811e489592..82f4627b8a9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -338,6 +338,8 @@ in { azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; + azure-mgmt-loganalytics = callPackage ../development/python-modules/azure-mgmt-loganalytics { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 4ddc3e954a3fd1945565f2f420afdc3e1f6e3065 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:45:58 -0400 Subject: [PATCH 129/248] pythonPackages.azure-mgmt-logic: init at 3.0.0 --- .../azure-mgmt-logic/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-logic/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix new file mode 100644 index 000000000000..2050e2904676 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-logic"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "d163dfc32e3cfa84f3f8131a75d9e94f5c4595907332cc001e45bf7e4efd5add"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Logic Apps Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/logic-apps?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82f4627b8a9a..6cb6f9715065 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -340,6 +340,8 @@ in { azure-mgmt-loganalytics = callPackage ../development/python-modules/azure-mgmt-loganalytics { }; + azure-mgmt-logic = callPackage ../development/python-modules/azure-mgmt-logic { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; From 75a0b554f6192c53b716d99a1fd3d37a7ac5a626 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:47:34 -0400 Subject: [PATCH 130/248] pythonPackages.azure-mgmt-machinelearningcompute: init at 0.4.1 --- .../default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +++--- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix new file mode 100644 index 000000000000..a68f7e438586 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-machinelearningcompute"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7a52f85591114ef33a599dabbef840d872b7f599b7823e596af9490ec51b873f"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Machine Learning Compute Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-machinelearningcompute; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cb6f9715065..24d53c4d5406 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -278,6 +278,10 @@ in { azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; + azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; azure-mgmt-applicationinsights = callPackage ../development/python-modules/azure-mgmt-applicationinsights { }; @@ -296,8 +300,6 @@ in { azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { }; - azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; - azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; @@ -342,9 +344,9 @@ in { azure-mgmt-logic = callPackage ../development/python-modules/azure-mgmt-logic { }; - azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; + azure-mgmt-machinelearningcompute = callPackage ../development/python-modules/azure-mgmt-machinelearningcompute { }; - azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From 58a2e1ea3a74cf3f81550ab2d45bfb5cb8dab06b Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:48:16 -0400 Subject: [PATCH 131/248] pythonPackages.azure-mgmt-managementgroups: init at 0.2.0 --- .../azure-mgmt-managementgroups/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix new file mode 100644 index 000000000000..03faf442cbdd --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-managementgroups"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "3d5237947458dc94b4a392141174b1c1258d26611241ee104e9006d1d798f682"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Management Groups Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-managementgroups; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24d53c4d5406..d031c5d6bf18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -346,6 +346,8 @@ in { azure-mgmt-machinelearningcompute = callPackage ../development/python-modules/azure-mgmt-machinelearningcompute { }; + azure-mgmt-managementgroups = callPackage ../development/python-modules/azure-mgmt-managementgroups { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From b9b15c5f89f3d165d29b28405bc89ba6e8921f3d Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:49:00 -0400 Subject: [PATCH 132/248] pythonPackages.azure-mgmt-managementpartner: init at 0.1.1 --- .../azure-mgmt-managementpartner/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix new file mode 100644 index 000000000000..be1ddc49a491 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-managementpartner"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1bvcmx7dkf2adi26z7c2ga63ggpzdfqj8q1gzcic1yn03v6nb8i7"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure ManagementPartner Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-managementpartner; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d031c5d6bf18..377b4eb48238 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -348,6 +348,8 @@ in { azure-mgmt-managementgroups = callPackage ../development/python-modules/azure-mgmt-managementgroups { }; + azure-mgmt-managementpartner = callPackage ../development/python-modules/azure-mgmt-managementpartner { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From de4d5fc86faf40aeb74acd45911ffcde8aaef021 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:49:32 -0400 Subject: [PATCH 133/248] pythonPackages.azure-mgmt-maps: init at 0.1.0 --- .../azure-mgmt-maps/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-maps/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix new file mode 100644 index 000000000000..b1e373173d25 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-maps"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c120e210bb61768da29de24d28b82f8d42ae24e52396eb6569b499709e22f006"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Maps Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-maps; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 377b4eb48238..ebceefb80448 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -350,6 +350,8 @@ in { azure-mgmt-managementpartner = callPackage ../development/python-modules/azure-mgmt-managementpartner { }; + azure-mgmt-maps = callPackage ../development/python-modules/azure-mgmt-maps { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From f0a784a83f49f69f77b4a9092022c6ef5c180035 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:50:14 -0400 Subject: [PATCH 134/248] pythonPackages.azure-mgmt-marketplaceordering: init at 0.2.1 --- .../default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix new file mode 100644 index 000000000000..8995f43a08b6 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-marketplaceordering"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dc765cde7ec03efe456438c85c6207c2f77775a8ce8a7adb19b0df5c5dc513c2"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Market Place Ordering Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-marketplaceordering; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebceefb80448..3819e080ca41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -352,6 +352,8 @@ in { azure-mgmt-maps = callPackage ../development/python-modules/azure-mgmt-maps { }; + azure-mgmt-marketplaceordering = callPackage ../development/python-modules/azure-mgmt-marketplaceordering { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From 92425a94b1536054e97cfcf78674a783fa990435 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:50:48 -0400 Subject: [PATCH 135/248] pythonPackages.azure-mgmt-media: init at 1.1.1 --- .../azure-mgmt-media/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-media/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix new file mode 100644 index 000000000000..5061fa90ae81 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-media"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "5d0c6b3a0f882dde8ae3d42467f03ea6c4e3f62613936087d54c67e6f504939b"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Media Services Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/media-services?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3819e080ca41..2bf0a9a5bf32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -354,6 +354,8 @@ in { azure-mgmt-marketplaceordering = callPackage ../development/python-modules/azure-mgmt-marketplaceordering { }; + azure-mgmt-media = callPackage ../development/python-modules/azure-mgmt-media { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From 9977c6cf19e35557f0f95fb51368922e4cbfa377 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:51:26 -0400 Subject: [PATCH 136/248] pythonPackages.azure-mgmt-monitor: init at 0.6.0 --- .../azure-mgmt-monitor/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-monitor/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix new file mode 100644 index 000000000000..0a6f045dc4b7 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-monitor"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "5a804dae2c3e31bfd6f1b0482d49761b9a56f7eefa9b190cd76ef5fe1d504ef2"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Monitor Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/monitoring?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bf0a9a5bf32..b860a0057dfc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -356,6 +356,8 @@ in { azure-mgmt-media = callPackage ../development/python-modules/azure-mgmt-media { }; + azure-mgmt-monitor = callPackage ../development/python-modules/azure-mgmt-monitor { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From 628d735751d99811fd3327951b78aab3012af8c3 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:51:56 -0400 Subject: [PATCH 137/248] pythonPackages.azure-mgmt-msi: init at 1.0.0 --- .../python-modules/azure-mgmt-msi/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-msi/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix new file mode 100644 index 000000000000..63ebbb298f2c --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-msi"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0n4gbwk843z66hhpcp1kcrnwqkzygbbc2ma01r9asgfv4nmklvyl"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure MSI Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-msi; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b860a0057dfc..b0752e1fd420 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -358,6 +358,8 @@ in { azure-mgmt-monitor = callPackage ../development/python-modules/azure-mgmt-monitor { }; + azure-mgmt-msi = callPackage ../development/python-modules/azure-mgmt-msi { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; From b044c8e1e696f44f9c1a2a2111e6929b68b2c0a8 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:53:30 -0400 Subject: [PATCH 138/248] pythonPackages.azure-mgmt-notificationhubs: init at 2.1.0 --- .../azure-mgmt-notificationhubs/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix new file mode 100644 index 000000000000..0629eb07b661 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-notificationhubs"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "10w53ida2nlx73vd1pczh4mkpg0lag1h19yyklx3yvgsyvahj25h"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Notification Hubs Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/notification-hubs?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0752e1fd420..9cb32d5d4ee3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -362,6 +362,8 @@ in { azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; + azure-mgmt-notificationhubs = callPackage ../development/python-modules/azure-mgmt-notificationhubs { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From efa438331f0cfbf5603ad728b248099f91ee836d Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:54:37 -0400 Subject: [PATCH 139/248] pythonPackages.azure-mgmt-policyinsights: init at 0.3.1 --- .../azure-mgmt-policyinsights/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix new file mode 100644 index 000000000000..b57146afe3e9 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-policyinsights"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "b27f5ac367b69e225ab02fa2d1ea20cbbfe948ff43b0af4698cd8cbde0063908"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Policy Insights Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/policy?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cb32d5d4ee3..67c8ec316a9e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -364,6 +364,8 @@ in { azure-mgmt-notificationhubs = callPackage ../development/python-modules/azure-mgmt-notificationhubs { }; + azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From 0b5759cd31ed127665662517654cee23813de049 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:55:13 -0400 Subject: [PATCH 140/248] pythonPackages.azure-mgmt-powerbiembedded: init at 2.0.0 --- .../azure-mgmt-powerbiembedded/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix new file mode 100644 index 000000000000..c946bb7ab36c --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-powerbiembedded"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "2f05be73f2a086c579a78fc900e3b2ae14ccde5bcec54e29dfc73e626b377476"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Power BI Embedded Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/power-bi?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67c8ec316a9e..c545eff5af5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -366,6 +366,8 @@ in { azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { }; + azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From 747d59e6b364a9dbddc31149019afb8c0d761866 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:55:49 -0400 Subject: [PATCH 141/248] pythonPackages.azure-mgmt-rdbms: init at 1.8.0 --- .../azure-mgmt-rdbms/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-rdbms/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix new file mode 100644 index 000000000000..881727e383ba --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-rdbms"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "40abbe4f9c59d7906594ceed067d0e7d09fef44be0d16aded5d5717f1a8aa5ea"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure RDBMS Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-rdbms; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c545eff5af5c..f74daabc7f52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -368,6 +368,8 @@ in { azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { }; + azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From e3a5ef136c7d8cc86206c5ec99de1cffe03d7492 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:56:23 -0400 Subject: [PATCH 142/248] pythonPackages.azure-mgmt-recoveryservices: init at 0.4.0 --- .../azure-mgmt-recoveryservices/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix new file mode 100644 index 000000000000..5e4a500ce3be --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-recoveryservices"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "e1e794760232239f8a9328d5de1740565ff70d1612a2921c9609746ba5671e6c"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Recovery Services Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/recoveryservices?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f74daabc7f52..2374db8335ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -370,6 +370,8 @@ in { azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { }; + azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From d52b290a28069fa9a57db4290753380bcb1c6da8 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:56:53 -0400 Subject: [PATCH 143/248] pythonPackages.azure-mgmt-recoveryservicesbackup: init at 0.3.0 --- .../default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix new file mode 100644 index 000000000000..49247e878011 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-recoveryservicesbackup"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1e55b6cbb808df83576cef352ba0065f4878fe505299c0a4c5a97f4f1e5793df"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/recovery-services-backup?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2374db8335ad..b42d434bf7ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -372,6 +372,8 @@ in { azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; + azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From 6730fb4fcb0cb3faa197aa136f7c949ce93ab608 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:57:44 -0400 Subject: [PATCH 144/248] pythonPackages.azure-mgmt-redis: init at 6.0.0 --- .../azure-mgmt-redis/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-redis/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix new file mode 100644 index 000000000000..21cdfbafc922 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-redis"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "db999e104edeee3a13a8ceb1881e15196fe03a02635e0e20855eb52c1e2ecca1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Redis Cache Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/redis?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b42d434bf7ee..40dc350a5bf0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -374,6 +374,8 @@ in { azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From b7a690c16493b4b5654ae65fba2b83de2bdce925 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:58:13 -0400 Subject: [PATCH 145/248] pythonPackages.azure-mgmt-relay: init at 0.2.0 --- .../azure-mgmt-relay/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-relay/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix new file mode 100644 index 000000000000..a3491356c9aa --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-relay"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0s5z4cil750wn770m0hdzcrpshj4bj1bglkkvxdx9l9054dk9s57"; + }; + + propagatedBuildInputs = [ + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Relay Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/relay?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40dc350a5bf0..fa337fb6624a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -376,6 +376,8 @@ in { azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; + azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From e1f894b0de9fd5452711935c159bce2d2a2715ae Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:58:55 -0400 Subject: [PATCH 146/248] pythonPackages.azure-mgmt-reservations: init at 0.3.2 --- .../azure-mgmt-reservations/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-reservations/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix new file mode 100644 index 000000000000..be00d4aa418c --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-reservations"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0nksxjh5kh09dr0zw667fg8mzik4ymvfq3dipwag6pynbqr9ls4l"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Reservations Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-reservations; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa337fb6624a..7aea6bc12218 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -378,6 +378,8 @@ in { azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { }; + azure-mgmt-reservations = callPackage ../development/python-modules/azure-mgmt-reservations { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From e70d8d9802b4dfdd70f930bef7ff5bb7c10cab2d Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 18:59:39 -0400 Subject: [PATCH 147/248] pythonPackages.azure-mgmt-scheduler: init at 2.0.0 --- .../azure-mgmt-scheduler/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-scheduler/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix new file mode 100644 index 000000000000..a25b81aa5fab --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-scheduler"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "c6e6edd386ddc4c21d54b1497c3397b970bc127b71809b51bd2391cb1f3d1a14"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Scheduler Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/scheduler?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7aea6bc12218..b870382cd679 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -382,6 +382,8 @@ in { azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; + azure-mgmt-scheduler = callPackage ../development/python-modules/azure-mgmt-scheduler { }; + azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; backports_csv = callPackage ../development/python-modules/backports_csv {}; From d98b22b1742597aa7df72f460b2cfc6d1861b3bd Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:00:07 -0400 Subject: [PATCH 148/248] pythonPackages.azure-mgmt-search: init at 2.0.0 --- .../azure-mgmt-search/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-search/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix new file mode 100644 index 000000000000..6ae9693e7f5c --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-search"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0ec5de861bd786bcb8691322feed6e6caa8d2f0806a50dc0ca5d640591926893"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Search Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/search?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b870382cd679..3248680dc366 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -384,6 +384,8 @@ in { azure-mgmt-scheduler = callPackage ../development/python-modules/azure-mgmt-scheduler { }; + azure-mgmt-search = callPackage ../development/python-modules/azure-mgmt-search { }; + azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; backports_csv = callPackage ../development/python-modules/backports_csv {}; From 0795e4b362d2f69bfc729d52ff998fbce59a5247 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:00:42 -0400 Subject: [PATCH 149/248] pythonPackages.azure-mgmt-servicebus: init at 0.6.0 --- .../azure-mgmt-servicebus/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-servicebus/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix new file mode 100644 index 000000000000..e5b35e538eef --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-servicebus"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f20920b8fb119ef4abeda4d2dac765a4fc48cd0bcf30c27f8c4cc6d890bc08b1"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Bus Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/servicebus?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3248680dc366..2f8949cf0c96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -386,6 +386,8 @@ in { azure-mgmt-search = callPackage ../development/python-modules/azure-mgmt-search { }; + azure-mgmt-servicebus = callPackage ../development/python-modules/azure-mgmt-servicebus { }; + azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; backports_csv = callPackage ../development/python-modules/backports_csv {}; From abb0852c861b0e16ccdac2c0533a61633c7549bc Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:01:14 -0400 Subject: [PATCH 150/248] pythonPackages.azure-mgmt-servicefabric: init at 0.2.0 --- .../azure-mgmt-servicefabric/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix new file mode 100644 index 000000000000..54c695a5079a --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-servicefabric"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "b2bf2279b8ff8450c35e78e226231655021482fdbda27db09975ebfc983398ad"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Fabric Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/servicefabric?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f8949cf0c96..b478fc182cbe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -386,6 +386,8 @@ in { azure-mgmt-search = callPackage ../development/python-modules/azure-mgmt-search { }; + azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { }; + azure-mgmt-servicebus = callPackage ../development/python-modules/azure-mgmt-servicebus { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From f71c40a4b1f441dfa77f868ab0c93a235e2ec95c Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:02:38 -0400 Subject: [PATCH 151/248] pythonPackages.azure-mgmt-signalr: init at 0.1.1 --- .../azure-mgmt-signalr/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/azure-mgmt-signalr/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix new file mode 100644 index 000000000000..d1671e02ec11 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +}: + +buildPythonPackage rec { + pname = "azure-mgmt-signalr"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "8a6266a59a5c69102e274806ccad3ac74b06fd2c226e16426bbe248fc2174903"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure SignalR Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-signalr; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b478fc182cbe..e157a86c964a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -386,9 +386,11 @@ in { azure-mgmt-search = callPackage ../development/python-modules/azure-mgmt-search { }; + azure-mgmt-servicebus = callPackage ../development/python-modules/azure-mgmt-servicebus { }; + azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { }; - azure-mgmt-servicebus = callPackage ../development/python-modules/azure-mgmt-servicebus { }; + azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { }; azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; From 7ff677c231ca2694cfb6b79049ce8a2b7618576e Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:03:34 -0400 Subject: [PATCH 152/248] pythonPackages.azure-mgmt-sql: init at 0.12.0 --- .../python-modules/azure-mgmt-sql/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-sql/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix new file mode 100644 index 000000000000..913eb150224f --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-sql"; + version = "0.12.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "8399702e9d1836f3b040ce0c93d8dc089767d66edb9224a3b8a6c9ab7e8ff01f"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure SQL Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/sql?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e157a86c964a..abb024e1f67a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -392,6 +392,8 @@ in { azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { }; + azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { }; + azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; backports_csv = callPackage ../development/python-modules/backports_csv {}; From a85b7c99db392fdfa3acc35484302f4905fdc7fb Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:04:08 -0400 Subject: [PATCH 153/248] pythonPackages.azure-mgmt-subscription: init at 0.3.0 --- .../azure-mgmt-subscription/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-subscription/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix new file mode 100644 index 000000000000..d19aba5fbc2d --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-subscription"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7a095fe46e598210b178e1059bba82eb02f3b8a7f44f3791442ff7d9ff323d2b"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Subscription Management Client Library"; + homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-mgmt-subscription; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abb024e1f67a..75faf48b847c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -396,6 +396,8 @@ in { azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; + azure-mgmt-subscription = callPackage ../development/python-modules/azure-mgmt-subscription { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; From af56054c8edf9eac32b685b2cbccbcdec47bce6f Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:04:47 -0400 Subject: [PATCH 154/248] pythonPackages.azure-mgmt-trafficmanager: init at 0.51.0 --- .../azure-mgmt-trafficmanager/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix new file mode 100644 index 000000000000..87b0603877b7 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-trafficmanager"; + version = "0.51.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "fc8ae77022cfe52fda4379a2f31e0b857574d536e41291a7b569b5c0f4104186"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Traffic Manager Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/traffic-manager?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75faf48b847c..91dbeca1a9f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -398,6 +398,8 @@ in { azure-mgmt-subscription = callPackage ../development/python-modules/azure-mgmt-subscription { }; + azure-mgmt-trafficmanager = callPackage ../development/python-modules/azure-mgmt-trafficmanager { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; From b2c15051328f9a6d94aab5892cea8d7f2724a8f8 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Mon, 29 Apr 2019 19:05:16 -0400 Subject: [PATCH 155/248] pythonPackages.azure-mgmt-web: init at 0.41.0 --- .../python-modules/azure-mgmt-web/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-web/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix new file mode 100644 index 000000000000..f2beeb99ffb2 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msrest +, msrestazure +, azure-common +, azure-mgmt-nspkg +, isPy3k +}: + +buildPythonPackage rec { + pname = "azure-mgmt-web"; + version = "0.41.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "5f170f25c72119ff4b4e2f39d46ce21bdb2f399f786ea24eedc15c12cfba3054"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ] ++ lib.optionals (!isPy3k) [ + azure-mgmt-nspkg + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Web Apps Management Client Library"; + homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/webapps?view=azure-python; + license = licenses.mit; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91dbeca1a9f6..7ac3d14289b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -400,6 +400,8 @@ in { azure-mgmt-trafficmanager = callPackage ../development/python-modules/azure-mgmt-trafficmanager { }; + azure-mgmt-web = callPackage ../development/python-modules/azure-mgmt-web { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; From ddb3d34d882a562cf9047795e58dee246bc5629e Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Tue, 30 Apr 2019 12:37:05 -0400 Subject: [PATCH 156/248] pythonPackages.azure-mgmt-nspkg: refactor metadata points to GitHub --- .../python-modules/azure-mgmt-nspkg/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index cf977539d5d2..8adb60e99aae 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , azure-nspkg +, python +, isPy3k }: buildPythonPackage rec { @@ -16,10 +18,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-nspkg ]; + doCheck = false; + meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://github.com/Azure/azure-sdk-for-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From e0c1e74805e979b8be0222092cc2be2a4ebac548 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Tue, 30 Apr 2019 12:38:09 -0400 Subject: [PATCH 157/248] pythonPackages.azure-nspkg: refactor updated license and homepage --- .../python-modules/azure-nspkg/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix index f95db7b1c59c..bb1cb41f3418 100644 --- a/pkgs/development/python-modules/azure-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-nspkg/default.nix @@ -1,6 +1,8 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi +, python +, isPy3k }: buildPythonPackage rec { @@ -13,10 +15,12 @@ buildPythonPackage rec { sha256 = "e7d3cea6af63e667d87ba1ca4f8cd7cb4dfca678e4c55fc1cedb320760e39dd0"; }; - meta = with pkgs.lib; { + doCheck = false; + + meta = with lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; + homepage = https://github.com/Azure/azure-sdk-for-python; + license = licenses.mit; + maintainers = with maintainers; [ olcai mwilsoninsight ]; }; } From 4049da4b074b17c78a5ef0f3147bba4e62d15ed1 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Tue, 21 May 2019 14:12:38 -0400 Subject: [PATCH 158/248] pythonPackages.msrest: refactor --- .../python-modules/msrest/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index ba3dd00bfe49..4b6a617c0187 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy3k , requests , requests_oauthlib @@ -21,9 +21,13 @@ buildPythonPackage rec { version = "0.6.8"; pname = "msrest"; - src = fetchPypi { - inherit pname version; - sha256 = "0yd43fnmfxkvk3idkyn67ziwjgkwkn261kicr3szjibpqjqcpsf9"; + # no tests in PyPI tarball + # see https://github.com/Azure/msrest-for-python/pull/152 + src = fetchFromGitHub { + owner = "Azure"; + repo = "msrest-for-python"; + rev = "v${version}"; + sha256 = "1vnh0y68vqf7hwhghbf6bjadrzlv98aj4vfz6g592lww3ijpy77w"; }; propagatedBuildInputs = [ @@ -42,8 +46,8 @@ buildPythonPackage rec { meta = with lib; { description = "The runtime library 'msrest' for AutoRest generated Python clients."; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; + homepage = https://github.com/Azure/msrest-for-python; license = licenses.mit; - maintainers = with maintainers; [ bendlas jonringer ]; + maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ]; }; } From c91c387a9eaf862a6ed256b6be2530d83e0450e5 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Tue, 21 May 2019 14:24:33 -0400 Subject: [PATCH 159/248] pythonPackages.azure-mgmt-network: 2.6.0 -> 2.7.0 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 29266aea7ee2..ad730774c5e5 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.6.0"; + version = "2.7.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0166646703389374736cbe045ffb874e08796407ea0b1b5d441143b054a47e09"; + sha256 = "04z9f0nd2nh5miw81qahqrrz998l4yd328qcyx7bxg42a5f5v5jp"; }; postInstall = if isPy3k then "" else '' From 5995755b68e16ed8ae594a3b2c350013af91520c Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 16 Jul 2019 14:39:54 -0700 Subject: [PATCH 160/248] pythonPackages.trio: disable the tests on Darwin --- pkgs/development/python-modules/trio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index f76939603d38..bc9837dc23c8 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -9,6 +9,7 @@ , pyopenssl , trustme , sniffio +, stdenv , jedi , pylint }: @@ -37,6 +38,9 @@ buildPythonPackage rec { sniffio ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + # tests are failing on Darwin + doCheck = !stdenv.isDarwin; + meta = { description = "An async/await-native I/O library for humans and snake people"; homepage = https://github.com/python-trio/trio; From 736f645da1ec45dc80961d3a3d7b94bb652f2614 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 16 Jul 2019 14:41:42 -0700 Subject: [PATCH 161/248] pythonPackages.uamqp: fix the build on Darwin --- pkgs/development/python-modules/uamqp/default.nix | 15 ++++++++++----- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index b7f244730b1c..ff0c61c5e077 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -1,12 +1,15 @@ -{ lib +{ CFNetwork +, Security , buildPythonPackage -, fetchPypi -, cmake -, openssl -, six , certifi +, cmake , enum34 +, fetchPypi , isPy3k +, lib +, openssl +, stdenv +, six }: buildPythonPackage rec { @@ -24,6 +27,8 @@ buildPythonPackage rec { six ] ++ lib.optionals (!isPy3k) [ enum34 + ] ++ lib.optionals stdenv.isDarwin [ + CFNetwork Security ]; nativeBuildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ac3d14289b5..2a8133108659 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1138,7 +1138,9 @@ in { toggl-cli = callPackage ../development/python-modules/toggl-cli { }; - uamqp = callPackage ../development/python-modules/uamqp { }; + uamqp = callPackage ../development/python-modules/uamqp { + inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; + }; unifi = callPackage ../development/python-modules/unifi { }; From af372747439918007ef9feb6c84d26df71754920 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Tue, 16 Jul 2019 15:58:20 -0700 Subject: [PATCH 162/248] pythonPackages.filebytes: 0.9.20 -> 0.9.21 --- pkgs/development/python-modules/filebytes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index b02ff0c74579..7102e5d73c41 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "filebytes"; - version = "0.9.20"; + version = "0.9.21"; src = fetchPypi { inherit pname version; - sha256 = "6c33986ca048e49cf1a5e2f167af9f02c7f866576b3b91a8a9124d32e57f935d"; + sha256 = "09e306feafd435e240b6ca22e6319ce51862dbe99e3481368fc9a2d15d2263d5"; }; meta = with stdenv.lib; { From e871d5466a0f5d6cd3068671b407d1bd4dd91937 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 17:55:50 -0700 Subject: [PATCH 163/248] strace: 5.1 -> 5.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/strace/versions --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 49b12b60b146..acdc712786f5 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "5.1"; + version = "5.2"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "12wsga1v3rab24gr0mpfip7j7gwr90m8f9h6fviqxa3xgnwl38zm"; + sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 908807bb53609e74a412149b2a1ca204cd488144 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 18:42:52 -0700 Subject: [PATCH 164/248] gitAndTools.subgit: 3.3.6 -> 3.3.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/subgit/versions --- .../version-management/git-and-tools/subgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index a129e0f75272..6866418f3e3e 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.6"; + name = "subgit-3.3.7"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://subgit.com/download/${name}.zip"; - sha256 = "1zfhl583lx7xdw9jwskv25p6m385wm3s5a311y0hnxxqwkjbgq1j"; + sha256 = "1cpssmvp961kw8s3b9s9bv9jmsm1gk3napggw5810c4rnnihjvrn"; }; } From de99f286112b2d4f2ba37827e27515b0a0099448 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 16 Jul 2019 11:44:45 -0700 Subject: [PATCH 165/248] git-crypt: include man pages in output --- .../git-and-tools/git-crypt/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 6a39f1fe3d1f..ec6e8d8d918c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,4 +1,6 @@ -{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv }: +{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv +, libxslt, docbook_xsl +}: stdenv.mkDerivation rec { name = "git-crypt-${version}"; @@ -12,6 +14,8 @@ stdenv.mkDerivation rec { inherit name; }; + nativeBuildInputs = [ libxslt ]; + buildInputs = [ openssl makeWrapper ]; patchPhase = '' @@ -19,9 +23,14 @@ stdenv.mkDerivation rec { --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"' ''; - installPhase = '' - make install PREFIX=$out - wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin + makeFlags = [ + "PREFIX=${placeholder ''out''}" + "ENABLE_MAN=yes" + "DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl" + ]; + + postFixup = '' + wrapProgram $out/bin/git-crypt --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin ''; meta = with stdenv.lib; { From 1e9373cb594ca1f2de9e9ddd84f38cdb51b2447b Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 16 Jul 2019 18:57:45 -0700 Subject: [PATCH 166/248] git-crypt: pname --- .../version-management/git-and-tools/git-crypt/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index ec6e8d8d918c..abb09ff9a45e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -3,15 +3,14 @@ }: stdenv.mkDerivation rec { - name = "git-crypt-${version}"; + pname = "git-crypt"; version = "0.6.0"; src = fetchFromGitHub { owner = "AGWA"; - repo = "git-crypt"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; - inherit name; }; nativeBuildInputs = [ libxslt ]; From 756760b216f0707ba8e539474ae52acb973c9dd1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 20:19:34 -0700 Subject: [PATCH 167/248] vips: 8.8.0 -> 8.8.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vips/versions --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index f5311d378d7e..db06c2a1588a 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.8.0"; + version = "8.8.1"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "17wz4rxn3jb171lrh8v3dxiykjhzwwzs5r7ly651dspcbi6s3r6c"; + sha256 = "1wnfn92rvafx1g9vvhbvxssifzydx9y95kszg6i4c1p5sv5nhfd2"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From 620ee144d90daa6bf97df9699c239bf1d5a5efbc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Jul 2019 00:00:00 -0500 Subject: [PATCH 168/248] gitAndTools.git-absorb: 0.4.0 -> 0.5.0 --- .../version-management/git-and-tools/git-absorb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 509fc73a3f35..169315d1e2ef 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "1clmd1b90vppbzng1kq0vzfh7964m3fk64q6h1vfcd1cfqj63r5v"; + sha256 = "0lggv3knh6iglkh8x2zqvqcs3dlwfsdiclg7pmdrycny72la4k2j"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "0q40qcki49dw23n3brgdz5plvigmsf61jm0kfy48j89mijih8zy7"; + cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd"; meta = with stdenv.lib; { homepage = "https://github.com/tummychow/git-absorb"; From f19bc96592acfeebe9f25d6c7ca3a40d55670cfd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 18:18:09 -0700 Subject: [PATCH 169/248] termtosvg: 0.8.0 -> 0.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/termtosvg/versions --- pkgs/tools/misc/termtosvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index eb46f12c5c2c..f3a482baa480 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "termtosvg"; - version = "0.8.0"; + version = "0.9.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "e3a0a7bd511028c96d242525df807a23e6f22e55b111a7ee861f294a86224b0c"; + sha256 = "1mf2vlq083mzhja449il78zpvjq6fv36pzakwrqmgxdjbsdyvxbd"; }; - propagatedBuildInputs = with python3Packages; [ lxml pyte ]; + propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ]; meta = with lib; { homepage = https://nbedos.github.io/termtosvg/; From e48aa067ade8658b2ddaedbc3b59c9d8e32b521d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 02:10:56 -0700 Subject: [PATCH 170/248] python37Packages.phonenumbers: 8.10.12 -> 8.10.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-phonenumbers/versions --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f30a73be8fb3..b86706bef081 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.12"; + version = "8.10.15"; src = fetchPypi { inherit pname version; - sha256 = "708c19860afb05085d5fe91b52fcbce9e1be3c020fe8c9b6f6d028879f5a7d5e"; + sha256 = "617b9127dc6fd29765ca122915d3b603131446a76a587deed0b92c8db53963fe"; }; meta = { From 99e72dc4133b600ba6a554cd2b0d890fa4f39bbf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 31 Dec 2018 15:28:20 +0100 Subject: [PATCH 171/248] =?UTF-8?q?pytrainer:=201.12.1=20=E2=86=92=202.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/pytrainer/default.nix | 87 ++++++++++++------- .../misc/pytrainer/fix-paths.patch | 11 +++ .../misc/pytrainer/fix-test-tz.patch | 45 ---------- .../misc/pytrainer/pytrainer-webkit.patch | 14 --- 4 files changed, 69 insertions(+), 88 deletions(-) create mode 100644 pkgs/applications/misc/pytrainer/fix-paths.patch delete mode 100644 pkgs/applications/misc/pytrainer/fix-test-tz.patch delete mode 100644 pkgs/applications/misc/pytrainer/pytrainer-webkit.patch diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index cdeca96568df..7c560cacda12 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,38 +1,45 @@ -{ stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel -, withWebKit ? false }: +{ stdenv +, fetchFromGitHub +, perl +, python3 +, sqlite +, gpsbabel +, gnome3 +, gobject-introspection +, wrapGAppsHook +, gtk3 +, xvfb_run +, webkitgtk +, glib-networking +, glibcLocales +, tzdata +, substituteAll +}: let - - # Pytrainer needs a matplotlib with GTK backend. Also ensure we are - # using the pygtk with glade support as needed by pytrainer. - matplotlibGtk = python.pkgs.matplotlib.override { - enableGtk2 = true; - pygtk = python.pkgs.pyGtkGlade; + # Pytrainer needs a matplotlib with GTK backend. + matplotlibGtk = python3.pkgs.matplotlib.override { + enableGtk3 = true; }; in -python.pkgs.buildPythonApplication rec { - name = "pytrainer-${version}"; - version = "1.12.1"; +python3.pkgs.buildPythonApplication rec { + pname = "pytrainer"; + version = "2.0.0"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx"; + sha256 = "1w5z1xwb2g6j2izm89b7lv9n92r1zhsr8bglxcn7jc5gwbvwysvd"; }; - namePrefix = ""; - patches = [ - # The test fails in the UTC timezone and C locale. - ./fix-test-tz.patch - - # The existing use of pywebkitgtk shows raw HTML text instead of - # map. This patch solves the problems by showing the file from a - # string, which allows setting an explicit MIME type. - ./pytrainer-webkit.patch + (substituteAll { + src = ./fix-paths.patch; + perl = "${perl}/bin/perl"; + }) ]; postPatch = '' @@ -40,18 +47,40 @@ python.pkgs.buildPythonApplication rec { --replace "'mysqlclient'," "" ''; - propagatedBuildInputs = with python.pkgs; [ - dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2 - ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; + propagatedBuildInputs = with python3.pkgs; [ + dateutil + lxml + matplotlibGtk + pygobject3 + sqlalchemy + sqlalchemy_migrate + psycopg2 + requests + certifi + ]; - buildInputs = [ perl gpsbabel sqlite ]; + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + xvfb_run + ]; - # This package contains no binaries to patch or strip. - dontPatchELF = true; - dontStrip = true; + buildInputs = [ + gpsbabel + sqlite + gtk3 + webkitgtk + glib-networking + glibcLocales + gnome3.adwaita-icon-theme + ]; checkPhase = '' - ${python.interpreter} -m unittest discover + env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \ + TZ=Europe/Kaliningrad \ + LC_ALL=en_US.UTF-8 \ + xvfb-run -s '-screen 0 800x600x24' \ + ${python3.interpreter} setup.py test ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pytrainer/fix-paths.patch b/pkgs/applications/misc/pytrainer/fix-paths.patch new file mode 100644 index 000000000000..7781f5aa4bed --- /dev/null +++ b/pkgs/applications/misc/pytrainer/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/imports/file_garminfit.py ++++ b/imports/file_garminfit.py +@@ -81,7 +81,7 @@ + logging.debug(">>") + result = False + try: +- result = subprocess.check_output(["perl", ++ result = subprocess.check_output(["@perl@", + self.main_data_path+"plugins/garmin-fit/bin/fit2tcx", + filename]) + except subprocess.CalledProcessError: diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch deleted file mode 100644 index ca4875769013..000000000000 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py ---- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100 -+++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100 -@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase): - self.assertEquals(self.activity.time, self.activity.duration) - - def test_activity_starttime(self): -- self.assertEquals(self.activity.starttime, '12:58:23 PM') -+ self.assertEquals(self.activity.starttime, '12:58:23') - - def test_activity_time_tuple(self): - self.assertEquals(self.activity.time_tuple, (2, 3, 46)) -diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py ---- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100 -+++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100 -@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase) - self.fail() - - def test_workout_summary(self): -- summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] -+ summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] - try: - current_path = os.path.dirname(os.path.abspath(__file__)) - data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" -@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase) - self.fail() - - def test_summary_in_database(self): -- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] -+ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] - activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') - self.ddbb.session.add(activity) - self.ddbb.session.commit( -diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py ---- source.orig/pytrainer/test/lib/test_date.py 2018-05-10 21:15:22.196275555 +0200 -+++ source/pytrainer/test/lib/test_date.py 2018-05-10 21:22:43.647870401 +0200 -@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase - def test_getDateTime(self): - utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') - self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime) -- self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime) -+ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime) - - class DateRangeTest(unittest.TestCase): - diff --git a/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch b/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch deleted file mode 100644 index 0f894c46a53b..000000000000 --- a/pkgs/applications/misc/pytrainer/pytrainer-webkit.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurp pytrainer-1.10.0-orig/pytrainer/extensions/mapviewer.py pytrainer-1.10.0/pytrainer/extensions/mapviewer.py ---- pytrainer-1.10.0-orig/pytrainer/extensions/mapviewer.py 2013-03-31 12:28:29.000000000 +0200 -+++ pytrainer-1.10.0/pytrainer/extensions/mapviewer.py 2014-12-22 11:44:44.367032126 +0100 -@@ -46,7 +46,9 @@ class MapViewer: - logging.debug(">>") - if htmlfile is None: - htmlfile = self.createErrorHtml() -- self.wkview.load_uri("file://%s" % (htmlfile)) -+ content = open(htmlfile, 'r').read() -+ self.wkview.load_string(content, 'text/html', 'UTF-8', 'file:///') -+ #self.wkview.load_uri("file://%s" % (htmlfile)) - #self.box.show_all() - logging.debug("<<") - From a610024634afd3960e08e0278797821e82344b7c Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 14 Jul 2019 17:47:50 +0000 Subject: [PATCH 172/248] perlPackages.EmailSender: fix tests It should fix https://github.com/NixOS/nixpkgs/pull/64157#issuecomment-510473907 --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3db604b9e325..e74b30379f65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5464,6 +5464,9 @@ let }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; + postPatch = '' + patchShebangs --build util + ''; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; From 589dd21f4e363c1cd56a4f795ff8c480cca4b7f4 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 14 Jul 2019 21:32:27 +0000 Subject: [PATCH 173/248] perlPackages.FileFindObjectRule: fix tests --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e74b30379f65..f78cacd08bec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6223,6 +6223,10 @@ let sha256 = "f1f1820ff44042f6b30e4d6be1db860b9e743b1a9836070ea656ad9829e4eca5"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; + # restore t/sample-data which is corrupted by patching shebangs + preCheck = '' + tar xf $src */t/sample-data --strip-components=1 + ''; meta = { homepage = https://www.shlomifish.org/open-source/projects/File-Find-Object/; description = "Alternative interface to File::Find::Object"; From 3147935531d97d2a44100f665a8db6ba8cf66652 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 22:52:19 -0700 Subject: [PATCH 174/248] vttest: 20190105 -> 20190710 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vttest/versions --- pkgs/tools/misc/vttest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 9ae1ee0b17eb..0aa51363ff8f 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20190105"; + version = "20190710"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "0wagaywzc6pq59m8gpcblag7gyjjarc0qx050arr1sy8hd3yy0sp"; + sha256 = "00v3a94vpmbdziizdw2dj4bfwzfzfs2lc0ijxv98ln1w01w412q4"; }; meta = with stdenv.lib; { From 8cee299afb017b710e5032f88075fd47db4efa08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 22:40:24 -0700 Subject: [PATCH 175/248] vnstat: 2.2 -> 2.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vnstat/versions --- pkgs/applications/networking/vnstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 7b3e62779e95..8a210c1af681 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.2"; + version = "2.3"; src = fetchurl { - sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6"; + sha256 = "138s79dqxrm59xc2s2xch16qkzzjks580sac4ppq8jy5lxrzj2i8"; url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz"; }; From 9d6fabd905b42764e7f46f401352f2b4808a8c75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 21:21:59 -0700 Subject: [PATCH 176/248] wpgtk: 6.0.7 -> 6.0.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wpgtk/versions --- pkgs/tools/X11/wpgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 5d94943daf90..a9ebbff8203d 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.7"; + version = "6.0.8"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "14qk7kmi37ppxh2m69g7wb7w2wh62nbsy3z4ns7hsns3p21va7y3"; + sha256 = "1c4iyy4db7zhbfnng8h1r7d2fmng4zspgl9zfr8vc86sk5wmfnjc"; }; buildInputs = [ From 8b88136f3e0a48aa344e679d3f9ecc5771f4e5c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 20:50:54 -0700 Subject: [PATCH 177/248] wcslib: 6.2 -> 6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wcslib/versions --- pkgs/development/libraries/wcslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 187eed6ae83a..44e6370e6408 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "6.2"; + version = "6.3"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="01fqckazhbfqqhyr0wd9vcks1m2afmsh83l981alxg2r54jgwkdv"; + sha256 ="1si272bms58yv1zmymx9ypx1ycka8bfqy8wk03rvl6nmciyz0dsc"; }; prePatch = '' From 8a4c3f43e0864813e04784b9d5d595af628e453c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 20:03:25 -0700 Subject: [PATCH 178/248] gnome3.totem: 3.32.0 -> 3.32.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/totem/versions --- pkgs/desktops/gnome-3/core/totem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index d3319c4522e4..15417d4ddbb9 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "totem-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12iykwslvnpgmrm4bcchx5rzn2g4rl5r9s86n2001djn58yw6m6r"; + sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v"; }; doCheck = true; From 9f29ecbaf496e97373642eea4dbf838626696373 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 19:00:34 -0700 Subject: [PATCH 179/248] tesseract4: 4.0.0 -> 4.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tesseract/versions --- pkgs/applications/graphics/tesseract/tesseract4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index df321023c741..af0063301f1a 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tesseract-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8"; + sha256 = "06i7abxy2ifmdx1fak81cx0kns85n8hvp0339jk6242fhshibljx"; }; enableParallelBuilding = true; From 1f71623c0b3b1c49a0495b87670cdcc7fea729cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 18:15:04 -0700 Subject: [PATCH 180/248] uftp: 4.9.11 -> 4.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uftp/versions --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 1530480dc4bf..ba628360aaa7 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.11"; + version = "4.10"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "06kb4h10n5nvmv79fs5nwk40pc4vl4xqidksy9fxasgn6md87p1d"; + sha256 = "14pjhc8a8fgm5cyy93r693nrjinaps6642v00jpwrjf7h2p8mfli"; }; buildInputs = [ openssl ]; From e50674b6b2308226ce53af61eedc27b681e96200 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 18:05:12 -0700 Subject: [PATCH 181/248] tgt: 1.0.78 -> 1.0.79 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tgt/versions --- pkgs/tools/networking/tgt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index a9e9f351aae3..61aaa263b350 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.78"; + version = "1.0.79"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "0778silfwvbpqljxdid96nn0vkdii3fszqp6w6w2bn9hdyxhqrjp"; + sha256 = "18bp7fcpv7879q3ppdxlqj7ayqmlh5zwrkz8gch6rq9lkmmrklrf"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; From 9a6f0ca8b7b915a7d52e2023ce3ab96413d4768e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 17:46:29 -0700 Subject: [PATCH 182/248] stacks: 2.4 -> 2.41 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/stacks/versions --- pkgs/applications/science/biology/stacks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index d188ca02b183..e778c3bd52cc 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.4"; + version = "2.41"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "1ha1avkh6rqqvsy4k42336a2gj14y1jq19a2x8cjmiidi9l3s29h"; + sha256 = "0q420rzjb05jfchcls3pysm4hxfgs6xj2jw246isx0il10g93gkq"; }; buildInputs = [ zlib ]; From 39263d8613a71c6e5ed94ea0551a01d142562cd0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 17:24:38 -0700 Subject: [PATCH 183/248] syncplay: 1.6.3 -> 1.6.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/syncplay/versions --- pkgs/applications/networking/syncplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index c8610d80ca78..763c740c8175 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.6.3"; + version = "1.6.4"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "03xw44lxdk1h9kbvfviqzpmxxld6zvp07i0hvdm1chchyp0a109h"; + sha256 = "0afh2a0l1c3hwgj5q6wy0v5iimg8qcjam3pw7b8mf63lasx6iqk4"; }; propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls; From d7cdd895fa65334dc063ae6cd2e01d48e962bc3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 16:47:15 -0700 Subject: [PATCH 184/248] rsyslog: 8.1905.0 -> 8.1907.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rsyslog/versions --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 729a90aa317e..2899837f3f88 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.1905.0"; + name = "rsyslog-8.1907.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1r0nf5j4y8p1hbay3kdgkggr76qm7sw10pnl4anxd3vninmlzgcn"; + sha256 = "1dcz0w5xalqsi2xjb5j7c9mq5kf9s9kq9j2inpv4w5wkrrg569zb"; }; #patches = [ ./fix-gnutls-detection.patch ]; From ef6f912245bffbaf4307c1dfbfba329beb7ec47d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 15:12:48 -0700 Subject: [PATCH 185/248] sauce-connect: 4.5.1 -> 4.5.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sauce-connect/versions --- pkgs/development/tools/sauce-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 50e2bd8dad84..715aa552ae56 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.5.1"; + version = "4.5.3"; src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0lpfvlax7k8r65bh01i3kzrlmx0vnm9vhhir8k1gp2f4rv6z4lyx"; + sha256 = "05fv9rggibx6dbdw8ywwwq45i9gdc53b7i7jhvl01m1sn2ygrrqd"; } else if stdenv.hostPlatform.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; sha256 = "1h9n1mzmrmlrbd0921b0sgg7m8z0w71pdb5sif6h1b9f97cp353x"; From 178bf6921b70d12283964f1c7d87f60111202f9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 14:21:17 -0700 Subject: [PATCH 186/248] python37Packages.ROPGadget: 5.4 -> 5.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-ropgadget/versions --- pkgs/development/python-modules/ROPGadget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index ac19a7e7063c..c9398d96fce9 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "5.4"; + version = "5.8"; src = fetchPypi { inherit pname version; - sha256 = "19wly4x3mq73c91pplqjk0c7sx6710887czh514qk5l7j0ky6dxg"; + sha256 = "184qncm2ss474prphw0xnf7ifkpgj955dzlb2vqq94z6xvf3xyd9"; }; propagatedBuildInputs = [ capstone ]; From 2928e4c3fc874e6e146c57e08e1d99bfa0b9f874 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 14:17:56 -0700 Subject: [PATCH 187/248] skypeforlinux: 8.47.0.59 -> 8.49.0.49 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/skypeforlinux/versions --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 7ef42f8ddfdf..8a732de08ce7 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.47.0.59"; + version = "8.49.0.49"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -58,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "0haiccmimbj1nyyyj556b0a181walmxwbbr0m18m2w67wi5z783r"; + sha256 = "0l5q336kkw9i13076qn7fkknypg7cwjp58qi8xd6h0rwha3kkqa2"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 3063809ac22d01acc97e35ef981f595ebd75de9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 13:48:31 -0700 Subject: [PATCH 188/248] smemstat: 0.02.03 -> 0.02.04 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/smemstat/versions --- pkgs/os-specific/linux/smemstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 06c668acc960..55336e3b2a04 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.02.03"; + version = "0.02.04"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "04q06wb37n4g1dlsjl8j2bwzd7qis4wanm0f4xg8y29br6skljx1"; + sha256 = "1kkdlnn3gahzd3ra2qc9vmc4ir5lydc3lyyqa269sb3nv9v2v30h"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; From 43aa4b4154665a9d61a92c653c3b58bc3cea476d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 13:23:59 -0700 Subject: [PATCH 189/248] spoofer: 1.4.2 -> 1.4.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spoofer/versions --- pkgs/tools/networking/spoofer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 8893c5e37fe0..faeec8523aa4 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -6,12 +6,12 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.2"; + version = "1.4.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz"; - sha256 = "041piwc2r4fig5b4apm2ibq1wyd11ic8p3xv3ss2hrbn5d8inza1"; + sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; }; nativeBuildInputs = [ pkgconfig ]; From abc4ccdd2d344ca6eb126af9fb5c82e85f637799 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 12:42:02 -0700 Subject: [PATCH 190/248] shc: 4.0.2 -> 4.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shc/versions --- pkgs/tools/security/shc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index e3f5f72c1414..3d3bd4eef849 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "shc-${version}"; - version = "4.0.2"; + version = "4.0.3"; rev = "${version}"; src = fetchFromGitHub { inherit rev; owner = "neurobin"; repo = "shc"; - sha256 = "1vd9dldm6h234awn5fhpgq4lb85ylcawr2p2108332ffy70kvdix"; + sha256 = "0bfn404plsssa14q89k9l3s5lxq3df0sny5lis4j2w75qrkqx694"; }; meta = with stdenv.lib; { From 4040b16c301e03ddc9bc11d5f32954e7fe2e3536 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 11:53:06 -0700 Subject: [PATCH 191/248] rabbitmq-server: 3.7.15 -> 3.7.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rabbitmq-server/versions --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 3d36202e8616..7e5714804190 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.15"; + version = "3.7.16"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "14ipnvcrwln9mwr4r32461js2gdlrr4h4hy92393ixbkscf9wdir"; + sha256 = "12s1s4zz3fxvb5ah5v6gmaq1kgd41pv9nahsdswa7svbgdc8lykz"; }; buildInputs = From 9ed84b6c2bcabdc37392fce044e330fa2ffa581c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 11:19:10 -0700 Subject: [PATCH 192/248] python37Packages.pyopencl: 2018.2.5 -> 2019.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pyopencl/versions --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index e17ec16f436d..8561cbac1b8e 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.5"; + version = "2019.1"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qgi6diw9m7yldmql9kh08792053ib6zkplh8v2mqv6waaflmrnn"; + sha256 = "04ahndgc5aqm3pqix2j4vzn9n3k762ylf3yq55jdbxm5cicz9nx0"; }; # py.test is not needed during runtime, so remove it from `install_requires` From 2957f9f79df35adaa5c516166bd0b01be1dc03fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 10:37:18 -0700 Subject: [PATCH 193/248] python37Packages.splinter: 0.10.0 -> 0.11.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-splinter/versions --- pkgs/development/python-modules/splinter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 5d863192b2b6..274a5148d8a1 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1x5g7pfj813rnci7dc46y01bq24qzw5qwlzm4iw61hg66q2kg7rd"; + sha256 = "0ddv80dv54rraa18lg9v7m9z61wzfwv6ww9ld83mr32gy3a2238p"; }; propagatedBuildInputs = [ selenium ]; From dcc38411e75d4ed35f3be60ce7f1c15d3ed305c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 08:25:28 -0700 Subject: [PATCH 194/248] python37Packages.python-gitlab: 1.8.0 -> 1.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-python-gitlab/versions --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 167da239fd16..bbd05b6757b2 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1rwkl36n1synyggg2li7r075fq5k3cmpgyazinw24bkf7z2kpc56"; + sha256 = "1p0i6gsl4mcv6w1sm0rsxq9bq2cmmg3n7c0dniqlvqmzkk62qqhx"; }; propagatedBuildInputs = [ requests six ]; From 76e53a96ec402eff25c11e431a413f72c3991730 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 06:47:02 -0700 Subject: [PATCH 195/248] python37Packages.whichcraft: 0.5.2 -> 0.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-whichcraft/versions --- pkgs/development/python-modules/whichcraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 498c1c401f81..102496582a03 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whichcraft"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "fecddd531f237ffc5db8b215409afb18fa30300699064cca4817521b4fc81815"; + sha256 = "1614vs0iwm9abina70vgvxaabi8xbz83yxgqfqi1syrzrhaalk6m"; }; LC_ALL="en_US.utf-8"; From bac8f18fc62398c4a6c3b5bfb5639d041274e431 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 04:50:12 -0700 Subject: [PATCH 196/248] python37Packages.piexif: 1.1.2 -> 1.1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-piexif/versions --- pkgs/development/python-modules/piexif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 0de96a3f585e..595e246f7778 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "piexif"; - version = "1.1.2"; + version = "1.1.3"; # Pillow needed for unit tests checkInputs = [ pillow ]; @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0dj6wiw4mk65zn7p0qpghra39mf88m3ph2xn7ff9jvasgczrgkb0"; + sha256 = "06sz58q4mrw472p8fbnq7wsj8zpi5js5r8phm2hiwfmz0v33bjw3"; }; meta = with stdenv.lib; { From 4dad0ae560708fee5d081c3f02bf94e4c6f4dfce Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Jul 2019 22:40:22 +0300 Subject: [PATCH 197/248] buildBazelPackage: cleanup hacks and enforce them for all builds Timestamp verification skip is no longer needed (not sure why). Generally we better off always using the environment hack for all packages because that ensures all NIX_* flags are correctly applied. One possible improvement in future is to filter only NIX_* variables to passthru in Bazel. --- .../build-bazel-package/default.nix | 43 ++++++------------- .../build-managers/bazel/nix-hacks.patch | 28 ------------ pkgs/top-level/all-packages.nix | 8 +--- 3 files changed, 15 insertions(+), 64 deletions(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 7c9fc83e0f1b..4e19b244f3cb 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bazel, cacert, enableNixHacks ? true }: +{ stdenv, bazel, cacert }: args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: @@ -37,7 +37,15 @@ in stdenv.mkDerivation (fBuildAttrs // { # We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads: # https://github.com/bazelbuild/bazel/issues/6502 - BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch --loading_phase_threads=1 $bazelFlags $bazelTarget + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + USER=homeless-shelter \ + bazel \ + --output_base="$bazelOut" \ + --output_user_root="$bazelUserRoot" \ + fetch \ + --loading_phase_threads=1 \ + $bazelFlags \ + $bazelTarget runHook postBuild ''; @@ -74,12 +82,14 @@ in stdenv.mkDerivation (fBuildAttrs // { ''; dontFixup = true; + allowedRequisites = []; + outputHashMode = "recursive"; outputHashAlgo = "sha256"; outputHash = fetchAttrs.sha256; }); - nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (if enableNixHacks then (bazel.override { enableNixHacks = true; }) else bazel) ]; + nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ]; preHook = fBuildAttrs.preHook or "" + '' export bazelOut="$NIX_BUILD_TOP/output" @@ -99,29 +109,6 @@ in stdenv.mkDerivation (fBuildAttrs // { buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild - # Bazel sandboxes the execution of the tools it invokes, so even though we are - # calling the correct nix wrappers, the values of the environment variables - # the wrappers are expecting will not be set. So instead of relying on the - # wrappers picking them up, pass them in explicitly via `--copt`, `--linkopt` - # and related flags. - # - copts=() - host_copts=() - for flag in $NIX_CFLAGS_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done - for flag in $NIX_CXXSTDLIB_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done - linkopts=() - host_linkopts=() - for flag in $NIX_LD_FLAGS; do - linkopts+=( "--linkopt=$flag" ) - host_linkopts+=( "--host_linkopt=$flag" ) - done - BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ USER=homeless-shelter \ bazel \ @@ -129,10 +116,6 @@ in stdenv.mkDerivation (fBuildAttrs // { --output_user_root="$bazelUserRoot" \ build \ -j $NIX_BUILD_CORES \ - "''${copts[@]}" \ - "''${host_copts[@]}" \ - "''${linkopts[@]}" \ - "''${host_linkopts[@]}" \ $bazelFlags \ $bazelTarget diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch index f58be89fabc1..75b0e3743f9d 100644 --- a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch +++ b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch @@ -1,31 +1,3 @@ -diff -Naur a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java ---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2019-06-12 20:39:37.420705161 -0700 -+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2019-06-12 20:44:18.894429744 -0700 -@@ -428,24 +428,7 @@ - try { - content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8); - String markerRuleKey = readMarkerFile(content, markerData); -- boolean verified = false; -- if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey) -- && Objects.equals( -- markerData.get(MANAGED_DIRECTORIES_MARKER), -- this.markerData.get(MANAGED_DIRECTORIES_MARKER))) { -- verified = handler.verifyMarkerData(rule, markerData, env); -- if (env.valuesMissing()) { -- return null; -- } -- } -- -- if (verified) { - return new Fingerprint().addString(content).digestAndReset(); -- } else { -- // So that we are in a consistent state if something happens while fetching the repository -- markerPath.delete(); -- return null; -- } - } catch (IOException e) { - throw new RepositoryFunctionException(e, Transience.TRANSIENT); - } diff -Naur a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java --- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2019-06-12 20:39:37.538708196 -0700 +++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2019-06-12 20:44:18.863429602 -0700 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ee66e0a610e..f642f9e18320 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8908,15 +8908,11 @@ in buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps { - buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; - }; + bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps { }; bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { - buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; - }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; bazelisk = callPackage ../development/tools/bazelisk { }; From 26bff5f76737b24dadf48449be1f387e0caa07ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 02:46:48 -0700 Subject: [PATCH 198/248] python37Packages.google-auth-oauthlib: 0.3.0 -> 0.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-google-auth-oauthlib/versions --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index b318016ee815..2cc1513812fa 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "03rq2rjac0zh16vsw0q914sp62l9f8fp033wn3191pqd2cchqix0"; + sha256 = "1fl3w23c93hlgqf0l57cdy17wmvyhrv3bh133ksd2h490ir012va"; }; checkInputs = [ From c1871485ed538755883b7d96d274b4e92f9abb10 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 01:48:19 -0700 Subject: [PATCH 199/248] python37Packages.identify: 1.4.3 -> 1.4.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-identify/versions --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 8837e34c788e..8987ce97c713 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.3"; + version = "1.4.5"; src = fetchPypi { inherit pname version; - sha256 = "432c548d6138cb57a3d8f62f079a025a29b8ae34a50dd3b496bbf661818f2bc0"; + sha256 = "1z8xjvpkj599h3s76q05y10iysjjky7b0s5g3zicfyxhzm7x59a3"; }; # Tests not included in PyPI tarball From c4ba29da302dfc5fabc7b74ea6f16e6dc43d5d90 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 01:37:47 -0700 Subject: [PATCH 200/248] dot2tex: 2.9.0 -> 2.11.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python2.7-dot2tex/versions --- pkgs/development/python-modules/dot2tex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 9d644c22eaf5..f671cdc9642a 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "dot2tex"; - version = "2.9.0"; + version = "2.11.3"; src = fetchPypi { inherit pname version; - sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; + sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9"; }; # Tests fail with 3.x. Furthermore, package is no longer maintained. From 1fb7255690204da87bc30af3d6ed6cbb6a3a6c9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 00:28:49 -0700 Subject: [PATCH 201/248] python37Packages.dbf: 0.98.0 -> 0.98.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-dbf/versions --- pkgs/development/python-modules/dbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 2ba308596d49..c3d5224dd4d4 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.98.0"; + version = "0.98.2"; src = fetchPypi { inherit pname version; - sha256 = "089h98gpjf9ffxzbkbd9k9wd8n3s7g0nhfpn3rf44h51hllgqxxb"; + sha256 = "0d8m3zhhxy1f35r1s8k0s218iz86bs6v89vy65lslrxbdg5pjia0"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; From 3e33e53c5d04e37f4df4f738b8c47f950c12f7ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 23:24:22 -0700 Subject: [PATCH 202/248] poco: 1.9.0 -> 1.9.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/poco/versions --- pkgs/development/libraries/poco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 4dffa7486a1c..68ddf5c91d17 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "poco-${version}"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; - sha256 = "11z1i0drbacs7c7d5virc3kz7wh79svd06iffh8j6giikl7vz1q3"; + sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd"; }; nativeBuildInputs = [ cmake pkgconfig ]; From fdca0189d9b8962f3e673541833fa5103a9117b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 22:46:59 -0700 Subject: [PATCH 203/248] pmd: 6.15.0 -> 6.16.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pmd/versions --- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 2ab9f12c7796..88d84ad1d11d 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.15.0"; + version = "6.16.0"; nativeBuildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0im64lg18bv764i14g3p42dzd7kqq9j5an8dkz1vanypb1jf5j3s"; + sha256 = "0h4818dxd9nq925asa9g3g9i2i5hg85ziapacyiqq4bhab67ysy4"; }; installPhase = '' From f3e50dfbbb550a8ad31a6c686c22ac51d295c41d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 21:50:02 -0700 Subject: [PATCH 204/248] python37Packages.asgiref: 3.1.2 -> 3.1.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-asgiref/versions --- pkgs/development/python-modules/asgiref/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index a07d370761a5..84c157e1bcd9 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.1.4"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1y32ys1q07nyri0b053mx24qvkw305iwvqvqgi2fdhx0va8d7qfy"; + sha256 = "0rmasjrvf083c7855xnggy251gm8vaxyv970b2rd6198h8s3rldh"; }; propagatedBuildInputs = [ async-timeout ]; From 4e5c0e9f0e41622be345324b369cf7ed334469aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 20:36:48 -0700 Subject: [PATCH 205/248] openimageio2: 2.0.8 -> 2.0.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openimageio/versions --- pkgs/applications/graphics/openimageio/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index f2e8eee9940b..837446190fb2 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0nk72h7q1n664b268zkhibb7a3i7fb3nl2z7fg31ys5r9zlq6mnp"; + sha256 = "17diyfk586hll54cl476kbhbcm3nihw6cb4bgjkjxxzxbd3wx839"; }; outputs = [ "bin" "out" "dev" "doc" ]; From 322201aefbc8c36fc053210def2825282695292e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 14:34:40 -0700 Subject: [PATCH 206/248] lxcfs: 3.0.3 -> 3.0.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lxcfs/versions --- pkgs/os-specific/linux/lxcfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 3953ff1915a7..4299a8e9b377 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.0.3"; + name = "lxcfs-3.0.4"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0imn031qpi1qfr1qw0ggpgcg8y6v0ykdr3m7f2czkiz3l7qqx2in"; + sha256 = "0wav2l8i218yma655870hvg96b5mxdcrsczjawjwv7qxcj5v98pw"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; From e8f2f769fd1822b05ff5cac06665bb7ee4f8cc72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 13:10:39 -0700 Subject: [PATCH 207/248] libdap: 3.20.3 -> 3.20.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdap/versions --- pkgs/development/libraries/libdap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 067144ddfa0c..86d14fe79740 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.3"; + version = "3.20.4"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0n6ciicaa7sn88gvg5sgcq0438i3vh6xbl9lxgafjqiznli1k5i9"; + sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i"; }; meta = with stdenv.lib; { From 2c901071010bc799469c5d56f523f320216cc416 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 22:29:05 -0700 Subject: [PATCH 208/248] postfix: 3.4.5 -> 3.4.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/postfix/versions --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 634bba2e57c9..10d3b397b26b 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "17riwr21i9p1h17wpagfiwkpx9bbx7dy4gpdl219a11akm7saawb"; + sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n"; }; nativeBuildInputs = [ makeWrapper m4 ]; From 2df0b53d700d93c5f5aa48c528554c090f382811 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 10:22:32 -0700 Subject: [PATCH 209/248] imagemagick7: 7.0.8-46 -> 7.0.8-53 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/imagemagick/versions --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f61215f83e22..2bd2207a97a4 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-46"; - sha256 = "1si3rv3b9jgjkwyny5ja76s8c0z9vyic28fm63j1jrqdd2jyq3pk"; + version = "7.0.8-53"; + sha256 = "0cgfsng2d14891fqwf7mlclsi576c42v0h5r6i4208bakcr25vzk"; patches = []; }; in From 2ee151102e1434d8f22ba011fb0b1c5750c8d497 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 10:01:37 -0700 Subject: [PATCH 210/248] josm: 15155 -> 15238 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/josm/versions --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 4f7acb7731ab..8838de9ac961 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "15155"; + version = "15238"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0qws5bgv7mm1iynsdrn7cdi16rd8k4139iia3bnjpm04xn69i5im"; + sha256 = "0zh84glb4545av0s1qnccqqp8nrnfsr7rnwgbqpwwzvc2ngk91gv"; }; buildInputs = [ jdk11 makeWrapper ]; From 3a2c9891e786982fc990473e1ae9a2e3d7b7daa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 16 Jul 2019 09:30:45 +0200 Subject: [PATCH 211/248] pythonPackages.thinc: 7.0.6 -> 7.0.8 Change: avoid allocating a negative shape for ngrams --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index ebca1346dfb3..ac8ab3fd8648 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.0.6"; + version = "7.0.8"; src = fetchPypi { inherit pname version; - sha256 = "12d0766z7ksqpqrvldi46mx0z4zsbgncda4fpvxra1d6vbchf8ba"; + sha256 = "191admjvhqsbxpqn73q42i0i8kvlblj0k6p0z9p7n3pcxzl75nsw"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From 4b334cf1d515052b937865f45137c3ed4a9a0285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 16 Jul 2019 09:31:28 +0200 Subject: [PATCH 212/248] pythonPackages.spacy: 2.1.4 -> 2.1.6 Includes various improvements, including: - Improvements for various languages. - Evaluation metrics per entity type. - Pretraining improvements. Changelogs: https://github.com/explosion/spaCy/releases/tag/v2.1.5 https://github.com/explosion/spaCy/releases/tag/v2.1.6 Also add myself as a maintainer. --- pkgs/development/python-modules/spacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 178be8bd86ac..2a8e5a264cf1 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.1.4"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "03m4c59aaqpqr2x5yhv7y37z0vxhmmkfi6dv4cbp9nxsq9wv100d"; + sha256 = "1s0a0vir9lg5q8n832kkadbajb4i4zl20zmdg3g20qlp4mcbn25p"; }; prePatch = '' @@ -72,6 +72,6 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = https://github.com/explosion/spaCy; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; + maintainers = with maintainers; [ danieldk sdll ]; }; } From 1346c4315810990efc28322b8c54850d0910dd34 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Tue, 16 Jul 2019 20:13:50 +0100 Subject: [PATCH 213/248] maintainers: add melling --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e4177563b8f..c70cfe007d52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5836,4 +5836,9 @@ github = "turboMaCk"; name = "Marek Fajkus"; }; + melling = { + email = "mattmelling@fastmail.com"; + github = "mattmelling"; + name = "Matt Melling"; + }; } From 6c9d4bc846819c5902bebc054f3328f59b3c9c30 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Tue, 16 Jul 2019 20:14:17 +0100 Subject: [PATCH 214/248] pythonPackages.mwparserfromhell: init at 0.5.4 --- .../mwparserfromhell/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/mwparserfromhell/default.nix diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix new file mode 100644 index 000000000000..e52e033cdb00 --- /dev/null +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mwparserfromhell"; + version = "0.5.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "aaf5416ab9b75e99e286f8a4216f77a2f7d834afd4c8f81731e701e59bf99305"; + }; + + meta = with stdenv.lib; { + description = "MWParserFromHell is a parser for MediaWiki wikicode"; + homepage = "https://mwparserfromhell.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00612cbab960..bdd570872546 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5929,6 +5929,8 @@ in { flickrapi = callPackage ../development/python-modules/flickrapi { }; aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; + + mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; }); in fix' (extends overrides packages) From cebcbc24c7e0a44cea55369197d103ac04fa9335 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 17:30:08 -0400 Subject: [PATCH 215/248] pythonPackages.datashape: refactor fix broken package --- pkgs/development/python-modules/datashape/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 63191aa224e3..bb2e65125b7d 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -34,7 +34,8 @@ in buildPythonPackage rec { # Disable several tests # https://github.com/blaze/datashape/issues/232 checkPhase = '' - py.test -k "not test_validate and not test_nested_iteratables and not test_validate_dicts and not test_tuples_can_be_records_too" datashape/tests + pytest --ignore datashape/tests/test_str.py \ + --ignore datashape/tests/test_user.py ''; meta = { @@ -42,7 +43,5 @@ in buildPythonPackage rec { description = "A data description language"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; - # Package is no longer maintained upstream, and more and more tests are failing. - broken = true; }; -} \ No newline at end of file +} From 30169d9493a25c27fe507b7f2862b1582670905f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 17:30:37 -0400 Subject: [PATCH 216/248] pythonPackages.datashader: init at 0.7.0 --- .../python-modules/datashader/default.nix | 85 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/python-modules/datashader/default.nix diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix new file mode 100644 index 000000000000..8ce3012513c4 --- /dev/null +++ b/pkgs/development/python-modules/datashader/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dask +, distributed +, bokeh +, toolz +, datashape +, numba +, numpy +, pandas +, pillow +, xarray +, colorcet +, param +, pyct +, pyyaml +, requests +, scikitimage +, scipy +, pytest +, pytest-benchmark +, flake8 +, nbsmoke +, fastparquet +, testpath +, nbconvert +}: + +buildPythonPackage rec { + pname = "datashader"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5baf218713dc1ad4791f7bcf606ef8f618273945e788c59f9573aebd7cb851f8"; + }; + + propagatedBuildInputs = [ + dask + distributed + bokeh + toolz + datashape + numba + numpy + pandas + pillow + xarray + colorcet + param + pyct + pyyaml + requests + scikitimage + scipy + testpath + ]; + + checkInputs = [ + pytest + pytest-benchmark + flake8 + nbsmoke + fastparquet + pandas + nbconvert + ]; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "'testpath<0.4'" "'testpath'" + ''; + + checkPhase = '' + pytest datashader + ''; + + meta = with lib; { + description = "Data visualization toolchain based on aggregating into a grid"; + homepage = https://datashader.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdd570872546..3f6eca574790 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -484,6 +484,8 @@ in { datasette = callPackage ../development/python-modules/datasette { }; + datashader = callPackage ../development/python-modules/datashader { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; From 029ef744a8f02c0cd0ad4e984990247082b59ffd Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 17:31:04 -0400 Subject: [PATCH 217/248] pythonPackages.colorcet: init at 2.0.1 --- .../python-modules/colorcet/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/colorcet/default.nix diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix new file mode 100644 index 000000000000..83095a6a5626 --- /dev/null +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, param +, pyct +, nbsmoke +, flake8 +, pytest +, pytest-mpl +}: + +buildPythonPackage rec { + pname = "colorcet"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ab1d16aba97f54af190631c7777c356b04b53de549672ff6b01c66d716eddff3"; + }; + + propagatedBuildInputs = [ + param + pyct + ]; + + checkInputs = [ + nbsmoke + pytest + flake8 + pytest-mpl + ]; + + checkPhase = '' + pytest colorcet + ''; + + meta = with lib; { + description = "Collection of perceptually uniform colormaps"; + homepage = https://colorcet.pyviz.org; + license = licenses.cc-by-40; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f6eca574790..5b3776da5c30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1471,6 +1471,8 @@ in { circus = callPackage ../development/python-modules/circus {}; + colorcet = callPackage ../development/python-modules/colorcet { }; + colorclass = callPackage ../development/python-modules/colorclass {}; colorlog = callPackage ../development/python-modules/colorlog { }; From 36dc1d4fe61ae09a8cfb06926a7afacf2844d244 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 17:31:28 -0400 Subject: [PATCH 218/248] pythonPackages.colorcet: init at 0.10 --- .../python-modules/colorcet/default.nix | 4 ++ .../python-modules/pytest-mpl/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-mpl/default.nix diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 83095a6a5626..6a7328aaf73c 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -31,6 +31,10 @@ buildPythonPackage rec { ]; checkPhase = '' + export HOME=$(mktemp -d) + mkdir -p $HOME/.config/matplotlib + echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + pytest colorcet ''; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix new file mode 100644 index 000000000000..c3bd4c59f049 --- /dev/null +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, matplotlib +, nose +}: + +buildPythonPackage rec { + pname = "pytest-mpl"; + version = "0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "7006e63bf1ca9c50bea3d189c0f862751a16ce40bb373197b218f57af5b837c0"; + }; + + propagatedBuildInputs = [ + matplotlib + nose + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "pytest plugin to help with testing figures output from Matplotlib"; + homepage = https://github.com/matplotlib/pytest-mpl; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b3776da5c30..dcefe43d0c9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1917,6 +1917,8 @@ in { pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; + pytest-mock = callPackage ../development/python-modules/pytest-mock { }; pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; From 99f7b1498198863aed3134e48ae6a82d3b69c899 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 17:39:12 -0400 Subject: [PATCH 219/248] pythonPackages.stumpy: init at 1.0 --- .../python-modules/stumpy/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/stumpy/default.nix diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix new file mode 100644 index 000000000000..967e365dde0c --- /dev/null +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, numba +, pandas +, dask +, distributed +, coverage +, flake8 +, black +, pytest +, codecov +}: + +buildPythonPackage rec { + pname = "stumpy"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "TDAmeritrade"; + repo = "stumpy"; + rev = "115e477c1eec9291ab7c1fd8da30d67a70854f8e"; # no git version tag + sha256 = "0s2s3y855jjwdb7p55zx8lknplz58ghpw547yzmqisacr968b67w"; + }; + + propagatedBuildInputs = [ + numpy + scipy + numba + ]; + + checkInputs = [ + pandas + dask + distributed + coverage + flake8 + black + pytest + codecov + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; + homepage = https://github.com/TDAmeritrade/stumpy; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcefe43d0c9f..9b477c292ea1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1113,6 +1113,8 @@ in { statistics = callPackage ../development/python-modules/statistics { }; + stumpy = callPackage ../development/python-modules/stumpy { }; + sumo = callPackage ../development/python-modules/sumo { }; supervise_api = callPackage ../development/python-modules/supervise_api { }; From 1765a678fbfa8ed8ea0b4563ec872f500b9790e1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 18:09:01 -0400 Subject: [PATCH 220/248] pythonPackages.clifford: init at 1.0.4 --- .../python-modules/clifford/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/clifford/default.nix diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix new file mode 100644 index 000000000000..ca95ebbf1f3b --- /dev/null +++ b/pkgs/development/python-modules/clifford/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, numba +, future +, h5py +, nose +, isPy27 +}: + +buildPythonPackage rec { + pname = "clifford"; + version = "1.0.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "7fc5aa76b4f73c697c0ebd2f86c5233e7ca0a5109b80147f4e711bc3de4b3f2c"; + }; + + propagatedBuildInputs = [ + numpy + scipy + numba + future + h5py + ]; + + checkInputs = [ + nose + ]; + + preConfigure = '' + substituteInPlace setup.py \ + --replace "'numba==0.43'" "'numba'" + ''; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Numerical Geometric Algebra Module"; + homepage = https://clifford.readthedocs.io; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b477c292ea1..19c90ed0d2f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -466,6 +466,8 @@ in { cliff = callPackage ../development/python-modules/cliff { }; + clifford = callPackage ../development/python-modules/clifford { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cozy = callPackage ../development/python-modules/cozy { }; From ceaf12fd6e5b3b1a6feeb6b324b0d08c8ba5957b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 18:19:35 -0400 Subject: [PATCH 221/248] pythonPackages.pygbm: init at 0.1.0 --- .../python-modules/pygbm/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pygbm/default.nix diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix new file mode 100644 index 000000000000..6e4c70aaaf13 --- /dev/null +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, scipy +, numpy +, numba +, scikitlearn +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pygbm"; + version = "0.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ogrisel"; + repo = pname; + rev = "v${version}"; + sha256 = "1qg2md86d0z5aa6jn8kj3rxsippsqsccx1dbraspdsdkycncvww3"; + }; + + propagatedBuildInputs = [ + scipy + numpy + numba + scikitlearn + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # numerical rounding error in test + pytest -k "not test_derivatives" + ''; + + meta = with lib; { + description = "Experimental Gradient Boosting Machines in Python"; + homepage = https://github.com/ogrisel/pygbm; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19c90ed0d2f8..53cc2e0001cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -856,6 +856,8 @@ in { pygame = callPackage ../development/python-modules/pygame { }; + pygbm = callPackage ../development/python-modules/pygbm { }; + pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; pygdbmi = callPackage ../development/python-modules/pygdbmi { }; From b965b4b7ae5ff873667d0689b725b4737287d6aa Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Jul 2019 18:35:44 -0400 Subject: [PATCH 222/248] pythonPackages.yt: init at 3.5.1 --- .../development/python-modules/yt/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/yt/default.nix diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix new file mode 100644 index 000000000000..845fba749d69 --- /dev/null +++ b/pkgs/development/python-modules/yt/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, matplotlib +, setuptools +, sympy +, numpy +, ipython +, hdf5 +, nose +, cython +, python +}: + +buildPythonPackage rec { + pname = "yt"; + version = "3.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c8ef8eceb934dc189d63dc336109fad3002140a9a32b19f38d1812d5d5a30d71"; + }; + + buildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + matplotlib + setuptools + sympy + numpy + ipython + hdf5 + ]; + + checkInputs = [ + nose + ]; + + checkPhase = '' + cd $out/${python.sitePackages} + HOME=$(mktemp -d) nosetests yt + ''; + + meta = with lib; { + description = "An analysis and visualization toolkit for volumetric data"; + homepage = https://github.com/yt-project/yt; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53cc2e0001cf..e6383723f688 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1172,6 +1172,8 @@ in { yarg = callPackage ../development/python-modules/yarg { }; + yt = callPackage ../development/python-modules/yt { }; + # packages defined here aafigure = callPackage ../development/python-modules/aafigure { }; From eceb53f082b094644686da402f6c5355b3a76e1d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 10:40:16 -0400 Subject: [PATCH 223/248] pythonPackages.pydy: init at 0.5.0 --- .../python-modules/pydy/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pydy/default.nix diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix new file mode 100644 index 000000000000..8bdb2affc532 --- /dev/null +++ b/pkgs/development/python-modules/pydy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, cython +, numpy +, scipy +, sympy +}: + +buildPythonPackage rec { + pname = "pydy"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b487a62b55a8c8664009b09bf789254b2c942cd704a380bedb1057418c94fa2"; + }; + + checkInputs = [ + nose + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + sympy + ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Python tool kit for multi-body dynamics"; + homepage = http://pydy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6383723f688..d8d8b3b54883 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -844,6 +844,8 @@ in { pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + pydy = callPackage ../development/python-modules/pydy { }; + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; From 5bf65feaaa0630a36fa8e7ae7b0dca56fa15d0d8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 11:16:42 -0400 Subject: [PATCH 224/248] pythonPackages.pytest-doctestplus: init at 0.3.0 --- .../pytest-doctestplus/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-doctestplus/default.nix diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix new file mode 100644 index 000000000000..a132fdd26f85 --- /dev/null +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, pytest +, numpy +}: + +buildPythonPackage rec { + pname = "pytest-doctestplus"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e641bc720661c08ec3afe44a7951660cdff5e187259c433aa66e9ec2d5ccea1"; + }; + + propagatedBuildInputs = [ + six + numpy + pytest + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin with advanced doctest features"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d8d8b3b54883..f735c998ba27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1909,6 +1909,8 @@ in { pytest-django = callPackage ../development/python-modules/pytest-django { }; + pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; + pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { }; pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; From e175b841f8da301cf95bda92bab77b5af7f06fcf Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 11:21:59 -0400 Subject: [PATCH 225/248] pythonPackages.pytest-remotedata: init at 0.3.1 --- .../pytest-remotedata/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-remotedata/default.nix diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix new file mode 100644 index 000000000000..2bf3a7f6cac4 --- /dev/null +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-remotedata"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15b75a38431da96a4da5e48b20a18e4dcc40d191abc199b17cb969f818530481"; + }; + + propagatedBuildInputs = [ + six + pytest + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # these tests require a network connection + pytest --ignore tests/test_strict_check.py + ''; + + meta = with lib; { + description = "Pytest plugin for controlling remote data access"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f735c998ba27..2cc7a3426bd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1921,6 +1921,8 @@ in { pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; + pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; From 3291b8dadf32d94ec3b4520114ed35febd778b06 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 11:39:44 -0400 Subject: [PATCH 226/248] pythonPackages.pytest-openfiles: init at 0.3.2 --- .../pytest-openfiles/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-openfiles/default.nix diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix new file mode 100644 index 000000000000..dbce114d7bf8 --- /dev/null +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, psutil +}: + +buildPythonPackage rec { + pname = "pytest-openfiles"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "e51c91889eb9e4c75f47735efc57a1435f3f1182463600ba7bce7f2556a46884"; + }; + + propagatedBuildInputs = [ + pytest + psutil + ]; + + checkInputs = [ + pytest + ]; + + postConfigure = '' + # remove on next release + substituteInPlace setup.cfg \ + --replace "[pytest]" "[tool:pytest]" + ''; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin for detecting inadvertent open file handles"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cc7a3426bd3..e5288b5f8e02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1935,6 +1935,8 @@ in { pytest-mock = callPackage ../development/python-modules/pytest-mock { }; + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; From 45ee5f6d28523695415c2bdedccd39e0e2601947 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 11:45:36 -0400 Subject: [PATCH 227/248] pythonPackages.pytest-arraydiff: init at 0.3 --- .../pytest-arraydiff/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-arraydiff/default.nix diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix new file mode 100644 index 000000000000..4a59e22d1365 --- /dev/null +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, six +, pytest +, astropy +}: + +buildPythonPackage rec { + pname = "pytest-arraydiff"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15"; + }; + + propagatedBuildInputs = [ + numpy + six + pytest + ]; + + checkInputs = [ + pytest + astropy + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin to help with comparing array output from tests"; + homepage = https://github.com/astrofrog/pytest-arraydiff; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5288b5f8e02..26c5858cac1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1895,6 +1895,8 @@ in { pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; pytestcache = callPackage ../development/python-modules/pytestcache { }; From 1832c1c52e30964ad29ab858e6c68111bce87b35 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 11:47:58 -0400 Subject: [PATCH 228/248] pythonPackages.pytest-astropy: init at 0.5.0 --- .../python-modules/pytest-astropy/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-astropy/default.nix diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix new file mode 100644 index 000000000000..272b1fa56b90 --- /dev/null +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytest-doctestplus +, pytest-remotedata +, pytest-openfiles +, pytest-arraydiff +}: + +buildPythonPackage rec { + pname = "pytest-astropy"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f28fb81dcdfa745f423b8f6d0303d97357d775b4128bcc2b3668f1602fd5a0b"; + }; + + propagatedBuildInputs = [ + pytest + pytest-doctestplus + pytest-remotedata + pytest-openfiles + pytest-arraydiff + ]; + + # pytest-astropy is a meta package and has no tests + doCheck = false; + + meta = with lib; { + description = "Meta-package containing dependencies for testing"; + homepage = https://astropy.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26c5858cac1c..9e2c25be0145 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1897,6 +1897,8 @@ in { pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; + pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; pytestcache = callPackage ../development/python-modules/pytestcache { }; From 7e929898d7c3ed6c274da84833c1aa593987af5b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 11:56:28 -0400 Subject: [PATCH 229/248] pythonPackages.pytest-socket: init at 0.3.3 --- .../python-modules/pytest-socket/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-socket/default.nix diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix new file mode 100644 index 000000000000..a28970a8ec45 --- /dev/null +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-socket"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "miketheman"; + repo = pname; + rev = version; + sha256 = "1jbzkyp4xki81h01yl4vg3nrg9b6shsk1ryrmkaslffyhrqnj8zh"; + }; + + propagatedBuildInputs = [ + pytest + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + # unsurprisingly pytest-socket require network for majority of tests + # to pass... + doCheck = false; + + meta = with lib; { + description = "Pytest Plugin to disable socket calls during tests"; + homepage = https://github.com/miketheman/pytest-socket; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e2c25be0145..623d84730e17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1965,6 +1965,8 @@ in { pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + pytest-socket = callPackage ../development/python-modules/pytest-socket { }; + pytestcov = callPackage ../development/python-modules/pytest-cov { }; pytest-expect = callPackage ../development/python-modules/pytest-expect { }; From 7523cd4f8937916ad75977116e6826462fb0f1fd Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 12:05:05 -0400 Subject: [PATCH 230/248] pythonPackages.trustme: refactor add idna as dependency needed downstream --- .../python-modules/trustme/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 6daa99aca6a6..e2ba008d3a0b 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -1,4 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, cryptography, futures, pytest, pyopenssl, service-identity }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cryptography +, futures +, pytest +, pyopenssl +, service-identity +, idna +}: buildPythonPackage rec { pname = "trustme"; @@ -9,18 +19,25 @@ buildPythonPackage rec { sha256 = "103f8n0c60593r0z8hh1zvk1bagxwnhrv3203xpiiddwqxalr04b"; }; - checkInputs = [ pytest pyopenssl service-identity ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytest + pyopenssl + service-identity + ]; + propagatedBuildInputs = [ cryptography + idna ] ++ lib.optionals (!isPy3k) [ futures ]; + checkPhase = '' + pytest + ''; + meta = { - description = "#1 quality TLS certs while you wait, for the discerning tester"; + description = "High quality TLS certs while you wait, for the discerning tester"; homepage = https://github.com/python-trio/trustme; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; From ad4bbe8684ea74d334b232227f93fb11ac57fa6e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 12:12:56 -0400 Subject: [PATCH 231/248] pythonPackages.aioftp: init at 0.13.0 --- .../python-modules/aioftp/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/aioftp/default.nix diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix new file mode 100644 index 000000000000..1d2b32a73b9e --- /dev/null +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, pytest-asyncio +, pytestcov +, trustme +, async-timeout +}: + +buildPythonPackage rec { + pname = "aioftp"; + version = "0.13.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "5711c03433b510c101e9337069033133cca19b508b5162b414bed24320de6c18"; + }; + + checkInputs = [ + pytest + pytest-asyncio + pytestcov + trustme + async-timeout + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Ftp client/server for asyncio"; + homepage = https://github.com/aio-libs/aioftp; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 623d84730e17..61817522a1c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1206,6 +1206,8 @@ in { aioh2 = callPackage ../development/python-modules/aioh2 { }; + aioftp = callPackage ../development/python-modules/aioftp { }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; From bd82932de371510d4d11910ba4549e4e3b134a61 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 12:15:26 -0400 Subject: [PATCH 232/248] pythonPackages.parfive: init at 1.0.0 --- .../python-modules/parfive/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/parfive/default.nix diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix new file mode 100644 index 000000000000..26a3a613be44 --- /dev/null +++ b/pkgs/development/python-modules/parfive/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tqdm +, aiohttp +, pytest +, setuptools_scm +, pytest-localserver +, pytest-socket +, pytest-asyncio +, aioftp +}: + +buildPythonPackage rec { + pname = "parfive"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15dc8466922c8fb1f814d3f7c3f3656191ac17b38fd7cc3350b9bf726e144ebb"; + }; + + buildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + tqdm + aiohttp + aioftp + ]; + + checkInputs = [ + pytest + pytest-localserver + pytest-socket + pytest-asyncio + ]; + + checkPhase = '' + # these two tests require network connection + pytest parfive -k "not test_ftp and not test_ftp_http" + ''; + + meta = with lib; { + description = "A HTTP and FTP parallel file downloader"; + homepage = https://parfive.readthedocs.io/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61817522a1c8..54c6d8bb439e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3929,6 +3929,8 @@ in { paramz = callPackage ../development/python-modules/paramz { }; + parfive = callPackage ../development/python-modules/parfive { }; + parsel = callPackage ../development/python-modules/parsel { }; parso = callPackage ../development/python-modules/parso { }; From 504134a4a034b52f7f95d30f278ceeea900efc44 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 12:17:51 -0400 Subject: [PATCH 233/248] pythonPackages.asdf: init at 2.3.3 --- .../python-modules/asdf/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/asdf/default.nix diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix new file mode 100644 index 000000000000..8efc251140a8 --- /dev/null +++ b/pkgs/development/python-modules/asdf/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest-astropy +, semantic-version +, pyyaml +, jsonschema +, six +, numpy +, isPy27 +, astropy +}: + +buildPythonPackage rec { + pname = "asdf"; + version = "2.3.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "d02e936a83abd206e7bc65050d94e8848da648344dbec9e49dddc2bdc3bd6870"; + }; + + checkInputs = [ + pytest-astropy + astropy + ]; + + propagatedBuildInputs = [ + semantic-version + pyyaml + jsonschema + six + numpy + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python tools to handle ASDF files"; + homepage = https://github.com/spacetelescope/asdf; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54c6d8bb439e..d9acf2bec2fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,6 +175,8 @@ in { asana = callPackage ../development/python-modules/asana { }; + asdf = callPackage ../development/python-modules/asdf { }; + asciimatics = callPackage ../development/python-modules/asciimatics { }; asciitree = callPackage ../development/python-modules/asciitree { }; From ccdd0930644a8db65d121cb95b3da73c72e6f08a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 13:03:37 -0400 Subject: [PATCH 234/248] pythonPackages.glymur: init at 0.8.18 --- .../python-modules/glymur/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/glymur/default.nix diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix new file mode 100644 index 000000000000..3da367c445fb --- /dev/null +++ b/pkgs/development/python-modules/glymur/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, numpy +, setuptools +, python +, scikitimage +, openjpeg +, procps +, contextlib2 +, mock +, importlib-resources +, isPy27 +}: + +buildPythonPackage rec { + pname = "glymur"; + version = "0.8.18"; + + src = fetchFromGitHub { + owner = "quintusdias"; + repo = pname; + rev = "v${version}"; + sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7"; + }; + + propagatedBuildInputs = [ + numpy + ] ++ stdenv.lib.optional isPy27 [ contextlib2 mock importlib-resources ]; + + checkInputs = [ + scikitimage + procps + ]; + + postConfigure = '' + substituteInPlace glymur/config.py \ + --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" + ''; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + description = "Tools for accessing JPEG2000 files"; + homepage = https://github.com/quintusdias/glymur; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9acf2bec2fc..cae06c67d137 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -582,6 +582,8 @@ in { globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + glymur = callPackage ../development/python-modules/glymur { }; + glom = callPackage ../development/python-modules/glom { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; From daf811fa6d19d1cba144d92455e4a33805680e82 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 13:07:47 -0400 Subject: [PATCH 235/248] pythonPackages.drms: init at 0.5.6 --- .../python-modules/drms/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/drms/default.nix diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix new file mode 100644 index 000000000000..4d322695ebf2 --- /dev/null +++ b/pkgs/development/python-modules/drms/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pandas +, six +, pytest +, python +}: + +buildPythonPackage rec { + pname = "drms"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "95cac0e14532893a44eeab8e329ddb76150e6848153d8cb1e4e08ba55569e6af"; + }; + + propagatedBuildInputs = [ + numpy + pandas + six + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + ${python.interpreter} -m drms.tests + ''; + + meta = with lib; { + description = "Access HMI, AIA and MDI data with Python"; + homepage = https://github.com/sunpy/drms; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cae06c67d137..30058901ed11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2123,6 +2123,8 @@ in { dropbox = callPackage ../development/python-modules/dropbox {}; + drms = callPackage ../development/python-modules/drms { }; + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; From 85e027d914875e4b963639f58d73770040345d5b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 13:47:36 -0400 Subject: [PATCH 236/248] pythonPackages.pytest_3: refactor fix broken build of old package --- pkgs/development/python-modules/pytest/3.10.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix index f24cab8af1c6..2b4dd41bc2ec 100644 --- a/pkgs/development/python-modules/pytest/3.10.nix +++ b/pkgs/development/python-modules/pytest/3.10.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" + $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py runHook postCheck ''; From 52840a2557eb6f44e045039b72d1deae5940fbb0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Jul 2019 13:48:07 -0400 Subject: [PATCH 237/248] pythonPackages.sunpy: init at 1.0.2 --- .../python-modules/sunpy/default.nix | 80 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/sunpy/default.nix diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix new file mode 100644 index 000000000000..252eafec465f --- /dev/null +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, matplotlib +, pandas +, astropy +, parfive +, pythonOlder +, sqlalchemy +, scikitimage +, glymur +, beautifulsoup4 +, drms +, python-dateutil +, zeep +, tqdm +, asdf +, astropy-helpers +, hypothesis +, pytest-astropy +, pytestcov +, pytest-mock +}: + +buildPythonPackage rec { + pname = "sunpy"; + version = "1.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sunpy"; + repo = pname; + rev = "v${version}"; + sha256 = "0dmfzxxsjjax9wf2ljyl4z07pxbshrj828zi5qnsa9rgk4148q9x"; + }; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + pandas + astropy + astropy-helpers + parfive + sqlalchemy + scikitimage + glymur + beautifulsoup4 + drms + python-dateutil + zeep + tqdm + asdf + ]; + + checkInputs = [ + hypothesis + pytest-astropy + pytestcov + pytest-mock + ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + export HOME=$(mktemp -d) + ''; + + checkPhase = '' + pytest sunpy -k "not test_rotation" + ''; + + meta = with lib; { + description = "SunPy: Python for Solar Physics"; + homepage = https://sunpy.org; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30058901ed11..cc034d701c48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2613,6 +2613,8 @@ in { subliminal = callPackage ../development/python-modules/subliminal {}; + sunpy = callPackage ../development/python-modules/sunpy { }; + hyperlink = callPackage ../development/python-modules/hyperlink {}; zope_copy = callPackage ../development/python-modules/zope_copy {}; From 28f1c7765d79c80a7d680db4eeaed4e189eafa0f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Jul 2019 07:57:16 -0400 Subject: [PATCH 238/248] pythonPackages.modeled: init at 0.1.8 --- .../python-modules/modeled/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/modeled/default.nix diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix new file mode 100644 index 000000000000..298c69194f20 --- /dev/null +++ b/pkgs/development/python-modules/modeled/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zetup +, six +, moretools +, pathpy +, pytest +}: + +buildPythonPackage rec { + pname = "modeled"; + version = "0.1.8"; + + src = fetchPypi { + extension = "zip"; + inherit pname version; + sha256 = "64934c68cfcdb75ed4a1ccadcfd5d2a46bf1b8e8e81dde89ef0f042c401e94f1"; + }; + + buildInputs = [ + zetup + ]; + + propagatedBuildInputs = [ + six + moretools + pathpy + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "Universal data modeling for Python"; + homepage = https://bitbucket.org/userzimmermann/python-modeled; + license = licenses.lgpl3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc034d701c48..cc08960544cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3620,6 +3620,8 @@ in { mockito = callPackage ../development/python-modules/mockito { }; + modeled = callPackage ../development/python-modules/modeled { }; + moderngl = callPackage ../development/python-modules/moderngl { }; modestmaps = callPackage ../development/python-modules/modestmaps { }; From bdd84a0257eb4f154229fbe55600554485dc1e8a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Jul 2019 07:58:23 -0400 Subject: [PATCH 239/248] pythonPackages.zetup: refactor fix broken --- pkgs/development/python-modules/zetup/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 89e9e9691401..ee9270f3596d 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkPhase = '' - py.test test + py.test test -k "not TestObject" ''; checkInputs = [ pytest_3 pathpy nbconvert ]; From 2c08f7daddf2528c1753de4ff8ce502ce00f825e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Jul 2019 07:59:05 -0400 Subject: [PATCH 240/248] pythonPackages.robotframework-tools: 0.1a114 -> 0.1rc4 --- .../robotframework-tools/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index be8b0b9454d7..97bc9de0bf75 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -7,25 +7,44 @@ , pathpy , six , zetup +, modeled +, pytest }: buildPythonPackage rec { - version = "0.1a115"; + version = "0.1rc4"; pname = "robotframework-tools"; src = fetchPypi { inherit pname version; - sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q"; + sha256 = "0377ikajf6c3zcy3lc0kh4w9zmlqyplk2c2hb0yyc7h3jnfnya96"; }; - nativeBuildInputs = [ zetup ]; + nativeBuildInputs = [ + zetup + ]; - propagatedBuildInputs = [ robotframework moretools pathpy six ]; + propagatedBuildInputs = [ + robotframework + moretools + pathpy + six + modeled + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # tests require network + pytest test --ignore test/remote/test_remote.py + ''; meta = with stdenv.lib; { description = "Python Tools for Robot Framework and Test Libraries"; homepage = https://bitbucket.org/userzimmermann/robotframework-tools; license = licenses.gpl3; - broken = isPy3k; # 2019-03-15, missing dependency robotframework-python3 + maintainers = [ maintainers.costrouc ]; }; } From 124d108d7d81aeb18053bc0315182e7889ee7148 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Jul 2019 08:00:08 -0400 Subject: [PATCH 241/248] pythonPackages.pytest-mpl: refactor fix broken python 2 test --- pkgs/development/python-modules/pytest-mpl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index c3bd4c59f049..0baaa9c5dfca 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -25,11 +25,15 @@ buildPythonPackage rec { ]; checkPhase = '' + export HOME=$(mktemp -d) + mkdir -p $HOME/.config/matplotlib + echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + pytest ''; meta = with lib; { - description = "pytest plugin to help with testing figures output from Matplotlib"; + description = "Pytest plugin to help with testing figures output from Matplotlib"; homepage = https://github.com/matplotlib/pytest-mpl; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; From a1fd2125365aee6eeb8c363f59189ac0590e62ec Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Jul 2019 08:00:36 -0400 Subject: [PATCH 242/248] pythonPackages.odo: refactor 0.5.1 -> unstable-2019-07-16 --- .../python-modules/odo/default.nix | 46 ++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix index f18420b676b7..6e82119faa57 100644 --- a/pkgs/development/python-modules/odo/default.nix +++ b/pkgs/development/python-modules/odo/default.nix @@ -13,32 +13,46 @@ buildPythonPackage rec { pname = "odo"; - version= "0.5.1"; - + version= "unstable-2019-07-16"; src = fetchFromGitHub { owner = "blaze"; repo = pname; - rev = version; - sha256 = "142f4jvaqjn0dq6rvlk7d7mzcmc255a9z4nxc1b3a862hp4gvijs"; + rev = "9fce6690b3666160681833540de6c55e922de5eb"; + sha256 = "0givkd5agr05wrf72fbghdaav6gplx7c069ngs1ip385v72ifsl9"; }; - checkInputs = [ pytest dask ]; - propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ]; + checkInputs = [ + pytest + dask + ]; - # Disable failing tests - # https://github.com/blaze/odo/issues/609 - checkPhase = '' - py.test -k "not test_numpy_asserts_type_after_dataframe" odo/tests + propagatedBuildInputs = [ + datashape + numpy + pandas + toolz + multipledispatch + networkx + ]; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "versioneer.get_version()" "'0.5.1'" ''; - meta = { + # disable 6/315 tests + checkPhase = '' + pytest odo -k "not test_insert_to_ooc \ + and not test_datetime_index \ + and not test_different_encoding \ + and not test_numpy_asserts_type_after_dataframe" + ''; + + meta = with lib; { homepage = https://github.com/ContinuumIO/odo; description = "Data migration utilities"; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ fridh ]; - # incomaptible with Networkx 2 - # see https://github.com/blaze/odo/pull/601 - broken = true; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ fridh costrouc ]; }; } From a0fae1b615d2e53a90b64cba88dcf091b72b2d65 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Jul 2019 08:01:31 -0400 Subject: [PATCH 243/248] pythonPackages.decorator: 4.3.2 -> 4.4.0 --- pkgs/development/python-modules/decorator/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index f4395245a81f..b8c784023c23 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,16 +5,17 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.3.2"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e"; + sha256 = "1pi54wqj2p6ka13x7q8d5zgqg9bcf7m5d00l7x5bi204qmhn65c6"; }; - meta = { + meta = with lib; { homepage = https://pypi.python.org/pypi/decorator; description = "Better living through Python with decorators"; license = lib.licenses.mit; + maintainers = [ maintainers.costrouc ]; }; -} \ No newline at end of file +} From 0f5e19cc2bcc382db1be8011a299fca7bf1e281e Mon Sep 17 00:00:00 2001 From: Vladyslav Burzakovskyy Date: Tue, 9 Jul 2019 15:43:17 +0200 Subject: [PATCH 244/248] pythonPackages.isoweek: init at 1.3.3 --- .../python-modules/isoweek/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/isoweek/default.nix diff --git a/pkgs/development/python-modules/isoweek/default.nix b/pkgs/development/python-modules/isoweek/default.nix new file mode 100644 index 000000000000..65de70b20b5e --- /dev/null +++ b/pkgs/development/python-modules/isoweek/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "isoweek"; + version = "1.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s7zsf0pab0l9gn6456qadnz5i5h90hafcjwnhx5mq23qjxggwvk"; + }; + + meta = with lib; { + description = "The module provide the class Week. Instances represent specific weeks spanning Monday to Sunday."; + homepage = "https://github.com/gisle/isoweek"; + license = licenses.bsd2; + maintainers = with maintainers; [ mrmebelman ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc08960544cc..43d76a7fa4ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3320,6 +3320,8 @@ in { isort = callPackage ../development/python-modules/isort {}; + isoweek = callPackage ../development/python-modules/isoweek {}; + jabberbot = callPackage ../development/python-modules/jabberbot {}; jedi = callPackage ../development/python-modules/jedi { }; From d4e5748c1b919718e51cb03d6958cf06ce5d5308 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sat, 6 Jul 2019 09:29:58 -0700 Subject: [PATCH 245/248] nixos/openldap: fix assertion In commit d43dc68db3f414a527cad632a3f1fb868fc1c902, @Mic92 split the rootpw option to allow specifying it in a file kept outside the Nix store, as an alternative to specifying the password directly in the config. Prior to that, rootpw's type was `str`, but in order to allow both alternatives, it had to become `nullOr str` with a default of `null`. So I can see why this assertion, that either rootpw or rootpwFile are specified, makes sense to add here. However, these options aren't used if the configDir option is set, so as written this assertion breaks valid configurations, including the configuration used by nixos/tests/ldap.nix. So this patch fixes the assertion so that it doesn't fire if configDir is set. --- nixos/modules/services/databases/openldap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index c2f458c03794..d8e2c715afb9 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -237,8 +237,8 @@ in config = mkIf cfg.enable { assertions = [ { - assertion = cfg.rootpwFile != null || cfg.rootpw != null; - message = "Either services.openldap.rootpw or services.openldap.rootpwFile must be set"; + assertion = cfg.configDir != null || cfg.rootpwFile != null || cfg.rootpw != null; + message = "services.openldap: Unless configDir is set, either rootpw or rootpwFile must be set"; } ]; From 7c355b6a6df7ccf13f75ed14d3221a950ed05706 Mon Sep 17 00:00:00 2001 From: Taito Horiuchi Date: Fri, 28 Jun 2019 12:27:43 +0300 Subject: [PATCH 246/248] pythonPackages.robotframework: 3.0.4 -> 3.1.2 pythonPackages.robotframework: source file is zip formated --- pkgs/development/python-modules/robotframework/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 6d19feed3fb7..09d98c91203e 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,11 +2,12 @@ buildPythonPackage rec { pname = "robotframework"; - version = "3.0.4"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "ab94257cbd848dfca7148e092d233a12853cc7e840ce8231af9cbb5e7f51aa47"; + sha256 = "f10dd7c0c8c7962a4f80dd1e026b5db731b9391bc6e1f9ebb96d685eb1230dbc"; + extension = "zip"; }; meta = with stdenv.lib; { From 274bb2e34d29a02755998bb5acea71682f6d12f8 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 27 Jun 2019 13:51:23 +0900 Subject: [PATCH 247/248] python3Packages.pyls-mypy: 0.1.3 -> 0.1.6 --- pkgs/development/python-modules/pyls-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index dfba421ae58d..414c2cccbea3 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pyls-mypy"; - version = "0.1.3"; + version = "0.1.6"; src = fetchFromGitHub { owner = "tomv564"; repo = "pyls-mypy"; rev = version; - sha256 = "0v7ghcd1715lxlfq304b7xhchp31ahdd89lf6za4n0l59dz74swh"; + sha256 = "0c1111m9h6f05frkyj6i757q9y2lijpbv8nxmwgp3nqbpkvfnmrk"; }; disabled = !isPy3k; From 2cd892423587d3843b0f6e8dd90ceba92e56becc Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 27 Jun 2019 13:51:49 +0900 Subject: [PATCH 248/248] python3Packages.python-language-server: 0.26.1 -> 0.27.0 --- .../python-modules/python-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 54c5418ae677..084432061d1e 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "003fy8bbvwibnsnyxw1qwg2rxnhbfylqs67ixr6fdnw6mmrzd6fg"; + sha256 = "158wxj2w880jrab7mi4fb3xqnjhmfixqacxjp7whf7jy3zxqrq38"; }; # The tests require all the providers, disable otherwise.