nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-18 00:01:59 +00:00 committed by GitHub
commit 2341511023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
122 changed files with 696 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/modules.nix
View File

@ -710,6 +710,7 @@ rec {
mkOptionDefault = mkOverride 1500; # priority of option defaults
mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default
mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce
mkForce = mkOverride 50;
mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’

11
maintainers/team-list.nix
View File

@ -132,6 +132,17 @@ with lib.maintainers; {
scope = "Maintain the Home Assistant ecosystem";
};
iog = {
members = [
cleverca22
disassembler
jonringer
maveru
nrdxp
];
scope = "Input-Output Global employees, which maintain critical software";
};
jitsi = {
members = [
petabyteboy

40
nixos/doc/manual/development/building-nixos.chapter.md
View File

@ -1,7 +1,22 @@
# Building Your Own NixOS CD {#sec-building-cd}
Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your `configuration.nix` to configure the system that would be installed on the CD.
# Building a NixOS (Live) ISO {#sec-building-image}
Default CD/DVD configurations are available inside `nixos/modules/installer/cd-dvd`
Default live installer configurations are available inside `nixos/modules/installer/cd-dvd`.
For building other system images, [nixos-generators] is a good place to start looking at.
You have two options:
- Use any of those default configurations as is
- Combine them with (any of) your host config(s)
System images, such as the live installer ones, know how to enforce configuration settings
on wich they immediately depend in order to work correctly.
However, if you are confident, you can opt to override those
enforced values with `mkForce`.
[nixos-generators]: https://github.com/nix-community/nixos-generators
## Practical Instructions {#sec-building-image-instructions}
```ShellSession
$ git clone https://github.com/NixOS/nixpkgs.git
@ -9,10 +24,23 @@ $ cd nixpkgs/nixos
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
```
Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command:
To check the content of an ISO image, mount it like so:
```ShellSession
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
```
If you want to customize your NixOS CD in more detail, or generate other kinds of images, you might want to check out [nixos-generators](https://github.com/nix-community/nixos-generators). This can also be a good starting point when you want to use Nix to build a 'minimal' image that doesn't include a NixOS installation.
## Technical Notes {#sec-building-image-tech-notes}
The config value enforcement is implemented via `mkImageMediaOverride = mkOverride 60;`
and therefore primes over simple value assignments, but also yields to `mkForce`.
This property allows image designers to implement in semantically correct ways those
configuration values upon which the correct functioning of the image depends.
For example, the iso base image overrides those file systems which it needs at a minimum
for correct functioning, while the installer base image overrides the entire file system
layout because there can't be any other guarantees on a live medium than those given
by the live medium itself. The latter is especially true befor formatting the target
block device(s). On the other hand, the netboot iso only overrides its minimum dependencies
since netboot images are always made-to-target.

85
nixos/doc/manual/from_md/development/building-nixos.chapter.xml
View File

@ -1,33 +1,72 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-cd">
<title>Building Your Own NixOS CD</title>
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-image">
<title>Building a NixOS (Live) ISO</title>
<para>
Building a NixOS CD is as easy as configuring your own computer. The
idea is to use another module which will replace your
<literal>configuration.nix</literal> to configure the system that
would be installed on the CD.
Default live installer configurations are available inside
<literal>nixos/modules/installer/cd-dvd</literal>. For building
other system images,
<link xlink:href="https://github.com/nix-community/nixos-generators">nixos-generators</link>
is a good place to start looking at.
</para>
<para>
Default CD/DVD configurations are available inside
<literal>nixos/modules/installer/cd-dvd</literal>
You have two options:
</para>
<programlisting>
<itemizedlist spacing="compact">
<listitem>
<para>
Use any of those default configurations as is
</para>
</listitem>
<listitem>
<para>
Combine them with (any of) your host config(s)
</para>
</listitem>
</itemizedlist>
<para>
System images, such as the live installer ones, know how to enforce
configuration settings on wich they immediately depend in order to
work correctly.
</para>
<para>
However, if you are confident, you can opt to override those
enforced values with <literal>mkForce</literal>.
</para>
<section xml:id="sec-building-image-instructions">
<title>Practical Instructions</title>
<programlisting>
$ git clone https://github.com/NixOS/nixpkgs.git
$ cd nixpkgs/nixos
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
</programlisting>
<para>
Before burning your CD/DVD, you can check the content of the image
by mounting anywhere like suggested by the following command:
</para>
<programlisting>
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso&lt;/screen&gt;
<para>
To check the content of an ISO image, mount it like so:
</para>
<programlisting>
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
</programlisting>
<para>
If you want to customize your NixOS CD in more detail, or generate
other kinds of images, you might want to check out
<link xlink:href="https://github.com/nix-community/nixos-generators">nixos-generators</link>.
This can also be a good starting point when you want to use Nix to
build a <quote>minimal</quote> image that doesn’t include a NixOS
installation.
</para>
</section>
<section xml:id="sec-building-image-tech-notes">
<title>Technical Notes</title>
<para>
The config value enforcement is implemented via
<literal>mkImageMediaOverride = mkOverride 60;</literal> and
therefore primes over simple value assignments, but also yields to
<literal>mkForce</literal>.
</para>
<para>
This property allows image designers to implement in semantically
correct ways those configuration values upon which the correct
functioning of the image depends.
</para>
<para>
For example, the iso base image overrides those file systems which
it needs at a minimum for correct functioning, while the installer
base image overrides the entire file system layout because there
can’t be any other guarantees on a live medium than those given by
the live medium itself. The latter is especially true befor
formatting the target block device(s). On the other hand, the
netboot iso only overrides its minimum dependencies since netboot
images are always made-to-target.
</para>
</section>
</chapter>

6
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -737,6 +737,12 @@
<literal>linuxPackages_5_10_hardened</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>nomad</literal> package now defaults to a 1.1.x
release instead of 1.0.x
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">

2
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -191,6 +191,8 @@ To be able to access the web UI this port needs to be opened in the firewall.
a hardened kernel, please pin it explicitly with a versioned attribute such as
`linuxPackages_5_10_hardened`.
- The `nomad` package now defaults to a 1.1.x release instead of 1.0.x
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The linux kernel package infrastructure was moved out of `all-packages.nix`, and restructured. Linux related functions and attributes now live under the `pkgs.linuxKernel` attribute set.

5
nixos/modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -30,6 +30,11 @@ with lib;
# Add Memtest86+ to the CD.
boot.loader.grub.memtest86.enable = true;
# An installation media cannot tolerate a host config defined file
# system layout on a fresh machine, before it has been formatted.
swapDevices = mkImageMediaOverride [ ];
fileSystems = mkImageMediaOverride config.lib.isoFileSystems;
boot.postBootCommands = ''
for o in $(</proc/cmdline); do
case "$o" in

98
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -615,6 +615,55 @@ in
};
# store them in lib so we can mkImageMediaOverride the
# entire file system layout in installation media (only)
config.lib.isoFileSystems = {
"/" = mkImageMediaOverride
{
fsType = "tmpfs";
options = [ "mode=0755" ];
};
# Note that /dev/root is a symlink to the actual root device
# specified on the kernel command line, created in the stage 1
# init script.
"/iso" = mkImageMediaOverride
{ device = "/dev/root";
neededForBoot = true;
noCheck = true;
};
# In stage 1, mount a tmpfs on top of /nix/store (the squashfs
# image) to make this a live CD.
"/nix/.ro-store" = mkImageMediaOverride
{ fsType = "squashfs";
device = "/iso/nix-store.squashfs";
options = [ "loop" ];
neededForBoot = true;
};
"/nix/.rw-store" = mkImageMediaOverride
{ fsType = "tmpfs";
options = [ "mode=0755" ];
neededForBoot = true;
};
"/nix/store" = mkImageMediaOverride
{ fsType = "overlay";
device = "overlay";
options = [
"lowerdir=/nix/.ro-store"
"upperdir=/nix/.rw-store/store"
"workdir=/nix/.rw-store/work"
];
depends = [
"/nix/.ro-store"
"/nix/.rw-store/store"
"/nix/.rw-store/work"
];
};
};
config = {
assertions = [
{
@ -653,54 +702,7 @@ in
"boot.shell_on_fail"
];
fileSystems."/" =
# This module is often over-layed onto an existing host config
# that defines `/`. We use mkOverride 60 to override standard
# values, but at the same time leave room for mkForce values
# targeted at the image build.
{ fsType = mkOverride 60 "tmpfs";
options = [ "mode=0755" ];
};
# Note that /dev/root is a symlink to the actual root device
# specified on the kernel command line, created in the stage 1
# init script.
fileSystems."/iso" =
{ device = "/dev/root";
neededForBoot = true;
noCheck = true;
};
# In stage 1, mount a tmpfs on top of /nix/store (the squashfs
# image) to make this a live CD.
fileSystems."/nix/.ro-store" =
{ fsType = "squashfs";
device = "/iso/nix-store.squashfs";
options = [ "loop" ];
neededForBoot = true;
};
fileSystems."/nix/.rw-store" =
{ fsType = "tmpfs";
options = [ "mode=0755" ];
neededForBoot = true;
};
fileSystems."/nix/store" =
{ fsType = "overlay";
device = "overlay";
options = [
"lowerdir=/nix/.ro-store"
"upperdir=/nix/.rw-store/store"
"workdir=/nix/.rw-store/work"
];
depends = [
"/nix/.ro-store"
"/nix/.rw-store/store"
"/nix/.rw-store/work"
];
};
fileSystems = config.lib.isoFileSystems;
boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" "overlay" ];

14
nixos/modules/installer/netboot/netboot.nix
View File

@ -29,31 +29,27 @@ with lib;
then []
else [ pkgs.grub2 pkgs.syslinux ]);
fileSystems."/" =
# This module is often over-layed onto an existing host config
# that defines `/`. We use mkOverride 60 to override standard
# values, but at the same time leave room for mkForce values
# targeted at the image build.
{ fsType = mkOverride 60 "tmpfs";
fileSystems."/" = mkImageMediaOverride
{ fsType = "tmpfs";
options = [ "mode=0755" ];
};
# In stage 1, mount a tmpfs on top of /nix/store (the squashfs
# image) to make this a live CD.
fileSystems."/nix/.ro-store" =
fileSystems."/nix/.ro-store" = mkImageMediaOverride
{ fsType = "squashfs";
device = "../nix-store.squashfs";
options = [ "loop" ];
neededForBoot = true;
};
fileSystems."/nix/.rw-store" =
fileSystems."/nix/.rw-store" = mkImageMediaOverride
{ fsType = "tmpfs";
options = [ "mode=0755" ];
neededForBoot = true;
};
fileSystems."/nix/store" =
fileSystems."/nix/store" = mkImageMediaOverride
{ fsType = "overlay";
device = "overlay";
options = [

1
nixos/modules/services/web-apps/discourse.nix
View File

@ -771,7 +771,6 @@ in
"tmp"
"assets/javascripts/plugins"
"public"
"plugins"
"sockets"
];
RuntimeDirectoryMode = 0750;

13
nixos/modules/services/web-apps/discourse.xml
View File

@ -284,11 +284,22 @@ services.discourse = {
Ruby dependencies are listed in its
<filename>plugin.rb</filename> file as function calls to
<literal>gem</literal>. To construct the corresponding
<filename>Gemfile</filename>, run <command>bundle
<filename>Gemfile</filename> manually, run <command>bundle
init</command>, then add the <literal>gem</literal> lines to it
verbatim.
</para>
<para>
Much of the packaging can be done automatically by the
<filename>nixpkgs/pkgs/servers/web-apps/discourse/update.py</filename>
script - just add the plugin to the <literal>plugins</literal>
list in the <function>update_plugins</function> function and run
the script:
<programlisting language="bash">
./update.py update-plugins
</programlisting>.
</para>
<para>
Some plugins provide <link
linkend="module-services-discourse-site-settings">site

4
nixos/tests/discourse.nix
View File

@ -4,7 +4,7 @@
# 3. replying to that message via email.
import ./make-test-python.nix (
{ pkgs, lib, ... }:
{ pkgs, lib, package ? pkgs.discourse, ... }:
let
certs = import ./common/acme/server/snakeoil-certs.nix;
clientDomain = "client.fake.domain";
@ -55,7 +55,7 @@ import ./make-test-python.nix (
services.discourse = {
enable = true;
inherit admin;
inherit admin package;
hostname = discourseDomain;
sslCertificate = "${certs.${discourseDomain}.cert}";
sslCertificateKey = "${certs.${discourseDomain}.key}";

4
pkgs/applications/audio/pt2-clone/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
version = "1.31";
version = "1.32";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
sha256 = "sha256-hIm9HWKBTFmxU9jI41PfScZIHpZOZpjvV2jgaMX/KSg=";
sha256 = "sha256-U1q4xCOzV7n31WgCTGlEXvZaUT/TP797cOAHkecQaLo=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/audio/scream/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "scream";
version = "3.7";
version = "3.8";
src = fetchFromGitHub {
owner = "duncanthrax";
repo = pname;
rev = version;
sha256 = "0d9abrw62cd08lcg4il415b7ap89iggbljvbl5jqv2y23il0pvyz";
sha256 = "sha256-7UzwEoZujTN8i056Wf+0QtjyU+/UZlqcSompiAGHT54=";
};
buildInputs = lib.optional pulseSupport libpulseaudio

4
pkgs/applications/audio/x42-plugins/default.nix
View File

@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20210114";
version = "20210714";
pname = "x42-plugins";
src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
sha256 = "sha256-xUiA/k5ZbI/SkY8a20FsyRwqPxxMteiFdEhFF/8e2OA=";
sha256 = "sha256-X389bA+cf3N5eJpAlpDn/CJQ6xM4qzrBQ47fYPIyIHk=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/audio/zita-njbridge/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, libjack2, zita-resampler }:
stdenv.mkDerivation rec {
version = "0.4.4";
version = "0.4.8";
pname = "zita-njbridge";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j";
sha256 = "sha256-EBF2oL1AfKt7/9Mm6NaIbBtlshK8M/LvuXsD+SbEeQc=";
};
buildInputs = [ libjack2 zita-resampler ];

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

@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "rednotebook";
version = "2.21";
version = "2.22";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "v${version}";
sha256 = "07zm4q9h583sg82ayhn9d0ra3wbsfaqrl5sfw6a1kwhyxxkwp8ad";
sha256 = "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5";
};
# We have not packaged tests.

4
pkgs/applications/editors/thonny/default.nix
View File

@ -4,13 +4,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "thonny";
version = "3.3.6";
version = "3.3.14";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0ga0pqvq3nglr4jgh8ajv0bv8c7q09h1jh6q6r5cwqa49fawkr02";
sha256 = "13l8blq7y6p7a235x2lfiqml1bd4ba2brm3vfvs8wasjh3fvm9g5";
};
propagatedBuildInputs = with python3.pkgs; [

4
pkgs/applications/graphics/pdfcpu/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pdfcpu";
version = "0.3.11";
version = "0.3.12";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kLRxZW89Bm2N/KxFYetIq+auPBW/vFoUnB8uaEcM8Yo=";
sha256 = "sha256-Ts4FJWUeWHVfeBEetgACYMGEsDLHm5JOEEn7EtQduPU=";
};
vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM=";

6
pkgs/applications/graphics/rx/default.nix
View File

@ -7,16 +7,16 @@ with lib;
rustPlatform.buildRustPackage rec {
pname = "rx";
version = "0.4.0";
version = "0.5.2";
src = fetchFromGitHub {
owner = "cloudhead";
repo = pname;
rev = "v${version}";
sha256 = "1pln65pqy39ijrld11d06klwzfhhzmrgdaxijpx9q7w9z66zmqb8";
sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
};
cargoSha256 = "1mb9wx5h729pc9y1b0d0yiapyk0mlbvdmvwq993fcpkziwjvnl44";
cargoSha256 = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU=";
nativeBuildInputs = [ cmake pkg-config makeWrapper ];

4
pkgs/applications/misc/logseq/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.3.2";
version = "0.3.3";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "4gWpB3uTQsm9oRvT9rGizIU7xgrZim7jxjJGfME7WAg=";
sha256 = "OweKV+vF8H1QMNhIs0Z9/uUAuu1cCTitH2P7barS0ao=";
name = "${pname}-${version}.AppImage";
};

4
pkgs/applications/misc/mapproxy/default.nix
View File

@ -6,10 +6,10 @@
with python3.pkgs;
buildPythonApplication rec {
pname = "MapProxy";
version = "1.13.0";
version = "1.13.2";
src = fetchPypi {
inherit pname version;
sha256 = "0qi63ap8yi5g2cas33jv4jsmdrl6yv3qp6bh0zxrfpkb704lcng4";
sha256 = "1c2ba9424f600f35b7b883366296089cf61ac7c803da5d411a334c7a39ccf84b";
};
prePatch = ''
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"

4
pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
View File

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "remarkable-mouse";
version = "5.2.1";
version = "6.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0k2wjfcgnvb8yqn4c4ddfyyhrvl6hj61kn1ddnyp6ay9vklnw160";
sha256 = "46eff5d6a07ca60ed652d09eeee9b4c4566da422be4a3dfa2fcd452a3df65ac1";
};
propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ];

4
pkgs/applications/misc/worker/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "worker";
version = "4.7.0";
version = "4.8.1";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-9x/nHd2nUeFSH7a2qH4qlyH4FRH/NfNvTE1LEaMMSwU=";
sha256 = "sha256-Cf4vx1f4GgjlhNtGUuXf8174v8PGJapm5L30XUdqbro=";
};
buildInputs = [ libX11 ];

4
pkgs/applications/misc/xmenu/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xmenu";
version = "4.5.4";
version = "4.5.5";
src = fetchFromGitHub {
owner = "phillbush";
repo = "xmenu";
rev = "v${version}";
sha256 = "1dy3aqqczs7d3f8rf6h7xssgr3881g8m5y4waskizjy9z7chs64q";
sha256 = "sha256-Gg4hSBBVBOB/wlY44C5bJOuOnLoA/tPvcNZamXae/WE=";
};
buildInputs = [ imlib2 libX11 libXft libXinerama ];

4
pkgs/applications/misc/xmrig/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
version = "6.12.2";
version = "6.14.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "1gjwh509cxs8vqz72v97cir0aazcrd9y9l0k1q5ywbl5l3yf6ryf";
sha256 = "sha256-h+Y7hXkenoLT83eG0w6YEfOuEocejXgvqRMq1DwWwT0=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/misc/xmrig/proxy.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig-proxy";
version = "6.4.0";
version = "6.14.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
sha256 = "0bcbil9b5z95haqbmdqaslckvjflw7h77fqrcdxc6lrn29575nnf";
sha256 = "sha256-QCjXtn7O4jcPybzMsu2j7jQqWoGzeqjwessZC/dG86s=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/applications/networking/cluster/kuttl/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "kuttl";
version = "0.11.0";
version = "0.11.1";
cli = "kubectl-kuttl";
src = fetchFromGitHub {
owner = "kudobuilder";
repo = "kuttl";
rev = "v${version}";
sha256 = "sha256-42acx1UcvuzDZX2A33zExhhdNqWGkN0i6FR/Kx76WVM=";
sha256 = "sha256-jvearvhl2fQV5OOVmvf3C4MjE//wkVs8Ly9BIwv15/8=";
};
vendorSha256 = "sha256-TUNFUI7Lj7twJhM3bIdL6ElygIVFOlRut1MoFwVRGeo=";
vendorSha256 = "sha256-EytHUfr6RbgXowYlfuajvNt9VwmGmvw9TBRtwYMAIh4=";
subPackages = [ "cmd/kubectl-kuttl" ];

4
pkgs/applications/networking/cluster/node-problem-detector/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
version = "0.8.7";
version = "0.8.9";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GyWvwgLtE8N+HLmGKUOjv5HXl2sdnecjh5y6VCOs+/0=";
sha256 = "sha256-P7niTGe0uzg2R1UHrPWbU4tOhOA1OwlP3dslZPwuF0A=";
};
vendorSha256 = null;

6
pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nomad-driver-podman";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "1a2alapqm7wnkjm9cg0gvi63pkaila9lhsa5razv0vprhg1k84gy";
sha256 = "sha256-aVmXtYIquG0acVlbwNmgXUpuOgpsfMmfbnb5md9CN5w=";
};
vendorSha256 = "1zs5y0zfi8dd9w371hpmah4iwxahgvaf70biqqdw3c9yp6yw2rwq";
vendorSha256 = "sha256-QXAXDoYN5egl5y0YV4/7yh5K0tjzjN5vRJRHyI8eU2E=";
subPackages = [ "." ];

11
pkgs/applications/networking/cluster/nomad/0.12.nix
View File

@ -1,11 +0,0 @@
{ callPackage
, buildGoPackage
, nvidia_x11
, nvidiaGpuSupport
}:
callPackage ./generic.nix {
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
version = "0.12.12";
sha256 = "0hz5fsqv8jh22zhs0r1yk0c4qf4sf11hmqg4db91kp2xrq72a0qg";
}

11
pkgs/applications/networking/cluster/nomad/1.1.nix
View File

@ -1,11 +1,12 @@
{ callPackage
, buildGoPackage
, buildGoModule
, nvidia_x11
, nvidiaGpuSupport
}:
callPackage ./generic.nix {
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
version = "1.1.2";
sha256 = "08ynfr2lqzv66ymj37qbc72lf2iq41kf94n76pdvynymk4dq98nq";
callPackage ./genericModule.nix {
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
version = "1.1.3";
sha256 = "0jpc8ff56k9q2kv9l86y3p8h3gqbvx6amvs0cw8sp4i7dqd2ihz2";
vendorSha256 = "0az4gr7292lfr5wrwbkdknrigqm15lkbnf5mh517hl3yzv4pb8yr";
}

3
pkgs/applications/networking/cluster/nomad/generic.nix
View File

@ -6,7 +6,6 @@
, nvidiaGpuSupport
, patchelf
, nvidia_x11
, nixosTests
}:
buildGoPackage rec {
@ -40,8 +39,6 @@ buildGoPackage rec {
done
'';
passthru.tests.nomad = nixosTests.nomad;
meta = with lib; {
homepage = "https://www.nomadproject.io/";
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";

54
pkgs/applications/networking/cluster/nomad/genericModule.nix Normal file
View File

@ -0,0 +1,54 @@
{ lib
, buildGoModule
, fetchFromGitHub
, version
, sha256
, vendorSha256
, nvidiaGpuSupport
, patchelf
, nvidia_x11
, nixosTests
}:
buildGoModule rec {
pname = "nomad";
inherit version;
subPackages = [ "." ];
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
inherit sha256;
};
inherit vendorSha256;
nativeBuildInputs = lib.optionals nvidiaGpuSupport [
patchelf
];
# ui:
# Nomad release commits include the compiled version of the UI, but the file
# is only included if we build with the ui tag.
tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
# The dependency on NVML isn't explicit. We have to make it so otherwise the
# binary will not know where to look for the relevant symbols.
postFixup = lib.optionalString nvidiaGpuSupport ''
for bin in $out/bin/*; do
patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin"
done
'';
passthru.tests.nomad = nixosTests.nomad;
meta = with lib; {
homepage = "https://www.nomadproject.io/";
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
platforms = platforms.unix;
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ];
};
}

6
pkgs/applications/networking/cluster/popeye/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "popeye";
version = "0.9.2";
version = "0.9.7";
src = fetchFromGitHub {
rev = "v${version}";
owner = "derailed";
repo = "popeye";
sha256 = "sha256-GSH9q0hnyuGiJAdbFWKbaaYoHKl4e0SNmBkOvpn5a6s=";
sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c=";
};
buildFlagsArray = ''
@ -18,7 +18,7 @@ buildGoModule rec {
-X github.com/derailed/popeye/cmd.commit=${version}
'';
vendorSha256 = "sha256-pK04vGL9Izv1aK8UA+/3lSt/SjLyckjnfSCrOalRj3c=";
vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";
doCheck = true;

6
pkgs/applications/networking/cluster/velero/default.nix
View File

@ -3,7 +3,7 @@
buildGoModule rec {
pname = "velero";
# When updating, change the commit underneath
version = "1.6.2";
version = "1.6.3";
commit = "8c9cdb9603446760452979dc77f93b17054ea1cc";
@ -11,7 +11,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "vmware-tanzu";
repo = "velero";
sha256 = "sha256-JYa+5lP9uo/6/5wTxNz8xa2usHo6WfXSndbwrMpHhcg=";
sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk=";
};
buildFlagsArray = ''
@ -22,7 +22,7 @@ buildGoModule rec {
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean
'';
vendorSha256 = "sha256-Rmj2qGY2w1gsnKAuRQ8cQyqfoM556t4/MookkuPmbDM=";
vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU=";
excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" ];

4
pkgs/applications/networking/feedreaders/rssguard/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rssguard";
version = "3.9.1";
version = "3.9.2";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
sha256 = "sha256-zSnSCbBNySc5GQSm0O8NztCKNqdNs6bGNWL/RkmGsUw=";
sha256 = "sha256-vWKPIm8iqgjeC7BEBzd5wyFRkLstmdqEtdsror+HUgU=";
};
buildInputs = [ qtwebengine qttools ];

4
pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "whatsapp-for-linux";
version = "1.1.5";
version = "1.2.0";
src = fetchFromGitHub {
owner = "eneshecan";
repo = pname;
rev = "v${version}";
sha256 = "1gzahls4givd2kbjdwx6yb3jv7a3r1krw40qihiz7hkamkrpaiaz";
sha256 = "sha256-dB+NsoUEYM3cT0cg5ZOkBGW7ozRGFWSsYQMja3CjaHM=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/opsdroid/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "opsdroid";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "opsdroid";
repo = "opsdroid";
rev = "v${version}";
sha256 = "003gpzdjfz2jrwx2bkkd1k2mr7yjpaw5s7fy5l0hw72f9zimznd0";
sha256 = "1p1x7jbp0jx8anfwvavyn3x8i1vfhmbzyzrm014n26v5y39gabj1";
};
disabled = !python3Packages.isPy3k;

4
pkgs/applications/radio/wsjtx/default.nix
View File

@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "wsjtx";
version = "2.3.1";
version = "2.4.0";
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork
src = fetchurl {
url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
sha256 = "11wzh4bxp9277kbqkyrc063akkk09czgxnkpk8k07vl4s3dan3hh";
sha256 = "sha256-LpfGzI/Hpsp7/K0ZZu2EFVlvWcN0cnAQ1RNAxCMugcg=";
};
# Hamlib builds with autotools, wsjtx builds with cmake

4
pkgs/applications/science/biology/minimap2/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "minimap2";
version = "2.17";
version = "2.22";
src = fetchFromGitHub {
repo = pname;
owner = "lh3";
rev = "v${version}";
sha256 = "0qdwlkib3aa6112372hdgvnvk86hsjjkhjar0p53pq4ajrr2cdlb";
sha256 = "sha256-jYXJr2T1enZfSABVV5Kmd5OBtWZtQ2D/2eAlW2WHtGU=";
};
buildInputs = [ zlib ];

4
pkgs/applications/science/biology/picard-tools/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
version = "2.25.1";
version = "2.25.7";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "sha256-bW5iLWtGX5/HBMN7y6VbDaxa0U0HCIu9vfreXNAn7hw=";
sha256 = "sha256-3A6DDT6Dje4rT0qhyWMfs6TD7Jgt6N/lFF/HSBBMcUY=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vowpal-wabbit";
version = "8.10.0";
version = "8.11.0";
src = fetchFromGitHub {
owner = "VowpalWabbit";
repo = "vowpal_wabbit";
rev = version;
sha256 = "1vxnwanflsx6zf8m9mrxms28ii7rl61xfxp3556y3iawmy11d6pl";
sha256 = "sha256-F3la4n1ULMN2nktr+PVWFPl3V2RfCowR0ozL+dnbhgA=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
version = "3.19.0";
version = "3.20.1";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
sha256 = "1nrx7gp6f1yalbdda1gb97azhbr4xclq2xf08vvbvsk8jfd6fd2v";
sha256 = "sha256-GTOdJ4dxR491WU6WM47xLHO7RGUGXkdHuQIDxJvVvFE=";
};
hardeningDisable = [ "format" ];

4
pkgs/applications/science/math/wxmaxima/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wxmaxima";
version = "21.02.0";
version = "21.05.2";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${version}";
sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc=";
sha256 = "sha256-HPqdxGrPxe5FZNOimTpAP+c9VpDBkXu3Z1c1Aaf3+UA=";
};
buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ];

4
pkgs/applications/video/ccextractor/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "ccextractor";
version = "0.92";
version = "0.93";
src = fetchFromGitHub {
owner = "CCExtractor";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cEC0SF69CDLKQyTPIOZYPgxNR29mJVnzOZraGvPQjdg=";
sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc=";
};
sourceRoot = "source/src";

4
pkgs/applications/virtualization/x11docker/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
stdenv.mkDerivation rec {
pname = "x11docker";
version = "6.6.2";
version = "6.9.0";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
sha256 = "1skdgr2hipd7yx9c7r7nr3914gm9cm1xj6h3qdsa9f92xxm3aml1";
sha256 = "sha256-O+lab3K7J2Zz9t+yB/kYWtBOvQGOQMDFNDUVXzTj/h4=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/window-managers/i3/wmfocus.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "wmfocus";
version = "1.1.5";
version = "1.2.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = "v${version}";
sha256 = "09xffklpz62h6yiksxdlv3a9s1z0wr3ax9syl399avwdmq3c0y49";
sha256 = "sha256-fZbsKu7C+rqggaFVSDNIGDAgn23M7mi+1jhV85s1Co8=";
};
cargoSha256 = "0fmz3q3yadymbqnkdhjd2z2g4zgf3z81ccixwywndd9zb7p47zdr";
cargoSha256 = "sha256-ejzVJdtOXBPe+14g4aJFBMCvXkmNia9dNAk/BVQ2ZSQ=";
nativeBuildInputs = [ python3 pkg-config ];
buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];

2
pkgs/data/fonts/iosevka/bin.nix
View File

@ -10,7 +10,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "9.0.1";
version = "10.0.0";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

184
pkgs/data/fonts/iosevka/variants.nix
View File

@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
iosevka = "051yyvdhb8an7v5qsv9fd70z3dqrvg1y67mr0xf4wsbfpxpd10zh";
iosevka-aile = "1f7yvybfgf1in9b0w1zqzbcla7brzdx7hh00nk7mjbpl943qjcls";
iosevka-curly = "0bf294ccnp2ppzqr9xs142pgkch7vvh2p9s4dh2xmilrzrqi1qmr";
iosevka-curly-slab = "0ga30kwxd6984db4wfqzxfh6frqj3lp7745m4iqknx874p80gg3n";
iosevka-etoile = "11xxq6c8ppcr2y3wdzk2hklml32ga29vxw1qdmsbnj9pqykm0ik6";
iosevka-slab = "1b88f6y39d9qfpmv5lkrwnpkn5b6khj6nc2isbc49fprr7i5ycqf";
iosevka-ss01 = "1q0l0bi19bsq76y485l6mz9nl3bs2jqkyk6ny7z77kzdz3azipg9";
iosevka-ss02 = "1d44anwkmvvmw3z48w4p1n8pz7w0b7vwng3r087cmad8xhq1hcr1";
iosevka-ss03 = "1wihzc299f3ybw4c52xxmv2my129qbwmpr5n8z0rx939h951f9m3";
iosevka-ss04 = "1xzp2bkwl70c3524n7ajvjlb3zpgz35qrjbfhfr6hp42n8gj1ygx";
iosevka-ss05 = "17y8ham2dpa8yl3x393vic550f11bcjbgqlqdhpikwgb30012znw";
iosevka-ss06 = "0bb870gxv4f1jx1mc3znk7nh6cqjywx27y1w36brzp44lg20cjkp";
iosevka-ss07 = "12rh1a2499dr4bbmrq79b9qrf4a27ib5l8yvk817kig0dz8fvr7h";
iosevka-ss08 = "1bf307b0qr657jy73gq4y1wk3fwwzhpqyvcyhwl8ayanml99yiz8";
iosevka-ss09 = "1ydr6bjymsbpkplnxkav5v8ghnadrcghjz34gj6xb8lgk1kx5d1n";
iosevka-ss10 = "0429lnsc3vg1vlr0yxpah7j7bm352ys0yhl9vclqabbmkxjr9fjz";
iosevka-ss11 = "0ibqd20l3aalf72cia4k7z6a20sdaflb9kdiz90h5g769x0yc10a";
iosevka-ss12 = "1sjgk4nfgis4qbdyj9lfa7piwdixirx92769xmdgh8b0wwg1vhyq";
iosevka-ss13 = "0sgrxgss14ar104hc12zfim1pjs9nishmf4w8pyl0yjnxdmap9qq";
iosevka-ss14 = "176a3y0sk7fw93g8c7gwxsmiid3237k2mlff3qbm1nvcyxqnsxbi";
iosevka-ss15 = "1cb2g5aqxjbisyvy729sk70b169rvxcb0414nhrwa3jgcr807i31";
iosevka-ss16 = "12x58vdjchfyp0gak7r5wqfv1bc9scr0d76kmibscyrlc8ml50n0";
iosevka-ss17 = "1wh5vcch2wlbw9cg44lz8ic8d24r228p7kqjr11sapkcmaxd3dyk";
iosevka-ss18 = "1vzjad7r8h9k0qb744vbpqcm2l16s52sz53s1pq1jnqkhd3vmhx4";
sgr-iosevka = "1cd5na66986rjygvkq4b1nlk0f449z5dlz47wlifmqa503faqydd";
sgr-iosevka-aile = "1735ircj24xv8aajs6plfj9zfmvzjzhswwswjs8ccqc66dlgk47l";
sgr-iosevka-curly = "1jh9shgqldpqqmpapapagqsqlg3w3gldics9zabwnzbd6g9af8zx";
sgr-iosevka-curly-slab = "1cyn19c2wvh4mlpgc5zvizcxxlvz1x21ag73hcmn931czlcbxy74";
sgr-iosevka-etoile = "0kb7bfpj9cdbqmc9xbyq0hnw5sm66811sn330a7z0ypis6l0w2hi";
sgr-iosevka-fixed = "0lcdzlar9jgxqakb0j6ppwwdkyd4d8ih9dvav56frryikhdxyjxq";
sgr-iosevka-fixed-curly = "1rvb1yk1yy407pp4bp71zj60xyixxsji3igla8acwxhwv7rd5l66";
sgr-iosevka-fixed-curly-slab = "0kaifwrvy380i44p4v5h2cm9bpkdfkgdk961igc8v73yahlffyla";
sgr-iosevka-fixed-slab = "0nla5hma45ys56df9p2f0wr2zc2bg8448bdxif8ssybzm3mpgyqx";
sgr-iosevka-fixed-ss01 = "13g13jwdis724l1c9y7xbbvg9vik52pwfz4qvzmnxhj4wfvph0zy";
sgr-iosevka-fixed-ss02 = "08xwpi9nf4vcr3s6nq87sxsihrwdfn7325gdjbfp1pivy7r1bfzm";
sgr-iosevka-fixed-ss03 = "1gc6xhh388sdpqi1rdhr2kyq5j7z57vgn34fvfavs9l7m8qi5fa9";
sgr-iosevka-fixed-ss04 = "1bkbfqxkc2z0yvd5kcd5ldva4miz7bc2p29ld46cgb0c21k5wjf7";
sgr-iosevka-fixed-ss05 = "15bws3g53jzd15mhkj5dnkqqd5jqsq9ci9aiqvdd0q1vdcin28jk";
sgr-iosevka-fixed-ss06 = "098zqg3vdlkmfaq3aqp3il9im45dvpf3kxf8fqm0x110566vbgsm";
sgr-iosevka-fixed-ss07 = "0ba135blpvwwm07fp96lzi3c0wj6f3fglp5g0fivrblgy55qz0zg";
sgr-iosevka-fixed-ss08 = "0894yd8l1f9iymi27kv6wqp8c6s2hqvn60c860xp544vzm2w8xvc";
sgr-iosevka-fixed-ss09 = "133hw6xn4nx53s5hnlsx75c740w39kdfa04azidk2ar7sln4m1yr";
sgr-iosevka-fixed-ss10 = "0rlkjp9scawvii23fs9d5pcayarkrnl3pvr4naan2pc0cvcpl83f";
sgr-iosevka-fixed-ss11 = "07klrb1frrzwi10fc58ws8sykzjja1nnmifrl69489g23nm1dc19";
sgr-iosevka-fixed-ss12 = "0c22nc9pdmc0024im6xw6ims39qkd9zjd5kc0ndw4pq167w011pg";
sgr-iosevka-fixed-ss13 = "0lqa9q7y0hl1jwvhv5p7kbm03xgc1xba6ylhpg4yw2gsi2hkmw31";
sgr-iosevka-fixed-ss14 = "0i0jd33m0dwpyj1wylfa0pqay3qhlipxrlpshgrdjfq0kl8zik9l";
sgr-iosevka-fixed-ss15 = "0mp3qdd9042i4w2p9c2qrbzhw2rkdw49qcmmxhi0kl8nllfv9lpq";
sgr-iosevka-fixed-ss16 = "0c15z9m9kbb62d2kpmvsgxqpvcv1yhxwi70cln5s27w4i0nxggkj";
sgr-iosevka-fixed-ss17 = "17rdqagp7gxyyc2w0q0mjnbwd99v06750vb2ldcwcrq8pghyzr3v";
sgr-iosevka-fixed-ss18 = "0ghzg6p2ds3rs6nk484gssai9435k2p648l8070v1wj07llki4np";
sgr-iosevka-slab = "1ndnfnap3pkxfzw2sci7ds49fs2y43ck47xiww616kr8bj8xx852";
sgr-iosevka-ss01 = "1fvz4zhq4d3cv02y82pjrlmyvq8skvfp5l98walf62yjq2kqaak6";
sgr-iosevka-ss02 = "0xd67vvi07l8xfjq4pgz6n4xjslp60gdkh5hf9clc7z4y1q9649w";
sgr-iosevka-ss03 = "17nchy0izlpsi7vaqp9h3nffy0r4f3qh5gvsbxfrl0z5i23sfvif";
sgr-iosevka-ss04 = "0hpnfci9ddqxzylpl219bv4d9nbbcv5hiknddmdlrdry2ybz7yy3";
sgr-iosevka-ss05 = "1am0aqzzaqsajs8bk57rnc7r6j3qip6fcgqp4f3i3j6kfvmlvf3l";
sgr-iosevka-ss06 = "1jwmgxnhj7jninjzkn1vh557lcxxbpq6m6c0qh2wrlqan005q0xw";
sgr-iosevka-ss07 = "1ls5gbi4789fci20rsf1b4clqj703jzy5ffs78pl5rbxjfxgraqn";
sgr-iosevka-ss08 = "0c6ksaapnl21dnbmizihbgvkzqcww2bgfxm51sz3a0difgcwn9na";
sgr-iosevka-ss09 = "1ibpqi67f7rhg1jcpiy28cd4k4wrk542kd84ad10i64jb47lhwqq";
sgr-iosevka-ss10 = "13wq32l0gxc53hdbj3i8j1zkfm82g8a01xjpmh68hcllpmgr4yvd";
sgr-iosevka-ss11 = "1mbq0cykvybl487fzp79glbwsiwq1z4xk96992pqbv106nsqh9z9";
sgr-iosevka-ss12 = "1rggnmmgp33dpvbvlxkkvhlqx9arbwx3nrsxml9vjvf2c7875f3r";
sgr-iosevka-ss13 = "1nwqlqpqlvkq5h2l3kh04r8jadr4ar4n1w98hv1rd2pmhlh6izq8";
sgr-iosevka-ss14 = "1b3hlhy1lk8wi7ny9rkbb6my8sbc7k4ypc8hn62sc6a4spvfs14q";
sgr-iosevka-ss15 = "10b7rgff1jn4j3szrykljklisbmfs4lajii1h2lyx8vbwx1rahbp";
sgr-iosevka-ss16 = "0p4in5lwa3694lgz745fxsp85aypwgck6m7zgmc2dkjvvrhxxhm2";
sgr-iosevka-ss17 = "0j7088wnf2rvm0iad1kkkm3pryr2c4rh643mrllzr71dpbzvvxqn";
sgr-iosevka-ss18 = "1v8jrvjkakc2qks9yjwgg3b28gpgqv42d6k091a4nb8yn8ni7z1m";
sgr-iosevka-term = "1kwxp9a7ld9xvgf7zhims66yihlz03q6vmzz782xwx5j6rrrvh28";
sgr-iosevka-term-curly = "00ahf2lfrzpdplrjdgsjxfsfp40i5p79plxz7rz0dsvj6w3xivsg";
sgr-iosevka-term-curly-slab = "0vyya2p7c89ig2qmgsai45baj69hd5l9jfabnbz7bq78s0a7al9w";
sgr-iosevka-term-slab = "1fd2h5cnfla140fq8ydwygn156lyy3dyplkhmqvq8i1shgkj5z8i";
sgr-iosevka-term-ss01 = "0x19yg4w8v1i9r5l5n6azn8kqw89dmj9nv2gsxn3s603fd22yna5";
sgr-iosevka-term-ss02 = "19c5jz2an9azb1cgx9a9zhv976g3paklcyl8x7a5j9r2lxga75fm";
sgr-iosevka-term-ss03 = "0718n4x0q08v1m5sk498aw787i1m6fzrp93nqhlql61ym3l9bqvm";
sgr-iosevka-term-ss04 = "139614513mn6g3rs4dzp0wkdmwiv797w157xg66vcaxp03s2syl3";
sgr-iosevka-term-ss05 = "094zly2a5y36n152q8bgf00n9pad9qsbb2pniwh1hc3n5ydx9zgj";
sgr-iosevka-term-ss06 = "1z339061q3c8rj6j35y28qacpf630fd5xjam0lqi0vzxa6dx2x64";
sgr-iosevka-term-ss07 = "0g15gbihafa30sv2xysr96b99wxq7dfib5h72vfjhp8hrg5p92kc";
sgr-iosevka-term-ss08 = "17jyx4qb04s66klcw0zmnh55rdkskaifahd0v2xpf9gj5z0zbqvk";
sgr-iosevka-term-ss09 = "17i9wghxij2vn071hwj1zsn5pw0vgmgb7qay0fy5i6s87pjsnyi4";
sgr-iosevka-term-ss10 = "0kgmccymijlnamb4ag4gviyg21dm2si3m1p292lym3zw7f2m8is7";
sgr-iosevka-term-ss11 = "1lals7p4qbl4igsvy03vqfxwbapbqizwcgyk4fwj67padyv7xhca";
sgr-iosevka-term-ss12 = "181kgmmfllhwmz37gn28b84rffiac30d1dzgvm1hm8h9p5qrpj3q";
sgr-iosevka-term-ss13 = "1m5vaf22dq2a4hkfm47yy1mwm74sykmw450pxfi194s595kkxxqh";
sgr-iosevka-term-ss14 = "0gvxk2rsshcp35wg0vb4byrc9091lx1jq3nk4jypfrp97sz19nw7";
sgr-iosevka-term-ss15 = "1hbmpg4rdsm3fr3v2gvggmjqz80c6rwyjs30ql3bwzzc61cjp13f";
sgr-iosevka-term-ss16 = "078jcvzc2s490nbyzxa0vkvgws1a60s03xqws70yr5n8advf0px2";
sgr-iosevka-term-ss17 = "1yklfki4s1il1lgcax8q6sf8ivpqh40yvds97nsik412pyrncsnh";
sgr-iosevka-term-ss18 = "0qc2kwwl83z3czgfy3jsw1iri1gwxp1f14vz0dmdh2z9i349ayza";
iosevka = "1730pcbxkcyzfw22hgqsv45sybd79pdsm7vb4l2gm9pfzasypjra";
iosevka-aile = "1nm0s8zhmg5v181rik4d4nsygxrvfr9wdjwqz6gfl2dmg17r7cyi";
iosevka-curly = "0kmvj1zhf0xs02rdf2x1f3lnahj36dpc91p6k4mbji5mn9klb547";
iosevka-curly-slab = "0zklkypyh303gi5gqpdkwmj3g9m1f1xqda3ah232c3d6cfznbyqc";
iosevka-etoile = "1nj0p25pbjkzc1lg8fp45zxj6r3q4k5yc882rra3jkjmlw2h65b7";
iosevka-slab = "1vz9443swmxb27iqmimjyg3zs6q0pw7fpwiiaa7k1s7gc5xkyb5s";
iosevka-ss01 = "1g2xxl9x5apyhhm7lsbmplh19c5aln3jwryzqvrqxpnsngkqmp0h";
iosevka-ss02 = "1d2b8syvdx8i1dqw9k87yirkyg3wdvr7y2hy5c3nzj62sg7drfla";
iosevka-ss03 = "0b4y1v6kri4d56h6m58qqmc50bh4r4151h72n1a2q0a0nwkgvlwm";
iosevka-ss04 = "0fj7rj9xy9sfrzdhjqzv37v34lmkajz4d497i7lvdc2i0w4ia4gf";
iosevka-ss05 = "0xncnrf8d78iqf3731z0midw4rlza8hdji0m3gvxnigbq3cqxhwd";
iosevka-ss06 = "15vclj2m5brp1fnw82w5b53cwlwzzsr5hzxm6j2bj9bghc75cigm";
iosevka-ss07 = "1hs7c5n5pcgmspwrhdxv69dc0wdycfcdfs1mxwbamnal77c9q0s8";
iosevka-ss08 = "00fz1yb0g1rlzw3pxfpi88vh03k1q9nkzi8h6naqv0hngcbsz1ia";
iosevka-ss09 = "1ig5lqpk86z7mwr45gqvsdxs00g7b0mvx1i8q8hx5x4pyr36y7yh";
iosevka-ss10 = "12c50mh3xggz03lqqrkdcmdfvfq3m87x8xb9x0h8lwfslqaa0c0x";
iosevka-ss11 = "1qvdsfviif8wyms0bkzm7vx0gf8vx5gic3ghincv4ignx8hmrbm9";
iosevka-ss12 = "17qxrpmbrandlibhshycsgjlwspx7gz0x6mzhy1n8ccycrd7qlii";
iosevka-ss13 = "07nz5wf99j6m72vkrnbhpr4yhn3pdgb898dinzi4n5k0rmky03zb";
iosevka-ss14 = "1h9icwqz4qdzm99j17qxmrv1jvm3dzqrcghsffva9yvr32anc5y6";
iosevka-ss15 = "06362h12vy48ib338dw7vjxx6vqpfzcc47f54f23pp1b73ygrkxp";
iosevka-ss16 = "1sbby53vmjaq8h09a2izf4w5nha5knpgb0ljfyfd1wj1nnkdbisp";
iosevka-ss17 = "13l3dindp0x76c3ddx7ibjins65f6xpv8zy7dfjyil8kg2570lfq";
iosevka-ss18 = "1z0ypy19cj2hlg8qhvg0a54p0704f8szljf0lrrajprc8ws4cqy0";
sgr-iosevka = "0cl08cxidpvrjy2ifhjb4cgrcjsldv86ipx4i8wh2kvs632hkz42";
sgr-iosevka-aile = "01a7glrzrifwbfh05jynhmjd78cck4hw8aik3qf8pjr0lmyn8inz";
sgr-iosevka-curly = "1wl80fn6zk1dvhqnfwxc74i2f925yf362s45d1bshi3n2qd7ixv4";
sgr-iosevka-curly-slab = "18vvhkqhljnpv75v7cbw5z3d4xc418g0pgh39zyy1sdpq01h6ycj";
sgr-iosevka-etoile = "0g7brirxpb2s0a94vc00jk8d45wafcimkd1dkilhpc5h862d7y3d";
sgr-iosevka-fixed = "17g81448bjms88xph2h8cjfz2z2bhy4dc5ialy583zw9hafk0b6k";
sgr-iosevka-fixed-curly = "18kfz4bdp81ylwjikdyj00m58bb5ykaxnxv288d9qr9r0wav14bf";
sgr-iosevka-fixed-curly-slab = "1r1223m547ddpjrc0dpzkmkbw4851lvkc2g37yzd97i7g3da0q5g";
sgr-iosevka-fixed-slab = "006d1cznz5ikclpz6kli69h5jnsr50yd08za3m6k07npnj4g9i9h";
sgr-iosevka-fixed-ss01 = "0dxjmxvhq7dba7f4dcw2z85mgbx4qmy3w1nz99kbn729pjv3xbnr";
sgr-iosevka-fixed-ss02 = "1ljq7dxj7dfg8bwmljykbl0lgkw4q9v5h41mflrvxhxkgblghji9";
sgr-iosevka-fixed-ss03 = "14q5wi4af1mnm6g895zgpmf1qcnadv0mpiyydcizayqxnc015xr0";
sgr-iosevka-fixed-ss04 = "0szy07dlv9ag7jqahlgyi9wgwpas73rg2vw74jg63fx06svwyx7z";
sgr-iosevka-fixed-ss05 = "1bm6mqal8jni9za27dmbq9pdqs9j3x58w0cnzx7ma3gyaypfi5jc";
sgr-iosevka-fixed-ss06 = "08a6mzrbx7wl4z147kv3289fbaccd7cs0r1gp3dnkkypsy4cw907";
sgr-iosevka-fixed-ss07 = "05l0i4mblgx2zqfp5qvpwqp9671mkfj60i4pg0kznwd13j0ya8qs";
sgr-iosevka-fixed-ss08 = "15ils79jpa1kibyh3ih5dkjk0qi0ppsy9iibyyl301c4vyhgypzb";
sgr-iosevka-fixed-ss09 = "1s2m349m7560zz10r0w0nmgixxzn0ys4j8jwy3c1zxzphdq60a10";
sgr-iosevka-fixed-ss10 = "1iby1afylism23cn70x0bb2qi8mdkf0ysgnmagdr47cgh6n8kgmy";
sgr-iosevka-fixed-ss11 = "10zn26ijrdj2s0fzc1d1kyi0rpy6qw1bbp6qwf1x1mbhapj0mc8a";
sgr-iosevka-fixed-ss12 = "1vdxn5qr1h192c1czxifvr4f2mv1jhkb20m5n3wgawyf75p7blcy";
sgr-iosevka-fixed-ss13 = "1fdki2kf6xy2mvxnna1m77xgk5hm88i1g5ds8dzr6gc5mkm5mw8m";
sgr-iosevka-fixed-ss14 = "1gaycm1zzm2qnriy76xnyy74rk9ccs54q71br2m55jlr4ifglanv";
sgr-iosevka-fixed-ss15 = "07b9ss5a2vk4gndwc6zw8qwa4wgsrfnfq9cbrx9zlzj08143q9dr";
sgr-iosevka-fixed-ss16 = "156yh0hbqqklhpf7czblk43nmq3cw0akgiy4z7jq0904b96v68zs";
sgr-iosevka-fixed-ss17 = "0wj8j09wvf7m7m1ss47bqf6s0nvrn3vlzdhgnmzwc2jc4rkrvjpa";
sgr-iosevka-fixed-ss18 = "0zsy2ql3r0419h6ganfdfhmwzn7lprypw26bq7iqzvld03vss45c";
sgr-iosevka-slab = "10al24w3lglgdz9v86yx6q58mx4qyrxr8kffl0qvjiqvdcyyp460";
sgr-iosevka-ss01 = "0ipwpjwg14wijzx0qb0zni8rzvw6wwfbwzqv8pzf2dmm6iwnmnqc";
sgr-iosevka-ss02 = "0nfbw5smfarglma3cddzw397rjh72qjxqhz3g28l0sj26gk2bwma";
sgr-iosevka-ss03 = "0cdvb5igir3c216niq3i0hbjvff1y9bnzf6fwny17303vjvfqg41";
sgr-iosevka-ss04 = "0sj62id2ljwsms8xv17j474pdr881r6z8kb7a26gv48p08r225fq";
sgr-iosevka-ss05 = "13pxfc2s2vxxkqp4jvzam6bx7ywn350phs5xhlzmcdk4sjgml9i2";
sgr-iosevka-ss06 = "0xscng0a90vlr621pnl3hxpn2la862rgcx7xy8d1i6k47wpp1zbj";
sgr-iosevka-ss07 = "0yj11jc8fzw9l2316y90mdj7hsqd46y5i1rckxlvih5nv300x1cp";
sgr-iosevka-ss08 = "15jn1xjafawd5b4y2z4fkbaf22fgbvc861m3sjx4hib5vqjn41p3";
sgr-iosevka-ss09 = "0kffxk8kr5giisfc10a5h889azgkqs4q9f0gggv8xlml4afdycd0";
sgr-iosevka-ss10 = "1ldwpx2ysx0v79qfzhcqcc2cwylwnr6x81fy2yqqnv2319v1xrky";
sgr-iosevka-ss11 = "1rd98yvky9wxgxcp4ps9p1k4ll8hnh9g9vgwf1r0bjlykhv7dhmf";
sgr-iosevka-ss12 = "0439fg1pvxnv96v77rzrn0sbzna962ixgn8bx4ykpx0wkrigmyrk";
sgr-iosevka-ss13 = "0qzbf4milkijhmxfkv3al2w5s2aa0a0aqqqxbv2wgza7g3i2glgv";
sgr-iosevka-ss14 = "0vk8s71lyrdgngdbaasimdg0a5ygckciy7wxkkbixvxh18vi3mfr";
sgr-iosevka-ss15 = "0c5sai8zbciwpkwrfliakf8091n5zcj7bilkbhzljpgfhalxg43v";
sgr-iosevka-ss16 = "0a8q3ns3chw6kg77fxc03njlbr4slnq83381lwznhnsziyk7jb6r";
sgr-iosevka-ss17 = "0bbfq7fjbr718fnmfy4nl7m9n7sjnra89chig9am7571ws66wbxc";
sgr-iosevka-ss18 = "16sj1g5i75hfd07ghsm6zb655mypgwagxzpz5sk22dkrilxwrdix";
sgr-iosevka-term = "1ncr05mprm8bar8v9saqsklgm36mymzhzw5x1viz04757s89cqnc";
sgr-iosevka-term-curly = "0vwi4ccz0fnd7a3adfxffar5qxfzkx4pz23208kzc5zjidl9s9ka";
sgr-iosevka-term-curly-slab = "0dwjcj8d4am5kqw35w68hm3qnxyk9w5k44z2n1mf9gsj411layi8";
sgr-iosevka-term-slab = "1i7gp1lirdzzcmcv5lcrdf2mb2l9v3kjx1yhhdydfpapq85q5wma";
sgr-iosevka-term-ss01 = "0zjx0r7sznzdw1diy88p6bkdki0ihqilvksil6qccbg4fn9f2swm";
sgr-iosevka-term-ss02 = "1ma8366h42n5ij2czhkhmfyzmv23hmn165ihjxmwkxhg0c58l4jl";
sgr-iosevka-term-ss03 = "0n23fy0ks0pid1m8z5vl9j7g607nl70h7bxfn015lryl7v8yj2dm";
sgr-iosevka-term-ss04 = "1a7llxzf4cs9jr7ldnhxdc7r2jviaffq2kvhkj3spqan9bk6ymcx";
sgr-iosevka-term-ss05 = "1d3sp99f6gycbmxk6z0raa7gk0is0m7bc7dqb4dy6zikra35kv4x";
sgr-iosevka-term-ss06 = "1vjc785rzzrcbdbcp5j2dljk9flv9inmcjswyf7fyacn4ghszap6";
sgr-iosevka-term-ss07 = "03pjbr7bp1av2pav1x913j1h18b4nhxvr7k62dg68b019rj1pvfg";
sgr-iosevka-term-ss08 = "1b9qvkb4zpvwfygvh7i6b6dcwk8jk0y1kg078ma4vlpfag9ay4xb";
sgr-iosevka-term-ss09 = "0zcg1b1j7113qp5q81s5dx34n1h3lmrshrx8xkvy6kn1n48b17b8";
sgr-iosevka-term-ss10 = "1nrciywy8fr8x716w087pyyw0vkyd60j3lmxc7ixsr9yl3ff9bb0";
sgr-iosevka-term-ss11 = "1k4xsl9x6195ap2zg0xxrla4svvzxhwas6xf0dbh7k2baiwyknb3";
sgr-iosevka-term-ss12 = "16h0i0vj98l0l6hfyjsq4qy8mxkz5p8xpqxnpd56wxm7mnl2b7i9";
sgr-iosevka-term-ss13 = "1i907injbdamdyfd1ydzdjsygn0b3syab0ahas7xmd438rfkcfj6";
sgr-iosevka-term-ss14 = "1ypx059ws3pdhkn6lsc4cai4qhm8gzm9chmrsiqk2978yaf2z06c";
sgr-iosevka-term-ss15 = "1nqbslx44ikj4wd3h1ycqsbk6sk72zz2n49pkn9r3khp9wwz7qwn";
sgr-iosevka-term-ss16 = "1lpmph22gqzn3zf9zsr5hzb59573xkiz7yq9pfqg5bxnx248byr9";
sgr-iosevka-term-ss17 = "02d3vs46cg4nbak1y64cw5jlhzgxmlxxkhlz3jzf5wzzb9kli4iv";
sgr-iosevka-term-ss18 = "1z580s3icbzpivp766cqdc3j8ijgpp5f2yz9a4g4hpz3isa1lpy6";
}

4
pkgs/development/libraries/nco/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
version = "4.9.8";
version = "5.0.1";
pname = "nco";
nativeBuildInputs = [ flex which antlr2 ];
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
sha256 = "sha256-fOdmM0I/UGhxacofEBfw9UmOOrMDUXs59ca8uvkQKqw=";
sha256 = "sha256-Mdnko+0ZuMoKgBp//+rCVsbFJx90Tmrnal7FAmwIKEQ=";
};
prePatch = ''

4
pkgs/development/libraries/reproc/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "reproc";
version = "14.2.2";
version = "14.2.3";
src = fetchFromGitHub {
owner = "DaanDeMeyer";
repo = "reproc";
rev = "v${version}";
sha256 = "sha256-QOQcNDQkG929cEchIZ+XzjRncUUB10DpdB4zqgPqv4A=";
sha256 = "sha256-bdZ7czkeoSl5znGit0AYQ9D4K8qE2Co+F2Z4jLJuQok=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/rocksdb/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
version = "6.23.2";
version = "6.23.3";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "0ivdcc012c35f2wcc5qzic2jlrwp4whyz5sbz1nyfyrnv0xf5djw";
sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk=";
};
nativeBuildInputs = [ cmake ninja ];

4
pkgs/development/libraries/trompeloeil/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "trompeloeil";
version = "40";
version = "41";
src = fetchFromGitHub {
owner = "rollbear";
repo = "trompeloeil";
rev = "v${version}";
sha256 = "sha256-q0iMM3Hb5Y21RUhhxFEd/q4OCJFJ12gozZd5jCDscro=";
sha256 = "sha256-NsWRN520K4FLp+8W83bXT6pgQEADYFnWiB6gy3MjsWY=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/python-modules/dash-core-components/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_core_components";
version = "1.16.0";
version = "1.17.1";
src = fetchPypi {
inherit pname version;
sha256 = "e8cdfaf3580577670bb2d1c3168efa06f5a7b439fbe5527cfaefa3e32394542f";
sha256 = "sha256-flA/Xt22MDTdIMI9IYzA2KgeyI6aFbfLxg4maw4rYKk=";
};
# No tests in archive

4
pkgs/development/python-modules/dash-html-components/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_html_components";
version = "1.1.3";
version = "1.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "88adb77a674d5d7d0835d71c469f6e7b4aa692f9673808a474d244b71863c58a";
sha256 = "dc4f423e13716d179d51a42b3c7e2a2ed02e05185c742f88214b58d59e24bbd4";
};
# No tests in archive

4
pkgs/development/python-modules/dash-table/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_table";
version = "4.11.3";
version = "4.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "0a4f22a5cf5120882a252a3348fc15ef45a1b75bf900934783e338aceac52f56";
sha256 = "sha256-TJlomoh7/QNSeLFOzV23BwYCM4nlNzXV48zMQW+s2+Q=";
};
# No tests in archive

4
pkgs/development/python-modules/dash/default.nix
View File

@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "dash";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "plotly";
repo = pname;
rev = "v${version}";
sha256 = "1205xwi0w33g3c8gcba50fjj38dzgn7nhfk5w186kd6dwmvz02yg";
sha256 = "sha256-X2yRlW6aXgRgKgRxLNBUHjkjMaw7K4iydzpWLBNt+Y8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/django-jinja2/default.nix
View File

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "django-jinja";
version = "2.8.0";
version = "2.9.0";
meta = {
description = "Simple and nonobstructive jinja2 integration with Django";
@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "bba30a7ea4394bccfaa9bc8620996c25ede446ab06104b51b3a16fe81232cbf2";
sha256 = "69433ea312264a541acf1e3e9748e44783ad33381e48e6a7230762e02f005276";
};
buildInputs = [ django pytz tox ];

4
pkgs/development/python-modules/gpsoauth/default.nix
View File

@ -16,12 +16,12 @@
}:
buildPythonPackage rec {
version = "0.4.3";
version = "1.0.0";
pname = "gpsoauth";
src = fetchPypi {
inherit pname version;
sha256 = "b38f654450ec55f130c9414d457355d78030a2c29c5ad8f20b28304a9fc8fad7";
sha256 = "1c4d6a980625b8ab6f6f1cf3e30d9b10a6c61ababb2b60bfe4870649e9c82be0";
};
propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ];

4
pkgs/development/python-modules/gspread/default.nix
View File

@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
version = "3.7.0";
version = "4.0.1";
pname = "gspread";
src = fetchPypi {
inherit pname version;
sha256 = "4bda4ab8c5edb9e41cf4ae40d4d5fb30447522b4e43608e05c01351ab1b96912";
sha256 = "236a0f24e3724b49bae4cbd5144ed036b0ae6feaf5828ad033eb2824bf05e5be";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];

4
pkgs/development/tools/aws-sam-cli/default.nix
View File

@ -44,8 +44,8 @@ python3.pkgs.buildPythonApplication rec {
--replace "Flask~=1.1.2" "Flask~=2.0" \
--replace "dateparser~=0.7" "dateparser>=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "requests==2.23.0" "requests~=2.24" \
--replace "watchdog==0.10.3" "watchdog"
--replace "requests==" "requests~=" \
--replace "watchdog==" "watchdog #"
'';
meta = with lib; {

2
pkgs/development/tools/build-managers/scons/default.nix
View File

@ -8,7 +8,7 @@ in {
scons_3_0_1 = (mkScons {
version = "3.0.1";
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
}).override { python = python3; };
}).override { python = python2; };
scons_3_1_2 = (mkScons {
version = "3.1.2";
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";

6
pkgs/development/tools/gopls/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gopls";
version = "0.7.0";
version = "0.7.1";
src = fetchgit {
rev = "gopls/v${version}";
url = "https://go.googlesource.com/tools";
sha256 = "0vylrsmpszij23yngk7mfysp8rjbf29nyskbrwwysf63r9xbrwbi";
sha256 = "0cq8mangcc1fz1ii7v4smxbpzynhwy6gvl80n5hvhjpgkp0k4fsm";
};
modRoot = "gopls";
vendorSha256 = "1mnc84nvl7zhl4pzf90cd0gvid9g1jph6hcxk6lrlnfk2j2m75mj";
vendorSha256 = "1mzn1nn3l080lch0yhh4g2sq02g95v14nha8k3d373vwvwg45igs";
doCheck = false;

4
pkgs/development/tools/java/visualvm/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
stdenv.mkDerivation rec {
version = "2.0.7";
version = "2.1";
pname = "visualvm";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
sha256 = "sha256-IbiyrP3rIj3VToav1bhKnje0scEPSyLwsyclpW7nB+U=";
sha256 = "sha256-faKBYwyBGrMjNMO/0XzQIG+XI1p783p26Bpoj+mSY7s=";
};
desktopItem = makeDesktopItem {

6
pkgs/development/tools/kustomize/kustomize-sops.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kustomize-sops";
version = "2.5.7";
version = "2.6.0";
src = fetchFromGitHub {
owner = "viaduct-ai";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CtVFCpj6YZUAjeyRAPOkbd30Js1PSmzapB12SwKZisc=";
sha256 = "sha256-3dSWIDPIT4crsJuaB1TDfrUzobn8RfRlFAhqMXzZbKI=";
};
vendorSha256 = "sha256-kNJkSivSj8LMeXobKazLy9MCTtWzrBn99GmvaH+qIUU=";
vendorSha256 = "sha256-+MVViFwaApGZZxCyTwLzIEWTZDbr7WSx7e/yGbJ309Y=";
installPhase = ''
mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/

4
pkgs/development/tools/misc/circleci-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.15801";
version = "0.1.15824";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nKmBTXeSA7fOIUeCH4uR+x6ldfqBG9OhFbU+XSuBaKE=";
sha256 = "sha256-bTRtzjIm5NI89O09hMyiDVL4skkfg1C8/92IEDaIAak=";
};
vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ=";

2
pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml ncurses ];
phases = "unpackPhase patchPhase buildPhase";
dontInstall = true;
buildPhase = ''
make bootstrap
make PREFIX=$out all

4
pkgs/development/tools/react-native-debugger/default.nix
View File

@ -38,10 +38,10 @@ let
];
in stdenv.mkDerivation rec {
pname = "react-native-debugger";
version = "0.11.7";
version = "0.12.1";
src = fetchurl {
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA=";
sha256 = "sha256-DzDZmZn45gpZb/fkSssb0PtR7EVyBk44IjC57beg0RM=";
};
nativeBuildInputs = [ unzip ];

4
pkgs/development/tools/renderizer/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "renderizer";
version = "2.0.12";
version = "2.0.13";
src = fetchFromGitHub {
owner = "gomatic";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ji+wTTXLp17EYRIjUiVgd33ZeBdT8K2O8R2Ejq2Ll5I=";
sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A=";
};
buildFlagsArray = [

4
pkgs/development/tools/sd-local/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "sd-local";
version = "1.0.31";
version = "1.0.32";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2EhXhgSm6rCCXNBCf0BH+MzHeU7n/XAXYXosCjRGEbo=";
sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA=";
};
vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI=";

4
pkgs/development/tools/ytt/default.nix
View File

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ytt";
version = "0.31.0";
version = "0.36.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-ytt";
rev = "v${version}";
sha256 = "sha256-GXnhI8nd4ciFd22989ypqGy5pozKJm+dzg8MaDDvuZg=";
sha256 = "sha256-/o+SgH0wpQQokzpnlK6Im6K9U3Aax3GHe7IPmVg2etk=";
};
vendorSha256 = null;

4
pkgs/development/web/flyctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.231";
version = "0.0.232";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-XBF1VVbVxShUL0BNYhM12or9GaHR0JF1pe6JflXtItw=";
sha256 = "sha256-VpHHkcN7VTMLBFMOTJcO6b2JIOZVcubJDKN04xXQIzA=";
};
preBuild = ''

6
pkgs/development/web/minify/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minify";
version = "2.7.4";
version = "2.9.21";
src = fetchFromGitHub {
owner = "tdewolff";
repo = pname;
rev = "v${version}";
sha256 = "06xzb681g4lfrpqa1rhpq5mm83vpik8qp6gjxqm2n21bfph88jm2";
sha256 = "sha256-cHoQtvxofMet7j/PDKlFoVB9Qo5EMWcXqAwhqR4vNko=";
};
vendorSha256 = "120d3nzk8cr5496cxp5p6ydlzw9mmpg7dllqhv1kpgwlbxmd8vr3";
vendorSha256 = "sha256-awlrjXXX9PWs4dt78yK4qNE1wCaA+tGL45tHQxxby8c=";
doCheck = false;

4
pkgs/games/ultimatestunts/default.nix
View File

@ -3,10 +3,10 @@ pkg-config}:
stdenv.mkDerivation rec {
pname = "ultimate-stunts";
version = "0.7.6.1";
version = "0.7.7.1";
src = fetchurl {
url = "mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-${lib.replaceStrings ["."] [""] version}.tar.gz";
sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv";
sha256 = "sha256-/MBuSi/yxcG9k3ZwrNsHkUDzzg798AV462VZog67JtM=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/games/vassal/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "VASSAL";
version = "3.5.3";
version = "3.5.8";
src = fetchzip {
url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
sha256 = "sha256-r48k4Un623uYsYcdF5UAH6w/uIdgWz8WQ75BiwrApkA=";
sha256 = "sha256-IJ3p7+0fs/2dCbE1BOb2580upR9W/1R2/e3xmkAsJ+M=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/misc/emulators/sameboy/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sameboy";
version = "0.14.2";
version = "0.14.5";
src = fetchFromGitHub {
owner = "LIJI32";
repo = "SameBoy";
rev = "v${version}";
sha256 = "sha256-VGyB0Em9VFU1Z1K2XfbS9wGs6gZ8/eH/FiaFAKnFdaA=";
sha256 = "sha256-o2aH9rfga4f4yrf6r01wnrC0foYtD5EwdKFUPf2KGWM=";
};
enableParallelBuilding = true;

6
pkgs/misc/emulators/wine/sources.nix
View File

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.14";
version = "6.15";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-ZLRxk5lDvAjjUQJ9tvvCRlwTllCjv/65Flf/DujCUgI=";
sha256 = "sha256-Yf1lo2WDKmK656eEKScMB2+yop8cf0YlldHzVDZRd5s=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
@ -65,7 +65,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-yzpRWNx/e3BDCh1dyf8VdjLgvu6yZ/CXre/cb1roaVs=";
sha256 = "sha256-zT77xmc2gD8xNSk19OPYVJB6nZmh+g6TYRhVW674RFI=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

4
pkgs/os-specific/linux/uclibc/default.nix
View File

@ -48,7 +48,7 @@ let
UCLIBC_HAS_FPU n
'';
version = "1.0.37";
version = "1.0.38";
in
stdenv.mkDerivation {
@ -58,7 +58,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2";
# from "${url}.sha256";
sha256 = "sha256-wThkkRBA42CskGC8kUlgmxk88Qy2Z8qRfLqD6kP8JY0=";
sha256 = "sha256-7wexvOOfDpIsM3XcdhHxESz7GsOW+ZkiA0dfiN5rHrU=";
};
# 'ftw' needed to build acl, a coreutils dependency

4
pkgs/os-specific/linux/usbutils/default.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }:
stdenv.mkDerivation rec {
name = "usbutils-013";
name = "usbutils-014";
src = fetchurl {
url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy";
sha256 = "sha256-Ogec+tYFYCJ7ZxkkgteBO/ljJvy7ZsBCVIOXFfJ2/Gk=";
};
patches = [

4
pkgs/servers/jackett/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
version = "0.18.537";
version = "0.18.545";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "sha256-BJIyw2xjJK6lQbpVrH9pL5EasN6tvTdOsQyxYq7C9O8=";
sha256 = "sha256-aHb7bhqagf60YkzL5II/mGPeUibH655QH8Qx3+EqWjY=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/servers/libreddit/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "libreddit";
version = "0.14.9";
version = "0.14.14";
src = fetchFromGitHub {
owner = "spikecodes";
repo = pname;
rev = "v${version}";
sha256 = "1z3qhlf0i4s3jqh0dml75912sikdvv2hxclai4my6wryk78v6099";
sha256 = "sha256-duirX+X8moByV1urdgXjzTQ2zOfCfz7etzjDxkSKvhk=";
};
cargoSha256 = "0qdxhj9i3rhhnyla2glb2b45c51kyam8qg0038banwz9nw86jdjf";
cargoSha256 = "sha256-pFCERBnN386rW8ajpLWUHteCTWRmEiR19Sp5d8HXc5Y=";
buildInputs = lib.optional stdenv.isDarwin Security;

6
pkgs/servers/maddy/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "maddy";
version = "0.4.4";
version = "0.5.0";
src = fetchFromGitHub {
owner = "foxcpp";
repo = "maddy";
rev = "v${version}";
sha256 = "sha256-IhVEb6tjfbWqhQdw1UYxy4I8my2L+eSOCd/BEz0qis0=";
sha256 = "sha256-SxJfuNZBtwaILF4zD4hrTANc/GlOG53XVwg3NvKYAkg=";
};
vendorSha256 = "sha256-FrKWlZ3pQB+oo+rfHA8AgGRAr7YRUcb064bZGTDSKkk=";
vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4=";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ];

4
pkgs/servers/matterbridge/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "matterbridge";
version = "1.22.2";
version = "1.22.3";
src = fetchFromGitHub {
owner = "42wim";
repo = pname;
rev = "v${version}";
sha256 = "sha256-H6Cy6yvX57QLNfZPeansZv6IJ4uQVqr0h24QsAlrLx8=";
sha256 = "sha256-YBIDNyjS8Si7A2Bciz5M8jY3JrgKOmlDPT0m5QM/9+Y=";
};
vendorSha256 = null;

4
pkgs/servers/mattermost/matterircd.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "matterircd";
version = "0.23.1";
version = "0.24.2";
src = fetchFromGitHub {
owner = "42wim";
repo = "matterircd";
rev = "v${version}";
sha256 = "sha256-1oItl0mLyAFah9qaaYl+IAT/H4X+GW82GBHYuLWacVI=";
sha256 = "sha256-SatnrRKYCngBZJwRNMad9Vt2xd7FktH79t3TB83cwhg=";
};
goPackagePath = "github.com/42wim/matterircd";

4
pkgs/servers/misc/navidrome/default.nix
View File

@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "navidrome";
version = "0.43.0";
version = "0.44.1";
src = fetchurl {
url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
sha256 = "0y7a5n8phffxga1bjkaf7x5ijripqg1nfjljkrrj26778550vqb5";
sha256 = "sha256-2lnj6aNLPeLwxgyRUQFOQJDsOSMu9Banez8RMMQs74Y=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/servers/sql/dolt/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
version = "0.27.3";
version = "0.27.4";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-zqLGvbvl21KNBbESbp9gA8iA1Y6MXwqz3HBZlOYYdIo=";
sha256 = "sha256-q3zs402E3mqvxAuf/ll/ao9/c9NOWR7uYJMbieFXS1U=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
vendorSha256 = "sha256-JVDYSPLemJRD1Gb6rZJdI/0Z5f1a+0TkP1b0IZe/Ns0=";
vendorSha256 = "sha256-zF7pofbYrVzEiW6zttyePuEWueqKRKclc0WrYwb1bCU=";
doCheck = false;

6
pkgs/servers/unpackerr/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "unpackerr";
version = "0.9.6";
version = "0.9.7";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "1jyqrfik6fy7d4lr1y0ryp4iz8yn898ksyxwaryvrhykznqivp0y";
sha256 = "sha256-OJDFPSXbJffiKW1SmMptPxj69YU7cuOU1LgIiInurCM=";
};
vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z";
vendorSha256 = "sha256-n8gRefr+MyiSaATG1mZrS3lx4oDEfbQ1LQxQ6vp5l0Y=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];

13
pkgs/servers/web-apps/discourse/auto_generated_path.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 380a63e987..b2ce7fa982 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -403,7 +403,7 @@ class Plugin::Instance
end
def auto_generated_path
- File.dirname(path) << "/auto_generated"
+ "#{Rails.root}/public/assets/auto_generated_plugin_assets/#{name}"
end
def after_initialize(&block)

39
pkgs/servers/web-apps/discourse/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, runCommand, lib, nixosTests, writeShellScript
{ stdenv, pkgs, makeWrapper, runCommand, lib, writeShellScript
, fetchFromGitHub, bundlerEnv, callPackage
, ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk
@ -6,16 +6,16 @@
, redis, postgresql, which, brotli, procps, rsync, nodePackages, v8
, plugins ? []
}:
}@args:
let
version = "2.7.5";
version = "2.7.7";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-OykWaiBAHcZy41i+aRzBHCRgwnfQUBijHjb+ofIk25M=";
sha256 = "sha256-rhcTQyirgPX0ITjgotJAYLLSU957GanxAYYhy9j123U=";
};
runtimeDeps = [
@ -55,6 +55,7 @@ let
, version ? null
, meta ? null
, bundlerEnvArgs ? {}
, preserveGemsDir ? false
, src
, ...
}@args:
@ -71,11 +72,20 @@ let
runHook preInstall
mkdir -p $out
cp -r * $out/
'' + lib.optionalString (bundlerEnvArgs != {}) ''
ln -sf ${rubyEnv}/lib/ruby/gems $out/gems
'' + ''
'' + lib.optionalString (bundlerEnvArgs != {}) (
if preserveGemsDir then ''
cp -r ${rubyEnv}/lib/ruby/gems/* $out/gems/
''
else ''
if [[ -e $out/gems ]]; then
echo "Warning: The repo contains a 'gems' directory which will be removed!"
echo " If you need to preserve it, set 'preserveGemsDir = true'."
rm -r $out/gems
fi
ln -sf ${rubyEnv}/lib/ruby/gems $out/gems
'' + ''
runHook postInstall
'';
'');
});
rake = runCommand "discourse-rake" {
@ -158,6 +168,11 @@ let
# Use the Ruby API version in the plugin gem path, to match the
# one constructed by bundlerEnv
./plugin_gem_api_version.patch
# Change the path to the auto generated plugin assets, which
# defaults to the plugin's directory and isn't writable at the
# time of asset generation
./auto_generated_path.patch
];
# We have to set up an environment that is close enough to
@ -244,6 +259,11 @@ let
# Use mv instead of rename, since rename doesn't work across
# device boundaries
./use_mv_instead_of_rename.patch
# Change the path to the auto generated plugin assets, which
# defaults to the plugin's directory and isn't writable at the
# time of asset generation
./auto_generated_path.patch
];
postPatch = ''
@ -274,7 +294,6 @@ let
ln -sf /run/discourse/config $out/share/discourse/config
ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins
ln -sf /run/discourse/public $out/share/discourse/public
ln -sf /run/discourse/plugins $out/share/discourse/plugins
ln -sf ${assets} $out/share/discourse/public.dist/assets
${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} $out/share/discourse/plugins/${p.pluginName or ""}") plugins}
@ -294,7 +313,7 @@ let
enabledPlugins = plugins;
plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; };
ruby = rubyEnv.wrappedRuby;
tests = nixosTests.discourse;
tests = import ../../../../nixos/tests/discourse.nix { package = pkgs.discourse.override args; };
};
};
in discourse

3
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile
View File

@ -2,4 +2,7 @@
source "https://rubygems.org"
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
# gem "rails"
gem 'rrule', '0.4.2', require: false

2
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
View File

@ -18,7 +18,7 @@ GEM
zeitwerk (2.4.2)
PLATFORMS
x86_64-linux
ruby
DEPENDENCIES
rrule (= 0.4.2)

4
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-calendar";
rev = "567712d8c02640574fbab081eb54b2f26349c88d";
sha256 = "sha256-r6rfbi/ScbM+SiAjeijXmr5R9wpJxzxGl52X5oV++5w=";
rev = "519cf403ae3003291de20145aca243e2ffbcb4a2";
sha256 = "0398cf7k03i7j7v5w1mysjzk2npbkvr7icj5sjwa8i8xzg34gck4";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-calendar";

4
pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-canned-replies";
rev = "e3f1de8928df5955b64994079b7e2073556e5456";
sha256 = "1g4fazm6cn6hbfd08mq2zhc6dgm4qj1r1f1amhbgxhk6qsxf42cd";
rev = "672a96a8160d3767cf5fd6647309c7b5dcf8a55d";
sha256 = "105zgpc7j3xmlkaz3cgxw1rfgy5d3dzln58ix569jmzifbsijml7";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-canned-replies";

4
pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-data-explorer";
rev = "7a348aaa8b2a6b3a75db72e99a7370a1a6fcb2b8";
sha256 = "sha256-4X0oor3dIKrQO5IrScQ9+DBr39R7PJJ8dg9UQseV6IU=";
rev = "23287ece952cb45203819e7b470ebc194c58cb13";
sha256 = "1vc2072r72fkvcfpy6vpn9x4gl9lpjk29pnj8095xs22im8j5in1";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-data-explorer";

10
pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
View File

@ -3,7 +3,7 @@ GEM
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
faraday (1.5.0)
faraday (1.7.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@ -11,6 +11,7 @@ GEM
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
@ -18,20 +19,21 @@ GEM
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
multipart-post (2.1.1)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
public_suffix (4.0.6)
ruby2_keywords (0.0.4)
ruby2_keywords (0.0.5)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
PLATFORMS
x86_64-linux
ruby
DEPENDENCIES
octokit (= 4.21.0)

4
pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-github";
rev = "154fd5ea597640c2259ce489b4ce75b48ac1973c";
sha256 = "0wb5p219z42rc035rnh2iwrbsj000nxa9shbmc325rzcg6xlhdhw";
rev = "b6ad8e39a13e2ad5c6943ea697ca23f2c5f9fec1";
sha256 = "0vxwp4kbf44clcqilb8ni0ykk4jrgiv4rbd05pgfvndcp3izm2i6";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-github";

24
pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
View File

@ -11,15 +11,15 @@
version = "2.8.0";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"];
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah";
sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb";
type = "gem";
};
version = "1.5.0";
version = "1.7.0";
};
faraday-em_http = {
groups = ["default"];
@ -76,10 +76,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka";
sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
type = "gem";
};
version = "1.1.0";
version = "1.2.0";
};
faraday-patron = {
groups = ["default"];
@ -91,6 +91,16 @@
};
version = "1.0.0";
};
faraday-rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
type = "gem";
};
version = "1.0.0";
};
multipart-post = {
groups = ["default"];
platforms = [];
@ -127,10 +137,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "0.0.4";
version = "0.0.5";
};
sawyer = {
dependencies = ["addressable" "faraday"];

4
pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-solved";
rev = "b96374bf4ab7e6d5cecb0761918b060a524eb9bf";
sha256 = "0zrv70p0wz93akpcj6gpwjkw7az3iz9bx4n2z630kyrlmxdbj32a";
rev = "8bf54370200fe9d94541f69339430a7dc1019d62";
sha256 = "1sk91h4dilkxm1wpv8zw59wgw860ywwlcgiw2kd23ybdk9n7b3lh";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-solved";

74
pkgs/servers/web-apps/discourse/update.py
View File

@ -12,6 +12,7 @@ import os
import stat
import json
import requests
import textwrap
from distutils.version import LooseVersion
from pathlib import Path
from typing import Iterable
@ -77,7 +78,11 @@ def _call_nix_update(pkg, version):
def _nix_eval(expr: str):
nixpkgs_path = Path(__file__).parent / '../../../../'
return json.loads(subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True))
try:
output = subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)
except subprocess.CalledProcessError:
return None
return json.loads(output)
def _get_current_package_version(pkg: str):
@ -111,6 +116,18 @@ def _diff_file(filepath: str, old_version: str, new_version: str):
return
def _remove_platforms(rubyenv_dir: Path):
for platform in ['arm64-darwin-20', 'x86_64-darwin-18',
'x86_64-darwin-19', 'x86_64-darwin-20',
'x86_64-linux']:
with open(rubyenv_dir / 'Gemfile.lock', 'r') as f:
for line in f:
if platform in line:
subprocess.check_output(
['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir)
break
@click_log.simple_verbosity_option(logger)
@ -173,10 +190,7 @@ def update(rev):
f.write(repo.get_file(fn, rev))
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
for platform in ['arm64-darwin-20', 'x86_64-darwin-18',
'x86_64-darwin-19', 'x86_64-darwin-20',
'x86_64-linux']:
subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir)
_remove_platforms(rubyenv_dir)
subprocess.check_output(['bundix'], cwd=rubyenv_dir)
_call_nix_update('discourse', repo.rev2version(rev))
@ -206,13 +220,59 @@ def update_plugins():
repo_name = plugin.get('repo_name') or name
repo = DiscourseRepo(owner=owner, repo=repo_name)
filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')
if filename is None:
filename = Path(__file__).parent / 'plugins' / name / 'default.nix'
filename.parent.mkdir()
has_ruby_deps = False
for line in repo.get_file('plugin.rb', repo.latest_commit_sha).splitlines():
if 'gem ' in line:
has_ruby_deps = True
break
with open(filename, 'w') as f:
f.write(textwrap.dedent(f"""
{{ lib, mkDiscoursePlugin, fetchFromGitHub }}:
mkDiscoursePlugin {{
name = "{name}";"""[1:] + ("""
bundlerEnvArgs.gemdir = ./.;""" if has_ruby_deps else "") + f"""
src = {fetcher} {{
owner = "{owner}";
repo = "{repo_name}";
rev = "replace-with-git-rev";
sha256 = "replace-with-sha256";
}};
meta = with lib; {{
homepage = "";
maintainers = with maintainers; [ ];
license = licenses.mit; # change to the correct license!
description = "";
}};
}}"""))
all_plugins_filename = Path(__file__).parent / 'plugins' / 'all-plugins.nix'
with open(all_plugins_filename, 'r+') as f:
content = f.read()
pos = -1
while content[pos] != '}':
pos -= 1
content = content[:pos] + f' {name} = callPackage ./{name} {{}};' + os.linesep + content[pos:]
f.seek(0)
f.write(content)
f.truncate()
else:
filename = filename['file']
prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev')
if prev_commit_sha == repo.latest_commit_sha:
click.echo(f'Plugin {name} is already at the latest revision')
continue
filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')['file']
prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash')
new_hash = subprocess.check_output([
'nix-universal-prefetch', fetcher,
@ -248,7 +308,9 @@ def update_plugins():
with open(gemfile, 'a') as f:
f.write(gemfile_text)
subprocess.check_output(['bundle', 'lock', '--add-platform', 'ruby'], cwd=rubyenv_dir)
subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir)
_remove_platforms(rubyenv_dir)
subprocess.check_output(['bundix'], cwd=rubyenv_dir)

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