diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 92e87cd4640d..b851facf1e32 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -3,7 +3,7 @@ {config, pkgs, lib, ...}: let - inherit (lib) mkOption mkIf; + inherit (lib) mkOption mkIf types; cfg = config.services.gvpe; @@ -46,12 +46,14 @@ in nodename = mkOption { default = null; + type = types.nullOr types.str; description ='' GVPE node name ''; }; configText = mkOption { default = null; + type = types.nullOr types.lines; example = '' tcp-port = 655 udp-port = 655 @@ -72,6 +74,7 @@ in }; configFile = mkOption { default = null; + type = types.nullOr types.path; example = "/root/my-gvpe-conf"; description = '' GVPE config file, if already present @@ -79,12 +82,14 @@ in }; ipAddress = mkOption { default = null; + type = types.nullOr types.str; description = '' IP address to assign to GVPE interface ''; }; subnet = mkOption { default = null; + type = types.nullOr types.str; example = "10.0.0.0/8"; description = '' IP subnet assigned to GVPE network @@ -92,6 +97,7 @@ in }; customIFSetup = mkOption { default = ""; + type = types.lines; description = '' Additional commands to apply in ifup script ''; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index 3a0b08b3c6d8..df60d553e85b 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -16,16 +16,19 @@ in { description = '' product.data file. Defaults to the one supplied with installation package. ''; + type = types.path; }; frequency = mkOption { default = 30; + type = types.int; description = '' Update virus definitions every X minutes. ''; }; licenseKeyfile = mkOption { + type = types.path; description = '' License keyfile. Defaults to the one supplied with installation package. ''; diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 45398cb26138..7ca4fdcf64d4 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -41,6 +41,7 @@ in { openFilesLimit = mkOption { default = openFilesLimit; + type = types.either types.int types.str; description = '' Number of files to allow deluged to open. ''; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2b7cdb9b4b7c..acf1e6a7ee67 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -101,12 +101,14 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; + chromiumVersionAtLeast = min-version: + versionAtLeast upstream-info.version min-version; versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (importJSON ./upstream-info.json).stable.version; - in if versionAtLeast stable-version upto-version - then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + ungoogled-version = (importJSON ./upstream-info.json).ungoogled.version; + in if versionAtLeast ungoogled-version upto-version + then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result else result; @@ -269,6 +271,10 @@ let use_system_minigbm = true; use_system_libdrm = true; system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs (chromiumVersionAtLeast "89") { + # Disable PGO (defaults to 2 since M89) because it fails without additional changes: + # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version + chrome_pgo_phase = 0; } // optionalAttrs ungoogled { chrome_pgo_phase = 0; enable_hangout_services_extension = false; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 88736efe6ef2..a2d19900d8c8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,22 +18,9 @@ } }, "beta": { - "version": "88.0.4324.96", - "sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9", - "sha256bin64": "1v7bpidqs8y3k7kzfp52q8xsdc515mnf9arfw9pp5bsp79fl3rik", - "deps": { - "gn": { - "version": "2020-11-05", - "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" - } - } - }, - "dev": { "version": "89.0.4389.23", "sha256": "1d5pv4bhskh4l8x5ygccxwiryf05mwr1qzq1dzn6q82damr6dpq5", - "sha256bin64": "0d8ikwck7zmwgqni1f1xb44p773dqq096qnj0yg941457b0yg5hs", + "sha256bin64": "0swyx2a1gh9mi2jayymcvzwm9cb265ks43wg823abss4q3rskg84", "deps": { "gn": { "version": "2021-01-07", @@ -43,6 +30,19 @@ } } }, + "dev": { + "version": "90.0.4400.8", + "sha256": "0z7695r8k1xm5kx7cc42kmcr11dbagcwjak32sglj0sw3hsr2yqz", + "sha256bin64": "11gp2sxaly66qfb2gfxnikq1xad520r32pgshkm2jsb7a7vj7mmf", + "deps": { + "gn": { + "version": "2021-01-14", + "url": "https://gn.googlesource.com/gn", + "rev": "d62642c920e6a0d1756316d225a90fd6faa9e21e", + "sha256": "0f1i079asiznn092vm6lyad96wcs8pxh95fjmjbnaqjaalivsic0" + } + } + }, "ungoogled-chromium": { "version": "87.0.4280.141", "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 4ade911e1c7b..10831c57f8d8 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "1l9qcymjwg3wzbbi4hcyzfrxyqgz2xdy4ab3lr0zq38v025d794n"; + sha256 = "04bp5k1byjbzwnmcx4b7sw68pr2jrj4c21z76jq311hyrmanj6fi"; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index f0722b525329..9fdb78c70382 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -40,13 +40,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "26.0.2"; + version = "26.1.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; - rev = "refs/tags/${version}"; - sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw"; + rev = version; + sha256 = "1plr5a7k5scxlibhbknhhk19ipk8las14dzs7v64zx7rhpj00009"; fetchSubmodules = true; }; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 919c04913f03..8a283a041852 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20201013"; + version = "20210127"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"; + sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index e66415c3e129..36c449ee9de7 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }: stdenv.mkDerivation rec { pname = "terminology"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4"; + sha256 = "0v74858yvrrfy0l2pq7yn6izvqhpkb9gw2jpd3a3khjwv8kw6frz"; }; nativeBuildInputs = [ meson ninja pkg-config + python3 ]; buildInputs = [ @@ -25,6 +26,10 @@ stdenv.mkDerivation rec { "-D edje-cc=${efl}/bin/edje_cc" ]; + postPatch = '' + patchShebangs data/colorschemes/*.py + ''; + meta = { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 09df8d79dca0..3d88cbd92229 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -126,6 +126,8 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin.nix { }; + xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix new file mode 100644 index 000000000000..136b91a8a2f8 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, gtk3 +, libxfce4ui, libxfce4util, xfconf, xfce4-dev-tools, xfce4-panel +, i3ipc-glib +}: + +stdenv.mkDerivation rec { + pname = "xfce4-i3-workspaces-plugin"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "denesb"; + repo = "xfce4-i3-workspaces-plugin"; + rev = version; + sha256 = "sha256-+tjxMr0UbE3BLdxBwNr2mZqKSQOOtw69FmN4rk4loyA="; + }; + + nativeBuildInputs = [ + pkg-config + intltool + ]; + + buildInputs = [ + gtk3 + xfconf + libxfce4ui + libxfce4util + xfce4-dev-tools + xfce4-panel + i3ipc-glib + ]; + + preConfigure = '' + ./autogen.sh + patchShebangs . + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/denesb/xfce4-i3-workspaces-plugin"; + description = "Workspace switcher plugin for xfce4-panel which can be used for the i3 window manager"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix index 347382990d16..6e201ac79339 100644 --- a/pkgs/development/compilers/cc65/default.nix +++ b/pkgs/development/compilers/cc65/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 1f1eff189598..fd7df4d5ba37 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -17,12 +17,6 @@ , xmlto }: -assert - x11Support -> - libX11 != null && libICE != null && libSM != null; - -assert enableSystemd -> systemd != null; - stdenv.mkDerivation rec { pname = "dbus"; version = "1.12.20"; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 33cd34ea5a0e..d69c8d670c4a 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -3,14 +3,12 @@ , autoreconfHook , pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl -, udev ? null +, udev , libobjc , IOKit , withStatic ? false }: -assert enableUdev -> udev != null; - stdenv.mkDerivation rec { pname = "libusb"; version = "1.0.24"; diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index 04079fcb4761..dd16a369881c 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,35 +1,22 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub }: -stdenv.mkDerivation rec { +buildDunePackage rec { version = "2.1.2"; - name = "ocaml${ocaml.version}-opam-file-format-${version}"; + pname = "opam-file-format"; + + useDune2 = true; src = fetchFromGitHub { owner = "ocaml"; - repo = "opam-file-format"; + repo = pname; rev = version; sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2"; }; - buildInputs = [ ocaml findlib ]; - - installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; - - patches = [ - ./optional-static.patch - # fix no implementation error for OpamParserTypes - # can be removed at next release presumably - (fetchpatch { - url = "https://github.com/ocaml/opam-file-format/pull/41/commits/2a9a92ec334e0bf2adf8d2b4c1b83f1f9f68df8f.patch"; - sha256 = "090nl7yciyyidmbjfryw3wyx7srh6flnrr4zgyhv4kvjsvq944y2"; - }) - ]; - meta = { description = "Parser and printer for the opam file syntax"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch b/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch deleted file mode 100644 index 5501fdd0c6c3..000000000000 --- a/pkgs/development/ocaml-modules/opam-file-format/optional-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -1,1 +1,5 @@ --TARGETS = opam-file-format.cma opam-file-format.cmxa opam-file-format.cmxs -+TARGETS = opam-file-format.cma opam-file-format.cmxa -+ -+ifeq "$(NATDYNLINK)" "true" -+TARGETS = $(TARGETS) opam-file-format.cmxs -+endif - -all: $(TARGETS) - diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 22b6281fa769..fcde20b9bf79 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "f81cb52b220774aab93ffcf25bdc17e03fd84b6916836640789f86fbf636b984"; + sha256 = "3cf37df471f75441b0afe98a0f3a548434e9bc6a6426dca8c089950b5423f63f"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 60dc18a98779..6e98f6e80ac5 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -5,6 +5,7 @@ , apispec , colorama , click +, email_validator , flask , flask-babel , flask_login @@ -19,18 +20,17 @@ , python-dateutil , prison , pyjwt -, pyyaml , sqlalchemy-utils }: buildPythonPackage rec { pname = "flask-appbuilder"; - version = "2.3.0"; + version = "3.1.1"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "04bsswi7daaqda01a83rd1f2gq6asii520f9arjf7bsy24pmbprc"; + sha256 = "076b020b0ba125339a2e710e74eab52648cde2b18599f7cb0fa1eada9bbb648c"; }; checkInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { apispec colorama click + email_validator flask flask-babel flask_login @@ -56,21 +57,18 @@ buildPythonPackage rec { prison pyjwt sqlalchemy-utils - pyyaml ]; postPatch = '' substituteInPlace setup.py \ - --replace "apispec[yaml]>=1.1.1, <2" "apispec" \ - --replace "jsonschema>=3.0.1, <4" "jsonschema" \ - --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ - --replace "PyJWT>=1.7.1" "PyJWT" \ - --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \ + --replace "apispec[yaml]>=3.3, <4" "apispec" \ --replace "Flask-Login>=0.3, <0.5" "Flask-Login" \ - --replace "Flask-Babel>=1, <2" "Flask-Babel" + --replace "Flask-Babel>=1, <2" "Flask-Babel" \ + --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \ + --replace "prison>=0.1.3, <1.0.0" "prison" ''; + # majority of tests require network access or mongo doCheck = false; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 3b03a15b9a4d..4957b5d31315 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.5"; + version = "3.10.6"; src = fetchPypi { inherit pname version; - sha256 = "cb3b400b37a73cf4a0bc698be2ea414e78ff117867baed9313aa8c97596e1b98"; + sha256 = "b324c7c8689741bba6d71d1369d49780a24fe946b11a3c005d56e09bf705cd19"; }; checkInputs = [ @@ -22,6 +22,8 @@ buildPythonPackage rec { # requires network connection doCheck = false; + pythonImportsCheck = [ "isbnlib" ]; + meta = with lib; { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; homepage = "https://github.com/xlcnd/isbnlib"; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 93eafff6c93b..d5b1df57d047 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -40,8 +40,7 @@ buildPythonPackage rec { --replace "python-slugify>=1.2.6,<4" "python-slugify" ''; - # pytest seems to hang with python3.8 - doCheck = !stdenv.isDarwin && pythonOlder "3.8"; + doCheck = !stdenv.isDarwin; checkInputs = ([ pytest pytestcov diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 44435dd6bd8b..72f386b36272 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - sha256 = "1pp3z4q6ryxcc26kaq222j53ji110n2v7rx29c7vy1fbb8mq64im"; + sha256 = "1zgh4k96i939w4scikajmlriayk1zg3md16f8fckjvqbphpxrysl"; }; propagatedBuildInputs = [ @@ -33,6 +33,9 @@ buildPythonPackage rec { substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; + doCheck = false; + pythonImportsCheck = [ "xapp" ]; + meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 9cf93176b9a6..8ab54468c001 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -6,12 +6,12 @@ let zmusic-src = fetchFromGitHub { owner = "coelckers"; repo = "zmusic"; - rev = "2d0ea861174f9e2031400ab29f5bcc8425521cc6"; - sha256 = "1ac7lhbzwfr0fsyv7n70hvb8imzngxn1qyanmv9j26j0h90hhl8a"; + rev = "bff02053bea30bd789e45f60b90db3ffc69c8cc8"; + sha256 = "0vpr79gpdbhslg5qxyd1qxlv5akgli26skm1vb94yd8v69ymdcy2"; }; zmusic = stdenv.mkDerivation { pname = "zmusic"; - version = "1.1.0"; + version = "1.1.3"; src = zmusic-src; @@ -28,13 +28,13 @@ let gzdoom = stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.4.2"; + version = "4.5.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1xkkmbsdv64wyb9r2fv5mwyqw0bjryk528jghdrh47pndmjs9a38"; + sha256 = "0kmqnyhdi5psi7zwrx9j3pz0cplypsvhg4cr8w2jbawh6jb71sk9"; fetchSubmodules = true; }; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0d740e071e11..3812ae500e5c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -9,7 +9,7 @@ , pam , dbus , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl -, systemd ? null +, systemd , acl , gmp , darwin @@ -20,8 +20,6 @@ , coreutils }: -assert enableSystemd -> systemd != null; - ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. diff --git a/pkgs/misc/emulators/commander-x16/emulator.nix b/pkgs/misc/emulators/commander-x16/emulator.nix new file mode 100644 index 000000000000..73442215ff1e --- /dev/null +++ b/pkgs/misc/emulators/commander-x16/emulator.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "x16-emulator"; + version = "38"; + + src = fetchFromGitHub { + owner = "commanderx16"; + repo = pname; + rev = "r${version}"; + sha256 = "WNRq/m97NpOBWIk6mtxBAKmkxCGWacWjXeOvIhBrkYE="; + }; + + dontConfigure = true; + + buildInputs = [ SDL2 ]; + + installPhase = '' + runHook preInstall + install -D --mode 755 --target-directory $out/bin/ x16emu + install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; + description = "The official emulator of CommanderX16 8-bit computer"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = SDL2.meta.platforms; + }; + + passthru = { + # upstream project recommends emulator and rom synchronized; + # passing through the version is useful to ensure this + inherit version; + }; +} diff --git a/pkgs/misc/emulators/commander-x16/rom.nix b/pkgs/misc/emulators/commander-x16/rom.nix new file mode 100644 index 000000000000..5da77ebceefe --- /dev/null +++ b/pkgs/misc/emulators/commander-x16/rom.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, cc65 +}: + +stdenv.mkDerivation rec { + pname = "x16-rom"; + version = "38"; + + src = fetchFromGitHub { + owner = "commanderx16"; + repo = pname; + rev = "r${version}"; + sha256 = "xaqF0ppB7I7ST8Uh3jPbC14uRAb/WH21tHlNeTvYpoI="; + }; + + nativeBuildInputs = [ cc65 ]; + + postPatch = '' + patchShebangs scripts/ + ''; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -D --mode 444 --target-directory $out/share/${pname} build/x16/rom.bin + install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; + description = "ROM file for CommanderX16 8-bit computer"; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = cc65.meta.platforms; + }; + + passthru = { + # upstream project recommends emulator and rom synchronized; + # passing through the version is useful to ensure this + inherit version; + }; +} diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 5894d4f506ed..f510c03d9990 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, util-linux, openisns, openssl, kmod, perl, systemd, pkgconf +, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.1.3"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; - buildInputs = [ kmod openisns.lib openssl systemd util-linux ]; + buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; src = fetchFromGitHub { owner = "open-iscsi"; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 71cee65602c6..db35804611bd 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -1,16 +1,29 @@ -{ lib, stdenv, openssl, fetchFromGitHub }: +{ lib, stdenv, openssl, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "open-isns"; - version = "0.99"; + version = "0.100"; src = fetchFromGitHub { - owner = "gonzoleeman"; + owner = "open-iscsi"; repo = "open-isns"; rev = "v${version}"; - sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf"; + sha256 = "0d0dz965azsisvfl5wpp1b7m0q0fmaz5r7x5dfybkry551sbcydr"; }; + patches = [ + (fetchpatch { + name = "deprecated-sighold-sigrelease"; + url = "https://github.com/open-iscsi/open-isns/commit/e7dac76ce61039fefa58985c955afccb60dabe87.patch"; + sha256 = "15v106xn3ns7z4nlpby7kkm55rm9qncsmy2iqc4ifli0h67g34id"; + }) + (fetchpatch { + name = "warn_unused_result"; + url = "https://github.com/open-iscsi/open-isns/commit/4c39cb09735a494099fba0474d25ff26800de952.patch"; + sha256 = "1jlydrh9rgkky698jv0mp2wbbizn90q5wjbay086l0h6iqp8ibc3"; + }) + ]; + propagatedBuildInputs = [ openssl ]; outputs = [ "out" "lib" ]; outputInclude = "lib"; @@ -20,10 +33,11 @@ stdenv.mkDerivation rec { installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ]; installTargets = [ "install" "install_hdrs" "install_lib" ]; - meta = { + meta = with lib; { description = "iSNS server and client for Linux"; - license = lib.licenses.lgpl21; - homepage = "https://github.com/gonzoleeman/open-isns"; - platforms = lib.platforms.linux; + license = licenses.lgpl21Only; + homepage = "https://github.com/open-iscsi/open-isns"; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; }; } diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 9ce66e3c2d71..c41393459087 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "procs"; @@ -13,6 +13,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ilSDLbPQnmhQcNbtKCpUNmyZY0JUY/Ksg0sj/t7veT0="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/procs --completion $shell > procs.$shell + installShellCompletion procs.$shell + done + ''; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c980fda3c861..9ab08007ec71 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -226,6 +226,12 @@ in rec { url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; }) + # Fix the ETag bug. PR merged. Remove when updating to >= 20210125 + # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750 + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch"; + sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4="; + }) ]; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 6867256ea90c..7da3b8e9f068 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , bison , pam @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "doas"; - version = "6.8"; + version = "6.8.1"; src = fetchFromGitHub { owner = "Duncaen"; repo = "OpenDoas"; rev = "v${version}"; - sha256 = "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb"; + sha256 = "sha256-F0FVVspGDZmzxy4nsb/wsEoCw4eHscymea7tIKrWzD0="; }; # otherwise confuses ./configure diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 95a063331b27..22ceedfe4e10 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -412,6 +412,7 @@ mapAliases ({ oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 + openisns = open-isns; # added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 openjpeg_2 = openjpeg; # added 2021-01-25 opensans-ttf = open-sans; # added 2018-12-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d3d59365384..6426e89423d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18859,7 +18859,7 @@ in openiscsi = callPackage ../os-specific/linux/open-iscsi { }; - openisns = callPackage ../os-specific/linux/open-isns { }; + open-isns = callPackage ../os-specific/linux/open-isns { }; osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; @@ -29491,6 +29491,9 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; + x16-emulator = callPackage ../misc/emulators/commander-x16/emulator.nix { }; + x16-rom = callPackage ../misc/emulators/commander-x16/rom.nix { }; + bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; };