diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 93c6422744f..4b2dc491476 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2867,6 +2867,12 @@ githubId = 30512529; name = "Evils"; }; + ewok = { + email = "ewok@ewok.ru"; + github = "ewok"; + githubId = 454695; + name = "Artur Taranchiev"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; @@ -5919,6 +5925,12 @@ githubId = 1001112; name = "Marcin Janczyk"; }; + mjlbach = { + email = "m.j.lbach@gmail.com"; + github = "mjlbach"; + githubId = 13316262; + name = "Michael Lingelbach"; + }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; diff --git a/nixos/modules/services/networking/corerad.nix b/nixos/modules/services/networking/corerad.nix index d90a5923bc6..4acdd1d69cc 100644 --- a/nixos/modules/services/networking/corerad.nix +++ b/nixos/modules/services/networking/corerad.nix @@ -4,13 +4,7 @@ with lib; let cfg = config.services.corerad; - - writeTOML = name: x: - pkgs.runCommandNoCCLocal name { - passAsFile = ["config"]; - config = builtins.toJSON x; - buildInputs = [ pkgs.go-toml ]; - } "jsontoml < $configPath > $out"; + settingsFormat = pkgs.formats.toml {}; in { meta.maintainers = with maintainers; [ mdlayher ]; @@ -19,7 +13,7 @@ in { enable = mkEnableOption "CoreRAD IPv6 NDP RA daemon"; settings = mkOption { - type = types.uniq types.attrs; + type = settingsFormat.type; example = literalExample '' { interfaces = [ @@ -64,7 +58,7 @@ in { config = mkIf cfg.enable { # Prefer the config file over settings if both are set. - services.corerad.configFile = mkDefault (writeTOML "corerad.toml" cfg.settings); + services.corerad.configFile = mkDefault (settingsFormat.generate "corerad.toml" cfg.settings); systemd.services.corerad = { description = "CoreRAD IPv6 NDP RA daemon"; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 7f92c4d492c..101c9bc59f9 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "18ad85y4hrsvp7gs50dfg08cz40vbakb9hs8gw4cvi7r17vds5ar"; + sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; @@ -24,9 +24,10 @@ mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = "http://texstudio.sourceforge.net"; + homepage = "https://texstudio.org"; + changelog = "https://github.com/texstudio-org/texstudio/blob/${version}/utilities/manual/CHANGELOG.txt"; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ ajs124 cfouche ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b7b6c8ad73b..3570191fd84 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -65,6 +65,7 @@ let lxd = callPackage ./lxd {}; shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; + vercel = callPackage ./vercel {}; }; in automated-providers // special-providers diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix new file mode 100644 index 00000000000..b4e17aabb45 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-provider-vercel"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "ondrejsika"; + repo = pname; + rev = "v${version}"; + sha256 = "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw"; + }; + + vendorSha256 = "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k"; + + postInstall = "mv $out/bin/terraform-provider-vercel{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = "https://github.com/ondrejsika/terraform-provider-vercel"; + description = "Terraform provider for Vercel"; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index f720f56e6ae..2a489ee3e71 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "neochat"; - version = "v1.0"; + version = "1.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9"; }; @@ -61,6 +61,7 @@ mkDerivation rec { description = "A client for matrix, the decentralized communication protocol."; homepage = "https://apps.kde.org/en/neochat"; license = licenses.gpl3Only; + maintainers = with maintainers; [ mjlbach peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index c031615a90b..f918cbdc2b8 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "quaternion"; - version = "0.0.9.4e"; + version = "0.0.9.5-beta2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = version; - sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; + sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM="; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 6c6bf6f93db..eb946e267b2 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { alsaLib db glib - gtk3 + # We don't know why with trackerSupport the executable fail to launch, See: + # https://github.com/NixOS/nixpkgs/issues/106732 + (gtk3.override {trackerSupport = false; }) libkrb5 libsecret nss diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index d04a89bd884..ea9a9c1b755 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -12,7 +12,7 @@ , glib , libssh2 , ncurses -, opencv2 +, opencv4 , openssl , unixODBC , xkeyboard_config @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv2 + opencv4 openssl stdenv.cc.cc.lib unixODBC diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 0b9d29bd525..bdb3e4825b9 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.4.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "0ap5ih4s99c4ah95mcafqsvy4yhfqab6vg1c6ydzfa4czczgcxff"; + sha256 = "qt1IN/5+yw5lrQ00YsvXUcUXCxd97EtNf5JvxJVa7uc="; }; - cargoSha256 = "0vj7g2jhvd5d37rcq02hval9axpciwyqyd10z2a0bsvw0r4bh943"; + cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch b/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch deleted file mode 100644 index 89e81b7eb68..00000000000 --- a/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/lapi.c -+++ b/src/lapi.c -@@ -1285,14 +1285,14 @@ LUA_API void *lua_upvalueid (lua_State * - - LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1, - int fidx2, int n2) { -- LClosure *f1; -- UpVal **up1 = getupvalref(L, fidx1, n1, &f1); -+ UpVal **up1 = getupvalref(L, fidx1, n1, NULL); /* the last parameter not needed */ - UpVal **up2 = getupvalref(L, fidx2, n2, NULL); -+ if (*up1 == *up2) return; /* Already joined */ -+ (*up2)->refcount++; -+ if (upisopen(*up2)) (*up2)->u.open.touched = 1; -+ luaC_upvalbarrier(L, *up2); - luaC_upvdeccount(L, *up1); - *up1 = *up2; -- (*up1)->refcount++; -- if (upisopen(*up1)) (*up1)->u.open.touched = 1; -- luaC_upvalbarrier(L, *up1); - } - - diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 5c094893982..d78d5ba0c2d 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -29,12 +29,12 @@ in rec { }); lua5_3 = callPackage ./interpreter.nix { - sourceVersion = { major = "5"; minor = "3"; patch = "5"; }; - hash = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"; + sourceVersion = { major = "5"; minor = "3"; patch = "6"; }; + hash = "0q3d8qhd7p0b7a4mh9g7fxqksqfs6mr1nav74vq26qvkp2dxcpzw"; + patches = - lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ++ [ - ./CVE-2019-6706.patch - ]; + lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; + postConfigure = lib.optionalString (!stdenv.isDarwin) '' cat ${./lua-5.3-dso.make} >> src/Makefile sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 4971e37a427..84d7c51fd59 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "1721cy6zaq086nrwh9x4d7k1jiaygg1wkvyx486i9bj9z53lc3wd"; + sha256 = "sha256-RYEcFClRdAippG0kspNi9QZIzZAuU4++9LOQTZcqpVc="; }; buildInputs = [ qtbase qtmultimedia ]; @@ -18,7 +18,7 @@ mkDerivation rec { meta = with lib; { description = "A Qt5 library to write cross-platfrom clients for Matrix"; homepage = "https://matrix.org/docs/projects/sdk/quotient"; - maintainers = with maintainers; [ colemickens ]; license = licenses.lgpl21; + maintainers = with maintainers; [ colemickens ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch index 6485ba0f261..03a6b6903a8 100644 --- a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch +++ b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch @@ -10,7 +10,7 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLa { SCMP_SYS(move_pages), nullptr }, { SCMP_SYS(mbind), nullptr }, { SCMP_SYS(get_mempolicy), nullptr }, -@@ -724,6 +724,10 @@ +@@ -724,6 +724,11 @@ "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64", "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR, @@ -18,6 +18,7 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLa + // Nix Directories + "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", ++ "--ro-bind", "/run/opengl-driver", "/run/opengl-driver", }; // We would have to parse ld config files for more info. bindPathVar(sandboxArgs, "LD_LIBRARY_PATH"); diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index b7787650e7c..a0cb85ed71a 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,15 +1,17 @@ { stdenv , fetchFromGitHub +, fetchpatch , pkgconfig , meson , ninja , zstd , curl +, argp-standalone }: stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.6"; + version = "1.1.8"; outputs = [ "out" "lib" "dev" ]; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - sha256 = "1j05f26xppwbkxrm11895blm75i1a6p9q23x7wlkqw198mpnpbbv"; + sha256 = "0q1jafxh5nqgn2w5ciljkh8h46xma0qia8a5rj9m0pxixcacqj6q"; }; nativeBuildInputs = [ @@ -29,7 +31,17 @@ stdenv.mkDerivation rec { buildInputs = [ zstd curl - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin argp-standalone; + + # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS + # https://github.com/zchunk/zchunk/pull/35 + patches = [ + (fetchpatch { + name = "darwin-support.patch"; + url = "https://github.com/zchunk/zchunk/commit/f7db2ac0a95028a7f82ecb89862426bf53a69232.patch"; + sha256 = "0cm84gyii4ly6nsmagk15g9kbfa13rw395nqk3fdcwm0dpixlkh4"; + }) +]; meta = with stdenv.lib; { description = "File format designed for highly efficient deltas while maintaining good compression"; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 66a95500538..32b26a5e035 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -22,11 +22,10 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; maintainers = with stdenv.lib.maintainers; [ vrthra ]; license = with stdenv.lib.licenses; [ bsd3 ]; - homepage = "https://bitbucket.org/stoneleaf/aenum"; + homepage = "https://github.com/ethanfurman/aenum"; }; } diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix new file mode 100644 index 00000000000..e9887b47379 --- /dev/null +++ b/pkgs/development/python-modules/jsonfield/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, django, pytestCheckHook, pytest-django }: + +buildPythonPackage rec { + pname = "jsonfield"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yl828cd0m8jsyr4di6hcjdqmi31ijh5vk57mbpfl7p2gmcq8kky"; + }; + + checkInputs = [ pytestCheckHook pytest-django ]; + + preCheck = "export DJANGO_SETTINGS_MODULE=tests.settings"; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Reusable model field that allows you to store validated JSON, automatically handling serialization to and from the database"; + homepage = "https://github.com/rpkilby/jsonfield/"; + license = licenses.mit; + maintainers = with maintainers; [ mrmebelman ]; + }; +} diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 7fcdbd1a6ad..40238d0effa 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "sqlitebrowser"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "1arv4rzl8s1vjjqzz35l2b1rfzr2b8b23v97fdw1kdxpwvs63l99"; + rev = "v${version}"; + sha256 = "0ray6cscx2qil1dfi7hmpijmq3kba49wn430ih1q4fkz9psjvrz1"; }; # We should be using qscintilla from nixpkgs instead of the vendored version, diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index 825aa0c1fa6..15c1361abd2 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -1,23 +1,20 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: +{ buildGoModule, lib, fetchFromGitHub }: -buildGoPackage rec { - pname = "impl-unstable"; - version = "2019-11-19"; - rev = "6b9658ad00c7fbd61a7b50c195754413f6c4142c"; - - goPackagePath = "github.com/josharian/impl"; +buildGoModule rec { + pname = "impl"; + version = "1.0.0"; src = fetchFromGitHub { - inherit rev; owner = "josharian"; repo = "impl"; - sha256 = "1d4fvj7fgiykznx1z4fmcc06x5hsqp9wn62m5qm1ds8m0rjqaxwi"; + rev = "v${version}"; + sha256 = "0l21fkcgiaaf6ka91dmz8hx0l3nbp0kqi8p25kij1s5zb796z0dy"; }; - goDeps = ./deps.nix; + vendorSha256 = "0xkalwy02w62px01jdwwr3vwwsh50f22dsxf8lrrwmw6k0rq57zv"; + + # go: cannot find GOROOT directory: go + doCheck = false; meta = with lib; { description = "Generate method stubs for implementing an interface"; diff --git a/pkgs/development/tools/impl/deps.nix b/pkgs/development/tools/impl/deps.nix deleted file mode 100644 index f028df3be2d..00000000000 --- a/pkgs/development/tools/impl/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "2addee1ccfb22349ab47953a3046338e461eb4d1"; - sha256 = "1r0drcji290nlq9czibcfynpwxyqx8a5p4b7lam6wblbh2lasfb6"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; - sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } -] diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/misc/emulators/duckstation/default.nix new file mode 100644 index 00000000000..29b867f0e9e --- /dev/null +++ b/pkgs/misc/emulators/duckstation/default.nix @@ -0,0 +1,34 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, SDL2, qtbase +, wrapQtAppsHook, qttools, ninja, gtk3 }: +mkDerivation rec { + pname = "duckstation"; + version = "unstable-2020-12-29"; + + src = fetchFromGitHub { + owner = "stenzek"; + repo = pname; + rev = "f8dcfabc44ff8391b2d41eab2e883dc8f21a88b7"; + sha256 = "0v6w4di4yj1hbxpqqrcw8rbfjg18g9kla8mnb3b5zgv7i4dyzykw"; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; + + buildInputs = [ SDL2 qtbase gtk3 pkg-config ]; + + installPhase = '' + mkdir -p $out/ + mv bin $out/ + ''; + + # TODO: + # - vulkan graphics backend (OpenGL works). + # - default sound backend (cubeb) does not work, but SDL does. + meta = with lib; { + description = + "PlayStation 1 emulator focusing on playability, speed and long-term maintainability"; + homepage = "https://github.com/stenzek/duckstation"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 6938750dd64..caa675951e1 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, lib }: +{ stdenvNoCC, fetchgit, lib }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2020-11-18"; + version = "2020-12-18"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "107p7h13gncsxqhixqq9zmmswvs910sck54ab10s4m5cafvnaf94"; + sha256 = "1rb5b3fzxk5bi6kfqp76q1qszivi0v1kdz1cwj2llp5sd9ns03b5"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1319qr3mhbbvbnl8q151pgfpahwzfv9zg0fvpj34z5h0wnvmlr2v"; + outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146"; - meta = with stdenv.lib; { + meta = with stdenvNoCC.lib; { description = "Binary firmware collection packaged by kernel.org"; - homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index e45c70993a6..35dbd1a9ee1 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8821cu-${kernel.version}-${version}"; - version = "unstable-2020-08-21"; + version = "unstable-2020-12-21"; src = fetchFromGitHub { owner = "brektrou"; repo = "rtl8821cu"; - rev = "45a8b4393e3281b969822c81bd93bdb731d58472"; - sha256 = "1995zs1hvlxjhbh2w7zkwr824z19cgc91s00g7yhm5d7zjav14rd"; + rev = "428a0820487418ec69c0edb91726d1cf19763b1e"; + sha256 = "1ccl94727yq7gzn37ky91k0736cambgnkaa37r2f2hinpl9qdd8q"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 588113aa633..c06da6fee11 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.3.5"; + version = "7.3.6"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1gxa1j7sd4xcyb2gh2ja6mwp0j4zcqwzaz25n9f9p9azhjyd2zh5"; + sha256 = "10hm5bz2q9mccrjx1x77xckqvn2x9m7cl2dn60gvrl8m7q3afscp"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0vplzj5jrx643qp68kxg1g1gazxjrnx771dmc1703zalv28z8fq3"; + sha256 = "1fl4ng39qkc01nv49cfzm19sv3yzzshl22ylkwlsb41rmaifbd1f"; }; - vendorSha256 = "05brpjac54a8bxh7psy8gix9q2g36fr4z5msahp6i8wv2xfrf98b"; + vendorSha256 = "0p4wwacvka5lgzwhlwnn6iiwi9x67zgqf0l4vblpfckvvb3ar41h"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index ccc096fb72c..081c7c8352e 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "promscale"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-xkVT7Kn7mW23p8oGU4AsmB66lNd4QLnhEW7J66ldFHM="; + sha256 = "0179sw5zx552y14lr56adxcgas642xvxpqly6y4m9pi33r1gs8lj"; }; - vendorSha256 = "sha256:1wfyawbdbabyp9nyhzfp632hg9rvwdyagsdqvvq6gv8bn5xfcjvh"; + vendorSha256 = "sha256:04gzf0siz96ar4qdkcw6daswy14i1zvl7ir200adhw1c5phppab6"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/tools/X11/xkb-switch-i3/default.nix new file mode 100644 index 00000000000..9485cb62b2b --- /dev/null +++ b/pkgs/tools/X11/xkb-switch-i3/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, cmake +, fetchFromGitHub +, i3 +, jsoncpp +, libsigcxx +, libX11 +, libxkbfile +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "xkb-switch-i3"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "Zebradil"; + repo = "xkb-switch-i3"; + rev = version; + sha256 = "15c19hp0n1k3w15qn97j6wp5b8hbk0mq6x3xjfn6dkkjfz1fl6cn"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ i3 jsoncpp libsigcxx libX11 libxkbfile ]; + + meta = with stdenv.lib; { + description = "Switch your X keyboard layouts from the command line(i3 edition)"; + homepage = "https://github.com/Zebradil/xkb-switch-i3"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ewok ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03a146eabd0..64e6e95f54f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12865,6 +12865,8 @@ in duckdb = callPackage ../development/libraries/duckdb {}; + duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -25341,6 +25343,8 @@ in xkb-switch = callPackage ../tools/X11/xkb-switch { }; + xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { }; + xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; xlife = callPackage ../applications/graphics/xlife { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80f5f6cab1c..0dd7d2ec227 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3176,6 +3176,8 @@ in { jsondiff = callPackage ../development/python-modules/jsondiff { }; + jsonfield = callPackage ../development/python-modules/jsonfield { }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; jsonmerge = callPackage ../development/python-modules/jsonmerge { };