From 6a033a0b1bf7f67155cb42e4cd6eea25b8c69278 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 27 Jun 2021 22:08:53 +0800 Subject: [PATCH 1/3] pantheon.notes-up, notes-up: 2.0.2 -> unstable-2020-12-29 (cherry picked from commit 069c13eac9e40c4d41187da521b52a8c2cd7d3c9) --- pkgs/applications/office/notes-up/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 8271b2974ce..de09bc1c761 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -1,9 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon , pkg-config -, vala_0_46 +, vala , cmake , ninja , gtk3 @@ -12,27 +13,28 @@ , gtkspell3 , glib , libgee +, pcre , sqlite , discount , wrapGAppsHook -, withPantheon ? false }: +, withPantheon ? false +}: stdenv.mkDerivation rec { pname = "notes-up"; - version = "2.0.2"; + version = "unstable-2020-12-29"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Notes-up"; - rev = version; - sha256 = "0bklgp8qrrj9y5m77xqbpy1ld2d9ya3rlxklgzx3alffq5312i4s"; + rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f"; + sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk="; }; nativeBuildInputs = [ cmake ninja - # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349 - vala_0_46 + vala pkg-config wrapGAppsHook ]; @@ -45,6 +47,7 @@ stdenv.mkDerivation rec { gtkspell3 libgee pantheon.granite + pcre sqlite webkitgtk ]; @@ -60,9 +63,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Markdown notes editor and manager designed for elementary OS" - + lib.optionalString withPantheon " - built with Contractor support"; + + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; From 950142c900ef8427f81418a8d1fb76b2b9d09105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Jul 2021 18:10:55 +0200 Subject: [PATCH 2/3] doc: fix link to kodi-19.0 announcement Logically re-apply 7afaacf9a8 ("doc: fix link to kodi-19.0 announcement"), because it was lost in the conversion from docbook to markdown, in commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)"). (Hm, apparently we have *both* docbook and markdown? CI failed before I updated the .xml file.) (cherry picked from commit c2a3ff28be9712b598d84cdc94a7894ca59c772c) --- nixos/doc/manual/from_md/release-notes/rl-2105.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2105.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index e043bee7761..db17b4530ab 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -1026,7 +1026,7 @@ self: super: Kodi has been updated to version 19.1 "Matrix". See the - announcement + announcement for further details. diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index e4565b8ca60..3fe792b2143 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -300,7 +300,7 @@ When upgrading from a previous release, please be aware of the following incompa Regarding the NixOS module, new options for HTTPS inspection have been added and `services.privoxy.extraConfig` has been replaced by the new [services.privoxy.settings](options.html#opt-services.privoxy.settings) (See [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) for the motivation). -- [Kodi](https://kodi.tv/) has been updated to version 19.1 \"Matrix\". See the [announcement](https://kodi.tv/article/kodi-190-matrix-release) for further details. +- [Kodi](https://kodi.tv/) has been updated to version 19.1 \"Matrix\". See the [announcement](https://kodi.tv/article/kodi-19-0-matrix-release) for further details. - The `services.packagekit.backend` option has been removed as it only supported a single setting which would always be the default. Instead new [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) compliant [services.packagekit.settings](options.html#opt-services.packagekit.settings) and [services.packagekit.vendorSettings](options.html#opt-services.packagekit.vendorSettings) options have been introduced. From 5ca9576f49b76d51260405623384b8b6c5f3e36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Jul 2021 18:18:51 +0200 Subject: [PATCH 3/3] doc: point out that nixos-21.05 has gnuradio 3.9 Logically re-apply 64c70a8c4c ("doc: point out that nixos-21.05 has gnuradio 3.9"), because it was lost in the conversion from docbook to markdown, in commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)"). (Apparently we have both .md and .xml release notes now, and CI fails unless they have the same content (after .md processing), so update the .xml file to match...) (cherry picked from commit cfe8c3a75eaa427f48bc93b15c65b826c00d7401) --- .../from_md/release-notes/rl-2105.section.xml | 14 ++++++++------ nixos/doc/manual/release-notes/rl-2105.section.md | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index e043bee7761..3d039da8d54 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -101,16 +101,18 @@ GNURadio - 3.8 was + 3.8 and 3.9 were finally packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute - gnuradio and gnuradio3_7 - now point to an externally wrapped by default derivations, - that allow you to also add `extraPythonPackages` to the Python - interpreter used by GNURadio. Missing environmental variables - needed for operational GUI were also added + gnuradio (3.9), + gnuradio3_8 and + gnuradio3_7 now point to an externally + wrapped by default derivations, that allow you to also add + `extraPythonPackages` to the Python interpreter used by + GNURadio. Missing environmental variables needed for + operational GUI were also added (#75478). diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index e4565b8ca60..6af6218fbc6 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -36,7 +36,7 @@ In addition to numerous new and upgraded packages, this release has the followin The following new services were added since the last release: -- [GNURadio](https://www.gnuradio.org/) 3.8 was [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). +- [GNURadio](https://www.gnuradio.org/) 3.8 and 3.9 were [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` (3.9), `gnuradio3_8` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). - [Keycloak](https://www.keycloak.org/), an open source identity and access management server with support for [OpenID Connect](https://openid.net/connect/), [OAUTH 2.0](https://oauth.net/2/) and [SAML 2.0](https://en.wikipedia.org/wiki/SAML_2.0).