gador/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-02-25 00:10:13 +00:00
committed by GitHub
parent e347759873 3c95a192ed
commit 0414a20454
157 changed files with 2357 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CODEOWNERS
+1 -1
View File
@@ -229,7 +229,7 @@
/pkgs/misc/vim-plugins @jonringer @softinio
# VsCode Extensions
/pkgs/misc/vscode-extensions @jonringer
/pkgs/applications/editors/vscode/extensions @jonringer
# Prometheus exporter modules and tests
/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+20 -2
View File
@@ -26,8 +26,26 @@
</listitem>
<listitem>
<para>
<literal>iptables</literal> now uses
<literal>nf_tables</literal> backend.
<literal>iptables</literal> is now using
<literal>nf_tables</literal> under the hood, by using
<literal>iptables-nft</literal>, similar to
<link xlink:href="https://wiki.debian.org/nftables#Current_status">Debian</link>
and
<link xlink:href="https://fedoraproject.org/wiki/Changes/iptables-nft-default">Fedora</link>.
This means, <literal>ip[6]tables</literal>,
<literal>arptables</literal> and <literal>ebtables</literal>
commands will actually show rules from some specific tables in
the <literal>nf_tables</literal> kernel subsystem.
</para>
</listitem>
<listitem>
<para>
systemd got an <literal>nftables</literal> backend, and
configures (networkd) rules in their own
<literal>io.systemd.*</literal> tables. Check
<literal>nft list ruleset</literal> to see these rules, not
<literal>iptables-save</literal> (which only shows
<literal>iptables</literal>-created rules.
</para>
</listitem>
<listitem>
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+25 -3
View File
@@ -98,7 +98,7 @@
<link xlink:href="https://frrouting.org/">FRRouting</link>, a
popular suite of Internet routing protocol daemons (BGP, BFD,
OSPF, IS-IS, VVRP and others). Available as
<link linkend="opt-services.ffr.babel.enable">services.frr</link>
<link linkend="opt-services.frr.babel.enable">services.frr</link>
</para>
</listitem>
<listitem>
@@ -145,6 +145,15 @@
<link xlink:href="options.html#opt-services.maddy.enable">services.maddy</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://www.scorchworks.com/K40whisperer/k40whisperer.html">K40-Whisperer</link>,
a program to control cheap Chinese laser cutters. Available as
<link xlink:href="options.html#opt-programs.k4-whisperer.enable">programs.k40-whisperer.enable</link>.
Users must add themselves to the <literal>k40</literal> group
to be able to access the device.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/mgumz/mtr-exporter">mtr-exporter</link>,
@@ -196,7 +205,7 @@
<para>
<link xlink:href="https://moosefs.com">moosefs</link>, fault
tolerant petabyte distributed file system. Available as
<link linkend="opt-services.moosefs">moosefs</link>.
<link linkend="opt-services.moosefs.client.enable">moosefs</link>.
</para>
</listitem>
<listitem>
@@ -716,6 +725,19 @@
<link xlink:href="https://github.com/olimorris/onedarkpro.nvim">olimorris/onedarkpro.nvim</link>).
</para>
</listitem>
<listitem>
<para>
<literal>services.pipewire.enable</literal> will default to
enabling the WirePlumber session manager instead of
pipewire-media-session. pipewire-media-session is deprecated
by upstream and not recommended, but can still be manually
enabled by setting
<literal>services.pipewire.media-session.enable</literal> to
<literal>true</literal> and
<literal>services.pipewire.wireplumber.enable</literal> to
<literal>false</literal>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">
@@ -1024,7 +1046,7 @@
<listitem>
<para>
The option
<link linkend="opt-services.networking.networkmanager.enableFccUnlock">services.networking.networkmanager.enableFccUnlock</link>
<link linkend="opt-networking.networkmanager.enableFccUnlock">services.networking.networkmanager.enableFccUnlock</link>
was added to support FCC unlock procedures. Since release
1.18.4, the ModemManager daemon no longer automatically
performs the FCC unlock procedure by default. See
nixos/doc/manual/release-notes/release-notes.xml
+1
View File
@@ -8,6 +8,7 @@
This section lists the release notes for each stable version of NixOS and
current unstable revision.
</para>
<xi:include href="../from_md/release-notes/rl-2205.section.xml" />
<xi:include href="../from_md/release-notes/rl-2111.section.xml" />
<xi:include href="../from_md/release-notes/rl-2105.section.xml" />
<xi:include href="../from_md/release-notes/rl-2009.section.xml" />
nixos/doc/manual/release-notes/rl-2111.section.md
+9 -1
View File
@@ -8,7 +8,15 @@ In addition to numerous new and upgraded packages, this release has the followin
- Nix has been updated to version 2.4, reference its [release notes](https://discourse.nixos.org/t/nix-2-4-released/15822) for more information on what has changed. The previous version of Nix, 2.3.16, remains available for the time being in the `nix_2_3` package.
- `iptables` now uses `nf_tables` backend.
- `iptables` is now using `nf_tables` under the hood, by using `iptables-nft`,
similar to [Debian](https://wiki.debian.org/nftables#Current_status) and
[Fedora](https://fedoraproject.org/wiki/Changes/iptables-nft-default).
This means, `ip[6]tables`, `arptables` and `ebtables` commands will actually
show rules from some specific tables in the `nf_tables` kernel subsystem.
- systemd got an `nftables` backend, and configures (networkd) rules in their
own `io.systemd.*` tables. Check `nft list ruleset` to see these rules, not
`iptables-save` (which only shows `iptables`-created rules.
- PHP now defaults to PHP 8.0, updated from 7.4.
nixos/doc/manual/release-notes/rl-2205.section.md
+9 -3
View File
@@ -31,7 +31,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS).
- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable)
- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.frr.babel.enable)
- [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable).
@@ -45,6 +45,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable).
- [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device.
- [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable).
- [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable).
@@ -58,7 +60,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [BaGet](https://loic-sharma.github.io/BaGet/), a lightweight NuGet and symbol server. Available at [services.baget](#opt-services.baget.enable).
- [moosefs](https://moosefs.com), fault tolerant petabyte distributed file system.
Available as [moosefs](#opt-services.moosefs).
Available as [moosefs](#opt-services.moosefs.client.enable).
- [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable).
@@ -223,6 +225,10 @@ In addition to numerous new and upgraded packages, this release has the followin
- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim)
(formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)).
- `services.pipewire.enable` will default to enabling the WirePlumber session manager instead of pipewire-media-session.
pipewire-media-session is deprecated by upstream and not recommended, but can still be manually enabled by setting
`services.pipewire.media-session.enable` to `true` and `services.pipewire.wireplumber.enable` to `false`.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-release-22.05-notable-changes}
@@ -338,7 +344,7 @@ In addition to numerous new and upgraded packages, this release has the followin
Using the old option name will still work, but produce a warning.
- The option
[services.networking.networkmanager.enableFccUnlock](#opt-services.networking.networkmanager.enableFccUnlock)
[services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock)
was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager
daemon no longer automatically performs the FCC unlock procedure by default. See
[the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details.
nixos/modules/installer/sd-card/sd-image-aarch64.nix
+6
View File
@@ -24,6 +24,9 @@
[pi3]
kernel=u-boot-rpi3.bin
[pi02]
kernel=u-boot-rpi3.bin
[pi4]
kernel=u-boot-rpi4.bin
enable_gic=1
@@ -33,6 +36,9 @@
# what the pi3 firmware does by default.
disable_overscan=1
# Supported in newer board revisions
arm_boost=1
[all]
# Boot in 64-bit mode.
arm_64bit=1
nixos/modules/module-list.nix
+2
View File
@@ -167,6 +167,7 @@
./programs/iftop.nix
./programs/iotop.nix
./programs/java.nix
./programs/k40-whisperer.nix
./programs/kdeconnect.nix
./programs/kbdlight.nix
./programs/less.nix
@@ -897,6 +898,7 @@
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tedicross.nix
./services/networking/tetrd.nix
./services/networking/teleport.nix
./services/networking/thelounge.nix
./services/networking/tinc.nix
nixos/modules/programs/k40-whisperer.nix
+40
View File
@@ -0,0 +1,40 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.k40-whisperer;
pkg = cfg.package.override {
udevGroup = cfg.group;
};
in
{
options.programs.k40-whisperer = {
enable = mkEnableOption "K40-Whisperer";
group = mkOption {
type = types.str;
description = ''
Group assigned to the device when connected.
'';
default = "k40";
};
package = mkOption {
type = types.package;
default = pkgs.k40-whisperer;
defaultText = literalExpression "pkgs.k40-whisperer";
example = literalExpression "pkgs.k40-whisperer";
description = ''
K40 Whisperer package to use.
'';
};
};
config = mkIf cfg.enable {
users.groups.${cfg.group} = {};
environment.systemPackages = [ pkg ];
services.udev.packages = [ pkg ];
};
}
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+2 -3
View File
@@ -38,9 +38,8 @@ in {
services.pipewire.media-session = {
enable = mkOption {
type = types.bool;
default = config.services.pipewire.enable;
defaultText = literalExpression "config.services.pipewire.enable";
description = "Example pipewire session manager";
default = false;
description = "Whether to enable the deprecated example Pipewire session manager";
};
package = mkOption {
nixos/modules/services/desktops/pipewire/wireplumber.nix
+7 -4
View File
@@ -8,15 +8,18 @@ in
options = {
services.pipewire.wireplumber = {
enable = lib.mkEnableOption "A modular session / policy manager for PipeWire";
enable = lib.mkOption {
type = lib.types.bool;
default = config.services.pipewire.enable;
defaultText = lib.literalExpression "config.services.pipewire.enable";
description = "Whether to enable Wireplumber, a modular session / policy manager for PipeWire";
};
package = lib.mkOption {
type = lib.types.package;
default = pkgs.wireplumber;
defaultText = lib.literalExpression "pkgs.wireplumber";
description = ''
The wireplumber derivation to use.
'';
description = "The wireplumber derivation to use.";
};
};
};
nixos/modules/services/networking/tetrd.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
{
options.services.tetrd.enable = lib.mkEnableOption pkgs.tetrd.meta.description;
options.services.tetrd.enable = lib.mkEnableOption "tetrd";
config = lib.mkIf config.services.tetrd.enable {
environment = {
nixos/modules/virtualisation/openstack-metadata-fetcher.nix
+2 -1
View File
@@ -15,7 +15,8 @@
}
wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
(umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data)
# When no user-data is provided, the OpenStack metadata server doesn't expose the user-data route.
(umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data || rm -f "$metaDir/user-data")
wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
''
pkgs/applications/audio/plexamp/default.nix
+3 -3
View File
@@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "4.0.1";
version = "4.0.2";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "pZy2afj7g6wnOIHH3ecCYUX7/NX5op4aLSHe4/GbI5L9NUuFGoJIWWuVbv2kngcTo+XUqP0yoe0Ns+I4WulDVA==";
sha512 = "DqgzEt+frDJOcwOnQ5sx7JqEH5l/FJYCL5/97YBsEC2iTMIYi+NBUvuzyZcfRzOTfq7b/QBALDpRgvepWYjkxg==";
};
appimageContents = appimageTools.extractType2 {
@@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/39";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/40";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];
pkgs/applications/blockchains/namecoin/default.nix
+2 -2
View File
@@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
version = "nc0.21.1";
version = "nc22.0";
name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
src = fetchFromGitHub {
owner = "namecoin";
repo = "namecoin-core";
rev = version;
sha256 = "sha256-dA4BGhxHm0EdvqMq27zzWp2vOPyKbCgV1i1jt17TVxU=";
sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY=";
};
nativeBuildInputs = [
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+54 -24
View File
@@ -234,10 +234,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.0.16";
version = "13.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.0.16.tar";
sha256 = "1r9piq4js45knw8sf73kk8jjinmx4m2mdinc98xrklnwcffw7hjf";
url = "https://elpa.gnu.org/packages/auctex-13.1.1.tar";
sha256 = "193sqq2wiq3lg99m8hifl9rjxdazpy638r99sqvmxmkfm98cr34r";
};
packageRequires = [ emacs ];
meta = {
@@ -309,10 +309,10 @@
elpaBuild {
pname = "bbdb";
ename = "bbdb";
version = "3.2";
version = "3.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bbdb-3.2.tar";
sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx";
url = "https://elpa.gnu.org/packages/bbdb-3.2.1.tar";
sha256 = "01vsnifs47krq1srgdkk9agbv3p2fykl9nydr4nrfjxbqpnyh3ij";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1236,10 +1236,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20220212";
version = "20220224";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20220212.tar";
sha256 = "1w04jwh8y6l1fgx6sahwj9znw9cm83a1lld5vdgnbsww2m5nk8zm";
url = "https://elpa.gnu.org/packages/eev-20220224.tar";
sha256 = "008750fm7w5k9yrkwyxgank02smxki2857cd2d8qvhsa2qnz6c5n";
};
packageRequires = [ emacs ];
meta = {
@@ -1394,10 +1394,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
version = "9";
version = "10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/emms-9.tar";
sha256 = "12p9nigzyrlpkfvg7v76jmcfs08z84gggnx7h4frdaim3kx5y6xf";
url = "https://elpa.gnu.org/packages/emms-10.tar";
sha256 = "1lgjw9p799sl7nqnl2sk4g67ra10z2ldygx9kb8pmxjrx64mi3qm";
};
packageRequires = [ cl-lib nadvice seq ];
meta = {
@@ -2622,10 +2622,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "2.0.0";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-2.0.0.tar";
sha256 = "15d1ywj8k4yh57arzv7z2ir49gf2j7a80pscrfgxsypnyl2dkkfa";
url = "https://elpa.gnu.org/packages/modus-themes-2.2.0.tar";
sha256 = "1vgwr9q16d3hjwmqljmmzlpn177gvwbk3wg4l1fmgc5bpb7k78ky";
};
packageRequires = [ emacs ];
meta = {
@@ -3160,10 +3160,10 @@
elpaBuild {
pname = "parser-generator";
ename = "parser-generator";
version = "0.1.4";
version = "0.1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/parser-generator-0.1.4.tar";
sha256 = "0712y22cl6i98jlhmsm436v0mlmscbypc15sdkn704a491ipq2qj";
url = "https://elpa.gnu.org/packages/parser-generator-0.1.5.tar";
sha256 = "06cl9whk321l1q5xcjmgq5c59l10ybwcdsmmbrkrllnbpqxy23bj";
};
packageRequires = [ emacs ];
meta = {
@@ -3650,10 +3650,10 @@
elpaBuild {
pname = "repology";
ename = "repology";
version = "1.1.0";
version = "1.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/repology-1.1.0.tar";
sha256 = "031245rrhazj53bk1csa6x3ygzvg74w2hwjf08ficwvmdn97li90";
url = "https://elpa.gnu.org/packages/repology-1.2.2.tar";
sha256 = "0ggb0zgz24hs5andhyrlpqm0gda0gf1wynzkarj4z7gpk5p9wrpr";
};
packageRequires = [ emacs ];
meta = {
@@ -3727,6 +3727,21 @@
license = lib.licenses.free;
};
}) {};
satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
elpaBuild {
pname = "satchel";
ename = "satchel";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/satchel-0.2.tar";
sha256 = "1ajsfrr988nglw2l4kqjbbdq9x8gidv0ymsrg3jm2b9nisfhnixv";
};
packageRequires = [ emacs project ];
meta = {
homepage = "https://elpa.gnu.org/packages/satchel.html";
license = lib.licenses.free;
};
}) {};
scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "scanner";
@@ -4305,6 +4320,21 @@
license = lib.licenses.free;
};
}) {};
tramp-nspawn = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tramp-nspawn";
ename = "tramp-nspawn";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.tar";
sha256 = "1si649vcj4md50p5nzvw431580rcl113rraj6fw636a394485hvx";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
license = lib.licenses.free;
};
}) {};
tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "tramp-theme";
@@ -4903,10 +4933,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.3.2";
version = "1.4.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.3.2.tar";
sha256 = "1bwvli2d6d06gh004hnbbwy6rkn0jv1d1s7slfladqjjdkpjvpzd";
url = "https://elpa.gnu.org/packages/xref-1.4.0.tar";
sha256 = "1ng03fyhpisa1v99sc96mpr7hna1pmg4gdc61p86r8lka9m5gqfx";
};
packageRequires = [ emacs ];
meta = {
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+3 -3
View File
@@ -1825,10 +1825,10 @@
elpaBuild {
pname = "rust-mode";
ename = "rust-mode";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.3.tar";
sha256 = "1hg5hr5jma5v4rilchwyyw1fzm8lkfd3fxay0sb9dgzrgypvh5am";
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.4.tar";
sha256 = "137z04h29cgy1dmkf2cnchlfzqs4f5v3cc9gv9qxisw9dswlvdvk";
};
packageRequires = [ emacs ];
meta = {
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+963 -777
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/emacs/generic.nix
+4
View File
@@ -25,6 +25,8 @@
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
, siteStart ? ./site-start.el
, nativeComp ? false
, withAthena ? false
, withToolkitScrollBars ? true
, withPgtk ? false
, withXinput2 ? false
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
@@ -32,6 +34,7 @@
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
else if withMotif then "motif"
else if withAthena then "athena"
else "lucid")
}:
@@ -154,6 +157,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optional withImageMagick "--with-imagemagick"
++ lib.optional withPgtk "--with-pgtk"
++ lib.optional withXinput2 "--with-xinput2"
++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"
;
installTargets = [ "tags" "install" ];
pkgs/applications/editors/nano/default.nix
+2 -2
View File
@@ -16,11 +16,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
version = "6.1";
version = "6.2";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
sha256 = "PVfsiT+/3tEmZbfw1WPXRDH8Q6vqzKzt6iO2avcE20A=";
sha256 = "K8oYBL6taq9K15H3VuR0m7Ve2GDuwQWpf7qGS8anfLM=";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
pkgs/applications/editors/sigil/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "sigil";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
repo = "Sigil";
owner = "Sigil-Ebook";
rev = version;
sha256 = "sha256-luX4/KERB4GwpID7zVnd6F/mN8SHTy9zmqSUzJ1CYPk=";
sha256 = "sha256-3rECGnb0kkQwzsMxLxgAp0QEoHFHv+qCjiCgzCZeUJw=";
};
pythonPath = with python3Packages; [ lxml ];
pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh → pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh
View File
pkgs/misc/vscode-extensions/cpptools/default.nix → pkgs/applications/editors/vscode/extensions/cpptools/default.nix
View File
pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh → pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh
View File
pkgs/misc/vscode-extensions/cpptools/package-activation-events.json → pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json
View File
pkgs/misc/vscode-extensions/cpptools/update_helper.sh → pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh
View File
pkgs/misc/vscode-extensions/default.nix → pkgs/applications/editors/vscode/extensions/default.nix
View File
pkgs/misc/vscode-extensions/language-packs.nix → pkgs/applications/editors/vscode/extensions/language-packs.nix
View File
pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix → pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix
View File
pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix → pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix
View File
pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json → pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json
View File
pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs → pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs
View File
pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix → pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix
View File
pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix → pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix
View File
pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c → pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c
View File
pkgs/misc/vscode-extensions/python/default.nix → pkgs/applications/editors/vscode/extensions/python/default.nix
View File
pkgs/misc/vscode-extensions/python/extract-nuget.nix → pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix
View File
pkgs/misc/vscode-extensions/remote-ssh/default.nix → pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix
View File
pkgs/misc/vscode-extensions/rescript/default.nix → pkgs/applications/editors/vscode/extensions/rescript/default.nix
View File
pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix → pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix
View File
pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json → pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json
View File
pkgs/misc/vscode-extensions/rust-analyzer/default.nix → pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ let
sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=";
};
build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps";
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps";
# FIXME: Making a new derivation to link `node_modules` and run `npm run package`
# will cause a build failure.
vsix = build-deps.override {
pkgs/misc/vscode-extensions/terraform/default.nix → pkgs/applications/editors/vscode/extensions/terraform/default.nix
View File
pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch → pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch
View File
pkgs/misc/vscode-extensions/updateSettings.nix → pkgs/applications/editors/vscode/extensions/updateSettings.nix
View File
pkgs/misc/vscode-extensions/updateSettingsTest.nix → pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix
View File
pkgs/misc/vscode-extensions/update_installed_exts.sh → pkgs/applications/editors/vscode/extensions/update_installed_exts.sh
+1 -1
View File
@@ -4,7 +4,7 @@
set -eu -o pipefail
# can be added to your configuration with the following command and snippet:
# $ ./pkgs/misc/vscode-extensions/update_installed_exts.sh > extensions.nix
# $ ./pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > extensions.nix
#
# packages = with pkgs;
# (vscode-with-extensions.override {
pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json → pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json
View File
pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch → pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch
View File
pkgs/misc/vscode-extensions/vscode-lldb/default.nix → pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix
+1 -1
View File
@@ -42,7 +42,7 @@ let
doCheck = false;
};
nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps";
nodeDeps = nodePackages."vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps";
in stdenv.mkDerivation {
pname = "vscode-extension-${publisher}-${pname}";
pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix → pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix
View File
pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch → pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch
View File
pkgs/misc/vscode-extensions/vscode-lldb/update.sh → pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh
+5 -3
View File
@@ -1,5 +1,6 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p jq nix-prefetch
#! /usr/bin/env nix-shell
#! nix-shell ../../update-shell.nix -i bash
set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
if [[ $# -ne 1 ]]; then
@@ -12,7 +13,8 @@ FIXME: This script doesn't update patched lldb. Please manually check branches
of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM.
"
nixpkgs=../../../..
# Ideally, nixpkgs points to default.nix file of Nixpkgs official tree
nixpkgs=../../../../../..
nixFile=./default.nix
owner=vadimcn
repo=vscode-lldb
pkgs/misc/vscode-extensions/vscode-utils.nix → pkgs/applications/editors/vscode/extensions/vscode-utils.nix
View File
pkgs/misc/vscode-extensions/vscodeEnv.nix → pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
View File
pkgs/misc/vscode-extensions/vscodeEnvTest.nix → pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix
View File
pkgs/misc/vscode-extensions/vscodeExts2nix.nix → pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix
View File
pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix → pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix
View File
pkgs/misc/vscode-extensions/wakatime/default.nix → pkgs/applications/editors/vscode/extensions/wakatime/default.nix
View File
pkgs/applications/editors/vscode/update-shell.nix
+18
View File
@@ -0,0 +1,18 @@
{ pkgs ? import ../../../.. { } }:
# Ideally, pkgs points to default.nix file of Nixpkgs official tree
with pkgs;
mkShell {
packages = [
bash
curl
gawk
gnugrep
gnused
jq
nix
nix-prefetch
nix-prefetch-scripts
];
}
pkgs/applications/editors/vscode/update-vscode.sh
+2 -2
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq gnused
#! /usr/bin/env nix-shell
#! nix-shell update-shell.nix -i bash
# Update script for the vscode versions and hashes.
# Usually doesn't need to be called by hand,
pkgs/applications/editors/vscode/update-vscodium.sh
+2 -2
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep gnused gawk
#! /usr/bin/env nix-shell
#! nix-shell update-shell.nix -i bash
# Update script for the vscode versions and hashes.
# Usually doesn't need to be called by hand,
pkgs/applications/emulators/mednafen/default.nix
+12 -6
View File
@@ -15,6 +15,7 @@
, libsndfile
, pkg-config
, zlib
, libiconv
}:
stdenv.mkDerivation rec {
@@ -31,20 +32,25 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL2
SDL2_net
alsa-lib
flac
freeglut
libGL
libGLU
libX11
libcdio
libjack2
libsamplerate
libsndfile
zlib
] ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
libGL
libGLU
libX11
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
];
hardeningDisable = [ "pic" ];
hardeningDisable = [ "pic" "format" ];
enableParallelBuilding = true;
postInstall = ''
mkdir -p $out/share/doc
@@ -87,6 +93,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
pkgs/applications/emulators/mednaffe/default.nix
+7 -3
View File
@@ -20,11 +20,15 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 mednafen ];
postInstall = ''
wrapProgram $out/bin/mednaffe \
enableParallelBuilding = true;
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH ':' "${mednafen}/bin"
)
'';
meta = with lib; {
@@ -32,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/AmatCoder/mednaffe";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sheenobu yana AndersonTorres ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
pkgs/applications/graphics/mandelbulber/default.nix
+3 -3
View File
@@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
mkDerivation rec {
pname = "mandelbulber";
version = "2.26";
version = "2.27";
src = fetchFromGitHub {
owner = "buddhi1980";
repo = "mandelbulber2";
rev = version;
sha256 = "sha256-RKpg7LBsrBFOlFozoDcALwGeZ9whPiCpFMZF5ljsp7Q=";
sha256 = "sha256-CNIt+DC3ZYyT8EY1t641y7jW7vn7Rr1PLOsy9bjKaDk=";
};
nativeBuildInputs = [
@@ -57,7 +57,7 @@ mkDerivation rec {
description = "A 3D fractal rendering engine";
longDescription = "Mandelbulber creatively generates three-dimensional fractals. Explore trigonometric, hyper-complex, Mandelbox, IFS, and many other 3D fractals.";
homepage = "https://mandelbulber.com";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ kovirobi ];
};
pkgs/applications/misc/jotta-cli/default.nix
+2 -2
View File
@@ -5,10 +5,10 @@ let
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.13.53591";
version = "0.13.55213";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "sha256-sffJks3/QfAJJumaE61q4fiiXa/BNFF2TKjZmDOuMkc=";
sha256 = "sha256-u5DmpKvmgTqwtXLFMdz0dhtPc/2rzEX492OKxyFBqzY=";
stripRoot = false;
};
pkgs/applications/misc/k40-whisperer/default.nix
+74
View File
@@ -0,0 +1,74 @@
{ stdenv
, makeWrapper
, writeText
, python3
, fetchzip
, inkscape
, lib
, udevGroup ? "k40"
}:
let
pythonEnv = python3.withPackages (ps: with ps; [
lxml
pyusb
pillow
pyclipper
tkinter
]);
udevRule = writeText "k40-whisperer.rules" ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", ENV{DEVTYPE}=="usb_device", MODE="0664", GROUP="${udevGroup}"
'';
in stdenv.mkDerivation rec {
pname = "k40-whisperer";
version = "0.59";
src = fetchzip {
url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip";
stripRoot = true;
sha256 = "0r8rhaksk87l44pwwpvrfnck2lyic3lgcbh3pi7ib6mrwbsyhlni";
};
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
substituteInPlace svg_reader.py \
--replace '"/usr/bin/inkscape"' '"${inkscape}/bin/inkscape"'
'';
buildPhase = "";
installPhase = ''
mkdir -p $out
cp -p * $out
mkdir -p $out/bin
mkdir -p $out/lib/udev/rules.d
ln -s ${udevRule} $out/lib/udev/rules.d/97-k40-whisperer.rules
makeWrapper '${pythonEnv.interpreter}' $out/bin/k40-whisperer \
--add-flags $out/k40_whisperer.py \
--prefix PYTHONPATH : $out
'';
meta = with lib; {
description = ''
Control software for the stock K40 Laser controller
'';
mainProgram = "k40-whisperer";
longDescription = ''
K40 Whisperer is an alternative to the the Laser Draw (LaserDRW) program that comes with the cheap Chinese laser cutters available on E-Bay and Amazon.
K40 Whisperer reads SVG and DXF files, interprets the data and sends commands to the K40 controller to move the laser head and control the laser accordingly.
K40 Whisperer does not require a USB key (dongle) to function.
'';
homepage = "https://www.scorchworks.com/K40whisperer/k40whisperer.html";
downloadPage = "https://www.scorchworks.com/K40whisperer/k40whisperer.html#download";
license = licenses.gpl3;
maintainers = with maintainers; [ fooker ];
platforms = platforms.all;
};
}
pkgs/applications/misc/mapproxy/default.nix
+2 -2
View File
@@ -6,10 +6,10 @@
with python3.pkgs;
buildPythonApplication rec {
pname = "MapProxy";
version = "1.13.2";
version = "1.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "1c2ba9424f600f35b7b883366296089cf61ac7c803da5d411a334c7a39ccf84b";
sha256 = "dd36278d60cdcaaf31f7f9bbc50e90e770f3feb65cf4b3eff287215ee85f018d";
};
prePatch = ''
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
pkgs/applications/misc/seatd/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "seatd";
version = "0.6.3";
version = "0.6.4";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
repo = "seatd";
rev = version;
sha256 = "sha256-LLRGi3IACqaIHExLhALnUeiPyUnlhAJzsMFE2p+QSp4=";
sha256 = "1k0wz68aqr9xgpyrfrsmrjn5b634qmm7fwv2d73w112hjmgvjxk5";
};
outputs = [ "bin" "out" "dev" "man" ];
pkgs/applications/misc/survex/default.nix
+42 -49
View File
@@ -1,68 +1,61 @@
{ lib
, stdenv
, fetchgit
, autoreconfHook
, pkg-config
, wxGTK30-gtk3
, wxmac
, ffmpeg
, proj_7
, perl532
, unscii
, python2
, libGL
, libGLU
, xlibsWrapper
, docbook2x
, docbook5
, fetchurl
, Carbon
, Cocoa
, ffmpeg
, glib
, libGLU
, mesa
, perl
, pkg-config
, proj
, python3
, wrapGAppsHook
, wxGTK30-gtk3
, wxmac
, xlibsWrapper
}:
let
perlenv = perl532.withPackages (perlPackages: with perlPackages; [ LocalePO ] );
in
stdenv.mkDerivation rec {
pname = "survex";
version = "1.2.44";
version = "1.4.1";
nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python2 ];
buildInputs = [
libGL libGLU ffmpeg proj_7
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
wxmac Carbon Cocoa
] ++ lib.optionals stdenv.hostPlatform.isLinux [
wxGTK30-gtk3 xlibsWrapper
nativeBuildInputs = [
perl
pkg-config
python3
wrapGAppsHook
];
src = fetchgit {
url = "git://git.survex.com/survex";
rev = version;
sha256 = "11gaqmabrf3av665jy3mr0m8hg76fmvnd0g3rghzmyh8d8v6xk34";
buildInputs = [
ffmpeg
glib
libGLU
mesa
proj
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
wxmac
] ++ lib.optionals stdenv.hostPlatform.isLinux [
wxGTK30-gtk3
xlibsWrapper
];
src = fetchurl {
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4=";
};
enableParallelBuilding = true;
# Docs rely on sgmltools-lite, a package that would be quite complex to
# provide as it is quite old. So this preConfigure hook effectively disables
# the doc generation. An example of packaging sgmltools-lite from Gentoo can
# be found here:
# https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild?id=0b8b716331049599ea3299981e3a9ea6e258c5e0
postPatch = ''
patchShebangs .
echo "" > doc/Makefile.am
# substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged.
for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do
substituteInPlace src/Makefile.am \
--replace "$perltool" "${perlenv}/bin/perl $perltool"
done
substituteInPlace lib/Makefile.am \
--replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font'
substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex
'';
enableParallelBuilding = true;
doCheck = (!stdenv.isDarwin); # times out
enableParallelChecking = false;
meta = with lib; {
description = "Free Software/Open Source software package for mapping caves";
longDescription = ''
@@ -71,7 +64,7 @@ stdenv.mkDerivation rec {
variety of platforms, including Linux/Unix, macOS, and Microsoft Windows.
'';
homepage = "https://survex.com/";
changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS";
changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS";
license = licenses.gpl2Plus;
maintainers = [ maintainers.matthewcroughan ];
platforms = platforms.all;
pkgs/applications/networking/cluster/cni/plugins.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cni-plugins";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
sha256 = "sha256-zIL9KG1WL+DlgC5c+b9gV1i7mB0Ge8bapcuSV4GNIck=";
sha256 = "sha256-M0bYMaOqHkG1J6xGEqVvmYda/B6qDIrFOQhhW2LXiYE=";
};
vendorSha256 = null;
pkgs/applications/networking/opsdroid/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "opsdroid";
version = "0.24.1";
version = "0.25.0";
src = fetchFromGitHub {
owner = "opsdroid";
repo = "opsdroid";
rev = "v${version}";
sha256 = "15l2jvcpb9l8sgdd9zsvxqglf1r3vap0pp9cklpfa9jj0aik6nx9";
sha256 = "0f32jf2rds9543akysxinf3hsgzr0w880xwcrcm1r2r0nhp8b8s5";
};
disabled = !python3Packages.isPy3k;
pkgs/applications/science/biology/picard-tools/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
version = "2.26.10";
version = "2.26.11";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "sha256-hKBWRmzyMVXiEmsz/eYbVIUhezZdSJnBvcgv6ShPI5U=";
sha256 = "sha256-0swggo1a5gExpj3VgaWKT/TYd7rfSFBcqRrAURnTPjM=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/science/misc/cwltool/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
version = "3.1.20220217222804";
version = "3.1.20220221074232";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = version;
sha256 = "sha256-7zID/lChliEJxu6Dawz9DNP2YvSwtMo8G+ooXNh2Phc=";
sha256 = "sha256-hUdwtqYHcfyJ68LzwwCXAxr7YIkJm64brb+kA/WJqU8=";
};
postPatch = ''
pkgs/applications/version-management/gitea/default.nix
+2 -2
View File
@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.16.1";
version = "1.16.2";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-CaJ6Br8Sy+8GuoI8UWxsn3oGEp6R3X5kvl9vDKZB1bc=";
sha256 = "sha256-fN7F76TzxBwvUbe2Ha5sfAk6x+FaUDIdx8YaQKfndSU=";
};
unpackPhase = ''
pkgs/data/fonts/lxgw-wenkai/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ lib, fetchzip }:
let version = "1.210"; in
fetchzip {
name = "lxgw-wenkai-${version}";
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';
sha256 = "n8vnkoOJuUO4Gh+GUInZ/HJK5t4pD7MrPPaxDyH+0Qw=";
meta = with lib; {
homepage = "https://lxgw.github.io/";
description = "An open-source Chinese font derived from Fontworks' Klee One";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ elliot ];
};
}
pkgs/data/fonts/sarasa-gothic/default.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ lib, fetchurl, libarchive }:
let
version = "0.35.8";
version = "0.35.9";
in fetchurl {
name = "sarasa-gothic-${version}";
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
sha256 = "sha256-22q+FdTh9Dex+tEo/HCBK14ZlJFtFM7SrE6K1/iVBY0=";
sha256 = "sha256-zG1VVI7QRQMC4MBA3otD26LUvnkUxaxt6UkiweY0l1w=";
recursiveHash = true;
downloadToTemp = true;
pkgs/data/icons/luna-icons/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "luna-icons";
version = "1.9";
version = "1.9.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "1l6jxbgq2qnw4qx0khkdxcq75v17cv2ccfnm28sslpzcc1r8amqd";
sha256 = "sha256-ZUSG9lui07ICG/4M6LBEAhJo9KuKd+wMb2VoKu5Ifmg=";
};
nativeBuildInputs = [
pkgs/data/soundfonts/ydp-grand/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "ydp-grand";
version = "unstable-2016-08-04";
src = fetchurl {
url = "https://freepats.zenvoid.org/Piano/YDP-GrandPiano/YDP-GrandPiano-SF2-20160804.tar.bz2";
sha256 = "sha256-0kPcPhgqYN8qFukoKMGCHPPrV0i0Xi4r3Pqc968FYCY=";
};
installPhase = ''
install -Dm644 YDP-GrandPiano-*.sf2 $out/share/soundfonts/YDP-GrandPiano.sf2
'';
meta = with lib; {
description = "Acoustic grand piano soundfont";
homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html";
license = licenses.cc-by-30;
platforms = platforms.all;
maintainers = with maintainers; [ ckie ];
};
}
pkgs/desktops/gnome/extensions/arcmenu/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-arcmenu";
version = "21";
version = "23";
src = fetchFromGitLab {
owner = "arcmenu";
repo = "ArcMenu";
rev = "v${version}";
sha256 = "sha256-A47nX2fmFcJfWvQUJZsFGK1h4GPkf3QBB0BALlr9ZlM=";
sha256 = "sha256-i/sXAZhNbbVbKdCJ3k9kRAEY9iC5iSNq4YtjiiOqHTM=";
};
patches = [
pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
+3 -3
View File
@@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-dash-to-dock";
version = "71+date=2022-01-24";
version = "71+date=2022-02-23";
# Temporarily switched to commit hash because stable version is buggy.
src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
rev = "53114b4e000482a753e8b42dfa10d6057c08d1c6";
sha256 = "Gv78I/dxhc6FpjZWk10uHBfD24tHE4KdkpaAo8UZpwU=";
rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f";
sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100=";
};
nativeBuildInputs = [
pkgs/development/libraries/exiv2/default.nix
+9
View File
@@ -103,6 +103,15 @@ stdenv.mkDerivation rec {
remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a
'';
postFixup = ''
substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config.cmake --replace \
"set(_IMPORT_PREFIX \"$out\")" \
"set(_IMPORT_PREFIX \"$static\")"
substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config-*.cmake --replace \
"$lib/lib/libexiv2-xmp.a" \
"$static/lib/libexiv2-xmp.a"
'';
disallowedReferences = [ stdenv.cc.cc ];
meta = with lib; {
pkgs/development/libraries/libfprint/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libfprint";
version = "1.94.2";
version = "1.94.3";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "libfprint";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FQwjJOgANSmJu9ev1K2oovNGovsbxnWMxNveTmH5fHg=";
sha256 = "sha256-uOFWF+CDyK4+fY+NhiDnRKaptAN/vfH32Vzj+LAxWqg=";
};
nativeBuildInputs = [
pkgs/development/libraries/libraspberrypi/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libraspberrypi";
version = "unstable-2021-06-23";
version = "unstable-2021-10-25";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "97bc8180ad682b004ea224d1db7b8e108eda4397";
sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5";
rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b";
sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU=";
};
patches = [
pkgs/development/libraries/nanodbc/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }:
stdenv.mkDerivation rec {
pname = "nanodbc";
version = "2.13.0";
src = fetchFromGitHub {
owner = "nanodbc";
repo = "nanodbc";
rev = "v${version}";
sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC ];
cmakeFlags = if (stdenv.hostPlatform.isStatic) then
[ "-DBUILD_STATIC_LIBS=ON" ]
else
[ "-DBUILD_SHARED_LIBS=ON" ];
# fix compilation on macOS
# https://github.com/nanodbc/nanodbc/issues/274
# remove after the next version update
postUnpack = if stdenv.isDarwin then ''
mv $sourceRoot/VERSION $sourceRoot/VERSION.txt
substituteInPlace $sourceRoot/CMakeLists.txt \
--replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt'
'' else "";
meta = with lib; {
homepage = "https://github.com/nanodbc/nanodbc";
changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md";
description = "Small C++ wrapper for the native C ODBC API";
license = licenses.mit;
maintainers = [ maintainers.bzizou ];
};
}
pkgs/development/libraries/phonon/backends/vlc.nix
+5 -4
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "phonon-backend-vlc";
version = "0.11.2";
version = "0.11.3";
src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-xsM7/GjRN/DlegKeS3mMu5D1Svb3Ma9JZ3hXeRzNU6U=";
sha256 = "sha256-Xmn97MsGDH5rWSTO8uZb7loIrOQScAW5U0TtMHfcY5c=";
};
buildInputs = [
@@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://phonon.kde.org/";
homepage = "https://community.kde.org/Phonon";
# Dev repo is at https://invent.kde.org/libraries/phonon-vlc
description = "GStreamer backend for Phonon";
platforms = platforms.linux;
license = with licenses; [ bsd3 lgpl2Plus ];
license = with licenses; [ bsd3 lgpl21Plus ];
};
}
pkgs/development/libraries/pipewire/wireplumber.nix
+2
View File
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
"-Delogind=disabled"
"-Ddoc=${mesonEnableFeature enableDocs}"
"-Dintrospection=${mesonEnableFeature enableGI}"
"-Dsystemd-system-service=true"
"-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system"
];
passthru.updateScript = nix-update-script {
pkgs/development/libraries/wxwidgets/2.8/default.nix
+1 -1
View File
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
pkgs/development/libraries/wxwidgets/2.9/default.nix
+8 -7
View File
@@ -14,14 +14,15 @@
, compat26 ? true
, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, darwin
, AGL
, Carbon
, Cocoa
, Kernel
, QuickTime
, setfile
}:
assert withMesa -> libGLU != null && libGL != null;
let
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
in
stdenv.mkDerivation rec {
pname = "wxGTK";
version = "2.9.5";
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
../0001-fix-assertion-using-hide-in-destroy.patch
../patches/0001-fix-assertion-using-hide-in-destroy.patch
];
nativeBuildInputs = [
@@ -115,7 +116,7 @@ stdenv.mkDerivation rec {
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = platforms.darwin ++ platforms.linux;
badPlatforms = [ "x86_64-darwin" ];
};
pkgs/development/libraries/wxwidgets/3.0/default.nix
+8 -5
View File
@@ -17,14 +17,17 @@
, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk
, darwin
, AGL
, Carbon
, Cocoa
, Kernel
, QTKit
, setfile
}:
assert withGtk2 -> (!withWebKit);
let
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
inherit (gst_all_1) gstreamer gst-plugins-base;
gtk = if withGtk2 then gtk2 else gtk3;
in
@@ -66,7 +69,7 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
../0001-fix-assertion-using-hide-in-destroy.patch
../patches/0001-fix-assertion-using-hide-in-destroy.patch
];
configureFlags = [
@@ -126,7 +129,7 @@ stdenv.mkDerivation rec {
database support, HTML viewing and printing, and much more.
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = platforms.linux ++ platforms.darwin;
badPlatforms = [ "x86_64-darwin" ];
};
pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch → pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch
View File
pkgs/development/node-packages/node-packages.json
+2 -2
View File
@@ -257,7 +257,7 @@
, "reveal-md"
, "rimraf"
, "rollup"
, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
, { "rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-analyzer/build-deps" }
, "rtlcss"
, "s3http"
, "sass"
@@ -361,7 +361,7 @@
, "vscode-json-languageserver"
, "vscode-json-languageserver-bin"
, "vscode-langservers-extracted"
, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" }
, { "vscode-lldb-build-deps": "../../applications/editors/vscode/extensions/vscode-lldb/build-deps" }
, "vue-cli"
, "vue-language-server"
, "wavedrom-cli"
pkgs/development/node-packages/node-packages.nix
Generated
+4 -4
View File
@@ -118020,11 +118020,11 @@ in
bypassCache = true;
reconstructLock = true;
};
"rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage {
"rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage {
name = "rust-analyzer";
packageName = "rust-analyzer";
version = "0.2.834";
src = ../../misc/vscode-extensions/rust-analyzer/build-deps;
src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps;
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.16.7"
@@ -129307,11 +129307,11 @@ in
bypassCache = true;
reconstructLock = true;
};
"vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage {
"vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage {
name = "vscode-lldb";
packageName = "vscode-lldb";
version = "1.6.8";
src = ../../misc/vscode-extensions/vscode-lldb/build-deps;
src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps;
dependencies = [
sources."@discoveryjs/json-ext-0.5.6"
sources."@types/eslint-8.4.1"
pkgs/development/ocaml-modules/mdx/default.nix
+2
View File
@@ -8,6 +8,8 @@ buildDunePackage rec {
version = "2.1.0";
useDune2 = true;
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
sha256 = "sha256-ol1zy8LODDYdcnv/jByE0pnqJ5ujQuMALq3v9y7td/o=";
pkgs/development/ocaml-modules/printbox/default.nix
+2 -2
View File
@@ -17,8 +17,8 @@ buildDunePackage rec {
checkInputs = [ mdx.bin ];
# mdx is not available for OCaml < 4.07
doCheck = lib.versionAtLeast ocaml.version "4.07";
# mdx is not available for OCaml < 4.08
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
homepage = "https://github.com/c-cube/printbox/";
pkgs/development/ocaml-modules/pyml/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pyml";
version = "20210226";
version = "20211015";
src = fetchFromGitHub {
owner = "thierry-martinez";
repo = pname;
rev = version;
sha256 = "15xk6bgdzsf04d6wdjpr3s1ci2g7d7qnbq3102avkz179d5n62h7";
sha256 = "sha256-GCO6KlRhJmADFjQ5QF4naMQBskF63yqnJnLnuQsagEk=";
};
buildInputs = [
pkgs/development/python-modules/ansible-runner/default.nix
+2 -2
View File
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "ansible-runner";
version = "2.1.1";
version = "2.1.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-doRhL3VDxfB/PoE1Zn7rIqnb2Y9iXMaZAbqZJDKe8k8=";
hash = "sha256-GK/CqmMm67VmvzlhMV6ow+40m0DYUpXCFkP+9NgR/e4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "2.1.0";
version = "2.2.0";
pname = "azure-mgmt-kusto";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "171ea8719f543bd0dd4f3d6fa2277162d763182fe8e61b4db03f02668c1685b5";
sha256 = "sha256-A369Y5cqKthMz43QUvWQHq5ggz93plGObl7K4xnUdnc=";
extension = "zip";
};
pkgs/development/python-modules/connexion/default.nix
+2 -2
View File
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "connexion";
version = "2.11.2";
version = "2.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "zalando";
repo = pname;
rev = version;
sha256 = "sha256-kFNKRWl/Q8vxIELQURfzCRbVs2JYUwbKro/zKlzNcHU=";
sha256 = "sha256-JMuI3h0Pg7nCXrJtF0fhSFJTOWelEqcvmqv3ooIfkqM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/cssutils/default.nix
+10 -16
View File
@@ -4,6 +4,7 @@
, pythonOlder
, fetchpatch
, fetchPypi
, setuptools
, setuptools-scm
, toml
, importlib-metadata
@@ -11,28 +12,24 @@
, lxml
, mock
, pytestCheckHook
, importlib-resources
}:
buildPythonPackage rec {
pname = "cssutils";
version = "2.3.0";
version = "2.4.0";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA=";
hash = "sha256-LZchCoOwo/4eRGn1/5pkILB4VyA1GIsbq3EDw6NtyJs=";
};
patches = lib.optionals (pythonAtLeast "3.10") [
# fix tests for python3.10
(fetchpatch {
url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch";
sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ=";
})
];
nativeBuildInputs = [
setuptools
setuptools-scm
toml
];
@@ -46,6 +43,8 @@ buildPythonPackage rec {
lxml
mock
pytestCheckHook
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
];
disabledTests = [
@@ -53,11 +52,6 @@ buildPythonPackage rec {
"test_parseUrl"
"encutils"
"website.logging"
] ++ lib.optionals (pythonOlder "3.9") [
# AttributeError: module 'importlib.resources' has no attribute 'files'
"test_parseFile"
"test_parseString"
"test_combine"
];
pythonImportsCheck = [ "cssutils" ];

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