diff options
Diffstat (limited to 'pkgs')
63 files changed, 1244 insertions, 409 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index fbc3d1c36f91..b51acea061f1 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -22,6 +22,9 @@ rec { freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; }; go-ethereum = callPackage ./go-ethereum.nix { }; + hivemind = callPackage ./hivemind.nix { withGui = true; }; + hivemindd = callPackage ./hivemind.nix { withGui = false; }; + litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index b92a656c0833..d2532e0d41e9 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "0.2.1"; + version = "1.0.4"; src = fetchFromGitHub { - owner = "ethcore"; + owner = "paritytech"; repo = "ethabi"; - rev = "fbed04984cab0db8767e01054ee16271b8e36281"; - sha256 = "1zgyyg1i5wmz8l1405yg5jmq4ddq530sl7018pkkc7l6cjj3bbhd"; + rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f"; + sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; }; - depsSha256 = "0srxv0wbhvyflc967lkpd2mx5nk7asx2cbxa0qxvas16wy6vxz52"; + depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz"; meta = { description = "Ethereum function call encoding (ABI) utility"; diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix new file mode 100644 index 000000000000..1b2682f7d4c0 --- /dev/null +++ b/pkgs/applications/altcoins/hivemind.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version; + version = "unstable"; + + src = fetchFromGitHub { + owner = "bitcoin-hivemind"; + repo = "hivemind"; + rev = "147973cfe76867410578d91d6f0a8df105cab4e0"; + sha256 = "1ndqqma1b0sh2gn7cl8d9fg44q0g2g42jr2y0nifkjgfjn3c7l5h"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc protobuf libevent] + ++ optionals stdenv.isLinux [ utillinux ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" + "--with-incompatible-bdb" + ] ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-Peer oracle protocol"; + longDescription= '' + Hivemind is a Peer-to-Peer Oracle Protocol which absorbs accurate data + into a blockchain so that Bitcoin-users can speculate in Prediction + Markets. + ''; + homepage = "https://bitcoinhivemind.com"; + maintainers = with maintainers; [ canndrew ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 60e17982b5be..e9546c16d62b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0w790b9m94m28bx7n94pg2zjxrcjf13228lsb0pl8kyfsk2k2glx"; + sha256 = "10qzhfz34i7x7z5fv5a73a6aiwxvanyn0v825a6yz9qfc2mg4shd"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 4590939b516a..067aff5ee69b 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -3,25 +3,20 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "kakoune-nightly-${version}"; - version = "2017-02-09"; + name = "kakoune-unstable-${version}"; + version = "2017-04-12"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14"; - sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi"; + rev = "7482d117cc85523e840dff595134dcb9cdc62207"; + sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh"; }; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; - buildPhase = '' - sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile - substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex" + postPatch = '' export PREFIX=$out - (cd src && make ) - ''; - - installPhase = '' - (cd src && make install) + cd src + sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile ''; meta = { diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 645880a13e05..bfc3b7c79faf 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -36,15 +36,6 @@ in stdenv.mkDerivation rec { --sysconfdir=/etc ${optionalString (!enableNls) "--disable-nls"} ${optionalString enableTiny "--enable-tiny"} - '' - # Unclear why (perhaps an impurity?) but for some reason it decides that REG_ENHANCED is available - # during configure but then can't find it at build time. - + optionalString stdenv.isDarwin '' - nano_cv_flag_reg_extended=REG_EXTENDED - ''; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace src/text.c --replace "__time_t" "time_t" ''; postInstall = '' diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 05a4db7a2500..895299f75b64 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.18.1"; + version = "0.20"; goPackagePath = "github.com/spf13/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81"; + sha256 = "1dzvwldhf73ycmazq9xnridj7p3m3q6qv47rvk3vgj0xj6c107ij"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 0a95b083c0b8..e2e2d093dded 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,353 +1,380 @@ [ { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + url = "https://github.com/BurntSushi/toml"; + rev = "99064174e013895bbd9b025c31100bd1d9b590ca"; + sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"; }; } { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; }; } { - goPackagePath = "github.com/gorilla/websocket"; + goPackagePath = "github.com/bep/gitmap"; fetch = { type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a622679ebd7a3b813862379232f645f8e690e43f"; - sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + url = "https://github.com/bep/gitmap"; + rev = "dcb907b39a0690430d435eb8f63cd8811961231f"; + sha256 = "0bw4spyiidrvd8rls9g57mwxykfmv57qi9mcnjadbqrpv92br856"; }; } { - goPackagePath = "github.com/inconshreveable/mousetrap"; + goPackagePath = "github.com/bep/inflect"; fetch = { type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; - sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + url = "https://github.com/bep/inflect"; + rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; + sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; }; } { - goPackagePath = "github.com/kardianos/osext"; + goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + url = "https://github.com/chaseadamsio/goorgeous"; + rev = "42b0ec184e93fc9fd2c0402f099a4939aba68407"; + sha256 = "00mlv64q34d0vdq7p88hlsck4lsnk2pnxghx1jzy99r7wvs34am3"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "54864211433d45cb780682431585b3e573b49e4a"; - sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"; + sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; }; } { - goPackagePath = "github.com/hashicorp/go-multierror"; + goPackagePath = "github.com/dchest/cssmin"; fetch = { type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; - sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + url = "https://github.com/dchest/cssmin"; + rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; + sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/eknkc/amber"; fetch = { type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + url = "https://github.com/eknkc/amber"; + rev = "9be5e8aae85904f63d505e0c00e5e0881d44ef4d"; + sha256 = "1hmsqxwajgpmg1svzjqxf4n81qy7qs6m39cjv69jkhz9lpwc305j"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/fortytw2/leaktest"; fetch = { type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + url = "https://github.com/fortytw2/leaktest"; + rev = "0db74e8cd5adacfcc982838c6e185789e4b44e14"; + sha256 = "11s04f1pliqw185ai1dbpqn5rahc3yzv2fp5zdanjvql4168499m"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; + sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; }; } { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; - sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + url = "https://github.com/gorilla/websocket"; + rev = "adf16b31781325cbd41085c5be901d95b4d1f33d"; + sha256 = "0f93k3igbqqwsl734lxnkbfajc4lcyzg4szg15vb26qn939b5ccx"; }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/hashicorp/hcl"; fetch = { type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; - sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; + url = "https://github.com/hashicorp/hcl"; + rev = "80e628d796135357b3d2e33a985c666b9f35eee1"; + sha256 = "0l85a7ir60hycb3mqsxmrz18f1kax03k55afsahr8xf46pjp5pyb"; }; } { - goPackagePath = "github.com/yosssi/ace"; + goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { type = "git"; - url = "https://github.com/yosssi/ace"; - rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d"; - sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } { - goPackagePath = "github.com/spf13/viper"; + goPackagePath = "github.com/kardianos/osext"; fetch = { type = "git"; - url = "https://github.com/spf13/viper"; - rev = "ec4eb2fa8549869ae7a2accd4fcc83d1c0555c15"; - sha256 = "018niqyrg09andj3g08jalflq2ypz9bp7qb1mbk50kfly29lkih7"; + url = "https://github.com/kardianos/osext"; + rev = "9b883c5eb462dd5cb1b0a7a104fe86bc6b9bd391"; + sha256 = "0cyhbgsxwdfnwy57pdfivvjfy951gxbg9qlsjbwm6vs3gfws07mr"; }; } { - goPackagePath = "github.com/spf13/pflag"; + goPackagePath = "github.com/kr/fs"; fetch = { type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "b83537d79690b75cac5e021b036ae16792bf0f20"; - sha256 = "19blhq00rnynv11nnvixisx4h1429rp5bik13k661ixw0421qqyx"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; }; } { - goPackagePath = "github.com/spf13/jwalterweatherman"; + goPackagePath = "github.com/kyokomi/emoji"; fetch = { type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; - sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; + url = "https://github.com/kyokomi/emoji"; + rev = "7e06b236c489543f53868841f188a294e3383eab"; + sha256 = "1q2j0k5a8qqka1syc9zwmf1cvm6k628kf2g1nmghp2kdr7q1xmyb"; }; } { - goPackagePath = "github.com/fsnotify/fsnotify"; + goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; - sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + url = "https://github.com/magiconair/properties"; + rev = "9c47895dc1ce54302908ab8a43385d1f5df2c11c"; + sha256 = "0497bacr3gc7352gcwb07wyw7vb9m04xfd82mw0hpnzzw3kfnav3"; }; } { - goPackagePath = "github.com/magiconair/properties"; + goPackagePath = "github.com/miekg/mmark"; fetch = { type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c265cfa48dda6474e208715ca93e987829f572f8"; - sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"; + url = "https://github.com/miekg/mmark"; + rev = "2d4f1dd6f87cad351b9323bbaa6f6c586f0c4bee"; + sha256 = "1ak54nvmryx73g16q6qaac9x0klhbxxmk1j6zlnfvvibnkj2pa90"; }; } { - goPackagePath = "github.com/bep/inflect"; + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; - url = "https://github.com/bep/inflect"; - rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; - sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "bfdb1a85537d60bc7e954e600c250219ea497417"; + sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8"; }; } { - goPackagePath = "github.com/eknkc/amber"; + goPackagePath = "github.com/nicksnyder/go-i18n"; fetch = { type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "91774f050c1453128146169b626489e60108ec03"; - sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"; + url = "https://github.com/nicksnyder/go-i18n"; + rev = "4df9b06c0c1ffd8538a3cfa9d888f8f52985b302"; + sha256 = "1cbbvq9l822p7vrscvaah3zybsj5yxcsq9fgvgsg062njbb0x41f"; }; } { - goPackagePath = "github.com/spf13/afero"; + goPackagePath = "github.com/pelletier/go-buffruneio"; fetch = { type = "git"; - url = "https://github.com/spf13/afero"; - rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8"; - sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"; + url = "https://github.com/pelletier/go-buffruneio"; + rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; + sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; }; } { - goPackagePath = "github.com/spf13/cast"; + goPackagePath = "github.com/pelletier/go-toml"; fetch = { type = "git"; - url = "https://github.com/spf13/cast"; - rev = "27b586b42e29bec072fe7379259cc719e1289da6"; - sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"; + url = "https://github.com/pelletier/go-toml"; + rev = "fee7787d3f811af92276f5ff10107092e95b7a1d"; + sha256 = "0srx5hr35f9qzn5dnqqa0msyjknwn7vcq0jmlkvfxgaq0ygd6s3r"; }; } { - goPackagePath = "github.com/spf13/cobra"; + goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7"; - sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"; + url = "https://github.com/pkg/errors"; + rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; + sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; }; } { - goPackagePath = "github.com/dchest/cssmin"; + goPackagePath = "github.com/pkg/sftp"; fetch = { type = "git"; - url = "https://github.com/dchest/cssmin"; - rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; - sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; + url = "https://github.com/pkg/sftp"; + rev = "4d0e916071f68db74f8a73926335f809396d6b42"; + sha256 = "0l4n4ld0lx53s0hgz5rhk8gn7kr51adsr0cs6wlqm296xlcfp52h"; }; } { - goPackagePath = "github.com/spf13/fsync"; + goPackagePath = "github.com/russross/blackfriday"; fetch = { type = "git"; - url = "https://github.com/spf13/fsync"; - rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b"; - sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z"; + url = "https://github.com/russross/blackfriday"; + rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; + sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; }; } { - goPackagePath = "github.com/cpuguy83/go-md2man"; + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; - sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; + sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; }; } { - goPackagePath = "github.com/miekg/mmark"; + goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; - url = "https://github.com/miekg/mmark"; - rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a"; - sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"; + url = "https://github.com/spf13/afero"; + rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; + sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; }; } { - goPackagePath = "github.com/spf13/nitro"; + goPackagePath = "github.com/spf13/cast"; fetch = { type = "git"; - url = "https://github.com/spf13/nitro"; - rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; - sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + url = "https://github.com/spf13/cast"; + rev = "ce135a4ebeee6cfe9a26c93ee0d37825f26113c7"; + sha256 = "1a2ahiyynn1kdjznqvzjfm5g5bc098gfw857bw9qikhdljvsnjiy"; }; } { - goPackagePath = "github.com/PuerkitoBio/purell"; + goPackagePath = "github.com/spf13/cobra"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3"; - sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"; + url = "https://github.com/spf13/cobra"; + rev = "7be4beda01ec05d0b93d80b3facd2b6f44080d94"; + sha256 = "0jd2ya8kn763z16c3q5jl1x6raw2f3xq3vbaf4ppiy70zqzscmyg"; }; } { - goPackagePath = "github.com/pkg/sftp"; + goPackagePath = "github.com/spf13/fsync"; fetch = { type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472"; - sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"; + url = "https://github.com/spf13/fsync"; + rev = "12a01e648f05a938100a26858d2d59a120307a18"; + sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; }; } { - goPackagePath = "github.com/kr/fs"; + goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { type = "git"; - url = "https://github.com/kr/fs"; - rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; - sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66"; + sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8"; }; } { - goPackagePath = "github.com/kyokomi/emoji"; + goPackagePath = "github.com/spf13/nitro"; fetch = { type = "git"; - url = "https://github.com/kyokomi/emoji"; - rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9"; - sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"; + url = "https://github.com/spf13/nitro"; + rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; }; } { - goPackagePath = "github.com/pkg/errors"; + goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; - url = "https://github.com/pkg/errors"; - rev = "494e70f7620561491c2ca11e185bbef4b70060da"; - sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"; + url = "https://github.com/spf13/pflag"; + rev = "9ff6c6923cfffbcd502984b8e0c80539a94968b7"; + sha256 = "0mfrxzyl8x7araa126lh8l3sihbbgfbzgkrg3v3cx7y4n3wrsqvn"; }; } { - goPackagePath = "github.com/PuerkitoBio/urlesc"; + goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587"; - sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"; + url = "https://github.com/spf13/viper"; + rev = "7538d73b4eb9511d85a9f1dfef202eeb8ac260f4"; + sha256 = "0i4q715bjp018zw1b52zgx79j4s7s8l26dyrw8cslshibkx0frnl"; }; } { - goPackagePath = "github.com/nicksnyder/go-i18n"; + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; - url = "https://github.com/nicksnyder/go-i18n"; - rev = "e6c90c3ceece7f43060f843b495c3c9c031f5575"; - sha256 = "1i1hqvq05lk12wnrhayca66pvfbyjnj7dm0lr0hn5qhb2i8k84kd"; + url = "https://github.com/stretchr/testify"; + rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; + sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; }; } { - goPackagePath = "github.com/pelletier/go-toml"; + goPackagePath = "github.com/yosssi/ace"; fetch = { type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "45932ad32dfdd20826f5671da37a5f3ce9f26a8d"; - sha256 = "1rs25xqlpz2j9gqii144qnkvhsgzhwgy9ild7yvxhnbs2mybgix7"; + url = "https://github.com/yosssi/ace"; + rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"; + sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } { - goPackagePath = "github.com/pelletier/go-buffruneio"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d"; - sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f"; + url = "https://go.googlesource.com/crypto"; + rev = "453249f01cfeb54c3d549ddb75ff152ca243f9d8"; + sha256 = "0akybbzgi3v507a39bgnkk79rfhj8gflr7538g5a0177z5i9ygwa"; }; } { - goPackagePath = "github.com/bep/gitmap"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; - url = "https://github.com/bep/gitmap"; - rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac"; - sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g"; + url = "https://go.googlesource.com/net"; + rev = "906cda9512f77671ab44f8c8563b13a8e707b230"; + sha256 = "0aa33n5a2zzrm2pnjyc3xkdmf8hq2qpafgdp8v6fxfb0swqjl2n3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547"; + sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "0ad425fe45e885577bef05dc1c50f72e33188b16"; + sha256 = "1jz0i8iagfd703flx5z006kisjixpm8iy4hiwywgbh31wypsxxyl"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a3f3340b5840cee44f372bddb5880fcbc419b46a"; + sha256 = "1djb53a8ikwgkfpf8namgf4d8pq1mq6q9q2c7q0z8x4dxf3whxj7"; }; } ] diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 6dd0f532f183..753d27b33767 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 = "11639"; + version = "11826"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1xq074jfk58gh5xmm8s9sjbcbnl34dpx7wsgq9n60phciya90sfb"; + sha256 = "0x59n6klkxkaqcqgbkscdynyp0grfxdil2fxmg710yp8vkzg0zk2"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 8792a07e3e9b..cdde0beb8270 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,26 +1,33 @@ -{ stdenv, lib, cmake, plasma-framework, fetchFromGitHub }: +{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }: -let version = "0.5.98"; in +let version = "0.6.0"; -stdenv.mkDerivation { - name = "latte-dock-${version}"; + unwrapped = stdenv.mkDerivation { + name = "latte-dock-${version}"; - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "Latte-Dock"; - rev = version; - sha256 = "0z02ipbbv0dmcxs2g3dq5h62klhijni1i4ikq903hjg0j2cqg5xh"; - }; + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "Latte-Dock"; + rev = "v${version}"; + sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv"; + }; - buildInputs = [ plasma-framework ]; + buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { - description = "Dock-style app launcher based on Plasma frameworks"; - homepage = https://github.com/psifidotos/Latte-Dock; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = [ maintainers.benley ]; - }; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Dock-style app launcher based on Plasma frameworks"; + homepage = https://github.com/psifidotos/Latte-Dock; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.benley ]; + }; + }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/latte-dock" ]; } diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f202aee38283..581a45da3d8c 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "25.0.0.127"; + version = "25.0.0.148"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1gf0ncclkk3h4vj9kkhbqj1nnnm54gwm5mdcs4p4pl8i339scs14"; + sha256 = "1888n0mbzhbvi95kq19fzw310p7nr9h3g5d3nyzq5fnvj0lcfxsf"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 72a1f171dec6..bf0b91544ad0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -60,7 +60,7 @@ let arch = - if stdenv.system == "x86_64-linux" then + if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "i686-linux" then "i386" @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "25.0.0.127"; + version = "25.0.0.148"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0d37rwbqszl593pggph8pm8jwn05fppys7q8vk1jrk9jaz262iva" + "1jxxnbd357ndw8b64lw4pwkg9j0shy0ns7xw0f36awimq7bclr8d" else - "0lhngdx1q51kfpw3a961h9p9n1fnspk9pmg21i069hvd0h143arx" + "1k0zyy4mz307r7ph4pnmyqaa0fdw2f52apala6dbrys0wdl05yfg" else if arch == "x86_64" then - "1yasj9xzmb6ly9209b1hmrqrzxrr1bafsfjszsr3yf994hql6nzn" + "0n77a2z0928vd4bjgx69igzxvn8l9wrfh79j6knygdpnsbr3pybj" else - "02vs12cm6fpl2fif1lij9y15m89wk6aizc8sbjiw6w59wixn3p9d"; + "1cb1h37av4icfhl4vjngsa3nfcrcdvzliwxdg22rshimlkfgr7vx"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 178b86b61c66..4d65a7e9a629 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,15 +49,13 @@ let arch = - if stdenv.system == "x86_64-linux" then + if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then - "i386" else throw "Flash Player is not supported on this platform"; in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "25.0.0.127"; + version = "25.0.0.148"; src = fetchurl { url = @@ -67,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51" + "1pkzpip8d3m92kyzap00xxq40yilgmaqnc47nak3i7gnbic8fa2r" else - "0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2"; + "0xxsbxnkf9xnljy6sn61jqx9xd1w0lm5mbw4ca7xk5rkc84ik91z"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index aad5d1a80326..76984fed3404 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -49,20 +49,9 @@ in { sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - terraform_0_9_2 = generic { - version = "0.9.2"; - sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl"; - - patches = [ - (fetchpatch { - url = "https://github.com/hashicorp/terraform/pull/13237.patch"; - sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm"; - }) - (fetchpatch { - url = "https://github.com/hashicorp/terraform/pull/13248.patch"; - sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m"; - }) - ]; + terraform_0_9_3 = generic { + version = "0.9.3"; + sha256 = "00z72lwv0cprz1jjy0cr8dicl00zwc1zwsxzjssqnq0187sswkxw"; postPatch = '' rm builtin/providers/dns/data_dns_cname_record_set_test.go diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index bb4a4a710094..b491f287e701 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,25 +1,27 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.7.2"; + name = "davmail-4.8.0"; src = fetchurl { - url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz"; - sha256 = "196jr44kksb197biz984z664llf9z3d8rlnjm2iqcmgkjhx1mgy3"; + url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz"; + sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - meta = { + installPhase = '' + mkdir -p $out/share/davmail + cp -R ./* $out/share/davmail + makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} + ''; + + meta = with stdenv.lib; { + homepage = http://davmail.sourceforce.net/; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - maintainers = [ stdenv.lib.maintainers.hinton ]; - platforms = stdenv.lib.platforms.all; - homepage = "http://davmail.sourceforce.net/"; - license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.hinton ]; + platforms = platforms.all; + license = licenses.gpl2; }; - - installPhase = '' - mkdir -p $out/bin - cp ./* $out/bin/ -R - wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} - ''; } diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix new file mode 100644 index 000000000000..ed78274c799d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }: + +let + rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; + +in stdenv.mkDerivation rec { + name = "tensor-git-${stdenv.lib.strings.substring 0 8 rev}"; + + src = fetchgit { + url = "https://github.com/davidar/tensor.git"; + fetchSubmodules = true; + inherit rev; + sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + }; + + parallelBuilding = true; + + buildInputs = [ qtbase qtquickcontrols ]; + nativeBuildInputs = [ qmakeHook makeQtWrapper ]; + + desktopItem = makeDesktopItem { + name = "tensor"; + exec = "@bin@"; + icon = "tensor.png"; + comment = meta.description; + desktopName = "Tensor Matrix Client"; + genericName = meta.description; + categories = "Chat;Utility"; + mimeType = "text/xml"; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 tensor $out/bin/tensor + install -Dm644 client/logo.png \ + $out/share/icons/hicolor/512x512/apps/tensor.png + install -Dm644 ${desktopItem}/share/applications/tensor.desktop \ + $out/share/applications/tensor.desktop + + wrapQtProgram $out/bin/tensor + + substituteInPlace $out/share/applications/tensor.desktop \ + --subst-var-by bin $out/bin/tensor + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://matrix.org/docs/projects/client/tensor.html; + description = "Cross-platform Qt5/QML-based Matrix client"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 92d1a3446c0d..8eb1169b5a24 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -20,11 +20,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1axdcylyv0p194y6lj1jx127g5yc74zqzzxdc014cjw02bd1x125"; + sha256 = "1b8dggq5x1b77a9i9250b3jhv2iddfzhr9rix1yfzckdms65mr8b"; }; patchPhase = optionalString (openssl != null) '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 661d499d34e6..69286202823b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -7,6 +7,7 @@ , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , enableGTK3 ? false, gtk3, wrapGAppsHook +, enableCalendar ? true , debugBuild ? false , # If you want the resulting program to call itself "Thunderbird" instead # of "Earlybird" or whatever, enable this option. However, those @@ -77,6 +78,7 @@ stdenv.mkDerivation rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" ] + ++ lib.optional enableCalendar "--enable-calendar" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--disable-debug-symbols" diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 288fa4383610..5c9e96c65277 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -9,7 +9,7 @@ let mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]); + deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); tvldpath64 = lib.makeLibraryPath (deps pkgs); in @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ - $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \ + $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop - for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do + for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do echo "patching $i" - patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true + patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true done - for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do + for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do echo "patching $i" - patchelf --set-rpath ${tvldpath32} $i || true + patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true done ${if stdenv.system == "x86_64-linux" then '' patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga ]; + maintainers = with maintainers; [ jagajaga dasuxullebt ]; }; } diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix new file mode 100644 index 000000000000..a45e5df2f528 --- /dev/null +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake, gcc, zlib }: + +stdenv.mkDerivation rec { + name = "diamond-0.8.36"; + + src = fetchurl { + url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz"; + sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; + }; + + patches = [ + ./diamond-0.8.36-no-warning.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + description = "Accelerated BLAST compatible local sequence aligner"; + longDescription = '' + A sequence aligner for protein and translated DNA + searches and functions as a drop-in replacement for the NCBI BLAST + software tools. It is suitable for protein-protein search as well as + DNA-protein search on short reads and longer sequences including contigs + and assemblies, providing a speedup of BLAST ranging up to x20,000. + + DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter). + + If you use DIAMOND in published research, please cite + B. Buchfink, Xie C., D. Huson, + "Fast and sensitive protein alignment using DIAMOND", + Nature Methods 12, 59-60 (2015). + ''; + homepage = https://github.com/bbuchfink/diamond; + license = { + fullName = "University of Tuebingen, Benjamin Buchfink"; + url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING; + }; + maintainers = [ maintainers.metabar ]; + }; +} diff --git a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch new file mode 100644 index 000000000000..a16d475c5564 --- /dev/null +++ b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch @@ -0,0 +1,20 @@ +diff -u -r diamond-0.8.36/src/dp/scalar_traceback.h diamond-0.8.36-patched/src/dp/scalar_traceback.h +--- diamond-0.8.36/src/dp/scalar_traceback.h 2017-02-06 16:32:05.000000000 +0100 ++++ diamond-0.8.36-patched/src/dp/scalar_traceback.h 2017-02-23 15:13:24.000000000 +0100 +@@ -19,6 +19,7 @@ + #ifndef SCALAR_TRACEBACK_H_ + #define SCALAR_TRACEBACK_H_ + ++#include <cmath> + #include <exception> + #include "../basic/score_matrix.h" + +@@ -31,7 +32,7 @@ + template<> + inline bool almost_equal<float>(float x, float y) + { +- return abs(x - y) < 0.001f; ++ return std::abs(x - y) < 0.001f; + } + + template<typename _score> diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix new file mode 100644 index 000000000000..203b68f5e5d2 --- /dev/null +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, mkfontdir, mkfontscale }: + +stdenv.mkDerivation rec { + name = "envypn-font-1.7.1"; + + src = fetchurl { + url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz"; + sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; + }; + + buildInputs = [ mkfontdir mkfontscale ]; + + unpackPhase = '' + tar -xzf $src --strip-components=1 + ''; + + installPhase = '' + # install the pcf fonts (for xorg applications) + fontDir="$out/share/fonts/envypn" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = '' + Readable bitmap font inspired by Envy Code R + ''; + homepage = "http://ywstd.fr/p/pj/#envypn"; + license = licenses.miros; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch new file mode 100644 index 000000000000..3bc871f09063 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch @@ -0,0 +1,13 @@ +diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp +index 2f11ba1d..310f11b4 100644 +--- a/vpn/openvpn/openvpnadvancedwidget.cpp ++++ b/vpn/openvpn/openvpnadvancedwidget.cpp +@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P + connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged); + + // start openVPN process and get its cipher list +- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin"); ++ const QString openVpnBinary = "@openvpn@/bin/openvpn"; + const QStringList ciphersArgs(QLatin1String("--show-ciphers")); + const QStringList versionArgs(QLatin1String("--version")); + diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index da57653bb083..736d59b40412 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -4,7 +4,7 @@ , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem , kxmlgui, mobile_broadband_provider_info , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework -, qca-qt5, qtdeclarative, solid +, qca-qt5, qtdeclarative, solid, openvpn }: plasmaPackage { @@ -14,6 +14,10 @@ plasmaPackage { src = ./0001-mobile-broadband-provider-info-path.patch; inherit mobile_broadband_provider_info; }) + (substituteAll { + src = ./0002-openvpn-binary-path.patch; + inherit openvpn; + }) ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ @@ -23,4 +27,5 @@ plasmaPackage { mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; + enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 81bed7119ea5..12eb8b3a5425 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -60,7 +60,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "7-20161211"; +let version = "7-20170409"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -217,7 +217,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2"; - sha256 = "114rrrm5d5cawmr3161d2wgjlzkb9l1imj1p7fnypwz7y85l1661"; + sha256 = "19197rw1xrpkb8h10lfgn6zj7yj52x95hdmr0x5lg8i4v3i23b67"; }; inherit patches; diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix index c167f4bdd75a..08e74bdb78e9 100644 --- a/pkgs/development/compilers/halvm/2.4.0.nix +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { isHaLVM = true; isGhcjs = false; src = fetchgit { - rev = "6aa72c9b047fd8ddff857c994a5a895461fc3925"; + rev = "65fad65966eb7e60f234453a35aeb564a09d2595"; url = "https://github.com/GaloisInc/HaLVM"; - sha256 = "05cg4w6fw5ajmpmh8g2msprnygmr4isb3pphqhlddfqwyvqhl167"; + sha256 = "09633h38w0z20cz0wcfp9z5kzv8v1zwcv0wqvgq3c8svqbrxp28k"; }; prePatch = '' - sed -i '312 d' Makefile - sed -i '316,446 d' Makefile # Removes RPM packaging + sed -i '305 d' Makefile + sed -i '309,439 d' Makefile # Removes RPM packaging sed -i '20 d' src/scripts/halvm-cabal.in sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in ''; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d39e1bacd71d..0c51f208f462 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodejs +, jailbreak-cabal, hscolour, cpphs, nodejs, lib }: let isCross = (ghc.cross or null) != null; in { pname @@ -53,7 +53,7 @@ , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? [] +, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" } @ args: assert editedCabalFile != null -> revision != null; diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index d83b43ffd75a..b3c3e1732e0d 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { echo "<settings><mirrors>\ <mirror><id>tmpm2</id><url>file://$out/m2</url><mirrorOf>*</mirrorOf></mirror></mirrors>\ <localRepository>$out/m2/</localRepository></settings>" >> $out/m2/settings.xml - ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml + ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${boolToString skipTests} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml cp ./target/*.jar $out/m2/${m2Path} cp -v ./target/*.jar $out/target/ ''; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix new file mode 100644 index 000000000000..bfee99619840 --- /dev/null +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation { + name = "NSPlist-713decf"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "NSPlist"; + rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a"; + sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "Parses .plist files"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix new file mode 100644 index 000000000000..f7703b731b99 --- /dev/null +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: + +stdenv.mkDerivation { + name = "PlistCpp-11615d"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "PlistCpp"; + rev = "11615deab3369356a182dabbf5bae30574967264"; + sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; + }; + + buildInputs = [ cmake boost NSPlist pugixml ]; + + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "CPP bindings for Plist"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gnutls/3.5.10.nix b/pkgs/development/libraries/gnutls/3.5.10.nix new file mode 100644 index 000000000000..a1eab1a84c11 --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.5.10.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, libunistring, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.5.10"; + + src = fetchurl { + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; + sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g"; + }; +}) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index c3560c43e475..77ecd4957f75 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,4 +1,4 @@ -{ callPackage, stdenv, fetchurl, libunistring, darwin, ... } @ args: +{ callPackage, fetchurl, libunistring, ... } @ args: callPackage ./generic.nix (args // rec { version = "3.5.11"; @@ -15,6 +15,4 @@ callPackage ./generic.nix (args // rec { sed '2iexit 77' -i tests/pkgconfig.sh sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c ''; - - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.Security; }) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 8c40ff2be20b..d9d0afa2bde8 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp ''; - patches = [] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ]; - meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = http://pugixml.org/; diff --git a/pkgs/development/libraries/pugixml/no-long-long.patch b/pkgs/development/libraries/pugixml/no-long-long.patch deleted file mode 100644 index 46c54e85a1d0..000000000000 --- a/pkgs/development/libraries/pugixml/no-long-long.patch +++ /dev/null @@ -1,19 +0,0 @@ -Get rid of long-long feature. This breaks on AppleClang compilers. ---- -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40a7ab0..c84f0f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ else() - endif() - - # Enable C++11 long long for compilers that are capable of it --if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -- target_compile_features(pugixml PUBLIC cxx_long_long_type) --endif() -+# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -+# target_compile_features(pugixml PUBLIC cxx_long_long_type) -+# endif() - - set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1) - diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 76912f19ab5f..f4ec02422242 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb ]; propagatedBuildInputs = [ libusb ]; + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { description = "USB traffic redirection protocol"; homepage = http://spice-space.org/page/UsbRedir; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index d3a373ab4dbc..53d5a25a39eb 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,19 +1,30 @@ { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 , ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib -, ppx_tools, result +, ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" }: +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "2.7.1"; + sha256 = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; + } else { + version = "2.6.0"; + sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; + }; +in + stdenv.mkDerivation rec { name = "ocaml-lwt-${version}"; - version = "2.6.0"; + inherit (param) version; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; + inherit (param) sha256; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ] + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ]; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index a26109bd4f95..5e18d1fd6e42 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml , jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04") }: +with lib; + stdenv.mkDerivation { name = "ocaml${ocaml.version}-mtime-0.8.3"; @@ -15,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild opam ] ++ stdenv.lib.optional jsooSupport js_of_ocaml; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${boolToString jsooSupport}"; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; @@ -23,7 +25,7 @@ stdenv.mkDerivation { description = "Monotonic wall-clock time for OCaml"; homepage = http://erratique.ch/software/mtime; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index f9240f7507cf..91ab694eb6f2 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildPhase = '' LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \ - ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"} + ${topkg.buildPhase} --with-lwt ${boolToString withLwt} ''; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index b967728d048c..950395bd7eaa 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -29,7 +29,7 @@ buildOcaml rec { optional withLwt lwt; buildPhase = topkg.buildPhase - + " --with-lwt ${if withLwt then "true" else "false"}"; + + " --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index cb7878ac731e..ba33081486d7 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg , uchar, result, gg, uutf, otfm, js_of_ocaml, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: +with lib; + let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; version = "0.9.0"; webpage = "http://erratique.ch/software/${pname}"; - sob = b: if b then "true" else "false"; in assert versionAtLeast ocaml.version "4.02.0"; @@ -35,13 +36,14 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; buildPhase = topkg.buildPhase - + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}" - + " --with-js_of_ocaml ${sob htmlcBackend}" - + " --with-cairo2 false"; + + " --with-uutf ${boolToString pdfBackend}" + + " --with-otfm ${boolToString pdfBackend}" + + " --with-js_of_ocaml ${boolToString htmlcBackend}" + + " --with-cairo2 false"; inherit (topkg) installPhase; - meta = with stdenv.lib; { + meta = { description = "Declarative 2D vector graphics for OCaml"; longDescription = '' Vg is an OCaml module for declarative 2D vector graphics. In Vg, images diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix new file mode 100644 index 000000000000..9b79d82328f7 --- /dev/null +++ b/pkgs/development/python-modules/distro/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "distro"; + version = "1.0.3"; + + buildInputs = [ pytest pytestcov tox]; + + checkPhase = '' + touch tox.ini + tox + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmjdz1kxspsmps73m2kzhxz86jj43ikx825hmgmwbx793ywv69d"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/nir0s/distro; + description = "Linux Distribution - a Linux OS platform information API."; + license = licenses.asl20; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix new file mode 100644 index 000000000000..0bd569fd4ad3 --- /dev/null +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.1.1"; + pname = "node-semver"; + + buildInputs = [ pytest tox ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/podhmo/python-semver; + description = "A port of node-semver"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix new file mode 100644 index 000000000000..9d90c617fc16 --- /dev/null +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.5"; + pname = "pluginbase"; + + buildInputs = [ pytest tox ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1palagrlszs4f4f5j6npzl4d195vclrlza3qr524z2h758j31y5l"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/mitsuhiko/pluginbase; + description = "A support library for building plugins sytems in Python"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix new file mode 100644 index 000000000000..417e492f7d0b --- /dev/null +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + version = "0.21.2"; + pname = "conan"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0x9s5h81d885xdrjw5x99q18lhmj11kalrs6xnjy2phrr8qzil8c"; + }; + + propagatedBuildInputs = with pythonPackages; [ + requests2 fasteners pyyaml pyjwt colorama patch + bottle pluginbase six distro pylint node-semver + ]; + + # enable tests once all of these pythonPackages available: + # [ nose nose_parameterized mock WebTest codecov ] + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://conan.io; + description = "Decentralized and portable C/C++ package manager"; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 28b6601cab6f..51aaf5e6a79a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.4.1"; - nativeVersion = "0.13"; + name = "gradle-3.5"; + nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1cpria3qry4778pxcmqvnaqcyq36abj1fgw4pq115k3rsj9v27fv"; + sha256 = "046i268zkg89ps7c1sq8yx9lbn9kighh4gcskxmzf3qriiwm0x0b"; }; }; diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 34fc5b0f6202..31692d9bee68 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -101,6 +101,54 @@ let Name = "$(EXECUTABLE_NAME)"; }; } + { + Identifier = "com.apple.package-type.wrapper"; + Type = "PackageType"; + Name = "Wrapper"; + DefaultBuildSettings = { + WRAPPER_SUFFIX = ".bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; + INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; + FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Identifier = "com.apple.package-type.wrapper.application"; + Type = "PackageType"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Application Wrapper"; + DefaultBuildSettings = { + GENERATE_PKGINFO_FILE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } ]; # Based off of the MacOSX Product Types.xcpsec file. All @@ -125,6 +173,39 @@ let Name = "Dynamic Library"; PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle"; + Name = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + }; + PackageTypes = [ "com.apple.package-type.wrapper" ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } + { + Identifier = "com.apple.product-type.application"; + Type = "ProductType"; + BasedOn = "com.apple.product-type.bundle"; + Name = "Application"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_execute"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "app"; + }; + PackageTypes = [ "com.apple.package-type.wrapper.application" ]; + } ]; in diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 4313f0051473..9e34360909f9 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,6 +1,7 @@ {stdenv, writeText, toolchainName, xcbuild, fetchurl , llvm, cctools, gcc, bootstrap_cmds, binutils -, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: +, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper +, xib2nib}: let @@ -89,6 +90,8 @@ stdenv.mkDerivation { ln -s ${cctools}/bin/pagestuff ln -s ${cctools}/bin/ranlib ln -s ${cctools}/bin/redo_prebinding + + ln -s ${xib2nib}/bin/ibtool '' + # No point including the entire gcc closure if we don't already have it (if stdenv.cc.isClang then '' diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix new file mode 100644 index 000000000000..d585a35b0bc5 --- /dev/null +++ b/pkgs/development/tools/xib2nib/default.nix @@ -0,0 +1,22 @@ +{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }: + +stdenv.mkDerivation { + name = "xib2nib-730e177"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "xib2nib"; + rev = "97c6a53aab83d919805efcae33cf80690e953d1e"; + sha256 = "08442f4xg7racknj35nr56a4c62gvdgdw55pssbkn2qq0rfzziqq"; + }; + + buildInputs = [ PlistCpp pugixml boost ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "Compiles CocoaTouch .xib files into .nib"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 90559742057f..f818962b8ae0 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -647,11 +647,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-03-29"; + name = "vim-elixir-2017-04-13"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "9482415ab27fddf8125524f54d9e500bb9541756"; - sha256 = "1layanqayf2arg8cvpsx768p544znwsvwispnk01d0c73d2p5llq"; + rev = "8781ff7c675d0cbfb4859f91698365c2eecf3205"; + sha256 = "0990qbzs2cn3k07xrn4xcczl7kpapygpa0ypkwpgxamyk0lgjlr8"; }; dependencies = []; diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix deleted file mode 100644 index 581eb31cc71c..000000000000 --- a/pkgs/os-specific/darwin/install_name_tool/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "install_name_tool"; - src = "/usr/bin/install_name_tool"; - - unpackPhase = "true"; - dontBuild = true; - - installPhase = '' - mkdir -p "$out"/bin - ln -s "$src" "$out"/bin - ''; - - meta = with stdenv.lib; { - description = "Change dynamic shared library install names"; - homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.darwin; - - longDescription = '' - Install_name_tool changes the dynamic shared library install names and or - adds, changes or deletes the rpaths recorded in a Mach-O binary. - ''; - }; -} - diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index c2e3fa4b9e1f..ab1a93b3a703 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,14 +1,10 @@ { stdenv, lib, fetchurl, kernel, perl, makeWrapper }: -# BLCR 0.8.5 should works for kernel version up to 3.7.1 -# BLCR 0.8.6 should works for kernel version up to 3.17.x +# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x assert stdenv.isLinux; assert builtins.compareVersions "3.18" kernel.version == 1; -# it doesn't compile anymore on 3.12 -assert lib.versionAtLeast kernel.version "3.14"; - stdenv.mkDerivation { name = "blcr_${kernel.version}-0.8.6pre4"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix new file mode 100644 index 000000000000..9249d7cc347d --- /dev/null +++ b/pkgs/servers/cayley/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "cayley-${version}"; + version = "0.6.1"; + + goPackagePath = "github.com/cayleygraph/cayley"; + + src = fetchFromGitHub { + owner = "cayleygraph"; + repo = "cayley"; + rev = "v${version}"; + sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ''; + + meta = { + homepage = "https://cayley.io/"; + description = "A graph database inspired by Freebase and Knowledge Graph"; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix new file mode 100644 index 000000000000..1e6fadf9f4d8 --- /dev/null +++ b/pkgs/servers/cayley/deps.nix @@ -0,0 +1,272 @@ +[ + { + goPackagePath = "github.com/badgerodon/peg"; + fetch = { + type = "git"; + url = "https://github.com/badgerodon/peg"; + rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; + sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "a705895fdad108f053eae7ee011ed94a0541ee13"; + sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r"; + }; + } + { + goPackagePath = "github.com/cznic/mathutil"; + fetch = { + type = "git"; + url = "https://github.com/cznic/mathutil"; + rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd"; + sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "2df174808ee097f90d259e432cc04442cf60be21"; + sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5"; + sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz"; + }; + } + { + goPackagePath = "github.com/dop251/goja"; + fetch = { + type = "git"; + url = "https://github.com/dop251/goja"; + rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca"; + sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61"; + sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1"; + }; + } + { + 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 = "888eb0692c857ec880338addf316bd662d5e630e"; + sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "ad28ea4487f05916463e2423a55166280e8254b5"; + sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "b59a38004596b696aca7aa2adccfa68760864d86"; + sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "0dad96c0b94f8dee039aa40467f767467392a0af"; + sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4"; + }; + } + { + goPackagePath = "github.com/linkeddata/gojsonld"; + fetch = { + type = "git"; + url = "https://github.com/linkeddata/gojsonld"; + rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31"; + sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced"; + sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d"; + sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb"; + sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d"; + sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab"; + sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18"; + sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "4875955338b0a434238a31165cb87255ab6e9e4a"; + sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i"; + }; + } + { + goPackagePath = "github.com/syndtr/gosnappy"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gosnappy"; + rev = "156a073208e131d7d2e212cb749feae7c339e846"; + sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6a513affb38dc9788b449d59ffed099b8de18fa0"; + sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; + sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c"; + sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05"; + sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; + sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; + }; + } + { + goPackagePath = "github.com/dennwc/graphql"; + fetch = { + type = "git"; + url = "https://github.com/dennwc/graphql"; + rev = "fd5c4aa13f2119414084f229600de0d73f174436"; + sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs"; + }; + } +] diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 1a762bd87c79..613edfafd954 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -221,8 +221,7 @@ rec { # GCC has certain things built in statically. See # pkgs/stdenv/linux/default.nix for the details. cp -d ${isl}/lib/libisl*.so* $out/lib - # Also this is needed since bzip2 uses a custom build system - # for native builds but autoconf (via a patch) for cross builds + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 42015a79a3e0..2ce73eb781d8 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -122,6 +122,8 @@ rec { cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib + # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 7c410a1a4f4f..67bbb510b13d 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "150.0.0"; + version = "151.0.0"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0zg6jnn93dq53glds4cghksyghb4d4z0i2h38na0r88mr8hzmx1l"; + sha256 = "1d1h6jiqs3grsb6c61v6dkb4l2qv6v8g7wbzgaqkmn09xdbaq40l"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; - sha256 = "1vbc360z2da3blwx51asw7jh0v0v6wsrv20z36yq0hccmljlh24w"; + sha256 = "05idf0g505s8diaz28ij9yqig2wwn43lyppfs483m7vnx5hk62j5"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "1q66aap3qidfsa8gm13jff3dprx8qarhjkx5ib65439fy4zj0bca"; + sha256 = "01hf7pp1v57dxx6f2pz7j13fjdnrfp7gjmzjdlhlx4rnvxrd6i3f"; }; buildInputs = [python27 makeWrapper]; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 70f9e29d0f5d..8b26f4ce3c83 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.31.1"; + name = "icoutils-0.31.3"; src = fetchurl { url = "mirror://savannah/icoutils/${name}.tar.bz2"; - sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6"; + sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152"; }; buildInputs = [ makeWrapper libpng perl ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c66900c06b7..0bcb0baaab8b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam +{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false , withKerberos ? false @@ -12,17 +12,12 @@ assert withGssapiPatches -> withKerberos; let - hpnSrc = fetchurl { - url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz; - sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; - }; - # **please** update this patch when you update to a new openssh release. gssapiSrc = fetchpatch { name = "openssh-gssapi.patch"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa"; - sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2"; + + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef"; + sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3"; }; in @@ -31,18 +26,18 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.4p1"; - - src = fetchurl { - url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"; - }; - - prePatch = optionalString hpnSupport - '' - gunzip -c ${hpnSrc} | patch -p1 - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; + version = "7.5p1"; + + src = if hpnSupport then + fetchurl { + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz"; + sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn"; + } + else + fetchurl { + url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; + sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; + }; patches = [ @@ -55,7 +50,8 @@ stdenv.mkDerivation rec { ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] - ++ optional withKerberos kerberos; + ++ optional withKerberos kerberos + ++ optional hpnSupport autoreconfHook; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. @@ -94,6 +90,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ eelco aneeshusa ]; - broken = hpnSupport; # probably after 6.7 update }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 62f1a3a05dd0..83394d984ad7 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + patches = [ ./set-correct-program-name-for-sleep.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch new file mode 100644 index 000000000000..782e06e20fd9 --- /dev/null +++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch @@ -0,0 +1,69 @@ +From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001 +From: "Andrew R. M" <andrewmiller237@gmail.com> +Date: Sat, 8 Apr 2017 13:50:01 -0400 +Subject: [PATCH] Patch the clip() function to work even when using + single-binary coreutils + +--- + src/password-store.sh | 4 ++-- + src/platform/cygwin.sh | 4 ++-- + src/platform/darwin.sh | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/password-store.sh b/src/password-store.sh +index 6a4172d..4dbd6b8 100755 +--- a/src/password-store.sh ++++ b/src/password-store.sh +@@ -155,11 +155,11 @@ clip() { + # variable. Specifically, it cannot store nulls nor (non-trivally) store + # trailing new lines. + local sleep_argv0="password store sleep on display $DISPLAY" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" + ( +- ( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" ) ++ ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") ) + local now="$(xclip -o -selection "$X_SELECTION" | base64)" + [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + +diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh +index 6e5dd86..f3574c4 100644 +--- a/src/platform/cygwin.sh ++++ b/src/platform/cygwin.sh +@@ -3,11 +3,11 @@ + + clip() { + local sleep_argv0="password store sleep on display $DISPLAY" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(base64 < /dev/clipboard)" + echo -n "$1" > /dev/clipboard + ( +- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) ++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) + local now="$(base64 < /dev/clipboard)" + [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + echo "$before" | base64 -d > /dev/clipboard +diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh +index 86eb325..deb04c4 100644 +--- a/src/platform/darwin.sh ++++ b/src/platform/darwin.sh +@@ -3,11 +3,11 @@ + + clip() { + local sleep_argv0="password store sleep for user $(id -u)" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(pbpaste | openssl base64)" + echo -n "$1" | pbcopy + ( +- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) ++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) + local now="$(pbpaste | openssl base64)" + [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now" + echo "$before" | openssl base64 -d | pbcopy +-- +2.12.2 + diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix index 7116d1777d6d..4cba1c7e6172 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry-mac/default.nix @@ -1,20 +1,22 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; - src = fetchurl { - url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz"; - sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271"; + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "pinentry-mac"; + rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4"; + sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq"; }; - postPatch = '' - substituteInPlace ./Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild libiconv Cocoa ncurses ]; + + dontUseXcbuild = true; installPhase = '' mkdir -p $out/Applications - mv build/Release/pinentry-mac.app $out/Applications + mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications ''; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e20c102ea900..85557b15e3d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -555,8 +555,6 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; - install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = callPackage ../development/mobile/titaniumenv { @@ -654,6 +652,8 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; + blink1-tool = callPackage ../tools/misc/blink1-tool { }; blitz = callPackage ../development/libraries/blitz { @@ -3492,7 +3492,9 @@ with pkgs; libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_mac = callPackage ../tools/security/pinentry-mac { }; + pinentry_mac = callPackage ../tools/security/pinentry-mac { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; pingtcp = callPackage ../tools/networking/pingtcp { }; @@ -5085,7 +5087,7 @@ with pkgs; cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; - isl = if !stdenv.isDarwin then isl_0_14 else null; + isl = isl_0_17; })); gfortran = gfortran5; @@ -6407,6 +6409,8 @@ with pkgs; complexity = callPackage ../development/tools/misc/complexity { }; + conan = callPackage ../development/tools/build-managers/conan { }; + cookiecutter = pythonPackages.cookiecutter; ctags = callPackage ../development/tools/misc/ctags { }; @@ -7739,9 +7743,15 @@ with pkgs; gnutls = gnutls35; - gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix { - guileBindings = config.gnutls.guile or false; - }; + gnutls35 = callPackage + (if stdenv.isDarwin + # Avoid > 3.5.10 due to frameworks for now; see discussion on: + # https://github.com/NixOS/nixpkgs/commit/d6454e6a1 + then ../development/libraries/gnutls/3.5.10.nix + else ../development/libraries/gnutls/3.5.nix) + { + guileBindings = config.gnutls.guile or false; + }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { guileBindings = config.gnutls.guile or false; @@ -10585,6 +10595,8 @@ with pkgs; bosun = callPackage ../servers/monitoring/bosun { }; scollector = bosun; + cayley = callPackage ../servers/cayley { }; + charybdis = callPackage ../servers/irc/charybdis {}; couchdb = callPackage ../servers/http/couchdb { @@ -12437,6 +12449,8 @@ with pkgs; encode-sans = callPackage ../data/fonts/encode-sans { }; + envypn-font = callPackage ../data/fonts/envypn-font { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -13762,15 +13776,15 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; + debug = true; }; fluxbox = callPackage ../applications/window-managers/fluxbox { }; @@ -17196,6 +17210,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + diamond = callPackage ../applications/science/biology/diamond { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -18187,10 +18203,10 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_2; + terraform_0_9_3; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_2; + terraform_0_9 = terraform_0_9_3; terraform = terraform_0_9; terragrunt = callPackage ../applications/networking/cluster/terragrunt { @@ -18482,4 +18498,11 @@ with pkgs; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; + + NSPlist = callPackage ../development/libraries/NSPlist {}; + + PlistCpp = callPackage ../development/libraries/PlistCpp {}; + + xib2nib = callPackage ../development/tools/xib2nib {}; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e13978469345..59bf5fa1007e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2986,11 +2986,10 @@ in { to do lots of things, you're probably outside the use cases. Either trust those users, or don't. ''; - homepage = https://github.com/jsocol/bleach; - downloadPage = https://github.com/jsocol/bleach/releases; + homepage = https://github.com/mozilla/bleach; + downloadPage = https://github.com/mozilla/bleach/releases; license = licenses.asl20; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; }; }; @@ -20679,11 +20678,11 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.5"; + name = "PyICU-1.9.6"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; + sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5"; }; buildInputs = [ pkgs.icu ]; @@ -28909,8 +28908,7 @@ EOF }; propagatedBuildInputs = with self; [ cffi ]; - buildInputs = [ pkgs.libspotify ] - ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; + buildInputs = [ pkgs.libspotify ]; # python zip complains about old timestamps preConfigure = '' @@ -32191,6 +32189,12 @@ EOF nitpick = callPackage ../applications/version-management/nitpick { }; + pluginbase = callPackage ../development/python-modules/pluginbase { }; + + node-semver = callPackage ../development/python-modules/node-semver { }; + + distro = callPackage ../development/python-modules/distro { }; + }); in fix' (extends overrides packages) |