b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2022-10-01 00:23:36 +00:00 committed by GitHub
parent a3f96efe76 3b5295131d
commit 528cdca4be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
379 changed files with 11898 additions and 5903 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/missing_documentation.md vendored
View file

@ -15,7 +15,7 @@ assignees: ''
<!-- make sure this issue is not redundant or obsolete -->
- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual]] \[source][nixos-source])
- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual]] \([source][nixos-source])
- [ ] checked [open documentation issues] for possible duplicates
- [ ] checked [open documentation pull requests] for possible solutions

7
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -767,6 +767,13 @@
grants access to the hardware.
</para>
</listitem>
<listitem>
<para>
The Wordpress module got support for installing language packs
through
<literal>services.wordpress.sites.&lt;site&gt;.languages</literal>.
</para>
</listitem>
<listitem>
<para>
There is a new module for the <literal>thunar</literal>

2
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -254,6 +254,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- There is a new module for AMD SEV CPU functionality, which grants access to the hardware.
- The Wordpress module got support for installing language packs through `services.wordpress.sites.<site>.languages`.
- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.
- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.

29
nixos/modules/services/home-automation/home-assistant.nix
View file

@ -415,7 +415,7 @@ in {
# Empty string first, so we will never accidentally have an empty capability bounding set
# https://github.com/NixOS/nixpkgs/issues/120617#issuecomment-830685115
""
] ++ lib.optionals (builtins.any useComponent [ "bluetooth" "bluetooth_le_tracker" "bluetooth_tracker" "eq3btsmart" "fjaraskupan" "govee_ble" "homekit_controller" "inkbird" "moat" "sensorpush" "switchbot" "xiaomi_ble" ]) [
] ++ lib.optionals (builtins.any useComponent componentsUsingBluetooth) [
# Required for interaction with hci devices and bluetooth sockets, identified by bluetooth-adapters dependency
# https://www.home-assistant.io/integrations/bluetooth_le_tracker/#rootless-setup-on-core-installs
"CAP_NET_ADMIN"
@ -432,8 +432,30 @@ in {
]);
componentsUsingBluetooth = [
# Components that require the AF_BLUETOOTH address family
"bluetooth_tracker"
"august"
"bluemaestro"
"bluetooth"
"bluetooth_le_tracker"
"bluetooth_tracker"
"bthome"
"default_config"
"eq3btsmart"
"esphome"
"fjaraskupan"
"govee_ble"
"homekit_controller"
"inkbird"
"led_ble"
"melnor"
"moat"
"qingping"
"sensorpro"
"sensorpush"
"switchbot"
"thermobeacon"
"thermopro"
"xiaomi_ble"
"yalexs_ble"
];
componentsUsingPing = [
# Components that require the capset syscall for the ping wrapper
@ -450,7 +472,6 @@ in {
# mostly the ones using config flows already.
"acer_projector"
"alarmdecoder"
"arduino"
"blackbird"
"deconz"
"dsmr"
@ -464,7 +485,6 @@ in {
"insteon"
"kwb"
"lacrosse"
"mhz19"
"modbus"
"modem_callerid"
"mysensors"
@ -480,7 +500,6 @@ in {
"usb"
"velbus"
"w800rf32"
"xbee"
"zha"
"zwave"
"zwave_js"

2
nixos/modules/services/monitoring/prometheus/sachet.nix
View file

@ -14,7 +14,7 @@ in
configuration = mkOption {
type = types.nullOr types.attrs;
default = null;
example = literalExample ''
example = literalExpression ''
{
providers = {
twilio = {

29
nixos/modules/services/web-apps/wordpress.nix
View file

@ -30,9 +30,10 @@ let
# requests that look like: https://example.com/wp-content//nix/store/...plugin/path/some-file.js
# Since hard linking directories is not allowed, copying is the next best thing.
# copy additional plugin(s) and theme(s)
# copy additional plugin(s), theme(s) and language(s)
${concatMapStringsSep "\n" (theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${theme.name}") cfg.themes}
${concatMapStringsSep "\n" (plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${plugin.name}") cfg.plugins}
${concatMapStringsSep "\n" (language: "cp -r ${language} $out/share/wordpress/wp-content/languages/") cfg.languages}
'';
};
@ -154,6 +155,32 @@ let
'';
};
languages = mkOption {
type = types.listOf types.path;
default = [];
description = lib.mdDoc ''
List of path(s) to respective language(s) which are copied from the 'languages' directory.
'';
example = literalExpression ''
[(
# Let's package the German language.
# For other languages try to replace language and country code in the download URL with your desired one.
# Reference https://translate.wordpress.org for available translations and
# codes.
language-de = pkgs.stdenv.mkDerivation {
name = "language-de";
src = pkgs.fetchurl {
url = "https://de.wordpress.org/wordpress-''${pkgs.wordpress.version}-de_DE.tar.gz";
# Name is required to invalidate the hash when wordpress is updated
name = "wordpress-''${pkgs.wordpress.version}-language-de"
sha256 = "sha256-dlas0rXTSV4JAl8f/UyMbig57yURRYRhTMtJwF9g8h0=";
};
installPhase = "mkdir -p $out; cp -r ./wp-content/languages/* $out/";
};
)];
'';
};
database = {
host = mkOption {
type = types.str;

1
nixos/tests/all-tests.nix
View file

@ -317,6 +317,7 @@ in {
ksm = handleTest ./ksm.nix {};
kthxbye = handleTest ./kthxbye.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
ladybird = handleTest ./ladybird.nix {};
languagetool = handleTest ./languagetool.nix {};
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
leaps = handleTest ./leaps.nix {};

30
nixos/tests/ladybird.nix Normal file
View file

@ -0,0 +1,30 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "ladybird";
meta = with pkgs.lib.maintainers; {
maintainers = [ fgaz ];
};
nodes.machine = { config, pkgs, ... }: {
imports = [
./common/x11.nix
];
services.xserver.enable = true;
environment.systemPackages = [
pkgs.ladybird
];
};
enableOCR = true;
testScript =
''
machine.wait_for_x()
machine.succeed("echo '<!DOCTYPE html><html><body><h1>Hello world</h1></body></html>' > page.html")
machine.execute("ladybird file://$(pwd)/page.html >&2 &")
machine.wait_for_window("Ladybird")
machine.sleep(5)
machine.wait_for_text("Hello world")
machine.screenshot("screen")
'';
})

1
pkgs/applications/audio/furnace/default.nix
View file

@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};
tests.version = testers.testVersion {

6
pkgs/applications/audio/mmtc/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mmtc";
version = "0.2.14";
version = "0.2.15";
src = fetchFromGitHub {
owner = "figsoda";
repo = pname;
rev = "v${version}";
sha256 = "sha256-g2JHY95vkG/Ep2eqz8guteF8fHUso/JuuVijNGkgykA=";
sha256 = "sha256-GQ1SoZE74o8fsXHVdjdEMbdUeefyPb4FXxidcHCy180=";
};
cargoSha256 = "sha256-tVjy/O5hfnQFC6to8VMGc39mEXhA5lwUIne6pVvDec0=";
cargoSha256 = "sha256-2IcOwjYTRl2tCB/YAuDACpgaRKZ/21IKWpVs+koYH3k=";
nativeBuildInputs = [ installShellFiles ];

2
pkgs/applications/audio/r128gain/default.nix
View file

@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
# sandbox to be disabled.
doCheck = false;
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";

8
pkgs/applications/audio/touchosc/default.nix
View file

@ -45,7 +45,7 @@ in
stdenv.mkDerivation rec {
pname = "touchosc";
version = "1.1.4.143";
version = "1.1.5.145";
suffix = {
aarch64-linux = "linux-arm64";
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
hash = {
aarch64-linux = "sha256-BLPTCaFtsvYzesFvOJVCCofgRVpT2hCvrpYbceh95J4=";
armv7l-linux = "sha256-RpHAXj2biZDqeE9xy3Q+fcGTIvCXfTJNn/jMObfL44g=";
x86_64-linux = "sha256-CD8JR1QVMBe//MyrNfo8RE1ogoVU0H87IU5rTg5rDAU=";
aarch64-linux = "sha256-3qbr9dveeDqP9psZNyN520B2JuG/R9yvpYX9CdqR7TI=";
armv7l-linux = "sha256-wns0hb+5s7cEbV+4crUWRJ1yU3pl1N0NJ0GWmM4Uvos=";
x86_64-linux = "sha256-LsrR46Epc8x0KTc2lbVN1rbb5KZXYTG8oygJ1BmsCC8=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

4
pkgs/applications/blockchains/ergo/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.45";
version = "4.0.103";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-YUcBNGUs7oBiY7zkRSQxT4/t3DfvamcQPVI3h/sonHM=";
sha256 = "sha256-9vGPHNq76BSdqN1z0KzDOzeMOHAUKnA3Jpx+I5+FOFM=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/blockchains/stellar-core/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "stellar-core";
version = "19.3.0";
version = "19.4.0";
src = fetchFromGitHub {
owner = "stellar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6untHS4+2CyYfGQdbACjEbE+aSirjNk7LxOO2BWDZEM=";
sha256 = "sha256-pgwLCtlj2Ak34KfE+ffIxQ1Z4Epxm3f1Y2aqYOIlLUc=";
fetchSubmodules = true;
};

114
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View file

@ -643,10 +643,10 @@
elpaBuild {
pname = "code-cells";
ename = "code-cells";
version = "0.2";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/code-cells-0.2.tar";
sha256 = "19v6a7l23646diazl0rzjxjsam12hm08hgyq8hdcc7l3xl840ghk";
url = "https://elpa.gnu.org/packages/code-cells-0.3.tar";
sha256 = "0i5n9xqpf0www553in3xibc93vw9x6659zaqnvr5rkad95gz456x";
};
packageRequires = [ emacs ];
meta = {
@ -673,10 +673,10 @@
elpaBuild {
pname = "comint-mime";
ename = "comint-mime";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/comint-mime-0.1.tar";
sha256 = "1ak0ylqdslsb6a64dkpvappdbqnl1i8lc17jla9pqqs7r16sh3n0";
url = "https://elpa.gnu.org/packages/comint-mime-0.2.tar";
sha256 = "06sxsrmxr2l63cslaqmsc03birkcsqbnwbjkhn0f8y3afb4pafkf";
};
packageRequires = [ emacs ];
meta = {
@ -1086,10 +1086,10 @@
elpaBuild {
pname = "detached";
ename = "detached";
version = "0.8.1";
version = "0.9.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/detached-0.8.1.tar";
sha256 = "03riybjk2yls8wjkp1sqd30p0jpvrlz3qlj8r04cx7s1nn1kn9g3";
url = "https://elpa.gnu.org/packages/detached-0.9.0.tar";
sha256 = "1br1s2kwb5ji4ad5m89grpyvjffhc3xxydgja9q796cx6zwrnavp";
};
packageRequires = [ emacs ];
meta = {
@ -1401,10 +1401,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "0.4.2";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-0.4.2.tar";
sha256 = "0ik9kzdv5r1q7hw81nh3raiychpmwi61034y12pqvbq24njp0y72";
url = "https://elpa.gnu.org/packages/ef-themes-0.5.0.tar";
sha256 = "1k73q48vg7vyjmnvizinwn9if481ajq63ps2iwb01f1brrhmbf5v";
};
packageRequires = [ emacs ];
meta = {
@ -1563,10 +1563,10 @@
elpaBuild {
pname = "ement";
ename = "ement";
version = "0.1.2";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ement-0.1.2.tar";
sha256 = "1n5k3rcgdq625b9fjhl53nl5zbis4dw0d00h4dk16m61nk98ra2l";
url = "https://elpa.gnu.org/packages/ement-0.2.tar";
sha256 = "1kxbkqiy5c9pxk4f5k3d3j2q3qn7cg8f21zpgds9s8fd6ax0arcf";
};
packageRequires = [
emacs
@ -1806,10 +1806,10 @@
elpaBuild {
pname = "flymake-proselint";
ename = "flymake-proselint";
version = "0.2.3";
version = "0.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.3.tar";
sha256 = "1384m52zkrlkkkyxg1zimp7dwrxhx8wbvw5ga5vg78yl6cqx9kbc";
url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar";
sha256 = "1x1hp06hggywmpbimyw4cg0cyg7g9v39r552ypivq9pvz94kmkp0";
};
packageRequires = [ emacs ];
meta = {
@ -2255,10 +2255,10 @@
elpaBuild {
pname = "inspector";
ename = "inspector";
version = "0.7";
version = "0.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/inspector-0.7.tar";
sha256 = "0cwfbg7bx4ni0xadba9v5jbkivz2slqwxcy7q8s3zipb4m578xbk";
url = "https://elpa.gnu.org/packages/inspector-0.8.tar";
sha256 = "0yrkm5bh2kczl5f642wx1xlnzry1xrw0yxhpm0hqwjrmgmbdb9m6";
};
packageRequires = [ emacs ];
meta = {
@ -2285,10 +2285,10 @@
elpaBuild {
pname = "isearch-mb";
ename = "isearch-mb";
version = "0.5";
version = "0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/isearch-mb-0.5.tar";
sha256 = "0fah8dmh9jv05i93ccn9dvl7qmfy32vwxqdzkf1v8gr1plsyjyx7";
url = "https://elpa.gnu.org/packages/isearch-mb-0.6.tar";
sha256 = "1rbslnnwsikpnb07jhzyk0f83z8i581834hsq3i7gnz3a99wpkx7";
};
packageRequires = [ emacs ];
meta = {
@ -2680,10 +2680,10 @@
elpaBuild {
pname = "logos";
ename = "logos";
version = "0.5.0";
version = "0.5.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/logos-0.5.0.tar";
sha256 = "026nzkgkfs96m9qxpng7h0kqvhxfah883pv4i08fz0950lrsxynd";
url = "https://elpa.gnu.org/packages/logos-0.5.1.tar";
sha256 = "0154fxl20crl0ay064cbhgsjnj70nq5jz778hzjjy3mnkwzsmbh3";
};
packageRequires = [ emacs ];
meta = {
@ -3158,6 +3158,21 @@
license = lib.licenses.free;
};
}) {};
notmuch-indicator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "notmuch-indicator";
ename = "notmuch-indicator";
version = "0.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.0.tar";
sha256 = "11kbl8y95vwww1rsgdd1q5x8i690gi4cxql4n2sg7r5dysdrbyz1";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
license = lib.licenses.free;
};
}) {};
ntlm = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ntlm";
@ -3293,6 +3308,21 @@
license = lib.licenses.free;
};
}) {};
org-contacts = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
elpaBuild {
pname = "org-contacts";
ename = "org-contacts";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar";
sha256 = "1kzdw9kbnpryxdb9ywh2va4nnjcxw6asszf5n7a95rw2gl6m3l10";
};
packageRequires = [ emacs org ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-contacts.html";
license = lib.licenses.free;
};
}) {};
org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }:
elpaBuild {
pname = "org-edna";
@ -3567,10 +3597,10 @@
elpaBuild {
pname = "persist";
ename = "persist";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/persist-0.4.tar";
sha256 = "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q";
url = "https://elpa.gnu.org/packages/persist-0.5.tar";
sha256 = "090n4479zs82by7a3vb551gyjvv8lpfcylk43ywr2lfyssc9xiq0";
};
packageRequires = [];
meta = {
@ -4198,10 +4228,10 @@
elpaBuild {
pname = "setup";
ename = "setup";
version = "1.3.0";
version = "1.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/setup-1.3.0.tar";
sha256 = "0r13ry73jm31j8fq7v1sh0k113fr4blfkiz85696bdpah2pnca87";
url = "https://elpa.gnu.org/packages/setup-1.3.2.tar";
sha256 = "1sr514w4mn0fbdawjb5p0fd6i6q2zi9737rbwcgakb1l9cqvb5qy";
};
packageRequires = [ emacs ];
meta = {
@ -4637,10 +4667,10 @@
elpaBuild {
pname = "taxy";
ename = "taxy";
version = "0.10";
version = "0.10.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/taxy-0.10.tar";
sha256 = "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3";
url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar";
sha256 = "05czw8fkifb25rwl99dmncr1g0rjfx1bqijl7igqs9j6h9ia2xvg";
};
packageRequires = [ emacs ];
meta = {
@ -5107,10 +5137,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.26";
version = "0.27";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.26.tar";
sha256 = "070dkw7ii5lfg4m0bwl9blbyq3rgqs212my142ri69ig1fz9x5ad";
url = "https://elpa.gnu.org/packages/vertico-0.27.tar";
sha256 = "0yf02xwv0zx2pwb7c97k7qbbvmkripb1pb4mn16rvs07a9r217hz";
};
packageRequires = [ emacs ];
meta = {
@ -5450,10 +5480,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.5.0";
version = "1.5.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.5.0.tar";
sha256 = "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d";
url = "https://elpa.gnu.org/packages/xref-1.5.1.tar";
sha256 = "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna";
};
packageRequires = [ emacs ];
meta = {

2
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View file

@ -160,6 +160,8 @@
urweb-mode = callPackage ./urweb-mode { };
voicemacs = callPackage ./voicemacs { };
# Packages made the classical callPackage way
ebuild-mode = callPackage ./ebuild-mode { };

48
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
View file

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.7.1";
version = "1.7.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.1.tar";
sha256 = "0jyzx5z10mv9b134jz4hkp1mbc9f1ki794cr5na9zwvpd9q3j9iy";
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.2.tar";
sha256 = "0vdpv8k1cvkn3cvsnxqv299gvp470ga2pgmfvdqi7k1vzypgpp57";
};
packageRequires = [];
meta = {
@ -199,10 +199,10 @@
elpaBuild {
pname = "boxquote";
ename = "boxquote";
version = "2.2";
version = "2.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/boxquote-2.2.tar";
sha256 = "0vcqm78b5fsizkn2xalnzmdci5m02yxxypcr9q2sai04j7lhmwd9";
url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar";
sha256 = "1d072qls4ywl71wi29khlq4w6yw9idp55vf811nvbmiihn6lwmiv";
};
packageRequires = [ cl-lib ];
meta = {
@ -1577,7 +1577,6 @@
};
}) {};
mentor = callPackage ({ async
, cl-lib ? null
, elpaBuild
, emacs
, fetchurl
@ -1587,12 +1586,12 @@
elpaBuild {
pname = "mentor";
ename = "mentor";
version = "0.3.5";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/mentor-0.3.5.tar";
sha256 = "01zrvfk2njzyzjzkvp5hv5cjl1k1qjrila1ab4bv26gf6bkq5xh3";
url = "https://elpa.nongnu.org/nongnu/mentor-0.4.tar";
sha256 = "1n51yabm4npx62fpfn8rhky09x4y779ismdxa026fycy7va7ynzz";
};
packageRequires = [ async cl-lib emacs seq xml-rpc ];
packageRequires = [ async emacs seq xml-rpc ];
meta = {
homepage = "https://elpa.gnu.org/packages/mentor.html";
license = lib.licenses.free;
@ -2348,10 +2347,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
version = "1.0.8";
version = "1.0.10";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.0.8.tar";
sha256 = "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1";
url = "https://elpa.nongnu.org/nongnu/subed-1.0.10.tar";
sha256 = "08vw9sv2g76yj8sfnx53dd28zkj4s0842i7qi92jam993v9s8h0z";
};
packageRequires = [ emacs ];
meta = {
@ -2500,6 +2499,21 @@
license = lib.licenses.free;
};
}) {};
treeview = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "treeview";
ename = "treeview";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/treeview-1.1.1.tar";
sha256 = "0ryycz2n1kam3ji0ibpy99ll5l6xnx1mx9i9bgfvma61f0ppcppd";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/treeview.html";
license = lib.licenses.free;
};
}) {};
tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tuareg";
@ -2722,10 +2736,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "17.22.20220909110152";
version = "18.1.20220921110635";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.22.20220909110152.tar";
sha256 = "1d8xkwcyd6dcxp926mwb8kgcpdqrcpmdv62ybdhx7izx0abia95y";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-18.1.20220921110635.tar";
sha256 = "0nnd7jq1k62cgjb5y45jg6b76gvzyqh11kha7has4zipd52psvnj";
};
packageRequires = [ emacs ];
meta = {

1206
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View file

File diff suppressed because it is too large Load diff

12
pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
View file

@ -24,14 +24,14 @@ commit_change() {
}
download_change "elpa/elpa-generated.nix"
nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace
commit_change "elpa-packages" "elpa-generated.nix"
download_change "melpa/recipes-archive-melpa.json"
download_change "nongnu/nongnu-generated.nix"
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.elpaPackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages
commit_change "melpa-packages" "recipes-archive-melpa.json"
download_change "nongnu/nongnu-generated.nix"
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages
commit_change "elpa-packages" "elpa-generated.nix"
commit_change "melpa-packages" "recipes-archive-melpa.json"
commit_change "nongnu-packages" "nongnu-generated.nix"

38
pkgs/applications/editors/emacs/elisp-packages/voicemacs/add-missing-require.patch Normal file
View file

@ -0,0 +1,38 @@
From eb9fefe7eddee0b22c7c1104eb9133ed595c55f9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 23 Sep 2022 14:52:34 +1200
Subject: [PATCH] Add missing (require)'s
---
voicemacs-server.el | 2 ++
voicemacs.el | 2 ++
2 files changed, 4 insertions(+)
diff --git a/voicemacs-server.el b/voicemacs-server.el
index edfe74c..04ffdf2 100644
--- a/voicemacs-server.el
+++ b/voicemacs-server.el
@@ -1,5 +1,7 @@
(require 'cl-lib)
(require 'json-rpc-server)
+(require 'f)
+(require 'porthole)
(defvar voicemacs--update-response-timeout 3
diff --git a/voicemacs.el b/voicemacs.el
index b93e80b..d790636 100644
--- a/voicemacs.el
+++ b/voicemacs.el
@@ -18,6 +18,8 @@
(require 'voicemacs-extend-company))
+(require 'yasnippet)
+
(voicemacs-define-sync voicemacs
:update t
:enable nil
--
2.37.2

50
pkgs/applications/editors/emacs/elisp-packages/voicemacs/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ trivialBuild
, lib
, fetchFromGitHub
, avy
, json-rpc-server
, f
, nav-flash
, helm
, cl-lib
, porthole
, default-text-scale
, bind-key
, yasnippet
, company
, company-quickhelp
}:
trivialBuild {
pname = "voicemacs";
version = "unstable-2022-02-16";
src = fetchFromGitHub {
owner = "jcaw";
repo = "voicemacs";
rev = "d91de2a31c68ab083172ade2451419d6bd7bb389";
sha256 = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc=";
};
patches = [ ./add-missing-require.patch ];
packageRequires = [
avy
json-rpc-server
f
nav-flash
helm
cl-lib
porthole
default-text-scale
bind-key
yasnippet
company-quickhelp
];
meta = {
description = "Voicemacs is a set of utilities for controlling Emacs by voice";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.all;
};
}

4
pkgs/applications/editors/ne/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ne";
version = "3.3.1";
version = "3.3.2";
src = fetchFromGitHub {
owner = "vigna";
repo = pname;
rev = version;
sha256 = "sha256-75xsZ9X6nmRj0VVZmY1AeEOBtO2d7jbanZIZ3Klx4mk=";
sha256 = "sha256-mRMACfWcUW6/R43riRGNce4Ac5IRo4YEML8H0oGSH5o=";
};
postPatch = ''

4
pkgs/applications/editors/notepad-next/default.nix
View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "notepad-next";
version = "0.5.4";
version = "0.5.5";
src = fetchFromGitHub {
owner = "dail8859";
repo = "NotepadNext";
rev = "v${version}";
sha256 = "sha256-kEqoL4S/eHsbFoYxNlrv+Wq6acrHQm/qMfrARzl+BYA=";
sha256 = "sha256-ZjDvAN/NNz1GY7/0eKlxogYPg2Ba7Ncg6TXyKQEdWrU=";
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
fetchSubmodules = true;
};

4
pkgs/applications/editors/rednotebook/default.nix
View file

@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "rednotebook";
version = "2.25";
version = "2.26";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "refs/tags/v${version}";
sha256 = "sha256-3FcnyiQc7XGiZVtqxVxqaWYxXejgy/eNQQ4QNTUsCUI=";
sha256 = "sha256-QKK0bHy6pe+elPhnQlYAwmFP93LwCGxqRtBy10vj4i4=";
};
# We have not packaged tests.

4
pkgs/applications/misc/bottles/default.nix
View file

@ -96,9 +96,7 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru.updateScript = gitUpdater {
inherit pname version;
};
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "An easy-to-use wineprefix manager";

4
pkgs/applications/misc/dasel/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.27.0";
version = "1.27.1";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
sha256 = "sha256-bVAW8DrLqZKm9/iLleFxIMVkxaqhgdKwQUSEPpYhwt8=";
sha256 = "sha256-ebz6JUifkw0FQ88dKvIYwC83zuzGsXFaN9PdGDxHmJc=";
};
vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA=";

1
pkgs/applications/misc/diffuse/default.nix
View file

@ -53,7 +53,6 @@ python3.pkgs.buildPythonApplication rec {
passthru = {
updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};
};

2
pkgs/applications/misc/fbmenugen/default.nix
View file

@ -66,7 +66,7 @@ perlPackages.buildPerlPackage rec {
wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB"
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
homepage = "https://github.com/trizen/fbmenugen";

4
pkgs/applications/misc/fluidd/default.nix
View file

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "fluidd";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
sha256 = "sha256-zDCvRwAtjBbBOa5D1k7khZGXeql5COMlWMi/dpwiiYM=";
sha256 = "sha256-CA0C3yERT6r33GdtCZ7UZheEhDL4uzjAvcuhZeZQLvg=";
};
nativeBuildInputs = [ unzip ];

1
pkgs/applications/misc/gnome-firmware/default.nix
View file

@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
];
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "(alpha|beta|rc).*";
};

1
pkgs/applications/misc/pwsafe/default.nix
View file

@ -53,7 +53,6 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x
url = src.gitRepoUrl;
};

6
pkgs/applications/misc/rusty-psn/default.nix
View file

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "rusty-psn";
version = "0.1.2";
version = "0.3.0";
src = fetchFromGitHub {
owner = "RainbowCookie32";
repo = "rusty-psn";
rev = "v${version}";
sha256 = "14li5fsaj4l5al6lcxy07g3gzmi0l3cyiczq44q7clq4myhykhhb";
sha256 = "sha256-BsbuEsW6cQbWg8BLtEBnjoCfcUCy1xWz9u0wBa8BKtA=";
};
cargoSha256 = "0kjaq3ik3lwaz7rjb5jaxavpahzp33j7vln3zyifql7j7sbr300f";
cargoSha256 = "sha256-TD5du7I6Hw1PC8s9NI19jYCXlaZMnsdVj/a0q+M8Raw=";
nativeBuildInputs = [
pkg-config

4
pkgs/applications/misc/spicetify-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.13.1";
version = "2.14.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YgT4HlVqm58CEGoc/bNjo0xEzoNIcTpKGZkSdhcAgis=";
sha256 = "sha256-iaaf5ZHaHSEkQdxqZtsc6K/3+x6gAfvgQoWWYWcFeV4=";
};
vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";

1
pkgs/applications/misc/sticky/default.nix
View file

@ -76,7 +76,6 @@ python3.pkgs.buildPythonApplication rec {
passthru = {
updateScript = gitUpdater {
inherit pname version;
ignoredVersions = ''master.*'';
};
};

2
pkgs/applications/misc/xdgmenumaker/default.nix
View file

@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Command line tool that generates XDG menus for several window managers";

54
pkgs/applications/networking/browsers/ladybird/default.nix
View file

@ -5,28 +5,28 @@
, ninja
, unzip
, wrapQtAppsHook
, makeWrapper
, qtbase
, qttools
, nixosTests
}:
let serenity = fetchFromGitHub {
owner = "SerenityOS";
repo = "serenity";
rev = "094ba6525f0217f3b8d5e467cef326caeb659e8a";
hash = "sha256-IHXe2Td9iRSL1oQVwL2gZHxEM2ID4SghZwK6ewjFV1Y=";
rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5";
hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8=";
};
in gcc11Stdenv.mkDerivation {
pname = "ladybird";
version = "unstable-2022-07-20";
version = "unstable-2022-09-29";
# Remember to update `serenity` too!
src = fetchFromGitHub {
owner = "awesomekling";
owner = "SerenityOS";
repo = "ladybird";
rev = "9e3a1f47d484cee6f23c4dae6c51750af155a8fc";
hash = "sha256-1cPWpPvjM/VcVUEf2k+MvGvTgZ3Fc4LFHZCLh1wU78Y=";
rev = "d69ad7332477de33bfd1963026e057d55c6f222d";
hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E=";
};
nativeBuildInputs = [
@ -34,7 +34,6 @@ in gcc11Stdenv.mkDerivation {
ninja
unzip
wrapQtAppsHook
makeWrapper
];
buildInputs = [
@ -48,39 +47,9 @@ in gcc11Stdenv.mkDerivation {
"-DENABLE_UNICODE_DATABASE_DOWNLOAD=false"
];
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
# Upstream install rules are missing
# https://github.com/awesomekling/ladybird/issues/36
installPhase = ''
runHook preInstall
install -Dm755 ladybird $out/bin/ladybird
mkdir -p $out/lib/ladybird
cp -d _deps/lagom-build/*.so* $out/lib/ladybird/
runHook postInstall
'';
# Patch rpaths
# https://github.com/awesomekling/ladybird/issues/36
preFixup = ''
for f in $out/bin/ladybird $out/lib/ladybird/*.so; do
old_rpath=$(patchelf --print-rpath "$f")
# Remove reference to libraries from build directory
rpath_without_build=$(sed -e 's@[^:]*/_deps/lagom-build:@@g' <<< $old_rpath)
# Add directory where we install those libraries
new_rpath=$out/lib/ladybird:$rpath_without_build
patchelf --set-rpath "$new_rpath" "$f"
done
'';
# According to the readme, the program needs access to the serenity sources
# at runtime
postFixup = ''
wrapProgram $out/bin/ladybird --set SERENITY_SOURCE_DIR "${serenity}"
'';
# Stripping results in a symbol lookup error
dontStrip = true;
passthru.tests = {
nixosTest = nixosTests.ladybird;
};
meta = with lib; {
description = "A browser using the SerenityOS LibWeb engine with a Qt GUI";
@ -88,7 +57,6 @@ in gcc11Stdenv.mkDerivation {
license = licenses.bsd2;
maintainers = with maintainers; [ fgaz ];
# SerenityOS only works on x86, and can only be built on unix systems.
# We also use patchelf in preFixup, so we restrict that to linux only.
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
};
}

10
pkgs/applications/networking/browsers/librewolf/src.json
View file

@ -1,11 +1,11 @@
{
"packageVersion": "105.0-1",
"packageVersion": "105.0.1-1",
"source": {
"rev": "105.0-1",
"sha256": "0p3bcyyap8yjxha064klpjkhca6hdis3qgx15c4dh8wc3gr581f6"
"rev": "105.0.1-1",
"sha256": "0a6vvf62xqxnqn0f87971nsnrr0xzakgjl4d655qhq9xn0apj8wg"
},
"firefox": {
"version": "105.0",
"sha512": "a48f323f874b538402630a9094daa83189b3ca319feddc80fd66d087eca13f21c8b2d85be9c29e948c18cb7c524adac44e135adcde4d4592738e104ae9c1a734"
"version": "105.0.1",
"sha512": "66ef7cd5028953e7da9d55e127135739c9d85be68ec633b71c52d6c9427edb0bd8a38504148484cd322adcefb57bfefe6e57cb15855f195508fe438864f4322b"
}
}

6
pkgs/applications/networking/cluster/helm/chart-testing/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chart-testing";
version = "3.7.0";
version = "3.7.1";
src = fetchFromGitHub {
owner = "helm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wwXHSjb5FeWOx008jpGNzplzRtHyvcxkcHWLOSoaIE0=";
sha256 = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro=";
};
vendorSha256 = "sha256-VYa97JaVGadltrUH/2S9QU5ndgAjozKUXtmaN0q478Q=";
vendorSha256 = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk=";
postPatch = ''
substituteInPlace pkg/config/config.go \

4
pkgs/applications/networking/cluster/kubeone/default.nix
View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kubeone";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
sha256 = "sha256-GC51gKAwurrsm8/zkYpSs7bnT55kpctsTpN6ZtlYxHk=";
sha256 = "sha256-DGLbbIDX2JASre/AQ1eWStNeu4GHgRTQyzrJRTz5DyE=";
};
vendorSha256 = "sha256-w/uLR7wi28Ub7Nouxxg39NlD1OzyIE2oEP4D88Xbwu0=";

6
pkgs/applications/networking/cluster/kubeseal/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubeseal";
version = "0.18.2";
version = "0.18.5";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "sha256-+5g51doZBJqNwsIvAZ7rsq6QhAMaWFjygzr+eAE+R8w=";
sha256 = "sha256-Ij+NNaAq3woHze7o14WT3cqKYLD99dU8C6TUsdG2U54=";
};
vendorSha256 = "sha256-YC4ZSeObkilNvAu3StMDrnZQexVUFwVtX7ee/EPLTsE=";
vendorSha256 = "sha256-Iry8ZE/HwZEnro7p36KTdy3phydA+fjM4EFg8DneSuA=";
subPackages = [ "cmd/kubeseal" ];

6
pkgs/applications/networking/cluster/starboard/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "starboard";
version = "0.15.8";
version = "0.15.10";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AgAcN1KtMW7yHi12Gg1M3hu7DQA7WdWtY3qf4K7c1YA=";
sha256 = "sha256-SuOfRLCEASgiLsy0xeuA1z55+vSMb4VGZuk+OVLSWJA=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-aQrKppIJOCTIDrKvtE6WTkQY8mfYzUh7mBKUd6z19E0=";
vendorSha256 = "sha256-uTDeYzq8XyjHHXfPQzN/ipHfqsPweedKhQQ8CkvqKIM=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/cluster/tilt/default.nix
View file

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
version = "0.30.7";
version = "0.30.8";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zYP9bn3wC5FJwCdDJEBunaEHoFhRKlH7Mec/Stvp76A=";
sha256 = "sha256-dVaLeooTEiKYWp9CmEcSFOunLyJecB8jR9LIKRO8b9g=";
};
vendorSha256 = null;

41
pkgs/applications/networking/feedreaders/newsflash/default.nix
View file

@ -5,35 +5,35 @@
, meson
, ninja
, pkg-config
, wrapGAppsHook
, wrapGAppsHook4
, gdk-pixbuf
, glib
, gtk3
, libhandy
, gtk4
, libadwaita
, libxml2
, openssl
, sqlite
, webkitgtk
, glib-networking
, librsvg
, gst_all_1
, xdg-utils
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "newsflash";
version = "1.5.1";
version = "2.1.0";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = version;
hash = "sha256-fLG7oYt+gdl3Lwnu6c7VLJWSHCFY5LyNeDKoUNGg3Yw=";
rev = "refs/tags/v.${finalAttrs.version}";
sha256 = "sha256-QDGoA22olhafL2geLf1Jxriqc4++3yxGN/ZnNyEAqjA=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-dQlbK3SfY6p1xinroXz5wcaBbq2LuDM9sMlfJ6ueTTg=";
name = "${finalAttrs.pname}-${finalAttrs.version}";
src = finalAttrs.src;
sha256 = "sha256-21v/4VAgolk/12mj7CTu8d5CKMCovE1FQuGyMar8idY=";
};
patches = [
@ -46,14 +46,14 @@ stdenv.mkDerivation rec {
];
postPatch = ''
patchShebangs .
patchShebangs build-aux/cargo.sh
'';
nativeBuildInputs = [
meson
ninja
pkg-config
wrapGAppsHook
wrapGAppsHook4
# Provides setup hook to fix "Unrecognized image file format"
gdk-pixbuf
@ -67,8 +67,9 @@ stdenv.mkDerivation rec {
]);
buildInputs = [
gtk3
libhandy
gtk4
libadwaita
libxml2
openssl
sqlite
webkitgtk
@ -86,18 +87,12 @@ stdenv.mkDerivation rec {
gst-plugins-bad
]);
preFixup = ''
gappsWrapperArgs+=(--suffix PATH : "${lib.makeBinPath [
# Open links in browser
xdg-utils
]}")
'';
meta = with lib; {
description = "A modern feed reader designed for the GNOME desktop";
homepage = "https://gitlab.com/news-flash/news_flash_gtk";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kira-bruneau stunkymonkey ];
platforms = platforms.unix;
mainProgram = "com.gitlab.newsflash";
};
}
})

4
pkgs/applications/networking/firewalld/default.nix
View file

@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation rec {
pname = "firewalld";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "firewalld";
repo = "firewalld";
rev = "v${version}";
sha256 = "sha256-lLS4ISmx+BgAExiqNpYcSIFpSenRs4Kh25WyvTxPqPg=";
sha256 = "sha256-8LLhrAArqa7t9vPe9TE2F0eTfScHFtfolfcXcfboKZQ=";
};
patches = [

6
pkgs/applications/networking/go-graft/default.nix
View file

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "go-graft";
version = "0.2.11";
version = "0.2.13";
src = fetchFromGitHub {
owner = "mzz2017";
repo = "gg";
rev = "v${version}";
sha256 = "sha256-RIHlAE+hsMXA/kWfazAmhsEi298tPY4Mt4RR6vmo1oQ=";
sha256 = "sha256-+AQFvYmuyU2z0F8XHdzkimf/zHMVUiw3TN2jMXTe11s=";
};
CGO_ENABLED = 0;
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
vendorSha256 = "sha256-DLlPwLDWAQw7YPib2G2bFk3BrDL9+uFENhVEf3smnIA=";
vendorSha256 = "sha256-MJMOCUIosLT9XhRsahQMx4Kq6j/aqCjhPq0ZvJc/Soc=";
subPackages = [ "." ];
meta = with lib; {

28
pkgs/applications/networking/instant-messengers/armcord/default.nix
View file

@ -36,20 +36,22 @@
stdenv.mkDerivation rec {
pname = "armcord";
version = "3.0.7";
version = "3.0.8";
src = let
base = "https://github.com/ArmCord/ArmCord/releases/download";
in {
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
sha256 = "b2a583e6abbc6e5dc3f7370a33f21fc4e7963c6cbe7555e954156c77e9577261";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
sha256 = "8c32a14ab8e5bdf865a6523cb4b5cec8f3f870b95f99be9661a4dd0df33aae1d";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src =
let
base = "https://github.com/ArmCord/ArmCord/releases/download";
in
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
sha256 = "sha256-Lzkh1RDRoZSg5GNYlntROHdKLj12ogCqH+h8l5en9U0=";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
sha256 = "sha256-PuQ/zhuv+MA59Cx6QypAmg5Q6zVwfKg+1xKbazb3XM0=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];

8
pkgs/applications/networking/instant-messengers/webex/default.nix
View file

@ -54,11 +54,11 @@
stdenv.mkDerivation rec {
pname = "webex";
version = "42.10.0.23251";
version = "42.7.0.22904";
src = fetchurl {
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Blue/20220815132636/Webex_ubuntu.7z";
sha256 = "a30002585194a7cb01985184031ca6250f4f648590715376aa6f164bce8ed898";
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20220907184519/Webex_ubuntu.7z";
sha256 = "731ec24d95243171649213b19a1709bef98846fd631f54a27d11fe16ebcc7d33";
};
buildInputs = [
@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
#!nix-shell -i bash -p curl jq common-updater-scripts
set -eou pipefail;
channel=blue
channel=gold # blue, green, gold
manifest=$(curl -s "https://client-upgrade-a.wbx2.com/client-upgrade/api/v1/webexteamsdesktop/upgrade/@me?channel=$channel&model=ubuntu" | jq '.manifest')
url=$(jq -r '.packageLocation' <<< "$manifest")

2
pkgs/applications/networking/mullvad-vpn/default.nix
View file

@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.gpl3Only;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ Br1ght0ne ymarkus flexagoon ];
maintainers = with maintainers; [ Br1ght0ne ymarkus ];
};
}

1
pkgs/applications/networking/newsreaders/liferea/default.nix
View file

@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
'';
passthru.updateScript = gitUpdater {
inherit pname version;
url = "https://github.com/lwindolf/${pname}";
rev-prefix = "v";
};

2
pkgs/applications/networking/remote/anydesk/default.nix
View file

@ -30,9 +30,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = genericUpdater {
inherit pname version;
versionLister = writeShellScript "anydesk-versionLister" ''
echo "# Versions for $1:" >> "$2"
curl -s https://anydesk.com/en/downloads/linux \
| grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
| uniq \

5
pkgs/applications/networking/shellhub-agent/default.nix
View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "shellhub-agent";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "F0kDrucPjjzlSiYDuZBO7xT0hTT0BNpHDCKbzWFQCzo=";
sha256 = "XYDS9g118jv7BoI0QSncZMPspSwcnAIFKdjUgttlTgU=";
};
modRoot = "./agent";
@ -25,7 +25,6 @@ buildGoModule rec {
passthru = {
updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
ignoredVersions = ".(rc|beta).*";
};

4
pkgs/applications/networking/testssl/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "testssl.sh";
version = "3.0.7";
version = "3.0.8";
src = fetchFromGitHub {
owner = "drwetter";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SZfGiKSbLq81YdDMgG0C6LC/nE5NApqeWK/PqDzQNBU=";
sha256 = "sha256-gkDtJlAC7woM2HyYDXntD1+bEuqHTEipqrn2EZjxnH8=";
};
nativeBuildInputs = [ makeWrapper ];

1
pkgs/applications/science/electronics/openboardview/default.nix
View file

@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
'';
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = ''.*\.90\..*'';
};

1
pkgs/applications/system/monitor/default.nix
View file

@ -76,7 +76,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "ci.*";
};
};

92
pkgs/applications/version-management/commitizen/default.nix
View file

@ -16,32 +16,18 @@
, termcolor
, tomlkit
, typing-extensions
, chardet
, argcomplete, fetchPypi
, argcomplete
}:
let
# NOTE: Upstream requires argcomplete <2, so we make it here.
argcomplete_1 = argcomplete.overrideAttrs (old: rec {
version = "1.12.3";
src = fetchPypi {
inherit (old) pname;
inherit version;
sha256 = "sha256-LH2//YwEXqU0kh5jsL5v5l6IWZmQ2NxAisjFQrcqVEU=";
};
});
in
buildPythonApplication rec {
pname = "commitizen";
version = "2.29.2";
version = "2.35.0";
src = fetchFromGitHub {
owner = "commitizen-tools";
repo = pname;
rev = "v${version}";
hash = "sha256-4mK+GA1rfctJkMv4ZMfXE/qih/9fF0kwT6bIcLVB/Bk=";
hash = "sha256-9ek6m5k01sGVHwqWXjWYDsPmIeAgK+H23D9sF5hjrf0=";
deepClone = true;
};
@ -50,7 +36,6 @@ buildPythonApplication rec {
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [
chardet
termcolor
questionary
colorama
@ -58,82 +43,47 @@ buildPythonApplication rec {
tomlkit
jinja2
pyyaml
argcomplete_1
argcomplete
typing-extensions
packaging
];
doCheck = true;
checkInputs = [
pytestCheckHook
pytest-freezegun
pytest-mock
pytest-regressions
argcomplete_1
argcomplete
git
];
# NB: These require full git history
# the tests require a functional git installation
# which requires a valid HOME directory.
preCheck = ''
export HOME="$(mktemp -d)"
git config --global user.name "Nix Builder"
git config --global user.email "nix-builder@nixos.org"
git init .
'';
# NB: These tests require complex GnuPG setup
disabledTests = [
"test_breaking_change_content_v1"
"test_breaking_change_content_v1_beta"
"test_breaking_change_content_v1_multiline"
"test_bump_command_increment_option"
"test_bump_command_prelease"
"test_bump_dry_run"
"test_bump_files_only"
"test_bump_local_version"
"test_bump_major_increment"
"test_bump_minor_increment"
"test_bump_on_git_with_hooks_no_verify_disabled"
"test_bump_minor_increment_signed"
"test_bump_minor_increment_signed_config_file"
"test_bump_on_git_with_hooks_no_verify_enabled"
"test_bump_patch_increment"
"test_bump_on_git_with_hooks_no_verify_disabled"
"test_bump_pre_commit_changelog"
"test_bump_pre_commit_changelog_fails_always"
"test_bump_tag_exists_raises_exception"
"test_bump_when_bumpping_is_not_support"
"test_bump_when_version_inconsistent_in_version_files"
"test_bump_with_changelog_arg"
"test_bump_with_changelog_config"
"test_bump_with_changelog_to_stdout_arg"
"test_bump_with_changelog_to_stdout_dry_run_arg"
"test_changelog_config_flag_increment"
"test_changelog_config_start_rev_option"
"test_changelog_from_rev_first_version_from_arg"
"test_changelog_from_rev_latest_version_dry_run"
"test_changelog_from_rev_latest_version_from_arg"
"test_changelog_from_rev_range_version_not_found"
"test_changelog_from_rev_single_version_not_found"
"test_changelog_from_rev_version_range_from_arg"
"test_changelog_from_rev_version_range_including_first_tag"
"test_changelog_from_rev_version_with_big_range_from_arg"
"test_changelog_from_start"
"test_changelog_from_version_zero_point_two"
"test_changelog_hook"
"test_changelog_incremental_angular_sample"
"test_changelog_incremental_keep_a_changelog_sample"
"test_changelog_incremental_keep_a_changelog_sample_with_annotated_tag"
"test_changelog_incremental_newline_separates_new_content_from_old"
"test_changelog_incremental_with_release_candidate_version"
"test_changelog_is_persisted_using_incremental"
"test_changelog_multiple_incremental_do_not_add_new_lines"
"test_changelog_replacing_unreleased_using_incremental"
"test_changelog_with_different_cz"
"test_changelog_with_filename_as_empty_string"
"test_get_commits"
"test_get_commits_author_and_email"
"test_get_commits_with_signature"
"test_get_latest_tag_name"
"test_invalid_subject_is_skipped"
"test_is_staging_clean_when_updating_file"
"test_none_increment_should_not_call_git_tag_and_error_code_is_not_zero"
"test_prevent_prerelease_when_no_increment_detected"
];
meta = with lib; {
description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs";
homepage = "https://github.com/commitizen-tools/commitizen";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ];
maintainers = with maintainers; [ lovesegfault anthonyroussel ];
};
}

4
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fast-export";
version = "210917";
version = "220921";
src = fetchFromGitHub {
owner = "frej";
repo = pname;
rev = "v${version}";
sha256 = "0xg8r9rbqv7mriraqxdks2mgj7j4c9gap3kc05y1kxi3nniywyd3";
sha256 = "sha256-8tAh17Cp1L0kyV5+HoFnh9mINCBNCNBv1gqsMd6U3FQ=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View file

@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
pname = "git-cola";
version = "4.0.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
hash = "sha256-xCGXPGZa4K9f37kZRerfUY+Y7atRdqld5rxj0VYdziU=";
rev = "refs/tags/v${version}";
hash = "sha256-5PE2Ey9IwNzxl4mk7tzaSWXiTmRFlxDO5MhoIYAwEag=";
};
buildInputs = [ git gettext ];

6
pkgs/applications/version-management/git-and-tools/git-gone/default.nix
View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "git-gone";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "flausch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-S9rNVWq1dbencp9Oy3eNPlJtBMdiFsiJnp5XvHi8hIw=";
sha256 = "sha256-kqKFs3xvTVHnsLpLC9gjj1dcPChhegmupNrbWy+7C6o=";
};
cargoSha256 = "sha256-ZytIBdhyBp0p68ERlXNU8CnK9zYVZaBt/wn8F2bXlII=";
cargoSha256 = "sha256-8R13eHS69fQ3r3LYlnB3nPTPX7VesUPlAUCmQEpUUdw=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/version-management/git-repo/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.29.2";
version = "2.29.3";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-995+6AYhSkMkOSm/ZjlInS5zb1od5nbEChvUyS/8RHM=";
sha256 = "sha256-hZoiljARTEhsuaM7QEFl+XqLq4RksLfxDpht5V1aC2M=";
};
# Fix 'NameError: name 'ssl' is not defined'

2
pkgs/applications/version-management/git-review/default.nix
View file

@ -41,7 +41,7 @@ buildPythonApplication rec {
pythonImportsCheck = [ "git_review" ];
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Tool to submit code to Gerrit";

1
pkgs/applications/version-management/gitqlient/default.nix
View file

@ -69,7 +69,6 @@ mkDerivation rec {
];
passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};

3
pkgs/applications/video/epgstation/default.nix
View file

@ -54,6 +54,9 @@ let
# Workaround for https://github.com/svanderburg/node2nix/issues/275
sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js
# Optional typeorm dependency that does not build on aarch64-linux
rm -r node_modules/oracledb
find . -name package-lock.json -delete
'';

4
pkgs/applications/video/epgstation/update.nix
View file

@ -15,8 +15,8 @@ let
attrPath = lib.toLower pname;
rev-prefix = "v";
};
updateScript = builtins.elemAt updater 0;
updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
updateScript = builtins.elemAt updater.command 0;
updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command);
in writers.writeBash "update-epgstation" ''
set -euxo pipefail

4
pkgs/applications/video/mirakurun/update.nix
View file

@ -17,8 +17,8 @@ let
# exclude prerelease versions
ignoredVersions = "-";
};
updateScript = builtins.elemAt updater 0;
updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
updateScript = builtins.elemAt updater.command 0;
updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command);
in writers.writeBash "update-mirakurun" ''
set -euxo pipefail

1
pkgs/applications/video/shotcut/default.nix
View file

@ -76,7 +76,6 @@ mkDerivation rec {
'';
passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};

7
pkgs/applications/virtualization/lkl/default.nix
View file

@ -1,5 +1,8 @@
{ lib, stdenv, fetchFromGitHub, bc, python3, bison, flex, fuse, libarchive
, buildPackages }:
, buildPackages
, firewallSupport ? false
}:
stdenv.mkDerivation rec {
pname = "lkl";
@ -26,6 +29,8 @@ stdenv.mkDerivation rec {
# Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
'' + lib.optionalString firewallSupport ''
cat ${./lkl-defconfig-enable-nftables} >> arch/lkl/configs/defconfig
'';
installPhase = ''

155
pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables Normal file
View file

@ -0,0 +1,155 @@
CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_LOG_NETDEV=y
CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
CONFIG_NF_CONNTRACK_AMANDA=y
CONFIG_NF_CONNTRACK_FTP=y
CONFIG_NF_CONNTRACK_H323=y
CONFIG_NF_CONNTRACK_IRC=y
CONFIG_NF_CONNTRACK_NETBIOS_NS=y
CONFIG_NF_CONNTRACK_SNMP=y
CONFIG_NF_CONNTRACK_PPTP=y
CONFIG_NF_CONNTRACK_SANE=y
CONFIG_NF_CONNTRACK_SIP=y
CONFIG_NF_CONNTRACK_TFTP=y
CONFIG_NF_CT_NETLINK=y
CONFIG_NF_CT_NETLINK_TIMEOUT=y
CONFIG_NF_CT_NETLINK_HELPER=y
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
CONFIG_NF_TABLES=y
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=y
CONFIG_NFT_CT=y
CONFIG_NFT_COUNTER=y
CONFIG_NFT_CONNLIMIT=y
CONFIG_NFT_LOG=y
CONFIG_NFT_LIMIT=y
CONFIG_NFT_MASQ=y
CONFIG_NFT_REDIR=y
CONFIG_NFT_NAT=y
CONFIG_NFT_TUNNEL=y
CONFIG_NFT_OBJREF=y
CONFIG_NFT_QUEUE=y
CONFIG_NFT_QUOTA=y
CONFIG_NFT_REJECT=y
CONFIG_NFT_COMPAT=y
CONFIG_NFT_HASH=y
CONFIG_NFT_FIB_INET=y
CONFIG_NFT_SOCKET=y
CONFIG_NFT_OSF=y
CONFIG_NFT_TPROXY=y
CONFIG_NFT_SYNPROXY=y
CONFIG_NFT_DUP_NETDEV=y
CONFIG_NFT_FWD_NETDEV=y
CONFIG_NFT_FIB_NETDEV=y
CONFIG_NF_FLOW_TABLE_INET=y
CONFIG_NF_FLOW_TABLE=y
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
CONFIG_NETFILTER_XT_TARGET_DSCP=y
CONFIG_NETFILTER_XT_TARGET_HMARK=y
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
CONFIG_NETFILTER_XT_TARGET_LOG=y
CONFIG_NETFILTER_XT_TARGET_MARK=y
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
CONFIG_NETFILTER_XT_TARGET_TEE=y
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
CONFIG_NETFILTER_XT_TARGET_TRACE=y
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
CONFIG_NETFILTER_XT_MATCH_BPF=y
CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
CONFIG_NETFILTER_XT_MATCH_CPU=y
CONFIG_NETFILTER_XT_MATCH_DCCP=y
CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y
CONFIG_NETFILTER_XT_MATCH_DSCP=y
CONFIG_NETFILTER_XT_MATCH_ESP=y
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
CONFIG_NETFILTER_XT_MATCH_HELPER=y
CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
CONFIG_NETFILTER_XT_MATCH_L2TP=y
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
CONFIG_NETFILTER_XT_MATCH_MAC=y
CONFIG_NETFILTER_XT_MATCH_MARK=y
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
CONFIG_NETFILTER_XT_MATCH_NFACCT=y
CONFIG_NETFILTER_XT_MATCH_OSF=y
CONFIG_NETFILTER_XT_MATCH_OWNER=y
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
CONFIG_NETFILTER_XT_MATCH_REALM=y
CONFIG_NETFILTER_XT_MATCH_RECENT=y
CONFIG_NETFILTER_XT_MATCH_SCTP=y
CONFIG_NETFILTER_XT_MATCH_SOCKET=y
CONFIG_NETFILTER_XT_MATCH_STATE=y
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
CONFIG_NETFILTER_XT_MATCH_STRING=y
CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
CONFIG_NETFILTER_XT_MATCH_TIME=y
CONFIG_NETFILTER_XT_MATCH_U32=y
CONFIG_NFT_DUP_IPV4=y
CONFIG_NFT_FIB_IPV4=y
CONFIG_NF_TABLES_ARP=y
CONFIG_NF_FLOW_TABLE_IPV4=y
CONFIG_NF_LOG_ARP=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
CONFIG_IP_NF_TARGET_SYNPROXY=y
CONFIG_IP_NF_NAT=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_TARGET_CLUSTERIP=y
CONFIG_IP_NF_TARGET_ECN=y
CONFIG_IP_NF_TARGET_TTL=y
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
CONFIG_NFT_DUP_IPV6=y
CONFIG_NFT_FIB_IPV6=y
CONFIG_NF_FLOW_TABLE_IPV6=y
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=y
CONFIG_IP6_NF_MATCH_EUI64=y
CONFIG_IP6_NF_MATCH_FRAG=y
CONFIG_IP6_NF_MATCH_OPTS=y
CONFIG_IP6_NF_MATCH_HL=y
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
CONFIG_IP6_NF_MATCH_MH=y
CONFIG_IP6_NF_MATCH_RPFILTER=y
CONFIG_IP6_NF_MATCH_RT=y
CONFIG_IP6_NF_MATCH_SRH=y
CONFIG_IP6_NF_TARGET_HL=y
CONFIG_IP6_NF_FILTER=y
CONFIG_IP6_NF_TARGET_REJECT=y
CONFIG_IP6_NF_TARGET_SYNPROXY=y
CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_RAW=y
CONFIG_IP6_NF_NAT=y
CONFIG_IP6_NF_TARGET_MASQUERADE=y
CONFIG_IP6_NF_TARGET_NPT=y
CONFIG_NF_CONNTRACK_BRIDGE=y

6
pkgs/applications/virtualization/nixpacks/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "0.7.2";
version = "0.8.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tiAz8nrUq47AgafoXx/6KNl7Q3y1/Z4ITOtznU3hQAw=";
sha256 = "sha256-5ImGG3sovDFya1o6bbEu3JaS3xUaO9gfAnw28GZf2aU=";
};
cargoSha256 = "sha256-6o254VH5fwtcTFPEFfPdLQOLk8YGbEi9ZeDfdHhVCn0=";
cargoSha256 = "sha256-WAnFucDCG0h+tfy6wHyWjIU7HpJ4Qylxw2Q4sgZgp7I=";
# skip test due FHS dependency
doCheck = false;

1
pkgs/applications/window-managers/e16/default.nix
View file

@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
'';
passthru.updateScript = gitUpdater {
inherit pname version;
url = "https://git.enlightenment.org/e16/e16";
rev-prefix = "v";
};

1
pkgs/applications/window-managers/jwm/default.nix
View file

@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};

6
pkgs/applications/window-managers/picom/picom-next.nix
View file

@ -2,12 +2,12 @@
picom.overrideAttrs (oldAttrs: rec {
pname = "picom-next";
version = "unstable-2022-08-23";
version = "unstable-2022-09-29";
src = fetchFromGitHub {
owner = "yshui";
repo = "picom";
rev = "e0758eb5e572d5d7cf28f28e5e409f20e0bd2ded";
sha256 = "sha256-L0cFkKPFw92dx3P9jlkwgw7/otjUVkVZbOE0UT6gF+I=";
rev = "0fe4e0a1d4e2c77efac632b15f9a911e47fbadf3";
sha256 = "1slcmayja8cszapxzs83xl1i9n9q0dz79cn5gzzf4mfcwvnxp8km";
};
meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
})

41
pkgs/common-updater/generic-updater.nix
View file

@ -1,8 +1,9 @@
{ stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }:
{ pname
, version
, attrPath ? pname
{ name ? null
, pname ? null
, version ? null
, attrPath ? null
, versionLister
, ignoredVersions ? ""
, rev-prefix ? ""
@ -15,22 +16,28 @@ let
fileForGitCommands = "update-git-commits.txt";
# shell script to update package
updateScript = writeScript "update-script.sh" ''
updateScript = writeScript "generic-update-script.sh" ''
#! ${stdenv.shell}
set -o errexit
set -x
pname="$1"
version="$2"
attr_path="$3"
version_lister="$4"
ignored_versions="$5"
rev_prefix="$6"
odd_unstable="$7"
patchlevel_unstable="$8"
name="$1"
pname="$2"
version="$3"
attr_path="$4"
version_lister="$5"
ignored_versions="$6"
rev_prefix="$7"
odd_unstable="$8"
patchlevel_unstable="$9"
[[ -n "$name" ]] || name="$UPDATE_NIX_NAME"
[[ -n "$pname" ]] || pname="$UPDATE_NIX_PNAME"
[[ -n "$version" ]] || version="$UPDATE_NIX_OLD_VERSION"
[[ -n "$attr_path" ]] || attr_path="$UPDATE_NIX_ATTR_PATH"
# print header
echo "# $pname-$version" >> ${fileForGitCommands}
echo "# $name" >> ${fileForGitCommands}
function version_is_ignored() {
local tag="$1"
@ -55,7 +62,7 @@ let
return 1
}
tags=$($version_lister --pname=${pname} --file="${fileForGitCommands}") || exit 1
tags=$($version_lister --pname=$pname --attr-path=$attr_path --file="${fileForGitCommands}") || exit 1
# print available tags
for tag in $tags; do
@ -104,5 +111,7 @@ let
echo "" >> ${fileForGitCommands}
'';
in
[ updateScript pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ]
in {
name = "generic-update-script";
command = [ updateScript name pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ];
}

6
pkgs/common-updater/git-updater.nix
View file

@ -3,9 +3,9 @@
, common-updater-scripts
}:
{ pname
, version
, attrPath ? pname
{ pname ? null
, version ? null
, attrPath ? null
, ignoredVersions ? ""
, rev-prefix ? ""
, odd-unstable ? false

6
pkgs/common-updater/http-two-levels-updater.nix
View file

@ -3,9 +3,9 @@
, common-updater-scripts
}:
{ pname
, version
, attrPath ? pname
{ pname ? null
, version ? null
, attrPath ? null
, ignoredVersions ? ""
, rev-prefix ? ""
, odd-unstable ? false

38
pkgs/common-updater/scripts/list-archive-two-levels-versions
View file

@ -2,20 +2,24 @@
# lists all available versions listed for a package in a site (http)
archive="" # archive url
pname="" # package name
attr_path="" # package attribute path
url="" # directory list url
file="" # file for writing debugging information
while (( $# > 0 )); do
flag="$1"
shift 1
case "$flag" in
--url=*)
archive="${flag#*=}"
;;
--pname=*)
pname="${flag#*=}"
;;
--attr-path=*)
attr_path="${flag#*=}"
;;
--url=*)
url="${flag#*=}"
;;
--file=*)
file="${flag#*=}"
;;
@ -26,29 +30,33 @@ while (( $# > 0 )); do
esac
done
# by default set url to the base dir of the first url in src.urls
if [[ -z "$archive" ]]; then
archive="$(nix-instantiate $systemArg --eval -E \
"with import ./. {}; dirOf (dirOf (lib.head $UPDATE_NIX_ATTR_PATH.src.urls))" \
| tr -d '"')"
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_NAME"
fi
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_ATTR_PATH"
if [[ -z "$attr_path" ]]; then
attr_path="$UPDATE_NIX_ATTR_PATH"
fi
# by default set url to the base dir of the first url in src.urls
if [[ -z "$url" ]]; then
url="$(nix-instantiate $systemArg --eval -E \
"with import ./. {}; dirOf (dirOf (lib.head $attr_path.src.urls))" \
| tr -d '"')"
fi
# print a debugging message
if [[ -n "$file" ]]; then
echo "# Listing versions for '$pname' at $archive" >> $file
echo "# Listing versions for '$pname' at $url" >> $file
fi
# list all major-minor versions from archive
tags1=$(curl -sS "$archive/")
# list all major-minor versions from url
tags1=$(curl -sS "$url/")
tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p')
# print available versions
for tag in $tags1; do
tags2=$(curl -sS "$archive/$tag/")
tags2=$(curl -sS "$url/$tag/")
tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p")
echo "$tags2"
done

28
pkgs/common-updater/scripts/list-git-tags
View file

@ -2,22 +2,24 @@
# lists all available tags from a git repository
echo "# pname=$UPDATE_NIX_ATTR_PATH" > /tmp/test.txt
pname="" # package name
attr_path="" # package attribute path
url="" # git repository url
pname="" # package name
file="" # file for writing debugging information
while (( $# > 0 )); do
flag="$1"
shift 1
case "$flag" in
--url=*)
url="${flag#*=}"
;;
--pname=*)
pname="${flag#*=}"
;;
--attr-path=*)
attr_path="${flag#*=}"
;;
--url=*)
url="${flag#*=}"
;;
--file=*)
file="${flag#*=}"
;;
@ -28,17 +30,21 @@ while (( $# > 0 )); do
esac
done
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_NAME"
fi
if [[ -z "$attr_path" ]]; then
attr_path="$UPDATE_NIX_ATTR_PATH"
fi
# By default we set url to src.url or src.meta.homepage
if [[ -z "$url" ]]; then
url="$(nix-instantiate $systemArg --eval -E \
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.meta.homepage or $UPDATE_NIX_ATTR_PATH.src.url" \
"with import ./. {}; $attr_path.src.meta.homepage or $attr_path.src.url" \
| tr -d '"')"
fi
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_ATTR_PATH"
fi
# print a debugging message
if [[ -n "$file" ]]; then
echo "# Listing tags for '$pname' at $url" >> $file

2
pkgs/data/icons/colloid-icon-theme/default.nix
View file

@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Colloid icon theme";

1
pkgs/data/icons/kora-icon-theme/default.nix
View file

@ -46,7 +46,6 @@ stdenvNoCC.mkDerivation rec {
'';
passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};

2
pkgs/data/icons/luna-icons/default.nix
View file

@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Icon pack based on marwaita and papirus icons";

2
pkgs/data/icons/numix-icon-theme-circle/default.nix
View file

@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Numix icon theme (circle version)";

2
pkgs/data/icons/numix-icon-theme-square/default.nix
View file

@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Numix icon theme (square version)";

2
pkgs/data/icons/numix-icon-theme/default.nix
View file

@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Numix icon theme";

2
pkgs/data/icons/qogir-icon-theme/default.nix
View file

@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Flat colorful design icon theme";

2
pkgs/data/icons/tela-circle-icon-theme/default.nix
View file

@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Flat and colorful personality icon theme";

2
pkgs/data/icons/zafiro-icons/default.nix
View file

@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Icon pack flat with light colors";

6
pkgs/data/misc/v2ray-geoip/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202209220104";
version = "202209290111";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "4eaa41ebcfc2aafaa5b363b8efdd867c53e3435b";
sha256 = "sha256-B0a6Zqd9WmlwBY6Kj0ZKNjZXzZWaNhRL0tLT0PM+gGA=";
rev = "1aa11a6dd94b708175a81b12037486459fa090a8";
sha256 = "sha256-CVze/QyoBKZmd+U8bfjxr+u8W95W+fs9+mAdPgyIpg4=";
};
installPhase = ''

2
pkgs/data/themes/colloid-gtk-theme/default.nix
View file

@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "A modern and clean Gtk theme";

2
pkgs/data/themes/colloid-kde/default.nix
View file

@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "A clean and concise theme for KDE Plasma desktop";

2
pkgs/data/themes/graphite-gtk-theme/default.nix
View file

@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Flat Gtk+ theme based on Elegant Design";

2
pkgs/data/themes/greybird/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
gtk-engine-murrine
];
passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; };
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; {
description = "Grey and blue theme from the Shimmer Project for GTK-based environments";

2
pkgs/data/themes/layan-kde/default.nix
View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "A flat Design theme for KDE Plasma desktop";

2
pkgs/data/themes/marwaita/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops";

2
pkgs/data/themes/matcha/default.nix
View file

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "A stylish flat Design theme for GTK based desktop environments";

2
pkgs/data/themes/mojave/default.nix
View file

@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Mac OSX Mojave like theme for GTK based desktop environments";

2
pkgs/data/themes/qogir-kde/default.nix
View file

@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "A flat Design theme for KDE Plasma desktop";

2
pkgs/data/themes/qogir/default.nix
View file

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Flat Design theme for GTK based desktop environments";

2
pkgs/data/themes/vimix/default.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {inherit pname version; };
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Flat Material Design theme for GTK based desktop environments";

2
pkgs/desktops/cinnamon/warpinator/default.nix
View file

@ -74,8 +74,6 @@ python3.pkgs.buildPythonApplication rec {
'';
passthru.updateScript = gitUpdater {
inherit pname version;
attrPath = "cinnamon.warpinator";
ignoredVersions = "^master.*";
};

2
pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
View file

@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
extensionPortalSlug = "dash-to-dock";
updateScript = gitUpdater {
pname = "gnomeExtensions.dash-to-dock";
inherit version;
rev-prefix = "extensions.gnome.org-v";
};
};

77
pkgs/desktops/gnome/extensions/extensions.json
View file

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show more