diff options
Diffstat (limited to 'pkgs')
42 files changed, 157 insertions, 125 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 29d97d8bc8ab..063cfcaa9fae 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -3,21 +3,21 @@ , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver -, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: mkDerivation rec { - pname = "amarok"; - version = "2.9.0-20190824"; + pname = "amarok-unstable"; + version = "2020-06-12"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out - url = "git://anongit.kde.org/amarok.git"; + url = "https://invent.kde.org/multimedia/amarok.git"; # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; - sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; + rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b"; + sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -26,7 +26,7 @@ mkDerivation rec { qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem phonon plasma-framework threadweaver - curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static pcre snappy taglib taglib_extras ]; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index c9a1e9bea808..bf9710fb17ee 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -9,14 +9,14 @@ let categories = "Audio;AudioVideo;"; }; in mkDerivation rec { - version = "2.3.0"; + version = "2.4.0"; pname = "munt"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = with stdenv.lib.versions; "${pname}_${major version}_${minor version}_${patch version}"; - sha256 = "0fjhshs4w942rlfksalalqshflbq83pyz1z0hcq53falh9v54cyw"; + rev = with stdenv.lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; + sha256 = "0521i7js5imlsxj6n7181w5szfjikam0k4vq1d2ilkqgcwrkg6ln"; }; postInstall = '' @@ -31,7 +31,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; homepage = "http://munt.sourceforge.net/"; - license = licenses.gpl2; + license = with licenses; [ lgpl21 gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; }; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index bae7326c2554..29990dae4049 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "0vaq6cqz03ps0fg3rvk298jnbf8mazvmyfcj7zsf1cgw41xdjjcf"; + sha256 = "1a38j7dy6ax9xvcjbdkiz0z33ln4rlmgrxznvqhdf11j70g1sr6x"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix index 157ef3753e08..3ae1b98661a6 100644 --- a/pkgs/applications/graphics/yeetgif/default.nix +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "yeetgif"; - version = "1.23.5"; + version = "1.23.6"; goPackagePath = "github.com/sgreben/yeetgif"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "sgreben"; repo = pname; rev = version; - sha256 = "1yz4pps8g378lvmi92cnci6msjj7fprp9bxqmnsyn6lqw7s2wb47"; + sha256 = "05z1ylsra60bb4cvr383g9im94zsph1dgicqbv5p73qgs634ckk7"; }; meta = with lib; { diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index c165003d8f8c..6201d881a882 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,27 +1,15 @@ -{ stdenv, fetchurl, unzip, makeWrapper, autoPatchelfHook -, zlib, lttng-ust, curl, icu, openssl }: +{ stdenv, fetchurl, unzip, makeWrapper, dotnetCorePackages, jq }: stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.0.6"; - - src = { - x86_64-linux = fetchurl { - url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-x64.zip"; - sha256 = "05hx6q1lkbjbqhwi9xxvm7ycnsnpl1cnqzyy2yn0q4x27im399cn"; - }; - armv7l-linux = fetchurl { - url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm.zip"; - sha256 = "0l8irqrpl5vbjj84k4makj2ph2z6kpny7qz51zrzbgwhrlw0w4vg"; - }; - aarch64-linux = fetchurl { - url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm64.zip"; - sha256 = "0hg2g4i8sj3fxqfy4imz1iarby1d9f8dh59j266lbbdf2vfz2cml"; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - - nativeBuildInputs = [ unzip makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc zlib lttng-ust curl ]; + version = "4.2.2.1"; + + src = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; + sha256 = "0pr9rrhi44yl99c2i12rimmc4mhbh0ma9jn17cgsh8p0kbj8sq94"; + }; + + nativeBuildInputs = [ unzip makeWrapper jq ]; sourceRoot = "."; @@ -29,23 +17,25 @@ stdenv.mkDerivation rec { dist=$out/opt/asf mkdir -p $dist cp -r * $dist - chmod +x $dist/ArchiSteamFarm - makeWrapper $dist/ArchiSteamFarm $out/bin/ArchiSteamFarm \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ icu openssl ] }" \ + + jq "del(.runtimeOptions.framework.version)" ArchiSteamFarm.runtimeconfig.json > $dist/ArchiSteamFarm.runtimeconfig.json + + makeWrapper ${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet $out/bin/ArchiSteamFarm \ + --add-flags $dist/ArchiSteamFarm.dll \ --add-flags "--path ~/.config/asf" \ --run "mkdir -p ~/.config/asf" \ --run "cd ~/.config/asf" \ --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ - --run "[ -d www ] || cp --no-preserve=mode -r $dist/www ." \ + --run "[ -d www ] || ln -sf $dist/www ." ''; meta = with stdenv.lib; { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; - platforms = [ "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; + platforms = dotnetCorePackages.aspnetcore_3_1.meta.platforms; maintainers = with maintainers; [ gnidorah ]; hydraPlatforms = []; }; diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index edb5a9b37889..1a8758955cef 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qmapshack"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "Maproom"; repo = pname; rev = "V_${version}"; - sha256 = "0hghynb4ac98fg1pwc645zriqkghxwp8mr3jhr87pa6fh0y848py"; + sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 0c932396e9e2..cd11bcbb431c 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.34.0"; + version = "1.34.2"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.15.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "0nc1g4lmz5ww6rjyyanp9vq4sj6fvi9zf9qjc4lpsmapddhjkdy7"; + sha256 = "1xzjzmjs2ijg7zzw53v02lgrg1j82jd7ljcn6lprg01hhvfrwgg7"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index da668b9589af..990679a86688 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nomad"; - version = "0.11.1"; + version = "0.11.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1pcn1bk7sqhhsrm3izqljwyrwdz6bdlplrajvjzka39l3k6f9hgc"; + sha256 = "1p7g7x2gl77h1w7aip3xji3s530fj46gspargz4j3i6h4wkyvafb"; }; # ui: diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index a48016d5069c..0689fd096b3b 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "1lf9srkmi7r6p3him19akzag13hj8arwlkm9mdy8a8fg1ascqbm4"; + sha256 = "0vy1cqqyga68qjbvyhsgl281qkbsvhvmwbxc93hygsxzm9kczy4p"; }; - vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6"; + vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index e8500872d52c..70e107c063fb 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dnscontrol"; - version = "3.0.0"; + version = "3.2.0"; goPackagePath = "github.com/StackExchange/dnscontrol"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7"; + sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7"; }; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch b/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch new file mode 100644 index 000000000000..e2d617bcc7ca --- /dev/null +++ b/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index cc6fa03..7c2b280 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,6 +24,7 @@ add_project_arguments(c_args, language: 'c') + cc = meson.get_compiler('c') + + libm = cc.find_library('m', required: false) ++librt = cc.find_library('rt', required: false) + + pixman = dependency('pixman-1') + libuv = dependency('libuv') +@@ -65,6 +66,7 @@ sources = [ + + dependencies = [ + libm, ++ librt, + pixman, + libuv, + egl, diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 865710184f93..4ca6ae952580 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0aa12fkbwhzs0g2pqw1b27l33nn5dpbcvsf1z8h88kwsf9xdvb2r"; }; + patches = [ ./add-missing-librt.patch ]; + postPatch = '' substituteInPlace meson.build \ --replace "version: '0.1.0'" "version: '${version}'" diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index a1616774d5d7..85d92d3af843 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.9"; + version = "2.23.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0qm32a58b2asiw8rnw1r6vz3bi61vfdan6wyr9f78fj4d07q7n53"; + sha256 = "0yhgfz5jjw55ipgdb32wjdcb01xx2g9ikgvwinnfwswx50iscf5a"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 27084e54a827..bc05e774cd86 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.5"; + version = "3.20.6"; pname = "libdap"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "15jysnsmdjs7q4iafb4qzq4b76cfyvmbxgcxnqg4sr0x4bplwfnb"; + sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 762e707528a6..830e125685e7 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,27 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, which, cmake +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake , fftwSinglePrec, libsamplerate, qtbase , darwin }: -let version = "1.1.0"; in - stdenv.mkDerivation rec { - pname = "liblastfm"; - inherit version; + pname = "liblastfm-unstable"; + version = "2019-08-23"; - # Upstream does not package git tags as tarballs. Get tarball from github. - src = fetchurl { - url = "https://github.com/lastfm/liblastfm/tarball/${version}"; - name = "${pname}-${version}.tar.gz"; - sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; + src = fetchFromGitHub { + owner = "lastfm"; + repo = "liblastfm"; + rev = "2ce2bfe1879227af8ffafddb82b218faff813db9"; + sha256 = "1crih9xxf3rb109aqw12bjqv47z28lvlk2dpvyym5shf82nz6yd0"; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'find_package(Qt5Core QUIET)' \ - 'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)' - ''; + patches = [(fetchpatch { + url = "https://github.com/lastfm/liblastfm/commit/9c5d072b55f2863310e40291677e6397e9cbc3c2.patch"; + name = "0001-Remove-deprecated-staging-server-and-fix-test-for-QT5-at-Ubuntu-19.10.patch"; + sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l"; + })]; - prefixKey = "--prefix "; nativeBuildInputs = [ pkgconfig which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; platforms = platforms.unix; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom ]; license = licenses.gpl3; }; } diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 8fd90c60bdad..21f80f80efa0 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.34.0"; + version = "2.35.2"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0bi7pszrryz18aqna0z73mb1hzz2vqdb0m00pf93hnwc2hba7hwm"; + sha256 = "14vf76vlyhh7b4yjzsnqpg1x3wdhwxrf1syvgf8wyxbjwb9plw82"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 3becd075b255..f033aa9f610f 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' - install -D -t $out/lib/udev/rules.d 70-u2f.rules - ''; - meta = with stdenv.lib; { homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 782af4ab0331..625b16cc99a0 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "37"; + version = "38"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "04f9vpzh4fc15w4ynirzs9ipm9r31dbggb2zilmk0fj4qr79am42"; + sha256 = "068q4xx09vwjs7i89w47qzymdb4l6jqi27gx2jmd3yb6fp2k7nsb"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 2b2e703026d8..c5a12c997d9d 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.8.1"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "1nrbn8a2c56l5j0axmn9ijaviw0a6nrd34sg81r5j05mzzpb69is"; + sha256 = "0rdrz2zkd6xaf9kb5l41xmbfzq618sz498w23irshih4c802pdv5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index ebf8fb9c94e7..4bb8613afeab 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "03ppmrnpyd77azylv1c673cffk6x53j9flx4i99k33bljmdy8iv4"; + sha256 = "1yz3k6dg15q4911x8kjy396dccfgrs50mjz278l09p6zmm71llax"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 302615dc469c..4c5aa374562a 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "051y4z70dq0j343rb02wn3a1vkdbi8khjfib2msa80vdld3nxcyv"; + sha256 = "19qwr0h6qavznx8rfjq6zjccyd2y7x4nc8asldvay3b44xfsr385"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0chw111j2c6ybvbb09x39zg7ghjz4ysw67wbpcmzd1v5jnwbaqdi"; + sha256 = "1wfhwmb1d32k8isk7k8525pmkfih8hlvy53zsj19l3gvjm0da9gw"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "14v2lj65ccgmijxqrr61vpgba30q6w5vnisz78y3hbf3qpxmmd7g"; + sha256 = "0g62v0maz3b9bmjvvjcin6ayg0f5k0n8m93zk75lagyr69g5vaka"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "03q9am237f2r8ivqm1dfkyzm3bmns4xjn99c27ps6dw9an15f73a"; + sha256 = "0dlq8pchgccc66gfdlssydacisia5fbwc8b4gd8f9gcbish8jmf7"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0wv5ghsfmhkbk96zimihcwn16rxjz1q1g5ppahb8gfrclmzhdynl"; + sha256 = "193nni55py6yzw730yyp5va2n4313sjf6a7jmi0xs9bivvvzg5w9"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 936ef661eeee..05938e43ad69 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "1cba1zmm3gfw3ikax7q4vbrxnvjxlby79x5lc4fg9c3igbm0nmwj"; + sha256 = "0p1w6ailp6xpa6ckl5prj413ilxx5s3lga5mzqxj9nn00vni8ik2"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index 447fbdfcdc44..b3d1fb3d26df 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , gdb @@ -19,6 +20,9 @@ buildPythonPackage rec { checkInputs = [ gdb ]; + # tests require gcc for some reason + doCheck = !stdenv.hostPlatform.isDarwin; + postPatch = '' # tries to execute flake8, # which is likely to break on flake8 updates diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 128fb8961d4d..cb3fe1a9f38d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { description = "Engine.IO server"; homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 33eda13b6044..b990fe10b05c 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.2.0"; + version = "1.4.1"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "1xz1xm0lb1arwm3w2ydq5y5xglq60fc0q46x9xndr3i9j0rm8bxh"; + sha256 = "007bc69r26w0sv6v9mbjdnmnkahpfk5998isx81ma7cinqdhi1cj"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index c9df63cabb78..c9a462f1832e 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.0.4"; + version = "1.1.1"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "1b52kpv5561pyjvqi8xmidarqp6lcyyy4sjsl4qjx4cr7hmk8kc7"; + sha256 = "01x4838jljhhhcwfh6zbhy3g7l7nqvypv3g0ch9n2amsf2s16s3l"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 2d87c490452b..e104784fbe8f 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.10.1"; + version = "1.11.0"; # rev is the ${version} commit, mainly for skaffold version command output rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1"; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1qi4b0304jjpv5npa5yfrrfg7yv5p838qqql3sgx4f47ysyyq0as"; + sha256 = "035xp34m8kzb75mivgf3kw026n2h6g2a7j2mi32nxl1a794w36zi"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1cec678d1534..36fb39fd1308 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -206,8 +206,8 @@ let B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = whenAtLeast "5.2" yes; - RTW88_8822CE = whenAtLeast "5.2" yes; + RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f2f0fac3b7dd..2a7a1fa93425 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc6"; - extraMeta.branch = "5.7"; + version = "5.8-rc1"; + extraMeta.branch = "5.1"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0g04zwdxks7pa5q6shl5xl2rml1w95rxq7sqkkadj11mpk2k89w4"; + sha256 = "1gb7g2vrgg0zz281lv1ir1r0535spc40j65p0azmdxlk24fkfxfc"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 627ac42efd20..4afabb858c38 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -14,14 +14,14 @@ buildGoModule rec { pname = "blockbook"; - version = "0.3.3"; - commit = "b6961ca"; + version = "0.3.4"; + commit = "eb4e10a"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "01nb4if2dix2h95xvqvafil325jjw2a4v1izb9mad0cjqcf8rk6n"; + sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; }; vendorSha256 = "1qjlvhizl8cy06cgf4phia70bgbm4lj57z5z2gyr8aglx98bnpdn"; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index a702626e1c14..d550a5cb699e 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.7.3"; + version = "1.7.4"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph"; + sha256 = "0yx0ry8gwgvw1mkz3nv4rn2pwslm0q7jxlk70gaw6386mxxmj0sk"; }; passthru.tests.consul = nixosTests.consul; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index a7581ccbb119..2aae5634cc5e 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { "--without-eddsa" "--with-aes" ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}" - ++ lib.optional enableSeccomp "--enable-seccomp"; + ++ lib.optional enableSeccomp "--enable-seccomp" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; postInstall = '' moveToOutput bin/bind9-config $dev diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 3b14fab68753..585a6196831b 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "1hxy9458apnzfg4n0alncsdgy5dwzn5dbn4xm46iv15xynbj9gz3"; + sha256 = "0xcd9pmv2p4znn6bqvka19h5h2lw90inyxrm5020acd0yaf0i0g3"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 11d9e48008fa..420aac7607e4 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -125,6 +125,10 @@ let pcre2 ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish" + ]; + preConfigure = '' patchShebangs ./build_tools/git_version_gen.sh ''; diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index dca8a0610da8..cf9297119e9f 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -8,7 +8,7 @@ let }); in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.4.0.1"; + version = "0.4.0.2"; format = "other"; @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { owner = "svsdval"; repo = pname; rev = version; - sha256 = "1869w60kprjdikqk4iwx058zri2jg4aznzlg668w9myka4mp01r9"; + sha256 = "174ijn8bc306529scd23szvgx1apanm2qmwk4lwmi64rhkm6dapx"; }; propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 4dd440850120..2ea1668409a5 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "rmlint"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "1r7j1bmm83p6wdw0jhvkm4sa568r534zsy45bvas7qq4433jl019"; + sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index fdcf9832e667..fee282de52fc 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,15 +1,15 @@ -{ stdenv +{ stdenv, lib , pkgconfig, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.14.2.1"; + version = "4.15.1"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i"; + url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; + sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 387fa4d750bd..5dccf295065c 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -2,13 +2,13 @@ , kernel ? null, withDriver ? false }: pythonPackages.buildPythonApplication rec { pname = "chipsec"; - version = "1.4.9"; + version = "1.5.1"; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "1p6w8294w5z2f4jwc22mqaggv5qajvmf9iifv7fl7wdz3wsvskrk"; + sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb"; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92f4f0fa414b..e502fab10d7c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -253,6 +253,7 @@ mapAliases ({ libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 + liblastfm = libsForQt5.liblastfm; # added 2020-06-14 liblrdf = lrdf; # added 2018-04-25 libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19a89edf500..ae44ac84e77b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6401,7 +6401,9 @@ in rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; - rpm = callPackage ../tools/package-management/rpm { }; + rpm = callPackage ../tools/package-management/rpm { + python = python3; + }; rpm-ostree = callPackage ../tools/misc/rpm-ostree { gperf = gperf_3_0; @@ -13076,8 +13078,6 @@ in liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; - liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { }; - liblcf = callPackage ../development/libraries/liblcf { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { }; @@ -14351,6 +14351,8 @@ in libktorrent = callPackage ../development/libraries/libktorrent { }; + liblastfm = callPackage ../development/libraries/liblastfm { }; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bbc5277cd648..89bf25c15908 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13858,6 +13858,22 @@ let }; }; + NetIPLite = buildPerlPackage { + pname = "Net-IP-Lite"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALEXKOM/Net-IP-Lite-0.03.tar.gz"; + sha256 = "c9916e6cfaa53be275379ce4b2a550ae176ddfab50dad43b43ed43e8267802a9"; + }; + buildInputs = [ TestException ]; + meta = { + homepage = "https://metacpan.org/pod/Net::IP::Lite"; + description = "Perl extension for manipulating IPv4/IPv6 addresses"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + NetIPv4Addr = buildPerlPackage { pname = "Net-IPv4Addr"; version = "0.10"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5bc5a54f7a6..5e7e70563526 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5718,7 +5718,7 @@ in { rply = callPackage ../development/python-modules/rply {}; - rpm = toPythonModule (pkgs.rpm.override{inherit python;}); + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; })); rpmfluff = callPackage ../development/python-modules/rpmfluff {}; |