diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-10-28 18:48:56 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-10-28 18:48:56 +0100 |
commit | 0b32140b34485eaa03a68e51b9d5aebc6bcce1fa (patch) | |
tree | 9fcd2956ef5f1e1d88746d1614fc260a346430fb /pkgs | |
parent | 41822ddb936a74fed600b616f124a4ee68c6a53e (diff) | |
parent | 31839c352e16c3eb55ee395fc127e300ff1f4b16 (diff) | |
download | nixpkgs-0b32140b34485eaa03a68e51b9d5aebc6bcce1fa.tar nixpkgs-0b32140b34485eaa03a68e51b9d5aebc6bcce1fa.tar.gz nixpkgs-0b32140b34485eaa03a68e51b9d5aebc6bcce1fa.tar.bz2 nixpkgs-0b32140b34485eaa03a68e51b9d5aebc6bcce1fa.tar.lz nixpkgs-0b32140b34485eaa03a68e51b9d5aebc6bcce1fa.tar.xz nixpkgs-0b32140b34485eaa03a68e51b9d5aebc6bcce1fa.tar.zst nixpkgs-0b32140b34485eaa03a68e51b9d5aebc6bcce1fa.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs')
77 files changed, 484 insertions, 747 deletions
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index ffef5d5fdde..f3506b0cb98 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -1,40 +1,33 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "micro"; - version = "2.0.7"; - - goPackagePath = "github.com/zyedidia/micro"; + version = "2.0.8"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb"; - fetchSubmodules = true; + sha256 = "1b51fvc9hrjfl8acr3yybp66xfll7d43412qwi76wxwarn06gkci"; }; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - buildFlagsArray = let t = "${goPackagePath}/internal/util"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.CommitHash=${src.rev} - ''; + vendorSha256 = "19iqvl63g9y6gkzfmv87rrgj4c4y6ngh467ss94rzrhaybj2b2d8"; - goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; postInstall = '' - installManPage $src/assets/packaging/micro.1 + installManPage assets/packaging/micro.1 + install -Dt $out/share/applications assets/packaging/micro.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; } - diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix deleted file mode 100644 index d1cb91c2959..00000000000 --- a/pkgs/applications/editors/micro/deps.nix +++ /dev/null @@ -1,345 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "v1.0.0"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "v1.0.1"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "95032a82bc51"; - sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "v1.0.3"; - sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.7"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "c382bd3c16ff"; - sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.1.0"; - sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/xo/terminfo"; - fetch = { - type = "git"; - url = "https://github.com/xo/terminfo"; - rev = "454e5b68f9e8"; - sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "ab39c6098bdb"; - sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; - }; - } - { - goPackagePath = "github.com/zyedidia/clipboard"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/clipboard"; - rev = "v1.0.3"; - sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q"; - }; - } - { - goPackagePath = "github.com/zyedidia/glob"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/glob"; - rev = "dd4023a66dc3"; - sha256 = "1vqw4xbqq6j8p5m7mwxvb448w69vjvgzx0ndsfzdh2cxfirwp3y7"; - }; - } - { - goPackagePath = "github.com/zyedidia/highlight"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/highlight"; - rev = "201131ce5cf5"; - sha256 = "0blaynf32swmqddx2hcrifrfssj9c04kwnbdy42h3kzxihrwz4ps"; - }; - } - { - goPackagePath = "github.com/zyedidia/json5"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/json5"; - rev = "2da050b1a98d"; - sha256 = "1sgydazf3npr788b4w17ydmlh3fd1zmpriv9b69967ww90ckh2kz"; - }; - } - { - goPackagePath = "github.com/zyedidia/poller"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/poller"; - rev = "v1.0.1"; - sha256 = "10cjrqfk1j0l55bdbpm7kv4mqc665pngc8avai0p9chq03y2654g"; - }; - } - { - goPackagePath = "github.com/zyedidia/pty"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/pty"; - rev = "v2.0.0"; - sha256 = "1n946ld8y2v2wfbwsxv8rfaicxbw3w8pk11ryc8iybmw7hkmmf79"; - }; - } - { - goPackagePath = "github.com/zyedidia/tcell"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/tcell"; - rev = "v2.0.2"; - sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z"; - }; - } - { - goPackagePath = "github.com/zyedidia/terminal"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/terminal"; - rev = "533c623e2415"; - sha256 = "16l628f3zgl5yp9z5zkfy2hyl2sckw4d6mg3iqv2jjvh4i8yhrsm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "33540a1f6037"; - sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.7"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "layeh.com/gopher-luar"; - fetch = { - type = "git"; - url = "https://github.com/layeh/gopher-luar"; - rev = "v1.0.7"; - sha256 = "1rdbni3q7zajmiy62ccvbfgqjzppk5212wpwks2ba726hvyf85mj"; - }; - } -] diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 209a6a4753b..26fabc364ba 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -18,17 +18,17 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.11.0"; + version = "2.11.2"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - sha256 = "02ahhhivgb9k1aygw1m35wdvhaizag1r98mb0r6zzrs5p4y64wlb"; + sha256 = "0sb2h08iaf6zrf54sg6ql6wm63q5vq0kpd3gffdm26z8w6j6wv3s"; # As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules): # * libE57Format # * PoissonRecon - # In > 2.11 it will also contain + # In a future version it will also contain # * CCCoreLib fetchSubmodules = true; }; @@ -53,7 +53,7 @@ mkDerivation rec { ]; cmakeFlags = [ - # TODO: This will become -DCCCORELIB_USE_TBB=ON in > 2.11.0, see + # TODO: This will become -DCCCORELIB_USE_TBB=ON in a future version, see # https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f "-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON" "-DOPTION_USE_DXF_LIB=ON" diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 89a4cf25b8d..7cccec3b72f 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,27 +1,38 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }: +{ stdenv +, fetchurl +, cmake +, pkgconfig +, gtk3 +, perl +, vte +, pcre2 +, glib +, makeWrapper +}: stdenv.mkDerivation rec { pname = "sakura"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m"; + url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; + sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; }; - nativeBuildInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ]; - buildInputs = [ makeWrapper gtk3 vte pcre2 glib ]; + buildInputs = [ gtk3 vte pcre2 glib ]; - # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ... - postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; + # Set path to gsettings-schemata so sakura knows + # where to find colorchooser, fontchooser etc. + postInstall = '' + wrapProgram $out/bin/sakura \ + --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ + ''; meta = with stdenv.lib; { + homepage = "https://www.pleyades.net/david/projects/sakura"; description = "A terminal emulator based on GTK and VTE"; - homepage = "https://www.pleyades.net/david/projects/sakura"; - license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl codyopel ]; - platforms = platforms.linux; longDescription = '' sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator with few dependencies, so you don't need a full GNOME desktop @@ -32,5 +43,8 @@ stdenv.mkDerivation rec { terminals in one window and adds a contextual menu with some basic options. No more no less. ''; - }; + license = licenses.gpl2Only; + maintainers = with maintainers; [ astsmtl codyopel AndersonTorres ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index f116bf1e86d..f1a2c137ad2 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { --replace /usr/bin/ $out/bin/ ln -s $out/opt/teams/teams $out/bin/ + + # Work-around screen sharing bug + # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html + rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay ''; dontAutoPatchelf = true; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index bb02c89486b..e186b3e3ce5 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.48.1"; + version = "0.49.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0xhxp4iglggv6rqwsg0xjn8z46v910rj372abkaviwa3cqzf7gdb"; + sha256 = "1b3dll6ljkj2wyiy3ns9cgxqgjjr60dfrqrbbwdbndqj4pzfvbyf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix index df52531a518..83bb520272e 100644 --- a/pkgs/applications/radio/aldo/default.nix +++ b/pkgs/applications/radio/aldo/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, libao }: +{ stdenv, fetchgit, libao, autoreconfHook }: -stdenv.mkDerivation rec { +let pname = "aldo"; - version = "0.7.7"; + version = "0.7.8"; +in stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "14lzgldqzbbzydsy1cai3wln3hpyj1yhj8ji3wygyzr616fq9f7i"; + src = fetchgit { + url = "git://git.savannah.gnu.org/${pname}.git"; + rev = "v${version}"; + sha256 = "0swvdq0pw1msy40qkpn1ar9kacqjyrw2azvf2fy38y0svyac8z2i"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libao ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 2ae3722fff2..05ba5ef19be 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,54 +1,80 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons, -mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3, -enca, pkgconfig, fetchpatch }: - -let fetchPatchFromAur = {name, sha256}: -fetchpatch { - inherit name sha256; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; -}; in +{ stdenv +, fetchFromGitHub +, pkgconfig +, fetchpatch +, scons +, boost +, dvdauthor +, dvdplusrwtools +, enca +, ffmpeg_3 +, gettext +, gtk2 +, gtkmm2 +, libdvdread +, libxmlxx +, mjpegtools +, wrapGAppsHook +}: + +let + fetchPatchFromAur = {name, sha256}: + fetchpatch { + inherit name sha256; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; + }; +in stdenv.mkDerivation rec { pname = "bombono"; version = "1.2.4"; + src = fetchFromGitHub { - owner = "muravjov"; + owner = "bombono-dvd"; repo = "bombono-dvd"; rev = version; - sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9"; + sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM="; }; patches = [ (fetchpatch { name = "bombono-dvd-1.2.4-scons3.patch"; url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457"; - sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4"; + sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA="; }) ] ++ (map fetchPatchFromAur [ - {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} - {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} - {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} - {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} - {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} - {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} - {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} - {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} + {name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";} + {name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";} + {name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";} + {name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";} + {name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";} + {name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";} + {name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";} + {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} ]); nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; buildInputs = [ - gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools - libxmlxx ffmpeg_3 enca - ]; + boost + dvdauthor + dvdplusrwtools + enca + ffmpeg_3 + gtk2 + gtkmm2 + libdvdread + libxmlxx + mjpegtools + ]; prefixKey = "PREFIX="; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "a DVD authoring program for personal computers"; - homepage = "http://www.bombono.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ symphorien ]; + homepage = "https://www.bombono.org/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ symphorien ]; }; } diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 4d22a329e41..10a331bcc9e 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -9,7 +9,7 @@ let in args@{ - name + name ? "${args.pname}-${args.version}" , bazel ? bazelPkg , bazelFlags ? [] , bazelBuildFlags ? [] diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index af125d60ed0..efea9d0eb82 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { cd go patchShebangs ./ # replace /bin/bash + # Disable timezone tests (these fail when `tzdata` is updated) + rm src/time/{example,format}_test.go # Disabling the 'os/http/net' tests (they want files not available in # chroot builds) rm src/net/{multicast_test.go,parse_test.go,port_test.go} @@ -56,8 +58,6 @@ stdenv.mkDerivation rec { sed -i '/TestDialTimeout/areturn' src/net/dial_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' @@ -119,13 +119,6 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.4.patch ./creds-test-1.4.patch - - # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch - # actually works on old versions too. - (fetchpatch { - url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; - sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; - }) ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 94f01cd51df..f06c51fce0d 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.09"; + version = "2020.10"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1izfwns7viwy0x9hnhx13j9w5qa97qpyxqk9cd8iax7i68z057m7"; + sha256 = "0wvsinmpz8icd0409f8rg93mqdb5ml76m0vb4r26ngz237ph69dn"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index f03043369e9..a873bfd28f5 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.09"; + version = "2020.10"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "08prlvnyqwnzb7mwaqvgv662v78xgwsyy12cpyim6gc4z0i1kcj8"; + sha256 = "1i7jjjwv4av3rsfgbqb213fhb9ns25jfm19nzn7kki0n7w486y33"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 14d5f563fcd..e200b59b61c 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.09"; + version = "2020.10"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "09kiy7r732yrh3nzdzdq9yki0jx2hamyqvrbahk4mlxmb6cl9qmh"; + sha256 = "0nb0vdycz2wrd5yspvps2wy7a21066csr18v786085qim347830h"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index ac622fb290e..9bb6e9e1c5e 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Image pixel format conversion library"; - homepage = "http://gegl.org/babl/"; - license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ jtojnar ]; + homepage = "https://gegl.org/babl/"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 6b38251a680..c25f9145ea5 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg"; + sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ="; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch"; - sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; + sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; }) ]; @@ -120,8 +120,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = "http://www.gegl.org"; - license = licenses.gpl3; + homepage = "https://www.gegl.org"; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 1b864317217..a99ec05d771 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,12 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk2, bzip2, intltool, libintl +{ stdenv +, fetchurl +, pkgconfig +, babl +, libpng +, cairo +, libjpeg +, librsvg +, pango +, gtk2 +, bzip2 +, intltool +, libintl , OpenGL ? null }: stdenv.mkDerivation rec { - name = "gegl-0.2.0"; + pname = "gegl"; + version = "0.2.0"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2"; + url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2"; sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; }; @@ -17,7 +29,7 @@ stdenv.mkDerivation rec { name = "CVE-2012-4433.patch"; })]; - # needs fonts otherwise don't know how to pass them + # needs fonts otherwise don't know how to pass them configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] @@ -27,10 +39,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails 3 out of 19 tests - meta = { + meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = "http://www.gegl.org"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.gegl.org"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index e49ab9b38a0..1603d32ba79 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ gpl3 lgpl3 ]; platforms = platforms.linux; - maintainers = with maintainers; [ lschuermann ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 3ae46270586..33229bbefc8 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -12,9 +12,9 @@ }: let - version = "1.6.0"; + version = "1.7.0"; device = if cudaSupport then "cuda" else "cpu"; - srcs = import ./binary-hashes.nix; + srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; in stdenv.mkDerivation { inherit version; diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 92a2e05e0ba..6048fe8676b 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,14 @@ -{ +version: { x86_64-darwin-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip"; - sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; + sha256 = "1912lklil0i7i10j1fm4qzcq96cc8c281l9fn5gfbwa2wwry0r59"; }; x86_64-linux-cpu = { - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip"; - sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; + sha256 = "0jdd7bjcy20xz2gfv8f61zdrbzxz5425bnqaaqgrwpzvd45ay8px"; }; x86_64-linux-cuda = { - url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip"; - sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya"; + url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip"; + sha256 = "1ag6lvf3a400ivqq4g9cxpmxzlfrga0y5ssjy0rfpw6i1xljibn6"; }; } diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 787854f8e41..13ee99804d8 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -2,6 +2,7 @@ , uri, xmlm, omd, ezjsonm }: buildDunePackage rec { + useDune2 = true; minimumOCamlVersion = "4.02.3"; version = "2.4.0"; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 781af8a4c98..269288ef3cd 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchzip, buildDunePackage, jsonm, hex, sexplib }: +{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: buildDunePackage rec { pname = "ezjsonm"; - version = "0.6.0"; + version = "1.2.0"; - src = fetchzip { - url = "https://github.com/mirage/${pname}/archive/${version}.tar.gz"; - sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/ezjsonm/releases/download/v${version}/ezjsonm-v${version}.tbz"; + sha256 = "1q6cf63cc614lr141rzhm2w4rhi1snfqai6fmkhvfjs84hfbw2w7"; }; - propagatedBuildInputs = [ jsonm hex sexplib ]; + propagatedBuildInputs = [ jsonm hex sexplib0 ]; meta = { description = "An easy interface on top of the Jsonm library"; diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix index 267aa17e9e4..005e26926d1 100644 --- a/pkgs/development/ocaml-modules/mustache/default.nix +++ b/pkgs/development/ocaml-modules/mustache/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "mustache"; version = "3.1.0"; + useDune2 = true; src = fetchFromGitHub { owner = "rgrinberg"; repo = "ocaml-mustache"; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 5f6deca863c..1737fb90c7a 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { test "$?" == 124 && echo "ok") ''; - meta = { + meta = with stdenv.lib; { description = "Launcher for Pharo distributions"; + homepage = "https://pharo.org"; longDescription = '' - Pharo's goal is to deliver a clean, innovative, free open-source Smalltalk-inspired environment. By providing a stable and small core system, excellent dev tools, and maintained releases, Pharo @@ -75,8 +75,7 @@ stdenv.mkDerivation rec { access it very rapidly from your OS application launcher. As a result, launching any image is never more than 3 clicks away. ''; - homepage = "http://pharo.org"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = [ ]; platforms = pharo.meta.platforms; }; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index fd6312c7b27..13db30eae90 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,20 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv +, fetchurl +, cmake +, bash +, unzip +, glibc +, openssl +, gcc +, libGLU +, libGL +, freetype +, xorg +, alsaLib +, cairo +, libuuid +, makeWrapper +, ... }: { name, src, ... }: @@ -10,7 +26,15 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "pic" ]; - # Building + nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; + + buildInputs = [ bash glibc openssl libGLU libGL freetype + xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath + [ cairo libGLU libGL freetype openssl libuuid alsaLib + xorg.libICE xorg.libSM ]; + preConfigure = '' cd build/ ''; @@ -46,12 +70,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; - nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; - - meta = { + meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; + homepage = "https://pharo.org"; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source Smalltalk-inspired environment. By providing a stable and small core @@ -65,9 +86,8 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = "http://pharo.org"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lukego ]; + license = licenses.mit; + maintainers = [ maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) platforms = stdenv.lib.filter (system: with stdenv.lib.systems.elaborate { inherit system; }; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 4bc60dde410..d5469233f38 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -46,6 +46,33 @@ stdenv.mkDerivation rec { # while the VM depends on <= gcc48: "stackprotector" ]; + # gcc 4.8 used for the build: + # + # gcc5 crashes during compilation; gcc >= 4.9 produces a + # binary that crashes when forking a child process. See: + # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html + # + # (stack protection is disabled above for gcc 4.8 compatibility.) + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + bash + unzip + glibc + openssl + gcc48 + libGLU libGL + freetype + xorg.libX11 + xorg.libICE + xorg.libSM + alsaLib + cairo + pharo-share + libuuid + ]; + + enableParallelBuilding = true; + # Regenerate the configure script. # Unnecessary? But the build breaks without this. autoreconfPhase = '' @@ -123,35 +150,9 @@ stdenv.mkDerivation rec { ln -s ${libgit2}/lib/libgit2.so* "$out/" ''; - enableParallelBuilding = true; - - # gcc 4.8 used for the build: - # - # gcc5 crashes during compilation; gcc >= 4.9 produces a - # binary that crashes when forking a child process. See: - # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html - # - # (stack protection is disabled above for gcc 4.8 compatibility.) - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - bash - unzip - glibc - openssl - gcc48 - libGLU libGL - freetype - xorg.libX11 - xorg.libICE - xorg.libSM - alsaLib - cairo - pharo-share - libuuid - ]; - meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; + homepage = "https://pharo.org"; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source Smalltalk-inspired environment. By providing a stable and small core @@ -165,7 +166,6 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = "http://pharo.org"; license = licenses.mit; maintainers = [ maintainers.lukego ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index ee7a0494ede..2c8c376b7c1 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared files for Pharo"; - homepage = "http://pharo.org"; + homepage = "https://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 4dac5602b37..5c260692887 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.8.7"; + version = "0.8.9"; src = fetchPypi { inherit pname version; - sha256 = "18a65c5917bf7f2d48bb557bf0879e49c5293b4c0e9809328387ae09338ae37b"; + sha256 = "024db00c6a80dbc8c9038b2de211c9fd32963046612882f3f54ad78930f3e0f7"; }; nativeBuildInputs = [ Babel ]; diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index addd187abeb..a4f6d905765 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "audioread"; - version = "2.1.8"; + version = "2.1.9"; src = fetchPypi { inherit pname version; - sha256 = "073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168"; + sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index c82bfeab2ed..1162b0405a7 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1efda568d67af911156591eb308432b5f9a56075b57ac0a5dd9f7aee17d79217"; + sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 0cb180064ee..93c78c401f0 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.9.0"; + version = "0.10.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9210db89fa18ee8ed53339cd63bbe6fe1d9624cd793b54b7451ddbda8ae92ef3"; + sha256 = "09e8d4928e19d12feb374adb47651b474f3ee3bc6a12704e4b70c9b38e3bcd9e"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index 5256d605049..b93ea9c3bd7 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cchardet"; - version = "2.1.6"; + version = "2.1.7"; src = fetchPypi { inherit pname version; - sha256 = "1cs6y59qhbal8fgbyjk2lpjykh8kfjhq16clfssylsddb4hgnsmp"; + sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 619c059d385..f985da36d17 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.21.2"; + version = "1.21.3"; src = fetchPypi { inherit pname version; - sha256 = "72efc25672ce7535c0e26bbe7157d7bd31ab12ed3f5221a64367548ca2daa265"; + sha256 = "0b44514cdbafab08b18e21f59fc016cead0b78f5f5fdf14eccd993c469130b39"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 7418eb4f952..3f0cca295dc 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "456facce7a7ccfd9363948109cf1e978d48c58e46a46b01c71b4c0adc73b1928"; + sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4"; }; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 0f5f0bc56e0..1488d938228 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.17.1"; + version = "1.20.0"; src = fetchPypi { inherit pname version; - sha256 = "5572e9d5baab9f6b49318169df9789f7399d0e3c7bdac8fdb8dfccf1d5d2b1ca"; + sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 1898be45f82..07d13c74c8d 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.6.0"; + version = "10.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8a7c80eb70ec677a149173154a98cf1fa461c6b0e1a1d833c90e40a735eda2cd"; + sha256 = "08c1e0bbc16499e0138431e34777c35ea086734ff15ee5067b0df3424df2a9ec"; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index aca87297506..c50cc2aeb82 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "1.1.3"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - sha256 = "ef335d13b798bc901636643f11455bab8b8698ddfe3a0b67bc251af1fd809b21"; + sha256 = "3a057277bba7144a0c15ab8c737dc8a1002e87e7284847aa011ce122e353418e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 287216cc949..4d9da17bd3a 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.13.4"; + version = "1.13.5"; src = fetchPypi { inherit pname version; - sha256 = "34dc09dfb557f79515a011a72b343daf31b5e5d67403a008dded59bab658267c"; + sha256 = "3f8a00ce1cc67a388a3a949441accd7e7e9ca9960ba16b49ee96a50305105a01"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index f46322954f3..fb5eb6cbf7c 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0j56bxdj08vn3q1804qwb1ywhga1mdg1awgm7i64wfpfwi8df2zm"; + sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index b1e8a23ef8e..dc56bf956b7 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.1.1"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1kir9g7kmy2qygyzczx8nj4b0sc6jjvqy0ssm39bxzqsr1vzzvxm"; + sha256 = "5827b644d1b0833603710dac198f5f8cbb9002769f97001a191e863b32f5956c"; }; propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index bf2ad31ec3d..6caaacd963b 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "ff1b4ba2458a6ee460c3c4161d780a12e94811b2daaa5d13acdb354fa21a9916"; + sha256 = "0bc5a4a0ee22689a863090993e0054485030847d0e9884afa1592ca388cccf4a"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index a98c7a518d2..73d367f5eb1 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "PuLP"; - version = "2.3"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "9d8ecf532868cc31fa9ff59ee5d5b2049600c5c902c18c794a2bad677c1f92e5"; + sha256 = "5bbe53f854fb3b689e4faacac5bdb5fa576cb270fc12c78edef827dd46a4fb50"; }; propagatedBuildInputs = [ pyparsing amply ]; diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index c304e68fd8d..b229361917f 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "py-multibase"; - version = "1.0.1"; + version = "1.0.3"; disabled = isPy27; src = fetchPypi { inherit pname version ; - sha256 = "6ed706ea321b487ba82e4172a9c82d61dacd675c865f576a937a94bca1a23443"; + sha256 = "d28a20efcbb61eec28f55827a0bf329c7cea80fffd933aecaea6ae8431267fe4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 284b8f0837a..68afbafef30 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.0.1"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "43943cc15889153b90191d9e1bd85e7a3709a6d57b6379220cb14017217fb999"; + sha256 = "a3e22a4d31429f0d5b9ff50aaac3fb47e4f7da678b6b0439a7b91ef40675f88d"; }; propagatedBuildInputs = [ setuptools six traits ]; diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index ad59da259e5..8a5c3ae348a 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "0937cb44936805d403e8e678d7042feb6d85da950a7019e8ae6842a0720fb00c"; + sha256 = "7aedd5e003992c6c78b41a0da4bf165359a46ea25ab2a9a1594d13f471ad7287"; }; propagatedBuildInputs = [ @@ -25,6 +25,8 @@ buildPythonPackage rec { # https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt doCheck = false; + pythonImportsCheck = [ "nmb" "smb" ]; + meta = { description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines"; homepage = "https://miketeo.net/wp/index.php/projects/pysmb"; diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index b1b662e95b3..f073c408f70 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -11,17 +11,20 @@ , patchelf , pyyaml , requests +, typing-extensions }: let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; platform = if stdenv.isDarwin then "darwin" else "linux"; - srcs = import ./binary-hashes.nix; + srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; + version = "1.7.0"; in buildPythonPackage { + inherit version; + pname = "pytorch"; # Don't forget to update pytorch to the same version. - version = "1.6.0"; format = "wheel"; @@ -39,6 +42,17 @@ in buildPythonPackage { numpy pyyaml requests + typing-extensions + ]; + + # PyTorch are broken: the dataclasses wheel is required, but ships with + # Python >= 3.7. Our dataclasses derivation is incompatible with >= 3.7. + # + # https://github.com/pytorch/pytorch/issues/46930 + # + # Should be removed with the next PyTorch version. + pipInstallFlags = [ + "--no-deps" ]; postInstall = '' diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index 481dc6825c7..afdde5057db 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -1,10 +1,10 @@ -{ +version: { x86_64-linux-37 = { - url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl"; - sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7"; + url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0cvafwzd44d7i2d0y01lyk75lhxffcf6c94cx0wla0cnhcg9mqlf"; }; x86_64-linux-38 = { - url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl"; - sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk"; + url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl"; + sha256 = "1vxswkb2gzp87sbb5ycvyvs8aw1szp3v2mwdn4mp47yarlnbx8r6"; }; } diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix new file mode 100644 index 00000000000..a00ea9e818f --- /dev/null +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, semantic-version +, setuptools +, setuptools_scm +, toml +}: + +buildPythonPackage rec { + pname = "setuptools-rust"; + version = "0.11.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p21sw77197m7pciy8g25bwwaakq1675h0x1lis9sypzr46p2s11"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ semantic-version setuptools toml ]; + + meta = with stdenv.lib; { + description = "Setuptools plugin for Rust support"; + homepage = "https://github.com/PyO3/setuptools-rust"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f33d2639db5..6f271e1758a 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.3.3"; + version = "2.3.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "18w6ibpibqj3v136jjfklbax1l4y80v8mfk19apxlaprf6wvwpwy"; + sha256 = "5a072ee61ef156e5938e04447f0b99248b87ef262e498b5e5002f5b579cd7fb2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index bd049a9a2ca..7925cb15f03 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -22,7 +22,7 @@ # XLA without CUDA is broken , xlaSupport ? cudaSupport # Default from ./configure script -, cudaCapabilities ? [ "3.5" "5.2" ] +, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ] , sse42Support ? stdenv.hostPlatform.sse4_2Support , avx2Support ? stdenv.hostPlatform.avx2Support , fmaSupport ? stdenv.hostPlatform.fmaSupport diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index d650f350bd2..5b0ba5d0bfa 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -2,10 +2,12 @@ , rustPlatform , fetchFromGitHub , fetchurl -, maturin , pipInstallHook -, pytest +, setuptools-rust +, wheel +, numpy , python +, pytestCheckHook , requests }: @@ -18,10 +20,18 @@ let url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt"; sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w"; }; + albertVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/albert-base-v1-tokenizer.json"; + sha256 = "1hra9pn8rczx7378z88zjclw2qsdrdwq20m56sy42s2crbas6akf"; + }; bertVocab = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt"; sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07"; }; + norvigBig = fetchurl { + url = "https://norvig.com/big.txt"; + sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps"; + }; openaiVocab = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json"; sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x"; @@ -32,38 +42,34 @@ let }; in rustPlatform.buildRustPackage rec { pname = "tokenizers"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "python-v${version}"; - sha256 = "0sxdwx05hr87j2z32rk4rgwn6a26w9r7m5fgj6ah1sgagiiyxbjw"; + sha256 = "0rsm1g5zfq3ygdb3s8v9xqqpgfzvvkc4n5ik3ahy8sw7pyjljb4m"; }; - # Update parking_lot to be compatible with recent Rust versions, that - # replace asm! by llvm_asm!: - # - # https://github.com/Amanieu/parking_lot/pull/223 - # - # Remove once upstream updates this dependency. - cargoPatches = [ ./update-parking-lot.diff ]; - - cargoSha256 = "0cdkxmj8z2wdspn6r62lqlpvd0sj1z0cmb1zpqaajxvr0b2kjlj8"; + cargoSha256 = "0yn699dq9hdjh7fyci99ni8mmd5qdhzrsi80grzgf5cch8g38rbi"; sourceRoot = "source/bindings/python"; nativeBuildInputs = [ - maturin pipInstallHook + setuptools-rust + wheel ]; propagatedBuildInputs = [ + numpy python ]; - # tokenizers uses pyo3, which requires Rust nightly. - RUSTC_BOOTSTRAP = 1; + installCheckInputs = [ + pytestCheckHook + requests + ]; doCheck = false; doInstallCheck = true; @@ -74,51 +80,21 @@ in rustPlatform.buildRustPackage rec { ( cd $sourceRoot/tests/data ln -s ${robertaVocab} roberta-base-vocab.json ln -s ${robertaMerges} roberta-base-merges.txt + ln -s ${albertVocab} albert-base-v1-tokenizer.json ln -s ${bertVocab} bert-base-uncased-vocab.txt + ln -s ${norvigBig} big.txt ln -s ${openaiVocab} openai-gpt-vocab.json ln -s ${openaiMerges} openai-gpt-merges.txt ) ''; - postPatch = '' - # pyo3's build check verifies that Rust is a nightly - # version. Disable this check. - substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \ - --replace "check_rustc_version()?;" "" - - # Patching the vendored dependency invalidates the file - # checksums, so remove them. This should be safe, since - # this is just a copy of the vendored dependencies and - # the integrity of the vendored dependencies is validated - # by cargoSha256. - sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \ - $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json - - # Maturin uses the crate name as the wheel name. - substituteInPlace Cargo.toml \ - --replace "tokenizers-python" "tokenizers" - ''; - buildPhase = '' - maturin build --release --manylinux off + ${python.interpreter} setup.py bdist_wheel ''; installPhase = '' - # Put the wheels where the pip install hook can find them. - install -Dm644 -t dist target/wheels/*.whl pipInstallPhase ''; - installCheckInputs = [ - pytest - requests - ]; - - installCheckPhase = '' - # Append paths, or the binding's tokenizer module will be - # used, since the test directories have __init__.py - pytest --import-mode=append - ''; - meta = with stdenv.lib; { homepage = "https://github.com/huggingface/tokenizers"; description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; diff --git a/pkgs/development/python-modules/tokenizers/update-parking-lot.diff b/pkgs/development/python-modules/tokenizers/update-parking-lot.diff deleted file mode 100644 index d8f144465ac..00000000000 --- a/pkgs/development/python-modules/tokenizers/update-parking-lot.diff +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/bindings/python/Cargo.lock b/bindings/python/Cargo.lock -index f50db71..ea71817 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -269,7 +269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "lock_api" --version = "0.3.3" -+version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -337,16 +337,16 @@ dependencies = [ - - [[package]] - name = "parking_lot" --version = "0.10.0" -+version = "0.10.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "parking_lot_core" --version = "0.7.0" -+version = "0.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -409,7 +409,7 @@ dependencies = [ - "inventory 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "pyo3cls 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -768,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" - "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - "checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" --"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" -+"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" - "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - "checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" -@@ -777,8 +777,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" - "checksum onig 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd91ccd8a02fce2f7e8a86655aec67bc6c171e6f8e704118a0e8c4b866a05a8a" - "checksum onig_sys 69.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3814583fad89f3c60ae0701d80e87e1fd3028741723deda72d0d4a0ecf0cb0db" --"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" --"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" -+"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -+"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" - "checksum paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a" - "checksum paste-impl 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a" - "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index fdb807bd0a1..e3fd150fbcf 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -7,6 +7,7 @@ , requests , numpy , parameterized +, protobuf , sacremoses , sentencepiece , timeout-decorator @@ -17,19 +18,19 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "1j9nzhl0zw5z9rnvzfih7v6bax353rxp05b3f0cvkii3b5dbkc2j"; + sha256 = "1v09gryxsg57d2cjwagna1535m8mbxlazdbhsww210lxa818m5qj"; }; propagatedBuildInputs = [ - boto3 filelock numpy + protobuf regex requests sacremoses @@ -44,11 +45,6 @@ buildPythonPackage rec { timeout-decorator ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8" - ''; - preCheck = '' export HOME="$TMPDIR" @@ -67,8 +63,10 @@ buildPythonPackage rec { # Disable tests that require network access. disabledTests = [ - "PegasusTokenizationTest" - "T5TokenizationTest" + "BlenderbotSmallTokenizerTest" + "Blenderbot3BTokenizerTests" + "TokenizationTest" + "TestTokenizationBart" "test_all_tokenizers" "test_batch_encoding_is_fast" "test_batch_encoding_pickle" diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 38b7346896c..5a9495746cd 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,12 +25,12 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.6.7"; + version = "5.6.8"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "aca005639931835f4f0eaa92ae48ffebb94551af91649a96018694ea448ca0ae"; + sha256 = "330067d7319a50b9fb15e89d224e89ab28bc363926774adf7fa119f681b106b6"; }; # Tells the tests which database to use diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 4cde308b835..0c9f4d7c50a 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -7,7 +7,7 @@ }: buildBazelPackage rec { - name = "bazel-remote-${version}"; + pname = "bazel-remote"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 17f7e2c7e49..3d24ac34b3e 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.3.2"; + version = "1.4.1"; # Python 2 won't have prompt_toolkit 2.x.x # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0bfx7fw6jnkqxa82xvd10yx1w2wbmrrqxwbh4anp5x9wnl91a9lp"; + sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index ba57ef561f3..16365a462a9 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190823.6"; + version = "0.20201025"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f"; + sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 45606151e28..b932e1b550c 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.3.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0jbnx23f1323sh1rfx8rza2pzr4li4199wblrl4vw4zp5hj4qnkm"; + sha256 = "1kl3s5kv3wwh4br6zf0f56bffzjwhgzga93zg39mqry8jvwxp6dx"; fetchSubmodules = true; }; - cargoSha256 = "08zi3ynbi44rdgid9qalgsb5g8dcwclr6ynwxvhi8r0v5i7swwrx"; + cargoSha256 = "1m3wd2gjy2b8a3x9wm49n9z02165afv4c3n13pnqsxcqmd9a764f"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; @@ -54,6 +54,9 @@ rustPlatform.buildRustPackage rec { # TODO: Move to enhanced installShellCompletion when merged: PR #83630 postInstall = '' + # remove test plugin and test server + rm -rf $out/lib $out/bin/test_server + $out/bin/deno completions bash > deno.bash $out/bin/deno completions fish > deno.fish $out/bin/deno completions zsh > _deno diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix index f6baca6fb01..09c7b3973d9 100644 --- a/pkgs/development/web/deno/deps.nix +++ b/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.9.1"; + version = "0.12.0"; sha256s = { - x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash"; - aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx"; - x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk"; + x86_64-linux = "18pim960fh18wrdkhirlj4hnnbxrk172r7yksdn2k5z9lgccighg"; + aarch64-linux = "0d1c8kcz44n1mqprspnshzbqlqw7mq7vryxpmd49gw3fvhcy66y7"; + x86_64-darwin = "1pc2dfq8p1a8dahkc4g8r6b9zwnvds60zc2lgbf8cj5n0ijd06y1"; }; }; } diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 1fa46389204..74253e97334 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -1,13 +1,13 @@ { callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; python = python2; }; in buildNodejs { inherit enableNpm; - version = "10.22.1"; - sha256 = "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl"; + version = "10.23.0"; + sha256 = "07vlqr0493a569i0npwgkxk5wa4vc7j68jsivchg08y2slwn0dgx"; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 6c0d445476b..820deb5884d 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.14.0"; - sha256 = "1rphkl3lqg0rzgg0r58bfv1hjw3rg96qvqcilk2927kbpps3bs84"; + version = "14.15.0"; + sha256 = "0fzv05f8rnc0s1a11k0cqfpgv9yawfbdd8qcl8zr25kv5ridhdip"; } diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index e03cc06d55e..c26b84ffa0a 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.18"; + version = "5.20"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "0hpkcpi6j162bkgcgzzj8y471777q06j7pydl61yp6qscn4g80ch"; + sha256 = "sha256-j1Ui+M6+vbqhL1jhumcaEfZjcuCu33T7kyz1qJOQhhw="; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0bwcvkf1g1dsq1qmric3jfl85rfjzhq6x4h839hfqc536lkfbrpy"; + sha256 = "sha256-1oWoLb5w9g3wDghpvHpNsJCws7QoZ/E2dqxLuaIgi6o="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index a089488b0e0..c4b8eefcc20 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-pkcs11"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ lschuermann ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index e6b0754639c..88b0c843586 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.8.0"; + version = "7.8.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0ivsbhb81v803dsx3c7vj4zbnhx8mr38nn9c45dfdp4lm6shsjq0"; + sha256 = "0jgwd8vb58yzwvnns0kyb0vzgrdvjwzvpk4x8228hrisjxahsm45"; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 893f20cf59a..44d9aba582e 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "atlassian-crowd"; - version = "4.0.2"; + version = "4.2.0"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "1ndg9qb406rd239q7xycc2vdh2jd4fh9wryx1fm9493rxlncx28b"; + sha256 = "1gg4jcwvk4za6j4260dx1vz2dprrnqv8paqf6z86s7ka3y1nx1aj"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 2298ecc84ce..6d75011575a 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.36.4"; + version = "0.37.0.2"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1k6f22ii9vga8j9jxipl1r55msxgag0lbkjxw7vf285z1hdhwylq"; + sha256 = "7f95f9823bdf567d4044925e9f14c820a6b4a176624ec027d911cac33813bf96"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index d3b35a8a8f1..b6fafe5eaa4 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "snmp_exporter"; - version = "0.18.0"; + version = "0.19.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "1zdkb036zy2sw1drlp2m2z1yb7857d2y3yn2y3l0a1kkd4zcqkk4"; + sha256 = "1ppi5lmc2lryawpw1b3kpg3qxr7v62zbiwg2v1d8sq1y5b2xdza6"; }; buildInputs = [ net-snmp ]; diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 09f5471de48..588049cb976 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "112dfqxc144a61jqil2s3181gngfw5vz7yy10ml4f5a1nd90qnci"; + sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index 150371f82b6..d3d3651c2b0 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -1,20 +1,18 @@ { stdenv, fetchurl }: -let version = "0.8"; in - stdenv.mkDerivation rec { pname = "buildtorrent"; - inherit version; + version = "0.8"; src = fetchurl { url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz"; - sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; + sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA="; }; - meta = { + meta = with stdenv.lib; { description = "A simple commandline torrent creator"; - homepage = "http://mathr.co.uk/blog/torrent.html"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + homepage = "https://mathr.co.uk/blog/torrent.html"; + license = licenses.gpl3Plus; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 3cc56d87c62..d9eaa3f3272 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.45.2"; + version = "0.46.2"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0kxmgx4pnayp3jf6cgmka05x3aymxr79rim5nff6k3cg5zaqrz59"; + sha256 = "092nqxl3vdk8k589bv3g05c598k77f4wsxcgymfb1h1fc0lfzqs4"; }; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -31,14 +31,17 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "0x9a322anwrgpxfqrvqb1ikavp8qffa93wdvj5kln1d2rgmxr2sy"; + cargoSha256 = "1smz7084ppz79p8migpy0cqp6azf7sixv9ga65l2f3zfna7kbk78"; checkFlags = [ "--skip=directory_in_home" - "--skip=fish_directory_in_home" "--skip=home_directory" - "--skip=truncated_directory_in_home" "--skip=directory_in_root" + "--skip=truncation_symbol_not_truncated_home" + "--skip=truncation_symbol_truncated_home" + "--skip=folder_with_glide_yaml" + "--skip=shows_multiple_tfms" + "--skip=shows_pinned_in_project_below_root_with_global_json" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/vix/default.nix b/pkgs/tools/misc/vix/default.nix new file mode 100644 index 00000000000..7e93cd5d67e --- /dev/null +++ b/pkgs/tools/misc/vix/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, SDL }: + +stdenv.mkDerivation { + pname = "vix"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "vix"; + rev = "824b6755157a0f7430a0be0af454487d1492204d"; + sha256 = "1y0a2sajkrsg36px21b8lgx1irf0pyj7hccyd6k806bm4zhgxw1z"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ SDL ]; + + meta = with stdenv.lib; { + description = "Visual Interface heXadecimal dump "; + homepage = "http://actinid.org/vix/"; + license = licenses.gpl3; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index e00634dd53e..e89ef8dab0e 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ lschuermann ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/tools/networking/nxdomain/default.nix new file mode 100644 index 00000000000..073ac48b8d3 --- /dev/null +++ b/pkgs/tools/networking/nxdomain/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonApplication, fetchPypi, dnspython, pytestCheckHook }: + +buildPythonApplication rec { + pname = "nxdomain"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn"; + }; + + propagatedBuildInputs = [ dnspython ]; + + checkInputs = [ pytestCheckHook ]; + + postCheck = '' + echo example.org > simple.list + python -m nxdomain --format dnsmasq --out dnsmasq.conf --simple ./simple.list + grep -q 'address=/example.org/' dnsmasq.conf + ''; + + meta = with lib; { + homepage = "https://github.com/zopieux/nxdomain"; + description = "A domain (ad) block list creator"; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zopieux ]; + }; +} diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index e173f66f748..04af88e3335 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://gnupg-pkcs11.sourceforge.net/"; license = licenses.bsd3; - maintainers = with maintainers; [ lschuermann philandstuff ]; + maintainers = with maintainers; [ matthiasbeyer philandstuff ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index 7a7928621bd..a3352c5abfd 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ lschuermann ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 9a19a6789e5..2f7e4d97cbb 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,39 +1,31 @@ -{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }: +{ stdenv, fetchFromGitHub, cmake, zlib, Cocoa }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "0.9.6"; + version = "20200701.154658.b0d6223"; - src = fetchhg { - url = "https://bitbucket.org/wez/atomicparsley"; - sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm"; + src = fetchFromGitHub { + owner = "wez"; + repo = pname; + rev = version; + sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # AC_FUNC_MALLOC is broken on cross builds. - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; + installPhase = '' + runHook preInstall + install -D AtomicParsley $out/bin/AtomicParsley + runHook postInstall + ''; meta = with stdenv.lib; { - description = '' - A lightweight command line program for reading, parsing and - setting metadata into MPEG-4 files - ''; - - longDescription = '' - This is a maintained fork of the original AtomicParsley. - ''; - - homepage = "https://bitbucket.org/wez/atomicparsley"; - license = licenses.gpl2; + description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files"; + homepage = "https://github.com/wez/atomicparsley"; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b932d1e770..fd5facef827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5907,6 +5907,8 @@ in nwdiag = with python3Packages; toPythonApplication nwdiag; + nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { }; + nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { }; nyancat = callPackage ../tools/misc/nyancat { }; @@ -7775,6 +7777,8 @@ in viu = callPackage ../tools/graphics/viu { }; + vix = callPackage ../tools/misc/vix { }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = callPackage ../tools/video/vncrec { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb9083a8a47..41a384579b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6517,6 +6517,8 @@ in { setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; + setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; |