diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS
index b85e922612..fc116b32d5 100644
--- a/third_party/nixpkgs/.github/CODEOWNERS
+++ b/third_party/nixpkgs/.github/CODEOWNERS
@@ -11,7 +11,7 @@
/.github/CODEOWNERS @edolstra
# GitHub actions
-/.github/workflows @Mic92 @zowoq
+/.github/workflows @NixOS/Security @Mic92 @zowoq
/.github/workflows/merge-staging @FRidh
# EditorConfig
diff --git a/third_party/nixpkgs/.github/workflows/labels.yml b/third_party/nixpkgs/.github/workflows/labels.yml
index 4232ceb623..4d1e2a2a0f 100644
--- a/third_party/nixpkgs/.github/workflows/labels.yml
+++ b/third_party/nixpkgs/.github/workflows/labels.yml
@@ -4,6 +4,10 @@ on:
pull_request_target:
types: [edited, opened, synchronize, reopened]
+permissions:
+ contents: read
+ pull-requests: write
+
jobs:
labels:
runs-on: ubuntu-latest
diff --git a/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos.yml
index fa1f8fc691..c885f6f766 100644
--- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml
+++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml
@@ -1,5 +1,7 @@
name: "Build NixOS manual"
+permissions: read-all
+
on:
pull_request_target:
branches:
diff --git a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml
index 192a4c6868..6f7ad10efd 100644
--- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml
+++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml
@@ -1,5 +1,7 @@
name: "Build Nixpkgs manual"
+permissions: read-all
+
on:
pull_request_target:
branches:
diff --git a/third_party/nixpkgs/doc/builders/images.xml b/third_party/nixpkgs/doc/builders/images.xml
index d7d2502918..cd10d69a96 100644
--- a/third_party/nixpkgs/doc/builders/images.xml
+++ b/third_party/nixpkgs/doc/builders/images.xml
@@ -5,8 +5,8 @@
This chapter describes tools for creating various types of images.
-
+
-
+
diff --git a/third_party/nixpkgs/doc/builders/images/appimagetools.section.md b/third_party/nixpkgs/doc/builders/images/appimagetools.section.md
new file mode 100644
index 0000000000..7ab4e4e9d8
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/images/appimagetools.section.md
@@ -0,0 +1,48 @@
+# pkgs.appimageTools {#sec-pkgs-appimageTools}
+
+`pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, `pkgs.appimage-run` can be used as well.
+
+::: warning
+The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future.
+:::
+
+## AppImage formats {#ssec-pkgs-appimageTools-formats}
+
+There are different formats for AppImages, see [the specification](https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format) for details.
+
+- Type 1 images are ISO 9660 files that are also ELF executables.
+- Type 2 images are ELF executables with an appended filesystem.
+
+They can be told apart with `file -k`:
+
+```ShellSession
+$ file -k type1.AppImage
+type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0,
+spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data
+
+$ file -k type2.AppImage
+type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data
+```
+
+Note how the type 1 AppImage is described as an `ISO 9660 CD-ROM filesystem`, and the type 2 AppImage is not.
+
+## Wrapping {#ssec-pkgs-appimageTools-wrapping}
+
+Depending on the type of AppImage you're wrapping, you'll have to use `wrapType1` or `wrapType2`.
+
+```nix
+appimageTools.wrapType2 { # or wrapType1
+ name = "patchwork";
+ src = fetchurl {
+ url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage";
+ sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
+ };
+ extraPkgs = pkgs: with pkgs; [ ];
+}
+```
+
+- `name` specifies the name of the resulting image.
+- `src` specifies the AppImage file to extract.
+- `extraPkgs` allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs:
+ - Looking through the extracted AppImage files, reading its scripts and running `patchelf` and `ldd` on its executables. This can also be done in `appimage-run`, by setting `APPIMAGE_DEBUG_EXEC=bash`.
+ - Running `strace -vfefile` on the wrapped executable, looking for libraries that can't be found.
diff --git a/third_party/nixpkgs/doc/builders/images/appimagetools.xml b/third_party/nixpkgs/doc/builders/images/appimagetools.xml
deleted file mode 100644
index 45c5619abd..0000000000
--- a/third_party/nixpkgs/doc/builders/images/appimagetools.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-
- pkgs.appimageTools
-
-
- pkgs.appimageTools is a set of functions for extracting and wrapping AppImage files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, pkgs.appimage-run can be used as well.
-
-
-
-
- The appimageTools API is unstable and may be subject to backwards-incompatible changes in the future.
-
-
-
-
- AppImage formats
-
-
- There are different formats for AppImages, see the specification for details.
-
-
-
-
-
- Type 1 images are ISO 9660 files that are also ELF executables.
-
-
-
-
- Type 2 images are ELF executables with an appended filesystem.
-
-
-
-
-
- They can be told apart with file -k:
-
-
-
-$ file -k type1.AppImage
-type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0,
-spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data
-
-$ file -k type2.AppImage
-type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data
-
-
-
- Note how the type 1 AppImage is described as an ISO 9660 CD-ROM filesystem, and the type 2 AppImage is not.
-
-
-
-
- Wrapping
-
-
- Depending on the type of AppImage you're wrapping, you'll have to use wrapType1 or wrapType2.
-
-
-
-appimageTools.wrapType2 { # or wrapType1
- name = "patchwork";
- src = fetchurl {
- url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage";
- sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
- };
- extraPkgs = pkgs: with pkgs; [ ];
-}
-
-
-
-
- name specifies the name of the resulting image.
-
-
-
-
- src specifies the AppImage file to extract.
-
-
-
-
- extraPkgs allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs:
-
-
-
- Looking through the extracted AppImage files, reading its scripts and running patchelf and ldd on its executables. This can also be done in appimage-run, by setting APPIMAGE_DEBUG_EXEC=bash.
-
-
-
-
- Running strace -vfefile on the wrapped executable, looking for libraries that can't be found.
-
-
-
-
-
-
-
-
diff --git a/third_party/nixpkgs/doc/builders/images/snap/example-firefox.nix b/third_party/nixpkgs/doc/builders/images/snap/example-firefox.nix
deleted file mode 100644
index d58c98a65a..0000000000
--- a/third_party/nixpkgs/doc/builders/images/snap/example-firefox.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-let
- inherit (import { }) snapTools firefox;
-in snapTools.makeSnap {
- meta = {
- name = "nix-example-firefox";
- summary = firefox.meta.description;
- architectures = [ "amd64" ];
- apps.nix-example-firefox = {
- command = "${firefox}/bin/firefox";
- plugs = [
- "pulseaudio"
- "camera"
- "browser-support"
- "avahi-observe"
- "cups-control"
- "desktop"
- "desktop-legacy"
- "gsettings"
- "home"
- "network"
- "mount-observe"
- "removable-media"
- "x11"
- ];
- };
- confinement = "strict";
- };
-}
diff --git a/third_party/nixpkgs/doc/builders/images/snap/example-hello.nix b/third_party/nixpkgs/doc/builders/images/snap/example-hello.nix
deleted file mode 100644
index 123da80c54..0000000000
--- a/third_party/nixpkgs/doc/builders/images/snap/example-hello.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-let
- inherit (import { }) snapTools hello;
-in snapTools.makeSnap {
- meta = {
- name = "hello";
- summary = hello.meta.description;
- description = hello.meta.longDescription;
- architectures = [ "amd64" ];
- confinement = "strict";
- apps.hello.command = "${hello}/bin/hello";
- };
-}
diff --git a/third_party/nixpkgs/doc/builders/images/snaptools.section.md b/third_party/nixpkgs/doc/builders/images/snaptools.section.md
new file mode 100644
index 0000000000..9e1403b882
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/images/snaptools.section.md
@@ -0,0 +1,71 @@
+# pkgs.snapTools {#sec-pkgs-snapTools}
+
+`pkgs.snapTools` is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations.
+
+## The makeSnap Function {#ssec-pkgs-snapTools-makeSnap-signature}
+
+`makeSnap` takes a single named argument, `meta`. This argument mirrors [the upstream `snap.yaml` format](https://docs.snapcraft.io/snap-format) exactly.
+
+The `base` should not be specified, as `makeSnap` will force set it.
+
+Currently, `makeSnap` does not support creating GUI stubs.
+
+## Build a Hello World Snap {#ssec-pkgs-snapTools-build-a-snap-hello}
+
+The following expression packages GNU Hello as a Snapcraft snap.
+
+```{#ex-snapTools-buildSnap-hello .nix}
+let
+ inherit (import { }) snapTools hello;
+in snapTools.makeSnap {
+ meta = {
+ name = "hello";
+ summary = hello.meta.description;
+ description = hello.meta.longDescription;
+ architectures = [ "amd64" ];
+ confinement = "strict";
+ apps.hello.command = "${hello}/bin/hello";
+ };
+}
+```
+
+`nix-build` this expression and install it with `snap install ./result --dangerous`. `hello` will now be the Snapcraft version of the package.
+
+## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox}
+
+Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.
+
+```{#ex-snapTools-buildSnap-firefox .nix}
+let
+ inherit (import { }) snapTools firefox;
+in snapTools.makeSnap {
+ meta = {
+ name = "nix-example-firefox";
+ summary = firefox.meta.description;
+ architectures = [ "amd64" ];
+ apps.nix-example-firefox = {
+ command = "${firefox}/bin/firefox";
+ plugs = [
+ "pulseaudio"
+ "camera"
+ "browser-support"
+ "avahi-observe"
+ "cups-control"
+ "desktop"
+ "desktop-legacy"
+ "gsettings"
+ "home"
+ "network"
+ "mount-observe"
+ "removable-media"
+ "x11"
+ ];
+ };
+ confinement = "strict";
+ };
+}
+```
+
+`nix-build` this expression and install it with `snap install ./result --dangerous`. `nix-example-firefox` will now be the Snapcraft version of the Firefox package.
+
+The specific meaning behind plugs can be looked up in the [Snapcraft interface documentation](https://docs.snapcraft.io/supported-interfaces).
diff --git a/third_party/nixpkgs/doc/builders/images/snaptools.xml b/third_party/nixpkgs/doc/builders/images/snaptools.xml
deleted file mode 100644
index bbe2e3f5e1..0000000000
--- a/third_party/nixpkgs/doc/builders/images/snaptools.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
- pkgs.snapTools
-
-
- pkgs.snapTools is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations.
-
-
-
- The makeSnap Function
-
-
- makeSnap takes a single named argument, meta. This argument mirrors the upstream snap.yaml format exactly.
-
-
-
- The base should not be specified, as makeSnap will force set it.
-
-
-
- Currently, makeSnap does not support creating GUI stubs.
-
-
-
-
- Build a Hello World Snap
-
-
- Making a Hello World Snap
-
- The following expression packages GNU Hello as a Snapcraft snap.
-
-
-
- nix-build this expression and install it with snap install ./result --dangerous. hello will now be the Snapcraft version of the package.
-
-
-
-
-
- Build a Hello World Snap
-
-
- Making a Graphical Snap
-
- Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.
-
-
-
- nix-build this expression and install it with snap install ./result --dangerous. nix-example-firefox will now be the Snapcraft version of the Firefox package.
-
-
- The specific meaning behind plugs can be looked up in the Snapcraft interface documentation.
-
-
-
-
diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md
new file mode 100644
index 0000000000..eccf4f7436
--- /dev/null
+++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md
@@ -0,0 +1,514 @@
+# Coding conventions {#chap-conventions}
+
+## Syntax {#sec-syntax}
+
+- Use 2 spaces of indentation per indentation level in Nix expressions, 4 spaces in shell scripts.
+
+- Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use `(setq-default indent-tabs-mode nil)` in Emacs. Everybody has different tab settings so it’s asking for trouble.
+
+- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in .
+
+- Function calls with attribute set arguments are written as
+
+ ```nix
+ foo {
+ arg = ...;
+ }
+ ```
+
+ not
+
+ ```nix
+ foo
+ {
+ arg = ...;
+ }
+ ```
+
+ Also fine is
+
+ ```nix
+ foo { arg = ...; }
+ ```
+
+ if it's a short call.
+
+- In attribute sets or lists that span multiple lines, the attribute names or list elements should be aligned:
+
+ ```nix
+ # A long list.
+ list = [
+ elem1
+ elem2
+ elem3
+ ];
+
+ # A long attribute set.
+ attrs = {
+ attr1 = short_expr;
+ attr2 =
+ if true then big_expr else big_expr;
+ };
+
+ # Combined
+ listOfAttrs = [
+ {
+ attr1 = 3;
+ attr2 = "fff";
+ }
+ {
+ attr1 = 5;
+ attr2 = "ggg";
+ }
+ ];
+ ```
+
+- Short lists or attribute sets can be written on one line:
+
+ ```nix
+ # A short list.
+ list = [ elem1 elem2 elem3 ];
+
+ # A short set.
+ attrs = { x = 1280; y = 1024; };
+ ```
+
+- Breaking in the middle of a function argument can give hard-to-read code, like
+
+ ```nix
+ someFunction { x = 1280;
+ y = 1024; } otherArg
+ yetAnotherArg
+ ```
+
+ (especially if the argument is very large, spanning multiple lines).
+
+ Better:
+
+ ```nix
+ someFunction
+ { x = 1280; y = 1024; }
+ otherArg
+ yetAnotherArg
+ ```
+
+ or
+
+ ```nix
+ let res = { x = 1280; y = 1024; };
+ in someFunction res otherArg yetAnotherArg
+ ```
+
+- The bodies of functions, asserts, and withs are not indented to prevent a lot of superfluous indentation levels, i.e.
+
+ ```nix
+ { arg1, arg2 }:
+ assert system == "i686-linux";
+ stdenv.mkDerivation { ...
+ ```
+
+ not
+
+ ```nix
+ { arg1, arg2 }:
+ assert system == "i686-linux";
+ stdenv.mkDerivation { ...
+ ```
+
+- Function formal arguments are written as:
+
+ ```nix
+ { arg1, arg2, arg3 }:
+ ```
+
+ but if they don't fit on one line they're written as:
+
+ ```nix
+ { arg1, arg2, arg3
+ , arg4, ...
+ , # Some comment...
+ argN
+ }:
+ ```
+
+- Functions should list their expected arguments as precisely as possible. That is, write
+
+ ```nix
+ { stdenv, fetchurl, perl }: ...
+ ```
+
+ instead of
+
+ ```nix
+ args: with args; ...
+ ```
+
+ or
+
+ ```nix
+ { stdenv, fetchurl, perl, ... }: ...
+ ```
+
+ For functions that are truly generic in the number of arguments (such as wrappers around `mkDerivation`) that have some required arguments, you should write them using an `@`-pattern:
+
+ ```nix
+ { stdenv, doCoverageAnalysis ? false, ... } @ args:
+
+ stdenv.mkDerivation (args // {
+ ... if doCoverageAnalysis then "bla" else "" ...
+ })
+ ```
+
+ instead of
+
+ ```nix
+ args:
+
+ args.stdenv.mkDerivation (args // {
+ ... if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "" ...
+ })
+ ```
+
+- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.
+
+- Prefer using the top-level `lib` over its alias `stdenv.lib`. `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing to avoid having to modify the function inputs just to test something out.
+
+## Package naming {#sec-package-naming}
+
+The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way.
+
+In Nixpkgs, there are generally three different names associated with a package:
+
+- The `name` attribute of the derivation (excluding the version part). This is what most users see, in particular when using `nix-env`.
+
+- The variable name used for the instantiated package in `all-packages.nix`, and when passing it as a dependency to other functions. Typically this is called the _package attribute name_. This is what Nix expression authors see. It can also be used when installing using `nix-env -iA`.
+
+- The filename for (the directory containing) the Nix expression.
+
+Most of the time, these are the same. For instance, the package `e2fsprogs` has a `name` attribute `"e2fsprogs-version"`, is bound to the variable name `e2fsprogs` in `all-packages.nix`, and the Nix expression is in `pkgs/os-specific/linux/e2fsprogs/default.nix`.
+
+There are a few naming guidelines:
+
+- The `name` attribute _should_ be identical to the upstream package name.
+
+- The `name` attribute _must not_ contain uppercase letters — e.g., `"mplayer-1.0rc2"` instead of `"MPlayer-1.0rc2"`.
+
+- The version part of the `name` attribute _must_ start with a digit (following a dash) — e.g., `"hello-0.3.1rc2"`.
+
+- If a package is not a release but a commit from a repository, then the version part of the name _must_ be the date of that (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format. Also append `"unstable"` to the name - e.g., `"pkgname-unstable-2014-09-23"`.
+
+- Dashes in the package name _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.
+
+- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c-0-9` and `json-c-0-11`. If there is an obvious “default” version, make an attribute like `json-c = json-c-0-9;`. See also
+
+## File naming and organisation {#sec-organisation}
+
+Names of files and directories should be in lowercase, with dashes between words — not in camel case. For instance, it should be `all-packages.nix`, not `allPackages.nix` or `AllPackages.nix`.
+
+### Hierarchy {#sec-hierarchy}
+
+Each package should be stored in its own directory somewhere in the `pkgs/` tree, i.e. in `pkgs/category/subcategory/.../pkgname`. Below are some rules for picking the right category for a package. Many packages fall under several categories; what matters is the _primary_ purpose of a package. For example, the `libxml2` package builds both a library and some tools; but it’s a library foremost, so it goes under `pkgs/development/libraries`.
+
+When in doubt, consider refactoring the `pkgs/` tree, e.g. creating new categories or splitting up an existing category.
+
+**If it’s used to support _software development_:**
+
+- **If it’s a _library_ used by other packages:**
+
+ - `development/libraries` (e.g. `libxml2`)
+
+- **If it’s a _compiler_:**
+
+ - `development/compilers` (e.g. `gcc`)
+
+- **If it’s an _interpreter_:**
+
+ - `development/interpreters` (e.g. `guile`)
+
+- **If it’s a (set of) development _tool(s)_:**
+
+ - **If it’s a _parser generator_ (including lexers):**
+
+ - `development/tools/parsing` (e.g. `bison`, `flex`)
+
+ - **If it’s a _build manager_:**
+
+ - `development/tools/build-managers` (e.g. `gnumake`)
+
+ - **Else:**
+
+ - `development/tools/misc` (e.g. `binutils`)
+
+- **Else:**
+
+ - `development/misc`
+
+**If it’s a (set of) _tool(s)_:**
+
+(A tool is a relatively small program, especially one intended to be used non-interactively.)
+
+- **If it’s for _networking_:**
+
+ - `tools/networking` (e.g. `wget`)
+
+- **If it’s for _text processing_:**
+
+ - `tools/text` (e.g. `diffutils`)
+
+- **If it’s a _system utility_, i.e., something related or essential to the operation of a system:**
+
+ - `tools/system` (e.g. `cron`)
+
+- **If it’s an _archiver_ (which may include a compression function):**
+
+ - `tools/archivers` (e.g. `zip`, `tar`)
+
+- **If it’s a _compression_ program:**
+
+ - `tools/compression` (e.g. `gzip`, `bzip2`)
+
+- **If it’s a _security_-related program:**
+
+ - `tools/security` (e.g. `nmap`, `gnupg`)
+
+- **Else:**
+
+ - `tools/misc`
+
+**If it’s a _shell_:**
+
+- `shells` (e.g. `bash`)
+
+**If it’s a _server_:**
+
+- **If it’s a web server:**
+
+ - `servers/http` (e.g. `apache-httpd`)
+
+- **If it’s an implementation of the X Windowing System:**
+
+ - `servers/x11` (e.g. `xorg` — this includes the client libraries and programs)
+
+- **Else:**
+
+ - `servers/misc`
+
+**If it’s a _desktop environment_:**
+
+- `desktops` (e.g. `kde`, `gnome`, `enlightenment`)
+
+**If it’s a _window manager_:**
+
+- `applications/window-managers` (e.g. `awesome`, `stumpwm`)
+
+**If it’s an _application_:**
+
+A (typically large) program with a distinct user interface, primarily used interactively.
+
+- **If it’s a _version management system_:**
+
+ - `applications/version-management` (e.g. `subversion`)
+
+- **If it’s a _terminal emulator_:**
+
+ - `applications/terminal-emulators` (e.g. `alacritty` or `rxvt` or `termite`)
+
+- **If it’s for _video playback / editing_:**
+
+ - `applications/video` (e.g. `vlc`)
+
+- **If it’s for _graphics viewing / editing_:**
+
+ - `applications/graphics` (e.g. `gimp`)
+
+- **If it’s for _networking_:**
+
+ - **If it’s a _mailreader_:**
+
+ - `applications/networking/mailreaders` (e.g. `thunderbird`)
+
+ - **If it’s a _newsreader_:**
+
+ - `applications/networking/newsreaders` (e.g. `pan`)
+
+ - **If it’s a _web browser_:**
+
+ - `applications/networking/browsers` (e.g. `firefox`)
+
+ - **Else:**
+
+ - `applications/networking/misc`
+
+- **Else:**
+
+ - `applications/misc`
+
+**If it’s _data_ (i.e., does not have a straight-forward executable semantics):**
+
+- **If it’s a _font_:**
+
+ - `data/fonts`
+
+- **If it’s an _icon theme_:**
+
+ - `data/icons`
+
+- **If it’s related to _SGML/XML processing_:**
+
+ - **If it’s an _XML DTD_:**
+
+ - `data/sgml+xml/schemas/xml-dtd` (e.g. `docbook`)
+
+ - **If it’s an _XSLT stylesheet_:**
+
+ (Okay, these are executable...)
+
+ - `data/sgml+xml/stylesheets/xslt` (e.g. `docbook-xsl`)
+
+- **If it’s a _theme_ for a _desktop environment_, a _window manager_ or a _display manager_:**
+
+ - `data/themes`
+
+**If it’s a _game_:**
+
+- `games`
+
+**Else:**
+
+- `misc`
+
+### Versioning {#sec-versioning}
+
+Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be kept unless there is a good reason to do so. For instance, Nixpkgs contains several versions of GCC because other packages don’t build with the latest version of GCC. Other examples are having both the latest stable and latest pre-release version of a package, or to keep several major releases of an application that differ significantly in functionality.
+
+If there is only one version of a package, its Nix expression should be named `e2fsprogs/default.nix`. If there are multiple versions, this should be reflected in the filename, e.g. `e2fsprogs/1.41.8.nix` and `e2fsprogs/1.41.9.nix`. The version in the filename should leave out unnecessary detail. For instance, if we keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named `firefox/2.0.nix` and `firefox/3.5.nix`, respectively (which, at a given point, might contain versions `2.0.0.20` and `3.5.4`). If a version requires many auxiliary files, you can use a subdirectory for each version, e.g. `firefox/2.0/default.nix` and `firefox/3.5/default.nix`.
+
+All versions of a package _must_ be included in `all-packages.nix` to make sure that they evaluate correctly.
+
+## Fetching Sources {#sec-sources}
+
+There are multiple ways to fetch a package source in nixpkgs. The general guideline is that you should package reproducible sources with a high degree of availability. Right now there is only one fetcher which has mirroring support and that is `fetchurl`. Note that you should also prefer protocols which have a corresponding proxy environment variable.
+
+You can find many source fetch helpers in `pkgs/build-support/fetch*`.
+
+In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these have names on the form `fetchFrom*`. The intention of these are to provide snapshot fetches but using the same api as some of the version controlled fetchers from `pkgs/build-support/`. As an example going from bad to good:
+
+- Bad: Uses `git://` which won't be proxied.
+
+ ```nix
+ src = fetchgit {
+ url = "git://github.com/NixOS/nix.git";
+ rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+ sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
+ }
+ ```
+
+- Better: This is ok, but an archive fetch will still be faster.
+
+ ```nix
+ src = fetchgit {
+ url = "https://github.com/NixOS/nix.git";
+ rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+ sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
+ }
+ ```
+
+- Best: Fetches a snapshot archive and you get the rev you want.
+
+ ```nix
+ src = fetchFromGitHub {
+ owner = "NixOS";
+ repo = "nix";
+ rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+ sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc";
+ }
+ ```
+
+ Find the value to put as `sha256` by running `nix run -f '' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix` or `nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz`.
+
+## Obtaining source hash {#sec-source-hashes}
+
+Preferred source hash type is sha256. There are several ways to get it.
+
+1. Prefetch URL (with `nix-prefetch-XXX URL`, where `XXX` is one of `url`, `git`, `hg`, `cvs`, `bzr`, `svn`). Hash is printed to stdout.
+
+2. Prefetch by package source (with `nix-prefetch-url '' -A PACKAGE.src`, where `PACKAGE` is package attribute name). Hash is printed to stdout.
+
+ This works well when you've upgraded existing package version and want to find out new hash, but is useless if package can't be accessed by attribute or package has multiple sources (`.srcs`, architecture-dependent sources, etc).
+
+3. Upstream provided hash: use it when upstream provides `sha256` or `sha512` (when upstream provides `md5`, don't use it, compute `sha256` instead).
+
+ A little nuance is that `nix-prefetch-*` tools produce hash encoded with `base32`, but upstream usually provides hexadecimal (`base16`) encoding. Fetchers understand both formats. Nixpkgs does not standardize on any one format.
+
+ You can convert between formats with nix-hash, for example:
+
+ ```ShellSession
+ $ nix-hash --type sha256 --to-base32 HASH
+ ```
+
+4. Extracting hash from local source tarball can be done with `sha256sum`. Use `nix-prefetch-url file:///path/to/tarball` if you want base32 hash.
+
+5. Fake hash: set fake hash in package expression, perform build and extract correct hash from error Nix prints.
+
+ For package updates it is enough to change one symbol to make hash fake. For new packages, you can use `lib.fakeSha256`, `lib.fakeSha512` or any other fake hash.
+
+ This is last resort method when reconstructing source URL is non-trivial and `nix-prefetch-url -A` isn't applicable (for example, [one of `kodi` dependencies](https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73")). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash.
+
+::: warning
+This method has security problems. Check below for details.
+:::
+
+### Obtaining hashes securely {#sec-source-hashes-security}
+
+Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of fetching source you can fetch malware, and instead of source hash you get hash of malware. Here are security considerations for this scenario:
+
+- `http://` URLs are not secure to prefetch hash from;
+
+- hashes from upstream (in method 3) should be obtained via secure protocol;
+
+- `https://` URLs are secure in methods 1, 2, 3;
+
+- `https://` URLs are not secure in method 5. When obtaining hashes with fake hash method, TLS checks are disabled. So refetch source hash from several different networks to exclude MITM scenario. Alternatively, use fake hash method to make Nix error, but instead of extracting hash from error, extract `https://` URL and prefetch it with method 1.
+
+## Patches {#sec-patches}
+
+Patches available online should be retrieved using `fetchpatch`.
+
+```nix
+patches = [
+ (fetchpatch {
+ name = "fix-check-for-using-shared-freetype-lib.patch";
+ url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d285";
+ sha256 = "1f0k043rng7f0rfl9hhb89qzvvksqmkrikmm38p61yfx51l325xr";
+ })
+];
+```
+
+Otherwise, you can add a `.patch` file to the `nixpkgs` repository. In the interest of keeping our maintenance burden to a minimum, only patches that are unique to `nixpkgs` should be added in this way.
+
+```nix
+patches = [ ./0001-changes.patch ];
+```
+
+If you do need to do create this sort of patch file, one way to do so is with git:
+
+1. Move to the root directory of the source code you're patching.
+
+ ```ShellSession
+ $ cd the/program/source
+ ```
+
+2. If a git repository is not already present, create one and stage all of the source files.
+
+ ```ShellSession
+ $ git init
+ $ git add .
+ ```
+
+3. Edit some files to make whatever changes need to be included in the patch.
+
+4. Use git to create a diff, and pipe the output to a patch file:
+
+ ```ShellSession
+ $ git diff > nixpkgs/pkgs/the/package/0001-changes.patch
+ ```
diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.xml b/third_party/nixpkgs/doc/contributing/coding-conventions.xml
deleted file mode 100644
index 9f00942918..0000000000
--- a/third_party/nixpkgs/doc/contributing/coding-conventions.xml
+++ /dev/null
@@ -1,943 +0,0 @@
-
- Coding conventions
-
- Syntax
-
-
-
-
- Use 2 spaces of indentation per indentation level in Nix expressions, 4 spaces in shell scripts.
-
-
-
-
- Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use (setq-default indent-tabs-mode nil) in Emacs. Everybody has different tab settings so it’s asking for trouble.
-
-
-
-
- Use lowerCamelCase for variable names, not UpperCamelCase. Note, this rule does not apply to package attribute names, which instead follow the rules in .
-
-
-
-
- Function calls with attribute set arguments are written as
-
-foo {
- arg = ...;
-}
-
- not
-
-foo
-{
- arg = ...;
-}
-
- Also fine is
-
-foo { arg = ...; }
-
- if it's a short call.
-
-
-
-
- In attribute sets or lists that span multiple lines, the attribute names or list elements should be aligned:
-
-# A long list.
-list = [
- elem1
- elem2
- elem3
-];
-
-# A long attribute set.
-attrs = {
- attr1 = short_expr;
- attr2 =
- if true then big_expr else big_expr;
-};
-
-# Combined
-listOfAttrs = [
- {
- attr1 = 3;
- attr2 = "fff";
- }
- {
- attr1 = 5;
- attr2 = "ggg";
- }
-];
-
-
-
-
-
- Short lists or attribute sets can be written on one line:
-
-# A short list.
-list = [ elem1 elem2 elem3 ];
-
-# A short set.
-attrs = { x = 1280; y = 1024; };
-
-
-
-
-
- Breaking in the middle of a function argument can give hard-to-read code, like
-
-someFunction { x = 1280;
- y = 1024; } otherArg
- yetAnotherArg
-
- (especially if the argument is very large, spanning multiple lines).
-
-
- Better:
-
-someFunction
- { x = 1280; y = 1024; }
- otherArg
- yetAnotherArg
-
- or
-
-let res = { x = 1280; y = 1024; };
-in someFunction res otherArg yetAnotherArg
-
-
-
-
-
- The bodies of functions, asserts, and withs are not indented to prevent a lot of superfluous indentation levels, i.e.
-
-{ arg1, arg2 }:
-assert system == "i686-linux";
-stdenv.mkDerivation { ...
-
- not
-
-{ arg1, arg2 }:
- assert system == "i686-linux";
- stdenv.mkDerivation { ...
-
-
-
-
-
- Function formal arguments are written as:
-
-{ arg1, arg2, arg3 }:
-
- but if they don't fit on one line they're written as:
-
-{ arg1, arg2, arg3
-, arg4, ...
-, # Some comment...
- argN
-}:
-
-
-
-
-
- Functions should list their expected arguments as precisely as possible. That is, write
-
-{ stdenv, fetchurl, perl }: ...
-
- instead of
-
-args: with args; ...
-
- or
-
-{ stdenv, fetchurl, perl, ... }: ...
-
-
-
- For functions that are truly generic in the number of arguments (such as wrappers around mkDerivation) that have some required arguments, you should write them using an @-pattern:
-
-{ stdenv, doCoverageAnalysis ? false, ... } @ args:
-
-stdenv.mkDerivation (args // {
- ... if doCoverageAnalysis then "bla" else "" ...
-})
-
- instead of
-
-args:
-
-args.stdenv.mkDerivation (args // {
- ... if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "" ...
-})
-
-
-
-
-
- Arguments should be listed in the order they are used, with the exception of lib, which always goes first.
-
-
-
-
- Prefer using the top-level lib over its alias stdenv.lib. lib is unrelated to stdenv, and so stdenv.lib should only be used as a convenience alias when developing to avoid having to modify the function inputs just to test something out.
-
-
-
-
-
- Package naming
-
-
- The key words must, must not, required, shall, shall not, should, should not, recommended, may, and optional in this section are to be interpreted as described in RFC 2119. Only emphasized words are to be interpreted in this way.
-
-
-
- In Nixpkgs, there are generally three different names associated with a package:
-
-
-
- The name attribute of the derivation (excluding the version part). This is what most users see, in particular when using nix-env.
-
-
-
-
- The variable name used for the instantiated package in all-packages.nix, and when passing it as a dependency to other functions. Typically this is called the package attribute name. This is what Nix expression authors see. It can also be used when installing using nix-env -iA.
-
-
-
-
- The filename for (the directory containing) the Nix expression.
-
-
-
- Most of the time, these are the same. For instance, the package e2fsprogs has a name attribute "e2fsprogs-version", is bound to the variable name e2fsprogs in all-packages.nix, and the Nix expression is in pkgs/os-specific/linux/e2fsprogs/default.nix.
-
-
-
- There are a few naming guidelines:
-
-
-
- The name attribute should be identical to the upstream package name.
-
-
-
-
- The name attribute must not contain uppercase letters — e.g., "mplayer-1.0rc2" instead of "MPlayer-1.0rc2".
-
-
-
-
- The version part of the name attribute must start with a digit (following a dash) — e.g., "hello-0.3.1rc2".
-
-
-
-
- If a package is not a release but a commit from a repository, then the version part of the name must be the date of that (fetched) commit. The date must be in "YYYY-MM-DD" format. Also append "unstable" to the name - e.g., "pkgname-unstable-2014-09-23".
-
-
-
-
- Dashes in the package name should be preserved in new variable names, rather than converted to underscores or camel cased — e.g., http-parser instead of http_parser or httpParser. The hyphenated style is preferred in all three package names.
-
-
-
-
- If there are multiple versions of a package, this should be reflected in the variable names in all-packages.nix, e.g. json-c-0-9 and json-c-0-11. If there is an obvious “default” version, make an attribute like json-c = json-c-0-9;. See also
-
-
-
-
-
-
- File naming and organisation
-
-
- Names of files and directories should be in lowercase, with dashes between words — not in camel case. For instance, it should be all-packages.nix, not allPackages.nix or AllPackages.nix.
-
-
-
- Hierarchy
-
-
- Each package should be stored in its own directory somewhere in the pkgs/ tree, i.e. in pkgs/category/subcategory/.../pkgname. Below are some rules for picking the right category for a package. Many packages fall under several categories; what matters is the primary purpose of a package. For example, the libxml2 package builds both a library and some tools; but it’s a library foremost, so it goes under pkgs/development/libraries.
-
-
-
- When in doubt, consider refactoring the pkgs/ tree, e.g. creating new categories or splitting up an existing category.
-
-
-
-
-
- If it’s used to support software development:
-
-
-
-
-
- If it’s a library used by other packages:
-
-
-
- development/libraries (e.g. libxml2)
-
-
-
-
-
- If it’s a compiler:
-
-
-
- development/compilers (e.g. gcc)
-
-
-
-
-
- If it’s an interpreter:
-
-
-
- development/interpreters (e.g. guile)
-
-
-
-
-
- If it’s a (set of) development tool(s):
-
-
-
-
-
- If it’s a parser generator (including lexers):
-
-
-
- development/tools/parsing (e.g. bison, flex)
-
-
-
-
-
- If it’s a build manager:
-
-
-
- development/tools/build-managers (e.g. gnumake)
-
-
-
-
-
- Else:
-
-
-
- development/tools/misc (e.g. binutils)
-
-
-
-
-
-
-
-
- Else:
-
-
-
- development/misc
-
-
-
-
-
-
-
-
- If it’s a (set of) tool(s):
-
-
-
- (A tool is a relatively small program, especially one intended to be used non-interactively.)
-
-
-
-
- If it’s for networking:
-
-
-
- tools/networking (e.g. wget)
-
-
-
-
-
- If it’s for text processing:
-
-
-
- tools/text (e.g. diffutils)
-
-
-
-
-
- If it’s a system utility, i.e., something related or essential to the operation of a system:
-
-
-
- tools/system (e.g. cron)
-
-
-
-
-
- If it’s an archiver (which may include a compression function):
-
-
-
- tools/archivers (e.g. zip, tar)
-
-
-
-
-
- If it’s a compression program:
-
-
-
- tools/compression (e.g. gzip, bzip2)
-
-
-
-
-
- If it’s a security-related program:
-
-
-
- tools/security (e.g. nmap, gnupg)
-
-
-
-
-
- Else:
-
-
-
- tools/misc
-
-
-
-
-
-
-
-
- If it’s a shell:
-
-
-
- shells (e.g. bash)
-
-
-
-
-
- If it’s a server:
-
-
-
-
-
- If it’s a web server:
-
-
-
- servers/http (e.g. apache-httpd)
-
-
-
-
-
- If it’s an implementation of the X Windowing System:
-
-
-
- servers/x11 (e.g. xorg — this includes the client libraries and programs)
-
-
-
-
-
- Else:
-
-
-
- servers/misc
-
-
-
-
-
-
-
-
- If it’s a desktop environment:
-
-
-
- desktops (e.g. kde, gnome, enlightenment)
-
-
-
-
-
- If it’s a window manager:
-
-
-
- applications/window-managers (e.g. awesome, stumpwm)
-
-
-
-
-
- If it’s an application:
-
-
-
- A (typically large) program with a distinct user interface, primarily used interactively.
-
-
-
-
- If it’s a version management system:
-
-
-
- applications/version-management (e.g. subversion)
-
-
-
-
-
- If it’s a terminal emulator:
-
-
-
- applications/terminal-emulators (e.g. alacritty or rxvt or termite)
-
-
-
-
-
- If it’s for video playback / editing:
-
-
-
- applications/video (e.g. vlc)
-
-
-
-
-
- If it’s for graphics viewing / editing:
-
-
-
- applications/graphics (e.g. gimp)
-
-
-
-
-
- If it’s for networking:
-
-
-
-
-
- If it’s a mailreader:
-
-
-
- applications/networking/mailreaders (e.g. thunderbird)
-
-
-
-
-
- If it’s a newsreader:
-
-
-
- applications/networking/newsreaders (e.g. pan)
-
-
-
-
-
- If it’s a web browser:
-
-
-
- applications/networking/browsers (e.g. firefox)
-
-
-
-
-
- Else:
-
-
-
- applications/networking/misc
-
-
-
-
-
-
-
-
- Else:
-
-
-
- applications/misc
-
-
-
-
-
-
-
-
- If it’s data (i.e., does not have a straight-forward executable semantics):
-
-
-
-
-
- If it’s a font:
-
-
-
- data/fonts
-
-
-
-
-
- If it’s an icon theme:
-
-
-
- data/icons
-
-
-
-
-
- If it’s related to SGML/XML processing:
-
-
-
-
-
- If it’s an XML DTD:
-
-
-
- data/sgml+xml/schemas/xml-dtd (e.g. docbook)
-
-
-
-
-
- If it’s an XSLT stylesheet:
-
-
-
- (Okay, these are executable...)
-
-
- data/sgml+xml/stylesheets/xslt (e.g. docbook-xsl)
-
-
-
-
-
-
-
-
- If it’s a theme for a desktop environment, a window manager or a display manager:
-
-
-
- data/themes
-
-
-
-
-
-
-
-
- If it’s a game:
-
-
-
- games
-
-
-
-
-
- Else:
-
-
-
- misc
-
-
-
-
-
-
-
- Versioning
-
-
- Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be kept unless there is a good reason to do so. For instance, Nixpkgs contains several versions of GCC because other packages don’t build with the latest version of GCC. Other examples are having both the latest stable and latest pre-release version of a package, or to keep several major releases of an application that differ significantly in functionality.
-
-
-
- If there is only one version of a package, its Nix expression should be named e2fsprogs/default.nix. If there are multiple versions, this should be reflected in the filename, e.g. e2fsprogs/1.41.8.nix and e2fsprogs/1.41.9.nix. The version in the filename should leave out unnecessary detail. For instance, if we keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named firefox/2.0.nix and firefox/3.5.nix, respectively (which, at a given point, might contain versions 2.0.0.20 and 3.5.4). If a version requires many auxiliary files, you can use a subdirectory for each version, e.g. firefox/2.0/default.nix and firefox/3.5/default.nix.
-
-
-
- All versions of a package must be included in all-packages.nix to make sure that they evaluate correctly.
-
-
-
-
- Fetching Sources
-
-
- There are multiple ways to fetch a package source in nixpkgs. The general guideline is that you should package reproducible sources with a high degree of availability. Right now there is only one fetcher which has mirroring support and that is fetchurl. Note that you should also prefer protocols which have a corresponding proxy environment variable.
-
-
-
- You can find many source fetch helpers in pkgs/build-support/fetch*.
-
-
-
- In the file pkgs/top-level/all-packages.nix you can find fetch helpers, these have names on the form fetchFrom*. The intention of these are to provide snapshot fetches but using the same api as some of the version controlled fetchers from pkgs/build-support/. As an example going from bad to good:
-
-
-
- Bad: Uses git:// which won't be proxied.
-
-src = fetchgit {
- url = "git://github.com/NixOS/nix.git";
- rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
- sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
-}
-
-
-
-
-
- Better: This is ok, but an archive fetch will still be faster.
-
-src = fetchgit {
- url = "https://github.com/NixOS/nix.git";
- rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
- sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
-}
-
-
-
-
-
- Best: Fetches a snapshot archive and you get the rev you want.
-
-src = fetchFromGitHub {
- owner = "NixOS";
- repo = "nix";
- rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
- sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc";
-}
-
- Find the value to put as sha256 by running nix run -f '<nixpkgs>' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix or nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz.
-
-
-
-
-
-
- Obtaining source hash
-
-
- Preferred source hash type is sha256. There are several ways to get it.
-
-
-
-
-
- Prefetch URL (with nix-prefetch-XXX URL, where XXX is one of url, git, hg, cvs, bzr, svn). Hash is printed to stdout.
-
-
-
-
- Prefetch by package source (with nix-prefetch-url '<nixpkgs>' -A PACKAGE.src, where PACKAGE is package attribute name). Hash is printed to stdout.
-
-
- This works well when you've upgraded existing package version and want to find out new hash, but is useless if package can't be accessed by attribute or package has multiple sources (.srcs, architecture-dependent sources, etc).
-
-
-
-
- Upstream provided hash: use it when upstream provides sha256 or sha512 (when upstream provides md5, don't use it, compute sha256 instead).
-
-
- A little nuance is that nix-prefetch-* tools produce hash encoded with base32, but upstream usually provides hexadecimal (base16) encoding. Fetchers understand both formats. Nixpkgs does not standardize on any one format.
-
-
- You can convert between formats with nix-hash, for example:
-
-$ nix-hash --type sha256 --to-base32 HASH
-
-
-
-
-
- Extracting hash from local source tarball can be done with sha256sum. Use nix-prefetch-url file:///path/to/tarball if you want base32 hash.
-
-
-
-
- Fake hash: set fake hash in package expression, perform build and extract correct hash from error Nix prints.
-
-
- For package updates it is enough to change one symbol to make hash fake. For new packages, you can use lib.fakeSha256, lib.fakeSha512 or any other fake hash.
-
-
- This is last resort method when reconstructing source URL is non-trivial and nix-prefetch-url -A isn't applicable (for example, one of kodi dependencies). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash.
-
-
-
- This method has security problems. Check below for details.
-
-
-
-
-
-
- Obtaining hashes securely
-
-
- Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of fetching source you can fetch malware, and instead of source hash you get hash of malware. Here are security considerations for this scenario:
-
-
-
-
-
- http:// URLs are not secure to prefetch hash from;
-
-
-
-
- hashes from upstream (in method 3) should be obtained via secure protocol;
-
-
-
-
- https:// URLs are secure in methods 1, 2, 3;
-
-
-
-
- https:// URLs are not secure in method 5. When obtaining hashes with fake hash method, TLS checks are disabled. So refetch source hash from several different networks to exclude MITM scenario. Alternatively, use fake hash method to make Nix error, but instead of extracting hash from error, extract https:// URL and prefetch it with method 1.
-
-
-
-
-
-
- Patches
-
-
- Patches available online should be retrieved using fetchpatch.
-
-
-
-
-patches = [
- (fetchpatch {
- name = "fix-check-for-using-shared-freetype-lib.patch";
- url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d285";
- sha256 = "1f0k043rng7f0rfl9hhb89qzvvksqmkrikmm38p61yfx51l325xr";
- })
-];
-
-
-
-
- Otherwise, you can add a .patch file to the nixpkgs repository. In the interest of keeping our maintenance burden to a minimum, only patches that are unique to nixpkgs should be added in this way.
-
-
-
-
-patches = [ ./0001-changes.patch ];
-
-
-
-
- If you do need to do create this sort of patch file, one way to do so is with git:
-
-
-
- Move to the root directory of the source code you're patching.
-
-$ cd the/program/source
-
-
-
-
- If a git repository is not already present, create one and stage all of the source files.
-
-$ git init
-$ git add .
-
-
-
-
- Edit some files to make whatever changes need to be included in the patch.
-
-
-
-
- Use git to create a diff, and pipe the output to a patch file:
-
-$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch
-
-
-
-
-
-
diff --git a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md
new file mode 100644
index 0000000000..642beba74d
--- /dev/null
+++ b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md
@@ -0,0 +1,24 @@
+# Contributing to this documentation {#chap-contributing}
+
+The DocBook sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository.
+
+You can quickly check your edits with `make`:
+
+```ShellSession
+$ cd /path/to/nixpkgs/doc
+$ nix-shell
+[nix-shell]$ make $makeFlags
+```
+
+If you experience problems, run `make debug` to help understand the docbook errors.
+
+After making modifications to the manual, it's important to build it before committing. You can do that as follows:
+
+```ShellSession
+$ cd /path/to/nixpkgs/doc
+$ nix-shell
+[nix-shell]$ make clean
+[nix-shell]$ nix-build .
+```
+
+If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`.
diff --git a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.xml b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.xml
deleted file mode 100644
index 132fa3816e..0000000000
--- a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
- Contributing to this documentation
-
- The DocBook sources of the Nixpkgs manual are in the doc subdirectory of the Nixpkgs repository.
-
-
- You can quickly check your edits with make:
-
-
-$ cd /path/to/nixpkgs/doc
-$ nix-shell
-[nix-shell]$ make $makeFlags
-
-
- If you experience problems, run make debug to help understand the docbook errors.
-
-
- After making modifications to the manual, it's important to build it before committing. You can do that as follows:
-
-$ cd /path/to/nixpkgs/doc
-$ nix-shell
-[nix-shell]$ make clean
-[nix-shell]$ nix-build .
-
- If the build succeeds, the manual will be in ./result/share/doc/nixpkgs/manual.html.
-
-
diff --git a/third_party/nixpkgs/doc/contributing/quick-start.chapter.md b/third_party/nixpkgs/doc/contributing/quick-start.chapter.md
new file mode 100644
index 0000000000..85c3897221
--- /dev/null
+++ b/third_party/nixpkgs/doc/contributing/quick-start.chapter.md
@@ -0,0 +1,77 @@
+# Quick Start to Adding a Package {#chap-quick-start}
+
+To add a package to Nixpkgs:
+
+1. Checkout the Nixpkgs source tree:
+
+ ```ShellSession
+ $ git clone https://github.com/NixOS/nixpkgs
+ $ cd nixpkgs
+ ```
+
+2. Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into `pkgs/development/libraries/pkgname`, while a web browser goes into `pkgs/applications/networking/browsers/pkgname`. See for some hints on the tree organisation. Create a directory for your package, e.g.
+
+ ```ShellSession
+ $ mkdir pkgs/development/libraries/libfoo
+ ```
+
+3. In the package directory, create a Nix expression — a piece of code that describes how to build the package. In this case, it should be a _function_ that is called with the package dependencies as arguments, and returns a build of the package in the Nix store. The expression should usually be called `default.nix`.
+
+ ```ShellSession
+ $ emacs pkgs/development/libraries/libfoo/default.nix
+ $ git add pkgs/development/libraries/libfoo/default.nix
+ ```
+
+ You can have a look at the existing Nix expressions under `pkgs/` to see how it’s done. Here are some good ones:
+
+ - GNU Hello: [`pkgs/applications/misc/hello/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix). Trivial package, which specifies some `meta` attributes which is good practice.
+
+ - GNU cpio: [`pkgs/tools/archivers/cpio/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix). Also a simple package. The generic builder in `stdenv` does everything for you. It has no dependencies beyond `stdenv`.
+
+ - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp/5.1.x.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix). Also done by the generic builder, but has a dependency on `m4`.
+
+ - Pan, a GTK-based newsreader: [`pkgs/applications/networking/newsreaders/pan/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix). Has an optional dependency on `gtkspell`, which is only built if `spellCheck` is `true`.
+
+ - Apache HTTPD: [`pkgs/servers/http/apache-httpd/2.4.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix). A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery.
+
+ - Thunderbird: [`pkgs/applications/networking/mailreaders/thunderbird/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix). Lots of dependencies.
+
+ - JDiskReport, a Java utility: [`pkgs/tools/misc/jdiskreport/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix). Nixpkgs doesn’t have a decent `stdenv` for Java yet so this is pretty ad-hoc.
+
+ - XML::Simple, a Perl module: [`pkgs/top-level/perl-packages.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix) (search for the `XMLSimple` attribute). Most Perl modules are so simple to build that they are defined directly in `perl-packages.nix`; no need to make a separate file for them.
+
+ - Adobe Reader: [`pkgs/applications/misc/adobe-reader/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix). Shows how binary-only packages can be supported. In particular the [builder](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh) uses `patchelf` to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime.
+
+ Some notes:
+
+ - All [`meta`](#chap-meta) attributes are optional, but it’s still a good idea to provide at least the `description`, `homepage` and [`license`](#sec-meta-license).
+
+ - You can use `nix-prefetch-url url` to get the SHA-256 hash of source distributions. There are similar commands as `nix-prefetch-git` and `nix-prefetch-hg` available in `nix-prefetch-scripts` package.
+
+ - A list of schemes for `mirror://` URLs can be found in [`pkgs/build-support/fetchurl/mirrors.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix).
+
+ The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the [chapter on writing Nix expressions](https://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions).
+
+4. Add a call to the function defined in the previous step to [`pkgs/top-level/all-packages.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix) with some descriptive name for the variable, e.g. `libfoo`.
+
+ ```ShellSession
+ $ emacs pkgs/top-level/all-packages.nix
+ ```
+
+ The attributes in that file are sorted by category (like “Development / Libraries”) that more-or-less correspond to the directory structure of Nixpkgs, and then by attribute name.
+
+5. To test whether the package builds, run the following command from the root of the nixpkgs source tree:
+
+ ```ShellSession
+ $ nix-build -A libfoo
+ ```
+
+ where `libfoo` should be the variable name defined in the previous step. You may want to add the flag `-K` to keep the temporary build directory in case something fails. If the build succeeds, a symlink `./result` to the package in the Nix store is created.
+
+6. If you want to install the package into your profile (optional), do
+
+ ```ShellSession
+ $ nix-env -f . -iA libfoo
+ ```
+
+7. Optionally commit the new package and open a pull request [to nixpkgs](https://github.com/NixOS/nixpkgs/pulls), or use [the Patches category](https://discourse.nixos.org/t/about-the-patches-category/477) on Discourse for sending a patch without a GitHub account.
diff --git a/third_party/nixpkgs/doc/contributing/quick-start.xml b/third_party/nixpkgs/doc/contributing/quick-start.xml
deleted file mode 100644
index 09d60834ec..0000000000
--- a/third_party/nixpkgs/doc/contributing/quick-start.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-
- Quick Start to Adding a Package
-
- To add a package to Nixpkgs:
-
-
-
- Checkout the Nixpkgs source tree:
-
-$ git clone https://github.com/NixOS/nixpkgs
-$ cd nixpkgs
-
-
-
-
- Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into pkgs/development/libraries/pkgname, while a web browser goes into pkgs/applications/networking/browsers/pkgname. See for some hints on the tree organisation. Create a directory for your package, e.g.
-
-$ mkdir pkgs/development/libraries/libfoo
-
-
-
-
- In the package directory, create a Nix expression — a piece of code that describes how to build the package. In this case, it should be a function that is called with the package dependencies as arguments, and returns a build of the package in the Nix store. The expression should usually be called default.nix.
-
-$ emacs pkgs/development/libraries/libfoo/default.nix
-$ git add pkgs/development/libraries/libfoo/default.nix
-
-
- You can have a look at the existing Nix expressions under pkgs/ to see how it’s done. Here are some good ones:
-
-
-
- GNU Hello: pkgs/applications/misc/hello/default.nix. Trivial package, which specifies some meta attributes which is good practice.
-
-
-
-
- GNU cpio: pkgs/tools/archivers/cpio/default.nix. Also a simple package. The generic builder in stdenv does everything for you. It has no dependencies beyond stdenv.
-
-
-
-
- GNU Multiple Precision arithmetic library (GMP): pkgs/development/libraries/gmp/5.1.x.nix. Also done by the generic builder, but has a dependency on m4.
-
-
-
-
- Pan, a GTK-based newsreader: pkgs/applications/networking/newsreaders/pan/default.nix. Has an optional dependency on gtkspell, which is only built if spellCheck is true.
-
-
-
-
- Apache HTTPD: pkgs/servers/http/apache-httpd/2.4.nix. A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery.
-
-
-
-
- Thunderbird: pkgs/applications/networking/mailreaders/thunderbird/default.nix. Lots of dependencies.
-
-
-
-
- JDiskReport, a Java utility: pkgs/tools/misc/jdiskreport/default.nix. Nixpkgs doesn’t have a decent stdenv for Java yet so this is pretty ad-hoc.
-
-
-
-
- XML::Simple, a Perl module: pkgs/top-level/perl-packages.nix (search for the XMLSimple attribute). Most Perl modules are so simple to build that they are defined directly in perl-packages.nix; no need to make a separate file for them.
-
-
-
-
- Adobe Reader: pkgs/applications/misc/adobe-reader/default.nix. Shows how binary-only packages can be supported. In particular the builder uses patchelf to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime.
-
-
-
-
-
- Some notes:
-
-
-
- All meta attributes are optional, but it’s still a good idea to provide at least the description, homepage and license.
-
-
-
-
- You can use nix-prefetch-url url to get the SHA-256 hash of source distributions. There are similar commands as nix-prefetch-git and nix-prefetch-hg available in nix-prefetch-scripts package.
-
-
-
-
- A list of schemes for mirror:// URLs can be found in pkgs/build-support/fetchurl/mirrors.nix.
-
-
-
-
-
- The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the chapter on writing Nix expressions.
-
-
-
-
- Add a call to the function defined in the previous step to pkgs/top-level/all-packages.nix with some descriptive name for the variable, e.g. libfoo.
-
-$ emacs pkgs/top-level/all-packages.nix
-
-
- The attributes in that file are sorted by category (like “Development / Libraries”) that more-or-less correspond to the directory structure of Nixpkgs, and then by attribute name.
-
-
-
-
- To test whether the package builds, run the following command from the root of the nixpkgs source tree:
-
-$ nix-build -A libfoo
- where libfoo should be the variable name defined in the previous step. You may want to add the flag to keep the temporary build directory in case something fails. If the build succeeds, a symlink ./result to the package in the Nix store is created.
-
-
-
-
- If you want to install the package into your profile (optional), do
-
-$ nix-env -f . -iA libfoo
-
-
-
-
- Optionally commit the new package and open a pull request to nixpkgs, or use the Patches category on Discourse for sending a patch without a GitHub account.
-
-
-
-
-
diff --git a/third_party/nixpkgs/doc/contributing/reviewing-contributions.chapter.md b/third_party/nixpkgs/doc/contributing/reviewing-contributions.chapter.md
new file mode 100644
index 0000000000..0dfe22199c
--- /dev/null
+++ b/third_party/nixpkgs/doc/contributing/reviewing-contributions.chapter.md
@@ -0,0 +1,204 @@
+# Reviewing contributions {#chap-reviewing-contributions}
+
+::: warning
+The following section is a draft, and the policy for reviewing is still being discussed in issues such as [#11166](https://github.com/NixOS/nixpkgs/issues/11166) and [#20836](https://github.com/NixOS/nixpkgs/issues/20836).
+:::
+
+The Nixpkgs project receives a fairly high number of contributions via GitHub pull requests. Reviewing and approving these is an important task and a way to contribute to the project.
+
+The high change rate of Nixpkgs makes any pull request that remains open for too long subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid this issue. GitHub provides sort filters that can be used to see the [most recently](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) and the [least recently](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc) updated pull requests. We highly encourage looking at [this list of ready to merge, unreviewed pull requests](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone).
+
+When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important to respect every community member and their work.
+
+GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution.
+
+pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
+
+All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking.
+
+## Package updates {#reviewing-contributions-package-updates}
+
+A package update is the most trivial and common type of pull request. These pull requests mainly consist of updating the version part of the package name and the source hash.
+
+It can happen that non-trivial updates include patches or more complex changes.
+
+Reviewing process:
+
+- Ensure that the package versioning fits the guidelines.
+- Ensure that the commit text fits the guidelines.
+- Ensure that the package maintainers are notified.
+ - [CODEOWNERS](https://help.github.com/articles/about-codeowners) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
+- Ensure that the meta field information is correct.
+ - License can change with version updates, so it should be checked to match the upstream license.
+ - If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package.
+- Ensure that the code contains no typos.
+- Building the package locally.
+ - pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds.
+ - It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone.
+ ```ShellSession
+ $ git fetch origin nixos-unstable
+ $ git fetch origin pull/PRNUMBER/head
+ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
+ ```
+ - The first command fetches the nixos-unstable branch.
+ - The second command fetches the pull request changes, `PRNUMBER` is the number at the end of the pull request title and `BASEBRANCH` the base branch of the pull request.
+ - The third command rebases the pull request changes to the nixos-unstable branch.
+ - The [nixpkgs-review](https://github.com/Mic92/nixpkgs-review) tool can be used to review a pull request content in a single command. `PRNUMBER` should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
+ ```ShellSession
+ $ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER"
+ ```
+- Running every binary.
+
+Sample template for a package update review is provided below.
+
+```markdown
+##### Reviewed points
+
+- [ ] package name fits guidelines
+- [ ] package version fits guidelines
+- [ ] package build on ARCHITECTURE
+- [ ] executables tested on ARCHITECTURE
+- [ ] all depending packages build
+
+##### Possible improvements
+
+##### Comments
+```
+
+## New packages {#reviewing-contributions-new-packages}
+
+New packages are a common type of pull requests. These pull requests consists in adding a new nix-expression for a package.
+
+Review process:
+
+- Ensure that the package versioning fits the guidelines.
+- Ensure that the commit name fits the guidelines.
+- Ensure that the meta fields contain correct information.
+ - License must match the upstream license.
+ - Platforms should be set (or the package will not get binary substitutes).
+ - Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package.
+- Report detected typos.
+- Ensure the package source:
+ - Uses mirror URLs when available.
+ - Uses the most appropriate functions (e.g. packages from GitHub should use `fetchFromGitHub`).
+- Building the package locally.
+- Running every binary.
+
+Sample template for a new package review is provided below.
+
+```markdown
+##### Reviewed points
+
+- [ ] package path fits guidelines
+- [ ] package name fits guidelines
+- [ ] package version fits guidelines
+- [ ] package build on ARCHITECTURE
+- [ ] executables tested on ARCHITECTURE
+- [ ] `meta.description` is set and fits guidelines
+- [ ] `meta.license` fits upstream license
+- [ ] `meta.platforms` is set
+- [ ] `meta.maintainers` is set
+- [ ] build time only dependencies are declared in `nativeBuildInputs`
+- [ ] source is fetched using the appropriate function
+- [ ] phases are respected
+- [ ] patches that are remotely available are fetched with `fetchpatch`
+
+##### Possible improvements
+
+##### Comments
+```
+
+## Module updates {#reviewing-contributions-module-updates}
+
+Module updates are submissions changing modules in some ways. These often contains changes to the options or introduce new options.
+
+Reviewing process:
+
+- Ensure that the module maintainers are notified.
+ - [CODEOWNERS](https://help.github.com/articles/about-codeowners/) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
+- Ensure that the module tests, if any, are succeeding.
+- Ensure that the introduced options are correct.
+ - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).
+ - Description, default and example should be provided.
+- Ensure that option changes are backward compatible.
+ - `mkRenamedOptionModule` and `mkAliasOptionModule` functions provide way to make option changes backward compatible.
+- Ensure that removed options are declared with `mkRemovedOptionModule`
+- Ensure that changes that are not backward compatible are mentioned in release notes.
+- Ensure that documentations affected by the change is updated.
+
+Sample template for a module update review is provided below.
+
+```markdown
+##### Reviewed points
+
+- [ ] changes are backward compatible
+- [ ] removed options are declared with `mkRemovedOptionModule`
+- [ ] changes that are not backward compatible are documented in release notes
+- [ ] module tests succeed on ARCHITECTURE
+- [ ] options types are appropriate
+- [ ] options description is set
+- [ ] options example is provided
+- [ ] documentation affected by the changes is updated
+
+##### Possible improvements
+
+##### Comments
+```
+
+## New modules {#reviewing-contributions-new-modules}
+
+New modules submissions introduce a new module to NixOS.
+
+Reviewing process:
+
+- Ensure that the module tests, if any, are succeeding.
+- Ensure that the introduced options are correct.
+ - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated).
+ - Description, default and example should be provided.
+- Ensure that module `meta` field is present
+ - Maintainers should be declared in `meta.maintainers`.
+ - Module documentation should be declared with `meta.doc`.
+- Ensure that the module respect other modules functionality.
+ - For example, enabling a module should not open firewall ports by default.
+
+Sample template for a new module review is provided below.
+
+```markdown
+##### Reviewed points
+
+- [ ] module path fits the guidelines
+- [ ] module tests succeed on ARCHITECTURE
+- [ ] options have appropriate types
+- [ ] options have default
+- [ ] options have example
+- [ ] options have descriptions
+- [ ] No unneeded package is added to environment.systemPackages
+- [ ] meta.maintainers is set
+- [ ] module documentation is declared in meta.doc
+
+##### Possible improvements
+
+##### Comments
+```
+
+## Other submissions {#reviewing-contributions-other-submissions}
+
+Other type of submissions requires different reviewing steps.
+
+If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints.
+
+Container system, boot system and library changes are some examples of the pull requests fitting this category.
+
+## Merging pull requests {#reviewing-contributions--merging-pull-requests}
+
+It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests.
+
+
+
+Please see the discussion in [GitHub nixpkgs issue #50105](https://github.com/NixOS/nixpkgs/issues/50105) for information on how to proceed to be granted this level of access.
+
+In a case a contributor definitively leaves the Nix community, they should create an issue or post on [Discourse](https://discourse.nixos.org) with references of packages and modules they maintain so the maintainership can be taken over by other contributors.
diff --git a/third_party/nixpkgs/doc/contributing/reviewing-contributions.xml b/third_party/nixpkgs/doc/contributing/reviewing-contributions.xml
deleted file mode 100644
index 7f83834bd8..0000000000
--- a/third_party/nixpkgs/doc/contributing/reviewing-contributions.xml
+++ /dev/null
@@ -1,488 +0,0 @@
-
- Reviewing contributions
-
-
- The following section is a draft, and the policy for reviewing is still being discussed in issues such as #11166 and #20836 .
-
-
-
- The Nixpkgs project receives a fairly high number of contributions via GitHub pull requests. Reviewing and approving these is an important task and a way to contribute to the project.
-
-
- The high change rate of Nixpkgs makes any pull request that remains open for too long subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being responsive to the comments is the key to avoid this issue. GitHub provides sort filters that can be used to see the most recently and the least recently updated pull requests. We highly encourage looking at this list of ready to merge, unreviewed pull requests.
-
-
- When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important to respect every community member and their work.
-
-
- GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution.
-
-
- pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
-
-
- All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking.
-
-
- Package updates
-
-
- A package update is the most trivial and common type of pull request. These pull requests mainly consist of updating the version part of the package name and the source hash.
-
-
-
- It can happen that non-trivial updates include patches or more complex changes.
-
-
-
- Reviewing process:
-
-
-
-
-
- Ensure that the package versioning fits the guidelines.
-
-
-
-
- Ensure that the commit text fits the guidelines.
-
-
-
-
- Ensure that the package maintainers are notified.
-
-
-
-
- CODEOWNERS will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
-
-
-
-
-
-
- Ensure that the meta field information is correct.
-
-
-
-
- License can change with version updates, so it should be checked to match the upstream license.
-
-
-
-
- If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package.
-
-
-
-
-
-
- Ensure that the code contains no typos.
-
-
-
-
- Building the package locally.
-
-
-
-
- pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds.
-
-
- It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone.
-
-$ git fetch origin nixos-unstable
-$ git fetch origin pull/PRNUMBER/head
-$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
-
-
-
-
- Fetching the nixos-unstable branch.
-
-
-
-
- Fetching the pull request changes, PRNUMBER is the number at the end of the pull request title and BASEBRANCH the base branch of the pull request.
-
-
-
-
- Rebasing the pull request changes to the nixos-unstable branch.
-
-
-
-
-
-
-
- The nixpkgs-review tool can be used to review a pull request content in a single command. PRNUMBER should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
-
-
-$ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER"
-
-
-
-
-
-
- Running every binary.
-
-
-
-
-
- Sample template for a package update review
-
-##### Reviewed points
-
-- [ ] package name fits guidelines
-- [ ] package version fits guidelines
-- [ ] package build on ARCHITECTURE
-- [ ] executables tested on ARCHITECTURE
-- [ ] all depending packages build
-
-##### Possible improvements
-
-##### Comments
-
-
-
-
-
- New packages
-
-
- New packages are a common type of pull requests. These pull requests consists in adding a new nix-expression for a package.
-
-
-
- Review process:
-
-
-
-
-
- Ensure that the package versioning fits the guidelines.
-
-
-
-
- Ensure that the commit name fits the guidelines.
-
-
-
-
- Ensure that the meta fields contain correct information.
-
-
-
-
- License must match the upstream license.
-
-
-
-
- Platforms should be set (or the package will not get binary substitutes).
-
-
-
-
- Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package.
-
-
-
-
-
-
- Report detected typos.
-
-
-
-
- Ensure the package source:
-
-
-
-
- Uses mirror URLs when available.
-
-
-
-
- Uses the most appropriate functions (e.g. packages from GitHub should use fetchFromGitHub).
-
-
-
-
-
-
- Building the package locally.
-
-
-
-
- Running every binary.
-
-
-
-
-
- Sample template for a new package review
-
-##### Reviewed points
-
-- [ ] package path fits guidelines
-- [ ] package name fits guidelines
-- [ ] package version fits guidelines
-- [ ] package build on ARCHITECTURE
-- [ ] executables tested on ARCHITECTURE
-- [ ] `meta.description` is set and fits guidelines
-- [ ] `meta.license` fits upstream license
-- [ ] `meta.platforms` is set
-- [ ] `meta.maintainers` is set
-- [ ] build time only dependencies are declared in `nativeBuildInputs`
-- [ ] source is fetched using the appropriate function
-- [ ] phases are respected
-- [ ] patches that are remotely available are fetched with `fetchpatch`
-
-##### Possible improvements
-
-##### Comments
-
-
-
-
-
- Module updates
-
-
- Module updates are submissions changing modules in some ways. These often contains changes to the options or introduce new options.
-
-
-
- Reviewing process
-
-
-
-
-
- Ensure that the module maintainers are notified.
-
-
-
-
- CODEOWNERS will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
-
-
-
-
-
-
- Ensure that the module tests, if any, are succeeding.
-
-
-
-
- Ensure that the introduced options are correct.
-
-
-
-
- Type should be appropriate (string related types differs in their merging capabilities, optionSet and string types are deprecated).
-
-
-
-
- Description, default and example should be provided.
-
-
-
-
-
-
- Ensure that option changes are backward compatible.
-
-
-
-
- mkRenamedOptionModule and mkAliasOptionModule functions provide way to make option changes backward compatible.
-
-
-
-
-
-
- Ensure that removed options are declared with mkRemovedOptionModule
-
-
-
-
- Ensure that changes that are not backward compatible are mentioned in release notes.
-
-
-
-
- Ensure that documentations affected by the change is updated.
-
-
-
-
-
- Sample template for a module update review
-
-##### Reviewed points
-
-- [ ] changes are backward compatible
-- [ ] removed options are declared with `mkRemovedOptionModule`
-- [ ] changes that are not backward compatible are documented in release notes
-- [ ] module tests succeed on ARCHITECTURE
-- [ ] options types are appropriate
-- [ ] options description is set
-- [ ] options example is provided
-- [ ] documentation affected by the changes is updated
-
-##### Possible improvements
-
-##### Comments
-
-
-
-
-
- New modules
-
-
- New modules submissions introduce a new module to NixOS.
-
-
-
-
-
- Ensure that the module tests, if any, are succeeding.
-
-
-
-
- Ensure that the introduced options are correct.
-
-
-
-
- Type should be appropriate (string related types differs in their merging capabilities, optionSet and string types are deprecated).
-
-
-
-
- Description, default and example should be provided.
-
-
-
-
-
-
- Ensure that module meta field is present
-
-
-
-
- Maintainers should be declared in meta.maintainers.
-
-
-
-
- Module documentation should be declared with meta.doc.
-
-
-
-
-
-
- Ensure that the module respect other modules functionality.
-
-
-
-
- For example, enabling a module should not open firewall ports by default.
-
-
-
-
-
-
-
- Sample template for a new module review
-
-##### Reviewed points
-
-- [ ] module path fits the guidelines
-- [ ] module tests succeed on ARCHITECTURE
-- [ ] options have appropriate types
-- [ ] options have default
-- [ ] options have example
-- [ ] options have descriptions
-- [ ] No unneeded package is added to environment.systemPackages
-- [ ] meta.maintainers is set
-- [ ] module documentation is declared in meta.doc
-
-##### Possible improvements
-
-##### Comments
-
-
-
-
-
- Other submissions
-
-
- Other type of submissions requires different reviewing steps.
-
-
-
- If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints.
-
-
-
- Container system, boot system and library changes are some examples of the pull requests fitting this category.
-
-
-
- Merging pull requests
-
-
- It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests.
-
-
-
-
-
- Please see the discussion in GitHub nixpkgs issue #50105 for information on how to proceed to be granted this level of access.
-
-
-
- In a case a contributor definitively leaves the Nix community, they should create an issue or post on Discourse with references of packages and modules they maintain so the maintainership can be taken over by other contributors.
-
-
-
diff --git a/third_party/nixpkgs/doc/manual.xml b/third_party/nixpkgs/doc/manual.xml
index 1c5a7bbcaa..6ea4addc36 100644
--- a/third_party/nixpkgs/doc/manual.xml
+++ b/third_party/nixpkgs/doc/manual.xml
@@ -32,11 +32,11 @@
Contributing to Nixpkgs
-
-
+
+
-
-
+
+
diff --git a/third_party/nixpkgs/lib/systems/doubles.nix b/third_party/nixpkgs/lib/systems/doubles.nix
index 8220bca249..6f638be585 100644
--- a/third_party/nixpkgs/lib/systems/doubles.nix
+++ b/third_party/nixpkgs/lib/systems/doubles.nix
@@ -6,43 +6,53 @@ let
inherit (lib.attrsets) matchAttrs;
all = [
- "aarch64-linux"
- "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux"
-
- "mipsel-linux"
-
- "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
-
- "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux"
- "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
+ # Cygwin
+ "i686-cygwin" "x86_64-cygwin"
+ # Darwin
"x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
- "x86_64-windows" "i686-windows"
+ # FreeBSD
+ "i686-freebsd" "x86_64-freebsd"
- "wasm64-wasi" "wasm32-wasi"
+ # Genode
+ "aarch64-genode" "i686-genode" "x86_64-genode"
- "x86_64-redox"
-
- "powerpc64-linux"
- "powerpc64le-linux"
-
- "riscv32-linux" "riscv64-linux"
-
- "arm-none" "armv6l-none" "aarch64-none"
- "avr-none"
- "i686-none" "x86_64-none"
- "powerpc-none"
- "msp430-none"
- "riscv64-none" "riscv32-none"
- "vc4-none"
- "or1k-none"
-
- "mmix-mmixware"
+ # illumos
+ "x86_64-solaris"
+ # JS
"js-ghcjs"
- "aarch64-genode" "i686-genode" "x86_64-genode"
+ # Linux
+ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
+ "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux"
+ "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux"
+
+ # MMIXware
+ "mmix-mmixware"
+
+ # NetBSD
+ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd"
+ "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd"
+ "riscv64-netbsd" "x86_64-netbsd"
+
+ # none
+ "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
+ "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none"
+ "x86_64-none"
+
+ # OpenBSD
+ "i686-openbsd" "x86_64-openbsd"
+
+ # Redox
+ "x86_64-redox"
+
+ # WASI
+ "wasm64-wasi" "wasm32-wasi"
+
+ # Windows
+ "x86_64-windows" "i686-windows"
];
allParsed = map parse.mkSystemFromString all;
diff --git a/third_party/nixpkgs/lib/tests/systems.nix b/third_party/nixpkgs/lib/tests/systems.nix
index c0800df25e..36f82b783b 100644
--- a/third_party/nixpkgs/lib/tests/systems.nix
+++ b/third_party/nixpkgs/lib/tests/systems.nix
@@ -15,9 +15,9 @@ in
with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);
- testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
+ testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
- testmips = mseteq mips [ "mipsel-linux" ];
+ testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ];
testmmix = mseteq mmix [ "mmix-mmixware" ];
testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
@@ -29,7 +29,7 @@ with lib.systems.doubles; lib.runTests {
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ];
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ];
- testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
+ testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 28413f04f8..1cdd23872a 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -3008,13 +3008,13 @@
name = "John Ericson";
};
erictapen = {
- email = "justin.humm@posteo.de";
+ email = "kerstin@erictapen.name";
github = "erictapen";
githubId = 11532355;
- name = "Justin Humm";
+ name = "Kerstin Humm";
keys = [{
- longkeyid = "rsa4096/0x438871E000AA178E";
- fingerprint = "984E 4BAD 9127 4D0E AE47 FF03 4388 71E0 00AA 178E";
+ longkeyid = "rsa4096/0x40293358C7B9326B";
+ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B";
}];
};
erikryb = {
@@ -4401,6 +4401,12 @@
githubId = 5283991;
name = "Jake Waksbaum";
};
+ jakubgs = {
+ email = "jakub@gsokolowski.pl";
+ github = "jakubgs";
+ githubId = 2212681;
+ name = "Jakub Grzgorz Sokołowski";
+ };
jamiemagee = {
email = "jamie.magee@gmail.com";
github = "JamieMagee";
@@ -6977,6 +6983,12 @@
githubId = 818502;
name = "Nathan Yong";
};
+ nbren12 = {
+ email = "nbren12@gmail.com";
+ github = "nbren12";
+ githubId = 1386642;
+ name = "Noah Brenowitz";
+ };
nckx = {
email = "github@tobias.gr";
github = "nckx";
@@ -7955,6 +7967,12 @@
githubId = 18549627;
name = "Proglodyte";
};
+ progval = {
+ email = "progval+nix@progval.net";
+ github = "ProgVal";
+ githubId = 406946;
+ name = "Valentin Lorentz";
+ };
protoben = {
email = "protob3n@gmail.com";
github = "protoben";
@@ -9414,8 +9432,8 @@
name = "Stian Lågstad";
};
StijnDW = {
- email = "stekke@airmail.cc";
- github = "StijnDW";
+ email = "nixdev@rinsa.eu";
+ github = "Stekke";
githubId = 1751956;
name = "Stijn DW";
};
@@ -9687,12 +9705,6 @@
githubId = 102685;
name = "Thomas Friese";
};
- tavyc = {
- email = "octavian.cerna@gmail.com";
- github = "tavyc";
- githubId = 3650609;
- name = "Octavian Cerna";
- };
tazjin = {
email = "mail@tazj.in";
github = "tazjin";
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml
index 5f70f74d5d..5a95436915 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -186,6 +186,25 @@ start_all()
+
+
+ get_screen_text_variants
+
+
+
+ Return a list of different interpretations of what is currently visible
+ on the machine's screen using optical character recognition. The number
+ and order of the interpretations is not specified and is subject to
+ change, but if no exception is raised at least one will be returned.
+
+
+
+ This requires passing to the test attribute
+ set.
+
+
+
+
get_screen_text
@@ -350,7 +369,8 @@ start_all()
Wait until the supplied regular expressions matches the textual contents
of the screen by using optical character recognition (see
- get_screen_text).
+ get_screen_text and
+ get_screen_text_variants).
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
index e0552c25a8..5fbef88c4a 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
@@ -680,6 +680,13 @@ environment.systemPackages = [
All CUDA toolkit versions prior to CUDA 10 have been removed.
+
+
+ The babeld service is now being run as an unprivileged user. To achieve that the module configures
+ skip-kernel-setup true and takes care of setting forwarding and rp_filter sysctls by itself as well
+ as for each interface in services.babeld.interfaces.
+
+
diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py
index 96b75a4992..7800a49e41 100644
--- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py
+++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py
@@ -1,7 +1,7 @@
#! /somewhere/python3
from contextlib import contextmanager, _GeneratorContextManager
from queue import Queue, Empty
-from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
+from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List, Iterable
from xml.sax.saxutils import XMLGenerator
import queue
import io
@@ -205,6 +205,37 @@ class Logger:
self.xml.endElement("nest")
+def _perform_ocr_on_screenshot(
+ screenshot_path: str, model_ids: Iterable[int]
+) -> List[str]:
+ if shutil.which("tesseract") is None:
+ raise Exception("OCR requested but enableOCR is false")
+
+ magick_args = (
+ "-filter Catrom -density 72 -resample 300 "
+ + "-contrast -normalize -despeckle -type grayscale "
+ + "-sharpen 1 -posterize 3 -negate -gamma 100 "
+ + "-blur 1x65535"
+ )
+
+ tess_args = f"-c debug_file=/dev/null --psm 11"
+
+ cmd = f"convert {magick_args} {screenshot_path} tiff:{screenshot_path}.tiff"
+ ret = subprocess.run(cmd, shell=True, capture_output=True)
+ if ret.returncode != 0:
+ raise Exception(f"TIFF conversion failed with exit code {ret.returncode}")
+
+ model_results = []
+ for model_id in model_ids:
+ cmd = f"tesseract {screenshot_path}.tiff - {tess_args} --oem {model_id}"
+ ret = subprocess.run(cmd, shell=True, capture_output=True)
+ if ret.returncode != 0:
+ raise Exception(f"OCR failed with exit code {ret.returncode}")
+ model_results.append(ret.stdout.decode("utf-8"))
+
+ return model_results
+
+
class Machine:
def __init__(self, args: Dict[str, Any]) -> None:
if "name" in args:
@@ -637,43 +668,29 @@ class Machine:
"""Debugging: Dump the contents of the TTY"""
self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty))
+ def _get_screen_text_variants(self, model_ids: Iterable[int]) -> List[str]:
+ with tempfile.TemporaryDirectory() as tmpdir:
+ screenshot_path = os.path.join(tmpdir, "ppm")
+ self.send_monitor_command(f"screendump {screenshot_path}")
+ return _perform_ocr_on_screenshot(screenshot_path, model_ids)
+
+ def get_screen_text_variants(self) -> List[str]:
+ return self._get_screen_text_variants([0, 1, 2])
+
def get_screen_text(self) -> str:
- if shutil.which("tesseract") is None:
- raise Exception("get_screen_text used but enableOCR is false")
-
- magick_args = (
- "-filter Catrom -density 72 -resample 300 "
- + "-contrast -normalize -despeckle -type grayscale "
- + "-sharpen 1 -posterize 3 -negate -gamma 100 "
- + "-blur 1x65535"
- )
-
- tess_args = "-c debug_file=/dev/null --psm 11 --oem 2"
-
- with self.nested("performing optical character recognition"):
- with tempfile.NamedTemporaryFile() as tmpin:
- self.send_monitor_command("screendump {}".format(tmpin.name))
-
- cmd = "convert {} {} tiff:- | tesseract - - {}".format(
- magick_args, tmpin.name, tess_args
- )
- ret = subprocess.run(cmd, shell=True, capture_output=True)
- if ret.returncode != 0:
- raise Exception(
- "OCR failed with exit code {}".format(ret.returncode)
- )
-
- return ret.stdout.decode("utf-8")
+ return self._get_screen_text_variants([2])[0]
def wait_for_text(self, regex: str) -> None:
def screen_matches(last: bool) -> bool:
- text = self.get_screen_text()
- matches = re.search(regex, text) is not None
+ variants = self.get_screen_text_variants()
+ for text in variants:
+ if re.search(regex, text) is not None:
+ return True
- if last and not matches:
- self.log("Last OCR attempt failed. Text was: {}".format(text))
+ if last:
+ self.log("Last OCR attempt failed. Text was: {}".format(variants))
- return matches
+ return False
with self.nested("waiting for {} to appear on screen".format(regex)):
retry(screen_matches)
diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix
index 2b6a61e9a8..567a8b6f3b 100644
--- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix
+++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix
@@ -6,6 +6,12 @@ let
ids = config.ids;
cfg = config.users;
+ isPasswdCompatible = str: !(hasInfix ":" str || hasInfix "\n" str);
+ passwdEntry = type: lib.types.addCheck type isPasswdCompatible // {
+ name = "passwdEntry ${type.name}";
+ description = "${type.description}, not containing newlines or colons";
+ };
+
# Check whether a password hash will allow login.
allowsLogin = hash:
hash == "" # login without password
@@ -54,7 +60,7 @@ let
options = {
name = mkOption {
- type = types.str;
+ type = passwdEntry types.str;
apply = x: assert (builtins.stringLength x < 32 || abort "Username '${x}' is longer than 31 characters which is not allowed!"); x;
description = ''
The name of the user account. If undefined, the name of the
@@ -63,7 +69,7 @@ let
};
description = mkOption {
- type = types.str;
+ type = passwdEntry types.str;
default = "";
example = "Alice Q. User";
description = ''
@@ -128,7 +134,7 @@ let
};
home = mkOption {
- type = types.path;
+ type = passwdEntry types.path;
default = "/var/empty";
description = "The user's home directory.";
};
@@ -157,7 +163,7 @@ let
};
shell = mkOption {
- type = types.nullOr (types.either types.shellPackage types.path);
+ type = types.nullOr (types.either types.shellPackage (passwdEntry types.path));
default = pkgs.shadow;
defaultText = "pkgs.shadow";
example = literalExample "pkgs.bashInteractive";
@@ -217,7 +223,7 @@ let
};
hashedPassword = mkOption {
- type = with types; nullOr str;
+ type = with types; nullOr (passwdEntry str);
default = null;
description = ''
Specifies the hashed password for the user.
@@ -251,7 +257,7 @@ let
};
initialHashedPassword = mkOption {
- type = with types; nullOr str;
+ type = with types; nullOr (passwdEntry str);
default = null;
description = ''
Specifies the initial hashed password for the user, i.e. the
@@ -323,7 +329,7 @@ let
options = {
name = mkOption {
- type = types.str;
+ type = passwdEntry types.str;
description = ''
The name of the group. If undefined, the name of the attribute set
will be used.
@@ -340,7 +346,7 @@ let
};
members = mkOption {
- type = with types; listOf str;
+ type = with types; listOf (passwdEntry str);
default = [];
description = ''
The user names of the group members, added to the
diff --git a/third_party/nixpkgs/nixos/modules/hardware/printers.nix b/third_party/nixpkgs/nixos/modules/hardware/printers.nix
index 752de41f26..c587076dcd 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/printers.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/printers.nix
@@ -15,7 +15,7 @@ let
${ppdOptionsString p.ppdOptions}
'';
ensureDefaultPrinter = name: ''
- ${pkgs.cups}/bin/lpoptions -d '${name}'
+ ${pkgs.cups}/bin/lpadmin -d '${name}'
'';
# "graph but not # or /" can't be implemented as regex alone due to missing lookahead support
diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
index 21f2e730c3..cb2dbf6c85 100644
--- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
@@ -163,7 +163,7 @@ in
# List packages installed in system profile. To search, run:
# \$ nix search wget
# environment.systemPackages = with pkgs; [
- # nano vim # don't forget to add an editor to edit configuration.nix!
+ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# firefox
# ];
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 0bf944d364..98ba5ba48b 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -133,6 +133,7 @@
./programs/file-roller.nix
./programs/firejail.nix
./programs/fish.nix
+ ./programs/flexoptix-app.nix
./programs/freetds.nix
./programs/fuse.nix
./programs/geary.nix
@@ -767,7 +768,6 @@
./services/networking/prayer.nix
./services/networking/privoxy.nix
./services/networking/prosody.nix
- ./services/networking/quagga.nix
./services/networking/quassel.nix
./services/networking/quorum.nix
./services/networking/quicktun.nix
diff --git a/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix b/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix
new file mode 100644
index 0000000000..93dcdfeb51
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.flexoptix-app;
+in {
+ options = {
+ programs.flexoptix-app = {
+ enable = mkEnableOption "FLEXOPTIX app + udev rules";
+
+ package = mkOption {
+ description = "FLEXOPTIX app package to use";
+ type = types.package;
+ default = pkgs.flexoptix-app;
+ defaultText = "\${pkgs.flexoptix-app}";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ cfg.package ];
+ services.udev.packages = [ cfg.package ];
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix
index 9f1efc4627..233e3ee848 100644
--- a/third_party/nixpkgs/nixos/modules/rename.nix
+++ b/third_party/nixpkgs/nixos/modules/rename.nix
@@ -18,6 +18,7 @@ with lib;
# Completely removed modules
(mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs")
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix
index 9ac6869068..61214508a9 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix
@@ -192,6 +192,7 @@ in
path = [ pkgs.nagios ] ++ cfg.plugins;
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
+ restartTriggers = [ nagiosCfgFile ];
serviceConfig = {
User = "nagios";
@@ -201,7 +202,6 @@ in
LogsDirectory = "nagios";
StateDirectory = "nagios";
ExecStart = "${pkgs.nagios}/bin/nagios /etc/nagios.cfg";
- X-ReloadIfChanged = nagiosCfgFile;
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/vnstat.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/vnstat.nix
index e9bedb704a..5e19c39956 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/vnstat.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/vnstat.nix
@@ -6,21 +6,21 @@ let
cfg = config.services.vnstat;
in {
options.services.vnstat = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable update of network usage statistics via vnstatd.
- '';
- };
+ enable = mkEnableOption "update of network usage statistics via vnstatd";
};
config = mkIf cfg.enable {
- users.users.vnstatd = {
- isSystemUser = true;
- description = "vnstat daemon user";
- home = "/var/lib/vnstat";
- createHome = true;
+
+ environment.systemPackages = [ pkgs.vnstat ];
+
+ users = {
+ groups.vnstatd = {};
+
+ users.vnstatd = {
+ isSystemUser = true;
+ group = "vnstatd";
+ description = "vnstat daemon user";
+ };
};
systemd.services.vnstat = {
@@ -33,7 +33,6 @@ in {
"man:vnstat(1)"
"man:vnstat.conf(5)"
];
- preStart = "chmod 755 /var/lib/vnstat";
serviceConfig = {
ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";
ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID";
@@ -52,7 +51,10 @@ in {
RestrictNamespaces = true;
User = "vnstatd";
+ Group = "vnstatd";
};
};
};
+
+ meta.maintainers = [ maintainers.evils ];
}
diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix
index 88d355ff32..6d8dfcce93 100644
--- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix
@@ -216,14 +216,11 @@ in {
systemd.packages = [ cfg.package ];
- systemd.services.ipfs-init = {
- description = "IPFS Initializer";
-
+ systemd.services.ipfs = {
+ path = [ "/run/wrappers" cfg.package ];
environment.IPFS_PATH = cfg.dataDir;
- path = [ cfg.package ];
-
- script = ''
+ preStart = ''
if [[ ! -f ${cfg.dataDir}/config ]]; then
ipfs init ${optionalString cfg.emptyRepo "-e"} \
${optionalString (! cfg.localDiscovery) "--profile=server"}
@@ -233,26 +230,7 @@ in {
else "ipfs config profile apply server"
}
fi
- '';
-
- wantedBy = [ "default.target" ];
-
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
- User = cfg.user;
- Group = cfg.group;
- };
- };
-
- systemd.services.ipfs = {
- path = [ "/run/wrappers" cfg.package ];
- environment.IPFS_PATH = cfg.dataDir;
-
- wants = [ "ipfs-init.service" ];
- after = [ "ipfs-init.service" ];
-
- preStart = optionalString cfg.autoMount ''
+ '' + optionalString cfg.autoMount ''
ipfs --local config Mounts.FuseAllowOther --json true
ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix b/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix
index e16e56121c..97dca002a0 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix
@@ -19,7 +19,10 @@ let
"interface ${name} ${paramsString interface}\n";
configFile = with cfg; pkgs.writeText "babeld.conf" (
- (optionalString (cfg.interfaceDefaults != null) ''
+ ''
+ skip-kernel-setup true
+ ''
+ + (optionalString (cfg.interfaceDefaults != null) ''
default ${paramsString cfg.interfaceDefaults}
'')
+ (concatMapStrings interfaceConfig (attrNames cfg.interfaces))
@@ -84,13 +87,22 @@ in
config = mkIf config.services.babeld.enable {
+ boot.kernel.sysctl = {
+ "net.ipv6.conf.all.forwarding" = 1;
+ "net.ipv6.conf.all.accept_redirects" = 0;
+ "net.ipv4.conf.all.forwarding" = 1;
+ "net.ipv4.conf.all.rp_filter" = 0;
+ } // lib.mapAttrs' (ifname: _: lib.nameValuePair "net.ipv4.conf.${ifname}.rp_filter" (lib.mkDefault 0)) config.services.babeld.interfaces;
+
systemd.services.babeld = {
description = "Babel routing daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state";
+ AmbientCapabilities = [ "CAP_NET_ADMIN" ];
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
+ DynamicUser = true;
IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ];
IPAddressDeny = "any";
LockPersonality = true;
@@ -98,7 +110,7 @@ in
MemoryDenyWriteExecute = true;
ProtectSystem = "strict";
ProtectClock = true;
- ProtectKernelTunables = false; # Couldn't write sysctl: Read-only file system
+ ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/quagga.nix b/third_party/nixpkgs/nixos/modules/services/networking/quagga.nix
deleted file mode 100644
index 7c169fe62d..0000000000
--- a/third_party/nixpkgs/nixos/modules/services/networking/quagga.nix
+++ /dev/null
@@ -1,185 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.quagga;
-
- services = [ "babel" "bgp" "isis" "ospf6" "ospf" "pim" "rip" "ripng" ];
- allServices = services ++ [ "zebra" ];
-
- isEnabled = service: cfg.${service}.enable;
-
- daemonName = service: if service == "zebra" then service else "${service}d";
-
- configFile = service:
- let
- scfg = cfg.${service};
- in
- if scfg.configFile != null then scfg.configFile
- else pkgs.writeText "${daemonName service}.conf"
- ''
- ! Quagga ${daemonName service} configuration
- !
- hostname ${config.networking.hostName}
- log syslog
- service password-encryption
- !
- ${scfg.config}
- !
- end
- '';
-
- serviceOptions = service:
- {
- enable = mkEnableOption "the Quagga ${toUpper service} routing protocol";
-
- configFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/etc/quagga/${daemonName service}.conf";
- description = ''
- Configuration file to use for Quagga ${daemonName service}.
- By default the NixOS generated files are used.
- '';
- };
-
- config = mkOption {
- type = types.lines;
- default = "";
- example =
- let
- examples = {
- rip = ''
- router rip
- network 10.0.0.0/8
- '';
-
- ospf = ''
- router ospf
- network 10.0.0.0/8 area 0
- '';
-
- bgp = ''
- router bgp 65001
- neighbor 10.0.0.1 remote-as 65001
- '';
- };
- in
- examples.${service} or "";
- description = ''
- ${daemonName service} configuration statements.
- '';
- };
-
- vtyListenAddress = mkOption {
- type = types.str;
- default = "127.0.0.1";
- description = ''
- Address to bind to for the VTY interface.
- '';
- };
-
- vtyListenPort = mkOption {
- type = types.nullOr types.int;
- default = null;
- description = ''
- TCP Port to bind to for the VTY interface.
- '';
- };
- };
-
-in
-
-{
-
- ###### interface
- imports = [
- {
- options.services.quagga = {
- zebra = (serviceOptions "zebra") // {
- enable = mkOption {
- type = types.bool;
- default = any isEnabled services;
- description = ''
- Whether to enable the Zebra routing manager.
-
- The Zebra routing manager is automatically enabled
- if any routing protocols are configured.
- '';
- };
- };
- };
- }
- { options.services.quagga = (genAttrs services serviceOptions); }
- ];
-
- ###### implementation
-
- config = mkIf (any isEnabled allServices) {
-
- environment.systemPackages = [
- pkgs.quagga # for the vtysh tool
- ];
-
- users.users.quagga = {
- description = "Quagga daemon user";
- isSystemUser = true;
- group = "quagga";
- };
-
- users.groups = {
- quagga = {};
- # Members of the quaggavty group can use vtysh to inspect the Quagga daemons
- quaggavty = { members = [ "quagga" ]; };
- };
-
- systemd.services =
- let
- quaggaService = service:
- let
- scfg = cfg.${service};
- daemon = daemonName service;
- in
- nameValuePair daemon ({
- wantedBy = [ "multi-user.target" ];
- restartTriggers = [ (configFile service) ];
-
- serviceConfig = {
- Type = "forking";
- PIDFile = "/run/quagga/${daemon}.pid";
- ExecStart = "@${pkgs.quagga}/libexec/quagga/${daemon} ${daemon} -d -f ${configFile service}"
- + optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}"
- + optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}";
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- Restart = "on-abort";
- };
- } // (
- if service == "zebra" then
- {
- description = "Quagga Zebra routing manager";
- unitConfig.Documentation = "man:zebra(8)";
- after = [ "network.target" ];
- preStart = ''
- install -m 0755 -o quagga -g quagga -d /run/quagga
-
- ${pkgs.iproute2}/bin/ip route flush proto zebra
- '';
- }
- else
- {
- description = "Quagga ${toUpper service} routing daemon";
- unitConfig.Documentation = "man:${daemon}(8) man:zebra(8)";
- bindsTo = [ "zebra.service" ];
- after = [ "network.target" "zebra.service" ];
- }
- ));
- in
- listToAttrs (map quaggaService (filter isEnabled allServices));
-
- };
-
- meta.maintainers = with lib.maintainers; [ tavyc ];
-
-}
diff --git a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix
index 033ff5ef4b..53bd9efa5a 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix
@@ -5,6 +5,21 @@ with lib;
let
cfg = config.services.sshguard;
+ configFile = let
+ args = lib.concatStringsSep " " ([
+ "-afb"
+ "-p info"
+ "-o cat"
+ "-n1"
+ ] ++ (map (name: "-t ${escapeShellArg name}") cfg.services));
+ backend = if config.networking.nftables.enable
+ then "sshg-fw-nft-sets"
+ else "sshg-fw-ipset";
+ in pkgs.writeText "sshguard.conf" ''
+ BACKEND="${pkgs.sshguard}/libexec/${backend}"
+ LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}"
+ '';
+
in {
###### interface
@@ -85,20 +100,7 @@ in {
config = mkIf cfg.enable {
- environment.etc."sshguard.conf".text = let
- args = lib.concatStringsSep " " ([
- "-afb"
- "-p info"
- "-o cat"
- "-n1"
- ] ++ (map (name: "-t ${escapeShellArg name}") cfg.services));
- backend = if config.networking.nftables.enable
- then "sshg-fw-nft-sets"
- else "sshg-fw-ipset";
- in ''
- BACKEND="${pkgs.sshguard}/libexec/${backend}"
- LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}"
- '';
+ environment.etc."sshguard.conf".source = configFile;
systemd.services.sshguard = {
description = "SSHGuard brute-force attacks protection system";
@@ -107,6 +109,8 @@ in {
after = [ "network.target" ];
partOf = optional config.networking.firewall.enable "firewall.service";
+ restartTriggers = [ configFile ];
+
path = with pkgs; if config.networking.nftables.enable
then [ nftables iproute2 systemd ]
else [ iptables ipset iproute2 systemd ];
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
index 16e8ae2ec0..661320b5d0 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
@@ -31,6 +31,8 @@ let
// (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {})
// cfg.extraConfig;
+ systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@resources" "@setuid" "@swap" ];
+
cfgService = {
# User and group
User = cfg.user;
@@ -68,7 +70,6 @@ let
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
- SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @reboot @resources @setuid @swap";
};
envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") (
@@ -432,6 +433,8 @@ in {
serviceConfig = {
Type = "oneshot";
WorkingDirectory = cfg.package;
+ # System Call Filtering
+ SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;
} // cfgService;
after = [ "network.target" ];
@@ -457,6 +460,8 @@ in {
Type = "oneshot";
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
WorkingDirectory = cfg.package;
+ # System Call Filtering
+ SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;
} // cfgService;
after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []);
wantedBy = [ "multi-user.target" ];
@@ -481,6 +486,8 @@ in {
# Runtime directory and mode
RuntimeDirectory = "mastodon-streaming";
RuntimeDirectoryMode = "0750";
+ # System Call Filtering
+ SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
} // cfgService;
};
@@ -503,6 +510,8 @@ in {
# Runtime directory and mode
RuntimeDirectory = "mastodon-web";
RuntimeDirectoryMode = "0750";
+ # System Call Filtering
+ SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
} // cfgService;
path = with pkgs; [ file imagemagick ffmpeg ];
};
@@ -522,6 +531,8 @@ in {
RestartSec = 20;
EnvironmentFile = "/var/lib/mastodon/.secrets_env";
WorkingDirectory = cfg.package;
+ # System Call Filtering
+ SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]);
} // cfgService;
path = with pkgs; [ file imagemagick ffmpeg ];
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index 58e8e5a0a8..545deaa905 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
@@ -10,7 +10,7 @@ let
extensions = { enabled, all }:
(with all;
enabled
- ++ optional (!cfg.disableImagemagick) imagick
+ ++ optional cfg.enableImagemagick imagick
# Optionally enabled depending on caching settings
++ optional cfg.caching.apcu apcu
++ optional cfg.caching.redis redis
@@ -63,6 +63,9 @@ in {
Further details about this can be found in the `Nextcloud`-section of the NixOS-manual
(which can be openend e.g. by running `nixos-help`).
'')
+ (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
+ Use services.nextcloud.nginx.enableImagemagick instead.
+ '')
];
options.services.nextcloud = {
@@ -303,16 +306,14 @@ in {
};
};
- disableImagemagick = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to not load the ImageMagick module into PHP.
+ enableImagemagick = mkEnableOption ''
+ Whether to load the ImageMagick module into PHP.
This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF).
You may want to disable it for increased security. In that case, previews will still be available
for some images (e.g. JPEG and PNG).
See https://github.com/nextcloud/server/issues/13099
- '';
+ '' // {
+ default = true;
};
caching = {
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
index 51c2f3febd..18e1263fef 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
@@ -887,6 +887,7 @@ in
users.users = optionalAttrs (cfg.user == "nginx") {
nginx = {
group = cfg.group;
+ isSystemUser = true;
uid = config.ids.uids.nginx;
};
};
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 6f756aa85c..a6a1c5619b 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -342,7 +342,6 @@ in
proxy = handleTest ./proxy.nix {};
pt2-clone = handleTest ./pt2-clone.nix {};
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
- quagga = handleTest ./quagga.nix {};
quorum = handleTest ./quorum.nix {};
rabbitmq = handleTest ./rabbitmq.nix {};
radarr = handleTest ./radarr.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/babeld.nix b/third_party/nixpkgs/nixos/tests/babeld.nix
index 5817ea4ce1..d4df6f86d0 100644
--- a/third_party/nixpkgs/nixos/tests/babeld.nix
+++ b/third_party/nixpkgs/nixos/tests/babeld.nix
@@ -25,9 +25,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
{
virtualisation.vlans = [ 10 20 ];
- boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1;
- boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
-
networking = {
useDHCP = false;
firewall.enable = false;
@@ -74,9 +71,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
{
virtualisation.vlans = [ 20 30 ];
- boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1;
- boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
-
networking = {
useDHCP = false;
firewall.enable = false;
diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix
index 5074b6cdaf..76f7f68dc9 100644
--- a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix
+++ b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix
@@ -51,7 +51,7 @@ in {
nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }:
lib.mkMerge
[ (nextcloud args)
- { services.nextcloud.disableImagemagick = true; } ];
+ { services.nextcloud.enableImagemagick = false; } ];
};
testScript = { nodes, ... }: let
diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
index 62c0080dd5..9aa430c25a 100644
--- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
+++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
@@ -118,6 +118,8 @@ let
metricProvider = {
services.bird2.enable = true;
services.bird2.config = ''
+ router id 127.0.0.1;
+
protocol kernel MyObviousTestString {
ipv4 {
import all;
@@ -132,7 +134,9 @@ let
exporterTest = ''
wait_for_unit("prometheus-bird-exporter.service")
wait_for_open_port(9324)
- succeed("curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'")
+ wait_until_succeeds(
+ "curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'"
+ )
'';
};
diff --git a/third_party/nixpkgs/nixos/tests/quagga.nix b/third_party/nixpkgs/nixos/tests/quagga.nix
deleted file mode 100644
index 9aed49bf45..0000000000
--- a/third_party/nixpkgs/nixos/tests/quagga.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-# This test runs Quagga and checks if OSPF routing works.
-#
-# Network topology:
-# [ client ]--net1--[ router1 ]--net2--[ router2 ]--net3--[ server ]
-#
-# All interfaces are in OSPF Area 0.
-
-import ./make-test-python.nix ({ pkgs, ... }:
- let
-
- ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ipv4.addresses).address;
-
- ospfConf = ''
- interface eth2
- ip ospf hello-interval 1
- ip ospf dead-interval 5
- !
- router ospf
- network 192.168.0.0/16 area 0
- '';
-
- in
- {
- name = "quagga";
-
- meta = with pkgs.lib.maintainers; {
- maintainers = [ tavyc ];
- };
-
- nodes = {
-
- client =
- { nodes, ... }:
- {
- virtualisation.vlans = [ 1 ];
- networking.defaultGateway = ifAddr nodes.router1 "eth1";
- };
-
- router1 =
- { ... }:
- {
- virtualisation.vlans = [ 1 2 ];
- boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
- networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospf -j ACCEPT";
- services.quagga.ospf = {
- enable = true;
- config = ospfConf;
- };
- };
-
- router2 =
- { ... }:
- {
- virtualisation.vlans = [ 3 2 ];
- boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
- networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospf -j ACCEPT";
- services.quagga.ospf = {
- enable = true;
- config = ospfConf;
- };
- };
-
- server =
- { nodes, ... }:
- {
- virtualisation.vlans = [ 3 ];
- networking.defaultGateway = ifAddr nodes.router2 "eth1";
- networking.firewall.allowedTCPPorts = [ 80 ];
- services.httpd.enable = true;
- services.httpd.adminAddr = "foo@example.com";
- };
- };
-
- testScript =
- { ... }:
- ''
- start_all()
-
- # Wait for the networking to start on all machines
- for machine in client, router1, router2, server:
- machine.wait_for_unit("network.target")
-
- with subtest("Wait for OSPF to form adjacencies"):
- for gw in router1, router2:
- gw.wait_for_unit("ospfd")
- gw.wait_until_succeeds("vtysh -c 'show ip ospf neighbor' | grep Full")
- gw.wait_until_succeeds("vtysh -c 'show ip route' | grep '^O>'")
-
- with subtest("Test ICMP"):
- client.wait_until_succeeds("ping -c 3 server >&2")
-
- with subtest("Test whether HTTP works"):
- server.wait_for_unit("httpd")
- client.succeed("curl --fail http://server/ >&2")
- '';
- })
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix
index 31b009c413..fd6726e9ac 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fdkaac";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "nu774";
repo = pname;
rev = "v${version}";
- sha256 = "02mzx4bird2q5chzpavfc9pg259hwfvq6px85xarm59vmj9nryb6";
+ sha256 = "tHhICq/FzbkvWkDdNzGqGoo7nIDb+DJXmkFwtPIA89c=";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with lib; {
- description = "Command line encoder frontend for libfdk-aac encder";
+ description = "Command line encoder frontend for libfdk-aac encoder";
longDescription = ''
fdkaac reads linear PCM audio in either WAV, raw PCM, or CAF format,
and encodes it into either M4A / AAC file.
diff --git a/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix
index fc0d0840fb..490591ec9e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Advanced drum machine";
homepage = "http://www.hydrogen-music.org";
- license = licenses.gpl2Only;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu orivej ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
index a3e5b3e50e..153e8b9940 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
@@ -1,9 +1,9 @@
{ lib, stdenv
, fetchurl
, makeWrapper
-
, alsaLib
, perl
+, withConplay ? !stdenv.targetPlatform.isWindows
}:
stdenv.mkDerivation rec {
@@ -14,35 +14,36 @@ stdenv.mkDerivation rec {
sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY=";
};
- outputs = [ "out" "conplay" ];
+ outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = lib.optionals withConplay [ makeWrapper ];
- buildInputs = [ perl ] ++ lib.optional (!stdenv.isDarwin) alsaLib;
+ buildInputs = lib.optionals withConplay [ perl ]
+ ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsaLib ];
configureFlags = lib.optional
(stdenv.hostPlatform ? mpg123)
"--with-cpu=${stdenv.hostPlatform.mpg123.cpu}";
- postInstall = ''
+ postInstall = lib.optionalString withConplay ''
mkdir -p $conplay/bin
mv scripts/conplay $conplay/bin/
'';
- preFixup = ''
+ preFixup = lib.optionalString withConplay ''
patchShebangs $conplay/bin/conplay
'';
- postFixup = ''
+ postFixup = lib.optionalString withConplay ''
wrapProgram $conplay/bin/conplay \
--prefix PATH : $out/bin
'';
- meta = {
+ meta = with lib; {
description = "Fast console MPEG Audio Player and decoder library";
- homepage = "http://mpg123.org";
- license = lib.licenses.lgpl21;
- maintainers = [ lib.maintainers.ftrvxmtrx ];
- platforms = lib.platforms.unix;
+ homepage = "https://mpg123.org";
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.ftrvxmtrx ];
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
index bd00a692b7..03d0556326 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
@@ -8,18 +8,18 @@
, lua5_3
, libid3tag
, flac
-, mongoose
+, pcre
}:
stdenv.mkDerivation rec {
pname = "mympd";
- version = "6.10.0";
+ version = "7.0.2";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${version}";
- sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ=";
+ sha256 = "sha256-2V3LbgnJfTIO71quZ+hfLnw/lNLYxXt19jw2Od6BVvM=";
};
nativeBuildInputs = [ pkg-config cmake ];
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
lua5_3
libid3tag
flac
+ pcre
];
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/myxer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/myxer/default.nix
index da3b8742d5..0aa3727f79 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/myxer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/myxer/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "myxer";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "Aurailus";
repo = pname;
rev = version;
- sha256 = "10m5qkys96n4v6qiffdiy0w660yq7b5sa70ww2zskc8d0gbmxp6x";
+ sha256 = "0bnhpzmx4yyasv0j7bp31q6jm20p0qwcia5bzmpkz1jhnc27ngix";
};
- cargoSha256 = "0nsscdjl5fh24sg87vdmijjmlihc0zk0p3vac701v60xlz55qipn";
+ cargoSha256 = "1cyh0nk627sgyr78rcnhj7af5jcahvjkiv5sz7xwqfdhvx5kqsk5";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
index 33b15e977e..7a7c7175a4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
@@ -46,15 +46,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- # 5.0.3 crashes. Test carefully before updating.
- # https://github.com/wwmm/pulseeffects/issues/927
- version = "5.0.2";
+ version = "5.0.3";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm";
+ sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix
index 5b1fc2be77..953c95c472 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix
@@ -51,6 +51,18 @@ let
meta.homepage = "https://github.com/andreyorst/fzf.kak/";
};
+ kakboard = buildKakounePluginFrom2Nix {
+ pname = "kakboard";
+ version = "2020-05-09";
+ src = fetchFromGitHub {
+ owner = "lePerdu";
+ repo = "kakboard";
+ rev = "2f13f5cd99591b76ad5cba230815b80138825120";
+ sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd";
+ };
+ meta.homepage = "https://github.com/lePerdu/kakboard/";
+ };
+
kakoune-buffer-switcher = buildKakounePluginFrom2Nix {
pname = "kakoune-buffer-switcher";
version = "2020-12-27";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
index 7b6f485930..6cf7d30f27 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
@@ -12,6 +12,7 @@ greenfork/active-window.kak
kakoune-editor/kakoune-extra-filetypes
kakounedotcom/connect.kak
kakounedotcom/prelude.kak
+lePerdu/kakboard
listentolist/kakoune-rainbow
mayjs/openscad.kak
occivink/kakoune-buffer-switcher
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
index de96650167..c77e60950c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "6.9.12-3";
+ version = "6.9.12-8";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
- sha256 = "sha256-h9c0N9AcFVpNYpKl+95q1RVJWuacN4N4kbAJIKJp8Jc=";
+ sha256 = "sha256-ZFCmoZOdZ3jbM5S90zBNiMGJKFylMLO0r3DB25wu3MM=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix
index 8cf7966703..b2c665258c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "7.0.11-6";
+ version = "7.0.11-8";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
- sha256 = "sha256-QClOS58l17KHeQXya+IKNx6nIkd6jCKp8uupRH7Fwnk=";
+ sha256 = "sha256-h9hoFXnxuLVQRVtEh83P7efz2KFLLqOXKD6nVJEhqiM=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix
index 0feb72f64a..a2b4e94949 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix
@@ -17,7 +17,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "drawing";
- version = "0.4.13";
+ version = "0.8.0";
format = "other";
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "maoschanz";
repo = pname;
rev = version;
- sha256 = "0mj2nmfrckv89srgkn16fnbrb35f5a655ak8bb3rd9na3hd5bq53";
+ sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix
new file mode 100644
index 0000000000..4cb2440cb8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub, libevent, glew, glfw }:
+
+stdenv.mkDerivation {
+ pname = "pixelnuke";
+ version = "unstable-2019-05-19";
+
+ src = fetchFromGitHub {
+ owner = "defnull";
+ repo = "pixelflut";
+ rev = "3458157a242ba1789de7ce308480f4e1cbacc916";
+ sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40";
+ };
+
+ sourceRoot = "source/pixelnuke";
+
+ buildInputs = [ libevent glew glfw ];
+
+ installPhase = ''
+ install -Dm755 ./pixelnuke $out/bin/pixelnuke
+ '';
+
+ meta = with lib; {
+ description = "Multiplayer canvas (C implementation)";
+ homepage = "https://cccgoe.de/wiki/Pixelflut";
+ license = licenses.unlicense;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ mrVanDalo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
index bb748a1074..0f9ca5c4b8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
- version = "0.82.0";
+ version = "0.82.1";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-D0bwy8LJihlfM+E3oys85yjadjZNfPv5xnq4ekaZPCU=";
+ sha256 = "sha256-6poWFcApwCos3XvS/Wq1VJyf5xTUWtqWNFXIhjNsXVs=";
};
vendorSha256 = "sha256-pJBm+yyy1DbH28oVBQA+PHSDtSg3RcgbRlurrwnnEls=";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix
index b01b5af7de..962bd9f592 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/polybar/default.nix
@@ -7,6 +7,7 @@
, pcre
, pkg-config
, python3
+, python3Packages # sphinx-build
, lib
, stdenv
, xcbproto
@@ -18,41 +19,47 @@
, xcbutilxrm
, makeWrapper
, removeReferencesTo
+, alsaLib
+, curl
+, libmpdclient
+, libpulseaudio
+, wirelesstools
+, libnl
+, i3
+, i3-gaps
+, jsoncpp
-# optional packages-- override the variables ending in 'Support' to enable or
-# disable modules
-, alsaSupport ? true, alsaLib ? null
-, githubSupport ? false, curl ? null
-, mpdSupport ? false, libmpdclient ? null
-, pulseSupport ? false, libpulseaudio ? null
-, iwSupport ? false, wirelesstools ? null
-, nlSupport ? true, libnl ? null
-, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
+# override the variables ending in 'Support' to enable or disable modules
+, alsaSupport ? true
+, githubSupport ? false
+, mpdSupport ? false
+, pulseSupport ? false
+, iwSupport ? false
+, nlSupport ? true
+, i3Support ? false
+, i3GapsSupport ? false
}:
-assert alsaSupport -> alsaLib != null;
-assert githubSupport -> curl != null;
-assert mpdSupport -> libmpdclient != null;
-assert pulseSupport -> libpulseaudio != null;
-
-assert iwSupport -> ! nlSupport && wirelesstools != null;
-assert nlSupport -> ! iwSupport && libnl != null;
-
-assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null;
-assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
-
stdenv.mkDerivation rec {
pname = "polybar";
- version = "3.5.2";
+ version = "3.5.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x";
+ sha256 = "sha256-oRtTm5bXdL0C2WJsaK8H2Oc40DPWgAfjP7FgIHrpKGI=";
fetchSubmodules = true;
};
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ python3Packages.sphinx
+ removeReferencesTo
+ ]
+ ++ lib.optional (i3Support || i3GapsSupport) makeWrapper;
+
buildInputs = [
cairo
libXdmcp
@@ -67,21 +74,16 @@ stdenv.mkDerivation rec {
xcbutilrenderutil
xcbutilwm
xcbutilxrm
-
- (if alsaSupport then alsaLib else null)
- (if githubSupport then curl else null)
- (if mpdSupport then libmpdclient else null)
- (if pulseSupport then libpulseaudio else null)
-
- (if iwSupport then wirelesstools else null)
- (if nlSupport then libnl else null)
-
- (if i3Support || i3GapsSupport then jsoncpp else null)
- (if i3Support then i3 else null)
- (if i3GapsSupport then i3-gaps else null)
-
- (if i3Support || i3GapsSupport then makeWrapper else null)
- ];
+ ]
+ ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional githubSupport curl
+ ++ lib.optional mpdSupport libmpdclient
+ ++ lib.optional pulseSupport libpulseaudio
+ ++ lib.optional iwSupport wirelesstools
+ ++ lib.optional nlSupport libnl
+ ++ lib.optional (i3Support || i3GapsSupport) jsoncpp
+ ++ lib.optional i3Support i3
+ ++ lib.optional i3GapsSupport i3-gaps;
postInstall = if i3Support
then ''wrapProgram $out/bin/polybar \
@@ -93,18 +95,13 @@ stdenv.mkDerivation rec {
''
else '''';
- nativeBuildInputs = [
- cmake
- pkg-config
- removeReferencesTo
- ];
-
postFixup = ''
remove-references-to -t ${stdenv.cc} $out/bin/polybar
'';
meta = with lib; {
homepage = "https://polybar.github.io/";
+ changelog = "https://github.com/polybar/polybar/releases/tag/${version}";
description = "A fast and easy-to-use tool for creating status bars";
longDescription = ''
Polybar aims to help users build beautiful and highly customizable
@@ -112,7 +109,7 @@ stdenv.mkDerivation rec {
having a black belt in shell scripting.
'';
license = licenses.mit;
- maintainers = with maintainers; [ afldcr Br1ght0ne ];
+ maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
index 4d2ef2254e..a6e81375de 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
pname = "prusa-slicer";
- version = "2.3.0";
+ version = "2.3.1";
nativeBuildInputs = [
cmake
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
- sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5";
+ sha256 = "1lyaxc9nha1cd8p35iam1k1pikp9kfx0fj1l6vb1xb8pgqp02jnn";
rev = "version_${version}";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
index f6bb7133d9..d866b643ef 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
@@ -1,16 +1,16 @@
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
}:
-let inherit (python3Packages) python buildPythonApplication fetchPypi;
+let inherit (python3Packages) python buildPythonApplication fetchPypi croniter;
in buildPythonApplication rec {
pname = "safeeyes";
- version = "2.0.9";
+ version = "2.1.3";
namePrefix = "";
src = fetchPypi {
inherit pname version;
- sha256 = "13q06jv8hm0dynmr3g5pf1m4j3w9iabrpz1nhpl02f7x0d90whg2";
+ sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x";
};
buildInputs = [
@@ -30,6 +30,7 @@ in buildPythonApplication rec {
xlib
pygobject3
dbus-python
+ croniter
libappindicator-gtk3
libnotify
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix
index 9a05ac22af..cc7d4c3771 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix
@@ -1,12 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, makeWrapper
, pkg-config
, which
, bison
, gnuplot
, libxls
+, libxlsxwriter
, libxml2
, libzip
, ncurses
@@ -25,6 +27,18 @@ stdenv.mkDerivation rec {
sourceRoot = "${src.name}/src";
+ patches = [
+ # libxls and libxlsxwriter are not found without the patch
+ # https://github.com/andmarti1424/sc-im/pull/542
+ (fetchpatch {
+ name = "use-pkg-config-for-libxls-and-libxlsxwriter.patch";
+ url = "https://github.com/andmarti1424/sc-im/commit/b62dc25eb808e18a8ab7ee7d8eb290e34efeb075.patch";
+ sha256 = "1yn32ps74ngzg3rbkqf8dn0g19jv4xhxrfgx9agnywf0x8gbwjh3";
+ })
+ ];
+
+ patchFlags = [ "-p2" ];
+
nativeBuildInputs = [
makeWrapper
pkg-config
@@ -35,6 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnuplot
libxls
+ libxlsxwriter
libxml2
libzip
ncurses
diff --git a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
index 16d56eeaa9..9d93c8ae43 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
@@ -1,20 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
+, openssl
+, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "stork";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "jameslittle230";
repo = "stork";
rev = "v${version}";
- sha256 = "sha256-pBJ9n1pQafXagQt9bnj4N1jriczr47QLtKiv+UjWgTg=";
+ sha256 = "sha256-gPrXeS7XT38Dil/EBwmeKIJrmPlEK+hmiyHi4p28tl0=";
};
- cargoSha256 = "sha256-u8L4ZeST4ExYB2y8E+I49HCy41dOfhR1fgPpcVMVDuk=";
+ cargoSha256 = "sha256-9YKCtryb9mTPz9iWE7Iuk2SKgV0knWRbaouF+1DCjv8=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ openssl ];
meta = with lib; {
description = "Impossibly fast web search, made for static sites";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix
index f41fe82893..ddbd837a6d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "xplr";
- version = "0.5.4";
+ version = "0.5.6";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = name;
rev = "v${version}";
- sha256 = "0m28jhkvz46psxbv8g34v34m1znvj51gqizaxlmxbgh9fj3vyfdb";
+ sha256 = "070jyii2p7qk6gij47n5i9a8bal5iijgn8cv79mrija3pgddniaz";
};
- cargoSha256 = "0q2k8bs32vxqbnjdh674waagpzpb9rxlwi4nggqlbzcmbqsy8n6k";
+ cargoSha256 = "113f0hbgy8c9gxl70b6frr0klfc8rm5klgwls7fgbb643rdh03b9";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index 3e823a5616..2b480bc55d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -7,7 +7,7 @@
, xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2
-, python2Packages, perl, pkg-config
+, python2Packages, python3Packages, perl, pkg-config
, nspr, systemd, libkrb5
, util-linux, alsaLib
, bison, gperf
@@ -42,6 +42,16 @@ with lib;
let
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
+ # TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py"
+ # currently doesn't work due to mixed Python 2/3 dependencies:
+ pythonPackages = if chromiumVersionAtLeast "93"
+ then python3Packages
+ else python2Packages;
+ forcePython3Patch = (githubPatch
+ # Reland #8 of "Force Python 3 to be used in build."":
+ "a2d3c362802d9e6b62f895fcda75a3695b77b1b8"
+ "1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2"
+ );
# The additional attributes for creating derivations based on the chromium
# source tree.
@@ -100,16 +110,19 @@ let
buildPath = "out/${buildType}";
libExecPath = "$out/libexec/${packageName}";
+ warnObsoleteVersionConditional = min-version: result:
+ let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
+ in if versionAtLeast ungoogled-version min-version
+ then warn "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
+ result
+ else result;
chromiumVersionAtLeast = min-version:
- versionAtLeast upstream-info.version min-version;
+ let result = versionAtLeast upstream-info.version min-version;
+ in warnObsoleteVersionConditional min-version result;
versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = versionAtLeast version min-version && versionOlder version upto-version;
- ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
- in if versionAtLeast ungoogled-version upto-version
- then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
- result
- else result;
+ in warnObsoleteVersionConditional upto-version result;
ungoogler = ungoogled-chromium {
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
@@ -127,9 +140,9 @@ let
nativeBuildInputs = [
llvmPackages.lldClang.bintools
- ninja which python2Packages.python perl pkg-config
- python2Packages.ply python2Packages.jinja2 nodejs
- gnutar python2Packages.setuptools
+ ninja which pythonPackages.python perl pkg-config
+ pythonPackages.ply pythonPackages.jinja2 nodejs
+ gnutar pythonPackages.setuptools
];
buildInputs = defaultDependencies ++ [
@@ -151,28 +164,17 @@ let
patches = [
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
- # ++ optional (versionRange "68" "72") (githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000")
- ] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch
- # To fix the build of chromiumBeta and chromiumDev:
- "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs
- "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x"
- ) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch {
- url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
- sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
- }) ++ optional (chromiumVersionAtLeast "90")
+ # Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
./patches/fix-missing-atspi2-dependency.patch
- ++ optionals (chromiumVersionAtLeast "91") [
+ ] ++ optionals (chromiumVersionAtLeast "91") [
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
- (githubPatch
- # Revert "Reland #7 of "Force Python 3 to be used in build.""
- "38b6a9a8e5901766613879b6976f207aa163588a"
- "1lvxbd7rl6hz5j6kh6q83yb6vd9g7anlqbai8g1w1bp6wdpgwvp9"
- )
];
postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
# Required for patchShebangs (unsupported):
chmod -x third_party/webgpu-cts/src/tools/deno
+ '' + optionalString (chromiumVersionAtLeast "92") ''
+ patch -p1 --reverse < ${forcePython3Patch}
'' + ''
# remove unused third-party
for lib in ${toString gnSystemLibraries}; do
@@ -277,12 +279,9 @@ let
} // optionalAttrs pulseSupport {
use_pulseaudio = true;
link_pulseaudio = true;
- } // optionalAttrs (chromiumVersionAtLeast "89") {
- rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
chrome_pgo_phase = 0;
- } // optionalAttrs (chromiumVersionAtLeast "90") {
# Disable build with TFLite library because it fails without additional changes:
# ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it
# Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 54ae1e5f5b..21d54f7733 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,22 +18,22 @@
}
},
"beta": {
- "version": "90.0.4430.85",
- "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
- "sha256bin64": "0aw76phm8r9k2zlqywyggzdqa467c8naqa717m24dk3nvv2rfkg2",
+ "version": "91.0.4472.19",
+ "sha256": "0p51cxz0dm9ss9k7b91c0nd560mgi2x4qdcpg12vdf8x24agai5x",
+ "sha256bin64": "0pf0sw8sskv4x057w7l6jh86q5mdvm800iikzy6fvambhh7bvd1i",
"deps": {
"gn": {
- "version": "2021-02-09",
+ "version": "2021-04-06",
"url": "https://gn.googlesource.com/gn",
- "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
- "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
+ "rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
+ "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
}
}
},
"dev": {
- "version": "91.0.4472.10",
- "sha256": "168121aznynks5waj3mm2m036mbrlmqmp2kmnn9r4ibq2x01dpxm",
- "sha256bin64": "05bk6gmmfsh50jjlb6lmwqhhbs0v0hlijsmxpk9crdx2gw071rlr",
+ "version": "92.0.4484.7",
+ "sha256": "1111b1vj4zqcz57c65pjbxjilvv2ps8cjz2smxxz0vjd432q2fdf",
+ "sha256bin64": "0qb5bngp3vwn7py38bn80k43safm395qda760nd5kzfal6c98fi1",
"deps": {
"gn": {
"version": "2021-04-06",
@@ -44,19 +44,19 @@
}
},
"ungoogled-chromium": {
- "version": "89.0.4389.114",
- "sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j",
- "sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a",
+ "version": "90.0.4430.85",
+ "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
+ "sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir",
"deps": {
"gn": {
- "version": "2021-01-07",
+ "version": "2021-02-09",
"url": "https://gn.googlesource.com/gn",
- "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
- "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
+ "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
+ "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
},
"ungoogled-patches": {
- "rev": "89.0.4389.114-1",
- "sha256": "0cr2i51gxhgl55c8f9w0ra3m5q2dk03sf7p2qn4bqq1l1l72hw6s"
+ "rev": "90.0.4430.85-1",
+ "sha256": "04nrx6fgkizmza50xj236m4rb1j8yaw0cw5790df1vlmbsc81667"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
index bc9cf8a326..62bb722652 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -257,7 +257,7 @@ let
makeWrapper "$oldExe" \
"$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \
- --suffix LD_LIBRARY_PATH ':' "$libs" \
+ --prefix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--prefix PATH ':' "${xdg-utils}/bin" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
index 3b9d7784b7..959b0a9877 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
- sha256 = "sha256-TbNqwTVND09WzUH8ZH7YFRwcHV8eX1G0FXtZJi67Sk4=";
+ sha256 = "sha256-+LuBz58hTzi/hGwqX/0VMNYn/+SRYgnNefn3B3i7eEs=";
};
vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg=";
@@ -46,10 +46,11 @@ buildGoModule rec {
buildFlagsArray = ''
-ldflags=
-s -w
- -X github.com/argoproj/argo.version=${version}
- -X github.com/argoproj/argo.gitCommit=${src.rev}
- -X github.com/argoproj/argo.gitTreeState=clean
- -X github.com/argoproj/argo.gitTag=${version}
+ -X github.com/argoproj/argo-workflows/v3.buildDate=unknown
+ -X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}
+ -X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}
+ -X github.com/argoproj/argo-workflows/v3.gitTreeState=clean
+ -X github.com/argoproj/argo-workflows/v3.version=${version}
'';
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix
index 1b83e982c7..1418f40e21 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "starboard";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hieenhe3HsMqg7dMhvOUcvVGzBedYXqJRxEUkw4DG6o=";
+ sha256 = "sha256-cDqZo0GTpvvkEiccP42u9X2ydHkSBuoD8Zfp+i+/qjo=";
};
- vendorSha256 = "sha256-Vj8t4v2o6x+tFLWy84W3tVaIf6WtFWXpvLQfeTbeGbM=";
+ vendorSha256 = "sha256-noK4fF9wCP1dYfDgmJVZehcF+eunzP+d9n1SiPO9UEU=";
subPackages = [ "cmd/starboard" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 290460e1e5..33fba6e5a0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -823,11 +823,13 @@
"version": "1.5.0"
},
"rancher2": {
- "owner": "terraform-providers",
+ "owner": "rancher",
+ "provider-source-address": "registry.terraform.io/hashicorp/rancher2",
"repo": "terraform-provider-rancher2",
- "rev": "v1.8.3",
- "sha256": "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna",
- "version": "1.8.3"
+ "rev": "v1.13.0",
+ "sha256": "0xczv9qsviryiw95yd6cl1nnb0daxs971fm733gfvwm36jvmyr89",
+ "vendorSha256": "0apy6qbmshfj4pzz9nqdhyk6h7l9qwrccz30q8ljl928pj49q04c",
+ "version": "1.13.0"
},
"random": {
"owner": "hashicorp",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
index 94026992c3..0d726e5cfc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.28.24";
+ version = "0.29.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7wfBKXO4uUrFjEklmgfgzIECARsOolwXjNFOFqfn1ds=";
+ sha256 = "sha256-Ubft+R2nBUNRx3SfksORxBbKY/mSvY+tKkz1UcGXyjw=";
};
vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
index 39073985fa..cac662c9b6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
- version = "3.8.0";
+ version = "3.8.1";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-VSNvyigaGfGDbcng6ltdq+X35zT2tb2p4j/4KAjd1Yk=";
+ sha256 = "sha256-x002p7wPKbcmr4uE04mgKBagHQV/maEo99Y2Jr7xgK4=";
};
- vendorSha256 = "sha256-VU0uJDp5koVU+wDwr3ctrDY0R3vd/JmpA7gtWWpwpfw=";
+ vendorSha256 = "sha256-lR5+xVi/ROOFoRWyK0h/8uiSP/joQ9Zr9kMaQ+sWNhM=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
index a12e914097..405304f74a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
@@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "zeek";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
- sha256 = "0m7zy5k2595vf5xr2r4m75rfsdddigrv2hilm1c3zaif4srxmvpj";
+ sha256 = "0ficl4i012gfv4mdbdclgvi6gyq338gw9gb6k58k1drw8c7qk6k5";
};
nativeBuildInputs = [ cmake flex bison file ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
index d10c5359e3..363d123dbe 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
@@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
- version = "2.7.0";
+ version = "2.8.5";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
- sha256 = "1g8was4anrsdpv4h11z544mi0v79him2xjyknixyrqfy87cbh97n";
+ sha256 = "0r3jj3qjx38l1g733vhrwcm2yg7ppp23ciz84x2kqq51mlzr84c6";
name = "${pname}-${version}.AppImage";
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 927f89c949..b097864af4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -7,7 +7,6 @@
, lmdb
, lmdbxx
, libsecret
-, tweeny
, mkDerivation
, qtbase
, qtkeychain
@@ -30,13 +29,13 @@
mkDerivation rec {
pname = "nheko";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "nheko";
rev = "v${version}";
- sha256 = "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524";
+ sha256 = "sha256-w4l91/W6F1FL+Q37qWSjYRHv4vad/10fxdKwfNeEwgw=";
};
nativeBuildInputs = [
@@ -47,7 +46,6 @@ mkDerivation rec {
buildInputs = [
nlohmann_json
- tweeny
mtxclient
olm
boost17x
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix
new file mode 100644
index 0000000000..593e63d32f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix
@@ -0,0 +1,87 @@
+{ lib, stdenv, fetchurl, fetchgit, jre, coreutils, gradle_6, git, perl
+, makeWrapper }:
+
+let
+ pname = "signald";
+
+ version = "0.13.1";
+
+ # This package uses the .git directory
+ src = fetchgit {
+ url = "https://gitlab.com/signald/signald";
+ rev = version;
+ sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7";
+ leaveDotGit = true;
+ };
+
+ buildConfigJar = fetchurl {
+ url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar";
+ sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
+ };
+
+ patches = [ ./git-describe-always.patch ./gradle-plugin.patch ];
+
+ postPatch = ''
+ patchShebangs gradlew
+ sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
+ '';
+
+ # fake build to pre-download deps into fixed-output derivation
+ deps = stdenv.mkDerivation {
+ name = "${pname}-deps";
+ inherit src version postPatch patches;
+ nativeBuildInputs = [ gradle_6 perl ];
+ buildPhase = ''
+ export GRADLE_USER_HOME=$(mktemp -d)
+ gradle --no-daemon build
+ '';
+ # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+ installPhase = ''
+ find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
+ | sh
+ '';
+ # Don't move info to share/
+ forceShare = [ "dummy" ];
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7";
+ };
+
+in stdenv.mkDerivation rec {
+ inherit pname src version postPatch patches;
+
+ buildPhase = ''
+ export GRADLE_USER_HOME=$(mktemp -d)
+
+ # Use the local packages from -deps
+ sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle
+
+ gradle --offline --no-daemon distTar
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+ tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/
+ wrapProgram $out/bin/signald \
+ --prefix PATH : ${lib.makeBinPath [ coreutils ]} \
+ --set JAVA_HOME "${jre}"
+ '';
+
+ nativeBuildInputs = [ git gradle_6 makeWrapper ];
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Unofficial daemon for interacting with Signal";
+ longDescription = ''
+ Signald is a daemon that facilitates communication over Signal. It is
+ unofficial, unapproved, and not nearly as secure as the real Signal
+ clients.
+ '';
+ homepage = "https://signald.org";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ expipiplus1 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch
new file mode 100644
index 0000000000..2f4830e27d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch
@@ -0,0 +1,9 @@
+diff --git a/version.sh b/version.sh
+index 7aeeb3c..060cba3 100755
+--- a/version.sh
++++ b/version.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count)
++VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count)
+ echo $VERSION
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch
new file mode 100644
index 0000000000..6952654758
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch
@@ -0,0 +1,26 @@
+diff --git a/build.gradle b/build.gradle
+index 11d7a99..66805bb 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
+ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+ import org.xml.sax.SAXParseException
+
+-plugins {
+- id 'de.fuerstenau.buildconfig' version '1.1.8'
++buildscript {
++ dependencies {
++ classpath files ("BuildConfig.jar")
++ }
+ }
++apply plugin: 'de.fuerstenau.buildconfig'
+
+ apply plugin: 'java'
+ apply plugin: 'application'
+@@ -185,4 +188,4 @@ task integrationTest(type: Test) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+ outputs.upToDateWhen { false }
+-}
+\ No newline at end of file
++}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
index adef444110..0bb0d78416 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
@@ -3,8 +3,8 @@
set -eou pipefail
-latest_linux_version=$(curl --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
-latest_mac_version=$(curl --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
+latest_linux_version=$(curl -L --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
+latest_mac_version=$(curl -L --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
# Double check that the latest mac and linux versions are in sync.
if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 67127a0497..fd15e77c8b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -7,7 +7,6 @@
, atk
, cairo
, dbus
-, dpkg
, libGL
, fontconfig
, freetype
@@ -33,8 +32,8 @@ let
version = "5.6.16775.0418";
srcs = {
x86_64-linux = fetchurl {
- url = "https://zoom.us/client/${version}/zoom_amd64.deb";
- sha256 = "1fmzwxq8jv5k1b2kvg1ij9g6cdp1hladd8vm3cxzd8fywdjcndim";
+ url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
+ sha256 = "twtxzniojgyLTx6Kda8Ej96uyw2JQB/jIhLdTgTqpCo=";
};
};
@@ -71,21 +70,17 @@ in stdenv.mkDerivation rec {
inherit version;
src = srcs.${stdenv.hostPlatform.system};
+ dontUnpack = true;
+
nativeBuildInputs = [
- dpkg
makeWrapper
];
- unpackCmd = ''
- mkdir out
- dpkg -x $curSrc out
- '';
-
installPhase = ''
runHook preInstall
mkdir $out
- mv usr/* $out/
- mv opt $out/
+ tar -C $out -xf ${src}
+ mv $out/usr/* $out/
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
index 76f1e92d5f..8b60110184 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "himalaya";
- version = "0.2.6";
+ version = "0.2.7";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
- sha256 = "1fl3lingb4wdh6bz4calzbibixg44wnnwi1qh0js1ijp8b6ll560";
+ sha256 = "0yp3gc5hmlrs5rcmb2qbi4iqb5ndflgqw20qa7ziqayrdd15kzpn";
};
- cargoSha256 = "10p8di71w7hn36b1994wgk33fnj641lsp80zmccinlg5fiwyzncx";
+ cargoSha256 = "1abz3s9c3byqc0vaws839hjlf96ivq4zbjyijsbg004ffbmbccpn";
nativeBuildInputs = [ ]
++ lib.optionals (enableCompletions) [ installShellFiles ]
@@ -34,9 +34,6 @@ rustPlatform.buildRustPackage rec {
openssl
];
- # The completions are correctly installed, and there is issue that himalaya
- # generate empty completion files without mail configure.
- # This supposed to be fixed in 0.2.7
postInstall = lib.optionalString enableCompletions ''
# Install shell function
installShellCompletion --cmd himalaya \
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh
index 806dd0806a..9ab3a907a9 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh
@@ -2,7 +2,7 @@
export JAVA_HOME="${JAVA_HOME:-@jdk@}"
#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
-if uname | grep Linux > /dev/null &&
+if uname | grep Linux > /dev/null &&
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
if ! test -d "$dbus_tmp_dir" && test -d "/run"; then
@@ -14,6 +14,7 @@ if uname | grep Linux > /dev/null &&
fi
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null &
+ dbus_pid=$!
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
fi
@@ -27,5 +28,5 @@ done
"@libreoffice@/bin/$(basename "$0")" "$@"
code="$?"
-test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir"
+test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; }
exit "$code"
diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix
index 32c9dc79d6..dab4367b3a 100644
--- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix
@@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
- version = "0.46.7";
+ version = "0.46.9";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "0saqj32jcb9ga418bpdxy93hf1z8nmwzf76rfgnnac7286ciyinr";
+ sha256 = "1qpk5z8w4wbkxs1lpnz3g8w30zygj4wxxlwj6gp1pip09xgiksm9";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
- sha256 = "0b9bbm1iyaa5wf758085m6kfbq4li1iimj11ryf9xv9fzrbc4gvs";
+ sha256 = "1n8g7l6hiw9bhzylvzlfcn2pk4i8pqkqp9lj3lcxwwqb8va52phg";
};
in {
diff --git a/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix b/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix
index 6299fe21d2..6cb0f40f12 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/airspy/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "airspy";
- version = "1.0.9";
+ version = "1.0.10";
src = fetchFromGitHub {
owner = "airspy";
repo = "airspyone_host";
rev = "v${version}";
- sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
+ sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix b/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix
index f473c4f536..091b098fa3 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clingo";
- version = "5.4.1";
+ version = "5.5.0";
src = fetchzip {
url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
- sha256 = "1f0q5f71s696ywxcjlfz7z134m1h7i39j9sfdv8hlw2w3g5nppc3";
+ sha256 = "sha256-6xKtNi5IprjaFNadfk8kKjKzuPRanUjycLWCytnk0mU=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
index c5a3fd606c..f209e2de8c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
- version = "2.12.9.1";
+ version = "2.13.0.1";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
- sha256 = "sha256-B3ko+RNT+LYSJG1P5cujgRMc1OJhDPqm1ONrMh+7fI4=";
+ sha256 = "sha256-auU49XeFxXAacBEszwB6tVU6vTMq4t6q2vVk9AHHNK0=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix
index 1c88edfd90..cce37df357 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "bit";
- version = "1.0.6";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "chriswalz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-juQAFVqs0d4EtoX24EyrlKd2qRRseP+jKfM0ymkD39E=";
+ sha256 = "sha256-85GEx9y8r9Fjgfcwh1Bi8WDqBm6KF7uidutlF77my60=";
};
vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA=";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
index 05d5dfe960..8ec57f2e69 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
@@ -1,20 +1,25 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, fetchFromGitHub, buildGoModule }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "git-chglog";
- version = "0.9.1";
-
- goPackagePath = "github.com/git-chglog/git-chglog";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "git-chglog";
repo = "git-chglog";
- rev = version;
- sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p";
+ rev = "v${version}";
+ sha256 = "124bqywkj37gv61fswgrg528bf3rjqms1664x22lkn0sqh22zyv1";
};
+ vendorSha256 = "09zjypmcc3ra7sw81q1pbbrlpxxp4k00p1cfkrrih8wvb25z89h5";
+
+ buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ];
+
+ subPackages = [ "cmd/git-chglog" ];
+
meta = with lib; {
description = "CHANGELOG generator implemented in Go (Golang)";
+ homepage = "https://github.com/git-chglog/git-chglog";
license = licenses.mit;
maintainers = with maintainers; [ ldenefle ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index 18f2e5ad48..520f33905c 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -1,23 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub }:
-# Currently `buildGo114Module` is passed as `buildGoModule` from
-# `../default.nix`. Please remove the fixed 1.14 once a new release has been
-# made and the issue linked below has been closed upstream.
-
-# https://github.com/Arkweid/lefthook/issues/151
-
buildGoModule rec {
pname = "lefthook";
- version = "0.7.2";
+ version = "0.7.3";
src = fetchFromGitHub {
rev = "v${version}";
- owner = "Arkweid";
+ owner = "evilmartians";
repo = "lefthook";
- sha256 = "1ciyxjx3r3dcl8xas49kqsjshs1bv4pafmfmhdfyfdvlaj374hgj";
+ sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk=";
};
- vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8";
+ vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index 346841eabf..651234be8e 100644
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -1,37 +1,29 @@
{ lib
, buildPythonApplication
-, copyDesktopItems
, fetchPypi
-, makeDesktopItem
-, flask
, jellyfin-apiclient-python
, jinja2
, mpv
, pillow
-, pydantic
-, pyqtwebengine
, pystray
, python-mpv-jsonipc
, pywebview
-, qt5
, tkinter
-, werkzeug
}:
buildPythonApplication rec {
pname = "jellyfin-mpv-shim";
- version = "1.10.4";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-QMyb69S8Ln4X0oUuLpL6vtgxJwq8f+Q4ReNckrN4E+E=";
+ sha256 = "sha256-NXDLqQzCUfDPoKNPrmIn5FMedMKYxtDhkawRE2lg/vI=";
};
propagatedBuildInputs = [
jellyfin-apiclient-python
mpv
pillow
- pydantic
python-mpv-jsonipc
# gui dependencies
@@ -41,28 +33,6 @@ buildPythonApplication rec {
# display_mirror dependencies
jinja2
pywebview
-
- # desktop dependencies
- flask
- pyqtwebengine
- werkzeug
- ];
-
- nativeBuildInputs = [
- copyDesktopItems
- qt5.wrapQtAppsHook
- ];
-
- desktopItems = [
- (makeDesktopItem {
- name = "Jellyfin Desktop";
- exec = "jellyfin-desktop";
- icon = "jellyfin-desktop";
- desktopName = "jellyfin-desktop";
- comment = "MPV-based desktop and cast client for Jellyfin";
- genericName = "MPV-based desktop and cast client for Jellyfin";
- categories = "Video;AudioVideo;TV;Player";
- })
];
# override $HOME directory:
@@ -82,24 +52,33 @@ buildPythonApplication rec {
--replace "notify_updates: bool = True" "notify_updates: bool = False"
'';
- postInstall = ''
- mkdir -p $out/share/pixmaps
- cp jellyfin_mpv_shim/integration/jellyfin-256.png $out/share/pixmaps/jellyfin-desktop.png
- '';
-
- postFixup = ''
- wrapQtApp $out/bin/jellyfin-desktop
- wrapQtApp $out/bin/jellyfin-mpv-desktop
- '';
-
# no tests
doCheck = false;
pythonImportsCheck = [ "jellyfin_mpv_shim" ];
meta = with lib; {
- homepage = "https://github.com/jellyfin/jellyfin-desktop";
+ homepage = "https://github.com/jellyfin/jellyfin-mpv-shim";
description = "Allows casting of videos to MPV via the jellyfin mobile and web app";
- license = licenses.gpl3;
+ longDescription = ''
+ Jellyfin MPV Shim is a client for the Jellyfin media server which plays media in the
+ MPV media player. The application runs in the background and opens MPV only
+ when media is cast to the player. The player supports most file formats, allowing you
+ to prevent needless transcoding of your media files on the server. The player also has
+ advanced features, such as bulk subtitle updates and launching commands on events.
+ '';
+ license = with licenses; [
+ # jellyfin-mpv-shim
+ gpl3Only
+ mit
+
+ # shader-pack licenses (github:iwalton3/default-shader-pack)
+ # KrigBilateral, SSimDownscaler, NNEDI3
+ gpl3Plus
+ # Anime4K, FSRCNNX
+ mit
+ # Static Grain
+ unlicense
+ ];
maintainers = with maintainers; [ jojosch ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix
index d26acfd7c0..23bad049d6 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix
@@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
- version = "55.0.0";
+ version = "56.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7";
+ sha256 = "0nhpp1zkggxqjj7lhj6as5mcjcz5yk3l1d1xcgs7i9153blam1yj";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix
index 2ff335b083..40a1050cd3 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix
@@ -12,15 +12,17 @@ stdenvNoCC.mkDerivation {
patches = [ ./convert.patch ];
- postPatch =
- let
- t = k: v: '' 'local ${k} = "${v}"' '';
- subs = var: orig: repl: "--replace " + t var orig + t var repl;
- in ''
- substituteInPlace convert_script.lua \
- ${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \
- ${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \
- ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"}
+ postPatch = ''
+ substituteInPlace convert_script.lua \
+ --replace 'mkvpropedit_exe = "mkvpropedit"' \
+ 'mkvpropedit_exe = "${mkvtoolnix-cli}/bin/mkvpropedit"' \
+ --replace 'mkvmerge_exe = "mkvmerge"' \
+ 'mkvmerge_exe = "${mkvtoolnix-cli}/bin/mkvmerge"' \
+ --replace 'yad_exe = "yad"' \
+ 'yad_exe = "${yad}/bin/yad"' \
+ --replace 'notify_send_exe = "notify-send"' \
+ 'notify_send_exe = "${libnotify}/bin/notify-send"' \
+
'';
dontBuild = true;
@@ -38,9 +40,7 @@ stdenvNoCC.mkDerivation {
When this script is loaded into mpv, you can hit Alt+W to mark the beginning
and Alt+W again to mark the end of the clip. Then a settings window opens.
'';
+ # author was asked to add a license https://gist.github.com/Zehkul/25ea7ae77b30af959be0#gistcomment-3715700
license = licenses.unfree;
- # script crashes mpv. See https://github.com/NixOS/nixpkgs/issues/113202
- broken = true;
};
}
-
diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.patch b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.patch
index 82171210b4..d3a891bb34 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.patch
+++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.patch
@@ -1,17 +1,45 @@
---- convert/convert_script.lua 2016-03-18 19:30:49.675401969 +0100
-+++ convert_script.lua 2016-03-19 01:18:00.801897043 +0100
-@@ -3,6 +3,10 @@
+diff --git "a/Convert Script \342\200\223 README.md" "b/Convert Script \342\200\223 README.md"
+index 8e062c1..6e0d798 100644
+--- "a/Convert Script \342\200\223 README.md"
++++ "b/Convert Script \342\200\223 README.md"
+@@ -68,7 +68,7 @@ and set some options in ``mpv/lua-settings/convert_script.conf`` or with ``--scr
+ If you don’t want to upgrade your yad. Features like appending segments won’t be available.
+
+ libvpx_fps
+- Default: --oautofps
++ Default: ""
+ FPS settings (or any other settings really) for libvpx encoding. Set it to --ofps=24000/1001 for example.
+
+-Warning: Some of these options aren’t very robust and setting them to bogus values will break the script.
+\ No newline at end of file
++Warning: Some of these options aren’t very robust and setting them to bogus values will break the script.
+diff --git a/convert_script.lua b/convert_script.lua
+index 17d3100..90f88ec 100644
+--- a/convert_script.lua
++++ b/convert_script.lua
+@@ -3,6 +3,12 @@ local msg = require 'mp.msg'
local opt = require 'mp.options'
local utils = require 'mp.utils'
-+local NOTIFY_CMD = "notify-send"
-+local YAD_CMD = "yad"
-+local MKVMERGE_CMD = "mkvmerge"
++-- executables
++local mkvpropedit_exe = "mkvpropedit"
++local mkvmerge_exe = "mkvmerge"
++local yad_exe = "yad"
++local notify_send_exe = "notify-send"
+
-- default options, convert_script.conf is read
local options = {
bitrate_multiplier = 0.975, -- to make sure the file won’t go over the target file size, set it to 1 if you don’t care
-@@ -247,12 +247,12 @@
+@@ -14,7 +20,7 @@ local options = {
+ libvpx_options = "--ovcopts-add=cpu-used=0,auto-alt-ref=1,lag-in-frames=25,quality=good",
+ libvpx_vp9_options = "",
+ legacy_yad = false, -- if you don’t want to upgrade to at least yad 0.18
+- libvpx_fps = "--oautofps", -- --ofps=24000/1001 for example
++ libvpx_fps = "", -- --ofps=24000/1001 for example
+ audio_bitrate = 112, -- mpv default, in kbps
+ }
+
+@@ -247,12 +253,12 @@ function encode(enc)
if string.len(vf) > 0 then
vf = vf .. ","
end
@@ -26,42 +54,49 @@
local audio_file = ""
for index, param in pairs(audio_file_table) do
audio_file = audio_file .. " --audio-file='" .. string.gsub(tostring(param), "'", "'\\''") .. "'"
-@@ -354,9 +358,9 @@
+@@ -354,9 +360,9 @@ function encode(enc)
if ovc == "gif" then
full_command = full_command .. ' --vf-add=lavfi=graph=\\"framestep=' .. framestep .. '\\" && convert '
.. tmpfolder .. '/*.png -set delay ' .. delay .. ' -loop 0 -fuzz ' .. fuzz .. '% ' .. dither .. ' -layers optimize '
- .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && notify-send "Gif done") & disown'
-+ .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && ' .. NOTIFY_CMD .. ' "Gif done") & disown'
++ .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && ' .. notify_send_exe .. ' "Gif done") & disown'
else
- full_command = full_command .. ' && notify-send "Encoding done"; mkvpropedit '
-+ full_command = full_command .. ' && ' .. NOTIFY_CMD .. ' "Encoding done"; mkvpropedit '
++ full_command = full_command .. ' && ' .. notify_send_exe .. ' "Encoding done"; ' .. mkvpropedit_exe .. ' '
.. full_output_path .. ' -s title="' .. metadata_title .. '") & disown'
end
-@@ -409,7 +413,7 @@
+@@ -409,7 +415,7 @@ function encode_copy(enc)
sep = ",+"
if enc then
- local command = "mkvmerge '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path
-+ local command = MKVMERGE_CMD .. " '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path
++ local command = mkvmerge_exe .. " '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path
msg.info(command)
os.execute(command)
clear()
-@@ -508,7 +512,7 @@
+@@ -508,7 +514,7 @@ function call_gui ()
end
- local yad_command = [[LC_NUMERIC=C yad --title="Convert Script" --center --form --fixed --always-print-result \
-+ local yad_command = [[LC_NUMERIC=C ]] .. YAD_CMD .. [[ --title="Convert Script" --center --form --fixed --always-print-result \
++ local yad_command = [[LC_NUMERIC=C ]] .. yad_exe .. [[ --title="Convert Script" --center --form --fixed --always-print-result \
--name "convert script" --class "Convert Script" --field="Resize to height:NUM" "]] .. scale_sav --yad_table 1
.. [[" --field="Resize to width instead:CHK" ]] .. resize_to_width_instead .. " " --yad_table 2
if options.legacy_yad then
-@@ -543,7 +547,7 @@
- yad_command = yad_command .. [[ --button="Crop:1" --button="gtk-cancel:2" --button="gtk-ok:0"; ret=$? && echo $ret]]
-
- if gif_dialog then
-- yad_command = [[echo $(LC_NUMERIC=C yad --title="Gif settings" --name "convert script" --class "Convert Script" \
-+ yad_command = [[echo $(LC_NUMERIC=C ]] .. YAD_CMD .. [[ --title="Gif settings" --name "convert script" --class "Convert Script" \
- --center --form --always-print-result --separator="…" \
- --field="Fuzz Factor:NUM" '1!0..100!0.5!1' \
- --field="Framestep:NUM" '3!1..3!1' \
+@@ -524,7 +530,7 @@ function call_gui ()
+ yad_command = yad_command
+ .. [[--field="2pass:CHK" "false" ]] --yad_table 5
+ .. [[--field="Encode options::CBE" '! --ovcopts=b=2000,cpu-used=0,auto-alt-ref=1,lag-in-frames=25,quality=good,threads=4' ]] --yad_table 6
+- .. [[--field="Output format::CBE" ' --ovc=libx264! --oautofps --of=webm --ovc=libvpx' ]]
++ .. [[--field="Output format::CBE" ' --ovc=libx264! --of=webm --ovc=libvpx' ]]
+ .. [[--field="Simple:FBTN" 'bash -c "echo \"simple\" && kill -s SIGUSR1 \"$YAD_PID\""' ]]
+ advanced = true
+ else
+@@ -734,4 +740,4 @@ mp.set_key_bindings({
+
+ mp.add_key_binding("alt+w", "convert_script", convert_script_hotkey_call)
+
+-mp.register_event("tick", tick)
+\ No newline at end of file
++mp.register_event("tick", tick)
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix
index ae5dad94f2..07c3573fb2 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix
@@ -1,27 +1,37 @@
-{ gestures ? false
-, lib, stdenv, fetchurl, pkg-config
-, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
-, libXpm, libXt, librsvg, libpng, fribidi, perl
-, libstroke ? null
-}:
-
-assert gestures -> libstroke != null;
+{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub
+, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
+, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }:
stdenv.mkDerivation rec {
pname = "fvwm";
version = "2.6.9";
- src = fetchurl {
- url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv";
+ src = fetchFromGitHub {
+ owner = "fvwmorg";
+ repo = pname;
+ rev = version;
+ sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
- cairo fontconfig freetype
- libXft libXcursor libXinerama libXpm libXt
- librsvg libpng fribidi perl
- ] ++ lib.optional gestures libstroke;
+ cairo
+ fontconfig
+ freetype
+ libXft
+ libXcursor
+ libXinerama
+ libXpm
+ libXt
+ librsvg
+ libpng
+ fribidi
+ perl
+ readline
+ libxslt
+ ] ++ lib.optional enableGestures libstroke;
+
+ configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ];
meta = {
homepage = "http://fvwm.org";
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/workstyle.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/workstyle.nix
new file mode 100644
index 0000000000..b245139abe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/workstyle.nix
@@ -0,0 +1,27 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "workstyle";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "pierrechevalier83";
+ repo = pname;
+ rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9";
+ sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn";
+ };
+
+ cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54";
+
+ doCheck = false; # No tests
+
+ meta = with lib; {
+ description = "Sway workspaces with style";
+ homepage = "https://github.com/pierrechevalier83/workstyle";
+ license = licenses.mit;
+ maintainers = with maintainers; [ FlorianFranzen ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix
index 97da815b5d..6799473470 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3wsr";
- version = "1.3.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "roosta";
repo = pname;
rev = "v${version}";
- sha256 = "1zpyncg29y8cv5nw0vgd69nywbj1ppxf6qfm4zc6zz0gk0vxy4pn";
+ sha256 = "sha256-PluczllPRlfzoM2y552YJirrX5RQZQAkBQkner7fWhU=";
};
- cargoSha256 = "0snys419d32anf73jcvrq8h9kp1fq0maqcxz6ww04yg2jv6j47nc";
+ cargoSha256 = "sha256-GwRiyAHTcRoByxUViXSwslb+IAP6LK8IWZ0xICQ8qag=";
nativeBuildInputs = [ python3 ];
buildInputs = [ libxcb ];
diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version
index 90543a9cfc..d5c23466ee 100755
--- a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version
+++ b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version
@@ -19,6 +19,7 @@ args=()
for arg in "$@"; do
case $arg in
--system=*)
+ system="${arg#*=}"
systemArg="--system ${arg#*=}"
;;
--version-key=*)
@@ -59,6 +60,9 @@ newVersion=${args[1]}
newHash=${args[2]}
newUrl=${args[3]}
+# Third-party repositories might not accept arguments in their default.nix.
+importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)"
+
if (( "${#args[*]}" < 2 )); then
echo "$scriptName: Too few arguments"
usage
@@ -75,11 +79,39 @@ if [[ -z "$versionKey" ]]; then
versionKey=version
fi
+# Allow finding packages among flake outputs in repos using flake-compat.
+pname=$(nix-instantiate $systemArg --eval --strict -A "$attr.name" || echo)
+if [[ -z "$pname" ]]; then
+ if [[ -z "$system" ]]; then
+ system=$(nix-instantiate --eval -E 'builtins.currentSystem' | tr -d '"')
+ fi
+
+ pname=$(nix-instantiate $systemArg --eval --strict -A "packages.$system.$attr.name" || echo)
+ if [[ -n "$pname" ]]; then
+ attr="packages.$system.$attr"
+ else
+ pname=$(nix-instantiate $systemArg --eval --strict -A "legacyPackages.$system.$attr.name" || echo)
+ if [[ -n "$pname" ]]; then
+ attr="legacyPackages.$system.$attr"
+ else
+ die "Could not find attribute '$attr'!"
+ fi
+ fi
+fi
+
if [[ -z "$nixFile" ]]; then
nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
if [[ ! -f "$nixFile" ]]; then
die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!"
fi
+
+ # flake-compat will return paths in the Nix store, we need to correct for that.
+ possiblyOutPath=$(nix-instantiate $systemArg --eval -E "with $importTree; outPath" | tr -d '"')
+ if [[ -n "$possiblyOutPath" ]]; then
+ outPathEscaped=$(echo "$possiblyOutPath" | sed 's#[$^*\\.[|]#\\&#g')
+ pwdEscaped=$(echo "$PWD" | sed 's#[$^*\\.[|]#\\&#g')
+ nixFile=$(echo "$nixFile" | sed "s|^$outPathEscaped|$pwdEscaped|")
+ fi
fi
oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"')
@@ -93,17 +125,16 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then
die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
fi
-oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"')
+oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"')
if [[ -z "$oldUrl" ]]; then
die "Couldn't evaluate source url from '$attr.src'!"
fi
-drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"')
-oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"')
+oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"')
-if [[ -z "$drvName" || -z "$oldVersion" ]]; then
- die "Couldn't evaluate name and version from '$attr.name'!"
+if [[ -z "$oldVersion" ]]; then
+ die "Couldn't find out the old version of '$attr'!"
fi
if [[ "$oldVersion" = "$newVersion" ]]; then
@@ -115,7 +146,7 @@ if [[ "$oldVersion" = "$newVersion" ]]; then
fi
if [[ -n "$newRevision" ]]; then
- oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"')
+ oldRevision=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.src.rev" | tr -d '"')
if [[ -z "$oldRevision" ]]; then
die "Couldn't evaluate source revision from '$attr.src'!"
fi
diff --git a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix
index e9fa1b7e4f..900f28edc8 100644
--- a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix
+++ b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "scheme-manpages-unstable";
- version = "2021-01-17";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "schemedoc";
repo = "manpages";
- rev = "817798ccca81424e797fda0e218d53a95f50ded7";
- sha256 = "1amc0dmliz2a37pivlkx88jbc08ypfiwv3z477znx8khhc538glk";
+ rev = "d0163a4e29d29b2f0beb762be4095775134f5ef9";
+ sha256 = "0a8f7rq458c7985chwn1qb9yxcwyr0hl39r9vlvm5j687hy3igs2";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/data/icons/beauty-line-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/beauty-line-icon-theme/default.nix
new file mode 100644
index 0000000000..2942315f7d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/data/icons/beauty-line-icon-theme/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }:
+
+stdenv.mkDerivation rec {
+ pname = "BeautyLine";
+ version = "0.0.1";
+
+ src = fetchzip {
+ name = "${pname}-${version}";
+ url = "https://github.com/gvolpe/BeautyLine/releases/download/${version}/BeautyLine.tar.gz";
+ sha256 = "030bjk333fr9wm1nc740q8i31rfsgf3vg6cvz36xnvavx3q363l7";
+ };
+
+ nativeBuildInputs = [ gtk3 ];
+
+ # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point)
+ propagatedBuildInputs = [
+ breeze-icons
+ gnome-icon-theme
+ hicolor-icon-theme
+ mint-x-icons
+ pantheon.elementary-icon-theme
+ ];
+
+ dontDropIconThemeCache = true;
+
+ installPhase = ''
+ mkdir -p $out/share/icons/${pname}
+ cp -r * $out/share/icons/${pname}/
+ gtk-update-icon-cache $out/share/icons/${pname}
+ '';
+
+ meta = with lib; {
+ description = "BeautyLine icon theme";
+ homepage = "https://www.gnome-look.org/p/1425426/";
+ platforms = platforms.linux;
+ license = [ licenses.publicDomain ];
+ maintainers = with maintainers; [ gvolpe ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix
index 79a5e09c4f..482fb402e4 100644
--- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "nemo";
- version = "4.8.4";
+ version = "4.8.6";
# TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-OOPjxYrYUd1PIRxRgHwYbm7ennmAChbXqcM8MEPKXO0=";
+ hash = "sha256-OUv7l+klu5l1Y7m+iHiq/dDyxH3/hT4k7F9gDuUiGds=";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
index be1f8a80e7..c28d069d5f 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "libfm-qt";
- version = "0.16.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
- sha256 = "0b52bczqvw4brxv5fszjrl1375yid6xzjm49ns9rx1jw71422w0p";
+ sha256 = "0jdsqvwp81y4ylabrqdc673x80fp41rpp5w7c1v9zmk9k8z4s5ll";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
index 38cc871964..b7aa5d95ea 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "liblxqt";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1rp26g1ygzzy1cm7md326sv99zjz4y12pa402nlf2vrf2lzbwfmk";
+ sha256 = "0n0pjz5wihchfcji8qal0lw8kzvv3im50v1lbwww4ymrgacz9h4l";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
index adb8b8a116..7abaed7c09 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "libqtxdg";
- version = "3.6.0";
+ version = "3.7.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0wiannhaydnbqd8ni3nflx2s4036grxs8aklcb95j88v3cgr2gck";
+ sha256 = "1x806hdics3d49ys0a2vkln9znidj82qscjnpcqxclxn26xqzd91";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
index 6f6e432ad9..8da7675d48 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "libsysstat";
- version = "0.4.4";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1pbshhg8pjkzkka5f2rxfxal7rb4fjccpgj07kxvgcnqlah27ydk";
+ sha256 = "14q55iayygmjh63zgsb9qa4af766gj9b0jsrmfn85fdiqb8p8yfz";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
index b7e30096b7..10e40f4ed9 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lximage-qt";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1z2lvfrw9shpvwxva0vf0rk74nj3mmjgxznsgq8r65645fnj5imb";
+ sha256 = "1xajsblk2954crvligvrgwp7q1pj7124xdfnlq9k9q0ya2xc36lx";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
index 523092d178..08e2173612 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-about";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0m7gan31byy80k9jqfqxx4drvfx0d9savj4shnrabsb3z3fj9h8h";
+ sha256 = "011jcab47iif741azfgvf52my118nwkny5m0pa7nsqyv8ad1fsiw";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 8406b90949..a3fd034e33 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-admin";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0mi119ji0260idi14980nhmylx3krnfmkj9r81nmbbrg02h158nz";
+ sha256 = "1xi169gz1sarv7584kg33ymckqlx9ddci7r9m0dlm4a7mw7fm0lf";
};
nativeBuildInputs = [
@@ -40,8 +40,11 @@ mkDerivation rec {
];
postPatch = ''
- sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
- -i lxqt-admin-user/CMakeLists.txt
+ for f in lxqt-admin-{time,user}/CMakeLists.txt; do
+ substituteInPlace $f --replace \
+ "\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \
+ "$out/share/polkit-1/actions"
+ done
'';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index 43896c2d6c..348ee3423d 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-archiver";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-archiver";
rev = version;
- sha256 = "0f4nj598w6qhcrhbab15cpfmrda02jcflxhb15vyv7gnplalkya6";
+ sha256 = "0wpayzcyqcnvzk95bqql7p07l8p7mwdgdj7zlbcsdn0wis4yhjm6";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index f45f8c7295..27fda63610 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -6,18 +6,19 @@
, pcre
, qtbase
, glib
+, perl
, lxqtUpdateScript
}:
mkDerivation rec {
pname = "lxqt-build-tools";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1wf6mhcfgk64isy7bk018szlm18xa3hjjnmhpcy2whnnjfq0jal6";
+ sha256 = "0zhcv6cbdn9fr5lpglz26gzssbxkpi824sgc0g7w3hh1z6nqqf8l";
};
nativeBuildInputs = [
@@ -32,6 +33,10 @@ mkDerivation rec {
pcre
];
+ propagatedBuildInputs = [
+ perl # needed by LXQtTranslateDesktop.cmake
+ ];
+
setupHook = ./setup-hook.sh;
# We're dependent on this macro doing add_definitions in most places
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
index c273a7bd85..5913ec7a0d 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-config";
- version = "0.16.1";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1ppkkz7rg5ddlyk1ikh2s3g7nbb0wnpl0lldg9j68l76d61sfm8z";
+ sha256 = "0b9jihmsqgdfdsisz15j3p53fgf1w30s8irj9zjh52fsj58p924p";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index a54564e062..6dab1cbf73 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-globalkeys";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "00n02mci0wry9l2prc98liiamshacnj8pvmra5wkmygm581q2r19";
+ sha256 = "135292l8w9sngg437n1zigkap15apifyqd9847ln84bxsmcj8lay";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index c02b768d6b..093706fd6e 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-notificationd";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0ahvjf5102a0pz5bfznjvkg55xix6k9bw381gzv6jqw5553snanc";
+ sha256 = "1r2cmxcjkm9lvb2ilq2winyqndnamsd9x2ynmfiqidby2pcr9i3a";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 3aac000fb6..a6fbfc2f56 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-openssh-askpass";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "163mshrwfwp31bjis66l50krsyp184idw9gyp7pdh047psca5129";
+ sha256 = "18pn7kw9aw7859jnwvjnjcvr50pqsi8gqcxsbx9rvsjrybw2qcgc";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
index bb6ed85489..c565c5b4c3 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -30,13 +30,13 @@
mkDerivation rec {
pname = "lxqt-panel";
- version = "0.16.1";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1mm23fys5npm5fi47y3h2mzvlhlcaz7k1p4wwmc012f0hqcrvqik";
+ sha256 = "1wmm4sml7par5z9xcs5qx2y2pdbnnh66zs37jhx9f9ihcmh1sqlw";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index adda2339f3..0a84799d37 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -19,13 +19,13 @@
mkDerivation rec {
pname = "lxqt-policykit";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "05qi550cjyjzhlma4zxnp1pn8i5cgak2k2mwwh2a5gpicp5axavn";
+ sha256 = "15f0hnif8zs38qgckif63dds9zgpp3dmg9pg3ppgh664lkbxx7n7";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 3c1350753c..a1b0680674 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-powermanagement";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1pf3z8hymddk1cm5j5lqgah967xsdl37j66gz5bs3dw7871gbdhy";
+ sha256 = "1ikkksg5k7jwph7060h8wyk7bdsywvhl47zp23j5gcig0nk62ggf";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index d19abcfe95..3095b23992 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-qtplugin";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "14k5icxjkl5znp59y44791brsmwy54jkwr4vn3kg4ggqjdp3vbh9";
+ sha256 = "168ii015j57hkccdh27h2fdh8yzs8nzy8nw20wnx6fbcg5401666";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 3f80800310..32d9194be6 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -20,13 +20,13 @@
mkDerivation rec {
pname = "lxqt-runner";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0bmx5y4l443j8vrzw8967kw5i150braq0pfj8xk0nyz6zz62rrf1";
+ sha256 = "167gzn6aqk7akzbmrnm7nmcpkl0nphr8axbfgwnw552dnk6v8gn0";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
index 4c29a249dd..b62ca157ee 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -11,6 +11,7 @@
, kwindowsystem
, liblxqt
, libqtxdg
+, procps
, xorg
, xdg-user-dirs
, lxqtUpdateScript
@@ -18,13 +19,13 @@
mkDerivation rec {
pname = "lxqt-session";
- version = "0.16.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1lmj0cx4crdjl2qih3scm2gvsx3qna0nb6mjjrcx0f2k7h744pik";
+ sha256 = "1nhw3y3dm4crawc1905l6drn0i79fs1dzs8iak0vmmplbiv3fvgg";
};
nativeBuildInputs = [
@@ -41,6 +42,7 @@ mkDerivation rec {
kwindowsystem
liblxqt
libqtxdg
+ procps
xorg.libpthreadstubs
xorg.libXdmcp
xdg-user-dirs
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 79168795c6..4daf40197e 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lxqt-sudo";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0al64v12ddi6bgrr2z86jh21c02wg5l0mxjcmk9xlsvdx0d94cdx";
+ sha256 = "10s8k83mkqiakh18mh1l7idjp95cy49rg8dh14cy159dk8mchcd0";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 08ba99c960..985e84d03c 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -8,13 +8,13 @@
mkDerivation rec {
pname = "lxqt-themes";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "12pbba7a2rk0kjn3hl2lvn90di58w0s5psbq51kz39ah3rlp9dzz";
+ sha256 = "13zh5yrq0f96cn5m6i7zdvgb9iw656fad5ps0s2zx6x8mj2mv64f";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index e996eefc90..662930e4e3 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "pavucontrol-qt";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1d3kp2y3crrmbqak4mn9d6cfbhi5l5xhchhjh44ng8gpww22k5h0";
+ sha256 = "0syc4bc2k7961la2c77787akhcljspq3s2nyqvb7mq7ddq1xn0wx";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 2fa7879d58..ba913cd147 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "pcmanfm-qt";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "09mlv5qkwzpfz5l41pcz0k01kgsikzkghhfkl84hwyjdm4i2vapj";
+ sha256 = "1awyncpypygsrg7d2nc6xh1l4xaln3ypdliy4xmq8bf94sh9rf0y";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
index be28b589ca..0a4918190b 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "qps";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0gfw7iz7jzyfl9hiq3aivbgkkl61fz319cfg57fgn2kldlcljhwa";
+ sha256 = "0fihhnb7vp6x072spg1fnxaip4sq9mbvhrfqdwnzph5dlyvs54nj";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
index 740cc09fca..d383703199 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix
@@ -12,13 +12,13 @@
mkDerivation rec {
pname = "qterminal";
- version = "0.16.1";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0l1jhkyx7ihv3nvqm1gfvzhrhl4l8yvqxly0c9zgl6mzrd39cj3d";
+ sha256 = "0mdcz45faj9ysw725qzg572968kf5sh6zfw7iiksi26s8kiyhbbp";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
index 5970827f45..94a9c651cc 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "qtermwidget";
- version = "0.16.1";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0kpg4b60h6dads8ncwlk0zj1c8y7xpb0kz28j0v9fqjbmxja7x6w";
+ sha256 = "0pmkk2mba8z6cgfsd8sy4vhf5d9fn9hvxszzyycyy1ndygjrc1v8";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
index 36174c870d..0ed305403b 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix
@@ -9,6 +9,7 @@
, qtsvg
, kwindowsystem
, libqtxdg
+, perl
, xorg
, autoPatchelfHook
, lxqtUpdateScript
@@ -16,18 +17,19 @@
mkDerivation rec {
pname = "screengrab";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0jy2izgl3jg6mnykpw7ji1fjv7dsivdfi6k6i6glrpa0z1p51gic";
+ sha256 = "16dycq40lbvk6jvpj7zp85m23cgvh8nj38fz99gxjfzn2nz1gy4a";
};
nativeBuildInputs = [
cmake
pkg-config
+ perl # needed by LXQtTranslateDesktop.cmake
autoPatchelfHook # fix libuploader.so and libextedit.so not found
];
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix
index 3f68da288c..7e8afde588 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix
@@ -17,17 +17,18 @@
, enablePostScript ? true, libspectre
, enableXps ? true, libgxps
, enableImages ? false
+, mateUpdateScript
}:
with lib;
stdenv.mkDerivation rec {
pname = "atril";
- version = "1.24.0";
+ version = "1.24.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y";
+ sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl";
};
nativeBuildInputs = [
@@ -67,10 +68,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "A simple multi-page document viewer for the MATE desktop";
homepage = "https://mate-desktop.org";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
index 92176493af..3b96f67b12 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, substituteAll
, pkg-config, gobject-introspection, gdk-pixbuf
-, gtk3, mate, python3, dropbox }:
+, gtk3, mate, python3, dropbox, mateUpdateScript }:
let
dropboxd = "${dropbox}/bin/dropbox";
@@ -43,10 +43,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Dropbox extension for Caja file manager";
homepage = "https://github.com/mate-desktop/caja-dropbox";
- license = with licenses; [ gpl3 cc-by-nd-30 ];
+ license = with licenses; [ gpl3Plus cc-by-nd-30 ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix
index 64a036fd38..5c08074f04 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "caja-extensions";
@@ -33,10 +33,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Set of extensions for Caja file manager";
homepage = "https://mate-desktop.org";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
index 35e3cd198f..125e39d1f4 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }:
+{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }:
stdenv.mkDerivation {
pname = "${caja.pname}-with-extensions";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix
index 890d3d6154..c533f78849 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "caja";
- version = "1.24.0";
+ version = "1.24.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0";
+ sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5";
};
nativeBuildInputs = [
@@ -33,11 +33,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
+ meta = with lib; {
description = "File manager for the MATE desktop";
homepage = "https://mate-desktop.org";
- license = with lib.licenses; [ gpl2 lgpl2 ];
- platforms = lib.platforms.unix;
- maintainers = [ lib.maintainers.romildo ];
+ license = with licenses; [ gpl2Plus lgpl2Plus ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/default.nix
index 10c278c8bf..291d26afcd 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/default.nix
@@ -1,10 +1,18 @@
-{ newScope }:
+{ pkgs, newScope }:
let
callPackage = newScope self;
self = rec {
+ # Update script tailored to mate packages from git repository
+ mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }:
+ pkgs.genericUpdater {
+ inherit pname version odd-unstable;
+ attrPath = "mate.${pname}";
+ versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}";
+ };
+
atril = callPackage ./atril { };
caja = callPackage ./caja { };
caja-dropbox = callPackage ./caja-dropbox { };
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix
index 591cac7d88..81d34b8b12 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "engrampa";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y";
+ sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f";
};
nativeBuildInputs = [
@@ -32,11 +32,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
+ meta = with lib; {
description = "Archive Manager for MATE";
homepage = "https://mate-desktop.org";
- license = lib.licenses.gpl2;
- platforms = lib.platforms.unix;
- maintainers = [ lib.maintainers.romildo ];
+ license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix
index 8b447f14d8..27c1207965 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "eom";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f";
+ sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf";
};
nativeBuildInputs = [
@@ -32,10 +32,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = {
description = "An image viewing and cataloging program for the MATE desktop";
homepage = "https://mate-desktop.org";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix
index 1b66bb97ef..8d0b567f16 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "libmatekbd";
@@ -15,10 +15,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Keyboard management library for MATE";
homepage = "https://github.com/mate-desktop/libmatekbd";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix
index 29d6127c3b..9d42c23c71 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix
@@ -2,7 +2,8 @@
, alsaSupport ? stdenv.isLinux, alsaLib
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
, ossSupport ? false
- }:
+, mateUpdateScript
+}:
stdenv.mkDerivation rec {
pname = "libmatemixer";
@@ -23,10 +24,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Mixer library for MATE";
homepage = "https://github.com/mate-desktop/libmatemixer";
- license = with licenses; [ gpl2 lgpl2 ];
+ license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
index 0f5deb8f55..b042df0fe1 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "libmateweather";
@@ -22,10 +22,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Library to access weather information from online services for MATE";
homepage = "https://github.com/mate-desktop/libmateweather";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix
index 3c16004010..b652be0f71 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix
@@ -1,12 +1,13 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
+, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "marco";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54";
+ sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9";
};
nativeBuildInputs = [
@@ -28,10 +29,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "MATE default window manager";
homepage = "https://github.com/mate-desktop/marco";
- license = [ licenses.gpl2 ];
+ license = [ licenses.gpl2Plus ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
index bfa5a1a5d9..1046e431a3 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3
+, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
+, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-applets";
@@ -38,6 +40,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Applets for use with the MATE panel";
homepage = "https://mate-desktop.org";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix
index b990a53b04..cfe1325b83 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, gettext }:
+{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-backgrounds";
@@ -15,10 +15,12 @@ stdenv.mkDerivation rec {
ninja
];
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Background images and data for MATE";
homepage = "https://mate-desktop.org";
- license = licenses.gpl2;
+ license = with licenses; [ gpl2Plus cc-by-sa-40 ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix
index 2805c86fe8..a3e8d3b595 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-calc";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw";
+ sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l";
};
nativeBuildInputs = [
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Calculator for the MATE desktop";
homepage = "https://mate-desktop.org";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix
index 7a2ac74522..58314df673 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-common";
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = {
description = "Common files for development of MATE packages";
homepage = "https://mate-desktop.org";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix
index 262ca75ac7..b94e7ecfd0 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,15 +1,16 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib,
- libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
- desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib
+, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3
+, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
+, mateUpdateScript
}:
stdenv.mkDerivation rec {
pname = "mate-control-center";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0";
+ sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39";
};
nativeBuildInputs = [
@@ -49,10 +50,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Utilities to configure the MATE desktop";
homepage = "https://github.com/mate-desktop/mate-control-center";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix
index 9102ae3e8b..b1b59dc640 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-desktop";
@@ -23,10 +23,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Library with common API for various MATE modules";
homepage = "https://mate-desktop.org";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index fd280f3d96..7dc4423fb6 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }:
+{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-icon-theme-faenza";
@@ -23,11 +23,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
+ meta = with lib; {
description = "Faenza icon theme from MATE";
homepage = "https://mate-desktop.org";
- license = lib.licenses.gpl2;
- platforms = lib.platforms.unix;
- maintainers = [ lib.maintainers.romildo ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix
index 530a7b66ff..cf18cf528f 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-icon-theme";
@@ -27,10 +27,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = {
description = "Icon themes from MATE";
homepage = "https://mate-desktop.org";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix
index a26b593101..804bf2352d 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-indicator-applet";
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
homepage = "https://github.com/mate-desktop/mate-indicator-applet";
description = "MATE panel indicator applet";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix
index f4d8bd7388..6072e81fb3 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-media";
@@ -27,10 +27,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Media tools for MATE";
homepage = "https://mate-desktop.org";
- license = licenses.gpl3;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo maintainers.chpatrick ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix
index 1333af0cdd..5b11c20380 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3 }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-menus";
@@ -20,10 +20,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Menu system for MATE";
homepage = "https://github.com/mate-desktop/mate-menus";
- license = with licenses; [ gpl2 lgpl2 ];
+ license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
index 3912ab47c8..9b7a5ae671 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-netbook";
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "MATE utilities for netbooks";
longDescription = ''
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
devices with low resolution displays.
'';
homepage = "https://mate-desktop.org";
- license = with licenses; [ gpl3 lgpl2Plus ];
+ license = with licenses; [ gpl3Only lgpl2Plus ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 5e867085bb..62181418fd 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
- libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }:
+ libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-notification-daemon";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b";
+ sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q";
};
nativeBuildInputs = [
@@ -28,10 +28,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Notification daemon for MATE Desktop";
homepage = "https://github.com/mate-desktop/mate-notification-daemon";
- license = licenses.gpl2;
+ license = with licenses; [ gpl2Plus gpl3Plus ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
index 1ada017191..328fcfd20d 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-panel";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l";
+ sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h";
};
nativeBuildInputs = [
@@ -39,10 +39,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "The MATE panel";
homepage = "https://github.com/mate-desktop/mate-panel";
- license = with licenses; [ gpl2 lgpl2 ];
+ license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix
index 67690161f5..174e2e4662 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-polkit";
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Integrates polkit authentication for MATE desktop";
homepage = "https://mate-desktop.org";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix
index e0c46076a6..3a99538d92 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-power-manager";
- version = "1.24.2";
+ version = "1.24.3";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj";
+ sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6";
};
nativeBuildInputs = [
@@ -34,10 +34,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "The MATE Power Manager";
homepage = "https://mate-desktop.org";
- license = licenses.gpl3;
+ license = with licenses; [ gpl2Plus fdl11Plus ];
platforms = platforms.unix;
maintainers = with maintainers; [ romildo chpatrick ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix
index fe30935234..f132bbcd26 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-screensaver";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw";
+ sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy";
};
nativeBuildInputs = [
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Screen saver and locker for the MATE desktop";
homepage = "https://mate-desktop.org";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix
index 6fed2a6544..849f767c7c 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify
+, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-sensors-applet";
@@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
homepage = "https://github.com/mate-desktop/mate-sensors-applet";
description = "MATE panel applet for hardware sensors";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix
index 08a119ad8d..c0cd12bd27 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
- wrapGAppsHook, fetchpatch
+ wrapGAppsHook, fetchpatch, mateUpdateScript
}:
stdenv.mkDerivation rec {
pname = "mate-session-manager";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51";
+ sha256 = "1jcb5k2fx2rwwbrslgv1xlzaiwiwjnxjwnp503qf8cg89w69q2vb";
};
patches = [
@@ -43,16 +43,17 @@ stdenv.mkDerivation rec {
postFixup = ''
substituteInPlace $out/share/xsessions/mate.desktop \
- --replace "Exec=mate-session" "Exec=$out/bin/mate-session" \
- --replace "TryExec=mate-session" "TryExec=$out/bin/mate-session"
+ --replace "Exec=mate-session" "Exec=$out/bin/mate-session"
'';
passthru.providedSessions = [ "mate" ];
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "MATE Desktop session manager";
homepage = "https://github.com/mate-desktop/mate-session-manager";
- license = with licenses; [ gpl2 lgpl2 ];
+ license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 0a483269c5..6c35a1d631 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier,
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
- wrapGAppsHook }:
+ wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-settings-daemon";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab";
+ sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc";
};
nativeBuildInputs = [
@@ -38,10 +38,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "MATE settings daemon";
homepage = "https://github.com/mate-desktop/mate-settings-daemon";
- license = with licenses; [ gpl2 lgpl21 ];
+ license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ];
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
index 2d89cb2494..4527c91eed 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-system-monitor";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz";
+ sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp";
};
nativeBuildInputs = [
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "System monitor for the MATE desktop";
homepage = "https://mate-desktop.org";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix
index 48588cc6d6..2c4d4223ec 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-terminal";
@@ -30,10 +30,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "The MATE Terminal Emulator";
homepage = "https://mate-desktop.org";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix
index 3c0d9cf1b0..6a1be82c8a 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3,
- gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
+ gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-themes";
- version = "3.22.21";
+ version = "3.22.22";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n";
+ sha256 = "18crdwfpfm3br4pv94wy7rpmzzb69im4j8dgq1b7c8gcbbzay05x";
};
nativeBuildInputs = [ pkg-config gettext gtk3 ];
@@ -24,11 +24,16 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ passthru.updateScript = mateUpdateScript {
+ inherit pname version;
+ url = "https://pub.mate-desktop.org/releases/themes";
+ };
+
+ meta = with lib; {
description = "A set of themes from MATE";
homepage = "https://mate-desktop.org";
- license = lib.licenses.lgpl21;
- platforms = lib.platforms.unix;
- maintainers = [ lib.maintainers.romildo ];
+ license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix
index ce97bc416e..830cf092f8 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix
@@ -9,17 +9,19 @@
, gobject-introspection
, wrapGAppsHook
, glib
+, genericUpdater
+, common-updater-scripts
}:
python3Packages.buildPythonApplication rec {
pname = "mate-tweak";
- version = "20.10.0";
+ version = "21.04.3";
src = fetchFromGitHub {
owner = "ubuntu-mate";
repo = pname;
rev = version;
- sha256 = "08gw5i5wjxmzn92h9fv6g7q9i00n8shv1wlpy6cb31xy9wbmjph6";
+ sha256 = "0vpzy7awhb1xfsdjsrchy5b9dygj4ixdcvgx5v5w8hllmi4yxpc1";
};
nativeBuildInputs = [
@@ -72,6 +74,12 @@ python3Packages.buildPythonApplication rec {
done
'';
+ passthru.updateScript = genericUpdater {
+ inherit pname version;
+ attrPath = "mate.${pname}";
+ versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
+ };
+
meta = with lib; {
description = "Tweak tool for the MATE Desktop";
homepage = "https://github.com/ubuntu-mate/mate-tweak";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix
index 2a91cac5a5..d7c83cc982 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp }:
+{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-user-guide";
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "MATE User Guide";
homepage = "https://mate-desktop.org";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix
index 8aa9591003..1126e58513 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2
+, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-user-share";
@@ -44,6 +45,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "User level public file sharing for the MATE desktop";
homepage = "https://github.com/mate-desktop/mate-user-share";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix
index c58a3d4bc6..0b7b181bd5 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3
+, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-utils";
@@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Utilities for the MATE desktop";
homepage = "https://mate-desktop.org";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix
index 4d893cd2e7..4122e82316 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix
@@ -1,15 +1,15 @@
-{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
+{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }:
python3.pkgs.buildPythonApplication rec {
pname = "mozo";
- version = "1.24.0";
+ version = "1.24.1";
format = "other";
doCheck = false;
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3";
+ sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0";
};
nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ];
@@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "MATE Desktop menu editor";
homepage = "https://github.com/mate-desktop/mozo";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix
index a879f2df5d..4c98c9cf52 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix
@@ -1,12 +1,13 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3
+, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "pluma";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f";
+ sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4";
};
nativeBuildInputs = [
@@ -30,11 +31,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
+ meta = with lib; {
description = "Powerful text editor for the MATE desktop";
homepage = "https://mate-desktop.org";
- license = lib.licenses.gpl2;
- platforms = lib.platforms.unix;
- maintainers = [ lib.maintainers.romildo ];
+ license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix
index 2c59d78e86..8104da3420 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "python-caja";
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.updateScript = mateUpdateScript { inherit pname version; };
+
meta = with lib; {
description = "Python binding for Caja components";
homepage = "https://github.com/mate-desktop/python-caja";
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/update.sh b/third_party/nixpkgs/pkgs/desktops/mate/update.sh
deleted file mode 100755
index d214e07f8c..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/mate/update.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p libarchive curl common-updater-scripts
-
-set -eu -o pipefail
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-root=../../..
-export NIXPKGS_ALLOW_UNFREE=1
-
-mate_version=1.24
-theme_version=3.22
-materepo=https://pub.mate-desktop.org/releases/${mate_version}
-themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version}
-
-version() {
- (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
-}
-
-update_package() {
- local p=$1
- echo $p
- echo "# $p" >> git-commits.txt
-
- local repo
- if [ "$p" = "mate-themes" ]; then
- repo=$themerepo
- else
- repo=$materepo
- fi
-
- local p_version_old=$(version mate.$p)
- local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p")
- local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1)
-
- if [[ -z "$p_version" ]]; then
- echo "unavailable $p"
- echo "# $p not found" >> git-commits.txt
- echo
- return
- fi
-
- if [[ "$p_version" = "$p_version_old" ]]; then
- echo "nothing to do, $p $p_version is current"
- echo
- return
- fi
-
- # Download package and save hash and file path.
- local url="$repo/$p-${p_version}.tar.xz"
- mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
- local hash=${prefetch[0]}
- local path=${prefetch[1]}
- echo "$p: $p_version_old -> $p_version"
- (cd "$root" && update-source-version mate.$p "$p_version" "$hash")
- echo " git add pkgs/desktops/mate/$p" >> git-commits.txt
- echo " git commit -m \"mate.$p: $p_version_old -> $p_version\"" >> git-commits.txt
- echo
-}
-
-for d in $(ls -A --indicator-style=none); do
- if [ -d $d ]; then
- update_package $d
- fi
-done
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 71645cd1f9..cca8070803 100644
--- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -5,9 +5,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfce4-settings";
- version = "4.16.0";
+ version = "4.16.1";
- sha256 = "0iha3jm7vmgk6hq7z4l2r7w9qm5jraka0z580i8i83704kfx9g0y";
+ sha256 = "0mjhglfsqmiycpv98l09n2556288g2713n4pvxn0srivm017fdir";
postPatch = ''
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do
diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix b/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix
index 916a150c1f..b61db92584 100644
--- a/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix
+++ b/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix
@@ -9,7 +9,7 @@ mixRelease rec {
src = fetchFromGitHub {
owner = "elixir-lsp";
repo = "elixir-ls";
- rev = "v{version}";
+ rev = "v${version}";
sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/hex/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/hex/default.nix
index 794b9e5cf2..836740a793 100644
--- a/third_party/nixpkgs/pkgs/development/beam-modules/hex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/beam-modules/hex/default.nix
@@ -8,13 +8,13 @@ let
pkg = self: stdenv.mkDerivation rec {
pname = "hex";
- version = "0.20.5";
+ version = "0.21.2";
src = fetchFromGitHub {
owner = "hexpm";
repo = "hex";
rev = "v${version}";
- sha256 = "1wz6n4qrmsb4kkww6lrdbs99xzwp4dyjjmr8m4drcwn3sd2k9ba6";
+ sha256 = "18vwrc5b7pyi3nifmx5hd5wbz8fy3h6sfvkmskjg5acmz66fys0g";
};
setupHook = writeText "setupHook.sh" ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
index 6ecf462d54..4edc034720 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
@@ -55,6 +55,7 @@ let majorVersion = "8";
patches =
optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+ ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch
++ optional noSysDirs ../no-sys-dirs.patch
/* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
index 7f35f5c7bb..ca92a8f484 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
@@ -70,6 +70,7 @@ let majorVersion = "9";
# This patch can most likely be removed by a post 9.3.0-release.
[ ./avoid-cycling-subreg-reloads.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+ ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch
++ optional noSysDirs ../no-sys-dirs.patch
/* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools.nix
rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix
index 00922ed96e..a6d68d2e2a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix
@@ -108,7 +108,7 @@ let
# doesn’t support like LLVM. Probably we should move to some other
# file.
- bintools = callPackage ./bintools.nix {};
+ bintools = callPackage ./bintools {};
lldClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
@@ -192,18 +192,18 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
- libcxx = callPackage ./libc++ ({ inherit llvm_meta; } //
+ libcxx = callPackage ./libcxx ({ inherit llvm_meta; } //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
- libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } //
+ libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind;
}));
- openmp = callPackage ./openmp.nix { inherit llvm_meta; };
+ openmp = callPackage ./openmp { inherit llvm_meta; };
libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix
similarity index 98%
rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++/default.nix
rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix
index d85d890879..7b3b26b959 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
- pname = "libc++";
+ pname = "libcxx";
inherit version;
src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
similarity index 99%
rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi/default.nix
rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
index 22ec211a3b..dab6c583e8 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
- pname = "libc++abi";
+ pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch
rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp.nix
rename to third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp/default.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix
new file mode 100644
index 0000000000..35e7daaf21
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix
@@ -0,0 +1,153 @@
+{ lib, stdenv
+, fetchurl
+, mrustc
+, mrustc-minicargo
+, rust
+, llvm_7
+, llvmPackages_7
+, libffi
+, cmake
+, python3
+, zlib
+, libxml2
+, openssl
+, pkg-config
+, curl
+, which
+, time
+}:
+
+let
+ rustcVersion = "1.29.0";
+ rustcSrc = fetchurl {
+ url = "https://static.rust-lang.org/dist/rustc-${rustcVersion}-src.tar.gz";
+ sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4";
+ };
+ rustcDir = "rustc-${rustcVersion}-src";
+in
+
+stdenv.mkDerivation rec {
+ pname = "mrustc-bootstrap";
+ version = "${mrustc.version}_${rustcVersion}";
+
+ inherit (mrustc) src;
+ postUnpack = "tar -xf ${rustcSrc} -C source/";
+
+ # the rust build system complains that nix alters the checksums
+ dontFixLibtool = true;
+
+ patches = [
+ ./patches/0001-use-shared-llvm.patch
+ ./patches/0002-dont-build-llvm.patch
+ ./patches/0003-echo-newlines.patch
+ ./patches/0004-increase-parallelism.patch
+ ];
+
+ postPatch = ''
+ echo "applying patch ./rustc-${rustcVersion}-src.patch"
+ patch -p0 -d ${rustcDir}/ < rustc-${rustcVersion}-src.patch
+
+ for p in ${lib.concatStringsSep " " llvmPackages_7.compiler-rt.patches}; do
+ echo "applying patch $p"
+ patch -p1 -d ${rustcDir}/src/libcompiler_builtins/compiler-rt < $p
+ done
+ '';
+
+ # rustc unfortunately needs cmake to compile llvm-rt but doesn't
+ # use it for the normal build. This disables cmake in Nix.
+ dontUseCmakeConfigure = true;
+
+ strictDeps = true;
+ nativeBuildInputs = [
+ cmake
+ mrustc
+ mrustc-minicargo
+ pkg-config
+ python3
+ time
+ which
+ ];
+ buildInputs = [
+ # for rustc
+ llvm_7 libffi zlib libxml2
+ # for cargo
+ openssl curl
+ ];
+
+ makeFlags = [
+ # Use shared mrustc/minicargo/llvm instead of rebuilding them
+ "MRUSTC=${mrustc}/bin/mrustc"
+ "MINICARGO=${mrustc-minicargo}/bin/minicargo"
+ "LLVM_CONFIG=${llvm_7}/bin/llvm-config"
+ "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}"
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ local flagsArray=(
+ PARLEVEL=$NIX_BUILD_CORES
+ ${toString makeFlags}
+ )
+
+ echo minicargo.mk: libs
+ make -f minicargo.mk "''${flagsArray[@]}" LIBS
+
+ echo minicargo.mk: deps
+ mkdir -p output/cargo-build
+ # minicargo has concurrency issues when running these; let's build them
+ # without parallelism
+ for crate in regex regex-0.2.11 curl-sys
+ do
+ echo "building $crate"
+ minicargo ${rustcDir}/src/vendor/$crate \
+ --vendor-dir ${rustcDir}/src/vendor \
+ --output-dir output/cargo-build -L output/
+ done
+
+ echo minicargo.mk: rustc
+ make -f minicargo.mk "''${flagsArray[@]}" output/rustc
+
+ echo minicargo.mk: cargo
+ make -f minicargo.mk "''${flagsArray[@]}" output/cargo
+
+ echo run_rustc
+ make -C run_rustc "''${flagsArray[@]}"
+
+ unset flagsArray
+
+ runHook postBuild
+ '';
+
+ doCheck = true;
+ checkPhase = ''
+ runHook preCheck
+ run_rustc/output/prefix/bin/hello_world | grep "hello, world"
+ runHook postCheck
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin/ $out/lib/
+ cp run_rustc/output/prefix/bin/cargo $out/bin/cargo
+ cp run_rustc/output/prefix/bin/rustc_binary $out/bin/rustc
+
+ cp -r run_rustc/output/prefix/lib/* $out/lib/
+ cp $out/lib/rustlib/${rust.toRustTarget stdenv.targetPlatform}/lib/*.so $out/lib/
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ inherit (src.meta) homepage;
+ description = "A minimal build of Rust";
+ longDescription = ''
+ A minimal build of Rust, built from source using mrustc.
+ This is useful for bootstrapping the main Rust compiler without
+ an initial binary toolchain download.
+ '';
+ maintainers = with maintainers; [ progval r-burns ];
+ license = with licenses; [ mit asl20 ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
+
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mrustc/default.nix
new file mode 100644
index 0000000000..4c813d88b7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/default.nix
@@ -0,0 +1,53 @@
+{ lib, stdenv
+, fetchFromGitHub
+, zlib
+}:
+
+let
+ version = "0.9";
+ tag = "v${version}";
+ rev = "15773561e40ca5c8cffe0a618c544b6cfdc5ad7e";
+in
+
+stdenv.mkDerivation rec {
+ pname = "mrustc";
+ inherit version;
+
+ # Always update minicargo.nix and bootstrap.nix in lockstep with this
+ src = fetchFromGitHub {
+ owner = "thepowersgang";
+ repo = "mrustc";
+ rev = tag;
+ sha256 = "194ny7vsks5ygiw7d8yxjmp1qwigd71ilchis6xjl6bb2sj97rd2";
+ };
+
+ postPatch = ''
+ sed -i 's/\$(shell git show --pretty=%H -s)/${rev}/' Makefile
+ sed -i 's/\$(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)/${tag}/' Makefile
+ sed -i 's/\$(shell git diff-index --quiet HEAD; echo $$?)/0/' Makefile
+ '';
+
+ strictDeps = true;
+ buildInputs = [ zlib ];
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp bin/mrustc $out/bin
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Mutabah's Rust Compiler";
+ longDescription = ''
+ In-progress alternative rust compiler, written in C++.
+ Capable of building a fully-working copy of rustc,
+ but not yet suitable for everyday use.
+ '';
+ inherit (src.meta) homepage;
+ license = licenses.mit;
+ maintainers = with maintainers; [ progval r-burns ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/minicargo.nix b/third_party/nixpkgs/pkgs/development/compilers/mrustc/minicargo.nix
new file mode 100644
index 0000000000..8505e5b8d7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/minicargo.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv
+, makeWrapper
+, mrustc
+}:
+
+stdenv.mkDerivation rec {
+ pname = "mrustc-minicargo";
+ inherit (mrustc) src version;
+
+ strictDeps = true;
+ nativeBuildInputs = [ makeWrapper ];
+
+ enableParallelBuilding = true;
+ makefile = "minicargo.mk";
+ makeFlags = [ "tools/bin/minicargo" ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp tools/bin/minicargo $out/bin
+
+ # without it, minicargo defaults to "/../../bin/mrustc"
+ wrapProgram "$out/bin/minicargo" --set MRUSTC_PATH ${mrustc}/bin/mrustc
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A minimalist builder for Rust";
+ longDescription = ''
+ A minimalist builder for Rust, similar to Cargo but written in C++.
+ Designed to work with mrustc to build Rust projects
+ (like the Rust compiler itself).
+ '';
+ inherit (src.meta) homepage;
+ license = licenses.mit;
+ maintainers = with maintainers; [ progval r-burns ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0001-use-shared-llvm.patch b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0001-use-shared-llvm.patch
new file mode 100644
index 0000000000..e8c57ae254
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0001-use-shared-llvm.patch
@@ -0,0 +1,12 @@
+--- a/rustc-1.29.0-src/src/librustc_llvm/lib.rs
+--- b/rustc-1.29.0-src/src/librustc_llvm/lib.rs
+@@ -23,6 +23,9 @@
+ #![feature(link_args)]
+ #![feature(static_nobundle)]
+
++// https://github.com/rust-lang/rust/issues/34486
++#[link(name = "ffi")] extern {}
++
+ // See librustc_cratesio_shim/Cargo.toml for a comment explaining this.
+ #[allow(unused_extern_crates)]
+ extern crate rustc_cratesio_shim;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0002-dont-build-llvm.patch b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0002-dont-build-llvm.patch
new file mode 100644
index 0000000000..7ae8d191d8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0002-dont-build-llvm.patch
@@ -0,0 +1,14 @@
+--- a/minicargo.mk
++++ b/minicargo.mk
+@@ -116,11 +116,6 @@
+ LLVM_CMAKE_OPTS += CMAKE_BUILD_TYPE=RelWithDebInfo
+
+
+-$(LLVM_CONFIG): $(RUSTCSRC)build/Makefile
+- $Vcd $(RUSTCSRC)build && $(MAKE)
+-$(RUSTCSRC)build/Makefile: $(RUSTCSRC)src/llvm/CMakeLists.txt
+- @mkdir -p $(RUSTCSRC)build
+- $Vcd $(RUSTCSRC)build && cmake $(addprefix -D , $(LLVM_CMAKE_OPTS)) ../src/llvm
+
+
+ #
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0003-echo-newlines.patch b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0003-echo-newlines.patch
new file mode 100644
index 0000000000..f4a4acca85
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0003-echo-newlines.patch
@@ -0,0 +1,13 @@
+--- a/run_rustc/Makefile
++++ b/run_rustc/Makefile
+@@ -103,7 +103,9 @@
+ else
+ cp $(OUTDIR)build-rustc/release/rustc_binary $(BINDIR)rustc_binary
+ endif
+- echo '#!/bin/sh\nd=$$(dirname $$0)\nLD_LIBRARY_PATH="$(abspath $(LIBDIR))" $$d/rustc_binary $$@' >$@
++ echo '#!$(shell which bash)' > $@
++ echo 'd=$$(dirname $$0)' >> $@
++ echo 'LD_LIBRARY_PATH="$(abspath $(LIBDIR))" $$d/rustc_binary $$@' >> $@
+ chmod +x $@
+
+ $(BINDIR)hello_world: $(RUST_SRC)test/run-pass/hello.rs $(LIBDIR)libstd.rlib $(BINDIR)rustc
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0004-increase-parallelism.patch b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0004-increase-parallelism.patch
new file mode 100644
index 0000000000..ce1fec5726
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/patches/0004-increase-parallelism.patch
@@ -0,0 +1,28 @@
+--- a/run_rustc/Makefile
++++ b/run_rustc/Makefile
+@@ -79,14 +79,14 @@
+ @mkdir -p $(OUTDIR)build-std
+ @mkdir -p $(LIBDIR)
+ @echo [CARGO] $(RUST_SRC)libstd/Cargo.toml
+- $VCARGO_TARGET_DIR=$(OUTDIR)build-std RUSTC=$(BINDIR_S)rustc $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libstd/Cargo.toml -j 1 --release --features panic-unwind
++ $VCARGO_TARGET_DIR=$(OUTDIR)build-std RUSTC=$(BINDIR_S)rustc $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libstd/Cargo.toml -j $(NIX_BUILD_CORES) --release --features panic-unwind
+ $Vcp --remove-destination $(OUTDIR)build-std/release/deps/*.rlib $(LIBDIR)
+ $Vcp --remove-destination $(OUTDIR)build-std/release/deps/*.so $(LIBDIR)
+ # libtest
+ $(LIBDIR)libtest.rlib: $(BINDIR)rustc_m $(LIBDIR)libstd.rlib $(CARGO_HOME)config
+ @mkdir -p $(OUTDIR)build-test
+ @echo [CARGO] $(RUST_SRC)libtest/Cargo.toml
+- $VCARGO_TARGET_DIR=$(OUTDIR)build-test RUSTC=$(BINDIR)rustc_m $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libtest/Cargo.toml -j 1 --release
++ $VCARGO_TARGET_DIR=$(OUTDIR)build-test RUSTC=$(BINDIR)rustc_m $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)libtest/Cargo.toml -j $(NIX_BUILD_CORES) --release
+ @mkdir -p $(LIBDIR)
+ $Vcp --remove-destination $(OUTDIR)build-test/release/deps/*.rlib $(LIBDIR)
+ $Vcp --remove-destination $(OUTDIR)build-test/release/deps/*.so $(LIBDIR)
+@@ -95,7 +95,7 @@
+ $(BINDIR)rustc: $(BINDIR)rustc_m $(BINDIR)cargo $(CARGO_HOME)config $(LIBDIR)libtest.rlib
+ @mkdir -p $(PREFIX)tmp
+ @echo [CARGO] $(RUST_SRC)rustc/Cargo.toml
+- $V$(RUSTC_ENV_VARS) TMPDIR=$(abspath $(PREFIX)tmp) CARGO_TARGET_DIR=$(OUTDIR)build-rustc RUSTC=$(BINDIR)rustc_m RUSTC_ERROR_METADATA_DST=$(abspath $(PREFIX)) $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)rustc/Cargo.toml --release -j 1
++ $V$(RUSTC_ENV_VARS) TMPDIR=$(abspath $(PREFIX)tmp) CARGO_TARGET_DIR=$(OUTDIR)build-rustc RUSTC=$(BINDIR)rustc_m RUSTC_ERROR_METADATA_DST=$(abspath $(PREFIX)) $(CARGO_ENV) $(BINDIR)cargo build --manifest-path $(RUST_SRC)rustc/Cargo.toml --release -j $(NIX_BUILD_CORES)
+ cp $(OUTDIR)build-rustc/release/deps/*.so $(LIBDIR)
+ cp $(OUTDIR)build-rustc/release/deps/*.rlib $(LIBDIR)
+ ifeq ($(RUSTC_VERSION),1.19.0)
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix
index 817cdf9c26..436bd0468c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix
@@ -1,19 +1,34 @@
-{ jdk
-, runCommand
-, patchelf
+{ stdenv
+, jdk
, lib
, modules ? [ "java.base" ]
}:
let
- jre = runCommand "${jdk.name}-jre" {
- nativeBuildInputs = [ patchelf ];
+ jre = stdenv.mkDerivation {
+ name = "${jdk.name}-minimal-jre";
+ version = jdk.version;
+
buildInputs = [ jdk ];
+
+ dontUnpack = true;
+
+ # Strip more heavily than the default '-S', since if you're
+ # using this derivation you probably care about this.
+ stripDebugFlags = [ "--strip-unneeded" ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out
+
+ runHook postBuild
+ '';
+
+ dontInstall = true;
+
passthru = {
home = "${jre}";
};
- } ''
- jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out
- patchelf --shrink-rpath $out/bin/* $out/lib/jexec $out/lib/jspawnhelper $out/lib/*.so $out/lib/*/*.so
- '';
+ };
in jre
diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
index 32ef1ad633..6490391eb6 100644
--- a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
@@ -5,6 +5,7 @@ mkCoqDerivation {
pname = "QuickChick";
owner = "QuickChick";
defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [
+ { cases = [ "8.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }
{ cases = [ "8.10" pred.true ]; out = "1.2.1"; }
@@ -14,6 +15,7 @@ mkCoqDerivation {
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
] null;
+ release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
release."1.2.1".sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index f313d65508..552e35b9c3 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -85,7 +85,6 @@ self: super: {
kademlia = dontCheck super.kademlia;
# Tests require older versions of tasty.
- cborg = (doJailbreak super.cborg).override { base16-bytestring = self.base16-bytestring_0_1_1_7; };
hzk = dontCheck super.hzk;
resolv = doJailbreak super.resolv;
tdigest = doJailbreak super.tdigest;
@@ -326,6 +325,7 @@ self: super: {
optional = dontCheck super.optional;
orgmode-parse = dontCheck super.orgmode-parse;
os-release = dontCheck super.os-release;
+ parameterized = dontCheck super.parameterized; # https://github.com/louispan/parameterized/issues/2
persistent-redis = dontCheck super.persistent-redis;
pipes-extra = dontCheck super.pipes-extra;
pipes-websockets = dontCheck super.pipes-websockets;
@@ -1529,7 +1529,7 @@ self: super: {
# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
- http-client = self.http-client_0_7_7;
+ http-client = self.http-client_0_7_8;
});
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
@@ -1780,4 +1780,11 @@ self: super: {
# https://github.com/hasufell/lzma-static/issues/1
lzma-static = doJailbreak super.lzma-static;
+ # Fix haddock errors: https://github.com/koalaman/shellcheck/issues/2216
+ ShellCheck = appendPatch super.ShellCheck (pkgs.fetchpatch {
+ url = "https://github.com/koalaman/shellcheck/commit/9e60b3ea841bcaf48780bfcfc2e44aa6563a62de.patch";
+ sha256 = "1vmg8mmmnph34x7y0mhkcd5nzky8f1rh10pird750xbkp9zlk099";
+ excludes = ["test/buildtest"];
+ });
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f1b953553b..3bf834c16d 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -101,7 +101,7 @@ default-package-overrides:
- gi-secret < 0.0.13
- gi-vte < 2.91.28
- # Stackage Nightly 2021-04-06
+ # Stackage Nightly 2021-04-15
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -139,7 +139,7 @@ default-package-overrides:
- alex-meta ==0.3.0.13
- alg ==0.2.13.1
- algebraic-graphs ==0.5
- - Allure ==0.9.5.0
+ - Allure ==0.10.2.0
- almost-fix ==0.0.2
- alsa-core ==0.5.0.1
- alsa-mixer ==0.3.0
@@ -327,7 +327,7 @@ default-package-overrides:
- bazel-runfiles ==0.12
- bbdb ==0.8
- bcp47 ==0.2.0.3
- - bcp47-orphans ==0.1.0.2
+ - bcp47-orphans ==0.1.0.3
- bcrypt ==0.0.11
- bech32 ==1.1.0
- bech32-th ==1.0.2
@@ -391,7 +391,7 @@ default-package-overrides:
- boundingboxes ==0.2.3
- bower-json ==1.0.0.1
- boxes ==0.1.5
- - brick ==0.60.2
+ - brick ==0.61
- broadcast-chan ==0.2.1.1
- bsb-http-chunked ==0.0.0.4
- bson ==0.4.0.1
@@ -451,8 +451,8 @@ default-package-overrides:
- cassava-megaparsec ==2.0.2
- cast ==0.1.0.2
- category ==0.2.5.0
- - cayley-client ==0.4.14
- - cborg ==0.2.4.0
+ - cayley-client ==0.4.15
+ - cborg ==0.2.5.0
- cborg-json ==0.2.2.0
- cereal ==0.5.8.1
- cereal-conduit ==0.8.0
@@ -528,13 +528,13 @@ default-package-overrides:
- compiler-warnings ==0.1.0
- composable-associations ==0.1.0.0
- composable-associations-aeson ==0.1.0.1
- - composite-aeson ==0.7.4.0
- - composite-aeson-path ==0.7.4.0
- - composite-aeson-refined ==0.7.4.0
- - composite-base ==0.7.4.0
- - composite-binary ==0.7.4.0
- - composite-ekg ==0.7.4.0
- - composite-hashable ==0.7.4.0
+ - composite-aeson ==0.7.5.0
+ - composite-aeson-path ==0.7.5.0
+ - composite-aeson-refined ==0.7.5.0
+ - composite-base ==0.7.5.0
+ - composite-binary ==0.7.5.0
+ - composite-ekg ==0.7.5.0
+ - composite-hashable ==0.7.5.0
- composite-tuple ==0.1.2.0
- composite-xstep ==0.1.0.0
- composition ==1.0.2.2
@@ -681,7 +681,7 @@ default-package-overrides:
- deferred-folds ==0.9.17
- dejafu ==2.4.0.2
- dense-linear-algebra ==0.1.0.0
- - depq ==0.4.1.0
+ - depq ==0.4.2
- deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1
- derive-topdown ==0.0.2.2
@@ -710,7 +710,7 @@ default-package-overrides:
- distributed-closure ==0.4.2.0
- distribution-opensuse ==1.1.1
- distributive ==0.6.2.1
- - dl-fedora ==0.7.7
+ - dl-fedora ==0.8
- dlist ==0.8.0.8
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
@@ -800,10 +800,10 @@ default-package-overrides:
- errors-ext ==0.4.2
- ersatz ==0.4.9
- esqueleto ==3.4.1.1
- - essence-of-live-coding ==0.2.4
- - essence-of-live-coding-gloss ==0.2.4
- - essence-of-live-coding-pulse ==0.2.4
- - essence-of-live-coding-quickcheck ==0.2.4
+ - essence-of-live-coding ==0.2.5
+ - essence-of-live-coding-gloss ==0.2.5
+ - essence-of-live-coding-pulse ==0.2.5
+ - essence-of-live-coding-quickcheck ==0.2.5
- etc ==0.4.1.0
- eve ==0.1.9.0
- eventful-core ==0.2.0
@@ -825,7 +825,7 @@ default-package-overrides:
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.10
- exp-pairs ==0.2.1.0
- - express ==0.1.3
+ - express ==0.1.4
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
@@ -869,7 +869,7 @@ default-package-overrides:
- first-class-patterns ==0.3.2.5
- fitspec ==0.4.8
- fixed ==0.3
- - fixed-length ==0.2.2
+ - fixed-length ==0.2.2.1
- fixed-vector ==1.2.0.0
- fixed-vector-hetero ==0.6.1.0
- fix-whitespace ==0.0.5
@@ -936,10 +936,10 @@ default-package-overrides:
- generic-data-surgery ==0.3.0.0
- generic-deriving ==1.13.1
- generic-functor ==0.2.0.0
- - generic-lens ==2.0.0.0
- - generic-lens-core ==2.0.0.0
+ - generic-lens ==2.1.0.0
+ - generic-lens-core ==2.1.0.0
- generic-monoid ==0.1.0.1
- - generic-optics ==2.0.0.0
+ - generic-optics ==2.1.0.0
- GenericPretty ==1.2.2
- generic-random ==1.3.0.1
- generics-eot ==0.4.0.1
@@ -978,7 +978,7 @@ default-package-overrides:
- geojson ==4.0.2
- getopt-generics ==0.13.0.4
- ghc-byteorder ==4.11.0.0.10
- - ghc-check ==0.5.0.3
+ - ghc-check ==0.5.0.4
- ghc-core ==0.5.6
- ghc-events ==0.16.0
- ghc-exactprint ==0.6.4
@@ -1028,7 +1028,7 @@ default-package-overrides:
- gitrev ==1.3.1
- gi-xlib ==2.0.9
- gl ==0.9
- - glabrous ==2.0.2
+ - glabrous ==2.0.3
- GLFW-b ==3.3.0.0
- Glob ==0.10.1
- gloss ==1.13.2.1
@@ -1130,7 +1130,7 @@ default-package-overrides:
- hgrev ==0.2.6
- hidapi ==0.1.7
- hie-bios ==0.7.5
- - hi-file-parser ==0.1.1.0
+ - hi-file-parser ==0.1.2.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
- hinfo ==0.0.3.0
@@ -1187,7 +1187,7 @@ default-package-overrides:
- hslua-module-path ==0.1.0.1
- hslua-module-system ==0.2.2.1
- hslua-module-text ==0.3.0.1
- - HsOpenSSL ==0.11.6.1
+ - HsOpenSSL ==0.11.6.2
- HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0
- hspec ==2.7.9
@@ -1197,13 +1197,13 @@ default-package-overrides:
- hspec-core ==2.7.9
- hspec-discover ==2.7.9
- hspec-expectations ==0.8.2
- - hspec-expectations-json ==1.0.0.2
+ - hspec-expectations-json ==1.0.0.3
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
- hspec-golden ==0.1.0.3
- hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2
- - hspec-junit-formatter ==1.0.0.1
+ - hspec-junit-formatter ==1.0.0.2
- hspec-leancheck ==0.0.4
- hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8
@@ -1316,7 +1316,7 @@ default-package-overrides:
- indexed ==0.1.3
- indexed-containers ==0.1.0.2
- indexed-list-literals ==0.2.1.3
- - indexed-profunctors ==0.1
+ - indexed-profunctors ==0.1.1
- indexed-traversable ==0.1.1
- indexed-traversable-instances ==0.1
- infer-license ==0.2.0
@@ -1332,6 +1332,7 @@ default-package-overrides:
- insert-ordered-containers ==0.2.4
- inspection-testing ==0.4.3.0
- instance-control ==0.1.2.0
+ - int-cast ==0.2.0.0
- integer-logarithms ==1.0.3.1
- integer-roots ==1.0
- integration ==0.2.1
@@ -1356,7 +1357,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.2
- iproute ==1.7.11
- - IPv6Addr ==2.0.1
+ - IPv6Addr ==2.0.2
- ipynb ==0.1.0.1
- ipython-kernel ==0.10.2.1
- irc ==0.6.1.0
@@ -1369,13 +1370,12 @@ default-package-overrides:
- iso639 ==0.1.0.3
- iso8601-time ==0.1.5
- iterable ==3.0
- - it-has ==0.2.0.0
- ixset-typed ==0.5
- ixset-typed-binary-instance ==0.1.0.2
- ixset-typed-conversions ==0.1.2.0
- ixset-typed-hashable-instance ==0.1.0.2
- ix-shapable ==0.1.0
- - jack ==0.7.1.4
+ - jack ==0.7.2
- jalaali ==1.0.0.0
- jira-wiki-markup ==1.3.4
- jose ==0.8.4
@@ -1416,13 +1416,13 @@ default-package-overrides:
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==1.0.14
- - LambdaHack ==0.9.5.0
+ - LambdaHack ==0.10.2.0
- lame ==0.2.0
- language-avro ==0.1.3.1
- language-bash ==0.9.2
- language-c ==0.8.3
- language-c-quote ==0.12.2.1
- - language-docker ==9.1.3
+ - language-docker ==9.2.0
- language-java ==0.2.9
- language-javascript ==0.7.1.0
- language-protobuf ==1.0.1
@@ -1591,7 +1591,7 @@ default-package-overrides:
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
- mock-time ==0.1.0
- - mod ==0.1.2.1
+ - mod ==0.1.2.2
- model ==0.5
- modern-uri ==0.3.4.1
- modular ==0.1.0.8
@@ -1617,7 +1617,7 @@ default-package-overrides:
- monad-primitive ==0.1
- monad-products ==4.0.1
- MonadPrompt ==1.0.0.5
- - MonadRandom ==0.5.2
+ - MonadRandom ==0.5.3
- monad-resumption ==0.1.4.0
- monad-skeleton ==0.1.5
- monad-st ==0.2.4.1
@@ -1707,7 +1707,7 @@ default-package-overrides:
- nonemptymap ==0.0.6.0
- non-empty-sequence ==0.2.0.4
- nonempty-vector ==0.2.1.0
- - nonempty-zipper ==1.0.0.1
+ - nonempty-zipper ==1.0.0.2
- non-negative ==0.1.2
- not-gloss ==0.7.7.0
- no-value ==1.0.0.0
@@ -1715,7 +1715,7 @@ default-package-overrides:
- nqe ==0.6.3
- nri-env-parser ==0.1.0.6
- nri-observability ==0.1.0.1
- - nri-prelude ==0.5.0.2
+ - nri-prelude ==0.5.0.3
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@@ -1961,8 +1961,8 @@ default-package-overrides:
- QuickCheck ==2.14.2
- quickcheck-arbitrary-adt ==0.3.1.0
- quickcheck-assertions ==0.3.0
- - quickcheck-classes ==0.6.4.0
- - quickcheck-classes-base ==0.6.1.0
+ - quickcheck-classes ==0.6.5.0
+ - quickcheck-classes-base ==0.6.2.0
- quickcheck-higherorder ==0.1.0.0
- quickcheck-instances ==0.3.25.2
- quickcheck-io ==0.2.0
@@ -2013,7 +2013,7 @@ default-package-overrides:
- rebase ==1.6.1
- record-dot-preprocessor ==0.2.10
- record-hasfield ==1.0
- - records-sop ==0.1.0.3
+ - records-sop ==0.1.1.0
- record-wrangler ==0.1.1.0
- recursion-schemes ==5.2.2.1
- reducers ==3.12.3
@@ -2038,7 +2038,7 @@ default-package-overrides:
- regex-posix ==0.96.0.0
- regex-tdfa ==1.3.1.0
- regex-with-pcre ==1.1.0.0
- - registry ==0.2.0.2
+ - registry ==0.2.0.3
- reinterpret-cast ==0.1.0
- relapse ==1.0.0.0
- relational-query ==0.12.2.3
@@ -2087,7 +2087,7 @@ default-package-overrides:
- rvar ==0.2.0.6
- safe ==0.3.19
- safe-coloured-text ==0.0.0.0
- - safecopy ==0.10.4.1
+ - safecopy ==0.10.4.2
- safe-decimal ==0.2.0.0
- safe-exceptions ==0.1.7.1
- safe-foldable ==0.1.0.0
@@ -2248,9 +2248,9 @@ default-package-overrides:
- sparse-tensor ==0.2.1.5
- spatial-math ==0.5.0.1
- special-values ==0.1.0.0
- - speculate ==0.4.2
+ - speculate ==0.4.4
- speedy-slice ==0.3.2
- - Spintax ==0.3.5
+ - Spintax ==0.3.6
- splice ==0.6.1.1
- splint ==1.0.1.4
- split ==0.2.3.4
@@ -2419,7 +2419,7 @@ default-package-overrides:
- text-metrics ==0.3.0
- text-postgresql ==0.0.3.1
- text-printer ==0.5.0.1
- - text-regex-replace ==0.1.1.3
+ - text-regex-replace ==0.1.1.4
- text-region ==0.3.1.0
- text-short ==0.1.3
- text-show ==3.9
@@ -2457,9 +2457,9 @@ default-package-overrides:
- throwable-exceptions ==0.1.0.9
- th-strict-compat ==0.1.0.1
- th-test-utils ==1.1.0
- - th-utilities ==0.2.4.2
+ - th-utilities ==0.2.4.3
- thyme ==0.3.5.5
- - tidal ==1.7.2
+ - tidal ==1.7.3
- tile ==0.3.0.0
- time-compat ==1.9.5
- timeit ==2.0
@@ -2604,9 +2604,9 @@ default-package-overrides:
- valor ==0.1.0.0
- vault ==0.3.1.5
- vec ==0.4
- - vector ==0.12.2.0
+ - vector ==0.12.3.0
- vector-algorithms ==0.8.0.4
- - vector-binary-instances ==0.2.5.1
+ - vector-binary-instances ==0.2.5.2
- vector-buffer ==0.4.1
- vector-builder ==0.3.8.1
- vector-bytes-instances ==0.1.1
@@ -2729,15 +2729,15 @@ default-package-overrides:
- yesod ==1.6.1.0
- yesod-auth ==1.6.10.2
- yesod-auth-hashdb ==1.7.1.5
- - yesod-auth-oauth2 ==0.6.2.3
+ - yesod-auth-oauth2 ==0.6.3.0
- yesod-bin ==1.6.1
- - yesod-core ==1.6.18.8
+ - yesod-core ==1.6.19.0
- yesod-fb ==0.6.1
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.8
- yesod-newsfeed ==1.7.0.0
- - yesod-page-cursor ==2.0.0.5
+ - yesod-page-cursor ==2.0.0.6
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.6
- yesod-sitemap ==1.6.0
@@ -5951,7 +5951,6 @@ broken-packages:
- gw
- gyah-bin
- gym-http-api
- - H
- h-booru
- h-gpgme
- h-reversi
@@ -6838,6 +6837,7 @@ broken-packages:
- hsdip
- hsdns-cache
- Hsed
+ - hsendxmpp
- hsenv
- HSet
- hset
@@ -7193,7 +7193,6 @@ broken-packages:
- inject-function
- inline-asm
- inline-java
- - inline-r
- inserts
- inspector-wrecker
- instana-haskell-trace-sdk
@@ -8693,6 +8692,8 @@ broken-packages:
- opentelemetry-http-client
- opentheory-char
- opentok
+ - opentracing-jaeger
+ - opentracing-zipkin-v1
- opentype
- OpenVG
- OpenVGRaw
@@ -8813,7 +8814,6 @@ broken-packages:
- Paraiso
- Parallel-Arrows-Eden
- parallel-tasks
- - parameterized
- parameterized-utils
- paranoia
- parco
@@ -9818,6 +9818,7 @@ broken-packages:
- safe-globals
- safe-lazy-io
- safe-length
+ - safe-numeric
- safe-plugins
- safe-printf
- safecopy-migrate
@@ -10004,11 +10005,11 @@ broken-packages:
- servant-db
- servant-db-postgresql
- servant-dhall
- - servant-docs
- servant-docs-simple
- servant-ede
- servant-ekg
- servant-elm
+ - servant-event-stream
- servant-examples
- servant-fiat-content
- servant-generate
@@ -10769,6 +10770,7 @@ broken-packages:
- TaskMonad
- tasty-auto
- tasty-bdd
+ - tasty-checklist
- tasty-fail-fast
- tasty-grading-system
- tasty-groundhog-converters
@@ -11574,6 +11576,7 @@ broken-packages:
- whois
- why3
- wide-word
+ - wide-word-instances
- WikimediaParser
- wikipedia4epub
- wild-bind-indicator
@@ -11637,7 +11640,6 @@ broken-packages:
- wshterm
- wsjtx-udp
- wss-client
- - wstunnel
- wtk
- wtk-gtk
- wu-wei
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
index 066830814f..ba00d20007 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
@@ -661,20 +661,26 @@ self: super: builtins.intersectAttrs super {
# fine with newer versions.
spagoWithOverrides = doJailbreak super.spago;
- # This defines the version of the purescript-docs-search release we are using.
- # This is defined in the src/Spago/Prelude.hs file in the spago source.
- docsSearchVersion = "v0.0.10";
-
- docsSearchAppJsFile = pkgs.fetchurl {
- url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/docs-search-app.js";
+ docsSearchApp_0_0_10 = pkgs.fetchurl {
+ url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js";
sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5";
};
- purescriptDocsSearchFile = pkgs.fetchurl {
- url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/purescript-docs-search";
+ docsSearchApp_0_0_11 = pkgs.fetchurl {
+ url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/docs-search-app.js";
+ sha256 = "17qngsdxfg96cka1cgrl3zdrpal8ll6vyhhnazqm4hwj16ywjm02";
+ };
+
+ purescriptDocsSearch_0_0_10 = pkgs.fetchurl {
+ url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/purescript-docs-search";
sha256 = "0wc1zyhli4m2yykc6i0crm048gyizxh7b81n8xc4yb7ibjqwhyj3";
};
+ purescriptDocsSearch_0_0_11 = pkgs.fetchurl {
+ url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/purescript-docs-search";
+ sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
+ };
+
spagoFixHpack = overrideCabal spagoWithOverrides (drv: {
postUnpack = (drv.postUnpack or "") + ''
# The source for spago is pulled directly from GitHub. It uses a
@@ -695,13 +701,19 @@ self: super: builtins.intersectAttrs super {
# However, they are not actually available in the spago source, so they
# need to fetched with nix and put in the correct place.
# https://github.com/spacchetti/spago/issues/510
- cp ${docsSearchAppJsFile} "$sourceRoot/templates/docs-search-app.js"
- cp ${purescriptDocsSearchFile} "$sourceRoot/templates/purescript-docs-search"
+ cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js"
+ cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js"
+ cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10"
+ cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11"
# For some weird reason, on Darwin, the open(2) call to embed these files
# requires write permissions. The easiest resolution is just to permit that
# (doesn't cause any harm on other systems).
- chmod u+w "$sourceRoot/templates/docs-search-app.js" "$sourceRoot/templates/purescript-docs-search"
+ chmod u+w \
+ "$sourceRoot/templates/docs-search-app-0.0.10.js" \
+ "$sourceRoot/templates/purescript-docs-search-0.0.10" \
+ "$sourceRoot/templates/docs-search-app-0.0.11.js" \
+ "$sourceRoot/templates/purescript-docs-search-0.0.11"
'';
});
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index a4581a2a57..7869388c54 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -946,35 +946,6 @@ self: {
}) {};
"Allure" = callPackage
- ({ mkDerivation, async, base, enummapset, filepath, ghc-compact
- , LambdaHack, optparse-applicative, primitive, random
- , template-haskell, text, transformers
- }:
- mkDerivation {
- pname = "Allure";
- version = "0.9.5.0";
- sha256 = "0cl1r3rcbkj8q290l3q5xva7lkh444s49xz8bm8sbgrk0q3zx041";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- async base enummapset filepath ghc-compact LambdaHack
- optparse-applicative primitive random template-haskell text
- transformers
- ];
- executableHaskellDepends = [
- async base filepath LambdaHack optparse-applicative
- ];
- testHaskellDepends = [
- async base filepath LambdaHack optparse-applicative
- ];
- description = "Near-future Sci-Fi roguelike and tactical squad combat game";
- license = lib.licenses.agpl3Plus;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "Allure_0_10_2_0" = callPackage
({ mkDerivation, async, base, containers, enummapset, file-embed
, filepath, ghc-compact, hsini, LambdaHack, optparse-applicative
, primitive, splitmix, tasty, tasty-hunit, template-haskell, text
@@ -7856,8 +7827,6 @@ self: {
];
description = "The Haskell/R mixed programming environment";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"HABQT" = callPackage
@@ -10886,8 +10855,8 @@ self: {
({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
mkDerivation {
pname = "HsOpenSSL";
- version = "0.11.6.1";
- sha256 = "0jmnmrhvm7rbspv0vw482i8wpmkzhnnwxswqwx75455w0mvdg62l";
+ version = "0.11.6.2";
+ sha256 = "160fpl2lcardzf4gy5dimhad69gvkkvnpp5nqbf8fcxzm4vgg76y";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring network time ];
librarySystemDepends = [ openssl ];
@@ -10896,12 +10865,12 @@ self: {
license = lib.licenses.publicDomain;
}) {inherit (pkgs) openssl;};
- "HsOpenSSL_0_11_6_2" = callPackage
+ "HsOpenSSL_0_11_7" = callPackage
({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
mkDerivation {
pname = "HsOpenSSL";
- version = "0.11.6.2";
- sha256 = "160fpl2lcardzf4gy5dimhad69gvkkvnpp5nqbf8fcxzm4vgg76y";
+ version = "0.11.7";
+ sha256 = "0kji758bi8agcjvpbb3hpppv55qm9g2r02mamiv568zwmlkkxsm3";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring network time ];
librarySystemDepends = [ openssl ];
@@ -11287,24 +11256,6 @@ self: {
}) {};
"IPv6Addr" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
- , network-info, random, test-framework, test-framework-hunit, text
- }:
- mkDerivation {
- pname = "IPv6Addr";
- version = "2.0.1";
- sha256 = "0gkk20ngbfrr64w5szjhvlwlmali4xcx36iqa714cbxy6lpqy5cl";
- libraryHaskellDepends = [
- aeson attoparsec base iproute network network-info random text
- ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit text
- ];
- description = "Library to deal with IPv6 address text representations";
- license = lib.licenses.bsd3;
- }) {};
-
- "IPv6Addr_2_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
, network-info, random, test-framework, test-framework-hunit, text
}:
@@ -11320,7 +11271,6 @@ self: {
];
description = "Library to deal with IPv6 address text representations";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"IPv6DB" = callPackage
@@ -12443,40 +12393,6 @@ self: {
}) {};
"LambdaHack" = callPackage
- ({ mkDerivation, assert-failure, async, base, base-compat, binary
- , bytestring, containers, deepseq, directory, enummapset, filepath
- , ghc-compact, ghc-prim, hashable, hsini, keys, miniutter
- , optparse-applicative, pretty-show, primitive, random, sdl2
- , sdl2-ttf, stm, template-haskell, text, time, transformers
- , unordered-containers, vector, vector-binary-instances, zlib
- }:
- mkDerivation {
- pname = "LambdaHack";
- version = "0.9.5.0";
- sha256 = "1y5345cmwl40p0risziyqlxfa8jv1rm9x6ivv85xhznrsmr0406h";
- revision = "1";
- editedCabalFile = "0qaqfyg7a50yibshq63718iyi4z1v017fzp7kbwrnwqmkmdqfa5a";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- assert-failure async base base-compat binary bytestring containers
- deepseq directory enummapset filepath ghc-compact ghc-prim hashable
- hsini keys miniutter optparse-applicative pretty-show primitive
- random sdl2 sdl2-ttf stm template-haskell text time transformers
- unordered-containers vector vector-binary-instances zlib
- ];
- executableHaskellDepends = [
- async base filepath optparse-applicative
- ];
- testHaskellDepends = [ async base filepath optparse-applicative ];
- description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "LambdaHack_0_10_2_0" = callPackage
({ mkDerivation, assert-failure, async, base, base-compat, binary
, bytestring, containers, deepseq, directory, enummapset
, file-embed, filepath, ghc-compact, ghc-prim, hashable, hsini
@@ -13932,21 +13848,6 @@ self: {
}) {};
"MonadRandom" = callPackage
- ({ mkDerivation, base, mtl, primitive, random, transformers
- , transformers-compat
- }:
- mkDerivation {
- pname = "MonadRandom";
- version = "0.5.2";
- sha256 = "1rjihspfdg2b9bwvbgj36ql595nbza8ddh1bmgz924xmddshcf30";
- libraryHaskellDepends = [
- base mtl primitive random transformers transformers-compat
- ];
- description = "Random-number generation monad";
- license = lib.licenses.bsd3;
- }) {};
-
- "MonadRandom_0_5_3" = callPackage
({ mkDerivation, base, mtl, primitive, random, transformers
, transformers-compat
}:
@@ -13959,7 +13860,6 @@ self: {
];
description = "Random-number generation monad";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"MonadRandomLazy" = callPackage
@@ -14588,8 +14488,8 @@ self: {
}:
mkDerivation {
pname = "Network-NineP";
- version = "0.4.7";
- sha256 = "08r15aacvdx739w1nn1bmr0n8ygfjhqnj12zk6zchw1d50x65mi2";
+ version = "0.4.7.1";
+ sha256 = "0gjscwrm4qjz662819g3l7i989ykxg3cka82kp23j5d2fy2sn2mc";
libraryHaskellDepends = [
async base binary bytestring containers convertible exceptions
hslogger monad-loops monad-peel mstate mtl network network-bsd
@@ -18405,8 +18305,8 @@ self: {
}:
mkDerivation {
pname = "ShellCheck";
- version = "0.7.1";
- sha256 = "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1";
+ version = "0.7.2";
+ sha256 = "0wl43njaq95l35y5mvipwp1db9vr551nz9wl0xy83j1x1kc38xgz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -19221,19 +19121,6 @@ self: {
}) {};
"Spintax" = callPackage
- ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
- mkDerivation {
- pname = "Spintax";
- version = "0.3.5";
- sha256 = "1z5sv03h07bf8z6pzxsia9hgf879cmiqdajvx212dk47lysfnm8v";
- libraryHaskellDepends = [
- attoparsec base extra mtl mwc-random text
- ];
- description = "Random text generation based on spintax";
- license = lib.licenses.bsd3;
- }) {};
-
- "Spintax_0_3_6" = callPackage
({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
mkDerivation {
pname = "Spintax";
@@ -19244,7 +19131,6 @@ self: {
];
description = "Random text generation based on spintax";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"Spock" = callPackage
@@ -22182,8 +22068,8 @@ self: {
}:
mkDerivation {
pname = "Z-Data";
- version = "0.7.4.0";
- sha256 = "1v0n0f96d5g1j6xw7d8w225r9qk9snjdfz7snq8pnmpjcna374jf";
+ version = "0.8.1.0";
+ sha256 = "19w5g5flsjnhjpvnmw7s8b5jg5nlpg0md99zgp3by8gjyigappc7";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq ghc-prim
@@ -39358,27 +39244,6 @@ self: {
}) {};
"bcp47-orphans" = callPackage
- ({ mkDerivation, base, bcp47, cassava, errors, esqueleto, hashable
- , hspec, http-api-data, path-pieces, persistent, QuickCheck, text
- }:
- mkDerivation {
- pname = "bcp47-orphans";
- version = "0.1.0.2";
- sha256 = "0rgr1p8dn54j432hfwg361dhsd4ngwvy3h8wx094m0kb6vjix9l6";
- libraryHaskellDepends = [
- base bcp47 cassava errors esqueleto hashable http-api-data
- path-pieces persistent text
- ];
- testHaskellDepends = [
- base bcp47 cassava hspec path-pieces persistent QuickCheck
- ];
- description = "BCP47 orphan instances";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "bcp47-orphans_0_1_0_3" = callPackage
({ mkDerivation, base, bcp47, cassava, errors, esqueleto, hashable
, hspec, http-api-data, path-pieces, persistent, QuickCheck, text
}:
@@ -40260,8 +40125,8 @@ self: {
}:
mkDerivation {
pname = "betris";
- version = "0.2.0.0";
- sha256 = "0d8qiiabcca7l57lkmmz5pn11y0jbksv08bzisfab588sbxd9vqr";
+ version = "0.2.1.0";
+ sha256 = "1vpj20hvr2nf3i8a2ijlxmfa1zqv3xwfp8krz4zjznhgjrb1nfpj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -44628,8 +44493,8 @@ self: {
}:
mkDerivation {
pname = "blucontrol";
- version = "0.2.1.1";
- sha256 = "087bk9fxjgavrprba7ffyb91jv7ms8k7mlq9s5963lkpdf5636n7";
+ version = "0.3.0.0";
+ sha256 = "0xh1qxfmrfjdsprl5m748j5z9w0qmww8gkj8lhghfskdzxhy0qic";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -44825,6 +44690,21 @@ self: {
license = "GPL";
}) {};
+ "boardgame" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "boardgame";
+ version = "0.0.0.1";
+ sha256 = "0azbr123zykvjya60s8q3vdpsg2xvy5wn9py0dsi4ih039s7jg64";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers ];
+ executableHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base ];
+ description = "Modeling boardgames";
+ license = lib.licenses.mit;
+ }) {};
+
"bogocopy" = callPackage
({ mkDerivation, base, directory, filemanip, filepath
, optparse-applicative, shelly, text, transformers, unix
@@ -46026,34 +45906,6 @@ self: {
}) {};
"brick" = callPackage
- ({ mkDerivation, base, bytestring, config-ini, containers
- , contravariant, data-clist, deepseq, directory, dlist, exceptions
- , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
- , template-haskell, text, text-zipper, transformers, unix, vector
- , vty, word-wrap
- }:
- mkDerivation {
- pname = "brick";
- version = "0.60.2";
- sha256 = "1fcpbm58fikqv94cl97p6bzhyq07kkp3zppylqwpil2qzfhvzb3i";
- revision = "1";
- editedCabalFile = "0jm3f0f9hyl6pn92d74shm33v93pyjj20x2axp5y9jgkf1ynnbc8";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring config-ini containers contravariant data-clist
- deepseq directory dlist exceptions filepath microlens microlens-mtl
- microlens-th stm template-haskell text text-zipper transformers
- unix vector vty word-wrap
- ];
- testHaskellDepends = [
- base containers microlens QuickCheck vector
- ];
- description = "A declarative terminal user interface library";
- license = lib.licenses.bsd3;
- }) {};
-
- "brick_0_61" = callPackage
({ mkDerivation, base, bytestring, config-ini, containers
, contravariant, data-clist, deepseq, directory, dlist, exceptions
, filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -46077,7 +45929,6 @@ self: {
];
description = "A declarative terminal user interface library";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"brick-dropdownmenu" = callPackage
@@ -50565,8 +50416,8 @@ self: {
}:
mkDerivation {
pname = "calamity";
- version = "0.1.28.3";
- sha256 = "0w7jcq6jplr31ljdvj9cqimg1xxz9pjnsdqkncdsiywa10ngww10";
+ version = "0.1.28.4";
+ sha256 = "07ibhr3xngpwl7pq9ykbf6pxzlp8yx49d0qrlhyn7hj5xbswkv3f";
libraryHaskellDepends = [
aeson async base bytestring colour concurrent-extra connection
containers data-default-class data-flags deepseq deque df1 di-core
@@ -52599,27 +52450,6 @@ self: {
}) {};
"cayley-client" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
- , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
- , mtl, text, transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "cayley-client";
- version = "0.4.14";
- sha256 = "1hczhvqqpx8kqg90h5qb2vjindn4crxmq6lwbj8ix45fnkijv4xg";
- libraryHaskellDepends = [
- aeson attoparsec base binary bytestring exceptions http-client
- http-conduit lens lens-aeson mtl text transformers
- unordered-containers vector
- ];
- testHaskellDepends = [ aeson base hspec unordered-containers ];
- description = "A Haskell client for the Cayley graph database";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "cayley-client_0_4_15" = callPackage
({ mkDerivation, aeson, attoparsec, base, binary, bytestring
, exceptions, hspec, http-client, http-conduit, lens, lens-aeson
, mtl, text, transformers, unordered-containers, vector
@@ -52697,30 +52527,6 @@ self: {
}) {};
"cborg" = callPackage
- ({ mkDerivation, aeson, array, base, base-orphans
- , base16-bytestring, base64-bytestring, bytestring, containers
- , deepseq, ghc-prim, half, integer-gmp, primitive, QuickCheck
- , random, scientific, tasty, tasty-hunit, tasty-quickcheck, text
- , vector
- }:
- mkDerivation {
- pname = "cborg";
- version = "0.2.4.0";
- sha256 = "0zrn75jx3lprdagl99r88jfhccalw783fn9jjk9zhy50zypkibil";
- libraryHaskellDepends = [
- array base bytestring containers deepseq ghc-prim half integer-gmp
- primitive text
- ];
- testHaskellDepends = [
- aeson array base base-orphans base16-bytestring base64-bytestring
- bytestring deepseq half QuickCheck random scientific tasty
- tasty-hunit tasty-quickcheck text vector
- ];
- description = "Concise Binary Object Representation (CBOR)";
- license = lib.licenses.bsd3;
- }) {};
-
- "cborg_0_2_5_0" = callPackage
({ mkDerivation, aeson, array, base, base-orphans
, base16-bytestring, base64-bytestring, bytestring, containers
, deepseq, ghc-prim, half, integer-gmp, primitive, QuickCheck
@@ -52742,7 +52548,6 @@ self: {
];
description = "Concise Binary Object Representation (CBOR)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"cborg-json" = callPackage
@@ -57282,8 +57087,8 @@ self: {
}:
mkDerivation {
pname = "closed-intervals";
- version = "0.1.0.0";
- sha256 = "1k8kbqh6w7cj7qkmzvh47v9zrpf5y465lj6fzq7vk71bq0dy59vm";
+ version = "0.1.0.1";
+ sha256 = "19vmiwwzv9g4nl1mzkqc7r9bw67n9y7kk3v0jc2vc8yjzrmqgy7v";
libraryHaskellDepends = [ base containers time ];
testHaskellDepends = [
base containers doctest-exitcode-stdio doctest-lib QuickCheck time
@@ -58501,8 +58306,8 @@ self: {
pname = "codeworld-api";
version = "0.7.0";
sha256 = "1l1w4mrw4b2njz4kmfvd94mlwn776vryy1y9x9cb3r69fw5qy2f3";
- revision = "3";
- editedCabalFile = "0whbjs6j4fy4jk3bc1djx1bkxpsdyms3r3rf5167x0dhxnahwcgi";
+ revision = "4";
+ editedCabalFile = "06qa2djbzfdwlvgbr2k8667fipyrkdvp8a1vac75fla99pdwp7yi";
libraryHaskellDepends = [
aeson base base64-bytestring blank-canvas bytestring cereal
cereal-text containers deepseq dependent-sum ghc-prim hashable
@@ -60462,33 +60267,6 @@ self: {
}) {};
"composite-aeson" = callPackage
- ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base
- , composite-base, containers, contravariant, generic-deriving
- , hashable, hspec, lens, mmorph, mtl, profunctors, QuickCheck
- , scientific, tagged, template-haskell, text, time
- , unordered-containers, vector, vinyl
- }:
- mkDerivation {
- pname = "composite-aeson";
- version = "0.7.4.0";
- sha256 = "1k8m89cff8b3yc1af0l9vd13pav2hjy51gcadahn07zpwv1bszfj";
- libraryHaskellDepends = [
- aeson aeson-better-errors base composite-base containers
- contravariant generic-deriving hashable lens mmorph mtl profunctors
- scientific tagged template-haskell text time unordered-containers
- vector vinyl
- ];
- testHaskellDepends = [
- aeson aeson-better-errors aeson-qq base composite-base containers
- contravariant generic-deriving hashable hspec lens mmorph mtl
- profunctors QuickCheck scientific tagged template-haskell text time
- unordered-containers vector vinyl
- ];
- description = "JSON for Vinyl records";
- license = lib.licenses.bsd3;
- }) {};
-
- "composite-aeson_0_7_5_0" = callPackage
({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base
, composite-base, containers, contravariant, generic-deriving
, hashable, hspec, lens, mmorph, mtl, profunctors, QuickCheck
@@ -60513,7 +60291,6 @@ self: {
];
description = "JSON for Vinyl records";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"composite-aeson-cofree-list" = callPackage
@@ -60532,17 +60309,6 @@ self: {
}) {};
"composite-aeson-path" = callPackage
- ({ mkDerivation, base, composite-aeson, path }:
- mkDerivation {
- pname = "composite-aeson-path";
- version = "0.7.4.0";
- sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx";
- libraryHaskellDepends = [ base composite-aeson path ];
- description = "Formatting data for the path library";
- license = lib.licenses.bsd3;
- }) {};
-
- "composite-aeson-path_0_7_5_0" = callPackage
({ mkDerivation, base, composite-aeson, path }:
mkDerivation {
pname = "composite-aeson-path";
@@ -60551,25 +60317,9 @@ self: {
libraryHaskellDepends = [ base composite-aeson path ];
description = "Formatting data for the path library";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"composite-aeson-refined" = callPackage
- ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl
- , refined
- }:
- mkDerivation {
- pname = "composite-aeson-refined";
- version = "0.7.4.0";
- sha256 = "049lrm5iip5y3c9m9x4sjangaigdprj1553sw2vrcvnvn8xfq57s";
- libraryHaskellDepends = [
- aeson-better-errors base composite-aeson mtl refined
- ];
- description = "composite-aeson support for Refined from the refined package";
- license = lib.licenses.bsd3;
- }) {};
-
- "composite-aeson-refined_0_7_5_0" = callPackage
({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl
, refined
}:
@@ -60582,7 +60332,6 @@ self: {
];
description = "composite-aeson support for Refined from the refined package";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"composite-aeson-throw" = callPackage
@@ -60615,29 +60364,6 @@ self: {
}) {};
"composite-base" = callPackage
- ({ mkDerivation, base, deepseq, exceptions, hspec, lens
- , monad-control, mtl, profunctors, QuickCheck, template-haskell
- , text, transformers, transformers-base, unliftio-core, vinyl
- }:
- mkDerivation {
- pname = "composite-base";
- version = "0.7.4.0";
- sha256 = "1ml1y1zh8znvaqydwcnv8n69rzmx7zy2bpzr65gy79xbczz3dxwz";
- libraryHaskellDepends = [
- base deepseq exceptions lens monad-control mtl profunctors
- template-haskell text transformers transformers-base unliftio-core
- vinyl
- ];
- testHaskellDepends = [
- base deepseq exceptions hspec lens monad-control mtl profunctors
- QuickCheck template-haskell text transformers transformers-base
- unliftio-core vinyl
- ];
- description = "Shared utilities for composite-* packages";
- license = lib.licenses.bsd3;
- }) {};
-
- "composite-base_0_7_5_0" = callPackage
({ mkDerivation, base, deepseq, exceptions, hspec, lens
, monad-control, mtl, profunctors, QuickCheck, template-haskell
, text, transformers, transformers-base, unliftio-core, vinyl
@@ -60658,21 +60384,9 @@ self: {
];
description = "Shared utilities for composite-* packages";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"composite-binary" = callPackage
- ({ mkDerivation, base, binary, composite-base }:
- mkDerivation {
- pname = "composite-binary";
- version = "0.7.4.0";
- sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp";
- libraryHaskellDepends = [ base binary composite-base ];
- description = "Orphan binary instances";
- license = lib.licenses.bsd3;
- }) {};
-
- "composite-binary_0_7_5_0" = callPackage
({ mkDerivation, base, binary, composite-base }:
mkDerivation {
pname = "composite-binary";
@@ -60681,24 +60395,9 @@ self: {
libraryHaskellDepends = [ base binary composite-base ];
description = "Orphan binary instances";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"composite-ekg" = callPackage
- ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl
- }:
- mkDerivation {
- pname = "composite-ekg";
- version = "0.7.4.0";
- sha256 = "0y8wnp6n1fvqfrkm1lqv8pdfq7a4k7gaxl3i9dh6xfzyamlghg82";
- libraryHaskellDepends = [
- base composite-base ekg-core lens text vinyl
- ];
- description = "EKG Metrics for Vinyl records";
- license = lib.licenses.bsd3;
- }) {};
-
- "composite-ekg_0_7_5_0" = callPackage
({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl
}:
mkDerivation {
@@ -60710,21 +60409,9 @@ self: {
];
description = "EKG Metrics for Vinyl records";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"composite-hashable" = callPackage
- ({ mkDerivation, base, composite-base, hashable }:
- mkDerivation {
- pname = "composite-hashable";
- version = "0.7.4.0";
- sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1";
- libraryHaskellDepends = [ base composite-base hashable ];
- description = "Orphan hashable instances";
- license = lib.licenses.bsd3;
- }) {};
-
- "composite-hashable_0_7_5_0" = callPackage
({ mkDerivation, base, composite-base, hashable }:
mkDerivation {
pname = "composite-hashable";
@@ -60733,7 +60420,6 @@ self: {
libraryHaskellDepends = [ base composite-base hashable ];
description = "Orphan hashable instances";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"composite-opaleye" = callPackage
@@ -73631,22 +73317,6 @@ self: {
}) {};
"depq" = callPackage
- ({ mkDerivation, base, containers, deepseq, hspec, psqueues
- , QuickCheck
- }:
- mkDerivation {
- pname = "depq";
- version = "0.4.1.0";
- sha256 = "1rlbz9x34209zn44pn1xr9hnjv8ig47yq0p940wkblg55fy4lxcy";
- libraryHaskellDepends = [
- base containers deepseq psqueues QuickCheck
- ];
- testHaskellDepends = [ base containers hspec QuickCheck ];
- description = "Double-ended priority queues";
- license = lib.licenses.bsd3;
- }) {};
-
- "depq_0_4_2" = callPackage
({ mkDerivation, base, containers, deepseq, hspec, psqueues
, QuickCheck
}:
@@ -73660,7 +73330,6 @@ self: {
testHaskellDepends = [ base containers hspec QuickCheck ];
description = "Double-ended priority queues";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"deptrack-core" = callPackage
@@ -78247,8 +77916,8 @@ self: {
}:
mkDerivation {
pname = "dl-fedora";
- version = "0.7.7";
- sha256 = "0m4rf0h2hzsd00cgn14w1n8pyrqrikwnf9d232lzwx6qx3nf2nqp";
+ version = "0.8";
+ sha256 = "1pd0cslszd9srr9bpcxzrm84cnk5r78xs79ig32528z0anc5ghcr";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -78263,21 +77932,22 @@ self: {
broken = true;
}) {};
- "dl-fedora_0_8" = callPackage
+ "dl-fedora_0_9" = callPackage
({ mkDerivation, base, bytestring, directory, extra, filepath
- , http-directory, http-types, optparse-applicative, regex-posix
- , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
+ , http-client, http-client-tls, http-directory, http-types
+ , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args
+ , text, time, unix, xdg-userdirs
}:
mkDerivation {
pname = "dl-fedora";
- version = "0.8";
- sha256 = "1pd0cslszd9srr9bpcxzrm84cnk5r78xs79ig32528z0anc5ghcr";
+ version = "0.9";
+ sha256 = "17khlv65irp1bdr7j0njlh1sgvr1nhi5xfvdiklhjr7vm6vhmipd";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring directory extra filepath http-directory http-types
- optparse-applicative regex-posix simple-cmd simple-cmd-args text
- time unix xdg-userdirs
+ base bytestring directory extra filepath http-client
+ http-client-tls http-directory http-types optparse-applicative
+ regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs
];
testHaskellDepends = [ base simple-cmd ];
description = "Fedora image download tool";
@@ -78805,8 +78475,8 @@ self: {
}:
mkDerivation {
pname = "docker";
- version = "0.6.0.4";
- sha256 = "07j1c526gazy0kw98iklac767jhslhx9mcnzjazmwqsgyj8n217f";
+ version = "0.6.0.5";
+ sha256 = "1y7vs9s17gwls8f223b4vkwvwflyxr7spslccr9izlf4cblj216d";
libraryHaskellDepends = [
aeson base blaze-builder bytestring conduit conduit-combinators
conduit-extra containers data-default-class directory exceptions
@@ -80869,6 +80539,8 @@ self: {
pname = "duckling";
version = "0.2.0.0";
sha256 = "0hr3dwfksi04is2wqykfx04da40sa85147fnfnmazw5czd20xwya";
+ revision = "1";
+ editedCabalFile = "19ml7s7p79y822b7bk9hlxg3c3p6gsklamzysv6pcdpf917cvgl4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -85671,15 +85343,19 @@ self: {
}) {};
"errata" = callPackage
- ({ mkDerivation, base, containers, text }:
+ ({ mkDerivation, base, containers, hspec, hspec-discover
+ , hspec-golden, text
+ }:
mkDerivation {
pname = "errata";
- version = "0.2.0.0";
- sha256 = "14yg0zh7lawjdqpzw7qiwi0c41zqhbvijxxxba319mij5skmmr4k";
+ version = "0.3.0.0";
+ sha256 = "1m83lp3h2lxqkx0d17kplmwp0ngh3yn79k7yza4jkny0c4xv0ijy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers text ];
executableHaskellDepends = [ base containers text ];
+ testHaskellDepends = [ base containers hspec hspec-golden text ];
+ testToolDepends = [ hspec-discover ];
description = "Source code error pretty printing";
license = lib.licenses.mit;
}) {};
@@ -86218,30 +85894,6 @@ self: {
}) {};
"essence-of-live-coding" = callPackage
- ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck
- , syb, test-framework, test-framework-quickcheck2, time
- , transformers, vector-sized
- }:
- mkDerivation {
- pname = "essence-of-live-coding";
- version = "0.2.4";
- sha256 = "04rbbq58ska6qldah0d7s8kdn5hkxka7bap7ca1wksbwbkph6qj1";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base containers foreign-store syb time transformers vector-sized
- ];
- executableHaskellDepends = [ base transformers ];
- testHaskellDepends = [
- base containers mtl QuickCheck syb test-framework
- test-framework-quickcheck2 transformers
- ];
- description = "General purpose live coding framework";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ turion ];
- }) {};
-
- "essence-of-live-coding_0_2_5" = callPackage
({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck
, syb, test-framework, test-framework-quickcheck2, time
, transformers, vector-sized
@@ -86262,27 +85914,10 @@ self: {
];
description = "General purpose live coding framework";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ turion ];
}) {};
"essence-of-live-coding-gloss" = callPackage
- ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss
- , syb, transformers
- }:
- mkDerivation {
- pname = "essence-of-live-coding-gloss";
- version = "0.2.4";
- sha256 = "11hnzax39g7yaqwaaxi3niipamd65mcrdi431fxrspkhgcm1nx2y";
- libraryHaskellDepends = [
- base essence-of-live-coding foreign-store gloss syb transformers
- ];
- description = "General purpose live coding framework - Gloss backend";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ turion ];
- }) {};
-
- "essence-of-live-coding-gloss_0_2_5" = callPackage
({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss
, syb, transformers
}:
@@ -86295,7 +85930,6 @@ self: {
];
description = "General purpose live coding framework - Gloss backend";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ turion ];
}) {};
@@ -86318,22 +85952,6 @@ self: {
}) {};
"essence-of-live-coding-pulse" = callPackage
- ({ mkDerivation, base, essence-of-live-coding, foreign-store
- , pulse-simple, transformers
- }:
- mkDerivation {
- pname = "essence-of-live-coding-pulse";
- version = "0.2.4";
- sha256 = "0lhnq85bi22mwnw4fcg9hzr18mdifxlr833pwsc7ch401y2mf1kz";
- libraryHaskellDepends = [
- base essence-of-live-coding foreign-store pulse-simple transformers
- ];
- description = "General purpose live coding framework - pulse backend";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ turion ];
- }) {};
-
- "essence-of-live-coding-pulse_0_2_5" = callPackage
({ mkDerivation, base, essence-of-live-coding, foreign-store
, pulse-simple, transformers
}:
@@ -86346,7 +85964,6 @@ self: {
];
description = "General purpose live coding framework - pulse backend";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ turion ];
}) {};
@@ -86369,23 +85986,6 @@ self: {
}) {};
"essence-of-live-coding-quickcheck" = callPackage
- ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding
- , QuickCheck, syb, transformers
- }:
- mkDerivation {
- pname = "essence-of-live-coding-quickcheck";
- version = "0.2.4";
- sha256 = "1ic2wvk4fc7jb6dkfy6fypmyw7hfbn79m51gn4z4c35ddhsfpngd";
- libraryHaskellDepends = [
- base boltzmann-samplers essence-of-live-coding QuickCheck syb
- transformers
- ];
- description = "General purpose live coding framework - QuickCheck integration";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ turion ];
- }) {};
-
- "essence-of-live-coding-quickcheck_0_2_5" = callPackage
({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding
, QuickCheck, syb, transformers
}:
@@ -86399,7 +85999,6 @@ self: {
];
description = "General purpose live coding framework - QuickCheck integration";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ turion ];
}) {};
@@ -88567,8 +88166,8 @@ self: {
({ mkDerivation, base, containers, fgl, mtl, transformers }:
mkDerivation {
pname = "exploring-interpreters";
- version = "0.3.0.0";
- sha256 = "0h39si80s4q4n6599qj95z19jy3yc0101pphm4apvalm6wmppgpz";
+ version = "0.3.1.0";
+ sha256 = "0765nfr65lphp768j3snzpqpz6f4nrmkvsb6ishflhnxnp99xgyz";
libraryHaskellDepends = [ base containers fgl mtl transformers ];
description = "A generic exploring interpreter for exploratory programming";
license = lib.licenses.bsd3;
@@ -88597,19 +88196,6 @@ self: {
}) {};
"express" = callPackage
- ({ mkDerivation, base, leancheck, template-haskell }:
- mkDerivation {
- pname = "express";
- version = "0.1.3";
- sha256 = "09g7i6x553gv5jkhbn5ffsrxznx8g4b3fcn1gibwyh380pbss8x1";
- libraryHaskellDepends = [ base template-haskell ];
- testHaskellDepends = [ base leancheck ];
- benchmarkHaskellDepends = [ base leancheck ];
- description = "Dynamically-typed expressions involving applications and variables";
- license = lib.licenses.bsd3;
- }) {};
-
- "express_0_1_4" = callPackage
({ mkDerivation, base, leancheck, template-haskell }:
mkDerivation {
pname = "express";
@@ -88620,7 +88206,6 @@ self: {
benchmarkHaskellDepends = [ base leancheck ];
description = "Dynamically-typed expressions involving applications and variables";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"expression-parser" = callPackage
@@ -88774,12 +88359,12 @@ self: {
}) {};
"extended-containers" = callPackage
- ({ mkDerivation, base, hspec, QuickCheck, transformers, vector }:
+ ({ mkDerivation, base, deepseq, hspec, primitive, QuickCheck }:
mkDerivation {
pname = "extended-containers";
- version = "0.1.0.0";
- sha256 = "04m3i90iljx36yc528yz6dcgcrfvzkvjvghqjp741mqvmixdjsip";
- libraryHaskellDepends = [ base transformers vector ];
+ version = "0.1.1.0";
+ sha256 = "1fiwhfnwr8m0fnivfx4vmpdzmmglk82xc0x7djavz48mfsz1x459";
+ libraryHaskellDepends = [ base deepseq primitive ];
testHaskellDepends = [ base hspec QuickCheck ];
description = "Heap and Vector container types";
license = lib.licenses.bsd3;
@@ -92425,6 +92010,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "finite-fields" = callPackage
+ ({ mkDerivation, base, Cabal, containers, directory, filepath
+ , QuickCheck, random, tasty, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "finite-fields";
+ version = "0.2";
+ sha256 = "158qc6q8ppisjxhipcvfjha8iklg0x6jpf0cb8wgsz2456wzm2s8";
+ setupHaskellDepends = [ base Cabal directory filepath ];
+ libraryHaskellDepends = [ base containers random vector ];
+ testHaskellDepends = [
+ base containers QuickCheck random tasty tasty-quickcheck
+ ];
+ description = "Arithmetic in finite fields";
+ license = lib.licenses.bsd3;
+ }) {};
+
"finite-typelits" = callPackage
({ mkDerivation, base, deepseq }:
mkDerivation {
@@ -92777,20 +92379,6 @@ self: {
}) {};
"fixed-length" = callPackage
- ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht
- }:
- mkDerivation {
- pname = "fixed-length";
- version = "0.2.2";
- sha256 = "1bx46n11k9dpr5hhfhxiwdd5npaqf9xwvqvjd0nlbylfmsmgd14y";
- libraryHaskellDepends = [
- base non-empty storable-record tfp utility-ht
- ];
- description = "Lists with statically known length based on non-empty package";
- license = lib.licenses.bsd3;
- }) {};
-
- "fixed-length_0_2_2_1" = callPackage
({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht
}:
mkDerivation {
@@ -92802,7 +92390,6 @@ self: {
];
description = "Lists with statically known length based on non-empty package";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"fixed-list" = callPackage
@@ -95072,8 +94659,8 @@ self: {
}:
mkDerivation {
pname = "forex2ledger";
- version = "1.0.0.0";
- sha256 = "0rsaw9l3653kfp3hfszdyq7xqfmr38xwvlwk7mdr7sqhqs2xxbaq";
+ version = "1.0.0.1";
+ sha256 = "0v6adrl9c9vjpf4gm8x729qxq7yl84bfbiawmdpks2jzdckxvgdb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -100039,24 +99626,6 @@ self: {
}) {};
"generic-lens" = callPackage
- ({ mkDerivation, base, doctest, generic-lens-core, HUnit
- , inspection-testing, lens, profunctors, text
- }:
- mkDerivation {
- pname = "generic-lens";
- version = "2.0.0.0";
- sha256 = "0fh9095qiqlym0s6w0zkmybn7hyywgy964fhg95x0vprpmfya5mq";
- libraryHaskellDepends = [
- base generic-lens-core profunctors text
- ];
- testHaskellDepends = [
- base doctest HUnit inspection-testing lens profunctors
- ];
- description = "Generically derive traversals, lenses and prisms";
- license = lib.licenses.bsd3;
- }) {};
-
- "generic-lens_2_1_0_0" = callPackage
({ mkDerivation, base, doctest, generic-lens-core, HUnit
, inspection-testing, lens, profunctors, text
}:
@@ -100072,21 +99641,9 @@ self: {
];
description = "Generically derive traversals, lenses and prisms";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"generic-lens-core" = callPackage
- ({ mkDerivation, base, indexed-profunctors, text }:
- mkDerivation {
- pname = "generic-lens-core";
- version = "2.0.0.0";
- sha256 = "0h7fjh3zk8lkkmdj3w3wg72gbmnr8wz9wfm58ryvx0036l284qji";
- libraryHaskellDepends = [ base indexed-profunctors text ];
- description = "Generically derive traversals, lenses and prisms";
- license = lib.licenses.bsd3;
- }) {};
-
- "generic-lens-core_2_1_0_0" = callPackage
({ mkDerivation, base, indexed-profunctors, text }:
mkDerivation {
pname = "generic-lens-core";
@@ -100095,7 +99652,6 @@ self: {
libraryHaskellDepends = [ base indexed-profunctors text ];
description = "Generically derive traversals, lenses and prisms";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"generic-lens-labels" = callPackage
@@ -100184,24 +99740,6 @@ self: {
}) {};
"generic-optics" = callPackage
- ({ mkDerivation, base, doctest, generic-lens-core, HUnit
- , inspection-testing, optics-core, text
- }:
- mkDerivation {
- pname = "generic-optics";
- version = "2.0.0.0";
- sha256 = "17m72q0cjvagq1khiq8m495jhkpn2rqd6y1h9bxngp6l0k355nmw";
- libraryHaskellDepends = [
- base generic-lens-core optics-core text
- ];
- testHaskellDepends = [
- base doctest HUnit inspection-testing optics-core
- ];
- description = "Generically derive traversals, lenses and prisms";
- license = lib.licenses.bsd3;
- }) {};
-
- "generic-optics_2_1_0_0" = callPackage
({ mkDerivation, base, doctest, generic-lens-core, HUnit
, inspection-testing, optics-core, text
}:
@@ -100217,7 +99755,6 @@ self: {
];
description = "Generically derive traversals, lenses and prisms";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"generic-optics-lite" = callPackage
@@ -101796,23 +101333,6 @@ self: {
}) {};
"ghc-check" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, ghc
- , ghc-paths, process, safe-exceptions, template-haskell
- , transformers
- }:
- mkDerivation {
- pname = "ghc-check";
- version = "0.5.0.3";
- sha256 = "0crhlqs296zsz7bhy3zqaqhglxg45i6z7d1iqj9v7nr9crimxyjn";
- libraryHaskellDepends = [
- base containers directory filepath ghc ghc-paths process
- safe-exceptions template-haskell transformers
- ];
- description = "detect mismatches between compile-time and run-time versions of the ghc api";
- license = lib.licenses.bsd3;
- }) {};
-
- "ghc-check_0_5_0_4" = callPackage
({ mkDerivation, base, containers, directory, filepath, ghc
, ghc-paths, process, safe-exceptions, template-haskell, th-compat
, transformers
@@ -101827,7 +101347,6 @@ self: {
];
description = "detect mismatches between compile-time and run-time versions of the ghc api";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"ghc-clippy-plugin" = callPackage
@@ -105324,6 +104843,25 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) libsoup;};
+ "gi-vips" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+ , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+ , text, transformers, vips
+ }:
+ mkDerivation {
+ pname = "gi-vips";
+ version = "8.0.1";
+ sha256 = "1iq30mbyw638srpna9db1l039iz30zglxxfjysh0gmkrij4ky7kv";
+ setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ vips ];
+ description = "libvips GObject bindings";
+ license = lib.licenses.lgpl21Only;
+ }) {inherit (pkgs) vips;};
+
"gi-vte" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
@@ -107038,26 +106576,6 @@ self: {
}) {};
"glabrous" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
- , cereal, cereal-text, directory, either, hspec, text
- , unordered-containers
- }:
- mkDerivation {
- pname = "glabrous";
- version = "2.0.2";
- sha256 = "10aaa3aggn48imhqxkwyp0i0mar7fan29rwr6qkwli63v3m7fvgr";
- libraryHaskellDepends = [
- aeson aeson-pretty attoparsec base bytestring cereal cereal-text
- either text unordered-containers
- ];
- testHaskellDepends = [
- base directory either hspec text unordered-containers
- ];
- description = "A template DSL library";
- license = lib.licenses.bsd3;
- }) {};
-
- "glabrous_2_0_3" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, cereal, cereal-text, directory, either, hspec, text
, unordered-containers
@@ -107075,7 +106593,6 @@ self: {
];
description = "A template DSL library";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"glade" = callPackage
@@ -107771,6 +107288,32 @@ self: {
broken = true;
}) {inherit (pkgs) glpk;};
+ "glsl" = callPackage
+ ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+ , directory, fgl, graphviz, hspec, hspec-discover, lens, linear
+ , QuickCheck, scientific, text, time, transformers, vector
+ }:
+ mkDerivation {
+ pname = "glsl";
+ version = "0.0.1.0";
+ sha256 = "1zq1dy6jzd41qz08xhwvbgy2g6zj90akb2145kh2h2906fyzr2wf";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ attoparsec base binary containers fgl graphviz lens linear
+ scientific text transformers
+ ];
+ executableHaskellDepends = [ base text time ];
+ testHaskellDepends = [
+ attoparsec base binary bytestring directory hspec QuickCheck text
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Parser and optimizer for a small subset of GLSL";
+ license = lib.licenses.bsd3;
+ }) {};
+
"gltf-codec" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
, directory, filepath, scientific, shower, text
@@ -112340,6 +111883,8 @@ self: {
pname = "graphula-core";
version = "2.0.0.1";
sha256 = "0yl1x5dw70rds9fk7ijsyrksharjm2fhvbihybjbjpj89s1n1zir";
+ revision = "1";
+ editedCabalFile = "0wpbz938vqw60lzgw98pf83i2c09c5633kkh3xhn42zpbnw76ylj";
libraryHaskellDepends = [
base containers directory generics-eot HUnit mtl persistent
QuickCheck random semigroups temporary text transformers unliftio
@@ -113270,8 +112815,8 @@ self: {
}:
mkDerivation {
pname = "grpc-haskell";
- version = "0.0.1.0";
- sha256 = "1cl12g88wvml3s5jazcb4gi4zwf6fp28hc9jp1fj25qpbr14il5c";
+ version = "0.1.0";
+ sha256 = "1qqa4qn6ql8zvacaikd1a154ib7bah2h96fjfvd3hz6j79bbfqw4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116036,8 +115581,8 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "2.1.0";
- sha256 = "0hvn6kq6pasyh9mvnxn4crhg4fxmw7xrcfxa77wkxni8q1a94xxs";
+ version = "2.3.0";
+ sha256 = "03cz3inkkqbdnwwvsf7dhclp9svi8c0lpjmcp81ff9vxr1v6x73x";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -119941,6 +119486,8 @@ self: {
pname = "haskell-awk";
version = "1.2";
sha256 = "14jfw5s3xw7amwasw37mxfinzwvxd6pr64iypmy65z7bkx3l01cj";
+ revision = "1";
+ editedCabalFile = "1d6smaalvf66h0d9d1vq9q8ldxcvg11m05wg70cbsq3s2vh6iz4p";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -127394,16 +126941,16 @@ self: {
, inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base
, monad-control, mtl, network, network-uri, nix
, optparse-applicative, process, process-extras, protolude
- , safe-exceptions, servant, servant-auth-client, servant-client
- , servant-client-core, stm, temporary, text, time, tomland
- , transformers, transformers-base, unbounded-delays, unix, unliftio
- , unliftio-core, unordered-containers, uuid, vector, websockets
- , wuss
+ , safe-exceptions, scientific, servant, servant-auth-client
+ , servant-client, servant-client-core, stm, temporary, text, time
+ , tomland, transformers, transformers-base, unbounded-delays, unix
+ , unliftio, unliftio-core, unordered-containers, uuid, vector
+ , websockets, wuss
}:
mkDerivation {
pname = "hercules-ci-agent";
- version = "0.8.0";
- sha256 = "1nwdi442ccm1x2isxdlh3rpcw627wjccdb4y40w2qna6dchx7v9z";
+ version = "0.8.1";
+ sha256 = "0f18mz2chwipjac7dc918hn54frrxqk6bvyjvzqq25agi5zh8h12";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127423,7 +126970,7 @@ self: {
hostname http-client http-client-tls http-conduit inline-c
inline-c-cpp katip lens lens-aeson lifted-async lifted-base
monad-control mtl network network-uri optparse-applicative process
- process-extras protolude safe-exceptions servant
+ process-extras protolude safe-exceptions scientific servant
servant-auth-client servant-client servant-client-core stm
temporary text time tomland transformers transformers-base unix
unliftio unliftio-core unordered-containers uuid vector websockets
@@ -127452,8 +126999,8 @@ self: {
}:
mkDerivation {
pname = "hercules-ci-api";
- version = "0.6.0.0";
- sha256 = "11ha3jvwg501n9all4v5r057qr9m9qbmbrkiv5l04mrsi5pvhpw7";
+ version = "0.6.0.1";
+ sha256 = "1c9dvj9vv4rm0ndmgfm9s4qfpjbs2ly98r06bl0xv550anik7kqj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127484,8 +127031,8 @@ self: {
}:
mkDerivation {
pname = "hercules-ci-api-agent";
- version = "0.3.0.0";
- sha256 = "161ghlz5n6na4sviwyxxq78hj37yk89kri0367xx9dbsllgfc7g6";
+ version = "0.3.1.0";
+ sha256 = "0p1xlzwhaz6ycjzmadnlmr7fvz9iar9b7qzz867xxvix6p8w2nj6";
libraryHaskellDepends = [
aeson base base64-bytestring-type bytestring containers cookie
deepseq exceptions hashable hercules-ci-api-core http-api-data
@@ -127540,8 +127087,8 @@ self: {
}:
mkDerivation {
pname = "hercules-ci-cli";
- version = "0.1.0";
- sha256 = "1fcg1fd2jd0334nhwsipyf468a4kkdhbibyhhjyspqagswaanm9q";
+ version = "0.2.0";
+ sha256 = "0fxsx31b6m9hxcpymixmfpvj1k569kzbxd2jvm8kzda073hljsbm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127593,8 +127140,8 @@ self: {
}:
mkDerivation {
pname = "hercules-ci-cnix-store";
- version = "0.1.0.0";
- sha256 = "1ni83x2453ii2xgq4ihhr41jbjhgga5dq5q8560f555fwrw10brz";
+ version = "0.1.1.0";
+ sha256 = "1lvlilhfkyx3i4fp0azjx4gm2iwm6hkjrg6kc5faifw7knfivinj";
libraryHaskellDepends = [
base bytestring conduit containers inline-c inline-c-cpp protolude
unliftio-core
@@ -129244,20 +128791,6 @@ self: {
}) {};
"hi-file-parser" = callPackage
- ({ mkDerivation, base, binary, bytestring, hspec, rio, vector }:
- mkDerivation {
- pname = "hi-file-parser";
- version = "0.1.1.0";
- sha256 = "1wb79m6vx7dz4hrvyk2h1iv6q36g9hhywls5ygam7pmw9c4rs3sq";
- revision = "2";
- editedCabalFile = "1495j6ky44r660yr5szy2ln96rdhakh0fhnw749g2yyx5l0gwcrs";
- libraryHaskellDepends = [ base binary bytestring rio vector ];
- testHaskellDepends = [ base binary bytestring hspec rio vector ];
- description = "Parser for GHC's hi files";
- license = lib.licenses.bsd3;
- }) {};
-
- "hi-file-parser_0_1_2_0" = callPackage
({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, vector
}:
mkDerivation {
@@ -129270,7 +128803,6 @@ self: {
];
description = "Parser for GHC's hi files";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hi3status" = callPackage
@@ -129570,6 +129102,28 @@ self: {
broken = true;
}) {};
+ "hierarchical-env" = callPackage
+ ({ mkDerivation, base, hspec, hspec-discover, method, microlens
+ , microlens-mtl, microlens-th, rio, template-haskell
+ , th-abstraction
+ }:
+ mkDerivation {
+ pname = "hierarchical-env";
+ version = "0.1.0.0";
+ sha256 = "0syx9i9z9j75wbqsrwl8nqhr025df6vmgb4p767sdb7dncpqkph9";
+ libraryHaskellDepends = [
+ base method microlens microlens-mtl microlens-th rio
+ template-haskell th-abstraction
+ ];
+ testHaskellDepends = [
+ base hspec method microlens microlens-mtl microlens-th rio
+ template-haskell th-abstraction
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "hierarchical environments for dependency injection";
+ license = lib.licenses.bsd3;
+ }) {};
+
"hierarchical-exceptions" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -131855,6 +131409,8 @@ self: {
pname = "hlrdb";
version = "0.3.2.0";
sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p";
+ revision = "1";
+ editedCabalFile = "1ypb0197v5x6a5zkj7qqrr7lam3sxvvi3wbgk5imvdppq2rj7hqz";
libraryHaskellDepends = [
base base64-bytestring bytestring cryptonite hashable hedis
hlrdb-core memory random store time unordered-containers zstd
@@ -131871,10 +131427,10 @@ self: {
}:
mkDerivation {
pname = "hlrdb-core";
- version = "0.1.6.0";
- sha256 = "13hb0657y5cqhbl2m27v28b6zl9mgcq17r983rds3l3bccn67ayv";
+ version = "0.1.6.1";
+ sha256 = "0sy87qz7v1x4rmqclfz2q8bnca2k7zyc7cgk67s80xhp4jsab90x";
revision = "1";
- editedCabalFile = "163scamdjq98zk039qv3r4xqz7hmixa136gfkifx757fy4nigdiy";
+ editedCabalFile = "1nyvgbpvr7l0b9cvnlavmc88aszvxfrdcj57grrs6dcd1d4lv7ss";
libraryHaskellDepends = [
base bytestring hashable hedis lens mtl profunctors random time
unordered-containers
@@ -136127,15 +135683,15 @@ self: {
}:
mkDerivation {
pname = "hs-conllu";
- version = "0.1.2";
- sha256 = "1dvayafvf14gbir7cafhzlscqlffaws5ajilm5h520ji449jh2aa";
+ version = "0.1.5";
+ sha256 = "1azh4g5kdng8v729ldgblkmrdqrc501rgm9wwqx6gkqwwzn8w3r4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers directory filepath megaparsec void
];
executableHaskellDepends = [
- base containers directory filepath megaparsec
+ base containers directory filepath megaparsec void
];
description = "Conllu validating parser and utils";
license = lib.licenses.lgpl3Only;
@@ -138094,20 +137650,22 @@ self: {
"hsendxmpp" = callPackage
({ mkDerivation, base, hslogger, pontarius-xmpp
- , pontarius-xmpp-extras, string-class
+ , pontarius-xmpp-extras, string-class, text
}:
mkDerivation {
pname = "hsendxmpp";
- version = "0.1.2.4";
- sha256 = "17dhhjbynr7afjibv6fys45m2al422b6q3z7ncfycpwp6541qifm";
+ version = "0.1.2.5";
+ sha256 = "0wyfcsc0vjyx87r5dv51frfligf4d7v0n1m7967vg4d6jkw2zxd9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base hslogger pontarius-xmpp pontarius-xmpp-extras string-class
+ text
];
description = "sendxmpp clone, sending XMPP messages via CLI";
- license = "unknown";
+ license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hsenv" = callPackage
@@ -138406,8 +137964,8 @@ self: {
}:
mkDerivation {
pname = "hsinspect";
- version = "0.0.17";
- sha256 = "1ib8vxjsrg03i4fmcgwfkxwbr4dwyvk6xvhb0y6xydwjckfs0ldd";
+ version = "0.0.18";
+ sha256 = "1xqrmkr1r3ssv51aqikxhw39rgajswrvl3z0gb0xq2p3shynxi53";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -139327,25 +138885,6 @@ self: {
}) {};
"hspec-expectations-json" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec
- , HUnit, scientific, text, unordered-containers, vector
- }:
- mkDerivation {
- pname = "hspec-expectations-json";
- version = "1.0.0.2";
- sha256 = "1jv0mi0hdbxx75yygd3184kqpi50ysjp82vyr1di7dcz0ffyxhmb";
- libraryHaskellDepends = [
- aeson aeson-pretty base Diff HUnit scientific text
- unordered-containers vector
- ];
- testHaskellDepends = [ aeson-qq base hspec ];
- description = "Hspec expectations for JSON Values";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "hspec-expectations-json_1_0_0_3" = callPackage
({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec
, HUnit, scientific, text, unordered-containers, vector
}:
@@ -139566,23 +139105,6 @@ self: {
}) {};
"hspec-junit-formatter" = callPackage
- ({ mkDerivation, base, conduit, directory, exceptions, hashable
- , hspec, hspec-core, resourcet, temporary, text, xml-conduit
- , xml-types
- }:
- mkDerivation {
- pname = "hspec-junit-formatter";
- version = "1.0.0.1";
- sha256 = "146y4y3q047a5g8dif1vdjsn8jz6kafq0yzd7x5wpg7daccbxami";
- libraryHaskellDepends = [
- base conduit directory exceptions hashable hspec hspec-core
- resourcet temporary text xml-conduit xml-types
- ];
- description = "A JUnit XML runner/formatter for hspec";
- license = lib.licenses.mit;
- }) {};
-
- "hspec-junit-formatter_1_0_0_2" = callPackage
({ mkDerivation, base, conduit, directory, exceptions, hashable
, hspec, hspec-core, resourcet, temporary, text, xml-conduit
, xml-types
@@ -139597,7 +139119,6 @@ self: {
];
description = "A JUnit XML runner/formatter for hspec";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"hspec-laws" = callPackage
@@ -141695,7 +141216,7 @@ self: {
license = lib.licenses.mit;
}) {};
- "http-client_0_7_7" = callPackage
+ "http-client_0_7_8" = callPackage
({ mkDerivation, array, async, base, base64-bytestring
, blaze-builder, bytestring, case-insensitive, containers, cookie
, deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -141705,8 +141226,8 @@ self: {
}:
mkDerivation {
pname = "http-client";
- version = "0.7.7";
- sha256 = "0sbjfxfnj5b594klc7h7zmw27gssrbcsacld9lw9p0bpmgx73lvn";
+ version = "0.7.8";
+ sha256 = "043ydfakl02cghmphzz9hj08hrfszqw96vjrb4cal7c7801szz0q";
libraryHaskellDepends = [
array base base64-bytestring blaze-builder bytestring
case-insensitive containers cookie deepseq exceptions filepath
@@ -142326,8 +141847,8 @@ self: {
pname = "http-media";
version = "0.8.0.0";
sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir";
- revision = "4";
- editedCabalFile = "0qg6x92i3w2q7zarr08kmicychkwskfi04xaxkqkg0cw6jnpnhhh";
+ revision = "5";
+ editedCabalFile = "0wf39pdag8a81ksk5xrgjzzzhav62vw2s77p43y7n3zkz5vynw7n";
libraryHaskellDepends = [
base bytestring case-insensitive containers utf8-string
];
@@ -142458,19 +141979,23 @@ self: {
({ mkDerivation, async, base, blaze-builder, bytestring
, bytestring-lexing, case-insensitive, conduit, conduit-extra
, connection, hspec, http-client, http-conduit, http-types, mtl
- , network, QuickCheck, random, resourcet, streaming-commons, text
- , tls, transformers, vault, wai, wai-conduit, warp, warp-tls
+ , network, network-uri, QuickCheck, random, resourcet
+ , streaming-commons, text, tls, transformers, vault, wai
+ , wai-conduit, warp, warp-tls
}:
mkDerivation {
pname = "http-proxy";
- version = "0.1.1.0";
- sha256 = "1nzihn2qxm066avzgill1nxa0174ggv54bacsn871a0ai7n03079";
+ version = "0.1.2.0";
+ sha256 = "17yn15hd0kn3r495awy5qmrxq8mgrby8h5b9q7vzm583yppi9dmn";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- async base blaze-builder bytestring bytestring-lexing
- case-insensitive conduit conduit-extra http-client http-conduit
- http-types mtl network resourcet streaming-commons text tls
- transformers wai wai-conduit warp warp-tls
+ async base bytestring bytestring-lexing case-insensitive conduit
+ conduit-extra http-client http-conduit http-types mtl network
+ resourcet streaming-commons text tls transformers wai wai-conduit
+ warp warp-tls
];
+ executableHaskellDepends = [ base bytestring network-uri wai ];
testHaskellDepends = [
async base blaze-builder bytestring bytestring-lexing
case-insensitive conduit conduit-extra connection hspec http-client
@@ -142746,7 +142271,7 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "http2_3_0_0" = callPackage
+ "http2_3_0_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, array, async, base
, base16-bytestring, bytestring, case-insensitive, containers
, cryptonite, directory, filepath, gauge, Glob, heaps, hspec
@@ -142757,8 +142282,8 @@ self: {
}:
mkDerivation {
pname = "http2";
- version = "3.0.0";
- sha256 = "17j4p2apyiiznkwdn9a8pdb43vcwbnpzyff2wqlzpbf9habb8idf";
+ version = "3.0.1";
+ sha256 = "1c1vhb2x23rlw7ciayz0rx6lpifjwrvpg88nspwa9w5nbjij2258";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -145516,8 +145041,8 @@ self: {
({ mkDerivation, base, containers, HUnit, random }:
mkDerivation {
pname = "hyahtzee";
- version = "0.2";
- sha256 = "0zv9ycgf9sii59q86s04m6krjyjgmrqaxz4lyvwa58b7a886wcmv";
+ version = "0.5";
+ sha256 = "0g9y155w072zdwfx241zs7wwi338kyabv6kdk5j180s85ya8ryxp";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base containers HUnit random ];
@@ -148762,17 +148287,6 @@ self: {
}) {};
"indexed-profunctors" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "indexed-profunctors";
- version = "0.1";
- sha256 = "0rdvj62rapkkj5zv5jyx2ynfwn2iszx1w2q08j9ik17zklqv9pri";
- libraryHaskellDepends = [ base ];
- description = "Utilities for indexed profunctors";
- license = lib.licenses.bsd3;
- }) {};
-
- "indexed-profunctors_0_1_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "indexed-profunctors";
@@ -148781,7 +148295,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Utilities for indexed profunctors";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"indexed-traversable" = callPackage
@@ -149417,8 +148930,6 @@ self: {
];
description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {inherit (pkgs) R;};
"inliterate" = callPackage
@@ -149542,6 +149053,23 @@ self: {
license = lib.licenses.mit;
}) {};
+ "inspection-testing_0_4_4_0" = callPackage
+ ({ mkDerivation, base, containers, ghc, mtl, template-haskell
+ , transformers
+ }:
+ mkDerivation {
+ pname = "inspection-testing";
+ version = "0.4.4.0";
+ sha256 = "1zr7c7xpmnfwn2p84rqw69n1g91rdkh7d20awvj0s56nbdikgiyh";
+ libraryHaskellDepends = [
+ base containers ghc mtl template-haskell transformers
+ ];
+ testHaskellDepends = [ base ];
+ description = "GHC plugin to do inspection testing";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"inspector-wrecker" = callPackage
({ mkDerivation, aeson, base, bytestring, case-insensitive
, connection, data-default, http-client, http-client-tls
@@ -150429,12 +149957,12 @@ self: {
}) {};
"interval-algebra" = callPackage
- ({ mkDerivation, base, hspec, QuickCheck, time }:
+ ({ mkDerivation, base, hspec, QuickCheck, time, witherable }:
mkDerivation {
pname = "interval-algebra";
- version = "0.1.2";
- sha256 = "1nhpcrp7r6ba9mqwrfkx0zk7awdw24kh75ggq1wcif6mpir2khkx";
- libraryHaskellDepends = [ base time ];
+ version = "0.3.3";
+ sha256 = "0njlirr5ymsdw27snixxf3c4dgj8grffqv94a1hz97k801a3axkh";
+ libraryHaskellDepends = [ base QuickCheck time witherable ];
testHaskellDepends = [ base hspec QuickCheck time ];
description = "An implementation of Allen's interval algebra for temporal logic";
license = lib.licenses.bsd3;
@@ -152934,26 +152462,6 @@ self: {
}) {};
"jack" = callPackage
- ({ mkDerivation, array, base, bytestring, enumset, event-list
- , explicit-exception, libjack2, midi, non-negative, semigroups
- , transformers
- }:
- mkDerivation {
- pname = "jack";
- version = "0.7.1.4";
- sha256 = "018lsa5mgl7vb0hrd4jswa40d6w7alfq082brax8p832zf0v5bj2";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- array base bytestring enumset event-list explicit-exception midi
- non-negative semigroups transformers
- ];
- libraryPkgconfigDepends = [ libjack2 ];
- description = "Bindings for the JACK Audio Connection Kit";
- license = "GPL";
- }) {inherit (pkgs) libjack2;};
-
- "jack_0_7_2" = callPackage
({ mkDerivation, array, base, bytestring, enumset, event-list
, explicit-exception, libjack2, midi, non-negative, semigroups
, transformers
@@ -152971,7 +152479,6 @@ self: {
libraryPkgconfigDepends = [ libjack2 ];
description = "Bindings for the JACK Audio Connection Kit";
license = lib.licenses.gpl2Only;
- hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) libjack2;};
"jack-bindings" = callPackage
@@ -158528,6 +158035,26 @@ self: {
broken = true;
}) {};
+ "kvitable" = callPackage
+ ({ mkDerivation, base, containers, html-parse, lucid, microlens
+ , pretty-show, prettyprinter, tasty, tasty-hunit, template-haskell
+ , text
+ }:
+ mkDerivation {
+ pname = "kvitable";
+ version = "1.0.0.0";
+ sha256 = "1p8myw0f32gb1cxzp63l4i7m6gz1l423pl40yp2jl7vfdp4kzjwz";
+ libraryHaskellDepends = [
+ base containers lucid microlens prettyprinter text
+ ];
+ testHaskellDepends = [
+ base html-parse microlens pretty-show tasty tasty-hunit
+ template-haskell text
+ ];
+ description = "Key/Value Indexed Table container and formatting library";
+ license = lib.licenses.isc;
+ }) {};
+
"kyotocabinet" = callPackage
({ mkDerivation, base, bytestring, cereal, kyotocabinet }:
mkDerivation {
@@ -160041,8 +159568,8 @@ self: {
}:
mkDerivation {
pname = "language-docker";
- version = "9.1.3";
- sha256 = "00nr8fb981rkjzy2xhppvg9avsi377ww28d50rldm5wh7ax9s3w2";
+ version = "9.2.0";
+ sha256 = "08nq78091w7dii823fy7bvp2gxn1j1fp1fj151z37hvf423w19ds";
libraryHaskellDepends = [
base bytestring containers data-default-class megaparsec
prettyprinter split text time
@@ -160055,15 +159582,15 @@ self: {
license = lib.licenses.gpl3Only;
}) {};
- "language-docker_9_2_0" = callPackage
+ "language-docker_9_3_0" = callPackage
({ mkDerivation, base, bytestring, containers, data-default-class
, hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text
, time
}:
mkDerivation {
pname = "language-docker";
- version = "9.2.0";
- sha256 = "08nq78091w7dii823fy7bvp2gxn1j1fp1fj151z37hvf423w19ds";
+ version = "9.3.0";
+ sha256 = "1n9v0b6lwr528b6919y11a8d27mhsp0mm870rx0rjg9l5j4mnbvn";
libraryHaskellDepends = [
base bytestring containers data-default-class megaparsec
prettyprinter split text time
@@ -162089,6 +161616,19 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "leancheck_0_9_4" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "leancheck";
+ version = "0.9.4";
+ sha256 = "0w17ymj7k4sr9jwp9yrgh3l94l3kgjyxxnpxwj2sdqk8fvmjpkny";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base ];
+ description = "Enumerative property-based testing";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"leancheck-enum-instances" = callPackage
({ mkDerivation, base, enum-types, leancheck }:
mkDerivation {
@@ -164667,6 +164207,19 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "lift-type" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "lift-type";
+ version = "0.1.0.0";
+ sha256 = "0832xn7bfv1kwg02mmh6my11inljb066mci01b7p0xkcip1kmrhy";
+ revision = "1";
+ editedCabalFile = "1m89kzw7zrys8jjg7sbdpfq3bsqdvqr8bcszsnwvx0nmj1c6hciw";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base template-haskell ];
+ license = lib.licenses.bsd3;
+ }) {};
+
"lifted-async" = callPackage
({ mkDerivation, async, base, constraints, deepseq, HUnit
, lifted-base, monad-control, mtl, tasty, tasty-bench
@@ -171926,6 +171479,27 @@ self: {
broken = true;
}) {};
+ "mangrove" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, filepath
+ , HUnit, text, transformers, unordered-containers, utility-ht
+ , vector, willow
+ }:
+ mkDerivation {
+ pname = "mangrove";
+ version = "0.1.0.0";
+ sha256 = "0r9gpi79h676zal5r6x6kq8aszi83y035g32j55y0lkqsiww86ah";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers filepath text transformers
+ unordered-containers utility-ht vector willow
+ ];
+ testHaskellDepends = [
+ base bytestring filepath HUnit text utility-ht
+ ];
+ description = "A parser for web documents according to the HTML5 specification";
+ license = lib.licenses.mpl20;
+ }) {};
+
"manifold-random" = callPackage
({ mkDerivation, base, constrained-categories, linearmap-category
, manifolds, random-fu, semigroups, vector-space
@@ -178031,29 +177605,6 @@ self: {
}) {};
"mod" = callPackage
- ({ mkDerivation, base, deepseq, integer-gmp, primitive
- , quickcheck-classes, quickcheck-classes-base, semirings, tasty
- , tasty-quickcheck, time, vector
- }:
- mkDerivation {
- pname = "mod";
- version = "0.1.2.1";
- sha256 = "0fjcjk9jxwc2d1fm3kzamh9gi3lwnl2g6kz3z2hd43dszkay1mn1";
- revision = "2";
- editedCabalFile = "0h4dff2r9q5619pfahdm4bb6xmsqvv5b6d0na1i2sg7zq58ac2bq";
- libraryHaskellDepends = [
- base deepseq integer-gmp primitive semirings vector
- ];
- testHaskellDepends = [
- base primitive quickcheck-classes quickcheck-classes-base semirings
- tasty tasty-quickcheck vector
- ];
- benchmarkHaskellDepends = [ base time ];
- description = "Fast type-safe modular arithmetic";
- license = lib.licenses.mit;
- }) {};
-
- "mod_0_1_2_2" = callPackage
({ mkDerivation, base, deepseq, integer-gmp, primitive
, quickcheck-classes, quickcheck-classes-base, semirings, tasty
, tasty-bench, tasty-quickcheck, vector
@@ -178072,7 +177623,6 @@ self: {
benchmarkHaskellDepends = [ base tasty-bench ];
description = "Fast type-safe modular arithmetic";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"modbus-tcp" = callPackage
@@ -180442,8 +179992,8 @@ self: {
pname = "monoidal-containers";
version = "0.6.0.1";
sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82";
- revision = "2";
- editedCabalFile = "1b98zf8c2mz7qrp24pyq6wqx5ljlckc7hyk62kiyj23svq7sxpzz";
+ revision = "4";
+ editedCabalFile = "1vi30clh5j3zzirbl4wch40vjds4p6sdmf1q1qadm4zzj7zahvpm";
libraryHaskellDepends = [
aeson base containers deepseq hashable lens newtype semialign
semigroups these unordered-containers
@@ -189765,18 +189315,6 @@ self: {
}) {};
"nonempty-zipper" = callPackage
- ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }:
- mkDerivation {
- pname = "nonempty-zipper";
- version = "1.0.0.1";
- sha256 = "17h070rciwbdk36n68dbin1yv2ybrb2vak9azimfv51z6b6a7b4w";
- libraryHaskellDepends = [ base comonad deepseq safe ];
- testHaskellDepends = [ base comonad deepseq doctest Glob safe ];
- description = "A non-empty comonadic list zipper";
- license = lib.licenses.mit;
- }) {};
-
- "nonempty-zipper_1_0_0_2" = callPackage
({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }:
mkDerivation {
pname = "nonempty-zipper";
@@ -189786,7 +189324,6 @@ self: {
testHaskellDepends = [ base comonad deepseq doctest Glob safe ];
description = "A non-empty comonadic list zipper";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"nonemptymap" = callPackage
@@ -190356,8 +189893,8 @@ self: {
}:
mkDerivation {
pname = "nri-prelude";
- version = "0.5.0.2";
- sha256 = "1g96nf1nslynqywkqzb4x0k17v0fcw37jidrp7yzkmz16yhqxh1n";
+ version = "0.5.0.3";
+ sha256 = "0k4mhgyazjc74hwf2xgznhhkryqhdmsc2pv1v9d32706qkr796wn";
libraryHaskellDepends = [
aeson aeson-pretty async auto-update base bytestring containers
directory exceptions filepath ghc hedgehog junit-xml pretty-diff
@@ -193049,6 +192586,43 @@ self: {
broken = true;
}) {};
+ "openapi3_3_1_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
+ , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
+ , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
+ , HUnit, insert-ordered-containers, lens, mtl, network, optics-core
+ , optics-th, QuickCheck, quickcheck-instances, scientific
+ , template-haskell, text, time, transformers, unordered-containers
+ , utf8-string, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "openapi3";
+ version = "3.1.0";
+ sha256 = "011754qyxxw5mn06hdmxalvsiff7a4x4k2yb2r6ylzr6zhyz818z";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base-compat-batteries bytestring containers
+ cookie generics-sop hashable http-media insert-ordered-containers
+ lens mtl network optics-core optics-th QuickCheck scientific
+ template-haskell text time transformers unordered-containers
+ uuid-types vector
+ ];
+ executableHaskellDepends = [ aeson base lens text ];
+ testHaskellDepends = [
+ aeson base base-compat-batteries bytestring containers doctest Glob
+ hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+ quickcheck-instances template-haskell text time
+ unordered-containers utf8-string vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "OpenAPI 3.0 data model";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"openapi3-code-generator" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, filepath, genvalidity, genvalidity-hspec, genvalidity-text
@@ -193888,6 +193462,120 @@ self: {
broken = true;
}) {};
+ "opentracing" = callPackage
+ ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+ , case-insensitive, clock, containers, http-types, iproute, lens
+ , mtl, mwc-random, network, safe-exceptions, semigroups, stm, text
+ , time, transformers, unordered-containers, uri-bytestring, vinyl
+ }:
+ mkDerivation {
+ pname = "opentracing";
+ version = "0.1.0.0";
+ sha256 = "0j791hv525mcskqmji3f9n8v803pailm8jrl336pxzdh3iacqvsl";
+ libraryHaskellDepends = [
+ aeson async base base64-bytestring bytestring case-insensitive
+ clock containers http-types iproute lens mtl mwc-random network
+ safe-exceptions semigroups stm text time transformers
+ unordered-containers uri-bytestring vinyl
+ ];
+ description = "OpenTracing for Haskell";
+ license = lib.licenses.asl20;
+ }) {};
+
+ "opentracing-http-client" = callPackage
+ ({ mkDerivation, base, http-client, lens, mtl, opentracing, text }:
+ mkDerivation {
+ pname = "opentracing-http-client";
+ version = "0.1.0.0";
+ sha256 = "1jzdnlk2cacmymjkcfx4n569n6gqy6kwzh9dxrgjnagwh3jqk7q3";
+ libraryHaskellDepends = [
+ base http-client lens mtl opentracing text
+ ];
+ description = "OpenTracing instrumentation of http-client";
+ license = lib.licenses.asl20;
+ }) {};
+
+ "opentracing-jaeger" = callPackage
+ ({ mkDerivation, base, bytestring, exceptions, hashable
+ , http-client, http-types, lens, mtl, network, opentracing
+ , QuickCheck, safe-exceptions, text, thrift, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "opentracing-jaeger";
+ version = "0.1.0.0";
+ sha256 = "1yr9vhbpqq12hj9blv3v1wc26n9qsp0g7pjngxh0k1zcv759s1k0";
+ libraryHaskellDepends = [
+ base bytestring exceptions hashable http-client http-types lens mtl
+ network opentracing QuickCheck safe-exceptions text thrift
+ unordered-containers vector
+ ];
+ description = "Jaeger backend for OpenTracing";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "opentracing-wai" = callPackage
+ ({ mkDerivation, base, lens, opentracing, text, wai }:
+ mkDerivation {
+ pname = "opentracing-wai";
+ version = "0.1.0.0";
+ sha256 = "1m68l4gxpyl81yhkd209kdgzydzyg632x8gl2jh3l4k83ysdg545";
+ libraryHaskellDepends = [ base lens opentracing text wai ];
+ description = "Middleware adding OpenTracing tracing for WAI applications";
+ license = lib.licenses.asl20;
+ }) {};
+
+ "opentracing-zipkin-common" = callPackage
+ ({ mkDerivation, aeson, base, opentracing, text }:
+ mkDerivation {
+ pname = "opentracing-zipkin-common";
+ version = "0.1.0.0";
+ sha256 = "00pg2k0v685gc4fmrcb464fapvpz8lw0249n6gmi2zkhpw8frnm0";
+ libraryHaskellDepends = [ aeson base opentracing text ];
+ description = "Zipkin OpenTracing Backend Commons";
+ license = lib.licenses.asl20;
+ }) {};
+
+ "opentracing-zipkin-v1" = callPackage
+ ({ mkDerivation, base, bytestring, exceptions, hashable
+ , http-client, http-types, iproute, lens, opentracing
+ , opentracing-zipkin-common, QuickCheck, text, thrift
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "opentracing-zipkin-v1";
+ version = "0.1.0.0";
+ sha256 = "0mw6x9jqh42ymn1a3maq47mw1mbzki5lv1axapqkhkx0w13824pp";
+ libraryHaskellDepends = [
+ base bytestring exceptions hashable http-client http-types iproute
+ lens opentracing opentracing-zipkin-common QuickCheck text thrift
+ unordered-containers vector
+ ];
+ description = "Zipkin V1 backend for OpenTracing";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "opentracing-zipkin-v2" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , exceptions, http-client, http-types, lens, opentracing
+ , opentracing-zipkin-common, text
+ }:
+ mkDerivation {
+ pname = "opentracing-zipkin-v2";
+ version = "0.1.0.0";
+ sha256 = "0rmrlx2g228p4ys95d4zqc0l56a62avsawq320g4n9i2g0hrl5n4";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring exceptions http-client
+ http-types lens opentracing opentracing-zipkin-common text
+ ];
+ description = "Zipkin V2 backend for OpenTracing";
+ license = lib.licenses.asl20;
+ }) {};
+
"opentype" = callPackage
({ mkDerivation, base, binary, bytestring, containers, ghc
, microlens, microlens-th, mtl, pretty-hex, time
@@ -196737,8 +196425,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "pandora";
- version = "0.3.9";
- sha256 = "1wl6jxpx181sx5w311c2h5kjpl5hjagbwfn68s6dbsbyp4p9sxjv";
+ version = "0.4.0";
+ sha256 = "0jy41qiqn6xj6ib20klv85jyr8vn633xqhxbx38zxs5dsq885laq";
description = "A box of patterns and paradigms";
license = lib.licenses.mit;
}) {};
@@ -197566,8 +197254,6 @@ self: {
testHaskellDepends = [ base data-diverse hspec transformers ];
description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"parameterized-data" = callPackage
@@ -198835,10 +198521,8 @@ self: {
}:
mkDerivation {
pname = "patch";
- version = "0.0.3.2";
- sha256 = "1b819d1iramxb0sf0zm4ry8mrd74y35iffbb6qys3a2xq1d382xa";
- revision = "2";
- editedCabalFile = "09v23qakrdjscwvzjarkssikkp7xmq9jbpp5hh1y857l02r3fz5c";
+ version = "0.0.4.0";
+ sha256 = "02hdhgk7wwcnq7aahbaqx5zzlha6mq6lj0mw57phj3ykmca0zggc";
libraryHaskellDepends = [
base constraints-extras containers dependent-map dependent-sum lens
monoidal-containers semialign semigroupoids these transformers
@@ -200943,7 +200627,7 @@ self: {
maintainers = with lib.maintainers; [ psibi ];
}) {};
- "persistent_2_12_1_0" = callPackage
+ "persistent_2_12_1_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, base64-bytestring
, blaze-html, bytestring, conduit, containers, criterion, deepseq
, deepseq-generics, fast-logger, file-embed, hspec, http-api-data
@@ -200954,8 +200638,8 @@ self: {
}:
mkDerivation {
pname = "persistent";
- version = "2.12.1.0";
- sha256 = "06cqrvavjzp2iyvi69j6ga0pqy6265dwsg44h93k4qffhknlms1a";
+ version = "2.12.1.1";
+ sha256 = "00n463mvfnjpi7dz4i3lz379cf4gprsiv57j4jb7wh5a8xr2vfhz";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html bytestring
conduit containers fast-logger http-api-data monad-logger mtl
@@ -201403,19 +201087,20 @@ self: {
license = lib.licenses.mit;
}) {};
- "persistent-postgresql_2_12_1_0" = callPackage
+ "persistent-postgresql_2_12_1_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, conduit, containers, fast-logger, hspec, hspec-expectations
- , HUnit, monad-logger, mtl, persistent, persistent-qq
- , persistent-test, postgresql-libpq, postgresql-simple, QuickCheck
- , quickcheck-instances, resource-pool, resourcet
- , string-conversions, text, time, transformers, unliftio
- , unliftio-core, unordered-containers, vector
+ , hspec-expectations-lifted, HUnit, monad-logger, mtl, persistent
+ , persistent-qq, persistent-test, postgresql-libpq
+ , postgresql-simple, QuickCheck, quickcheck-instances
+ , resource-pool, resourcet, string-conversions, text, time
+ , transformers, unliftio, unliftio-core, unordered-containers
+ , vector
}:
mkDerivation {
pname = "persistent-postgresql";
- version = "2.12.1.0";
- sha256 = "18b4069x4jb7qxmrv0hck7r7v8192bkn4nmhl3wfidwn1vvsa9da";
+ version = "2.12.1.1";
+ sha256 = "1zyh40490r3vjr5qyr8hp2ih1pjqjwbmwm1ashdm1b1n9y5ary53";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201426,9 +201111,10 @@ self: {
];
testHaskellDepends = [
aeson base bytestring containers fast-logger hspec
- hspec-expectations HUnit monad-logger persistent persistent-qq
- persistent-test QuickCheck quickcheck-instances resourcet text time
- transformers unliftio unliftio-core unordered-containers vector
+ hspec-expectations hspec-expectations-lifted HUnit monad-logger
+ persistent persistent-qq persistent-test QuickCheck
+ quickcheck-instances resourcet text time transformers unliftio
+ unliftio-core unordered-containers vector
];
description = "Backend for the persistent library using postgresql";
license = lib.licenses.mit;
@@ -202569,6 +202255,17 @@ self: {
license = lib.licenses.mit;
}) {};
+ "phonetic-languages-phonetics-basics" = callPackage
+ ({ mkDerivation, base, mmsyn2-array, mmsyn5 }:
+ mkDerivation {
+ pname = "phonetic-languages-phonetics-basics";
+ version = "0.3.2.0";
+ sha256 = "0r4f69ky1y45h6fys1821z45ccg30h61yc68x16cf839awfri92l";
+ libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ];
+ description = "A library for working with generalized phonetic languages usage";
+ license = lib.licenses.mit;
+ }) {};
+
"phonetic-languages-plus" = callPackage
({ mkDerivation, base, bytestring, lists-flines, parallel
, uniqueness-periods-vector-stats
@@ -202661,8 +202358,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-examples-array";
- version = "0.4.0.0";
- sha256 = "03vin7gng1sqifyy0s83igmd41bxxwrp7ck9j7bxhnqq0qmg5d7n";
+ version = "0.4.1.0";
+ sha256 = "02z7c3ngcj4dz473j0ha05qh5wviiy4qp1mk3p4gidxrhkgbxhyc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -205041,6 +204738,28 @@ self: {
broken = true;
}) {};
+ "pkgtreediff_0_4_1" = callPackage
+ ({ mkDerivation, async, base, directory, extra, filepath, Glob
+ , http-client, http-client-tls, http-directory, koji, simple-cmd
+ , simple-cmd-args, text
+ }:
+ mkDerivation {
+ pname = "pkgtreediff";
+ version = "0.4.1";
+ sha256 = "0yj0wpwpryavy09264xh82kxi52gc5ipyrgwpxh3m9gv1264gip0";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base text ];
+ executableHaskellDepends = [
+ async base directory extra filepath Glob http-client
+ http-client-tls http-directory koji simple-cmd simple-cmd-args text
+ ];
+ description = "Package tree diff tool";
+ license = lib.licenses.gpl3Only;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"pktree" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -206907,8 +206626,9 @@ self: {
}:
mkDerivation {
pname = "polysemy-test";
- version = "0.3.1.1";
- sha256 = "0xlhw9kf55fn26v068pxwajpl8dw7xcmrlkxk8ci55jans0blx9w";
+ version = "0.3.1.2";
+ sha256 = "1gzngz8mspq0n6hwhvqah8szjrhf65wigadrh3l863j2iswsxq2r";
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
base containers either hedgehog path path-io polysemy
polysemy-plugin relude string-interpolate tasty tasty-hedgehog
@@ -212859,8 +212579,8 @@ self: {
}:
mkDerivation {
pname = "proto3-suite";
- version = "0.4.0.2";
- sha256 = "0mk1yhpq2q6jv7z3ipdq5dw5sij39y7lv5gaslzxkbvs2kan7d4m";
+ version = "0.4.1";
+ sha256 = "1zzw3kgxa875g0bpqi1zblw3q8h7lw53gcz4c8qjgkr2v1cr5nf3";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -212915,6 +212635,31 @@ self: {
broken = true;
}) {};
+ "proto3-wire_1_2_1" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+ , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck
+ , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "proto3-wire";
+ version = "1.2.1";
+ sha256 = "0i706y9j5iq5zyi86vkiybznp3b4h2x0flvq3jmr8mgpgahvh94r";
+ libraryHaskellDepends = [
+ base bytestring cereal containers deepseq ghc-prim hashable
+ parameterized primitive QuickCheck safe text transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base bytestring cereal doctest QuickCheck tasty tasty-hunit
+ tasty-quickcheck text transformers vector
+ ];
+ description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"protobuf" = callPackage
({ mkDerivation, base, base-orphans, bytestring, cereal, containers
, data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -214096,13 +213841,14 @@ self: {
, ansi-terminal, ansi-wl-pprint, array, base, base-compat
, blaze-html, bower-json, boxes, bytestring, Cabal, cborg
, cheapskate, clock, containers, cryptonite, data-ordlist, deepseq
- , directory, edit-distance, file-embed, filepath, fsnotify, gitrev
- , Glob, happy, haskeline, hspec, hspec-discover, http-types, HUnit
- , language-javascript, lifted-async, lifted-base, memory
- , microlens-platform, monad-control, monad-logger, mtl, network
- , optparse-applicative, parallel, parsec, pattern-arrows, process
- , protolude, purescript-ast, purescript-cst, regex-base, regex-tdfa
- , safe, semialign, semigroups, serialise, sourcemap, split, stm
+ , directory, dlist, edit-distance, exceptions, file-embed, filepath
+ , fsnotify, gitrev, Glob, happy, haskeline, hspec, hspec-discover
+ , http-types, HUnit, language-javascript, lifted-async, lifted-base
+ , memory, microlens, microlens-platform, monad-control
+ , monad-logger, mtl, network, optparse-applicative, parallel
+ , parsec, pattern-arrows, process, protolude, purescript-ast
+ , purescript-cst, regex-base, regex-tdfa, safe, scientific
+ , semialign, semigroups, serialise, sourcemap, split, stm
, stringsearch, syb, tasty, tasty-golden, tasty-hspec
, tasty-quickcheck, text, these, time, transformers
, transformers-base, transformers-compat, unordered-containers
@@ -214110,34 +213856,36 @@ self: {
}:
mkDerivation {
pname = "purescript";
- version = "0.14.0";
- sha256 = "1bv68y91l6fyjidfp71djiv2lijn5d55j4szlg77yvsw164s6vk0";
+ version = "0.14.1";
+ sha256 = "0cqrasq0my2nsslpvy1mfhc2nqj2bfcilv8acd600bn9f6qgn4yv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-better-errors aeson-pretty ansi-terminal array base
base-compat blaze-html bower-json boxes bytestring Cabal cborg
cheapskate clock containers cryptonite data-ordlist deepseq
- directory edit-distance file-embed filepath fsnotify Glob haskeline
- language-javascript lifted-async lifted-base memory
- microlens-platform monad-control monad-logger mtl parallel parsec
- pattern-arrows process protolude purescript-ast purescript-cst
- regex-tdfa safe semialign semigroups serialise sourcemap split stm
- stringsearch syb text these time transformers transformers-base
- transformers-compat unordered-containers utf8-string vector
+ directory dlist edit-distance file-embed filepath fsnotify Glob
+ haskeline language-javascript lifted-async lifted-base memory
+ microlens microlens-platform monad-control monad-logger mtl
+ parallel parsec pattern-arrows process protolude purescript-ast
+ purescript-cst regex-tdfa safe scientific semialign semigroups
+ serialise sourcemap split stm stringsearch syb text these time
+ transformers transformers-base transformers-compat
+ unordered-containers utf8-string vector
];
libraryToolDepends = [ happy ];
executableHaskellDepends = [
aeson aeson-better-errors aeson-pretty ansi-terminal ansi-wl-pprint
array base base-compat blaze-html bower-json boxes bytestring Cabal
cborg cheapskate clock containers cryptonite data-ordlist deepseq
- directory edit-distance file-embed filepath fsnotify gitrev Glob
- haskeline http-types language-javascript lifted-async lifted-base
- memory microlens-platform monad-control monad-logger mtl network
- optparse-applicative parallel parsec pattern-arrows process
- protolude purescript-ast purescript-cst regex-tdfa safe semialign
- semigroups serialise sourcemap split stm stringsearch syb text
- these time transformers transformers-base transformers-compat
+ directory dlist edit-distance exceptions file-embed filepath
+ fsnotify gitrev Glob haskeline http-types language-javascript
+ lifted-async lifted-base memory microlens microlens-platform
+ monad-control monad-logger mtl network optparse-applicative
+ parallel parsec pattern-arrows process protolude purescript-ast
+ purescript-cst regex-tdfa safe scientific semialign semigroups
+ serialise sourcemap split stm stringsearch syb text these time
+ transformers transformers-base transformers-compat
unordered-containers utf8-string vector wai wai-websockets warp
websockets
];
@@ -214146,15 +213894,15 @@ self: {
aeson aeson-better-errors aeson-pretty ansi-terminal array base
base-compat blaze-html bower-json boxes bytestring Cabal cborg
cheapskate clock containers cryptonite data-ordlist deepseq
- directory edit-distance file-embed filepath fsnotify Glob haskeline
- hspec hspec-discover HUnit language-javascript lifted-async
- lifted-base memory microlens-platform monad-control monad-logger
- mtl parallel parsec pattern-arrows process protolude purescript-ast
- purescript-cst regex-base regex-tdfa safe semialign semigroups
- serialise sourcemap split stm stringsearch syb tasty tasty-golden
- tasty-hspec tasty-quickcheck text these time transformers
- transformers-base transformers-compat unordered-containers
- utf8-string vector
+ directory dlist edit-distance file-embed filepath fsnotify Glob
+ haskeline hspec HUnit language-javascript lifted-async lifted-base
+ memory microlens microlens-platform monad-control monad-logger mtl
+ parallel parsec pattern-arrows process protolude purescript-ast
+ purescript-cst regex-base regex-tdfa safe scientific semialign
+ semigroups serialise sourcemap split stm stringsearch syb tasty
+ tasty-golden tasty-hspec tasty-quickcheck text these time
+ transformers transformers-base transformers-compat
+ unordered-containers utf8-string vector
];
testToolDepends = [ happy hspec-discover ];
doCheck = false;
@@ -214171,8 +213919,8 @@ self: {
}:
mkDerivation {
pname = "purescript-ast";
- version = "0.1.0.0";
- sha256 = "1zwwbdkc5mb3ckc2g15b18j9vp9bksyc1nrlg73w7w0fzqwnqb4g";
+ version = "0.1.1.0";
+ sha256 = "12zkkbpv1xxvx4d3rybng1kxvw6z5gjr45mfy9bpkmb3jqzl1xd2";
libraryHaskellDepends = [
aeson base base-compat bytestring containers deepseq filepath
microlens mtl protolude scientific serialise text vector
@@ -214227,8 +213975,8 @@ self: {
}:
mkDerivation {
pname = "purescript-cst";
- version = "0.1.0.0";
- sha256 = "1h4na5k0lz91i1f49axsgs7zqz6dqdxds5dg0g00wd4wmyd619cc";
+ version = "0.1.1.0";
+ sha256 = "05jqf9c0pakbjvr2zvybaxg9rfi87dadsx4srjlrw294r2sz969r";
libraryHaskellDepends = [
array base containers dlist purescript-ast scientific semigroups
text
@@ -215790,29 +215538,6 @@ self: {
}) {};
"quickcheck-classes" = callPackage
- ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers
- , contravariant, fail, primitive, primitive-addr, QuickCheck
- , quickcheck-classes-base, semigroupoids, semigroups, semirings
- , tagged, tasty, tasty-quickcheck, transformers, vector
- }:
- mkDerivation {
- pname = "quickcheck-classes";
- version = "0.6.4.0";
- sha256 = "0qcxmkf9ig6jnfpd5slx2imzwmvvyqgvlif2940yzwam63m6anwg";
- libraryHaskellDepends = [
- aeson base base-orphans bifunctors containers contravariant fail
- primitive primitive-addr QuickCheck quickcheck-classes-base
- semigroupoids semigroups semirings tagged transformers vector
- ];
- testHaskellDepends = [
- aeson base base-orphans containers primitive QuickCheck
- semigroupoids tagged tasty tasty-quickcheck transformers vector
- ];
- description = "QuickCheck common typeclasses";
- license = lib.licenses.bsd3;
- }) {};
-
- "quickcheck-classes_0_6_5_0" = callPackage
({ mkDerivation, aeson, base, base-orphans, containers, primitive
, primitive-addr, QuickCheck, quickcheck-classes-base
, semigroupoids, semirings, tagged, tasty, tasty-quickcheck
@@ -215832,26 +215557,9 @@ self: {
];
description = "QuickCheck common typeclasses";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"quickcheck-classes-base" = callPackage
- ({ mkDerivation, base, base-orphans, bifunctors, containers
- , contravariant, fail, QuickCheck, tagged, transformers
- }:
- mkDerivation {
- pname = "quickcheck-classes-base";
- version = "0.6.1.0";
- sha256 = "0yzljsy74njmbav90hgraxhjx0l86zggakfw0j3k7maz9376jvax";
- libraryHaskellDepends = [
- base base-orphans bifunctors containers contravariant fail
- QuickCheck tagged transformers
- ];
- description = "QuickCheck common typeclasses from `base`";
- license = lib.licenses.bsd3;
- }) {};
-
- "quickcheck-classes-base_0_6_2_0" = callPackage
({ mkDerivation, base, containers, QuickCheck, transformers }:
mkDerivation {
pname = "quickcheck-classes-base";
@@ -215862,7 +215570,6 @@ self: {
];
description = "QuickCheck common typeclasses from `base`";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"quickcheck-combinators" = callPackage
@@ -220023,24 +219730,6 @@ self: {
}) {};
"records-sop" = callPackage
- ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec
- , should-not-typecheck
- }:
- mkDerivation {
- pname = "records-sop";
- version = "0.1.0.3";
- sha256 = "120kb6z4si5wqkahbqxqhm3qb8xpc9ivwg293ymz8a4ri1hdr0a5";
- revision = "1";
- editedCabalFile = "0492a3cabdl5ccncc7lk7bvh55in4hzm345fl3xpidp9jx6mv1x4";
- libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
- testHaskellDepends = [
- base deepseq generics-sop hspec should-not-typecheck
- ];
- description = "Record subtyping and record utilities with generics-sop";
- license = lib.licenses.bsd3;
- }) {};
-
- "records-sop_0_1_1_0" = callPackage
({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec
, should-not-typecheck
}:
@@ -220054,7 +219743,6 @@ self: {
];
description = "Record subtyping and record utilities with generics-sop";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"records-th" = callPackage
@@ -222139,6 +221827,8 @@ self: {
pname = "regex-tdfa-rc";
version = "1.1.8.3";
sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3";
+ revision = "2";
+ editedCabalFile = "04w0jdavczf8gilx6cr1cgpqydvrmiksrzc8j30ijwn9hsa149mh";
libraryHaskellDepends = [
array base bytestring containers ghc-prim mtl parsec regex-base
];
@@ -222473,35 +222163,6 @@ self: {
}) {};
"registry" = callPackage
- ({ mkDerivation, async, base, bytestring, containers, directory
- , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
- , MonadRandom, mtl, multimap, protolude, random, resourcet
- , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog
- , tasty-th, template-haskell, text, transformers-base, universum
- }:
- mkDerivation {
- pname = "registry";
- version = "0.2.0.2";
- sha256 = "1lq8r382xm1m5b7i0jfjaj3f1jr98rdvjpn0h77i4i0i1wy529c1";
- libraryHaskellDepends = [
- base containers exceptions hashable mmorph mtl protolude resourcet
- semigroupoids semigroups template-haskell text transformers-base
- ];
- testHaskellDepends = [
- async base bytestring containers directory exceptions generic-lens
- hashable hedgehog io-memoize mmorph MonadRandom mtl multimap
- protolude random resourcet semigroupoids semigroups tasty
- tasty-discover tasty-hedgehog tasty-th template-haskell text
- transformers-base universum
- ];
- testToolDepends = [ tasty-discover ];
- description = "data structure for assembling components";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "registry_0_2_0_3" = callPackage
({ mkDerivation, async, base, bytestring, containers, directory
, exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
, MonadRandom, mtl, multimap, protolude, random, resourcet
@@ -224067,6 +223728,21 @@ self: {
broken = true;
}) {};
+ "request" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, http-client
+ , http-client-tls, http-types
+ }:
+ mkDerivation {
+ pname = "request";
+ version = "0.1.3.0";
+ sha256 = "07ypsdmf227m6j8gkl29621z7grbsgr0pmk3dglx9zlrmq0zbn8j";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive http-client http-client-tls
+ http-types
+ ];
+ license = lib.licenses.bsd3;
+ }) {};
+
"request-monad" = callPackage
({ mkDerivation, base, free, mtl, transformers }:
mkDerivation {
@@ -228692,6 +228368,20 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "safe-numeric" = callPackage
+ ({ mkDerivation, base, containers, doctest, safe, wide-word }:
+ mkDerivation {
+ pname = "safe-numeric";
+ version = "0.1";
+ sha256 = "11y9p20cgfsg676a8jm5w7z2qc2y3hznwhniw054qcdnnf7dalwi";
+ libraryHaskellDepends = [ base safe wide-word ];
+ testHaskellDepends = [ base containers doctest ];
+ description = "Safe arithmetic operations";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"safe-plugins" = callPackage
({ mkDerivation, base, directory, filepath, haskell-src-exts
, plugins, Unixutils
@@ -228746,29 +228436,6 @@ self: {
}) {};
"safecopy" = callPackage
- ({ mkDerivation, array, base, bytestring, cereal, containers
- , generic-data, HUnit, lens, lens-action, old-time, QuickCheck
- , quickcheck-instances, tasty, tasty-quickcheck, template-haskell
- , text, time, transformers, vector
- }:
- mkDerivation {
- pname = "safecopy";
- version = "0.10.4.1";
- sha256 = "1p8kbf9js67zl2wr6y0605acy54xlpsih1zqkdy21cywz1kannbp";
- libraryHaskellDepends = [
- array base bytestring cereal containers generic-data old-time
- template-haskell text time transformers vector
- ];
- testHaskellDepends = [
- array base bytestring cereal containers HUnit lens lens-action
- QuickCheck quickcheck-instances tasty tasty-quickcheck
- template-haskell time vector
- ];
- description = "Binary serialization with version control";
- license = lib.licenses.publicDomain;
- }) {};
-
- "safecopy_0_10_4_2" = callPackage
({ mkDerivation, array, base, bytestring, cereal, containers
, generic-data, HUnit, lens, lens-action, old-time, QuickCheck
, quickcheck-instances, tasty, tasty-quickcheck, template-haskell
@@ -228789,7 +228456,6 @@ self: {
];
description = "Binary serialization with version control";
license = lib.licenses.publicDomain;
- hydraPlatforms = lib.platforms.none;
}) {};
"safecopy-migrate" = callPackage
@@ -230321,17 +229987,18 @@ self: {
}) {};
"scenegraph" = callPackage
- ({ mkDerivation, array, base, containers, fgl, GLUT, haskell98
- , hmatrix, mtl, old-time, OpenGL, process
+ ({ mkDerivation, base, data-default, fgl, graphviz, hspec
+ , hspec-discover, lens, linear, mtl, QuickCheck, text
}:
mkDerivation {
pname = "scenegraph";
- version = "0.1.0.2";
- sha256 = "1l946h6sggg2n8ldx34v2sx4dyjqxd7i34wrsllz88iiy4qd90yw";
+ version = "0.2.0.0";
+ sha256 = "0nwaf1wpr8pqwwkxx0zpbkmvn4ww6v3xcv5w7krk02f985ajaq50";
libraryHaskellDepends = [
- array base containers fgl GLUT haskell98 hmatrix mtl old-time
- OpenGL process
+ base data-default fgl graphviz lens linear mtl text
];
+ testHaskellDepends = [ base hspec lens linear QuickCheck ];
+ testToolDepends = [ hspec-discover ];
description = "Scene Graph";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -234470,8 +234137,6 @@ self: {
];
description = "generate API docs for your servant webservice";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"servant-docs-simple" = callPackage
@@ -234598,6 +234263,28 @@ self: {
license = lib.licenses.mit;
}) {};
+ "servant-event-stream" = callPackage
+ ({ mkDerivation, base, binary, http-media, lens, pipes
+ , servant-foreign, servant-js, servant-pipes, servant-server, text
+ , wai-extra
+ }:
+ mkDerivation {
+ pname = "servant-event-stream";
+ version = "0.2.1.0";
+ sha256 = "1bs4gjw7xaai5hxcv0dy7fmvx26ysmcqnaly5vriwkz45k1rhlj9";
+ revision = "2";
+ editedCabalFile = "1s6si9php8im45yh0r9slgw7sz8c0jk2i4c93a5qbjr0mzz9k2va";
+ libraryHaskellDepends = [
+ base binary http-media lens pipes servant-foreign servant-js
+ servant-pipes servant-server text wai-extra
+ ];
+ testHaskellDepends = [ base ];
+ description = "Servant support for Server-Sent events";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"servant-examples" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, either
, http-types, js-jquery, lucid, random, servant, servant-client
@@ -235225,8 +234912,38 @@ self: {
pname = "servant-openapi3";
version = "2.0.1.1";
sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf";
- revision = "1";
- editedCabalFile = "0j2b3zv5qk5xfi17jwwn456pqpf27aqgy6fmbyqvn8df83rcij5j";
+ revision = "2";
+ editedCabalFile = "0y214pgkfkysvdll15inf44psyqj7dmzcwp2vjynwdlywy2j0y16";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base-compat bytestring hspec http-media
+ insert-ordered-containers lens openapi3 QuickCheck servant
+ singleton-bool text unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base base-compat directory doctest filepath hspec lens
+ lens-aeson openapi3 QuickCheck servant template-haskell text time
+ utf8-string vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "servant-openapi3_2_0_1_2" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+ , Cabal, cabal-doctest, directory, doctest, filepath, hspec
+ , hspec-discover, http-media, insert-ordered-containers, lens
+ , lens-aeson, openapi3, QuickCheck, servant, singleton-bool
+ , template-haskell, text, time, unordered-containers, utf8-string
+ , vector
+ }:
+ mkDerivation {
+ pname = "servant-openapi3";
+ version = "2.0.1.2";
+ sha256 = "1lqvycbv49x0i3adbsdlcl49n65wxfjzhiz9pj11hg4k0j952q5p";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson aeson-pretty base base-compat bytestring hspec http-media
@@ -236064,6 +235781,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "servant-swagger-ui_0_3_5_3_47_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, file-embed-lzma, servant
+ , servant-server, servant-swagger-ui-core, text
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui";
+ version = "0.3.5.3.47.1";
+ sha256 = "00bmkj87rnd9zmg54h3z8k9zgs5d17lcdn9gp006xixa6g494cms";
+ libraryHaskellDepends = [
+ aeson base bytestring file-embed-lzma servant servant-server
+ servant-swagger-ui-core text
+ ];
+ description = "Servant swagger ui";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"servant-swagger-ui-core" = callPackage
({ mkDerivation, base, blaze-markup, bytestring, http-media
, servant, servant-blaze, servant-server, swagger2, text
@@ -236082,37 +235816,51 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "servant-swagger-ui-core_0_3_5" = callPackage
+ ({ mkDerivation, aeson, base, blaze-markup, bytestring, http-media
+ , servant, servant-blaze, servant-server, text, transformers
+ , transformers-compat, wai-app-static
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui-core";
+ version = "0.3.5";
+ sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd";
+ libraryHaskellDepends = [
+ aeson base blaze-markup bytestring http-media servant servant-blaze
+ servant-server text transformers transformers-compat wai-app-static
+ ];
+ description = "Servant swagger ui core components";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"servant-swagger-ui-jensoleg" = callPackage
- ({ mkDerivation, base, bytestring, file-embed-lzma, servant
- , servant-server, servant-swagger-ui-core, swagger2, text
+ ({ mkDerivation, aeson, base, bytestring, file-embed-lzma, servant
+ , servant-server, servant-swagger-ui-core, text
}:
mkDerivation {
pname = "servant-swagger-ui-jensoleg";
- version = "0.3.3";
- sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw";
- revision = "4";
- editedCabalFile = "19h7n1g847ly7addv03vzy5915n48xa0y7l88dzamy6ly1jrmdg2";
+ version = "0.3.4";
+ sha256 = "04s4syfmnjwa52xqm29x2sfi1ka6p7fpjff0pxry099rh0d59hkm";
libraryHaskellDepends = [
- base bytestring file-embed-lzma servant servant-server
- servant-swagger-ui-core swagger2 text
+ aeson base bytestring file-embed-lzma servant servant-server
+ servant-swagger-ui-core text
];
description = "Servant swagger ui: Jens-Ole Graulund theme";
license = lib.licenses.bsd3;
}) {};
"servant-swagger-ui-redoc" = callPackage
- ({ mkDerivation, base, bytestring, file-embed-lzma, servant
- , servant-server, servant-swagger-ui-core, swagger2, text
+ ({ mkDerivation, aeson, base, bytestring, file-embed-lzma, servant
+ , servant-server, servant-swagger-ui-core, text
}:
mkDerivation {
pname = "servant-swagger-ui-redoc";
- version = "0.3.3.1.22.3";
- sha256 = "0bzkrh1hf29vfa1r1sgifb9j2zcg6i43fal4abbx4lcqvf155pzv";
- revision = "3";
- editedCabalFile = "1csz8gzmrrjbjvr6kx4vmyp419i5vbzk84a01vh5zr6ncrpx5nf3";
+ version = "0.3.4.1.22.3";
+ sha256 = "0ln2sz7ffhddk4dqvczpxb5g8f6bic7sandn5zifpz2jg7lgzy0f";
libraryHaskellDepends = [
- base bytestring file-embed-lzma servant servant-server
- servant-swagger-ui-core swagger2 text
+ aeson base bytestring file-embed-lzma servant servant-server
+ servant-swagger-ui-core text
];
description = "Servant swagger ui: ReDoc theme";
license = lib.licenses.bsd3;
@@ -245870,21 +245618,6 @@ self: {
}) {};
"speculate" = callPackage
- ({ mkDerivation, base, cmdargs, containers, express, leancheck }:
- mkDerivation {
- pname = "speculate";
- version = "0.4.2";
- sha256 = "01ahb1g7f19qxf8lz9afxbf2inywrsqkawx784gx3af1wlzj61d9";
- libraryHaskellDepends = [
- base cmdargs containers express leancheck
- ];
- testHaskellDepends = [ base express leancheck ];
- benchmarkHaskellDepends = [ base express leancheck ];
- description = "discovery of properties about Haskell functions";
- license = lib.licenses.bsd3;
- }) {};
-
- "speculate_0_4_4" = callPackage
({ mkDerivation, base, cmdargs, containers, express, leancheck }:
mkDerivation {
pname = "speculate";
@@ -245897,7 +245630,6 @@ self: {
benchmarkHaskellDepends = [ base express leancheck ];
description = "discovery of properties about Haskell functions";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"speculation" = callPackage
@@ -247184,6 +246916,8 @@ self: {
pname = "ssh-known-hosts";
version = "0.2.0.0";
sha256 = "1zhhqam6y5ckh6i145mr0irm17dmlam2k730rpqiyw4mwgmcp4qa";
+ revision = "1";
+ editedCabalFile = "09158vd54ybigqxqcimfnmmv256p4ypazwfly7a5q2pxqgzs6nj0";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -250146,6 +249880,55 @@ self: {
license = lib.licenses.mit;
}) {};
+ "store_0_7_11" = callPackage
+ ({ mkDerivation, array, async, base, base-orphans
+ , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
+ , clock, containers, contravariant, criterion, cryptohash, deepseq
+ , directory, filepath, free, ghc-prim, hashable, hspec
+ , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+ , mono-traversable, nats, network, primitive, resourcet, safe
+ , smallcheck, store-core, syb, template-haskell, text, th-lift
+ , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+ , transformers, unordered-containers, vector
+ , vector-binary-instances, void, weigh
+ }:
+ mkDerivation {
+ pname = "store";
+ version = "0.7.11";
+ sha256 = "03i9gd18xqbfmj5kmiv4k4sw44gn6mn4faj71r2723abm3qwklwr";
+ libraryHaskellDepends = [
+ array async base base-orphans base64-bytestring bifunctors
+ bytestring containers contravariant cryptohash deepseq directory
+ filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+ lifted-base monad-control mono-traversable nats network primitive
+ resourcet safe smallcheck store-core syb template-haskell text
+ th-lift th-lift-instances th-orphans th-reify-many th-utilities
+ time transformers unordered-containers vector void
+ ];
+ testHaskellDepends = [
+ array async base base-orphans base64-bytestring bifunctors
+ bytestring clock containers contravariant cryptohash deepseq
+ directory filepath free ghc-prim hashable hspec hspec-smallcheck
+ integer-gmp lifted-base monad-control mono-traversable nats network
+ primitive resourcet safe smallcheck store-core syb template-haskell
+ text th-lift th-lift-instances th-orphans th-reify-many
+ th-utilities time transformers unordered-containers vector void
+ ];
+ benchmarkHaskellDepends = [
+ array async base base-orphans base64-bytestring bifunctors
+ bytestring cereal cereal-vector containers contravariant criterion
+ cryptohash deepseq directory filepath free ghc-prim hashable hspec
+ hspec-smallcheck integer-gmp lifted-base monad-control
+ mono-traversable nats network primitive resourcet safe smallcheck
+ store-core syb template-haskell text th-lift th-lift-instances
+ th-orphans th-reify-many th-utilities time transformers
+ unordered-containers vector vector-binary-instances void weigh
+ ];
+ description = "Fast binary serialization";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"store-core" = callPackage
({ mkDerivation, base, bytestring, ghc-prim, primitive, text
, transformers
@@ -251304,6 +251087,60 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "strict-containers" = callPackage
+ ({ mkDerivation, array, base, base-orphans, binary, ChasingBottoms
+ , containers, deepseq, hashable, HUnit, indexed-traversable
+ , primitive, QuickCheck, random, strict, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, transformers
+ , unordered-containers, vector, vector-binary-instances
+ }:
+ mkDerivation {
+ pname = "strict-containers";
+ version = "0.1";
+ sha256 = "0rb5mhz1f1g79c7c85q6pnars7qs3qzyl2gsc48p9sd2739q5nzs";
+ libraryHaskellDepends = [
+ array base binary containers deepseq hashable indexed-traversable
+ primitive strict unordered-containers vector
+ vector-binary-instances
+ ];
+ testHaskellDepends = [
+ array base base-orphans ChasingBottoms containers deepseq hashable
+ HUnit primitive QuickCheck random tasty tasty-hunit
+ tasty-quickcheck template-haskell test-framework
+ test-framework-hunit test-framework-quickcheck2 transformers
+ unordered-containers vector
+ ];
+ description = "Strict containers";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "strict-containers-lens" = callPackage
+ ({ mkDerivation, base, hashable, lens, strict-containers }:
+ mkDerivation {
+ pname = "strict-containers-lens";
+ version = "0.1";
+ sha256 = "0162vqkwm9z1pyizvs76fbraw6z43w8j1k7ag25l9lv67gydl4c1";
+ libraryHaskellDepends = [ base hashable lens strict-containers ];
+ description = "Strict containers - Lens instances";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "strict-containers-serialise" = callPackage
+ ({ mkDerivation, base, cborg, hashable, serialise
+ , strict-containers
+ }:
+ mkDerivation {
+ pname = "strict-containers-serialise";
+ version = "0.1";
+ sha256 = "17hsb90awsrgp83nkzjyr51wz7z5v4fii862arqfjkjqm6scb4d3";
+ libraryHaskellDepends = [
+ base cborg hashable serialise strict-containers
+ ];
+ description = "Strict containers - Serialise instances";
+ license = lib.licenses.bsd3;
+ }) {};
+
"strict-data" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, doctest
, exceptions, fail, hashable, HTF, monad-control, mtl, pretty
@@ -254057,8 +253894,8 @@ self: {
}:
mkDerivation {
pname = "sws";
- version = "0.5.0.0";
- sha256 = "04x8jvac8aaifsyll63gwjg2j6y2ap24a92k2dxn8mdbx2i3zjyq";
+ version = "0.5.0.1";
+ sha256 = "1xgyv7mwrf9imx1ja2vwdhj6rv59pz50sf9ijlp5pjckqpacm40p";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -256130,6 +255967,8 @@ self: {
pname = "tagged";
version = "0.8.6.1";
sha256 = "00kcc6lmj7v3xm2r3wzw5jja27m4alcw1wi8yiismd0bbzwzrq7m";
+ revision = "1";
+ editedCabalFile = "1rzqfw2pafxbnfpl1lizf9zldpxyy28g92x4jzq49miw9hr1xpsx";
libraryHaskellDepends = [
base deepseq template-haskell transformers
];
@@ -257186,6 +257025,27 @@ self: {
license = lib.licenses.mit;
}) {};
+ "tasty-checklist" = callPackage
+ ({ mkDerivation, base, exceptions, parameterized-utils, tasty
+ , tasty-expected-failure, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "tasty-checklist";
+ version = "1.0.0.0";
+ sha256 = "1ahy4nmkbqpfw38ny6w85q5whsidk3xyy8m6v6ndik2i8jjh8qr4";
+ libraryHaskellDepends = [
+ base exceptions parameterized-utils text
+ ];
+ testHaskellDepends = [
+ base parameterized-utils tasty tasty-expected-failure tasty-hunit
+ text
+ ];
+ description = "Check multiple items during a tasty test";
+ license = lib.licenses.isc;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"tasty-dejafu" = callPackage
({ mkDerivation, base, dejafu, random, tagged, tasty }:
mkDerivation {
@@ -257769,20 +257629,21 @@ self: {
"tasty-sugar" = callPackage
({ mkDerivation, base, directory, filemanip, filepath, hedgehog
- , logict, optparse-applicative, pretty-show, prettyprinter
- , raw-strings-qq, tagged, tasty, tasty-hedgehog, tasty-hunit
+ , kvitable, logict, microlens, optparse-applicative, pretty-show
+ , prettyprinter, raw-strings-qq, tagged, tasty, tasty-hedgehog
+ , tasty-hunit, text
}:
mkDerivation {
pname = "tasty-sugar";
- version = "1.1.0.0";
- sha256 = "1v1ikl4jy02c0jlvm4di8ndm7fbyr8235ydppp953d7qb8yilsyp";
+ version = "1.1.1.0";
+ sha256 = "1x06s47k2rw7a78djzf0i2zxplbazah5c5mjmnmd9nr5yafw0fqv";
libraryHaskellDepends = [
- base directory filemanip filepath logict optparse-applicative
- prettyprinter tagged tasty
+ base directory filemanip filepath kvitable logict microlens
+ optparse-applicative prettyprinter tagged tasty text
];
testHaskellDepends = [
base filepath hedgehog logict pretty-show prettyprinter
- raw-strings-qq tasty tasty-hedgehog tasty-hunit
+ raw-strings-qq tasty tasty-hedgehog tasty-hunit text
];
doHaddock = false;
description = "Tests defined by Search Using Golden Answer References";
@@ -260021,8 +259882,8 @@ self: {
}:
mkDerivation {
pname = "test-lib";
- version = "0.2.2";
- sha256 = "0bxrh7j10fadarg1kyrf8f0nmrmdfrgivxvv51xl9ykksrswhx2z";
+ version = "0.3";
+ sha256 = "15b3gsy03z3hqc0d2b7hjk3l79ykkcdhb5mrz453p8s4bgd8l6av";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -260546,6 +260407,8 @@ self: {
pname = "text-ansi";
version = "0.1.1";
sha256 = "1vcrsg7v8n6znh1pd9kbm20bc6dg3zijd3xjdjljadf15vfkd5f6";
+ revision = "1";
+ editedCabalFile = "09s363h3lw4p8f73m7vw0d1cqnwmap9ndrfxd4qbzbra5xf58q38";
libraryHaskellDepends = [ base text ];
description = "Text styling for ANSI terminals";
license = lib.licenses.bsd3;
@@ -261061,22 +260924,6 @@ self: {
}) {};
"text-regex-replace" = callPackage
- ({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck
- , text, text-icu
- }:
- mkDerivation {
- pname = "text-regex-replace";
- version = "0.1.1.3";
- sha256 = "0i0ifjxd24kfiljk3l0slxc8345d0rdb92ixxdzn04brs2fs5h53";
- libraryHaskellDepends = [ attoparsec base text text-icu ];
- testHaskellDepends = [
- base hspec QuickCheck smallcheck text text-icu
- ];
- description = "Easy replacement when using text-icu regexes";
- license = lib.licenses.asl20;
- }) {};
-
- "text-regex-replace_0_1_1_4" = callPackage
({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck
, text, text-icu
}:
@@ -261090,7 +260937,6 @@ self: {
];
description = "Easy replacement when using text-icu regexes";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"text-region" = callPackage
@@ -262214,29 +262060,6 @@ self: {
}) {};
"th-utilities" = callPackage
- ({ mkDerivation, base, bytestring, containers, directory, filepath
- , hspec, primitive, syb, template-haskell, text, th-abstraction
- , th-orphans, vector
- }:
- mkDerivation {
- pname = "th-utilities";
- version = "0.2.4.2";
- sha256 = "09rbs878gjhyg8n789p2c67lzxr4h1pg0zar47a7j8sg6ff5wcx2";
- revision = "1";
- editedCabalFile = "177hbrwcyalm6gbqq96b5xz974bxzch9g2mvffvksi1205z6v7dr";
- libraryHaskellDepends = [
- base bytestring containers directory filepath primitive syb
- template-haskell text th-abstraction th-orphans
- ];
- testHaskellDepends = [
- base bytestring containers directory filepath hspec primitive syb
- template-haskell text th-abstraction th-orphans vector
- ];
- description = "Collection of useful functions for use with Template Haskell";
- license = lib.licenses.mit;
- }) {};
-
- "th-utilities_0_2_4_3" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, hspec, primitive, syb, template-haskell, text, th-abstraction
, th-orphans, vector
@@ -262255,7 +262078,6 @@ self: {
];
description = "Collection of useful functions for use with Template Haskell";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"thank-you-stars" = callPackage
@@ -263154,16 +262976,16 @@ self: {
"tidal" = callPackage
({ mkDerivation, base, bifunctors, bytestring, clock, colour
, containers, criterion, deepseq, hosc, microspec, network, parsec
- , primitive, random, text, transformers, vector, weigh
+ , primitive, random, text, transformers, weigh
}:
mkDerivation {
pname = "tidal";
- version = "1.7.2";
- sha256 = "15shxaazxik1bawgak16xhlvk708kv9al6i3518b3m3iap9sbw9p";
+ version = "1.7.3";
+ sha256 = "0z0brlicisn7xpwag20vdrq6ympczxcyd886pm6am5phmifkmfif";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bifunctors bytestring clock colour containers deepseq hosc
- network parsec primitive random text transformers vector
+ network parsec primitive random text transformers
];
testHaskellDepends = [
base containers deepseq hosc microspec parsec
@@ -263173,15 +262995,15 @@ self: {
license = lib.licenses.gpl3Only;
}) {};
- "tidal_1_7_3" = callPackage
+ "tidal_1_7_4" = callPackage
({ mkDerivation, base, bifunctors, bytestring, clock, colour
, containers, criterion, deepseq, hosc, microspec, network, parsec
, primitive, random, text, transformers, weigh
}:
mkDerivation {
pname = "tidal";
- version = "1.7.3";
- sha256 = "0z0brlicisn7xpwag20vdrq6ympczxcyd886pm6am5phmifkmfif";
+ version = "1.7.4";
+ sha256 = "080zncw6gp0dzwm9vd82c789v1x00nfzz8r1ldb4hl67v04jf8hi";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bifunctors bytestring clock colour containers deepseq hosc
@@ -264023,6 +263845,8 @@ self: {
pname = "timer-wheel";
version = "0.3.0";
sha256 = "16v663mcsj0h17x4jriq50dps3m3f8wqcsm19kl48vrs7f4mp07s";
+ revision = "1";
+ editedCabalFile = "03wprm88wl6smfcq6dfr62l4igi8lfg6wkk65rsmyzxxkjzhc6f1";
libraryHaskellDepends = [ atomic-primops base psqueues vector ];
testHaskellDepends = [ base ];
description = "A timer wheel";
@@ -272011,6 +271835,30 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "unicode-collation" = callPackage
+ ({ mkDerivation, base, binary, bytestring, bytestring-lexing
+ , containers, filepath, parsec, QuickCheck, quickcheck-instances
+ , tasty, tasty-bench, tasty-hunit, template-haskell, text, text-icu
+ , th-lift-instances, unicode-transforms
+ }:
+ mkDerivation {
+ pname = "unicode-collation";
+ version = "0.1.2";
+ sha256 = "1q77rd3d2c1r5d35f0z1mhismc3rf8bg1dwfg32wvdd9hpszc52v";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring bytestring-lexing containers filepath parsec
+ template-haskell text th-lift-instances unicode-transforms
+ ];
+ testHaskellDepends = [ base bytestring tasty tasty-hunit text ];
+ benchmarkHaskellDepends = [
+ base QuickCheck quickcheck-instances tasty-bench text text-icu
+ ];
+ description = "Haskell implementation of the Unicode Collation Algorithm";
+ license = lib.licenses.bsd2;
+ }) {};
+
"unicode-general-category" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, file-embed, hspec, QuickCheck, text
@@ -272116,6 +271964,8 @@ self: {
pname = "unicode-transforms";
version = "0.3.7.1";
sha256 = "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f";
+ revision = "1";
+ editedCabalFile = "01kf1hanqcwc7vpkwq2rw5v2mn4nxx58l3v5hpk166jalmwqijaz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ghc-prim text ];
@@ -273142,6 +272992,19 @@ self: {
license = "GPL";
}) {};
+ "unlift" = callPackage
+ ({ mkDerivation, base, stm, transformers, transformers-base }:
+ mkDerivation {
+ pname = "unlift";
+ version = "0.0.0.0";
+ sha256 = "0xqn4252ncygmapfciwf6g2nzbavp8dmh4vds985nc0lq78wi7nj";
+ libraryHaskellDepends = [
+ base stm transformers transformers-base
+ ];
+ description = "Typeclass for monads that can be unlifted to arbitrary base monads";
+ license = lib.licenses.mpl20;
+ }) {};
+
"unlift-stm" = callPackage
({ mkDerivation, base, stm, transformers, unliftio, unliftio-core
}:
@@ -276323,24 +276186,6 @@ self: {
}) {};
"vector" = callPackage
- ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
- , primitive, QuickCheck, random, tasty, tasty-hunit
- , tasty-quickcheck, template-haskell, transformers
- }:
- mkDerivation {
- pname = "vector";
- version = "0.12.2.0";
- sha256 = "0l3bs8zvw1da9gzqkmavj9vrcxv8hdv9zfw1yqzk6nbqr220paqp";
- libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
- testHaskellDepends = [
- base base-orphans HUnit primitive QuickCheck random tasty
- tasty-hunit tasty-quickcheck template-haskell transformers
- ];
- description = "Efficient Arrays";
- license = lib.licenses.bsd3;
- }) {};
-
- "vector_0_12_3_0" = callPackage
({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
, primitive, QuickCheck, random, tasty, tasty-hunit
, tasty-quickcheck, template-haskell, transformers
@@ -276356,7 +276201,6 @@ self: {
];
description = "Efficient Arrays";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"vector-algorithms" = callPackage
@@ -276390,25 +276234,6 @@ self: {
}) {};
"vector-binary-instances" = callPackage
- ({ mkDerivation, base, binary, bytestring, deepseq, gauge, tasty
- , tasty-quickcheck, vector
- }:
- mkDerivation {
- pname = "vector-binary-instances";
- version = "0.2.5.1";
- sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r";
- revision = "2";
- editedCabalFile = "0ia9i7q7jrk3ab3nq2368glr69vl6fwvh42zlwvdmxn4xd861qfx";
- libraryHaskellDepends = [ base binary vector ];
- testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
- benchmarkHaskellDepends = [
- base binary bytestring deepseq gauge vector
- ];
- description = "Instances of Data.Binary for vector";
- license = lib.licenses.bsd3;
- }) {};
-
- "vector-binary-instances_0_2_5_2" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, tasty
, tasty-bench, tasty-quickcheck, vector
}:
@@ -276423,7 +276248,6 @@ self: {
];
description = "Instances of Data.Binary for vector";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"vector-buffer" = callPackage
@@ -280196,8 +280020,8 @@ self: {
}:
mkDerivation {
pname = "wai-session-redis";
- version = "0.1.0.0";
- sha256 = "12l2r85xq8ryv6y660c20yfxa19n3rvkilmkb74bj1ch7jmm8d6n";
+ version = "0.1.0.1";
+ sha256 = "14n5996y8fpq19jfn5ahfliq4gk2ydi5l8zcq8agqqpg875hzzcw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -281058,8 +280882,8 @@ self: {
}:
mkDerivation {
pname = "web-inv-route";
- version = "0.1.2.3";
- sha256 = "1xk6f3z7pcn5bmr2259yvv9l9wbfyycb7990dffz4b802ahxf1xv";
+ version = "0.1.3.1";
+ sha256 = "1l10rgrhcqld8znw6akxjlsm1h8z76l9yxa4yik11lk2l0g9anb2";
libraryHaskellDepends = [
base bytestring case-insensitive containers happstack-server
hashable http-types invertible network-uri snap-core text
@@ -282664,6 +282488,19 @@ self: {
broken = true;
}) {};
+ "wide-word-instances" = callPackage
+ ({ mkDerivation, base, binary, serialise, wide-word }:
+ mkDerivation {
+ pname = "wide-word-instances";
+ version = "0.1";
+ sha256 = "0v4isbpq1b76j755dh412zdgm6njgk6n86kzxd8q5idknk38cj4b";
+ libraryHaskellDepends = [ base binary serialise wide-word ];
+ description = "Instances for wide-word";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"wigner-symbols" = callPackage
({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
, random, vector
@@ -282810,6 +282647,30 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "willow" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, filepath, hashable
+ , hedgehog, hedgehog-classes, HUnit, mtl, text, transformers
+ , unordered-containers, utility-ht, vector
+ }:
+ mkDerivation {
+ pname = "willow";
+ version = "0.1.0.0";
+ sha256 = "1p47k0dsri76z6vpg59la3jm0smvmbh3qz0i0k0kz8ilc2sa65kn";
+ revision = "1";
+ editedCabalFile = "0lybbskp6y4679qqbmz02w173mvhfry3gzj9cgfvq6dqccmfdndl";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring filepath hashable mtl text transformers
+ unordered-containers utility-ht vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring filepath hedgehog hedgehog-classes HUnit text
+ transformers unordered-containers
+ ];
+ description = "An implementation of the web Document Object Model, and its rendering";
+ license = lib.licenses.mpl20;
+ }) {};
+
"wilton-ffi" = callPackage
({ mkDerivation, aeson, base, bytestring, utf8-string }:
mkDerivation {
@@ -283032,6 +282893,23 @@ self: {
license = lib.licenses.isc;
}) {};
+ "witch_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, hspec
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "witch";
+ version = "0.2.0.0";
+ sha256 = "03rnpljng4vy913zm3cxnhlq3i8d5p57661wa1cwj46hkhy7rhj7";
+ libraryHaskellDepends = [
+ base bytestring containers template-haskell text
+ ];
+ testHaskellDepends = [ base bytestring containers hspec text ];
+ description = "Convert values from one type into another";
+ license = lib.licenses.isc;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"with-index" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -284614,8 +284492,6 @@ self: {
];
description = "Tunneling program over websocket protocol";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"wtk" = callPackage
@@ -289231,30 +289107,6 @@ self: {
}) {};
"yesod-auth-oauth2" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cryptonite, errors
- , hoauth2, hspec, http-client, http-conduit, http-types, memory
- , microlens, safe-exceptions, text, uri-bytestring, yesod-auth
- , yesod-core
- }:
- mkDerivation {
- pname = "yesod-auth-oauth2";
- version = "0.6.2.3";
- sha256 = "1vf4cfbqg4zx3rdihj1iajk6kmj9c8xk4s4n2n40yvz2rmbjy0yb";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring cryptonite errors hoauth2 http-client
- http-conduit http-types memory microlens safe-exceptions text
- uri-bytestring yesod-auth yesod-core
- ];
- testHaskellDepends = [ base hspec uri-bytestring ];
- description = "OAuth 2.0 authentication plugins";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "yesod-auth-oauth2_0_6_3_0" = callPackage
({ mkDerivation, aeson, base, bytestring, cryptonite, errors
, hoauth2, hspec, http-client, http-conduit, http-types, memory
, microlens, mtl, safe-exceptions, text, unliftio, uri-bytestring
@@ -289462,43 +289314,6 @@ self: {
}) {};
"yesod-core" = callPackage
- ({ mkDerivation, aeson, async, auto-update, base, blaze-html
- , blaze-markup, bytestring, case-insensitive, cereal, clientsession
- , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
- , gauge, hspec, hspec-expectations, http-types, HUnit, memory
- , monad-logger, mtl, network, parsec, path-pieces, primitive
- , random, resourcet, shakespeare, streaming-commons
- , template-haskell, text, time, transformers, unix-compat, unliftio
- , unordered-containers, vector, wai, wai-extra, wai-logger, warp
- , word8
- }:
- mkDerivation {
- pname = "yesod-core";
- version = "1.6.18.8";
- sha256 = "1phqb74z5nqnx1xnbhnpimcdcrzm5dd474svzc5hp0ji3kp2xkri";
- libraryHaskellDepends = [
- aeson auto-update base blaze-html blaze-markup bytestring
- case-insensitive cereal clientsession conduit conduit-extra
- containers cookie deepseq fast-logger http-types memory
- monad-logger mtl parsec path-pieces primitive random resourcet
- shakespeare template-haskell text time transformers unix-compat
- unliftio unordered-containers vector wai wai-extra wai-logger warp
- word8
- ];
- testHaskellDepends = [
- async base bytestring clientsession conduit conduit-extra
- containers cookie hspec hspec-expectations http-types HUnit network
- path-pieces random resourcet shakespeare streaming-commons
- template-haskell text transformers unliftio wai wai-extra warp
- ];
- benchmarkHaskellDepends = [
- base blaze-html bytestring gauge shakespeare text
- ];
- description = "Creation of type-safe, RESTful web applications";
- license = lib.licenses.mit;
- }) {};
-
- "yesod-core_1_6_19_0" = callPackage
({ mkDerivation, aeson, async, auto-update, base, blaze-html
, blaze-markup, bytestring, case-insensitive, cereal, clientsession
, conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -289533,7 +289348,6 @@ self: {
];
description = "Creation of type-safe, RESTful web applications";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"yesod-crud" = callPackage
@@ -290176,32 +289990,6 @@ self: {
}) {};
"yesod-page-cursor" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, hspec
- , hspec-expectations-lifted, http-link-header, http-types, lens
- , lens-aeson, monad-logger, mtl, network-uri, persistent
- , persistent-sqlite, persistent-template, scientific, text, time
- , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test
- }:
- mkDerivation {
- pname = "yesod-page-cursor";
- version = "2.0.0.5";
- sha256 = "0jz5dhmvfggbyjkcxs7v4pc4jpcd759jfv77avzwr64xx2glk1yw";
- libraryHaskellDepends = [
- aeson base bytestring containers http-link-header network-uri text
- unliftio yesod-core
- ];
- testHaskellDepends = [
- aeson base bytestring hspec hspec-expectations-lifted
- http-link-header http-types lens lens-aeson monad-logger mtl
- persistent persistent-sqlite persistent-template scientific text
- time unliftio unliftio-core wai-extra yesod yesod-core yesod-test
- ];
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "yesod-page-cursor_2_0_0_6" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hspec
, hspec-expectations-lifted, http-link-header, http-types, lens
, lens-aeson, monad-logger, mtl, network-uri, persistent
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
index 8fee25b104..774bcbe11b 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
@@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
pname = "babashka";
- version = "0.3.1";
+ version = "0.3.5";
reflectionJson = fetchurl {
name = "reflection.json";
- url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
- sha256 = "0ar2ry07axgrmdb6nsc0786v1a1nwlyvapgxncaaympvn38qk8qf";
+ url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
+ sha256 = "sha256-TVFdGFXclJE9GpolKzTGSmeianBdb2Yp3kbNUWlddPw=";
};
src = fetchurl {
- url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
- sha256 = "1fapkyq7fcgydy8sls6jzxagfkhgxhwp1rdvjqxdmqk4d82jwrh2";
+ url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
+ sha256 = "sha256-tOLT5W5kK38fb9XL9jOQpw0LjHPjbn+BarckbCuwQAc=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix
index 85df0b4335..8210bdb442 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ace";
- version = "6.5.11";
+ version = "7.0.1";
src = fetchurl {
- url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
- sha256 = "0fbbysy6aymys30zh5m2bygs84dwwjnbsdl9ipj1rvfrhq8jbylb";
+ url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
+ sha256 = "sha256-5nH5a0tBOcGfA07eeh9EjH0vgT3gTRWYHXoeO+QFQjQ=";
};
enableParallelBuilding = true;
@@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
"-Wno-error=format-security"
];
- patchPhase = ''substituteInPlace ./MPC/prj_install.pl \
- --replace /usr/bin/perl "${perl}/bin/perl"'';
+ postPatch = ''
+ patchShebangs ./MPC/prj_install.pl
+ '';
preConfigure = ''
export INSTALL_PREFIX=$out
@@ -31,10 +32,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
+ homepage = "https://www.dre.vanderbilt.edu/~schmidt/ACE.html";
description = "ADAPTIVE Communication Environment";
- homepage = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html";
license = licenses.doc;
+ maintainers = with maintainers; [ nico202 ];
platforms = platforms.linux;
- maintainers = [ maintainers.nico202 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix
index 1aca24ac8e..3121edccfe 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix
@@ -1,14 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub, standard-library }:
mkDerivation rec {
- version = "0.1.5";
+ version = "0.1.6";
pname = "agda-categories";
src = fetchFromGitHub {
owner = "agda";
repo = "agda-categories";
rev = "v${version}";
- sha256 = "1b5gj0r2z5fhh7k8b9s2kx4rjv8gi5y8ijgrbcvsa06n3acap3lm";
+ sha256 = "1s75yqcjwj13s1m3fg29krnn05lws6143ccfdygc6c4iynvvznsh";
};
buildInputs = [ standard-library ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index 15603f293b..1e5c0ae28d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, lib, mkDerivation, standard-library }:
mkDerivation rec {
- version = "0.2";
+ version = "0.3";
pname = "functional-linear-algebra";
buildInputs = [ standard-library ];
@@ -10,7 +10,7 @@ mkDerivation rec {
repo = "functional-linear-algebra";
owner = "ryanorendorff";
rev = "v${version}";
- sha256 = "1dz7kh92df23scl1pkhn70n1f2v3d0x84liphn9kpsd6wlsxccxc";
+ sha256 = "032gl35x1qzaigc3hbg9dc40zr0nyjld175cb9m8b15rlz9xzjn2";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
index fd20a0d9a9..b77c904483 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "standard-library";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
repo = "agda-stdlib";
owner = "agda";
rev = "v${version}";
- sha256 = "16fcb7ssj6kj687a042afaa2gq48rc8abihpm14k684ncihb2k4w";
+ sha256 = "1smvnid7r1mc4lp34pfrbzgzrcl0gmw0dlkga8z0r3g2zhj98lz1";
};
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix
index cdcf4b7b8a..cbfec4dd46 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
- version = "1.7.16";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
- sha256 = "1vmhwjhppjv8m0ysk2qz0wl47cbl8i40bjjq5l4jmmp1ysvlbknf";
+ sha256 = "sha256-c4SN3kNY8415+O/2AYuHNQFEmuTBtLaWj5fsj0yJ2vs=";
};
outputs = [ "bin" "dev" "out" "lib" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/eigen/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
index a2b1ba47e2..a163359463 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/eigen/2.0.nix
@@ -6,19 +6,18 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
owner = "libeigen";
- repo = "eigen";
+ repo = pname;
rev = version;
- sha256 = "0d4knrcz04pxmxaqs5r3wv092950kl1z9wsw87vdzi9kgvc6wl0b";
+ hash = "sha256-C1Bu2H4zxd/2QVzz9AOdoCSRwOYjF41Vr/0S8Fm2kzQ=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
+ homepage = "https://eigen.tuxfamily.org";
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
- homepage = "https://eigen.tuxfamily.org";
- maintainers = with lib.maintainers; [ sander raskin ];
- branch = "2";
- platforms = with lib.platforms; unix;
+ maintainers = with maintainers; [ sander raskin ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix
index 079269521c..a16cb62800 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchFromGitLab, cmake }:
+{ lib
+, stdenv
+, fetchFromGitLab
+, cmake
+}:
stdenv.mkDerivation rec {
pname = "eigen";
@@ -6,9 +10,9 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
owner = "libeigen";
- repo = "eigen";
+ repo = pname;
rev = version;
- sha256 = "1i3cvg8d70dk99fl3lrv3wqhfpdnm5kx01fl7r2bz46sk9bphwm1";
+ hash = "sha256-oXJ4V5rakL9EPtQF0Geptl0HMR8700FdSrOB09DbbMQ=";
};
patches = [
@@ -18,11 +22,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
meta = with lib; {
+ homepage = "https://eigen.tuxfamily.org";
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
- homepage = "https://eigen.tuxfamily.org";
+ maintainers = with maintainers; [ sander raskin ];
platforms = platforms.unix;
- maintainers = with lib.maintainers; [ sander raskin ];
- inherit version;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix
index 5714131416..b50783e271 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation {
preInstall = ''
mkdir -p $INCDIR $INSTALLDIR
+ ''
+ # Workaround for Makefiles.osx not using ?=
+ + lib.optionalString stdenv.isDarwin ''
+ makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" )
'';
postInstall = lib.optionalString (!stdenv.isDarwin) ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
index fa100f3460..651a42da0b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "21.1.1";
+ version = "21.1.2";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
- sha256 = "0cdyrfyn05fadva8k02kp4nk14k274xfmhzwc0v7jijm1dw8v8rf";
+ sha256 = "0zs8l0q1q7xps3kxlch6jddxjiny8n8avdg1ghiwbkvgf76gb3as";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix
index fac8a40bb2..2df3e554c9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "jasper";
- version = "2.0.28";
+ version = "2.0.32";
src = fetchFromGitHub {
owner = "jasper-software";
repo = pname;
rev = "version-${version}";
- hash = "sha256-f3UG5w8GbwZcsFBaQN6v8kdEkKIGgizcAgaVZtKwS78=";
+ hash = "sha256-Uwgtex0MWC/pOmEr8itHMIa4wxd97c/tsTzcLgV8D0I=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
index 2cd634325b..2254c82415 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libnbd";
- version = "1.7.5";
+ version = "1.7.7";
src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
- sha256 = "sha256-UxQx/wnKnCB3uC9xEfq1F0l3kHAJjp9GzbeRugKyFsk=";
+ hash = "sha256-fNeu1qx+EbKitv2I8nJAmGMF5jxN2RZGPR/LJYnOjG8=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
index d4d69ed6af..8ffe8f488b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/raspberrypi/userland";
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" "x86_64-linux" ];
- maintainers = with maintainers; [ dezgeg tavyc tkerber ];
+ maintainers = with maintainers; [ dezgeg tkerber ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix
index 10554cb528..ddd7c7b207 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn";
};
+ patches = [
+ # Fix build on 32-bit ARM
+ (fetchpatch {
+ url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch";
+ sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd";
+ })
+ ];
+
separateDebugInfo = true;
enableParallelBuilding = true;
# Upstream's configure script is not autoconf generated, but a hand written one.
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix
index f78cd09c0a..d4f6391fe6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
let
- version = "5.1.2";
+ version = "5.1.3";
in stdenv.mkDerivation {
pname = "libxc";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
owner = "libxc";
repo = "libxc";
rev = version;
- sha256 = "1bcj7x0kaal62m41v9hxb4h1d2cxs2ynvsfqqg7c5yi7829nvapb";
+ sha256 = "14czspifznsmvvix5hcm1rk18iy590qk8p5m00p0y032gmn9i2zj";
};
buildInputs = [ gfortran ];
@@ -28,7 +28,6 @@ in stdenv.mkDerivation {
'';
doCheck = true;
- enableParallelBuilding = true;
meta = with lib; {
description = "Library of exchange-correlation functionals for density-functional theory";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix
new file mode 100644
index 0000000000..849ebcf3c8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, minizip
+, python3
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libxlsxwriter";
+ version = "1.0.3";
+
+ src = fetchFromGitHub {
+ owner = "jmcnamara";
+ repo = "libxlsxwriter";
+ rev = "RELEASE_${version}";
+ sha256 = "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv";
+ };
+
+ nativeBuildInputs = [
+ python3.pkgs.pytest
+ ];
+
+ buildInputs = [
+ minizip
+ zlib
+ ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ "USE_SYSTEM_MINIZIP=1"
+ ];
+
+ doCheck = true;
+
+ checkTarget = "test";
+
+ meta = with lib; {
+ description = "C library for creating Excel XLSX files";
+ homepage = "https://libxlsxwriter.github.io/";
+ changelog = "https://github.com/jmcnamara/libxlsxwriter/blob/${src.rev}/Changes.txt";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ dotlambda ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix
index 953eee3b8b..872327ed4b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix
@@ -1,8 +1,64 @@
-{ lib, fetchzip }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, python
+, cmake
+}:
-fetchzip {
- url = "https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz";
- sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6";
+let
+ pyEnv = python.withPackages (ps: [ ps.setuptools ]);
+in
+stdenv.mkDerivation rec {
+ pname = "lief";
+ version = "0.11.4";
+
+ src = fetchFromGitHub {
+ owner = "lief-project";
+ repo = "LIEF";
+ rev = version;
+ sha256 = "DgsTrJ2+zdXJK6CdDOan7roakaaxQiwrVeiQnzJnk0A=";
+ };
+
+ outputs = [ "out" "py" ];
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ # Not a propagatedBuildInput because only the $py output needs it; $out is
+ # just the library itself (e.g. C/C++ headers).
+ buildInputs = [
+ python
+ ];
+
+ dontUseCmakeConfigure = true;
+
+ buildPhase = ''
+ runHook preBuild
+
+ substituteInPlace setup.py \
+ --replace 'cmake_args = []' "cmake_args = [ \"-DCMAKE_INSTALL_PREFIX=$prefix\" ]"
+ ${pyEnv.interpreter} setup.py --sdk build --parallel=$NIX_BUILD_CORES
+
+ runHook postBuild
+ '';
+
+ # I was unable to find a way to build the library itself and have it install
+ # to $out, while also installing the Python bindings to $py without building
+ # the project twice (using cmake), so this is the best we've got. It uses
+ # something called CPack to create the tarball, but it's not obvious to me
+ # *how* that happens, or how to intercept it to just get the structured
+ # library output.
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out $py/nix-support
+ echo "${python}" >> $py/nix-support/propagated-build-inputs
+ tar xf build/*.tar.gz --directory $out --strip-components 1
+ ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py
+
+ runHook postInstall
+ '';
meta = with lib; {
description = "Library to Instrument Executable Formats";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
index 9b1d320678..2d037afbe2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "lmdbxx";
- version = "0.9.14.0";
+ version = "1.0.0";
src = fetchFromGitHub {
- owner = "drycpp";
+ owner = "hoytech";
repo = "lmdbxx";
rev = version;
- sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6";
+ sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo=";
};
buildInputs = [ lmdb ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
index 761026440f..05950bc686 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mtxclient";
- version = "0.4.1";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "mtxclient";
rev = "v${version}";
- sha256 = "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n";
+ sha256 = "sha256-UKroV1p7jYuNzCAFMsuUsYC/C9AZ1D4rhwpwuER39vc=";
};
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
index 59c1f0ef7d..f2a9833d77 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "opencascade-occt";
- version = "7.5.0";
+ version = "7.5.1";
commit = "V${builtins.replaceStrings ["."] ["_"] version}";
src = fetchurl {
name = "occt-${commit}.tar.gz";
url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
- sha256 = "0bpzpaqki3k6i7xmhan0f1c1fr05smpcmgrp4vh572j61lwpq1r3";
+ sha256 = "sha256-1whKU+7AMVYabfs15x8MabohKonn5oM54ZEtxF93wAo=";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix
index de62bde187..4b80b7ba5a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix
@@ -6,15 +6,15 @@
stdenv.mkDerivation rec {
pname = "libupnp";
- version = "1.14.4";
+ version = "1.14.6";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
- owner = "mrjimenez";
+ owner = "pupnp";
repo = "pupnp";
rev = "release-${version}";
- sha256 = "sha256-4VuTbcEjr9Ffrowb3eOtXFU8zPNu1NXS531EOZpI07A=";
+ sha256 = "1f9861q5dicp6rx3jnp1j788xfjfaf3k4620p9r0b0k0lj2gk38c";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
index 52a0877e77..1211892890 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake }:
stdenv.mkDerivation rec {
pname = "rapidjson";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
};
+ patches = [
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch";
+ sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82";
+ })
+ ];
+
nativeBuildInputs = [ pkg-config cmake ];
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
index 9097d5abe5..44da759409 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
@@ -4,13 +4,13 @@ assert readline != null -> ncurses != null;
stdenv.mkDerivation rec {
pname = "sqlcipher";
- version = "4.4.2";
+ version = "4.4.3";
src = fetchFromGitHub {
owner = "sqlcipher";
repo = "sqlcipher";
rev = "v${version}";
- sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na";
+ sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix
new file mode 100644
index 0000000000..ffe5e4bbb8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, cmake, sqlite, cppcheck, gtest }:
+
+stdenv.mkDerivation rec {
+ pname = "SQLiteCpp";
+ version = "3.1.1";
+
+ src = fetchFromGitHub {
+ owner = "SRombauts";
+ repo = pname;
+ rev = version;
+ sha256 = "1c2yyipiqswi5sf9xmpsgw6l1illzmcpkjm56agk6kl2hay23lgr";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ checkInputs = [ cppcheck gtest ];
+ buildInputs = [ sqlite ];
+ doCheck = true;
+
+ cmakeFlags = [
+ "-DSQLITECPP_INTERNAL_SQLITE=OFF"
+ "-DSQLITECPP_BUILD_TESTS=ON"
+ ];
+
+ meta = with lib; {
+ homepage = "http://srombauts.github.com/SQLiteCpp";
+ description = "C++ SQLite3 wrapper";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.jbedo maintainers.doronbehar ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix b/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix
new file mode 100644
index 0000000000..17b4e2fb3f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, lib, fetchgit, buildGoModule, zlib, makeWrapper, xcodeenv, androidenv
+, xcodeWrapperArgs ? { }
+, xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs
+, androidPkgs ? androidenv.composeAndroidPackages {
+ includeNDK = true;
+ ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken.
+ } }:
+
+buildGoModule {
+ pname = "gomobile";
+ version = "unstable-2020-06-22";
+
+ vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94";
+
+ src = fetchgit {
+ # WARNING: Next commit removes support for ARM 32 bit builds for iOS
+ rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5";
+ name = "gomobile";
+ url = "https://go.googlesource.com/mobile";
+ sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm";
+ };
+
+ subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ];
+
+ # Fails with: go: cannot find GOROOT directory
+ doCheck = false;
+
+ patches = [ ./resolve-nix-android-sdk.patch ];
+
+ nativeBuildInputs = [ makeWrapper ]
+ ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ];
+
+ # Prevent a non-deterministic temporary directory from polluting the resulting object files
+ postPatch = ''
+ substituteInPlace cmd/gomobile/env.go --replace \
+ 'tmpdir, err = ioutil.TempDir("", "gomobile-work-")' \
+ 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")' \
+ --replace '"io/ioutil"' ""
+ substituteInPlace cmd/gomobile/init.go --replace \
+ 'tmpdir, err = ioutil.TempDir(gomobilepath, "work-")' \
+ 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "work")'
+ '';
+
+ # Necessary for GOPATH when using gomobile.
+ postInstall = ''
+ mkdir -p $out/src/golang.org/x
+ ln -s $src $out/src/golang.org/x/mobile
+ wrapProgram $out/bin/gomobile \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
+ --prefix PATH : "${androidPkgs.androidsdk}/bin" \
+ --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \
+ --set GOPATH $out
+ '';
+
+ meta = with lib; {
+ description = "A tool for building and running mobile apps written in Go";
+ homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ jakubgs ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch b/third_party/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch
new file mode 100644
index 0000000000..cc143e3a44
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch
@@ -0,0 +1,15 @@
+diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go
+index 3b01adc..76216fa 100644
+--- a/cmd/gomobile/bind_androidapp.go
++++ b/cmd/gomobile/bind_androidapp.go
+@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) {
+ var apiVer int
+ for _, fi := range fis {
+ name := fi.Name()
++ // Resolve symlinked directories (this is how the Nix Android SDK package is built)
++ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil {
++ fi = fi2
++ }
+ if !fi.IsDir() || !strings.HasPrefix(name, "android-") {
+ continue
+ }
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
index 8d00e3595f..ff9b4747e6 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
@@ -285,6 +285,9 @@ let
libsecret
self.node-gyp-build
self.node-pre-gyp
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.AppKit
+ darwin.apple_sdk.frameworks.Security
];
};
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index eec6f447dc..2eda6d5f55 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config
+{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, bigarray-compat, pkg-config
, withFreestanding ? false
, ocaml-freestanding
}:
@@ -7,11 +7,11 @@ buildDunePackage rec {
minimumOCamlVersion = "4.08";
pname = "mirage-crypto";
- version = "0.9.2";
+ version = "0.10.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
- sha256 = "da200c0afdbe63474ab19f2bc616e26c10b0e4fbb53fb97fefb2794212f5d442";
+ sha256 = "20915c53ddb658c53f588c414f13676bc8ad3cd734d9ed909225ea080dd8144d";
};
useDune2 = true;
@@ -21,7 +21,7 @@ buildDunePackage rec {
nativeBuildInputs = [ dune-configurator pkg-config ];
propagatedBuildInputs = [
- cstruct eqaf
+ cstruct eqaf bigarray-compat
] ++ lib.optionals withFreestanding [
ocaml-freestanding
];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/2.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/2.nix
index 927acc1819..6db40dd9c7 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/2.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/2.nix
@@ -4,12 +4,11 @@
, buildDunePackage
, ocaml
, gen
-, ppx_tools_versioned
-, ocaml-migrate-parsetree
+, ppxlib
, uchar
}:
-if lib.versionOlder ocaml.version "4.02.3"
+if lib.versionOlder ocaml.version "4.08"
then throw "sedlex is not available for OCaml ${ocaml.version}"
else
@@ -32,7 +31,7 @@ let
in
buildDunePackage rec {
pname = "sedlex";
- version = "2.2";
+ version = "2.3";
useDune2 = true;
@@ -40,11 +39,11 @@ buildDunePackage rec {
owner = "ocaml-community";
repo = "sedlex";
rev = "v${version}";
- sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3";
+ sha256 = "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar";
};
propagatedBuildInputs = [
- gen uchar ocaml-migrate-parsetree ppx_tools_versioned
+ gen uchar ppxlib
];
preBuild = ''
@@ -60,6 +59,7 @@ buildDunePackage rec {
meta = {
homepage = "https://github.com/ocaml-community/sedlex";
+ changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES";
description = "An OCaml lexer generator for Unicode";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.marsam ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
index a34fa36734..f7194f8dd2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.0.6281";
+ version = "9.0.6852";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-IFUGtTO+DY8FIxLgvmwM/y/RQr42T9sABPpnJMILkqg=";
+ sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo=";
};
propagatedBuildInputs = [ pyvex ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
index ba0b3b68be..588e647647 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
@@ -18,7 +18,6 @@
, protobuf
, psutil
, pycparser
-, pkgs
, pythonOlder
, pyvex
, sqlalchemy
@@ -43,14 +42,14 @@ in
buildPythonPackage rec {
pname = "angr";
- version = "9.0.6281";
+ version = "9.0.6852";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "10i4qdk8f342gzxiwy0pjdc35lc4q5ab7l5q420ca61cgdvxkk4r";
+ sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8=";
};
propagatedBuildInputs = [
@@ -82,7 +81,9 @@ buildPythonPackage rec {
# Tests have additional requirements, e.g., pypcode and angr binaries
# cle is executing the tests with the angr binaries
doCheck = false;
- pythonImportsCheck = [ "angr" ];
+
+ # See http://angr.io/api-doc/
+ pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ];
meta = with lib; {
description = "Powerful and user-friendly binary analysis platform";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix
new file mode 100644
index 0000000000..1237ed6fa4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, angr
+, buildPythonPackage
+, fetchFromGitHub
+, progressbar
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "angrop";
+ version = "9.0.6852";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "angr";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo=";
+ };
+
+ propagatedBuildInputs = [
+ angr
+ progressbar
+ ];
+
+ # Tests have additional requirements, e.g., angr binaries
+ # cle is executing the tests with the angr binaries already and is a requirement of angr
+ doCheck = false;
+ pythonImportsCheck = [ "angrop" ];
+
+ meta = with lib; {
+ description = "ROP gadget finder and chain builder";
+ homepage = "https://github.com/angr/angrop";
+ license = with licenses; [ bsd2 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
index ec1db2e33d..7802df99eb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.0.6281";
+ version = "9.0.6852";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZO2P53RdR3cYhDbtrdGJnadFZgKkBdDi5gR/CB7YTpI=";
+ sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo=";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/banal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/banal/default.nix
new file mode 100644
index 0000000000..793de7d3a7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/banal/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+}:
+buildPythonPackage rec {
+ pname = "banal";
+ version = "1.0.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2fe02c9305f53168441948f4a03dfbfa2eacc73db30db4a93309083cb0e250a5";
+ };
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "banal"
+ ];
+
+ meta = with lib; {
+ description = "Commons of banal micro-functions for Python";
+ homepage = "https://github.com/pudo/banal";
+ license = licenses.mit;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
index a3e48d20c6..609c0392c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "binwalk";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "ReFirmLabs";
repo = "binwalk";
rev = "v${version}";
- sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc";
+ sha256 = "108mj4jjffdmaz6wjvglbv44j7fkhspaxz1rj2bi1fcnwsri5wsm";
};
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
@@ -53,5 +53,6 @@ buildPythonPackage rec {
homepage = "https://github.com/ReFirmLabs/binwalk";
description = "A tool for searching a given binary image for embedded files";
maintainers = [ maintainers.koral ];
+ license = licenses.mit;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index dc09aa2c6b..c3965b10a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
@@ -1,14 +1,19 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, python }:
buildPythonPackage rec {
pname = "bitarray";
- version = "1.8.1";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e02f79fba7a470d438eb39017d503498faaf760b17b6b46af1a9de12fd58d311";
+ sha256 = "sha256-7DpPbXEaee0jrqlUFjjTNT3D8IPyk6ExgLFLSC4+Ge8=";
};
+ checkPhase = ''
+ cd $out
+ ${python.interpreter} -c 'import bitarray; bitarray.test()'
+ '';
+
pythonImportsCheck = [ "bitarray" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix
index e4f9d63bd6..9f41ed5756 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "brother";
- version = "0.2.2";
+ version = "1.0.0";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE=";
+ sha256 = "sha256-0NfqPlQiOkNhR+H55E9LE4dGa9R8vcSyPNbbIeiRJV8=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix
index af6b9031e6..6ab2ed91fe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix
@@ -1,7 +1,7 @@
-{ stdenv
-, lib
+{ lib
, buildPythonPackage
, capstone
+, stdenv
, fetchpatch
, fetchPypi
, setuptools
@@ -33,5 +33,7 @@ buildPythonPackage rec {
license = licenses.bsdOriginal;
description = "Python bindings for Capstone disassembly engine";
maintainers = with maintainers; [ bennofs ris ];
+ # creates a manylinux2014-x86_64 wheel
+ broken = stdenv.isAarch64;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
index 39413d0f9c..c3a715c152 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.0.6281";
+ version = "9.0.6852";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gvo8I6LQRAEUa7QiV5Sugrt+e2SmGkkKfsGn/IKz+Mk=";
+ sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng=";
};
# Use upstream z3 implementation
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
index 436a364b2b..4daab50596 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.0.6281";
+ version = "9.0.6852";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "0f2zc02dljmgp6ny6ja6917j08kqhwckncan860dq4xv93g61rmg";
+ sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs=";
};
propagatedBuildInputs = [
@@ -64,6 +64,8 @@ buildPythonPackage rec {
"test_ppc_rel24_relocation"
"test_ppc_addr16_ha_relocation"
"test_ppc_addr16_lo_relocation"
+ # Binary not found, seems to be missing in the current binaries release
+ "test_plt_full_relro"
];
pythonImportsCheck = [ "cle" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix
new file mode 100644
index 0000000000..dfb82cccea
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools-scm
+, click
+, requests
+, attrs
+, intbitset
+, saneyaml
+, text-unidecode
+, beautifulsoup4
+, pytestCheckHook
+, pytest-xdist
+}:
+buildPythonPackage rec {
+ pname = "commoncode";
+ version = "21.1.21";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "6e2daa34fac2d91307b23d9df5f01a6168fdffb12bf5d161bd6776bade29b479";
+ };
+
+ dontConfigure = true;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ click
+ requests
+ attrs
+ intbitset
+ saneyaml
+ text-unidecode
+ beautifulsoup4
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-xdist
+ ];
+
+ pythonImportsCheck = [
+ "commoncode"
+ ];
+
+ meta = with lib; {
+ description = "A set of common utilities, originally split from ScanCode";
+ homepage = "https://github.com/nexB/commoncode";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/css-html-js-minify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/css-html-js-minify/default.nix
new file mode 100644
index 0000000000..d05941e1cf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/css-html-js-minify/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "css-html-js-minify";
+ version = "2.5.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c";
+ };
+
+ doCheck = false; # Tests are useless and broken
+
+ pythonImportsCheck = [ "css_html_js_minify" ];
+
+ meta = with lib; {
+ description = "StandAlone Async cross-platform Minifier for the Web";
+ homepage = "https://github.com/juancarlospaco/css-html-js-minify";
+ license = with licenses; [ gpl3Plus lgpl3Plus mit ];
+ maintainers = with maintainers; [ FlorianFranzen ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix
new file mode 100644
index 0000000000..580d698d8d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, gcc-unwrapped
+}:
+buildPythonPackage rec {
+ pname = "cxxfilt";
+ version = "0.2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b";
+ };
+
+ postPatch = ''
+ substituteInPlace cxxfilt/__init__.py \
+ --replace "find_any_library('stdc++', 'c++')" '"${lib.getLib gcc-unwrapped}/lib/libstdc++.so"'
+ '';
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "cxxfilt"
+ ];
+
+ meta = with lib; {
+ description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle ";
+ homepage = "https://github.com/afq984/python-cxxfilt";
+ license = licenses.bsd2;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
index 86bc2da156..1cfe643944 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
@@ -8,6 +8,7 @@
, scipy
, scikitlearn
, pytest
+, setuptools-scm
}:
buildPythonPackage rec {
@@ -20,6 +21,7 @@ buildPythonPackage rec {
};
checkInputs = [ pytest ];
+ nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
index 4f4b7b705c..517056866b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
@@ -13,6 +13,7 @@
, multipledispatch
, packaging
, distributed
+, setuptools-scm
}:
buildPythonPackage rec {
@@ -38,6 +39,7 @@ buildPythonPackage rec {
scipy
six
toolz
+ setuptools-scm
];
# has non-standard build from source, and pypi doesn't include tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
index 8f3e4d0858..13c03a1f79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
@@ -1,6 +1,7 @@
{ lib
, bokeh
, buildPythonPackage
+, fetchpatch
, fetchFromGitHub
, fsspec
, pytestCheckHook
@@ -42,7 +43,7 @@ buildPythonPackage rec {
distributed
];
- doCheck = false;
+ doCheck = true;
checkInputs = [
pytestCheckHook
@@ -52,6 +53,16 @@ buildPythonPackage rec {
dontUseSetuptoolsCheck = true;
+ patches = [
+ # dask dataframe cannot be imported in sandboxed builds
+ # See https://github.com/dask/dask/pull/7601
+ (fetchpatch {
+ url = "https://github.com/dask/dask/commit/9ce5b0d258cecb3ef38fd844135ad1f7ac3cea5f.patch";
+ sha256 = "sha256-1EVRYwAdTSEEH9jp+UOnrijzezZN3iYR6q6ieYJM3kY=";
+ name = "fix-dask-dataframe-imports-in-sandbox.patch";
+ })
+ ];
+
postPatch = ''
# versioneer hack to set version of github package
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
@@ -66,8 +77,13 @@ buildPythonPackage rec {
disabledTests = [
"test_annotation_pack_unpack"
"test_annotations_blockwise_unpack"
+ # this test requires features of python3Packages.psutil that are
+ # blocked in sandboxed-builds
+ "test_auto_blocksize_csv"
];
+ pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ];
+
meta = with lib; {
description = "Minimal task scheduling abstraction";
homepage = "https://dask.org/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix
new file mode 100644
index 0000000000..8064a35ffe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonAtLeast
+, fetchpatch
+, chardet
+, attrs
+, commoncode
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "debian-inspector";
+ version = "0.9.10";
+
+ src = fetchPypi {
+ pname = "debian_inspector";
+ inherit version;
+ sha256 = "fd29a02b925a4de0d7bb00c29bb05f19715a304bc10ef7b9ad06a93893dc3a8c";
+ };
+
+ patches = lib.optionals (pythonAtLeast "3.9") [
+ # https://github.com/nexB/debian-inspector/pull/15
+ # fixes tests on Python 3.9
+ (fetchpatch {
+ name = "drop-encoding-argument.patch";
+ url = "https://github.com/nexB/debian-inspector/commit/ff991cdb788671ca9b81f1602b70a439248fd1aa.patch";
+ sha256 = "bm3k7vb9+Rm6+YicQEeDOOUVut8xpDaNavG+t2oLZkI=";
+ })
+ ];
+
+ dontConfigure = true;
+
+ propagatedBuildInputs = [
+ chardet
+ attrs
+ commoncode
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "debian_inspector"
+ ];
+
+ meta = with lib; {
+ description = "Utilities to parse Debian package, copyright and control files";
+ homepage = "https://github.com/nexB/debian-inspector";
+ license = with licenses; [ asl20 bsd3 mit ];
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debut/default.nix
new file mode 100644
index 0000000000..02eece2fc2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/debut/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, chardet
+, attrs
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "debut";
+ version = "0.9.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a3a71e475295f4cf4292440c9c7303ebca0309d395536d2a7f86a5f4d7465dc1";
+ };
+
+ dontConfigure = true;
+
+ propagatedBuildInputs = [
+ chardet
+ attrs
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "debut"
+ ];
+
+ meta = with lib; {
+ description = "Python library to parse Debian deb822-style control and copyright files ";
+ homepage = "https://github.com/nexB/debut";
+ license = with licenses; [ asl20 bsd3 mit ];
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix
new file mode 100644
index 0000000000..cff9a66669
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, requests
+, tornado
+, poetry-core
+, pytestCheckHook
+, pytest-cov
+, pytest-vcr
+}:
+
+buildPythonPackage rec {
+ pname = "deezer-python";
+ version = "2.2.2";
+ disabled = pythonOlder "3.6";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "browniebroke";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1l8l4lxlqsj921gk1mxcilp11jx31addiyd9pk604aldgqma709y";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-cov
+ pytest-vcr
+ ];
+
+ propagatedBuildInputs = [
+ requests
+ tornado
+ ];
+
+ meta = with lib; {
+ description = "A friendly Python wrapper around the Deezer API";
+ homepage = "https://github.com/browniebroke/deezer-python";
+ license = licenses.mit;
+ maintainers = with maintainers; [ synthetica ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix
index 6433e0d17a..59fed703e2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix
@@ -1,4 +1,12 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, toml, pyyaml }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, toml
+, pyyaml
+, packaging
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "dparse";
@@ -10,13 +18,24 @@ buildPythonPackage rec {
sha256 = "a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367";
};
- propagatedBuildInputs = [ toml pyyaml ];
+ propagatedBuildInputs = [
+ toml
+ pyyaml
+ packaging
+ ];
- checkInputs = [ pytest ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # requires unpackaged dependency pipenv
+ "test_update_pipfile"
+ ];
meta = with lib; {
description = "A parser for Python dependency files";
- homepage = "https://github.com/pyupio/safety";
+ homepage = "https://github.com/pyupio/dparse";
license = licenses.mit;
maintainers = with maintainers; [ thomasdesr ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix
new file mode 100644
index 0000000000..e3318b426e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix
@@ -0,0 +1,48 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, plugincode
+, p7zip
+}:
+buildPythonPackage rec {
+ pname = "extractcode-7z";
+ version = "21.4.4";
+
+ src = fetchFromGitHub {
+ owner = "nexB";
+ repo = "scancode-plugins";
+ rev = "v${version}";
+ sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A=";
+ };
+
+ sourceRoot = "source/builtins/extractcode_7z-linux";
+
+ propagatedBuildInputs = [
+ plugincode
+ ];
+
+ preBuild = ''
+ pushd src/extractcode_7z/bin
+
+ rm 7z 7z.so
+ ln -s ${p7zip}/bin/7z 7z
+ ln -s ${p7zip}/lib/p7zip/7z.so 7z.so
+
+ popd
+ '';
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "extractcode_7z"
+ ];
+
+ meta = with lib; {
+ description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
+ homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_7z-linux";
+ license = with licenses; [ asl20 lgpl21 ];
+ maintainers = teams.determinatesystems.members;
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix
new file mode 100644
index 0000000000..481324d729
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools-scm
+, typecode
+, patch
+, extractcode-libarchive
+, extractcode-7z
+, pytestCheckHook
+, pytest-xdist
+}:
+buildPythonPackage rec {
+ pname = "extractcode";
+ version = "21.2.24";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "f91638dbf523b80df90ac184c25d5cd1ea24cac53f67a6bb7d7b389867e0744b";
+ };
+
+ dontConfigure = true;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ typecode
+ patch
+ extractcode-libarchive
+ extractcode-7z
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-xdist
+ ];
+
+ # cli test tests the cli which we can't do until after install
+ disabledTestPaths = [
+ "tests/test_extractcode_cli.py"
+ ];
+
+ # test_uncompress_* wants to use a binary to extract instead of the provided library
+ disabledTests = [
+ "test_uncompress_lz4_basic"
+ "test_extract_tarlz4_basic"
+ ];
+
+ pythonImportsCheck = [
+ "extractcode"
+ ];
+
+ meta = with lib; {
+ description = "A mostly universal archive extractor using z7zip, libarchve, other libraries and the Python standard library for reliable archive extraction";
+ homepage = "https://github.com/nexB/extractcode";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix
new file mode 100644
index 0000000000..0d5e7f3185
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix
@@ -0,0 +1,62 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, libarchive
+, libb2
+, bzip2
+, expat
+, lz4
+, lzma
+, zlib
+, zstd
+, plugincode
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "extractcode-libarchive";
+ version = "21.4.4";
+
+ src = fetchFromGitHub {
+ owner = "nexB";
+ repo = "scancode-plugins";
+ rev = "v${version}";
+ sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A=";
+ };
+
+ sourceRoot = "source/builtins/extractcode_libarchive-linux";
+
+ preBuild = ''
+ pushd src/extractcode_libarchive/lib
+
+ rm *.so *.so.*
+ ln -s ${lib.getLib libarchive}/lib/libarchive.so libarchive.so
+ ln -s ${lib.getLib libb2}/lib/libb2.so libb2-la3511.so.1
+ ln -s ${lib.getLib bzip2}/lib/libbz2.so libbz2-la3511.so.1.0
+ ln -s ${lib.getLib expat}/lib/libexpat.so libexpat-la3511.so.1
+ ln -s ${lib.getLib lz4}/lib/liblz4.so liblz4-la3511.so.1
+ ln -s ${lib.getLib lzma}/lib/liblzma.so liblzma-la3511.so.5
+ ln -s ${lib.getLib zlib}/lib/libz.so libz-la3511.so.1
+ ln -s ${lib.getLib zstd}/lib/libzstd.so libzstd-la3511.so.1
+
+ popd
+ '';
+
+ propagatedBuildInputs = [
+ plugincode
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "extractcode_libarchive"
+ ];
+
+ meta = with lib; {
+ description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
+ homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_libarchive-linux";
+ license = with licenses; [ asl20 bsd2 ];
+ maintainers = teams.determinatesystems.members;
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix
new file mode 100644
index 0000000000..ea68c6fa8d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, normality
+, mypy
+, coverage
+, nose
+}:
+buildPythonPackage rec {
+ pname = "fingerprints";
+ version = "1.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "cafd5f92b5b91e4ce34af2b954da9c05b448a4778947785abb19a14f363352d0";
+ };
+
+ propagatedBuildInputs = [
+ normality
+ ];
+
+ checkInputs = [
+ mypy
+ coverage
+ nose
+ ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ pythonImportsCheck = [
+ "fingerprints"
+ ];
+
+ meta = with lib; {
+ description = "A library to generate entity fingerprints";
+ homepage = "https://github.com/alephdata/fingerprints";
+ license = licenses.mit;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix
index 1734ad2f50..fbcf09de2e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix
@@ -5,34 +5,36 @@
, pytestCheckHook
, numpy
, stdenv
+, aiohttp
+, pytest-vcr
+, requests
}:
buildPythonPackage rec {
pname = "fsspec";
- version = "0.8.3";
+ version = "2021.04.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "intake";
repo = "filesystem_spec";
rev = version;
- sha256 = "0mfy0wxjfwwnp5q2afhhfbampf0fk71wsv512pi9yvrkzzfi1hga";
+ sha256 = "sha256-9072kb1VEQ0xg9hB8yEzJMD2Ttd3UGjBmTuhE+Uya1k=";
};
- checkInputs = [
- pytestCheckHook
- numpy
- ];
+ checkInputs = [ pytestCheckHook numpy pytest-vcr ];
+
+ __darwinAllowLocalNetworking = true;
+
+ propagatedBuildInputs = [ aiohttp requests ];
disabledTests = [
# Test assumes user name is part of $HOME
# AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar'
"test_strip_protocol_expanduser"
- # flaky: works locally but fails on hydra
- # as it uses the install dir for tests instead of a temp dir
- # resolved in https://github.com/intake/filesystem_spec/issues/432 and
- # can be enabled again from version 0.8.4
- "test_pathobject"
+ # test accesses this remote ftp server:
+ # https://ftp.fau.de/debian-cd/current/amd64/log/success
+ "test_find"
] ++ lib.optionals (stdenv.isDarwin) [
# works locally on APFS, fails on hydra with AssertionError comparing timestamps
# darwin hydra builder uses HFS+ and has only one second timestamp resolution
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix
new file mode 100644
index 0000000000..483e4a6108
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix
@@ -0,0 +1,37 @@
+{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth
+, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod
+, pytest-vcr, vcrpy }:
+
+buildPythonPackage rec {
+ pname = "gcsfs";
+ version = "2021.04.0";
+
+ # github sources needed for test data
+ src = fetchFromGitHub {
+ owner = "dask";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs=";
+ };
+
+ propagatedBuildInputs = [
+ google-auth
+ google-auth-oauthlib
+ requests
+ decorator
+ fsspec
+ aiohttp
+ ujson
+ crcmod
+ ];
+
+ checkInputs = [ pytestCheckHook pytest-vcr vcrpy ];
+ pythonImportsCheck = [ "gcsfs" ];
+
+ meta = with lib; {
+ description = "Convenient Filesystem interface over GCS";
+ homepage = "https://github.com/dask/gcsfs";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.nbren12 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix
new file mode 100644
index 0000000000..8aa4b81923
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "gemfileparser";
+ version = "0.8.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "839592e49ea3fd985cec003ef58f8e77009a69ed7644a0c0acc94cf6dd9b8d6e";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "gemfileparser"
+ ];
+
+ meta = with lib; {
+ description = "A library to parse Ruby Gemfile, .gemspec and Cocoapod .podspec file using Python";
+ homepage = "https://github.com/gemfileparser/gemfileparser";
+ license = with licenses; [ gpl3Plus /* or */ mit ];
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 37752601e2..6e4c139d8d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, click
@@ -28,6 +29,8 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = lib.optionals stdenv.isDarwin [ "test_run_local_server" ];
+
meta = with lib; {
description = "Google Authentication Library: oauthlib integration";
homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
index addd67f9fa..f106f6efaa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchpatch
, fetchPypi
@@ -48,6 +49,14 @@ buildPythonPackage rec {
"google.oauth2"
];
+ disabledTests = lib.optionals stdenv.isDarwin [
+ "test_request_with_timeout_success"
+ "test_request_with_timeout_failure"
+ "test_request_headers"
+ "test_request_error"
+ "test_request_basic"
+ ];
+
meta = with lib; {
description = "Google Auth Python Library";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix
new file mode 100644
index 0000000000..98aab26ffa
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, requests_oauthlib
+}:
+
+buildPythonPackage rec {
+ pname = "homeconnect";
+ version = "0.6.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ requests_oauthlib
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "homeconnect" ];
+
+ meta = with lib; {
+ description = "Python client for the BSH Home Connect REST API";
+ homepage = "https://github.com/DavidMStraub/homeconnect";
+ changelog = "https://github.com/DavidMStraub/homeconnect/releases/tag/v${version}";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
index ce3b3aa1f6..25c227c614 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
@@ -39,8 +40,10 @@ buildPythonPackage rec {
pytestCheckHook
];
- # Don't run tests for Python 2.7
- doCheck = !isPy27;
+ # Don't run tests for Python 2.7 or Darwin
+ # Nearly 50% of the test suite requires local network access
+ # which isn't allowed on sandboxed Darwin builds
+ doCheck = !(isPy27 || stdenv.isDarwin);
pytestFlagsArray = [ "--ignore python2" ];
pythonImportsCheck = [ "httplib2" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
index 136415eb54..700c23827f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
- version = "0.39.0";
+ version = "0.40.0";
disabled = isPy27;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
- sha256 = "sha256-PyksCYVe7Ij/+bZpntHgY51I/ZVnC6L20TcKfTLr2CY=";
+ sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A=";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix
new file mode 100644
index 0000000000..db98be8276
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, six
+, nose
+}:
+buildPythonPackage rec {
+ pname = "intbitset";
+ version = "2.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "44bca80b8cc702d5a56f0686f2bb5e028ab4d0c2c1761941589d46b7fa2c701c";
+ };
+
+ patches = [
+ # fixes compilation on aarch64 and determinism (uses -march=core2 and
+ # -mtune=native)
+ ./remove-impure-tuning.patch
+ ];
+
+ propagatedBuildInputs = [
+ six
+ ];
+
+ checkInputs = [
+ nose
+ ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ pythonImportsCheck = [
+ "intbitset"
+ ];
+
+ meta = with lib; {
+ description = "C-based extension implementing fast integer bit sets";
+ homepage = "https://github.com/inveniosoftware/intbitset";
+ license = licenses.lgpl3Only;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch
new file mode 100644
index 0000000000..4747b87b80
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch
@@ -0,0 +1,24 @@
+From 2ea60bdf4d7b0344fc6ff5c97c675842fedccfa8 Mon Sep 17 00:00:00 2001
+From: Cole Helbling
+Date: Fri, 23 Apr 2021 09:02:22 -0700
+Subject: [PATCH] setup.py: remove impure tuning
+
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 7840022..3922aa5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -48,7 +48,6 @@ setup(
+ ext_modules=[
+ Extension("intbitset",
+ ["intbitset/intbitset.c", "intbitset/intbitset_impl.c"],
+- extra_compile_args=['-O3', '-march=core2', '-mtune=native']
+ # For debug -> '-ftree-vectorizer-verbose=2'
+ )
+ ],
+--
+2.30.1
+
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
index 1050ae88e4..714f51c0d3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -1,5 +1,18 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchFromGitHub
+, lz4
+}:
+let
+ kaitai_compress = fetchFromGitHub {
+ owner = "kaitai-io";
+ repo = "kaitai_compress";
+ rev = "434fb42220ff58778bb9fbadb6152cad7e4f5dd0";
+ sha256 = "zVnkVl3amUDOB+pnw5SkMGSrVL/dTQ82E8IWfJvKC4Q=";
+ };
+in
buildPythonPackage rec {
pname = "kaitaistruct";
version = "0.9";
@@ -9,9 +22,27 @@ buildPythonPackage rec {
sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad";
};
+ preBuild = ''
+ ln -s ${kaitai_compress}/python/kaitai kaitai
+ sed '28ipackages = kaitai/compress' -i setup.cfg
+ '';
+
+ propagatedBuildInputs = [
+ lz4
+ ];
+
+ # no tests
+ dontCheck = true;
+
+ pythonImportsCheck = [
+ "kaitaistruct"
+ "kaitai.compress"
+ ];
+
meta = with lib; {
description = "Kaitai Struct: runtime library for Python";
homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
license = licenses.mit;
+ maintainers = teams.determinatesystems.members;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix
new file mode 100644
index 0000000000..c82cb89578
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flask
+, karton-core
+, mistune
+, prometheus_client
+}:
+
+buildPythonPackage rec {
+ pname = "karton-dashboard";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "CERT-Polska";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "101qmx6nmiim0vrz2ldk973ns498hnxla1xy7nys9kh9wijg4msk";
+ };
+
+ propagatedBuildInputs = [
+ flask
+ karton-core
+ mistune
+ prometheus_client
+ ];
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "Flask==1.1.1" "Flask" \
+ --replace "karton-core==4.1.0" "karton-core"
+ '';
+
+ # Project has no tests. pythonImportsCheck requires MinIO configuration
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Web application that allows for Karton task and queue introspection";
+ homepage = "https://github.com/CERT-Polska/karton-dashboard";
+ license = with licenses; [ bsd3 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liblzfse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liblzfse/default.nix
new file mode 100644
index 0000000000..72159fa5f1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/liblzfse/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, lzfse
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "pyliblzfse";
+ version = "0.4.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bb0b899b3830c02fdf3dbde48ea59611833f366fef836e5c32cf8145134b7d3d";
+ };
+
+ preBuild = ''
+ rm -r lzfse
+ ln -s ${lzfse.src} lzfse
+ '';
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "liblzfse"
+ ];
+
+ meta = with lib; {
+ description = "Python bindings for LZFSE";
+ homepage = "https://github.com/ydkhatri/pyliblzfse";
+ license = licenses.mit;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multimethod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multimethod/default.nix
new file mode 100644
index 0000000000..ded279cd86
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/multimethod/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pytest-cov
+}:
+buildPythonPackage rec {
+ pname = "multimethod";
+ version = "1.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b9c6f85ecf187f14a3951fff319643e1fac3086d757dec64f2469e1fd136b65d";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-cov
+ ];
+
+ pythomImportsCheck = [
+ "multimethod"
+ ];
+
+ meta = with lib; {
+ description = "Multiple argument dispatching";
+ homepage = "https://github.com/coady/multimethod";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix
new file mode 100644
index 0000000000..0e15bfb6cc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "nclib";
+ version = "1.0.0";
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0kf8x30lrwhijab586i54g70s3sxvm2945al48zj27grj0pagh7g";
+ };
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "nclib" ];
+
+ meta = with lib; {
+ description = "Python module that provides netcat features";
+ homepage = "https://nclib.readthedocs.io/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix
new file mode 100644
index 0000000000..ece47afad4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, text-unidecode
+, chardet
+, banal
+, PyICU
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "normality";
+ version = "2.1.3";
+
+ src = fetchFromGitHub {
+ owner = "pudo";
+ repo = "normality";
+ rev = version;
+ sha256 = "WvpMs02vBGnCSPkxo6r6g4Di2fKkUr2SsBflTBxlhkU=";
+ };
+
+ propagatedBuildInputs = [
+ text-unidecode
+ chardet
+ banal
+ PyICU
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "normality"
+ ];
+
+ meta = with lib; {
+ description = "Micro-library to normalize text strings";
+ homepage = "https://github.com/pudo/normality";
+ license = licenses.mit;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omnilogic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omnilogic/default.nix
index 6e12e57370..96d0d7e19c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/omnilogic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/omnilogic/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "omnilogic";
- version = "0.4.3";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "djtimca";
repo = "omnilogic-api";
- rev = "v${version}";
- sha256 = "19pmbykq0mckk23aj33xbhg3gjx557xy9a481mp6pkmihf2lsc8z";
+ rev = version;
+ sha256 = "081awb0fl40b5ighc9yxfq1xkgxz7l5dvz5544hx965q2r20wvsg";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ondilo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ondilo/default.nix
new file mode 100644
index 0000000000..7010bd473a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ondilo/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, oauthlib
+, pythonOlder
+, requests
+, requests_oauthlib
+}:
+
+buildPythonPackage rec {
+ pname = "ondilo";
+ version = "0.2.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "JeromeHXP";
+ repo = pname;
+ rev = version;
+ sha256 = "0k7c9nacf7pxvfik3hkv9vvvda2sx5jrf6zwq7r077x7fw5l8d2b";
+ };
+
+ propagatedBuildInputs = [
+ oauthlib
+ requests
+ requests_oauthlib
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "ondilo" ];
+
+ meta = with lib; {
+ description = "Python package to access Ondilo ICO APIs";
+ homepage = "https://github.com/JeromeHXP/ondilo";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix
new file mode 100644
index 0000000000..9cbe89e26a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, requests
+, testfixtures
+}:
+
+buildPythonPackage rec {
+ pname = "openerz-api";
+ version = "0.1.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "misialq";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "10kxsmaz2rn26jijaxmdmhx8vjdz8hrhlrvd39gc8yvqbjwhi3nw";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ testfixtures
+ ];
+
+ pythonImportsCheck = [ "openerz_api" ];
+
+ meta = with lib; {
+ description = "Python module to interact with the OpenERZ API";
+ homepage = "https://github.com/misialq/openerz-api";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
index efa4c3005f..a03452d786 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
@@ -8,19 +8,22 @@
buildPythonPackage rec {
pname = "pg8000";
- version = "1.19.0";
+ version = "1.19.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-EexwwLIOpECAfiyGmUDxSE7qk9cbQ1gHtjhW3YK3RN0=";
+ sha256 = "sha256-RMu008kS8toWfKAr+YoAQPfpMmDk7xFMKNXWFSAS6gc=";
};
- propagatedBuildInputs = [passlib scramp ];
+ propagatedBuildInputs = [
+ passlib
+ scramp
+ ];
postPatch = ''
substituteInPlace setup.py \
- --replace "scramp==1.3.0" "scramp>=1.3.0"
+ --replace "scramp==1.4.0" "scramp>=1.4.0"
'';
# Tests require a running PostgreSQL instance
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugincode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugincode/default.nix
new file mode 100644
index 0000000000..7270685f41
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plugincode/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools-scm
+, click
+, commoncode
+, pluggy
+, pytestCheckHook
+, pytest-xdist
+}:
+buildPythonPackage rec {
+ pname = "plugincode";
+ version = "21.1.21";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "97b5a2c96f0365c80240be103ecd86411c68b11a16f137913cbea9129c54907a";
+ };
+
+ dontConfigure = true;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ click
+ commoncode
+ pluggy
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-xdist
+ ];
+
+ pythonImportsCheck = [
+ "plugincode"
+ ];
+
+ meta = with lib; {
+ description = "A library that provides plugin functionality for ScanCode toolkit";
+ homepage = "https://github.com/nexB/plugincode";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugnplay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugnplay/default.nix
new file mode 100644
index 0000000000..259fe96028
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plugnplay/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+buildPythonPackage rec {
+ pname = "plugnplay";
+ version = "0.5.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "877e2d2500a45aaf31e5175f9f46182088d3e2d64c1c6b9ff6c778ae0ee594c8";
+ };
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "plugnplay"
+ ];
+
+ meta = with lib; {
+ description = "A Generic plug-in system for python applications";
+ homepage = "https://github.com/daltonmatos/plugnplay";
+ license = licenses.gpl2Only;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycocotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycocotools/default.nix
new file mode 100644
index 0000000000..a6cdf877a0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycocotools/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cython
+, matplotlib
+}:
+
+buildPythonPackage rec {
+ pname = "pycocotools";
+ version = "2.0.2";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "06hz0iz4kqxhqby4j7bah8l41kg68bb118jawp172i4vg497lw94";
+ };
+
+ propagatedBuildInputs = [
+ cython
+ matplotlib
+ ];
+
+ pythonImportsCheck = [
+ "pycocotools.coco"
+ "pycocotools.cocoeval"
+ ];
+
+ # has no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Official APIs for the MS-COCO dataset";
+ homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ hexa piegames ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
index 1db5df28e3..5bf9114d69 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
@@ -1,4 +1,5 @@
{ buildPythonPackage
+, addOpenGLRunpath
, fetchPypi
, fetchFromGitHub
, Mako
@@ -40,6 +41,13 @@ buildPythonPackage rec {
ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte
'';
+ postFixup = ''
+ find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ echo "setting opengl runpath for $lib..."
+ addOpenGLRunpath "$lib"
+ done
+ '';
+
# Requires access to libcuda.so.1 which is provided by the driver
doCheck = false;
@@ -47,6 +55,10 @@ buildPythonPackage rec {
py.test
'';
+ nativeBuildInputs = [
+ addOpenGLRunpath
+ ];
+
propagatedBuildInputs = [
numpy
pytools
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix
new file mode 100644
index 0000000000..ca171edde4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, yarl
+}:
+
+buildPythonPackage rec {
+ pname = "pydroid-ipcam";
+ version = "unstable-2021-04-16";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "home-assistant-libs";
+ repo = pname;
+ rev = "9f22682c6f9182aa5e42762f52223337b8b6909c";
+ sha256 = "1lvppyzmwg0fp8zch11j51an4sb074yl9shzanakvjmbqpnif6s6";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ yarl
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pydroid_ipcam" ];
+
+ meta = with lib; {
+ description = "Python library for Android IP Webcam";
+ homepage = "https://github.com/home-assistant-libs/pydroid-ipcam";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyimpfuzzy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyimpfuzzy/default.nix
new file mode 100644
index 0000000000..43e1a1a2b8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyimpfuzzy/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ssdeep
+, pefile
+}:
+buildPythonPackage rec {
+ pname = "pyimpfuzzy";
+ version = "0.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "da9796df302db4b04a197128637f84988f1882f1e08fdd69bbf9fdc6cfbaf349";
+ };
+
+ buildInputs = [
+ ssdeep
+ ];
+
+ propagatedBuildInputs = [
+ pefile
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "pyimpfuzzy"
+ ];
+
+ meta = with lib; {
+ description = "A Python module which calculates and compares the impfuzzy (import fuzzy hashing)";
+ homepage = "https://github.com/JPCERTCC/impfuzzy";
+ license = licenses.gpl2Only;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix
new file mode 100644
index 0000000000..e3a70ede06
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pbr
+, requests
+, six
+, lxml
+, pytestCheckHook
+, pytest-cov
+, mock
+}:
+buildPythonPackage rec {
+ pname = "pymaven-patch";
+ version = "0.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d55b29bd4aeef3510904a12885eb6856b5bd48f3e29925a123461429f9ad85c0";
+ };
+
+ propagatedBuildInputs = [
+ pbr
+ requests
+ six
+ lxml
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-cov
+ mock
+ ];
+
+ pythonImportsCheck = [
+ "pymaven"
+ ];
+
+ meta = with lib; {
+ description = "Python access to maven";
+ homepage = "https://github.com/nexB/pymaven";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
index cf8c951300..2f39be7982 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,22 +2,27 @@
buildPythonPackage rec {
pname = "pymavlink";
- version = "2.4.14";
+ version = "2.4.15";
src = fetchPypi {
inherit pname version;
- sha256 = "3bc3709c735ebb3f98f19e96c8887868f4671077d4808076cfc5445912633881";
+ sha256 = "106va20k0ahy0l2qvxf8k5pvqkgdmxbgzd9kij9fkrahlba5mx3v";
};
propagatedBuildInputs = [ future lxml ];
- # No tests included in PyPI tarball
+ # No tests included in PyPI tarball. We cannot use the GitHub tarball because
+ # we would like to use the same commit of the mavlink messages repo as
+ # included in the PyPI tarball, and there is no easy way to determine what
+ # commit is included.
doCheck = false;
+ pythonImportsCheck = [ "pymavlink" ];
+
meta = with lib; {
description = "Python MAVLink interface and utilities";
homepage = "https://github.com/ArduPilot/pymavlink";
- license = licenses.lgpl3;
+ license = with licenses; [ lgpl3Only mit ];
maintainers = with maintainers; [ lopsided98 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymdstat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymdstat/default.nix
new file mode 100644
index 0000000000..54c2096978
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymdstat/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "pymdstat";
+ version = "0.4.2";
+
+ src = fetchFromGitHub {
+ owner = "nicolargo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "01hj8vyd9f7610sqvzphpr033rvnazbwvl11gi18ia3yqlnlncp0";
+ };
+
+ checkPhase = ''
+ ${python.interpreter} $src/unitest.py
+ '';
+
+ pythonImportsCheck = [ "pymdstat" ];
+
+ meta = with lib; {
+ description = "A pythonic library to parse Linux /proc/mdstat file";
+ homepage = "https://github.com/nicolargo/pymdstat";
+ maintainers = with maintainers; [ rhoriguchi ];
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix
index 5e0131352c..0115893700 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix
@@ -8,15 +8,15 @@
}:
buildPythonPackage rec {
- pname = "PyMetno";
- version = "0.8.2";
+ pname = "pymetno";
+ version = "0.8.3";
format = "setuptools";
src = fetchFromGitHub {
- repo = pname;
owner = "Danielhiversen";
+ repo = "PyMetno";
rev = version;
- sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5";
+ sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g=";
};
propagatedBuildInputs = [
@@ -34,7 +34,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
- description = "A library to communicate with the met.no api";
+ description = "A library to communicate with the met.no API";
homepage = "https://github.com/Danielhiversen/pyMetno/";
license = licenses.mit;
maintainers = with maintainers; [ flyfloh ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmart-smartx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmart-smartx/default.nix
new file mode 100644
index 0000000000..66b789668a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmart-smartx/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, future
+, pytestCheckHook
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "pysmart-smartx";
+ version = "0.3.10";
+
+ src = fetchFromGitHub {
+ owner = "smartxworks";
+ repo = "pySMART";
+ rev = "v${version}";
+ sha256 = "1irl4nlgz3ds3aikraa9928gzn6hz8chfh7jnpmq2q7d2vqbdrjs";
+ };
+
+ propagatedBuildInputs = [ future ];
+
+ # tests require contextlib.nested
+ doCheck = !isPy3k;
+
+ checkInputs = [ pytestCheckHook mock ];
+
+ pythonImportsCheck = [ "pySMART" ];
+
+ meta = with lib; {
+ description = "It's a fork of pySMART with lots of bug fix and enhances";
+ homepage = "https://github.com/smartxworks/pySMART";
+ maintainers = with maintainers; [ rhoriguchi ];
+ license = licenses.gpl2Only;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix
new file mode 100644
index 0000000000..abf3796ae7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, httpsig
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pysmartapp";
+ version = "0.3.3";
+
+ src = fetchFromGitHub {
+ owner = "andrewsayre";
+ repo = pname;
+ rev = version;
+ sha256 = "03wk44siqxl15pa46x5vkg4q0mnga34ir7qn897576z2ivbx7awh";
+ };
+
+ propagatedBuildInputs = [
+ httpsig
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "pysmartapp" ];
+
+ meta = with lib; {
+ description = "Python implementation to work with SmartApp lifecycle events";
+ homepage = "https://github.com/andrewsayre/pysmartapp";
+ changelog = "https://github.com/andrewsayre/pysmartapp/releases/tag/${version}";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix
new file mode 100644
index 0000000000..e8a295c319
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pysmartthings";
+ version = "0.7.6";
+
+ src = fetchFromGitHub {
+ owner = "andrewsayre";
+ repo = pname;
+ rev = version;
+ sha256 = "0m91lfzdbmq6qv6bihd278psi9ghldxpa1d0dsbii2zf338188qj";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "pysmartthings" ];
+
+ meta = with lib; {
+ description = "Python library for interacting with the SmartThings cloud API";
+ homepage = "https://github.com/andrewsayre/pysmartthings";
+ changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/${version}";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-picnic-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-picnic-api/default.nix
new file mode 100644
index 0000000000..4ff18224d2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-picnic-api/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "python-picnic-api";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1axqw4bs3wa9mdac35h7r25v3i5g7v55cvyy48c4sg31dxnr4wcp";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ # Project doesn't ship tests
+ # https://github.com/MikeBrink/python-picnic-api/issues/13
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "python_picnic_api"
+ ];
+
+ meta = with lib; {
+ description = "Python wrapper for the Picnic API";
+ homepage = "https://github.com/MikeBrink/python-picnic-api";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix
new file mode 100644
index 0000000000..44795da8dd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, enum-compat
+, unicodecsv
+}:
+buildPythonPackage rec {
+ pname = "python-registry";
+ version = "1.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "99185f67d5601be3e7843e55902d5769aea1740869b0882f34ff1bd4b43b1eb2";
+ };
+
+ propagatedBuildInputs = [
+ enum-compat
+ unicodecsv
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "Registry"
+ ];
+
+ meta = with lib; {
+ description = "Pure Python parser for Windows Registry hives";
+ homepage = "https://github.com/williballenthin/python-registry";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix
index cb74224770..abfc34e648 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pyturbojpeg";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchPypi {
pname = "PyTurboJPEG";
inherit version;
- sha256 = "sha256-dWmj/huCkborcShf2BT+L3ybEfgdKVIGiJnkz755xwo=";
+ sha256 = "sha256-Q7KVfR9kA32QPQFWgSSCVB5sNOmSF8y5J4dmBc14jvg=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
index 75637acc39..fa3d2119ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.0.6281";
+ version = "9.0.6852";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-E8BYCzV71qVNRzWCCI2yTVU88JVMA08eqnIO8OtbNlM=";
+ sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM=";
};
propagatedBuildInputs = [
@@ -26,9 +26,8 @@ buildPythonPackage rec {
pycparser
];
- postPatch = ''
- substituteInPlace pyvex_c/Makefile \
- --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc"
+ preBuild = ''
+ export CC=${stdenv.cc.targetPrefix}cc
'';
# No tests are available on PyPI, GitHub release has tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiling/default.nix
new file mode 100644
index 0000000000..9513280f3c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qiling/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, capstone
+, unicorn
+, pefile
+, python-registry
+, keystone-engine
+, pyelftools
+, gevent
+}:
+buildPythonPackage rec {
+ pname = "qiling";
+ version = "1.2.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e3ed09f9e080559e73e2a9199649b934b3594f653079d1e7da4992340c19eb64";
+ };
+
+ propagatedBuildInputs = [
+ capstone
+ unicorn
+ pefile
+ python-registry
+ keystone-engine
+ pyelftools
+ gevent
+ ];
+
+ # Tests are broken (attempt to import a file that tells you not to import it,
+ # amongst other things)
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "qiling"
+ ];
+
+ meta = with lib; {
+ description = "Qiling Advanced Binary Emulation Framework";
+ homepage = "https://qiling.io/";
+ license = licenses.gpl2Only;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix
new file mode 100644
index 0000000000..71cb33560e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+buildPythonPackage rec {
+ pname = "requirements-parser";
+ version = "0.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5963ee895c2d05ae9f58d3fc641082fb38021618979d6a152b6b1398bd7d4ed4";
+ };
+
+ checkInputs = [
+ nose
+ ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ pythonImportsCheck = [
+ "requirements"
+ ];
+
+ meta = with lib; {
+ description = "A Pip requirements file parser";
+ homepage = "https://github.com/davidfischer/requirements-parser";
+ license = licenses.bsd2;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix
new file mode 100644
index 0000000000..baf12741b8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, xmltodict
+, yarl
+, aresponses
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "rokuecp";
+ version = "0.8.1";
+
+ src = fetchFromGitHub {
+ owner = "ctalkington";
+ repo = "python-rokuecp";
+ rev = version;
+ sha256 = "02mbmwljcvqj3ksj2irdm8849lcxzwa6fycgjqb0i75cgidxpans";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ xmltodict
+ yarl
+ ];
+
+ checkInputs = [
+ aresponses
+ pytestCheckHook
+ pytest-asyncio
+ ];
+
+ meta = with lib; {
+ description = "Asynchronous Python client for Roku (ECP)";
+ homepage = "https://github.com/ctalkington/python-rokuecp";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix
new file mode 100644
index 0000000000..e92e464a9c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools-scm
+, pyyaml
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "saneyaml";
+ version = "0.5.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d6074f1959041342ab41d74a6f904720ffbcf63c94467858e0e22e17e3c43d41";
+ };
+
+ dontConfigure = true;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ pyyaml
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "saneyaml"
+ ];
+
+ meta = with lib; {
+ description = "A PyYaml wrapper with sane behaviour to read and write readable YAML safely";
+ homepage = "https://github.com/nexB/saneyaml";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix
new file mode 100644
index 0000000000..f27a2d40bf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix
@@ -0,0 +1,122 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, markupsafe
+, click
+, typecode
+, gemfileparser
+, pefile
+, fingerprints
+, spdx-tools
+, fasteners
+, pycryptodome
+, urlpy
+, dparse
+, jaraco_functools
+, pkginfo
+, debian-inspector
+, extractcode
+, ftfy
+, pyahocorasick
+, colorama
+, jsonstreams
+, packageurl-python
+, pymaven-patch
+, nltk
+, pygments
+, bitarray
+, jinja2
+, javaproperties
+, boolean-py
+, license-expression
+, extractcode-7z
+, extractcode-libarchive
+, typecode-libmagic
+, pytestCheckHook
+}:
+buildPythonPackage rec {
+ pname = "scancode-toolkit";
+ version = "21.3.31";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "7e0301031a302dedbb4304a91249534f3d036f84a119170b8a9fe70bd57cff95";
+ };
+
+ dontConfigure = true;
+
+ # https://github.com/nexB/scancode-toolkit/issues/2501
+ # * dparse2 is a "Temp fork for Python 2 support", but pdfminer requires
+ # Python 3, so it's "fine" to leave dparse2 unpackaged and use the "normal"
+ # version
+ # * ftfy was pinned for similar reasons (to support Python 2), but rather than
+ # packaging an older version, I figured it would be better to remove the
+ # erroneous (at least for our usage) version bound
+ # * bitarray's version bound appears to be unnecessary for similar reasons
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "dparse2" "dparse" \
+ --replace "ftfy < 5.0.0" "ftfy" \
+ --replace "bitarray >= 0.8.1, < 1.0.0" "bitarray"
+ '';
+
+ propagatedBuildInputs = [
+ markupsafe
+ click
+ typecode
+ gemfileparser
+ pefile
+ fingerprints
+ spdx-tools
+ fasteners
+ pycryptodome
+ urlpy
+ dparse
+ jaraco_functools
+ pkginfo
+ debian-inspector
+ extractcode
+ ftfy
+ pyahocorasick
+ colorama
+ jsonstreams
+ packageurl-python
+ pymaven-patch
+ nltk
+ pygments
+ bitarray
+ jinja2
+ javaproperties
+ boolean-py
+ license-expression
+ extractcode-7z
+ extractcode-libarchive
+ typecode-libmagic
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # Importing scancode needs a writeable home, and preCheck happens in between
+ # pythonImportsCheckPhase and pytestCheckPhase.
+ postInstall = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ pythonImportsCheck = [
+ "scancode"
+ ];
+
+ # takes a long time and doesn't appear to do anything
+ dontStrip = true;
+
+ meta = with lib; {
+ description = "A tool to scan code for license, copyright, package and their documented dependencies and other interesting facts";
+ homepage = "https://github.com/nexB/scancode-toolkit";
+ license = with licenses; [ asl20 cc-by-40 ];
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
index 704549e987..9119836910 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "sendgrid";
- version = "6.6.0";
+ version = "6.7.0";
src = fetchFromGitHub {
owner = pname;
repo = "sendgrid-python";
rev = version;
- sha256 = "sha256-R9ASHDIGuPRh4yf0FAlpjUZ6QAakYs35EFSqAPc02Q8=";
+ sha256 = "sha256-Y0h5Aiu85/EWCmSc+eCtK6ZaPuu/LYZiwhXOx0XhfwQ=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix
new file mode 100644
index 0000000000..15322632ad
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, scikitlearn
+, perl
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "seqeval";
+ version = "1.2.2";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "chakki-works";
+ repo = "seqeval";
+ rev = "v${version}";
+ sha256 = "0qv05gn54kc4wpmwnflmfqw4gwwb8lxqhkiihl0pvl7s2i7qzx2j";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "use_scm_version=True," "version='${version}'," \
+ --replace "setup_requires=['setuptools_scm']," "setup_requires=[],"
+ '';
+
+ propagatedBuildInputs = [
+ numpy
+ scikitlearn
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # tests call perl script and get stuck in there
+ "test_statistical_tests"
+ "test_by_ground_truth"
+ ];
+
+ meta = with lib; {
+ description = "A Python framework for sequence labeling evaluation";
+ homepage = "https://github.com/chakki-works/seqeval";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
index 195bd72061..9044ce19b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
- version = "3.4.2";
+ version = "3.5.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
- sha256 = "sha256-AbQqe6hCy6Ke5lwKHFWLJlXv7HdDApYYK++SPNQ2Nxg=";
+ sha256 = "sha256-5ZBaF/6p/eOWjAmo+IlF9zCb9xBr2bP6suPZblRogUg=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
index 4a3c292721..cf7b161261 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
@@ -18,7 +18,7 @@
}:
buildPythonPackage rec {
- pname = "python-slackclient";
+ pname = "slackclient";
version = "2.9.3";
disabled = !isPy3k;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix
new file mode 100644
index 0000000000..3308697cf5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "smhi-pkg";
+ version = "1.0.14";
+
+ src = fetchFromGitHub {
+ owner = "joysoftware";
+ repo = "pypi_smhi";
+ rev = version;
+ sha256 = "186xwrg3hvr0hszq2kxvygd241q2sp11gfk6mwj9z4zqywwfcbn3";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Disable tests that needs network access
+ "test_smhi_integration_test"
+ "test_smhi_async_integration_test"
+ "test_smhi_async_integration_test_use_session"
+ "test_smhi_async_get_forecast_integration2"
+ "test_async_error_from_api"
+ ];
+
+ pythonImportsCheck = [ "smhi" ];
+
+ meta = with lib; {
+ description = "Python library for accessing SMHI open forecast data";
+ homepage = "https://github.com/joysoftware/pypi_smhi";
+ changelog = "https://github.com/joysoftware/pypi_smhi/releases/tag/${version}";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
index 702b0e3e36..95d162b7f3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
@@ -1,24 +1,31 @@
{ lib
, buildPythonPackage
, construct
-, fetchPypi
+, fetchFromGitHub
, isPy3k
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "snapcast";
- version = "2.1.2";
+ version = "2.1.3";
disabled = !isPy3k;
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-ILBleqxEO7wTxAw/fvDW+4O4H4XWV5m5WWtaNeRBr4g=";
+ src = fetchFromGitHub {
+ owner = "happyleavesaoc";
+ repo = "python-snapcast";
+ rev = version;
+ sha256 = "1jigdccdd7bffszim942mxcwxyznfjx7y3r5yklz3psl7zgbzd6c";
};
- propagatedBuildInputs = [ construct ];
+ propagatedBuildInputs = [
+ construct
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
- # no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23
- doCheck = false;
pythonImportsCheck = [ "snapcast" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sparklines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparklines/default.nix
new file mode 100644
index 0000000000..9913cafdbc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sparklines/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "sparklines";
+ version = "0.4.2";
+
+ src = fetchFromGitHub {
+ owner = "deeplook";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1hfxp5c4wbyddy7fgmnda819w3dia3i6gqb2323dr2z016p84r7l";
+ };
+
+ propagatedBuildInputs = [ future ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "sparklines" ];
+
+ meta = with lib; {
+ description = "This Python package implements Edward Tufte's concept of sparklines, but limited to text only";
+ homepage = "https://github.com/deeplook/sparklines";
+ maintainers = with maintainers; [ rhoriguchi ];
+ license = licenses.gpl3Only;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix
new file mode 100644
index 0000000000..53d6d51d2d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, six
+, pyyaml
+, rdflib
+, ply
+, xmltodict
+, pytestCheckHook
+, pythonAtLeast
+}:
+buildPythonPackage rec {
+ pname = "spdx-tools";
+ version = "0.6.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "9a1aaae051771e865705dd2fd374c3f73d0ad595c1056548466997551cbd7a81";
+ };
+
+ patches = lib.optionals (pythonAtLeast "3.9") [
+ # https://github.com/spdx/tools-python/pull/159
+ # fixes tests on Python 3.9
+ (fetchpatch {
+ name = "drop-encoding-argument.patch";
+ url = "https://github.com/spdx/tools-python/commit/6c8b9a852f8a787122c0e2492126ee8aa52acff0.patch";
+ sha256 = "RhvLhexsQRjqYqJg10SAM53RsOW+R93G+mns8C9g5E8=";
+ })
+ ];
+
+ propagatedBuildInputs = [
+ six
+ pyyaml
+ rdflib
+ ply
+ xmltodict
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "spdx"
+ ];
+
+ meta = with lib; {
+ description = "SPDX parser and tools";
+ homepage = "https://github.com/spdx/tools-python";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-material/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-material/default.nix
new file mode 100644
index 0000000000..aa6dc0d6bf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-material/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, sphinx
+, beautifulsoup4
+, python-slugify
+, unidecode
+, css-html-js-minify
+, lxml
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-material";
+ version = "0.0.32";
+
+ src = fetchPypi {
+ pname = "sphinx_material";
+ inherit version;
+ sha256 = "ec02825a1bbe8b662fe624c11b87f1cd8d40875439b5b18c38649cf3366201fa";
+ };
+
+ propagatedBuildInputs = [
+ sphinx
+ beautifulsoup4
+ python-slugify
+ unidecode
+ css-html-js-minify
+ lxml
+ ];
+
+ doCheck = false; # no tests
+
+ pythonImportsCheck = [ "sphinx_material" ];
+
+ meta = with lib; {
+ description = "A material-based, responsive theme inspired by mkdocs-material";
+ homepage = "https://bashtage.github.io/sphinx-material";
+ license = licenses.mit;
+ maintainers = with maintainers; [ FlorianFranzen ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-serve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-serve/default.nix
new file mode 100644
index 0000000000..ca2b587e3a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-serve/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-serve";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8d90f6595114108500b1f935d3f4d07bf5192783c67ce83f944ef289099669c9";
+ };
+
+ doCheck = false; # No tests
+
+ pythonImportsCheck = [ "sphinx_serve" ];
+
+ meta = with lib; {
+ description = "Spawns a simple HTTP server to preview your sphinx documents";
+ homepage = "https://github.com/tlatsas/sphinx-serve";
+ maintainers = with maintainers; [ FlorianFranzen ];
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix
index 99a2d85aaa..34b1eed172 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix
@@ -1,16 +1,19 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchPypi
, wrapio
}:
buildPythonPackage rec {
pname = "survey";
- version = "3.4.2";
+ version = "3.4.3";
+
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY=";
+ sha256 = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix
new file mode 100644
index 0000000000..a7aca8866e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, capstone
+, pyelftools
+, tlsh
+, nose
+}:
+buildPythonPackage {
+ pname = "telfhash";
+ version = "unstable-2021-01-29";
+
+ src = fetchFromGitHub {
+ owner = "trendmicro";
+ repo = "telfhash";
+ rev = "b5e398e59dc25a56a28861751c1fccc74ef71617";
+ sha256 = "jNu6qm8Q/UyJVaCqwFOPX02xAR5DwvCK3PaH6Fvmakk=";
+ };
+
+ # The tlsh library's name is just "tlsh"
+ postPatch = ''
+ substituteInPlace requirements.txt --replace "python-tlsh" "tlsh"
+ '';
+
+ propagatedBuildInputs = [
+ capstone
+ pyelftools
+ tlsh
+ ];
+
+ checkInputs = [
+ nose
+ ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ pythonImportsCheck = [
+ "telfhash"
+ ];
+
+ meta = with lib; {
+ description = "Symbol hash for ELF files";
+ homepage = "https://github.com/trendmicro/telfhash";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
index ef6d4f45ef..7b9cbf1f99 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
@@ -96,10 +96,19 @@ in buildPythonPackage {
# Unpack the wheel file.
wheel unpack --dest unpacked ./*.whl
- # Tensorflow has a hard dependency on gast==0.2.2, but we relax it to
- # gast==0.3.2.
- substituteInPlace ./unpacked/tensorflow*/tensorflow_core/tools/pip_package/setup.py --replace "gast == 0.2.2" "gast == 0.3.2"
- substituteInPlace ./unpacked/tensorflow*/tensorflow_*.dist-info/METADATA --replace "gast (==0.2.2)" "gast (==0.3.2)"
+ # Tensorflow wheels tightly constrain the versions of gast, tensorflow-estimator and scipy.
+ # This code relaxes these requirements:
+ substituteInPlace ./unpacked/tensorflow*/tensorflow_core/tools/pip_package/setup.py \
+ --replace "tensorflow_estimator >= 2.1.0rc0, < 2.2.0" "tensorflow_estimator" \
+ --replace "tensorboard >= 2.1.0, < 2.2.0" "tensorboard" \
+ --replace "gast == 0.2.2" "gast" \
+ --replace "scipy == 1.2.2" "scipy"
+
+ substituteInPlace ./unpacked/tensorflow*/tensorflow*.dist-info/METADATA \
+ --replace "gast (==0.2.2)" "gast" \
+ --replace "tensorflow-estimator (<2.2.0,>=2.1.0rc0)" "tensorflow_estimator" \
+ --replace "tensorboard (<2.2.0,>=2.1.0)" "tensorboard" \
+ --replace "scipy (==1.4.1)" "scipy"
# Pack the wheel file back up.
wheel pack ./unpacked/tensorflow*
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix
new file mode 100644
index 0000000000..6247087dd6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyyaml
+, docker
+, dockerfile-parse
+, requests
+, stevedore
+, pbr
+, debut
+, regex
+, GitPython
+, prettytable
+, idna
+}:
+buildPythonPackage rec {
+ pname = "tern";
+ version = "2.5.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727";
+ };
+
+ preBuild = ''
+ cp requirements.{in,txt}
+ '';
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ propagatedBuildInputs = [
+ pyyaml
+ docker
+ dockerfile-parse
+ requests
+ stevedore
+ debut
+ regex
+ GitPython
+ prettytable
+ idna
+ ];
+
+ # No tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "tern"
+ ];
+
+ meta = with lib; {
+ description = "A software composition analysis tool and Python library that generates a Software Bill of Materials for container images and Dockerfiles";
+ homepage = "https://github.com/tern-tools/tern";
+ license = licenses.bsd2;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
index 70893dc541..ae89b3ee0b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "tqdm";
- version = "4.58.0";
+ version = "4.60.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2";
+ sha256 = "ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae";
};
nativeBuildInputs = [
@@ -39,14 +39,19 @@ buildPythonPackage rec {
# Remove performance testing.
# Too sensitive for on Hydra.
- PYTEST_ADDOPTS = "-k \"not perf\"";
+ disabledTests = [
+ "perf"
+ ];
LC_ALL="en_US.UTF-8";
- meta = {
+ pythonImportsCheck = [ "tqdm" ];
+
+ meta = with lib; {
description = "A Fast, Extensible Progress Meter";
homepage = "https://github.com/tqdm/tqdm";
- license = with lib.licenses; [ mit ];
- maintainers = with lib.maintainers; [ fridh ];
+ changelog = "https://tqdm.github.io/releases/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fridh ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
index 11f596e01d..316709c204 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "twitterapi";
- version = "2.7.1";
+ version = "2.7.2";
src = fetchFromGitHub {
owner = "geduldig";
repo = "TwitterAPI";
rev = "v${version}";
- sha256 = "sha256-fLexFlnoh58b9q4mo9atGQmMttKytTfAYmaPj6xmPj8=";
+ sha256 = "sha256-kSL+zAWn/6itBu4T1OcIbg4k5Asatgz/dqzbnlcsqkg=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix
new file mode 100644
index 0000000000..c1208193f0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools-scm
+, attrs
+, pdfminer
+, commoncode
+, plugincode
+, binaryornot
+, typecode-libmagic
+, pytestCheckHook
+, pytest-xdist
+}:
+buildPythonPackage rec {
+ pname = "typecode";
+ version = "21.2.24";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "eaac8aee0b9c6142ad44671252ba00748202d218347d1c0451ce6cd76561e01b";
+ };
+
+ dontConfigure = true;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ attrs
+ pdfminer
+ commoncode
+ plugincode
+ binaryornot
+ typecode-libmagic
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-xdist
+ ];
+
+ pythonImportsCheck = [
+ "typecode"
+ ];
+
+ meta = with lib; {
+ description = "Comprehensive filetype and mimetype detection using libmagic and Pygments";
+ homepage = "https://github.com/nexB/typecode";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix b/third_party/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix
new file mode 100644
index 0000000000..9b652e664e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix
@@ -0,0 +1,51 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, plugincode
+, file
+, zlib
+, pytest
+}:
+buildPythonPackage rec {
+ pname = "typecode-libmagic";
+ version = "21.4.4";
+
+ src = fetchFromGitHub {
+ owner = "nexB";
+ repo = "scancode-plugins";
+ rev = "v${version}";
+ sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A=";
+ };
+
+ sourceRoot = "source/builtins/typecode_libmagic-linux";
+
+ propagatedBuildInputs = [
+ plugincode
+ ];
+
+ preBuild = ''
+ pushd src/typecode_libmagic
+
+ rm data/magic.mgc lib/libmagic.so lib/libz-lm539.so.1
+ ln -s ${file}/share/misc/magic.mgc data/magic.mgc
+ ln -s ${file}/lib/libmagic.so lib/libmagic.so
+ ln -s ${zlib}/lib/libz.so lib/libz-lm539.so.1
+
+ popd
+ '';
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "typecode_libmagic"
+ ];
+
+ meta = with lib; {
+ description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
+ homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/typecode_libmagic-linux";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urlpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urlpy/default.nix
new file mode 100644
index 0000000000..cd0e028c50
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/urlpy/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, publicsuffix2
+, pytestCheckHook
+, pythonAtLeast
+}:
+buildPythonPackage rec {
+ pname = "urlpy";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "nexB";
+ repo = "urlpy";
+ rev = "v${version}";
+ sha256 = "962jLyx+/GS8wrDPzG2ONnHvtUG5Pqe6l1Z5ml63Cmg=";
+ };
+
+ dontConfigure = true;
+
+ propagatedBuildInputs = [
+ publicsuffix2
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = lib.optionals (pythonAtLeast "3.9") [
+ # Fails with "AssertionError: assert 'unknown' == ''"
+ "test_unknown_protocol"
+ ];
+
+ pythonImportsCheck = [
+ "urlpy"
+ ];
+
+ meta = with lib; {
+ description = "Simple URL parsing, canonicalization and equivalence";
+ homepage = "https://github.com/nexB/urlpy";
+ license = licenses.mit;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix
new file mode 100644
index 0000000000..e94c96f72b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchFromGitHub
+, funcy
+, pefile
+, vivisect
+, intervaltree
+, setuptools
+}:
+buildPythonPackage rec {
+ pname = "viv-utils";
+ version = "0.3.17";
+ disabled = isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "williballenthin";
+ repo = "viv-utils";
+ rev = "v${version}";
+ sha256 = "wZWp6PMn1to/jP6lzlY/x0IhS/0w0Ys7AdklNQ+Vmyc=";
+ };
+
+ # argparse is provided by Python itself
+ preBuild = ''
+ sed '/"argparse",/d' -i setup.py
+ '';
+
+ propagatedBuildInputs = [
+ funcy
+ pefile
+ vivisect
+ intervaltree
+ setuptools
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "viv_utils"
+ ];
+
+ meta = with lib; {
+ description = "Utilities for working with vivisect";
+ homepage = "https://github.com/williballenthin/viv-utils";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix
new file mode 100644
index 0000000000..0d86f2ffbd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, pyasn1
+, pyasn1-modules
+, cxxfilt
+, msgpack
+, pycparser
+}:
+buildPythonPackage rec {
+ pname = "vivisect";
+ version = "0.1.0";
+ disabled = isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ed5e8c24684841d30dc7b41f2bee87c0198816a453417ae2e130b7845ccb2629";
+ };
+
+ propagatedBuildInputs = [
+ pyasn1
+ pyasn1-modules
+ cxxfilt
+ msgpack
+ pycparser
+ ];
+
+ preBuild = ''
+ sed "s@==.*'@'@" -i setup.py
+ '';
+
+ # requires another repo for test files
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "vivisect"
+ ];
+
+ meta = with lib; {
+ description = "Pure python disassembler, debugger, emulator, and static analysis framework";
+ homepage = "https://github.com/vivisect/vivisect";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
index ef80dedeb9..df9586fc8e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
@@ -2,32 +2,22 @@
, stdenv
, buildPythonPackage
, fetchPypi
-, fetchpatch
, argh
, pathtools
, pyyaml
-, pytest-cov
, pytestCheckHook
, CoreServices
}:
buildPythonPackage rec {
pname = "watchdog";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Uy/t2ZPnVVRnH6o2zQTFgM7T+uCEJUp3mvu9iq8AVms=";
+ sha256 = "sha256-QojTqYQyTbSS5XqhaWZiOKJXjwr1oIFoVSZgj7n2vWE=";
};
- patches = [
- (fetchpatch {
- # Fix test flakiness on Apple Silicon, remove after upgrade to 2.0.6.
- url = "https://github.com/gorakhargosh/watchdog/commit/331fd7c2c819663be39bc146e78ce67553f265fa.patch";
- sha256 = "sha256-pLkZmbPN3qRNHs53OP0HIyDxqYCPPo6yOcBLD3aO2YE=";
- })
- ];
-
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
propagatedBuildInputs = [
@@ -37,10 +27,15 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest-cov
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "--cov=watchdog" "" \
+ --replace "--cov-report=term-missing" ""
+ '';
+
pythonImportsCheck = [ "watchdog" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix
index 759bc0cd8e..ef69283e6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix
@@ -1,19 +1,18 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytestCheckHook
, inetutils
}:
buildPythonPackage rec {
pname = "whois";
- version = "0.9.7";
+ version = "0.9.13";
src = fetchFromGitHub {
owner = "DannyCork";
repo = "python-whois";
rev = version;
- sha256 = "1rbc4xif4dn455vc8dhxdvwszrb0nik5q9fy12db6mxfx6zikb7z";
+ sha256 = "0y2sfs6nkr2j2crrn81wkfdzn9aphb3iaddya5zd2midlgdqq7bw";
};
# whois is needed
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/woodblock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/woodblock/default.nix
new file mode 100644
index 0000000000..7497ad1548
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/woodblock/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, click
+, multimethod
+, numpy
+}:
+buildPythonPackage rec {
+ pname = "woodblock";
+ version = "0.1.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "c0347ece920b7009d94551983a01f42db02920ca8d7b0ff36d24a337e2c937f7";
+ };
+
+ propagatedBuildInputs = [
+ click
+ multimethod
+ numpy
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "woodblock"
+ ];
+
+ meta = with lib; {
+ description = "A framework to generate file carving test data";
+ homepage = "https://github.com/fkie-cad/woodblock";
+ license = licenses.mit;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
index a181a67418..aefe3ed2b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
- version = "0.18.0";
+ version = "0.18.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
- sha256 = "sha256-8g8DrFvhecdPsfiw+uKnfJOrLQeuFUziK2Jl3xKmrf4=";
+ sha256 = "sha256-Zf7Od3v54LxMofm67XHeRM4Yeg1+KQLRhFl1BihAxGc=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
index 1f211cd287..4728da51a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "ytmusicapi";
- version = "0.15.1";
+ version = "0.16.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-W/eZubJ/SNLBya1S6wLUwTwZCUD+wCQ5FAuNcSpl+9Y=";
+ sha256 = "sha256-/94/taeBI6xZ3uN/wfMnk/NPmk+j0+aaH8CAZBEsK10=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix
new file mode 100644
index 0000000000..61dba04a79
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-aiohttp
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "zwave-js-server-python";
+ version = "0.23.1";
+ disabled = pythonOlder "3.8";
+
+
+ src = fetchFromGitHub {
+ owner = "home-assistant-libs";
+ repo = pname;
+ rev = version;
+ sha256 = "0kmmhn357k22ana0ysd8jlz1fyfaqlc8k74ryaik0rrw7nmn1n11";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ pytest-aiohttp
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "zwave_js_server" ];
+
+ meta = with lib; {
+ description = "Python wrapper for zwave-js-server";
+ homepage = "https://github.com/home-assistant-libs/zwave-js-server-python";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index aa3ba723cf..8c8ea1a5ff 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.148.0";
+ version = "0.149.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "sha256-DPHDuTBCsRq+u5kYHwImIXPxq04kW2HiqYsxJrun6n8=";
+ sha256 = "sha256-/pNCEsCKfYh/jo+3x7usRyPNBRJB4gDu2TAgosSw37c=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
index cdade7c273..e59c48f91d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
@@ -1,5 +1,4 @@
{ lib
-, fetchpatch
, stdenv
, fetchFromGitHub
, buildPackages
@@ -27,44 +26,24 @@
, luaBindings ? false
}:
-let
- inherit (lib) optional;
-
- #
- # DO NOT EDIT! Automatically generated by ./update.py
- gittap = "5.2.0";
- gittip = "cf3db945083fb4dab951874e5ec1283128deab11";
- rev = "5.2.0";
- version = "5.2.0";
- sha256 = "08azxfk6mw2vr0x4zbz0612rk7pj4mfz8shrzc9ima77wb52b8sm";
- #
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "radare2";
- inherit version;
+ version = "5.2.1";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
- inherit rev sha256;
+ rev = version;
+ sha256 = "0n3k190qjhdlj10fjqijx6ismz0g7fk28i83j0480cxdqgmmlbxc";
};
- patches = [
- # fix build against openssl, included in next release
- (fetchpatch {
- url = "https://github.com/radareorg/radare2/commit/e5e7469b6450c374e0884d35d44824e1a4eb46b4.patch";
- sha256 = "sha256-xTmMHvUdW7d2QG7d4hlvMgEcegND7pGU745TWGqzY44=";
- })
- ];
-
postInstall = ''
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
'';
WITHOUT_PULL = "1";
makeFlags = [
- "GITTAP=${gittap}"
- "GITTIP=${gittip}"
+ "GITTAP=${version}"
"RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib"
];
configureFlags = [
@@ -89,10 +68,10 @@ stdenv.mkDerivation {
zlib
openssl
libuv
- ] ++ optional useX11 [ gtkdialog vte gtk2 ]
- ++ optional rubyBindings [ ruby ]
- ++ optional pythonBindings [ python3 ]
- ++ optional luaBindings [ lua ];
+ ] ++ lib.optional useX11 [ gtkdialog vte gtk2 ]
+ ++ lib.optional rubyBindings [ ruby ]
+ ++ lib.optional pythonBindings [ python3 ]
+ ++ lib.optional luaBindings [ lua ];
propagatedBuildInputs = [
# radare2 exposes r_lib which depends on these libraries
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py
deleted file mode 100755
index e1dfc071cd..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -p nix -p python3 -p git -i python
-# USAGE - just run the script: ./update.py
-# When editing this file, make also sure it passes the mypy typecheck
-# and is formatted with black.
-import fileinput
-import json
-import xml.etree.ElementTree as ET
-from urllib.parse import urlparse
-import re
-import subprocess
-import tempfile
-import urllib.request
-from datetime import datetime
-from pathlib import Path
-from typing import Dict
-
-SCRIPT_DIR = Path(__file__).parent.resolve()
-
-
-def sh(*args: str) -> str:
- out = subprocess.check_output(list(args))
- return out.strip().decode("utf-8")
-
-
-def prefetch_github(owner: str, repo: str, ref: str) -> str:
- return sh(
- "nix-prefetch-url",
- "--unpack",
- f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz",
- )
-
-
-def get_radare2_rev() -> str:
- feed_url = "https://github.com/radareorg/radare2/releases.atom"
- with urllib.request.urlopen(feed_url) as resp:
- tree = ET.fromstring(resp.read())
- releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry")
- for release in releases:
- link = release.find("{http://www.w3.org/2005/Atom}link")
- assert link is not None
- url = urlparse(link.attrib["href"])
- tag = url.path.split("/")[-1]
- if re.match(r"[0-9.]+", tag):
- return tag
- else:
- print(f"ignore {tag}")
- raise RuntimeError(f"No release found at {feed_url}")
-
-
-def git(dirname: str, *args: str) -> str:
- return sh("git", "-C", dirname, *args)
-
-
-def get_repo_info(dirname: str, rev: str) -> Dict[str, str]:
- sha256 = prefetch_github("radare", "radare2", rev)
-
- return dict(
- rev=rev,
- sha256=sha256,
- version_commit=git(dirname, "rev-list", "--all", "--count"),
- gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"),
- gittip=git(dirname, "rev-parse", "HEAD"),
- )
-
-
-def main() -> None:
- version = get_radare2_rev()
-
- with tempfile.TemporaryDirectory() as dirname:
- git(
- dirname,
- "clone",
- "--branch",
- version,
- "https://github.com/radare/radare2",
- ".",
- )
- nix_file = str(SCRIPT_DIR.joinpath("default.nix"))
-
- info = get_repo_info(dirname, version)
-
- timestamp = git(dirname, "log", "-n1", "--format=%at")
-
- in_block = False
- with fileinput.FileInput(nix_file, inplace=True) as f:
- for l in f:
- if "#" in l:
- in_block = True
- print(
- f""" #
- # DO NOT EDIT! Automatically generated by ./update.py
- gittap = "{info["gittap"]}";
- gittip = "{info["gittip"]}";
- rev = "{info["rev"]}";
- version = "{version}";
- sha256 = "{info["sha256"]}";
- #"""
- )
- elif "#" in l:
- in_block = False
- elif not in_block:
- print(l, end="")
-
-
-if __name__ == "__main__":
- main()
diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
index 6b94ed0a93..0be3f5c0b7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
- version = "10.9.0";
+ version = "10.10.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "v${version}";
- sha256 = "sha256-IVbvBqp/7Y3La0pP6gbWl0ATfEvkCuR4J9ChTDPNhB0=";
+ sha256 = "sha256-gWU219QlV+24RxnTHqQzQeGZHzVwmBXNKU+3QI6WvHI=";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-mj1TvNuFFPJGAJCBTQtU5WWPhHbiXUxRiMZQ/XvEy0U=";
+ vendorSha256 = "sha256-d965Rt8W74bsIZAZPZLe3twuUpp4wrnNc0qwjsKikOE=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
index c275d5bc30..0b893ea808 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, jdk11, ant, python3, watchman, bash, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, jdk8, ant, python3, watchman, bash, makeWrapper }:
stdenv.mkDerivation rec {
pname = "buck";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g"
'';
- nativeBuildInputs = [ makeWrapper python3 jdk11 ant watchman ];
+ nativeBuildInputs = [ makeWrapper python3 jdk8 ant watchman ];
buildPhase = ''
# Set correct version, see https://github.com/facebook/buck/issues/2607
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck
wrapProgram $out/bin/buck \
- --prefix PATH : "${lib.makeBinPath [ jdk11 watchman python3 ]}"
+ --prefix PATH : "${lib.makeBinPath [ jdk8 watchman python3 ]}"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix
index 5539489afb..5484652d38 100644
--- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix
@@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
pname = "clj-kondo";
- version = "2021.02.13";
+ version = "2021.03.31";
reflectionJson = fetchurl {
name = "reflection.json";
- url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json";
- sha256 = "ea5c18586fd8803b138a4dd197a0019d5e5a2c76ebe4925b9b54a10125a68c57";
+ url = "https://raw.githubusercontent.com/clj-kondo/${pname}/v${version}/reflection.json";
+ sha256 = "sha256-C4QYk5lLienCHKnWXXZPcKmsCTMtIIkXOkvCrZfyIhA=";
};
src = fetchurl {
- url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
- sha256 = "sha256-Rq7W5sP9nRB0TGRUSQIyC3U568uExmcM/gd+1HjAqac=";
+ url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
+ sha256 = "sha256-XSs0u758wEuaqZvFIevBrL61YNPUJ9Sc1DS+O9agj94=";
};
dontUnpack = true;
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A linter for Clojure code that sparks joy";
- homepage = "https://github.com/borkdude/clj-kondo";
+ homepage = "https://github.com/clj-kondo/clj-kondo";
license = licenses.epl10;
platforms = graalvm11-ce.meta.platforms;
maintainers = with maintainers; [ jlesquembre bandresen ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
index 9085be1428..6254ec0a2c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloud-nuke";
- version = "0.1.28";
+ version = "0.1.29";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-UssjIix2sFLqau5PMFNDP9XPCSNUdRO6aBixIQNtSy8=";
+ sha256 = "sha256-RPlEFajIjEBKdL97xjQP6r3AAcCQlxw2Il8nkSjxa+k=";
};
vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
index e453a78dec..b03dcc89d4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
@@ -20,7 +20,7 @@
}:
let
pname = "github-actions-runner";
- version = "2.277.1";
+ version = "2.278.0";
deps = (import ./deps.nix { inherit fetchurl; });
nugetPackages = map
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
- rev = "183a3dd9a0d4d51feddc5fe9fa6c3b5f8b08343d"; # v${version}
- sha256 = "sha256-fQH4QwdR8E76ckUjMCaKOsDjNoVBIWAw2YcFRrVucX8=";
+ rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version}
+ sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile
new file mode 100644
index 0000000000..f87a033ad7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'pgsync'
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock
new file mode 100644
index 0000000000..5ee736430a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/Gemfile.lock
@@ -0,0 +1,23 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ parallel (1.20.1)
+ pg (1.2.3)
+ pgsync (0.6.6)
+ parallel
+ pg (>= 0.18.2)
+ slop (>= 4.8.2)
+ tty-spinner
+ slop (4.8.2)
+ tty-cursor (0.7.1)
+ tty-spinner (0.9.3)
+ tty-cursor (~> 0.7)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ pgsync
+
+BUNDLED WITH
+ 2.1.4
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/default.nix
new file mode 100644
index 0000000000..f89b25bf0a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/default.nix
@@ -0,0 +1,15 @@
+{ lib, bundlerApp }:
+
+bundlerApp rec {
+ gemdir = ./.;
+ pname = "pgsync";
+ exes = [ "pgsync" ];
+
+ meta = with lib; {
+ description = "Sync data from one Postgres database to another (like `pg_dump`/`pg_restore`)";
+ homepage = "https://github.com/ankane/pgsync";
+ license = with licenses; mit;
+ maintainers = with maintainers; [ fabianhjr ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix
new file mode 100644
index 0000000000..18a8339707
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/database/pgsync/gemset.nix
@@ -0,0 +1,64 @@
+{
+ parallel = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
+ type = "gem";
+ };
+ version = "1.20.1";
+ };
+ pg = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
+ type = "gem";
+ };
+ version = "1.2.3";
+ };
+ pgsync = {
+ dependencies = ["parallel" "pg" "slop" "tty-spinner"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr";
+ type = "gem";
+ };
+ version = "0.6.6";
+ };
+ slop = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3";
+ type = "gem";
+ };
+ version = "4.8.2";
+ };
+ tty-cursor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
+ type = "gem";
+ };
+ version = "0.7.1";
+ };
+ tty-spinner = {
+ dependencies = ["tty-cursor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
+ type = "gem";
+ };
+ version = "0.9.3";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix
index 5ecaddc6f1..f0d8a5ac6e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dockle";
- version = "0.3.11";
+ version = "0.3.13";
src = fetchFromGitHub {
owner = "goodwithtech";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw=";
+ sha256 = "sha256-U0nIGuQ4QjBaCck0Kg1RTS2IQwfivN3VI5vxh8lxAYE=";
};
- vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4=";
+ vendorSha256 = "sha256-uHHm4AgnjTdPgpu3OpXXIRzrGhkpOoRY8qynfl7DO6w=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix
new file mode 100644
index 0000000000..33c47c7aed
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix
@@ -0,0 +1,22 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "esbuild";
+ version = "0.11.13";
+
+ src = fetchFromGitHub {
+ owner = "evanw";
+ repo = "esbuild";
+ rev = "v${version}";
+ sha256 = "0v358n2vpa1l1a699zyq43yzb3lcxjp3k4acppx0ggva05qn9zd1";
+ };
+
+ vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q";
+
+ meta = with lib; {
+ description = "An extremely fast JavaScript bundler";
+ homepage = "https://esbuild.github.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lucus16 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix
index 6c6d6343d4..e9bc48b0dc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gotestsum";
- version = "1.6.3";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "gotestyourself";
repo = "gotestsum";
rev = "v${version}";
- sha256 = "sha256-xUDhJLTO3JZ7rlUUzcypUev60qmRK9zOlO2VYeXqT4o=";
+ sha256 = "sha256-5iSUk/J73enbc/N3bn7M4oj2A0yoF1jTWpnXD380hFI=";
};
vendorSha256 = "sha256-sHi8iW+ZV/coeAwDUYnSH039UNtUO9HK0Bhz9Gmtv8k=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix
index c6863d535d..5b3f966399 100644
--- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }:
+{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "just";
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw=";
nativeBuildInputs = [ installShellFiles ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
postInstall = ''
installManPage man/just.1
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
index 2efe752c36..cb6263aca4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, fetchFromGitHub, jre}:
+{lib, stdenv, fetchpatch, fetchurl, fetchFromGitHub, jre}:
stdenv.mkDerivation rec {
pname = "antlr";
@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "1i0w2v9prrmczlwkfijfp4zfqfgrss90a7yk2hg3y0gkg2s4abbk";
};
+ patches = [
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/antlr3/raw/f1bb8d639678047935e1761c3bf3c1c7da8d0f1d/f/0006-antlr3memory.hpp-fix-for-C-20-mode.patch";
+ sha256 = "0apk904afjqbad6c7z9r72a9lkbz69vwrl8j2a6zgxjn8dfb2p8b";
+ })
+ ];
+
installPhase = ''
mkdir -p "$out"/{lib/antlr,bin,include}
cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar"
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index 0ce151f650..293b8bb095 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -71,6 +71,35 @@ let
in
lib.mapAttrs change grammars;
+ # Usage:
+ # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
+ #
+ # or for all grammars:
+ # pkgs.tree-sitter.withPlugins (_: allGrammars)
+ # which is equivalent to
+ # pkgs.tree-sitter.withPlugins (p: builtins.attrValues p)
+ withPlugins = grammarFn:
+ let
+ grammars = grammarFn builtGrammars;
+ in
+ linkFarm "grammars"
+ (map
+ (drv:
+ let
+ name = lib.strings.getName drv;
+ in
+ {
+ name =
+ (lib.strings.removePrefix "tree-sitter-"
+ (lib.strings.removeSuffix "-grammar" name))
+ + stdenv.hostPlatform.extensions.sharedLibrary;
+ path = "${drv}/parser";
+ }
+ )
+ grammars);
+
+ allGrammars = builtins.attrValues builtGrammars;
+
in
rustPlatform.buildRustPackage {
pname = "tree-sitter";
@@ -111,7 +140,7 @@ rustPlatform.buildRustPackage {
updater = {
inherit update-all-grammars;
};
- inherit grammars builtGrammars;
+ inherit grammars builtGrammars withPlugins allGrammars;
tests = {
# make sure all grammars build
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index 03c4bb06a0..dd6a3a380b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
- "rev": "70fd2cba742506903589b5e046c32e0e3e06404a",
- "date": "2021-03-03T17:18:54-08:00",
- "path": "/nix/store/m0pzbb0vg0fm9nycj05ay0yldzp7qwbi-tree-sitter-c-sharp",
- "sha256": "12jj66rsn1klsk24yj0ymgsqwy7lc5kb3nkj7griip8rmi3kgy41",
+ "rev": "09749b7b5428e770cc2ebdf2e90029c0f4a2d411",
+ "date": "2021-04-13T07:05:48+01:00",
+ "path": "/nix/store/w99nivk866bglvijxb5m0c789qh99x1m-tree-sitter-c-sharp",
+ "sha256": "17n7r1j1ib3gzjf0qw88512flzamjrvilksbf1p15dqa17rmwyq1",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
index 3d98f69f05..13fd968170 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
- "rev": "5aa0bbbfc41868a3727b7a89a90e9f52e0964b2b",
- "date": "2021-03-03T17:00:36-08:00",
- "path": "/nix/store/2wa64ii39p31wpngvqk4ni8z8ws29r2g-tree-sitter-c",
- "sha256": "1diys8yigvhm4ppbmp3a473yxjg2d5lk11y0ay7qprcz7233lakv",
+ "rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae",
+ "date": "2021-03-28T09:12:10-07:00",
+ "path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c",
+ "sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index fcd0457454..f88c5f9cf9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
- "rev": "05cf2030e5415e9e931f620f0924107f73976796",
- "date": "2021-03-04T10:01:34-08:00",
- "path": "/nix/store/fraya34acwl9i3cxpml9hwzfkyc8vs89-tree-sitter-cpp",
- "sha256": "08ywv6n80sa541rr08bqz4zyg7byvjcabp68lvxmcahjk8xzcgwk",
+ "rev": "c61212414a3e95b5f7507f98e83de1d638044adc",
+ "date": "2021-03-27T10:08:51-07:00",
+ "path": "/nix/store/a8cd3sv1j900sd8l7cdjw91iw7pp3jhv-tree-sitter-cpp",
+ "sha256": "04nv9j03q20idk9pnm2lgw7rbwzy5jf9v0y6l102by68z4lv79fi",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
index 8d3c6608ab..85e2f5e71b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/travonted/tree-sitter-fennel",
- "rev": "5aad9d1f490b7fc8a847a5b260f23396c56024f5",
- "date": "2020-11-03T09:22:17-05:00",
- "path": "/nix/store/gsxg67brk198201h70lip7miwny084sy-tree-sitter-fennel",
- "sha256": "1imv5nwmhsyxwq7b9z4qz72lfva40wgybdkmq0gbbfbszl9a9bgl",
+ "rev": "bc689e2ef264e2cba499cfdcd16194e8f5fe87d2",
+ "date": "2021-03-09T16:47:45-05:00",
+ "path": "/nix/store/3h4j1mrqvn0ybqjalic92bnhk7c15442-tree-sitter-fennel",
+ "sha256": "1jm21bmsdrz9x5skqmx433q9b4mfi88gzc4la5hqps4is28inqms",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index d0a7188c6b..6783d4381f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
- "rev": "e41dd569d91eb58725baa7089c34fc3d785b2978",
- "date": "2021-03-03T17:11:05-08:00",
- "path": "/nix/store/87n5nl5p1fnmwgy0zshz90vyvha6b7mn-tree-sitter-go",
- "sha256": "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x",
+ "rev": "2a83dfdd759a632651f852aa4dc0af2525fae5cd",
+ "date": "2021-03-09T16:11:33-05:00",
+ "path": "/nix/store/2jk1bacllxsii8nlbc5lyi3k376ylf3q-tree-sitter-go",
+ "sha256": "001p8kb8g4vghn78690bnav42inkypld2k1mbd5pbmd5svvacfav",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 191a23dd78..3dc04b3b08 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
- "rev": "24cf84ff618e96528882c67c8740fadcd6c4a921",
- "date": "2021-03-06T17:58:27+01:00",
- "path": "/nix/store/46hpbz06d1p5n0rp6z3iwy2lpwrn8kgl-tree-sitter-haskell",
- "sha256": "1l004x1z9g1p8313ipvrf581vr2wi82qcwc0281kg083m2z4535p",
+ "rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b",
+ "date": "2021-04-19T23:45:03+02:00",
+ "path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell",
+ "sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
index 19c8edef5e..c3e5cb9d20 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-java",
- "rev": "7ad106e81963b4d5c0aff99b93d16dc577fa3bc8",
- "date": "2021-03-05T16:03:00-08:00",
- "path": "/nix/store/ax9m7v0pv7q7xsnrjlfdpljs4f6xi2z3-tree-sitter-java",
- "sha256": "1594mrhqcdfs8b7wmwpzcwna4m3ra8cbzq162flwrhcsb3w0rr9w",
+ "rev": "ee8e358637e05188f9f65d8d1ad88a4412c975ce",
+ "date": "2021-04-20T10:40:14-04:00",
+ "path": "/nix/store/8612qackwqdsvbfc03lzc5vds6mvqwxf-tree-sitter-java",
+ "sha256": "19qxfimy8w49gqc97siknd27kvkz73qp2v2118pvdbdz7c5dv27r",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 6f31e096f5..351a0f262c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
- "rev": "b3e7667995c065be724d10b69fbc3d0177ccef0b",
- "date": "2021-03-08T13:12:59-08:00",
- "path": "/nix/store/1y3nirw7bbnld4qy7ysm20bq0x9403wz-tree-sitter-javascript",
- "sha256": "0bzyq5x8x1r34fzy1f05yqdlz51b1i1jmyssm0i571n9n6142s3j",
+ "rev": "a263a8f53266f8f0e47e21598e488f0ef365a085",
+ "date": "2021-04-20T10:37:09-04:00",
+ "path": "/nix/store/y6qbdzdx4g1g1sa2rb7dnk9snjs6lhpp-tree-sitter-javascript",
+ "sha256": "04s1jb9c96kwq0nrh6516idlh58d2b1k66amqa2sl5kk32pl9pmm",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 34f2563b12..ad00365e71 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-json",
- "rev": "89607925e8989f2638cc935b8de7e44ac3c91907",
- "date": "2021-03-04T14:55:58-08:00",
- "path": "/nix/store/xpykb8mr4xarh6finzkz71z2bpqm8k26-tree-sitter-json",
- "sha256": "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff",
+ "rev": "65bceef69c3b0f24c0b19ce67d79f57c96e90fcb",
+ "date": "2021-03-09T16:25:11-05:00",
+ "path": "/nix/store/bn5smxwwg4zzdc52wp2qb6s6yjdfi8mg-tree-sitter-json",
+ "sha256": "13p4ffmajirl9qh64d6qnng1gjnh5f6jkqbra0nlc1260nsf12hp",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
index 164b7c0549..0079a47810 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/ikatyang/tree-sitter-markdown",
- "rev": "5a139bed455268a06410471bf48b19d11abdd367",
- "date": "2021-01-24T15:17:18+08:00",
- "path": "/nix/store/125cbxcqvwyq8b7kvmg7wxjjz16s2jvw-tree-sitter-markdown",
- "sha256": "072b4nnpymrh90y4dk18kr8l1g7m83r3gvp6v0ad9f9dnq47fgax",
+ "rev": "8b8b77af0493e26d378135a3e7f5ae25b555b375",
+ "date": "2021-04-18T20:49:21+08:00",
+ "path": "/nix/store/4z2k0q6rwqmb7vbqr4vgc26w28szlan3-tree-sitter-markdown",
+ "sha256": "1a2899x7i6dgbsrf13qzmh133hgfrlvmjsr3bbpffi1ixw1h7azk",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index 8d0b5aaf0e..eb97bb46f6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
- "rev": "a6bae0619126d70c756c11e404d8f4ad5108242f",
- "date": "2021-02-09T00:48:18-06:00",
- "path": "/nix/store/1rfsi62v549h72vw7ysciaw17vr5h9yx-tree-sitter-nix",
- "sha256": "08n496k0vn7c2751gywl1v40490azlri7c92dr2wfgw5jxhjmb0d",
+ "rev": "d5287aac195ab06da4fe64ccf93a76ce7c918445",
+ "date": "2021-04-21T19:11:29-05:00",
+ "path": "/nix/store/6labzn2qd3wyn4k2ddb09z2avpgqwbp1-tree-sitter-nix",
+ "sha256": "0mapqdqrinskdxlarrrvyd55mjg97gbd6jm9vbjmdm4xi2hhzvxa",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
index d13f77a9f0..941a966468 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ocaml",
- "rev": "19a8d2aab425c4c4c8dc6a882e67c37010620c3b",
- "date": "2021-03-08T16:57:09-08:00",
- "path": "/nix/store/y8jsf6vp278svqm4c6xnl4i6vanslrkk-tree-sitter-ocaml",
- "sha256": "0c5wjanka87bhha0aq3m5p448apxhv8hndlqvhly6qafj99jp85i",
+ "rev": "2f962cf4eb0bee87bba755347a79ee501cd58313",
+ "date": "2021-03-11T02:13:42+01:00",
+ "path": "/nix/store/pwf6di3pdghsnb83c87vvm3w0d5aanvp-tree-sitter-ocaml",
+ "sha256": "1dfan7kbs7i0nz9dkxv8ipn0b341j1fr9fn0a2zfqsx6xxkra56r",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index 8a013179e3..a536d54b65 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
- "rev": "ba231f9844e5a1bf60e1cb72c34c0a431239585a",
- "date": "2021-03-03T17:17:11-08:00",
- "path": "/nix/store/cn06h14pgq3psjq3ms0yvdm3x1wwbc1j-tree-sitter-php",
- "sha256": "1xaml64b7cx3hn6x35bbgar8cp7ccxkwvxddjdvyj5nzfx1id8y3",
+ "rev": "4dcc061668fbc68b79421c72eb8a8baeeb0f3693",
+ "date": "2021-04-19T12:44:47-04:00",
+ "path": "/nix/store/2i80zds4dbynrdim9ngc8yp6yn825byb-tree-sitter-php",
+ "sha256": "0hs6dfw9n6sp7vbp7zfid0f0sxydyya3dyp5ghckz7al069g3vx2",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 976ec6c57c..1b6e562f85 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
- "rev": "dd98afca32aaceff9025f9e85031ac50bee8b08b",
- "date": "2021-03-05T16:00:15-08:00",
- "path": "/nix/store/6sbmzgva73fhgqhsdrg5zy7vbs9lzll9-tree-sitter-python",
- "sha256": "01ykryrv1nn2y8dcbl64d31h1ipz2569ywzjp10pd93h1s6czpnl",
+ "rev": "d6210ceab11e8d812d4ab59c07c81458ec6e5184",
+ "date": "2021-03-27T09:41:53-07:00",
+ "path": "/nix/store/4v24ahydid4hr7kj0xi41mgbpglfnnki-tree-sitter-python",
+ "sha256": "173lpxi4vqa42dcdr9aj5phg5g6ny9ns04djw9n86pasx2w66dhk",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index c88d6e2460..b83bcb2588 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
- "rev": "20f064bd758f94b8f47ce5a21e4383c7349ca182",
- "date": "2021-03-04T14:06:14-08:00",
- "path": "/nix/store/za0yxqjjp9vxgwrp014qwv2v2qffl0di-tree-sitter-rust",
- "sha256": "118vkhv7n3sw8y9pi0987cgdcd74sjqwviijw01mhnk3bkyczi3l",
+ "rev": "a360da0a29a19c281d08295a35ecd0544d2da211",
+ "date": "2021-03-27T09:50:22-07:00",
+ "path": "/nix/store/h4snh879ccy159fa390qr8l0nyaf5ndr-tree-sitter-rust",
+ "sha256": "0knaza3ww5h5w95hzdaalg5yrfpiv0r394q0imadxp5611132hxz",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
index 3ec792c719..b7c214cc72 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
- "rev": "262797b1dfe0303818c2418c0a88f6be65f37245",
- "date": "2021-03-04T15:02:28-08:00",
- "path": "/nix/store/vc5fr00vqx5nf17r9grdwb11wci3xrkm-tree-sitter-scala",
- "sha256": "1zf3b1x1s94dgzjbc6l8ind5fd1mmny3893d4bqc63h4qp0n0bp3",
+ "rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29",
+ "date": "2021-04-01T10:11:15-07:00",
+ "path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala",
+ "sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
index 6cd63a61e8..41c4fcfe73 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/Himujjal/tree-sitter-svelte",
- "rev": "a96899bd1ab6a18e3837f232fd688af69e3a8071",
- "date": "2021-03-09T15:14:24+05:30",
- "path": "/nix/store/nlpf6gilkk19aw7pk1kbys2alhnqagqj-tree-sitter-svelte",
- "sha256": "04virfsiqqhh3gc3cmcjd4s1zn9wdxi47m55x938napaqiaw29nx",
+ "rev": "c696a13a587b0595baf7998f1fb9e95c42750263",
+ "date": "2021-03-20T16:45:11+05:30",
+ "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte",
+ "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 3ff85a0766..a59dd9a000 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
- "rev": "7e119621b1d2ab1873ba14d8702f62458df70409",
- "date": "2021-03-08T13:23:30-08:00",
- "path": "/nix/store/k7vam1w5c2r0hhxy0bgpmj65bw5wnh96-tree-sitter-typescript",
- "sha256": "1fv6q1bc0j6b89skz7x2ibi6bxx0ijrb676y23aahycvz2p8x4z0",
+ "rev": "82916165120f840164f11119f268a4de819ea90b",
+ "date": "2021-04-19T18:16:19-07:00",
+ "path": "/nix/store/0c0kkiiamms3yl3mf1clyrqcjwp5j920-tree-sitter-typescript",
+ "sha256": "1jnf0hn6hmn4x2cvy29mk8g1wlp0afs8immp461by3q5hcq8fzb4",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
index 7ab79c6f2d..5e4e14a95b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-verilog",
- "rev": "ad551aae2649da56582bc0557478a7dc979c0be3",
- "date": "2020-10-13T17:40:47-07:00",
- "path": "/nix/store/nfaxfqrqkxpwaq8rnk7kcp28nnj8y6m2-tree-sitter-verilog",
- "sha256": "0cy29i200rnc34d237s19r6a1n5vv4d3wgwpbywxg6ahcankc34m",
+ "rev": "1b624ab8b3f8d54ecc37847aa04512844f0226ac",
+ "date": "2021-03-31T21:27:26-07:00",
+ "path": "/nix/store/4j6hrf8bc8zjd7r9xnna9njpw0i4z817-tree-sitter-verilog",
+ "sha256": "0ygm6bdxqzpl3qn5l58mnqyj730db0mbasj373bbsx81qmmzkgzz",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
index 8231a0354d..c8544d7dbe 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/ikatyang/tree-sitter-yaml",
- "rev": "ab0ce67ce98f8d9cc0224ebab49c64d01fedc1a1",
- "date": "2021-01-01T21:13:43+08:00",
- "path": "/nix/store/3vnhqr4l2hb0ank13avj8af4qbni5szw-tree-sitter-yaml",
- "sha256": "14f0abv68cjkwdcjjwa1nzjpwp6w59cj5v4m5h5h3jxi96z65459",
+ "rev": "6129a83eeec7d6070b1c0567ec7ce3509ead607c",
+ "date": "2021-04-18T14:25:59+08:00",
+ "path": "/nix/store/8wrwm71z9flfk00phrh9aaxpvsrw1m67-tree-sitter-yaml",
+ "sha256": "1bimf5fq85wn8dwlk665w15n2bj37fma5rsfxrph3i9yb0lvzi3q",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
index eca516bbeb..ed8da83e30 100644
--- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix
@@ -1,22 +1,22 @@
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
, base, bower-json, bytestring, Cabal, containers, cryptonite
-, dhall, directory, either, exceptions, extra, fetchgit, file-embed
-, filepath, foldl, fsnotify, generic-lens, github, Glob, hpack
-, hspec, hspec-discover, hspec-megaparsec, http-client
-, http-conduit, http-types, lens-family-core, megaparsec, mtl
-, network-uri, open-browser, optparse-applicative, prettyprinter
-, process, QuickCheck, retry, rio, rio-orphans, safe, semver-range
-, lib, stm, stringsearch, tar, template-haskell, temporary, text
-, time, transformers, turtle, unliftio, unordered-containers
-, utf8-string, vector, versions, with-utf8, zlib
+, dhall, directory, either, extra, fetchgit, file-embed, filepath
+, foldl, fsnotify, generic-lens, Glob, hpack, hspec, hspec-discover
+, hspec-megaparsec, http-client, http-conduit, http-types
+, lens-family-core, lib, megaparsec, mtl, network-uri, open-browser
+, optparse-applicative, prettyprinter, process, QuickCheck, retry
+, rio, rio-orphans, safe, semver-range, stm, stringsearch
+, tar, template-haskell, temporary, text, time, transformers
+, turtle, unliftio, unordered-containers, utf8-string, versions
+, with-utf8, zlib
}:
mkDerivation {
pname = "spago";
- version = "0.20.0";
+ version = "0.20.1";
src = fetchgit {
url = "https://github.com/purescript/spago.git";
- sha256 = "1n48p9ycry8bjnf9jlcfgyxsbgn5985l4vhbwlv46kbb41ddwi51";
- rev = "7dfd2236aff92e5ae4f7a4dc336b50a7e14e4f44";
+ sha256 = "1j2yi6zz9m0k0298wllin39h244v8b2rx87yxxgdbjg77kn96vxg";
+ rev = "41ad739614f4f2c2356ac921308f9475a5a918f4";
fetchSubmodules = true;
};
isLibrary = true;
@@ -24,16 +24,17 @@ mkDerivation {
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async-pool base bower-json
bytestring Cabal containers cryptonite dhall directory either
- exceptions file-embed filepath foldl fsnotify generic-lens github
- Glob http-client http-conduit http-types lens-family-core
- megaparsec mtl network-uri open-browser optparse-applicative
- prettyprinter process retry rio rio-orphans safe semver-range stm
- stringsearch tar template-haskell temporary text time transformers
- turtle unliftio unordered-containers utf8-string vector versions
- with-utf8 zlib
+ file-embed filepath foldl fsnotify generic-lens Glob http-client
+ http-conduit http-types lens-family-core megaparsec mtl network-uri
+ open-browser optparse-applicative prettyprinter process retry rio
+ rio-orphans safe semver-range stm stringsearch tar template-haskell
+ temporary text time transformers turtle unliftio
+ unordered-containers utf8-string versions with-utf8 zlib
];
libraryToolDepends = [ hpack ];
- executableHaskellDepends = [ base text turtle with-utf8 ];
+ executableHaskellDepends = [
+ ansi-terminal base text turtle with-utf8
+ ];
testHaskellDepends = [
base containers directory extra hspec hspec-megaparsec megaparsec
process QuickCheck temporary text turtle versions
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
index 54eead5d2a..4300719147 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
@@ -1,22 +1,31 @@
-{ lib, stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config
+{ lib
+, stdenv
+, fetchurl
+, runCommand
+, fetchCrate
+, rustPlatform
+, Security
+, openssl
+, pkg-config
, SystemConfiguration
+, libiconv
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
- version = "0.32.16";
+ version = "0.32.17";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-FrrQcZHy5WjNYCod2TBWVAj4clNWPLWLIR2/Kvkz4q0=";
+ sha256 = "sha256-D/8fjJIyHCRzkomRsYUnGjDMCusjNX8ZYmLjowCYgcM=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
- ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
+ ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
- cargoSha256 = "sha256-QEHl/Hhug0Ua/SZV0iq1jc6QGGxA1NwheEgGBZRYunI=";
+ cargoSha256 = "sha256-Upegh3W31sTaXl0iHZ3HiYs9urgXH/XhC0vQBAWvDIc=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
index 49265d22f8..0f596a0327 100644
--- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
@@ -1,19 +1,19 @@
{ stdenv, lib, fetchurl, unzip }:
let
- version = "3.3.101";
+ version = "3.3.115";
src =
if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl
{
url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip";
- sha256 = "KrFDQSs7hMCioeqPKTNODe3RKnwNV8XafdYDUaxou/Y=";
+ sha256 = "104h3b9cvmz2m27a94cfc00xm8wa2p1pvrfs92hrz59hcs8vdldf";
}
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl
{
url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip";
- sha256 = "vbeuZf/phOj83xTha+AzpKIvvrjwMar7q2teAmr5ESQ=";
+ sha256 = "0rs2vmdz8c9zs53pjbzy27ir0p5v752cpsnqfaqf0ilx7k6fpnnm";
}
else throw "Not supported on ${stdenv.hostPlatform.system}";
in
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
installPhase = ''
install -Dm755 TabNine $out/bin/TabNine
+ install -Dm755 TabNine-deep-cloud $out/bin/TabNine-deep-cloud
+ install -Dm755 TabNine-deep-local $out/bin/TabNine-deep-local
+ install -Dm755 WD-TabNine $out/bin/WD-TabNine
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
index 696776a697..4cad79f9a8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "vala-language-server";
- version = "0.48.1";
+ version = "0.48.2";
src = fetchFromGitHub {
owner = "benwaffle";
repo = pname;
rev = version;
- sha256 = "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0";
+ sha256 = "sha256-vtb2l4su+zuwGbS9F+Sv0tDInQMH4Uw6GjT+s7fHIio=";
};
passthru = {
diff --git a/third_party/nixpkgs/pkgs/development/tools/zls/default.nix b/third_party/nixpkgs/pkgs/development/tools/zls/default.nix
new file mode 100644
index 0000000000..6adf3a2ae9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/zls/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, zig }:
+
+stdenv.mkDerivation rec {
+ pname = "zls";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "zigtools";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-A4aOdmlIxBUeKyczzLxH4y1Rl9TgE1EeiKGbWY4p/00=";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ zig ];
+
+ preBuild = ''
+ export HOME=$TMPDIR
+ '';
+
+ installPhase = ''
+ zig build -Drelease-safe --prefix $out install
+ '';
+
+ meta = with lib; {
+ description = "Zig LSP implementation + Zig Language Server";
+ changelog = "https://github.com/zigtools/zls/releases/tag/${version}";
+ homepage = "https://github.com/zigtools/zls";
+ license = [ licenses.mit ];
+ maintainers = with maintainers; [ fortuneteller2k ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix
index a2e286d8bc..9b645fb55e 100644
--- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix
@@ -5,6 +5,7 @@
, rust
, rustPlatform
, installShellFiles
+, libiconv
, libobjc
, Security
, CoreServices
@@ -15,20 +16,20 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-h8dXGSu7DebzwZdc92A2d9xlYy6wD34phBUj5v5KuIc=";
+ sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI=";
};
- cargoSha256 = "sha256-htxpaALOXFQpQ68YE4b0T0jhcCIONgUZwpMPCcSdcgs=";
+ cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
- buildInputs = lib.optionals stdenv.isDarwin [ libobjc Security CoreServices Metal Foundation ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ];
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and place it in the locations it will require it in advance
diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json
index c8a441aaec..151836096f 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/versions.json
+++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json
@@ -10,12 +10,12 @@
"version": "1.1.32"
},
"stable": {
- "name": "factorio_alpha_x64-1.1.30.tar.xz",
+ "name": "factorio_alpha_x64-1.1.32.tar.xz",
"needsAuth": true,
- "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6",
+ "sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.30/alpha/linux64",
- "version": "1.1.30"
+ "url": "https://factorio.com/get-download/1.1.32/alpha/linux64",
+ "version": "1.1.32"
}
},
"demo": {
@@ -28,12 +28,12 @@
"version": "1.1.30"
},
"stable": {
- "name": "factorio_demo_x64-1.1.30.tar.xz",
+ "name": "factorio_demo_x64-1.1.32.tar.xz",
"needsAuth": false,
- "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv",
+ "sha256": "19zwl20hn8hh942avqri1kslf7dcqi9nim50vh4w5d0493srybfw",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.30/demo/linux64",
- "version": "1.1.30"
+ "url": "https://factorio.com/get-download/1.1.32/demo/linux64",
+ "version": "1.1.32"
}
},
"headless": {
@@ -46,12 +46,12 @@
"version": "1.1.32"
},
"stable": {
- "name": "factorio_headless_x64-1.1.30.tar.xz",
+ "name": "factorio_headless_x64-1.1.32.tar.xz",
"needsAuth": false,
- "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl",
+ "sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.30/headless/linux64",
- "version": "1.1.30"
+ "url": "https://factorio.com/get-download/1.1.32/headless/linux64",
+ "version": "1.1.32"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/games/mar1d/default.nix b/third_party/nixpkgs/pkgs/games/mar1d/default.nix
index 1323e1a8ac..1715a68f5d 100644
--- a/third_party/nixpkgs/pkgs/games/mar1d/default.nix
+++ b/third_party/nixpkgs/pkgs/games/mar1d/default.nix
@@ -1,58 +1,34 @@
-{ lib, stdenv
-, fetchFromGitHub
-, cmake
+{ stdenv
+, lib
+, SDL2
+, SDL2_mixer
, libGLU
-, xlibsWrapper
-, xorg
-, xinput_calibrator
-, doxygen
-, libpthreadstubs
-, alsaLib
-, alsaOss
-, libao
-, width ? 30
-, mute ? false
-, effects ? false
-, sensitivity ? 5
-, reverseY ? false
+, libconfig
+, meson
+, ninja
+, pkg-config
+, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "MAR1D";
- version = "0.2.0";
- options = "-w${toString width}"
- + " -s${toString sensitivity}"
- + (if mute then " -m" else "")
- + (if effects then " -f" else "")
- + (if reverseY then " -r" else "");
+ version = "0.3.0";
src = fetchFromGitHub {
- sha256 = "152w5dnlxzv60cl24r5cmrj2q5ar0jiimrmxnp87kf4d2dpbnaq7";
+ sha256 = "sha256-/QZH2H0PFCLeweXUE11vimLnJTt86PjnTnHC9vWkKsk=";
rev = "v${version}";
- repo = "fp_mario";
- owner = "olynch";
+ repo = "MAR1D";
+ owner = "Radvendii";
};
- buildInputs =
- [
- alsaLib
- alsaOss
- cmake
- doxygen
- libao
- libpthreadstubs
- libGLU
- xlibsWrapper
- xinput_calibrator
- xorg.libXrandr
- xorg.libXi
- xorg.xinput
- xorg.libXxf86vm
- ];
+ nativeBuildInputs = [ meson ninja pkg-config ];
- preConfigure = ''
- cd src
- '';
+ buildInputs = [
+ SDL2
+ SDL2_mixer
+ libconfig
+ libGLU
+ ];
meta = with lib; {
description = "First person Super Mario Bros";
@@ -62,9 +38,9 @@ stdenv.mkDerivation rec {
original, however, the game still takes place in a two dimensional world.
You must view the world as mario does, as a one dimensional line.
'';
- homepage = "https://github.com/olynch/fp_mario";
+ homepage = "https://mar1d.com";
license = licenses.agpl3;
maintainers = with maintainers; [ taeer ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
index 3d0b53035e..d98a7dd25e 100644
--- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix
+++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
@@ -88,11 +88,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";
- version = "2.2.1441";
+ version = "2.2.741";
src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
- sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm";
+ sha256 = "0bm78ybn91ihibxgmlpk7dl2zxy4a57k86qmb08cif3ifbflzkvw";
};
icon = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/games/openttd/default.nix b/third_party/nixpkgs/pkgs/games/openttd/default.nix
index a39b9cab35..34de043a65 100644
--- a/third_party/nixpkgs/pkgs/games/openttd/default.nix
+++ b/third_party/nixpkgs/pkgs/games/openttd/default.nix
@@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
pname = "openttd";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchurl {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
- sha256 = "sha256-XmUYTgc2i6Gvpi27PjWrrubE2mcw/0vJ60RH1TNjx6g=";
+ sha256 = "sha256-qZGeLkKbsI+in+jme6m8dckOnvb6ZCSOs0IjoyXUAKM=";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix
index 7f756dd10b..3dcb621db4 100644
--- a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix
+++ b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix
@@ -2,12 +2,12 @@
openttd.overrideAttrs (oldAttrs: rec {
pname = "openttd-jgrpp";
- version = "0.40.5";
+ version = "0.41.0";
src = fetchFromGitHub rec {
owner = "JGRennison";
repo = "OpenTTD-patches";
rev = "jgrpp-${version}";
- sha256 = "sha256-g1RmgVjefOrOVLTvFBiPEd19aLoFvB9yX/hMiKgGcGw=";
+ sha256 = "sha256-DrtxqXyeqA+X4iLTvTSPFDKDoLCyVd458+nJWc+9MF4=";
};
})
diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/games/steam/steam.nix
index 2c5932cf7f..f988363357 100644
--- a/third_party/nixpkgs/pkgs/games/steam/steam.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/steam.nix
@@ -2,15 +2,15 @@
let
traceLog = "/tmp/steam-trace-dependencies.log";
- version = "1.0.0.69";
+ version = "1.0.0.70";
in stdenv.mkDerivation {
pname = "steam-original";
inherit version;
src = fetchurl {
- url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
- sha256 = "sha256-b5g4AUprE/lTunJs59IDlGu5O/1dB0kBvCFq0Eqyx2c=";
+ url = "https://repo.steampowered.com/steam/archive/stable/steam_${version}.tar.gz";
+ sha256 = "sha256-n/iKV3jHsA77GPMk1M0MKC1fQ42tEgG8Ppgi4/9qLf8=";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix
new file mode 100644
index 0000000000..b64cb56c40
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/drivers/infnoise/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchFromGitHub, libftdi }:
+
+stdenv.mkDerivation rec {
+ pname = "infnoise";
+ version = "unstable-2019-08-12";
+
+ src = fetchFromGitHub {
+ owner = "13-37-org";
+ repo = "infnoise";
+ rev = "132683d4b5ce0902468b666cba63baea36e97f0c";
+ sha256 = "1dzfzinyvhyy9zj32kqkl19fyhih6sy8r5sa3qahbbr4c30k7flp";
+ };
+
+ # Patch makefile so we can set defines from the command line instead of it depending on .git
+ patches = [ ./makefile.patch ];
+ GIT_COMMIT = src.rev;
+ GIT_VERSION = version;
+ GIT_DATE = "2019-08-12";
+
+ buildInputs = [ libftdi ];
+
+ sourceRoot = "source/software";
+ makefile = "Makefile.linux";
+ makeFlags = [ "PREFIX=$(out)" ];
+ postPatch = ''
+ substituteInPlace init_scripts/infnoise.service --replace "/usr/local" "$out"
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/13-37-org/infnoise";
+ description = "Driver for the Infinite Noise TRNG";
+ longDescription = ''
+ The Infinite Noise TRNG is a USB key hardware true random number generator.
+ It can either provide rng for userland applications, or provide rng for the OS entropy.
+ Add the following to your system configuration for plug and play support, adding to the OS entropy:
+ systemd.packages = [ pkgs.infnoise ];
+ services.udev.packages = [ pkgs.infnoise ];
+ '';
+ license = licenses.cc0;
+ maintainers = with maintainers; [ StijnDW ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/infnoise/makefile.patch b/third_party/nixpkgs/pkgs/misc/drivers/infnoise/makefile.patch
new file mode 100644
index 0000000000..b38519036d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/drivers/infnoise/makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/software/Makefile.linux b/software/Makefile.linux
+index db48aa5..df8b3d2 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -1,6 +1,6 @@
+-GIT_VERSION := $(shell git --no-pager describe --tags --always)
+-GIT_COMMIT := $(shell git rev-parse --verify HEAD)
+-GIT_DATE := $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
++GIT_VERSION ?= $(shell git --no-pager describe --tags --always)
++GIT_COMMIT ?= $(shell git rev-parse --verify HEAD)
++GIT_DATE ?= $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
+
+ PREFIX = $(DESTDIR)/usr/local
+
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
index 7f02ead3e0..0fe4e4da92 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
@@ -44,10 +44,17 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "6.5";
+ version = "6.7";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
- sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c=";
- inherit (stable) mono gecko32 gecko64;
+ sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ=";
+ inherit (stable) gecko32 gecko64;
+
+ ## see http://wiki.winehq.org/Mono
+ mono = fetchurl rec {
+ version = "6.1.1";
+ url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
+ sha256 = "sha256-rDsUvq/eNLhIIofllwABE9wGqRXzLJ/QbHfrgZB544s=";
+ };
patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -58,7 +65,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc=";
+ sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index 76fa0f3298..5a5c66c538 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-04-21";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "ce0ac184e56d1a1865df1f0059ec01317f4210db";
- sha256 = "13v1x0mxzm8fzmf8k6f3wjdx91yki6lqz40wh1897g5zvsfjfvvr";
+ rev = "5b286768438921cbc77d6cfb4a7046ea45c8adfc";
+ sha256 = "1g5g1yqr78l620vr7vslx15j2f4dfg4bb8wwjgfqx0pw5lc982yc";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -533,12 +533,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-04-20";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "19bfd9443708a769b2d1379af874f644ba9f1cd4";
- sha256 = "0c9i25dsqhb1v6kcym424zmc5yn396wz6k9w71s1ja5q4p1jmxd8";
+ rev = "f9c4fc96fd08f13f549c4bc0eb56f2d91ca91919";
+ sha256 = "087nvvxfxrllnx2ggi8m088wgcrm1hd9c5mqfx37zmzfjqk78rw4";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -618,12 +618,12 @@ let
compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine";
- version = "2021-04-21";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
- rev = "1e81624bb91e79e245832bc0a88a1c194097f641";
- sha256 = "08cav97sj92vfl0y8kkn5kv5qxsfifb7xps3hndlg6vzbjci4vbr";
+ rev = "f6ace45ef5cbd8b274d7163a2931c11083d34d44";
+ sha256 = "0wjy38v3h5nqr2vw2ydhy2227cqkd8k14cnb3vr39xm5c0fc3ci5";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
@@ -1244,12 +1244,12 @@ let
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
- version = "2021-04-15";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "e9efa96bf130496537c978c8ee150bed280f7b19";
- sha256 = "0jzn6vax8ia9ha938jbs0wpm6wgz5m4vg6q3w8z562rq8kq70hcx";
+ rev = "d21059cd5960f4d0a5627fda82d29371772b247f";
+ sha256 = "0cbsiw0qkynm0glq8kidkbfxwy6lhn7rc6dvxflrrm62cl7yvw91";
};
meta.homepage = "https://github.com/dracula/vim/";
};
@@ -1631,12 +1631,12 @@ let
git-worktree-nvim = buildVimPluginFrom2Nix {
pname = "git-worktree-nvim";
- version = "2021-04-19";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "ThePrimeagen";
repo = "git-worktree.nvim";
- rev = "77c54ff659ec3eba0965e9a54e8569abd084b726";
- sha256 = "0lraa4di5z5jm103bqzr804bjcxa49b131mhpgg4r40zpam9iip1";
+ rev = "34d1c630546dc21517cd2faad82e23f02f2860d1";
+ sha256 = "0ddz2z7plw320kgsddlfywsa202bl8sxr9jbvldhh0j34q5lgdja";
};
meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/";
};
@@ -1655,12 +1655,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-04-20";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "6b7b666cc95f91c869b1ef266e10f06807f7ccf0";
- sha256 = "1ya54gkig13adcjgwjmvyssnrdz82rcwimlwk5ff6qqivwcbpsjy";
+ rev = "0b556d0b7ab50e19dc7db903d77ac6a8376d8a49";
+ sha256 = "06v2wbm582hplikjqw01r9zqgg45ji2887n288apg9yx43iknsy3";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -2088,12 +2088,12 @@ let
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
- version = "2021-04-16";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
- rev = "5b3984bbd411fae75933dcf21bfe2faeb6ec3b34";
- sha256 = "1ynd3ricc3xja9b0wswg4dh1b09p8pnppf682bfkm5a5cqar7n5k";
+ rev = "d0bb06ffc40ff7c49dfa2548e007e9013eaeabb7";
+ sha256 = "0zj12xp8djy3zr360lg9pkydz92cgkjiz33n9v5s2wyx63gk0dq4";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@@ -2314,6 +2314,18 @@ let
meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
};
+ lsp-colors-nvim = buildVimPluginFrom2Nix {
+ pname = "lsp-colors-nvim";
+ version = "2021-04-23";
+ src = fetchFromGitHub {
+ owner = "folke";
+ repo = "lsp-colors.nvim";
+ rev = "525c57c1138ca5640547efb476758938aedba943";
+ sha256 = "0dxalh12ifsghksl423bbawq096k8fcl1cgmnvaw3f2x71fngfs6";
+ };
+ meta.homepage = "https://github.com/folke/lsp-colors.nvim/";
+ };
+
lsp-status-nvim = buildVimPluginFrom2Nix {
pname = "lsp-status-nvim";
version = "2021-04-09";
@@ -2364,12 +2376,12 @@ let
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-04-20";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "e6cc09c2e95cc361babb64c113cc3e9355ea1130";
- sha256 = "1jf68z7vh467fr5arbcsk5g65gjpc0dqn584hbg0cpzfmdlrbj4n";
+ rev = "e3a558bc1dfbda29cde5b356b975a8abaf3f41b2";
+ sha256 = "1qwrpyjfcn23z4lw5ln5gn4lh8y0rw68gbmyd62pdqazckqhasds";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2760,12 +2772,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-04-20";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "cb846809d81c360b3f9658ee89a9342450c99da2";
- sha256 = "0r35flvb70y4ankp8v8p6jm0s9mrbg6i94n0v8avaw92xrcgl4ph";
+ rev = "a62ce86411048e1bed471d4c4ba5f56eb5b59c50";
+ sha256 = "1cnywkl21a8mw62bing202nw04y375968bggqraky1c57fpdq35j";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -2964,12 +2976,12 @@ let
nlua-nvim = buildVimPluginFrom2Nix {
pname = "nlua-nvim";
- version = "2021-01-05";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "nlua.nvim";
- rev = "c0e8fbcaf8bcf5571a9e1d780a72094aad3f3094";
- sha256 = "0q5aw3n4dsszk5iw7qg01xx1rbrr18jh1wqs6k9dd1kcr6yq22rq";
+ rev = "31e3430acb84368c0933a3e765d834e897dfca2f";
+ sha256 = "0h8908x2pf139q6mxckcglb5w7zxvhp0vj97za0g8343lvlhf0v1";
};
meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
};
@@ -3036,36 +3048,48 @@ let
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-04-21";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "d83b441b1838a30941af6582e9cb19d93b560b71";
- sha256 = "00h40qgkrydacsj5q8yv6g7m0835dqcxf66i1s2g32wssg6c1y5f";
+ rev = "41b3ed55c345b56190a282b125897dc99d2292d4";
+ sha256 = "1pjfani0g0wixsyxk8j0g4289jhnkbxl703fpdp9dls7c427pi8x";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
+ nvim-base16 = buildVimPluginFrom2Nix {
+ pname = "nvim-base16";
+ version = "2021-04-12";
+ src = fetchFromGitHub {
+ owner = "RRethy";
+ repo = "nvim-base16";
+ rev = "9d6649c01221680e5bb20ff9e2455280d9665de2";
+ sha256 = "18a974l753d92x3jyv5j0anri99hxzfw454lkz94amabbnc010p6";
+ };
+ meta.homepage = "https://github.com/RRethy/nvim-base16/";
+ };
+
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-04-17";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "20e19029c9d212d8eb43eb590ac7530077e13350";
- sha256 = "097iplsdkkq72981nwfppj07d0fg0fzjglwlvpxq61w1jwscd8fj";
+ rev = "55135d23dc8da4f75a95f425283c0080ec5a8ac6";
+ sha256 = "162wa2hwq1i9v2xgdfvg1d4ab392m4jcw815cn9l3z4r10g9719p";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
- version = "2021-04-20";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
- rev = "4ebab39af2376b850724dd29c29579c8e024abe6";
- sha256 = "0k671d27m2p0lv4vr99lra740511234f8m6zl2ykkb1b197841cg";
+ rev = "78ffd345d079246738ea06b04f58ad53503f48e2";
+ sha256 = "08xn8s9asa6b2gpbrsw1iy80s8419bck0z6nh9nmffisr3aga1bn";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@@ -3120,12 +3144,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-04-18";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "d646bbc4c820777c2b61dd73819eead1133b15f8";
- sha256 = "1bnxpcyrzi71b4ia0p1v8g3qx204ja4g3yfydcppdiwqfkhm2688";
+ rev = "41f982b646b29059749bd588ba783cb99d8fc781";
+ sha256 = "0z2kl2iqs8vcb8l4r508ny3h7vl3vm1l6cjsl5bi1s7387pizxbl";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -3168,12 +3192,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2021-04-20";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "89a00109fda04b2fe80cd4023092e5663a316777";
- sha256 = "1jx9wc6v4d4y4fx97qb0nhcm8w879ckk74anzsq3l9vxg7y9ydgq";
+ rev = "2f8bd90f3b4fa7620c61f66bcddb965139eb176f";
+ sha256 = "1zsvr9pba62ngchfmab7yns64mlkdqclqv516c7h62fh82fyx23a";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -3192,12 +3216,12 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-04-16";
+ version = "2021-04-21";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "76c4972f6edb961e7c7486bfd0a1f629b49a3e43";
- sha256 = "1c0f94hjvkj6mhx3id5867d65is1cqffj72nswgnxwx4y4psnbdg";
+ rev = "362a149dac40c90d917ac7bb78da988b8da6a971";
+ sha256 = "0psd99km6kfqwdw383w41aaq1cipcfhl1v5srjw29y2v6rgvnw9p";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -3216,12 +3240,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-04-19";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "5c005ce93367ad85933eff80887228bca2a7efee";
- sha256 = "1nppy9vkl8v8biq1q9sgqxakhqlw5zm7z1wiq68zzyivlz5mj1hg";
+ rev = "62977b6b2eeb20bd37703ebe4bc4b4c2ef006db2";
+ sha256 = "0niwaq3mc7x1zaf3qx9dp43607rnhq2nvyizkxb7j1yir8a8dk4x";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3288,36 +3312,36 @@ let
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
- version = "2021-04-20";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
- rev = "7c9d8c51841c3335818d04b684e93c655b5d61c9";
- sha256 = "04j34wyv7q9n7yld7k7cxxm92al3h7x3rkcnm1q61scwb1xf354r";
+ rev = "34cc65e594d4f4b9e0d6658a7ceb49f62820d762";
+ sha256 = "1gg4iyqpy68hhk4wly9k87841zns29vh04wcddn91awj5mpigb40";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-04-20";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "796628a7651f9399637ad8376bab920fb10493cf";
- sha256 = "1mb7ncp35yhzwzwp6l54dr1y3is705sa63hlx6bf5ny84q13kvxd";
+ rev = "f39869514645b98ec30bc8826763c288b6cbdbef";
+ sha256 = "0z6arqc2i8745vc08hdbwsm1i4biywq65v1zdzrhs3ysx0agppq0";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-04-19";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "df189e28a498d90dc8813e90944e0999bc936e56";
- sha256 = "0azpx89vykc1ylbn26744rdfd4f3wga0azdsg06hmz55a9q6qq8p";
+ rev = "af3537fbe57a2a37ab2b620c9ecc487e31b4da64";
+ sha256 = "1z4k0a8gyz8ycd6wq8npg056l0axz3vj7pipxcpi1i9xa4kx3j6i";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3348,12 +3372,12 @@ let
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2021-04-18";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "18cf678f6218ca40652b6d9017dad1b9e2899ba9";
- sha256 = "0xawv5pjz0mv4pf06vn3pvl4k996jmw4nmawbizqlvladcc2hc1k";
+ rev = "522b26a8795994b719a921a03cfacb0d7dcabf78";
+ sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -3600,12 +3624,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-04-20";
+ version = "2021-04-21";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "1a31d076a097ac23c0110537a99b686874ae2cdc";
- sha256 = "1ah2j5bxgg0mqa8nlc76f37apb9i6vx8i1c0vlmk144w9dfmxkis";
+ rev = "9bd408ba679d1511e269613af840c5019de59024";
+ sha256 = "1xjrd445jdjy789di6d3kdgxk9ds04mq47qigmplfsnv41d5c2nj";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3913,12 +3937,12 @@ let
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim";
- version = "2021-04-16";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
- rev = "cd1b5632cc2b7981bd7bdb9e55701ae58942864f";
- sha256 = "1jam4fnzg0nvj06d1vd9ryaan8fza7xc7fwdd7675bw828cs2fq8";
+ rev = "7d734e9b52fe54b6cd19435f0823d56dc2d17426";
+ sha256 = "181vq3p1f136qmb0qbd77khc04vrkdw8z9851car7lxs5m83wwp2";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@@ -4021,12 +4045,12 @@ let
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
- version = "2021-04-10";
+ version = "2021-04-21";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
- rev = "a36b8f129e99becc5e00ee3267695f62c3937a2f";
- sha256 = "0sk8xkqi3bciqwdd71z51mrx4dhy2i5nrf0b1c1xbzxbg3vkbvc3";
+ rev = "93021c0623c1822502a72131e2d45617510428b9";
+ sha256 = "042d7zmwmi0xhlshwwrf9bhc0j4ybksxxnrs986vm65y58c11fk3";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@@ -4298,12 +4322,12 @@ let
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
- version = "2021-03-15";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
- rev = "f2ddb480c5afa1c0f155d78e6fc7853fd20f0420";
- sha256 = "05ca80alkhnxj1klyy729y81g9ng2n841djxgd7zjg8cpkk94kw3";
+ rev = "a739985ef9fbb9888bdeea2f442d0574a9db0565";
+ sha256 = "0ajpn3q36mvczmvs0g17n1lz0h69rvm25bjsalw83mjxwn46g1h4";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@@ -4467,12 +4491,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-04-21";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "3adeab2bed42597c8495fbe3a2376c746232f2e3";
- sha256 = "0nnqlrzgmg50kdyjmbkr29dfn8ydvdamfihrw0nalvszhh577487";
+ rev = "6fd1b3bd255a6ebc2e44cec367ff60ce8e6e6cab";
+ sha256 = "1qifrnd0fq9844vvxy9fdp90kkb094a04wcshbfdy4cv489cqfax";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4672,12 +4696,12 @@ let
unicode-vim = buildVimPluginFrom2Nix {
pname = "unicode-vim";
- version = "2021-04-15";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "unicode.vim";
- rev = "8b6bb82f66c1f336257e670eb9b7c03f29df3345";
- sha256 = "0r082yn0jbvwxf5jfl79kzjzq5hlhqf3nkmf39g675pw2mc2fw6x";
+ rev = "090e77e30e46aceafd53a3219fb2a81b79927d8d";
+ sha256 = "136a8c4d4nrzvab2qa6sxc81x1mwg56nn8ajxikqgyvsr9fp1f9i";
};
meta.homepage = "https://github.com/chrisbra/unicode.vim/";
};
@@ -4996,12 +5020,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-04-15";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "07ab201a272fe8a848141a60adec3c0b837c0b37";
- sha256 = "131fj6fmpgbx7hiql1ci60rnpfffkzww0yf6ag3sclvnw375ylx4";
+ rev = "0a87d08dbdb398b2bb644b5041f68396f0c92d5d";
+ sha256 = "1ihg44f3pn4v3naxlzd9gmhw7hzywv4zzc97i9smbcacg9xm6mna";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -5248,12 +5272,12 @@ let
vim-choosewin = buildVimPluginFrom2Nix {
pname = "vim-choosewin";
- version = "2021-04-06";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "t9md";
repo = "vim-choosewin";
- rev = "1ca7da94aa1b8761f4212194e3c55e4a080d6525";
- sha256 = "0nr6k8g0l27g4lczsy30cnh1il547qgbs4xl936v43gp4wvybah4";
+ rev = "839da609d9b811370216bdd9d4512ec2d0ac8644";
+ sha256 = "1451ji3a7waxz1kc8l2hw96fff54xwa7q8glrin8qxn48fc4605n";
};
meta.homepage = "https://github.com/t9md/vim-choosewin/";
};
@@ -5524,12 +5548,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2021-04-19";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "9e3ca4e897d63ae8f64be579e42188b53d29323d";
- sha256 = "1p7pps21l7d3yfsydw6axyfaaf0an7ls7j3p80vxg9ia307hqnws";
+ rev = "63bfd6d99ba17832f4740efa5e2e6ad6537d4552";
+ sha256 = "0p9n1n8n0167kgq4wwwxsnair2hqqvy6vwcqchnb15hifl3cl0w3";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -5932,12 +5956,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-04-20";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "a0e34eb5471c54f979fc613b8068efa6d5015550";
- sha256 = "08xs3jzd41y0aa6g3var7shllh47g5biv4jv59f34d0l66mw18rz";
+ rev = "4a1938457489fe072acf2fbbe7142a3cfb0d8ad8";
+ sha256 = "1va57czyrihcc2cihbbil5vqhnlzvjrb9bw7wirdrpjrd04ciaa4";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -5992,12 +6016,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-04-16";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "895e56daca03c441427f2adca291cb10ea4d7ca8";
- sha256 = "139zdz0zsaqpwbscqzp61xilrvdjlvhrn985mfpgiwwrr6sa6gdr";
+ rev = "8f4a23e6639ff67c0efd7242870d4beed47b5d37";
+ sha256 = "0ss8qlxgidlf1ma6z3ma63lqgaynnbrj9fdbw38szwc823vdqiid";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -6064,12 +6088,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2021-04-13";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "9756e95bd596a303946a90f06f4efe51dcd57e87";
- sha256 = "0wkcximk4alm26x9qrqbanlhhzrim95gs5cbjy0hnlrqa8xmz20k";
+ rev = "f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5";
+ sha256 = "0h00i0b8p0mnynp7hhj2vpgj9rhqmlx14y2kcskvac8i2wlyj30c";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -6112,12 +6136,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-04-20";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "3ec431eaefb75520cbcfed0b6d0d7999d7ea3805";
- sha256 = "1h6lcxzm9njnyaxf9qjs4gspd5ag2dmqjjik947idxjs1435xjls";
+ rev = "87fd4bf57646f984b37de5041232047fa5fdee5a";
+ sha256 = "00clqf82731zz6r1h4vs15zy4dka549cbngr1j9w605k5m9hrrzs";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -6160,12 +6184,12 @@ let
vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8";
- version = "2021-04-06";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-gruvbox8";
- rev = "acb2574d85f3878cd5ab82dc3579403c174dafc3";
- sha256 = "17k3fcidsk26i9nnbk37jcgznypzwh0pzam03yayb6dw4n733mld";
+ rev = "217a87f4f751ed0d6fe5c79b2c0963f557bf0314";
+ sha256 = "1gdys8ycmmykq121ix34wva75m18nda0camiqr4aavb9hj32faj6";
};
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
};
@@ -7579,12 +7603,12 @@ let
vim-quickrun = buildVimPluginFrom2Nix {
pname = "vim-quickrun";
- version = "2021-01-27";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-quickrun";
- rev = "c980977f1d77b3285937b9d7b5baa964fc9ed7f5";
- sha256 = "00f1slgrjnh8m59sm3xmias3jvjlvw26yigv9fmy6zwcynlivc5x";
+ rev = "31274b11e0a658b84f220ef1f5d69e171ba53ebf";
+ sha256 = "1687ih32rgjjxf84dw7yx2qkylrqwp4ir8hj6mlh1hmysfd13vvl";
};
meta.homepage = "https://github.com/thinca/vim-quickrun/";
};
@@ -7831,12 +7855,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
- version = "2021-03-07";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
- rev = "2542b6459085f3d1e361e8b5bf406dec6448487e";
- sha256 = "1m7m1fwn4bpbqfji7fvvgx00fxz1hy5nvfajbpj4vpgaxzqwsf8k";
+ rev = "6b9afcce385b1121d46f749f9cd46d05e132c1e4";
+ sha256 = "04yh7cq9vi1hksksyphg8s4xz64qc6pmwnrbqapfgfsmp6jk11s5";
};
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
@@ -8011,12 +8035,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2021-04-02";
+ version = "2021-04-23";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "5ee8914b26e9f0b2d8ec01b3cef8c46e7a3954b5";
- sha256 = "0zg100sjbn7952ayqligpkfqvrh1qwr2q6pjqs5cnsyl5xs411v2";
+ rev = "df0f1dbdc0689f6172bdd3b8685868aa93446c6f";
+ sha256 = "0idrzl2kgclalsxixrh21fkw6d2vd53apw47ajjlcsl94acy2139";
};
meta.homepage = "https://github.com/mhinz/vim-startify/";
};
@@ -8033,6 +8057,18 @@ let
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
+ vim-strip-trailing-whitespace = buildVimPluginFrom2Nix {
+ pname = "vim-strip-trailing-whitespace";
+ version = "2021-01-03";
+ src = fetchFromGitHub {
+ owner = "axelf4";
+ repo = "vim-strip-trailing-whitespace";
+ rev = "9a93dd653806ba3f886b2cf92111b663ce8d44bd";
+ sha256 = "1pvirqj21xl2qbs9ycdp7n3lnf4n8b2bz1y90nphnvda4dfaac8l";
+ };
+ meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/";
+ };
+
vim-stylish-haskell = buildVimPluginFrom2Nix {
pname = "vim-stylish-haskell";
version = "2019-11-28";
@@ -8540,12 +8576,12 @@ let
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
- version = "2021-04-16";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
- rev = "4c605b1ef91194ff178fdb1d957ab5b655a7089a";
- sha256 = "1zngyw1bj9bws00qyfcz3vc6fpybqrmxa43hy2pvga5anfjm5y6a";
+ rev = "20163f6ffda855fa40a11cb999002211dc66288f";
+ sha256 = "1g29z5f2w1g6znljdgwn49wp8g85m1pawvg8qjrh1kxyjv9dr8x1";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@@ -8756,12 +8792,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-04-20";
+ version = "2021-04-22";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "297c0bea56fd3afce5209f47f330880d759c8698";
- sha256 = "04gkw01p5iiyj1xp9p446frg7f9szprm65gjs3w0s0akgbi5zp3g";
+ rev = "a47d0b921c42be740e57d75a73ae15a8ee0141d4";
+ sha256 = "05nhav31i3d16d1qdcgbkr8dfgwi53123sv3xd9pr8j7j3rdd0ix";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -8899,6 +8935,18 @@ let
meta.homepage = "https://github.com/lukaszkorecki/workflowish/";
};
+ wstrip-vim = buildVimPluginFrom2Nix {
+ pname = "wstrip-vim";
+ version = "2021-03-14";
+ src = fetchFromGitHub {
+ owner = "tweekmonster";
+ repo = "wstrip.vim";
+ rev = "3d4c35c8ca462fbece58886e52679a5355f461d6";
+ sha256 = "020bikc5482gzshjh2vgvknqxpzzzaff14z1rj6b2yvmbr2a837f";
+ };
+ meta.homepage = "https://github.com/tweekmonster/wstrip.vim/";
+ };
+
xptemplate = buildVimPluginFrom2Nix {
pname = "xptemplate";
version = "2020-06-29";
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
index 7e12d083c3..3e352977d5 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
@@ -50,6 +50,9 @@
, CoreFoundation
, CoreServices
+# nvim-treesitter dependencies
+, tree-sitter
+
# sved dependencies
, glib
, gobject-introspection
@@ -364,6 +367,24 @@ self: super: {
dependencies = with super; [ popfix ];
});
+ # Usage:
+ # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
+ # or for all grammars:
+ # pkgs.vimPlugins.nvim-treesitter.withPlugins (_: tree-sitter.allGrammars)
+ nvim-treesitter = super.nvim-treesitter.overrideAttrs (old: {
+ passthru.withPlugins =
+ grammarFn: self.nvim-treesitter.overrideAttrs (_: {
+ postPatch =
+ let
+ grammars = tree-sitter.withPlugins grammarFn;
+ in
+ ''
+ rm -r parser
+ ln -s ${grammars} parser
+ '';
+ });
+ });
+
onehalf = super.onehalf.overrideAttrs (old: {
configurePhase = "cd vim";
});
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index f0f2e26019..5421387e95 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -25,6 +25,7 @@ ap/vim-css-color
arcticicestudio/nord-vim
artur-shaik/vim-javacomplete2
autozimu/LanguageClient-neovim
+axelf4/vim-strip-trailing-whitespace
ayu-theme/ayu-vim
bakpakin/fennel.vim
bazelbuild/vim-bazel
@@ -131,6 +132,7 @@ fiatjaf/neuron.vim
fisadev/vim-isort
flazz/vim-colorschemes
floobits/floobits-neovim
+folke/lsp-colors.nvim@main
freitass/todo.txt-vim
frigoeu/psc-ide-vim
fruit-in/brainfuck-vim
@@ -528,6 +530,7 @@ roxma/nvim-cm-racer
roxma/nvim-completion-manager
roxma/nvim-yarp
roxma/vim-tmux-clipboard
+RRethy/nvim-base16
RRethy/vim-hexokinase
RRethy/vim-illuminate
rstacruz/vim-closer
@@ -656,6 +659,7 @@ tremor-rs/tremor-vim@main
triglav/vim-visual-increment
troydm/zoomwintab.vim
tversteeg/registers.nvim@main
+tweekmonster/wstrip.vim
twerth/ir_black
twinside/vim-haskellconceal
Twinside/vim-hoogle
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
index 708041897c..72581f340a 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
@@ -827,8 +827,8 @@ let
mktplcRef = {
name = "scala";
publisher = "scala-lang";
- version = "0.5.1";
- sha256 = "0p9nhds2xn08xz8x822q15jdrdlqkg2wa1y7mk9k89n8n2kfh91g";
+ version = "0.5.3";
+ sha256 = "0isw8jh845hj2fw7my1i19b710v3m5qsjy2faydb529ssdqv463p";
};
meta = {
license = lib.licenses.mit;
@@ -839,8 +839,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
- version = "1.9.13";
- sha256 = "0vrg25ygmyjx1lwif2ypyv688b290ycfn1qf0izxbmgi2z3f0wf9";
+ version = "1.10.3";
+ sha256 = "0m4qm1z1j6gfqjjnxl8v48ga7zkaspjy3gcnkrch3aj4fyafjl09";
};
meta = {
license = lib.licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
index d7ee218210..6d01bff3b3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
@@ -484,13 +484,6 @@ let
'';
};
- libkern = mkDerivation {
- path = "lib/libkern";
- version = "8.0";
- sha256 = "1wirqr9bms69n4b5sr32g1b1k41hcamm7c9n7i8c440m73r92yv4";
- meta.platforms = lib.platforms.netbsd;
- };
-
column = mkDerivation {
path = "usr.bin/column";
version = "8.0";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix
index bd50852bd9..ca3e38c2e7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix
@@ -20,17 +20,17 @@ let
in
stdenv.mkDerivation rec {
pname = "displaylink";
- version = "5.3.1.34";
+ version = "5.4.0-55.153";
src = requireFile rec {
name = "displaylink.zip";
- sha256 = "1c1kbjgpb71f73qnyl44rvwi6l4ivddq789rwvvh0ahw2jm324hy";
+ sha256 = "1m2l3bnlfwfp94w7khr05npsbysg9mcyi7hi85n78xkd0xdcxml8";
message = ''
In order to install the DisplayLink drivers, you must first
comply with DisplayLink's EULA and download the binaries and
sources from here:
- https://www.displaylink.com/downloads/file?id=1576
+ https://www.synaptics.com/node/3751
Once you have downloaded the file, please use the following
commands and re-run the installation:
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix
index 0f56d0e95c..a8a0445e95 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "evdi";
- version = "v1.7.2";
+ version = "unstable-20210401";
src = fetchFromGitHub {
owner = "DisplayLink";
repo = pname;
- rev = version;
- sha256 = "074j0xh037n8mc4isihfz9lap57wvxaxib32pvy6jhjl3wyik632";
+ rev = "b0b3d131b26df62664ca33775679eea7b70c47b1";
+ sha256 = "09apbvdc78bbqzja9z3b1wrwmqkv3k7cn3lll5gsskxjnqbhxk9y";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = with licenses; [ lgpl21 gpl2 ];
homepage = "https://www.displaylink.com/";
- broken = versionOlder kernel.version "4.9" || stdenv.isAarch64;
+ broken = versionOlder kernel.version "4.19" || stdenv.isAarch64;
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 7e0c48a439..6a826f6396 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
description = "Firmware for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/firmware";
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
- maintainers = with maintainers; [ dezgeg tavyc ];
+ maintainers = with maintainers; [ dezgeg ];
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index e3f0ebf76f..95f736d941 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
- version = "5.11.15";
+ version = "5.11.16";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@@ -12,7 +12,7 @@ in
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
- sha256 = "sha256-Qhq01SgLeNbts86DLi/t70HJfJPmM1So1C4eqVyRLK0=";
+ sha256 = "sha256-sK2DGJsmKP/gvPyT8HWjPa21OOXydMhGjJzrOkPo71Q=";
extraPostFetch = ''
rm $out/.config
'';
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbip/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbip/default.nix
index 923eab71b7..d98559c460 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/usbip/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbip/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, kernel, udev, autoconf, automake, libtool, kernelOlder }:
+{ lib, stdenv, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }:
stdenv.mkDerivation {
name = "usbip-${kernel.name}";
@@ -22,6 +22,8 @@ stdenv.mkDerivation {
./autogen.sh
'';
+ configureFlags = [ "--with-usbids-dir=${hwdata}/share/hwdata/" ];
+
meta = with lib; {
homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip";
description = "allows to pass USB device from server to client over the network";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
index 845593e266..adfd0cda81 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
@@ -210,9 +210,9 @@ in {
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12";
# this package should point to a version / git revision compatible with the latest kernel release
- version = "2.1.0-rc3";
+ version = "2.1.0-rc4";
- sha256 = "sha256-ARRUuyu07dWwEuXerTz9KBmclhlmsnnGucfBxxn0Zsw=";
+ sha256 = "sha256-eakOEA7LCJOYDsZH24Y5JbEd2wh1KfCN+qX3QxQZ4e8=";
isUnstable = true;
};
diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
index fff18486ab..e6468ef550 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "pdns-recursor";
- version = "4.4.2";
+ version = "4.4.3";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
- sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh";
+ sha256 = "01dypbqq6ynrdr3dqwbz8dzpkd2ykgaz9mqhaz3i1hqc21c14hgq";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 4d86e743d1..d3270846a5 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -32,7 +32,7 @@
"amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
"ampio" = ps: with ps; [ ]; # missing inputs: asmog
"analytics" = ps: with ps; [ aiohttp-cors ];
- "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
+ "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ];
"androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ];
"anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
"anthemav" = ps: with ps; [ ]; # missing inputs: anthemav
@@ -90,7 +90,7 @@
"blueprint" = ps: with ps; [ ];
"bluesound" = ps: with ps; [ xmltodict ];
"bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
- "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
+ "bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ];
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
@@ -351,7 +351,7 @@
"hitron_coda" = ps: with ps; [ ];
"hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
"hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
- "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect
+ "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ];
"home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ];
"homeassistant" = ps: with ps; [ ];
"homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ];
@@ -583,14 +583,14 @@
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
"omnilogic" = ps: with ps; [ omnilogic ];
"onboarding" = ps: with ps; [ aiohttp-cors pillow ];
- "ondilo_ico" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ondilo
+ "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ];
"onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet
"onkyo" = ps: with ps; [ onkyo-eiscp ];
"onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async
"openalpr_cloud" = ps: with ps; [ ];
"openalpr_local" = ps: with ps; [ ];
"opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless
- "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api
+ "openerz" = ps: with ps; [ openerz-api ];
"openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi
"openexchangerates" = ps: with ps; [ ];
"opengarage" = ps: with ps; [ ]; # missing inputs: open-garage
@@ -692,7 +692,7 @@
"rituals_perfume_genie" = ps: with ps; [ pyrituals ];
"rmvtransport" = ps: with ps; [ PyRMVtransport ];
"rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
- "roku" = ps: with ps; [ ]; # missing inputs: rokuecp
+ "roku" = ps: with ps; [ rokuecp ];
"roomba" = ps: with ps; [ roombapy ];
"roon" = ps: with ps; [ ]; # missing inputs: roonapi
"route53" = ps: with ps; [ boto3 ];
@@ -750,17 +750,17 @@
"sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub
"skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
"skybell" = ps: with ps; [ skybellpy ];
- "slack" = ps: with ps; [ ]; # missing inputs: slackclient
+ "slack" = ps: with ps; [ slackclient ];
"sleepiq" = ps: with ps; [ sleepyq ];
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api
"sma" = ps: with ps; [ pysma ];
"smappee" = ps: with ps; [ aiohttp-cors pysmappee ];
"smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
- "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings
+ "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ];
"smarttub" = ps: with ps; [ python-smarttub ];
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
- "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg
+ "smhi" = ps: with ps; [ smhi-pkg ];
"sms" = ps: with ps; [ python-gammu ];
"smtp" = ps: with ps; [ ];
"snapcast" = ps: with ps; [ snapcast ];
@@ -984,6 +984,6 @@
"zone" = ps: with ps; [ ];
"zoneminder" = ps: with ps; [ zm-py ];
"zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ];
- "zwave_js" = ps: with ps; [ aiohttp-cors ]; # missing inputs: zwave-js-server-python
+ "zwave_js" = ps: with ps; [ aiohttp-cors zwave-js-server-python ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
index ea9a7f5d15..1953faea95 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
@@ -27,6 +27,19 @@ let
(mkOverride "astral" "1.10.1"
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
+ # Pinned due to API changes in brother>=1.0, remove >= 2021.5
+ (self: super: {
+ brother = super.brother.overridePythonAttrs (oldAttrs: rec {
+ version = "0.2.2";
+ src = fetchFromGitHub {
+ owner = "bieniu";
+ repo = "brother";
+ rev = version;
+ sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE=";
+ };
+ });
+ })
+
# Pinned due to API changes in iaqualink>=2.0, remove after
# https://github.com/home-assistant/core/pull/48137 was merged
(self: super: {
@@ -205,6 +218,7 @@ in with py.pkgs; buildPythonApplication rec {
"axis"
"bayesian"
"binary_sensor"
+ "brother"
"caldav"
"calendar"
"camera"
@@ -253,6 +267,7 @@ in with py.pkgs; buildPythonApplication rec {
"hddtemp"
"history"
"history_stats"
+ "home_connect"
"home_plus_control"
"homekit"
"homekit_controller"
@@ -277,6 +292,7 @@ in with py.pkgs; buildPythonApplication rec {
"intent_script"
"ipp"
"kmtronic"
+ "knx"
"kodi"
"light"
"litterrobot"
@@ -309,6 +325,8 @@ in with py.pkgs; buildPythonApplication rec {
"notion"
"number"
"omnilogic"
+ "ondilo_ico"
+ "openerz"
"ozw"
"panel_custom"
"panel_iframe"
@@ -325,6 +343,7 @@ in with py.pkgs; buildPythonApplication rec {
"rest_command"
"rituals_perfume_genie"
"rmvtransport"
+ "roku"
"rss_feed_template"
"ruckus_unleashed"
"safe_mode"
@@ -338,7 +357,10 @@ in with py.pkgs; buildPythonApplication rec {
"simulated"
"sleepiq"
"sma"
+ "smhi"
"sensor"
+ "slack"
+ "smartthings"
"smarttub"
"smtp"
"smappee"
@@ -381,6 +403,7 @@ in with py.pkgs; buildPythonApplication rec {
"zha"
"zone"
"zwave"
+ "zwave_js"
];
pytestFlagsArray = [
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
index eeb117a984..b6ff5662f9 100755
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
@@ -124,7 +124,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional
for name in names:
# treat "-" and "_" equally
name = re.sub("[-_]", "[-_]", name)
- pattern = re.compile("^python\\d\\.\\d-{}-\\d".format(name), re.I)
+ # python(minor).(major)-(pname)-(version or unstable-date)
+ # we need the version qualifier, or we'll have multiple matches
+ # (e.g. pyserial and pyserial-asyncio when looking for pyserial)
+ pattern = re.compile("^python\\d\\.\\d-{}-(?:\\d|unstable-.*)".format(name), re.I)
for attr_path, package in packages.items():
if pattern.match(package["name"]):
attr_paths.add(attr_path)
diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix
index 92f31126e8..2b00cb5007 100644
--- a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
- version = "10.7.1";
+ version = "10.7.2";
# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz";
- sha256 = "sha256-pgFksZz0sD73uZDyUIhdFCgHPo67ZZiwklafyemJFGs=";
+ sha256 = "sha256-l2tQmKez06cekq/QLper+OrcSU/0lWpZ85xY2wZcK1s=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index 468c46b126..b54ad76e8f 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.30.0";
+ version = "1.32.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1ca69v479537bbj2hjliwk9zzy9fqqsf7fm188k6xxj0a37q9y41";
+ sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix
new file mode 100644
index 0000000000..2bf69a6306
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix
@@ -0,0 +1,55 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "mautrix-signal";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "tulir";
+ repo = "mautrix-signal";
+ rev = "v${version}";
+ sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ CommonMark
+ aiohttp
+ asyncpg
+ attrs
+ mautrix
+ phonenumbers
+ pillow
+ prometheus_client
+ pycryptodome
+ python-olm
+ python_magic
+ qrcode
+ ruamel_yaml
+ unpaddedbase64
+ yarl
+ ];
+
+ doCheck = false;
+
+ postInstall = ''
+ mkdir -p $out/bin
+
+ # Make a little wrapper for running mautrix-signal with its dependencies
+ echo "$mautrixSignalScript" > $out/bin/mautrix-signal
+ echo "#!/bin/sh
+ exec python -m mautrix_signal \"$@\"
+ " > $out/bin/mautrix-signal
+ chmod +x $out/bin/mautrix-signal
+ wrapProgram $out/bin/mautrix-signal \
+ --set PATH ${python3Packages.python}/bin \
+ --set PYTHONPATH "$PYTHONPATH"
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/tulir/mautrix-signal";
+ description = "A Matrix-Signal puppeting bridge";
+ license = licenses.agpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ expipiplus1 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix
index 3fed8691ec..b0d7f1048b 100644
--- a/third_party/nixpkgs/pkgs/servers/minio/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio";
- version = "2021-04-06T23-11-00Z";
+ version = "2021-04-22T15-44-28Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-gwf6qA63EFxGQxk8DiAiqLpIYVhVQDQYPffLNP5JfVw=";
+ sha256 = "147a4vgf2hdpbndska443axzvxx56bmc0011m3cq4ca1vm783k8q";
};
- vendorSha256 = "sha256-VeYc+UtocpeNSV+0MocZj/83X/SMMv5PX2cPIPBV/sk=";
+ vendorSha256 = "0qj1zab97q8s5gy7a304wqi832y8m083cnk8hllz8lz9yjcw6q92";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix
index c3c60e1d4a..50cf5a0016 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "alertmanager-irc-relay";
- version = "0.3.1";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "google";
repo = "alertmanager-irc-relay";
rev = "v${version}";
- sha256 = "sha256-IlWXsQZtDXG8sJBV+82BzEFj+JtUbfTOZyqYOrZFTXA=";
+ sha256 = "sha256-02uEvcxT5+0OJtqOyuQjgkqL0fZnN7umCSxBqAVPT9U=";
};
vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4=";
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
index 06cd0cf9b2..fb2d9c5f4e 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "check_systemd";
- version = "2.2.1";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "Josef-Friedrich";
repo = pname;
rev = "v${version}";
- sha256 = "04r14dhqzrdndn235dvr6afy4s4g4asynsgvj99cmyq55nah4asn";
+ sha256 = "11sc0gycxzq1vfvin501jnwnky2ky6ns64yjiw8vq9vmkbf8nni6";
};
propagatedBuildInputs = with python3Packages; [ nagiosplugin ];
@@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Nagios / Icinga monitoring plugin to check systemd for failed units";
inherit (src.meta) homepage;
+ changelog = "https://github.com/Josef-Friedrich/check_systemd/releases";
maintainers = with maintainers; [ symphorien ];
license = licenses.lgpl2Only;
platforms = platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/servers/quagga/default.nix b/third_party/nixpkgs/pkgs/servers/quagga/default.nix
deleted file mode 100644
index c3c69fa79b..0000000000
--- a/third_party/nixpkgs/pkgs/servers/quagga/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib, stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo,
- pkg-config, c-ares }:
-
-stdenv.mkDerivation rec {
- pname = "quagga";
- version = "1.2.4";
-
- src = fetchurl {
- url = "mirror://savannah/quagga/${pname}-${version}.tar.gz";
- sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73";
- };
-
- buildInputs =
- [ readline net-snmp c-ares ]
- ++ lib.optionals stdenv.isLinux [ libcap libnl ];
-
- nativeBuildInputs = [ pkg-config perl texinfo ];
-
- configureFlags = [
- "--sysconfdir=/etc/quagga"
- "--localstatedir=/run/quagga"
- "--sbindir=$(out)/libexec/quagga"
- "--disable-exampledir"
- "--enable-user=quagga"
- "--enable-group=quagga"
- "--enable-configfile-mask=0640"
- "--enable-logfile-mask=0640"
- "--enable-vtysh"
- "--enable-vty-group=quaggavty"
- "--enable-snmp"
- "--enable-multipath=64"
- "--enable-rtadv"
- "--enable-irdp"
- "--enable-opaque-lsa"
- "--enable-ospf-te"
- "--enable-pimd"
- "--enable-isis-topology"
- ];
-
- preConfigure = ''
- substituteInPlace vtysh/vtysh.c --replace \"more\" \"${less}/bin/less\"
- '';
-
- postInstall = ''
- rm -f $out/bin/test_igmpv3_join
- mv -f $out/libexec/quagga/ospfclient $out/bin/
- '';
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "Quagga BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite";
- longDescription = ''
- GNU Quagga is free software which manages TCP/IP based routing protocols.
- It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, and RIPng as
- well as the IPv6 versions of these.
-
- As the predecessor Zebra has been considered orphaned, the Quagga project
- has been formed by members of the zebra mailing list and the former
- zebra-pj project to continue developing.
-
- Quagga uses threading if the kernel supports it, but can also run on
- kernels that do not support threading. Each protocol has its own daemon.
-
- It is more than a routed replacement, it can be used as a Route Server and
- a Route Reflector.
- '';
- homepage = "https://www.nongnu.org/quagga/";
- license = licenses.gpl2;
- platforms = platforms.unix;
- maintainers = with maintainers; [ tavyc ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix
index bd781d869e..25f4d4b69c 100644
--- a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix
+++ b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix
@@ -1,14 +1,20 @@
-{ lib, python3 }:
+{ lib, python3, fetchFromGitHub, nixosTests }:
python3.pkgs.buildPythonApplication rec {
- pname = "Radicale";
+ pname = "radicale";
version = "3.0.6";
- src = python3.pkgs.fetchPypi {
- inherit pname version;
- sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6";
+ src = fetchFromGitHub {
+ owner = "Kozea";
+ repo = "Radicale";
+ rev = version;
+ sha256 = "1xlsvrmx6jhi71j6j8z9sli5vwxasivzjyqf8zq8r0l5p7350clf";
};
+ postPatch = ''
+ sed -i '/addopts/d' setup.cfg
+ '';
+
propagatedBuildInputs = with python3.pkgs; [
defusedxml
passlib
@@ -18,14 +24,14 @@ python3.pkgs.buildPythonApplication rec {
];
checkInputs = with python3.pkgs; [
- pytestrunner
- pytest
- pytestcov
- pytest-flake8
- pytest-isort
+ pytestCheckHook
waitress
];
+ passthru.tests = {
+ inherit (nixosTests) radicale;
+ };
+
meta = with lib; {
homepage = "https://www.radicale.org/3.0.html";
description = "CalDAV and CardDAV server";
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix
new file mode 100644
index 0000000000..a5c0f558c4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+ pname = "pgvector";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "ankane";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "03i8rq9wp9j2zdba82q31lzbrqpnhrqc8867pxxy3z505fxsvfzb";
+ };
+
+ buildInputs = [ postgresql ];
+
+ installPhase = ''
+ install -D -t $out/lib vector.so
+ install -D -t $out/share/postgresql/extension vector-*.sql
+ install -D -t $out/share/postgresql/extension vector.control
+ '';
+
+ meta = with lib; {
+ description = "Open-source vector similarity search for PostgreSQL";
+ homepage = "https://github.com/ankane/pgvector";
+ license = licenses.postgresql;
+ platforms = postgresql.meta.platforms;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
index e8b2f4130a..e2d655bdb3 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
@@ -25,6 +25,8 @@ self: super: {
pgroonga = super.callPackage ./ext/pgroonga.nix { };
+ pgvector = super.callPackage ./ext/pgvector.nix { };
+
plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { };
plr = super.callPackage ./ext/plr.nix { };
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
index 330470f0fd..8ad888e759 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
- version = "5.6.2";
+ version = "5.7.1";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
- sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI=";
+ sha256 = "08c9g80lhs4h2psf3ykn0l4k1yyy0x21kxjqy8ckjpjvw3281nd4";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
index 4c83229159..c25285d13e 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
@@ -773,6 +773,14 @@ self: super:
"--with-launchdaemons-dir=\${out}/LaunchDaemons"
"--with-launchagents-dir=\${out}/LaunchAgents"
];
+ patches = [
+ # don't unset DBUS_SESSION_BUS_ADDRESS in startx
+ (fetchpatch {
+ name = "dont-unset-DBUS_SESSION_BUS_ADDRESS.patch";
+ url = "https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/fs46369.patch?h=packages/xorg-xinit&id=40f3ac0a31336d871c76065270d3f10e922d06f3";
+ sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7";
+ })
+ ];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ]
++ lib.optionals isDarwin [ self.libX11 self.xorgproto ];
postFixup = ''
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix
index 70022b5c2a..ee291ccdc0 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.29.0";
+ version = "0.30.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-RZz8hmcLOJRz0HpPXc3121B1UcbtDgCFv8Zdv29E+XQ=";
+ sha256 = "104zrj15kmc0a698dc8dxbzhg1rjqn38v3wqcwg2xiickglpgd5f";
};
- cargoSha256 = "sha256-V6Qdg8xSm2/6BbSEOH5mH92Gjx+xy0J2CZ9FQxmhI88=";
+ cargoSha256 = "1c6yhkj1hyr82y82nff6gy9kq9z0mbq3ivlq8rir10pnqy4j5791";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
diff --git a/third_party/nixpkgs/pkgs/stdenv/native/default.nix b/third_party/nixpkgs/pkgs/stdenv/native/default.nix
index b79b81253a..010b4141e8 100644
--- a/third_party/nixpkgs/pkgs/stdenv/native/default.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/native/default.nix
@@ -129,7 +129,7 @@ in
name = "cc-native";
nativeTools = true;
nativeLibc = true;
- inherit nativePrefix;
+ inherit lib nativePrefix;
bintools = import ../../build-support/bintools-wrapper {
name = "bintools";
inherit stdenvNoCC nativePrefix;
diff --git a/third_party/nixpkgs/pkgs/stdenv/nix/default.nix b/third_party/nixpkgs/pkgs/stdenv/nix/default.nix
index a8311f4960..2fb19992bc 100644
--- a/third_party/nixpkgs/pkgs/stdenv/nix/default.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/nix/default.nix
@@ -24,6 +24,7 @@ bootStages ++ [
initialPath = (import ../common-path.nix) { pkgs = prevStage; };
cc = import ../../build-support/cc-wrapper {
+ inherit lib;
nativeTools = false;
nativePrefix = lib.optionalString hostPlatform.isSunOS "/usr";
nativeLibc = true;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
index 93b5433fcc..e9e039cfbd 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
- version = "4.0.4";
+ version = "4.0.5";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KY9POvwmyUVx9jcn02Ltcz2a1ULqyKW73A9Peb6rpYE=";
+ sha256 = "sha256-tpk5Avx2bRQlhOnHpmpDG14X9nk3x68TST+VtIW8rL8=";
};
- vendorSha256 = "sha256-+p3ucnvgOpSLS/uP9RAkWixCkaDoF64qCww013jPqSs=";
+ vendorSha256 = "sha256-O9SEVyBFnmyrQCmccXLyeOqlTwWHzICTLVKGO7rerjI=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
index c098fa278b..3f0aca33d6 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
- version = "1.27.2";
+ version = "1.28.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-Wq3CWKYuF4AaOVpe0sGn9BzLx/6rSPFN6rFc2jUUVEA=";
+ sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw=";
};
goPackagePath = "github.com/exoscale/cli";
diff --git a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix
index 5dc6e39f8d..80480c91ca 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix
@@ -1,30 +1,20 @@
{ lib
, python3
, fetchFromGitHub
-, fetchpatch
, ffmpeg
}:
python3.pkgs.buildPythonApplication rec {
pname = "spotdl";
- version = "3.5.1";
+ version = "3.5.2";
src = fetchFromGitHub {
owner = "spotDL";
repo = "spotify-downloader";
rev = "v${version}";
- sha256 = "sha256-Mc0aODyt0rwmBhkvY/gH1ODz4k8LOxyU5xXglSb6sPs=";
+ sha256 = "sha256-V9jIA+ULjZRj+uVy4Yh55PapPiqFy9I9ZVln1nt/bJw=";
};
- patches = [
- # https://github.com/spotDL/spotify-downloader/pull/1254
- (fetchpatch {
- name = "subprocess-dont-use-shell.patch";
- url = "https://github.com/spotDL/spotify-downloader/commit/fe9848518900577776b463ef0798796201e226ac.patch";
- sha256 = "1kqq3y31dcx1zglywr564hkd2px3qx6sk3rkg7yz8n5hnfjhp6fn";
- })
- ];
-
propagatedBuildInputs = with python3.pkgs; [
spotipy
pytube
diff --git a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
index 54644ac3a0..4a8de070ce 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
@@ -1,16 +1,16 @@
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
rustPlatform.buildRustPackage rec {
pname = "bupstash";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "andrewchambers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-zZHJlC0OICIc3G825t7GrZwdmkaaLQKzX2IwkKigkV4=";
+ sha256 = "sha256-uA5XEG9nvqsXg34bqw8k4Rjk5F9bPFSk1HQ4Bv6Ar+I=";
};
- cargoSha256 = "sha256-KVeIF6x+gpb8vkqCtZptF5EX9G1Zv6q8L6tskN6HziM=";
+ cargoSha256 = "sha256-4r+Ioh6Waoy/7LVF3CPz18c2bCRYym5T4za1GSKw7WQ=";
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
buildInputs = [ libsodium ];
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
index d13d4915e1..f47627b5d2 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
@@ -175,6 +175,7 @@ in rec {
preConfigure =''
substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo"
substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe"
+ substituteInPlace src/common/module.c --replace "/bin/grep" "grep"
# for pybind/rgw to find internal dep
export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
index a0dc312415..0da6c4c209 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
@@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
"-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}"
] ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake";
- doCheck = true;
+ # macFUSE needs to be installed for the test to succeed on Darwin
+ doCheck = !stdenv.isDarwin;
checkPhase = ''
# Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing)
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
index 66f7494415..b14dc620e4 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
@@ -1,34 +1,43 @@
-{ fetchFromGitHub
+{ lib
+, stdenv
+, fetchFromGitHub
, fetchurl
-, lz4 ? null
-, lz4Support ? false
-, lzo
-, lib, stdenv
, xz
+, lzo
, zlib
+, zstd
+, lz4
+, lz4Support ? false
}:
-assert lz4Support -> (lz4 != null);
-
let
- patch = fetchFromGitHub {
- owner = "devttys0";
- repo = "sasquatch";
- rev = "3e0cc40fc6dbe32bd3a5e6c553b3320d5d91ceed";
- sha256 = "19lhndjv7v9w6nmszry63zh5rqii9v7wvsbpc2n6q606hyz955g2";
- } + "/patches/patch0.txt";
+ patch = fetchFromGitHub
+ {
+ # NOTE: This uses my personal fork for now, until
+ # https://github.com/devttys0/sasquatch/pull/40 is merged.
+ # I, cole-h, will keep this fork available until that happens.
+ owner = "cole-h";
+ repo = "sasquatch";
+ rev = "6edc54705454c6410469a9cb5bc58e412779731a";
+ sha256 = "x+PuPYGD4Pd0fcJtlLWByGy/nggsmZkxwSXxJfPvUgo=";
+ } + "/patches/patch0.txt";
in
stdenv.mkDerivation rec {
pname = "sasquatch";
- version = "4.3";
+ version = "4.4";
src = fetchurl {
- url = "mirror://sourceforge/squashfs/squashfs4.3.tar.gz";
- sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d";
+ url = "mirror://sourceforge/squashfs/squashfs${version}.tar.gz";
+ sha256 = "qYGz8/IFS1ouZYhRo8BqJGCtBKmopkXgr+Bjpj/bsH4=";
};
- buildInputs = [ xz lzo xz zlib ]
- ++ lib.optional lz4Support lz4;
+ buildInputs = [
+ xz
+ lzo
+ zlib
+ zstd
+ ]
+ ++ lib.optionals lz4Support [ lz4 ];
patches = [ patch ];
patchFlags = [ "-p0" ];
diff --git a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix
index 3bc87680c5..9cb79ceabe 100644
--- a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix
@@ -34,16 +34,16 @@ let
in rustPlatform.buildRustPackage rec {
pname = "Ajour";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "casperstorm";
repo = "ajour";
rev = version;
- sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y=";
+ sha256 = "1xzsgxkdwdqcr8xs9ajr1ykfjjz95z9k7b7l644yijg31xf1lbq6";
};
- cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA=";
+ cargoSha256 = "02g25wr0f2bjr7zmpll3iicc6i8wk1j9iavagg1vhbpynp6z013x";
nativeBuildInputs = [
autoPatchelfHook
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix
index 3fe6698846..aca53c2546 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
- version = "1.1.0-dev-20210413";
+ version = "1.1.0-dev-20210421";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
- sha256 = "13i6n95d0cjrhx68qsich6xzk5f9ga0y3m19k4z2d58s164rnh0v";
+ sha256 = "sha256-2IgGvQy6omDEwrzQDfa/OLi3f+Q2zarvJVGk6ZhsjSA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix
index a3299b4274..90039d1780 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, rustPlatform
, fetchCrate
, installShellFiles
@@ -11,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "1.2.0";
+ version = "1.2.9";
src = fetchCrate {
inherit pname version;
- sha256 = "1mqaynrqaas82f5957lx31x80v74zwmwmjxxlbywajb61vh00d38";
+ sha256 = "sha256-5tM8ywLBPPjCKEfXIfUZ5aF4t9YpYA3tzERxC1NEsso=";
};
- cargoHash = "sha256-ffFS1myFjoQ6768D4zUytN6F9paWeJJFPFugCrfh4iU=";
+ cargoHash = "sha256-P5ukwtRUpIJIqJjwTXIB2xRnpyLkzMeBMHmUz4Ery3s=";
nativeBuildInputs = [
makeWrapper
diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
index f6c6b1aecc..cec900189c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "2.0.9";
+ version = "2.0.10";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-yDd9u9cwC+bjB0ZQW0EgEDaHmWwkUprwXIiVrOVP2nk=";
+ sha256 = "sha256-WVG4rww9Wd1H6zw5lRBErX9VwnA21dhvith9BQFYqxw=";
};
- vendorSha256 = "sha256-c6YIWpC8sQA/gbgD2vuuFvwccEE00aUrj6gcPpJsn0k=";
+ vendorSha256 = "sha256-khYcNP3xAXeQR9vaghkGq8x6KB1k5hLEcE7Zx8H+CfA=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix
index 9c6909d445..81e51bbbf2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix
@@ -1,21 +1,25 @@
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev
-, pkg-config, qtbase, cmake, zlib, kmod }:
+, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }:
mkDerivation rec {
- version = "0.4.2";
+ version = "0.4.4";
pname = "ckb-next";
src = fetchFromGitHub {
owner = "ckb-next";
repo = "ckb-next";
rev = "v${version}";
- sha256 = "1mkx1psw5xnpscdfik1kpzsnfhhkn3571i7acr9gxyjr27sckplc";
+ sha256 = "1fgvh2hsrm8vqbqq9g45skhyyrhhka4d8ngmyldkldak1fgmrvb7";
};
buildInputs = [
udev
qtbase
zlib
+ libXdmcp
+ qttools
+ qtx11extras
+ libdbusmenu
];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/install-dirs.patch b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/install-dirs.patch
index 0f113d71aa..05a661c7ff 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/install-dirs.patch
+++ b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/install-dirs.patch
@@ -1,12 +1,12 @@
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
-index 2fc10a8..22dbd14 100644
+index a04b80c..2969b3b 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
-@@ -421,7 +421,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd")
+@@ -437,7 +437,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd")
elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service"
-- DESTINATION "/usr/lib/systemd/system"
+- DESTINATION "${SYSTEMD_UNIT_INSTALL_DIR}"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
PERMISSIONS
OWNER_READ OWNER_WRITE
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/modprobe.patch b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/modprobe.patch
index a2cbe262e8..257683e11f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/modprobe.patch
+++ b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/modprobe.patch
@@ -1,21 +1,21 @@
diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
-index 8489f5b..b851419 100644
+index 933e628..c4f97f2 100644
--- a/src/daemon/input_linux.c
+++ b/src/daemon/input_linux.c
-@@ -63,7 +63,7 @@ int os_inputopen(usbdevice* kb){
+@@ -70,7 +70,7 @@ int os_inputopen(usbdevice* kb){
// If not available, load the module
if(fd < 0){
- if(system("modprobe uinput") != 0) {
+ if(system("@kmod@/bin/modprobe uinput") != 0) {
- ckb_fatal("Failed to load uinput module\n");
+ ckb_fatal("Failed to load uinput module");
return 1;
}
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
-index 1eb95bd..f7d38ba 100644
+index eeadaf8..87de71f 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
-@@ -284,7 +284,7 @@ void MainWindow::updateVersion(){
+@@ -309,7 +309,7 @@ void MainWindow::updateVersion(){
#elif defined(Q_OS_LINUX)
if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
QProcess modprobe;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix
new file mode 100644
index 0000000000..97dfd8310d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+python3.pkgs.buildPythonApplication rec {
+ pname = "cyclonedx-python";
+ version = "0.4.3";
+
+ src = fetchFromGitHub {
+ owner = "CycloneDX";
+ repo = "cyclonedx-python";
+ rev = "v${version}";
+ sha256 = "BvG4aWBMsllW2L4lLsiRFUCPjgoDpHxN49fsUFdg7tQ=";
+ };
+
+ # They pin versions for exact version numbers because "A bill-of-material such
+ # as CycloneDX expects exact version numbers" -- but that's unnecessary with
+ # Nix.
+ preBuild = ''
+ sed "s@==.*'@'@" -i setup.py
+ '';
+
+ propagatedBuildInputs = with python3.pkgs; [
+ packageurl-python
+ requests
+ xmlschema
+ setuptools
+ requirements-parser
+ packaging
+ chardet
+ jsonschema
+ ];
+
+ # the tests want access to the cyclonedx binary
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "cyclonedx"
+ ];
+
+ meta = with lib; {
+ description = "Creates CycloneDX Software Bill of Materials (SBOM) from Python projects";
+ homepage = "https://github.com/CycloneDX/cyclonedx-python";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix
index 1717b88f19..b1a42f5770 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ddcutil";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "rockowitz";
repo = "ddcutil";
rev = "v${version}";
- sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU=";
+ sha256 = "0wv8a8zjahzmi4qx0lc24mwyi3jklj1yxqq26fwklmfh5dv1y8yc";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff
index e45eb88b51..54d17ea5bf 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff
+++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff
@@ -1,32 +1,30 @@
-diff --git a/src/app_sysenv/query_sysenv_modules.c b/src/app_sysenv/query_sysenv_modules.c
-index 59df64f1..fb244dd0 100644
---- a/src/app_sysenv/query_sysenv_modules.c
-+++ b/src/app_sysenv/query_sysenv_modules.c
-@@ -50,7 +50,9 @@ bool is_module_loadable(char * module_name, int depth) {
- g_snprintf(module_name_ko, 100, "%s.ko", module_name);
-
- char dirname[PATH_MAX];
-- g_snprintf(dirname, PATH_MAX, "/lib/modules/%s/kernel/drivers/i2c", utsbuf.release);
-+ g_snprintf(dirname, PATH_MAX,
-+ "/run/booted-system/kernel-modules/lib/modules/%s/kernel/drivers/i2c",
-+ utsbuf.release);
-
- struct dirent *dent;
- DIR *d;
-diff --git a/src/util/linux_util.c b/src/util/linux_util.c
-index 5eb8491c..3a129ccf 100644
--- a/src/util/linux_util.c
+++ b/src/util/linux_util.c
-@@ -29,8 +29,10 @@ bool is_module_builtin(char * module_name)
- int rc = uname(&utsbuf);
- assert(rc == 0);
+@@ -125,6 +125,7 @@
+ "lib64",
+ "lib32",
+ "usr/lib", // needed for arch?
++ "run/booted-system/kernel-modules/lib", // NixOS
+ NULL};
+ int result = -1;
+ int ndx = 0;
+@@ -204,14 +205,15 @@
+ if (debug)
+ printf("(%s) machine: %s", __func__, utsbuf.machine);
-- char modules_builtin_fn[100];
-- snprintf(modules_builtin_fn, 100, "/lib/modules/%s/modules.builtin", utsbuf.release);
-+ char modules_builtin_fn[PATH_MAX];
-+ snprintf(modules_builtin_fn, PATH_MAX,
-+ "/run/booted-system/kernel-modules/lib/modules/%s/modules.builtin",
-+ utsbuf.release);
+- char * libdirs[3];
++ char * libdirs[4];
+ libdirs[0] = "lib";
++ libdirs[1] = "run/booted-system/kernel-modules/lib";
+ if (streq(utsbuf.machine, "amd_64")){
+- libdirs[1] = "lib64";
+- libdirs[2] = NULL;
++ libdirs[2] = "lib64";
++ libdirs[3] = NULL;
+ }
+ else
+- libdirs[1] = NULL;
++ libdirs[2] = NULL;
- char ko_name[40];
- snprintf(ko_name, 40, "%s.ko", module_name);
+ int libsndx = 0;
+ bool found = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix
index 4e059725f8..ff1c4c7b89 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
- version = "0.2.68";
+ version = "0.2.71";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
- sha256 = "0ga1v4s8ks2v632mim8ljya0gi2j8bbwj98yfm3g00p0z1i526qk";
+ sha256 = "sha256-dXFnM8085XVzUwk1e3SoO+O+z9lJ40htJzHBGRQ95XY=";
};
- cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w";
+ cargoSha256 = "sha256-VwxIH/n1DjZsMOLAREclqanb4q7QEOZ35KWWciyrnyQ=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs =
@@ -54,7 +54,7 @@ buildRustPackage rec {
web browser.
'';
homepage = "https://gitlab.com/timvisee/ffsend";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ lilyball equirosa ];
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix
new file mode 100644
index 0000000000..40f30bd7ad
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix
@@ -0,0 +1,47 @@
+{ lib, appimageTools, fetchurl }: let
+ pname = "flexoptix-app";
+ version = "5.9.0";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ name = "${name}.AppImage";
+ url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
+ sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj";
+ };
+
+ udevRules = fetchurl {
+ url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules";
+ sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr";
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ inherit name src;
+ };
+
+in appimageTools.wrapType2 {
+ inherit name src;
+
+ multiPkgs = null; # no 32bit needed
+ extraPkgs = { pkgs, ... }@args: [
+ pkgs.hidapi
+ ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
+
+ extraInstallCommands = ''
+ mv $out/bin/{${name},${pname}}
+ install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications
+ install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps
+ substituteInPlace $out/share/applications/flexoptix-app.desktop \
+ --replace 'Exec=AppRun' "Exec=$out/bin/${pname}"
+ mkdir -p $out/lib/udev/rules.d
+ ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules
+ '';
+
+ meta = {
+ description = "Configure FLEXOPTIX Universal Transcievers in seconds";
+ homepage = "https://www.flexoptix.net";
+ changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog";
+ license = lib.licenses.unfree;
+ maintainers = with lib.maintainers; [ das_j ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix
index 4a02e921f4..5ccf4b96d8 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix
@@ -1,36 +1,27 @@
-{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }:
+{ lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }:
stdenv.mkDerivation rec {
- version = "1.4";
+ version = "1.4.6";
pname = "goaccess";
src = fetchurl {
url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
- sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8";
+ sha256 = "1l3j3i4vb7ni7i047qvi9a3hs43ym24r6hfcnqsbhgrb731jf3qx";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch";
- sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6";
- })
- ];
-
configureFlags = [
- "--enable-geoip=mmdb"
"--enable-utf8"
- ];
+ "--with-openssl"
+ ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ];
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- libmaxminddb
- ncurses
- glib
- ];
+ buildInputs = [ ncurses openssl ]
+ ++ lib.optionals withGeolocation [ libmaxminddb ]
+ ++ lib.optionals stdenv.isDarwin [ gettext ];
meta = {
description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
homepage = "https://goaccess.io";
+ changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog";
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ ederoyd46 ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
index 8732ee66ef..6b92ecc5ef 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "0.162.0";
+ version = "0.163.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nhl6GATzFsfEQjKVxz65REn9QTvOH49omU00ZCfO6CY=";
+ sha256 = "sha256-2SDy/Mk4TkXkJKF1gFW7/FH4Y31TE2X38I0r/Ng/BjU=";
};
- vendorSha256 = "sha256-zq/RIOK/Hs1GJ2yLE7pe0UoDuR6LGUrPQAuQzrTvuKs=";
+ vendorSha256 = "sha256-+Qdxnd+IhBNfZ0R2lCfPGJSjpTw1TA6uPjykCfrYtMk=";
buildFlagsArray = [
"-ldflags="
diff --git a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix
index 1d825c866c..978168d367 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix
@@ -1,20 +1,23 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub, shared-mime-info }:
rustPlatform.buildRustPackage rec {
pname = "handlr";
- version = "0.5.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "chmln";
repo = pname;
rev = "v${version}";
- sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg";
+ sha256 = "0mxkirsicagvfyihcb06g2bsz5h0zp7xc87vldp4amgddzaxhpbg";
};
- cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p";
+ cargoSha256 = "11glh6f0cjrq76212h80na2rgwpzjmk0j78y3i98nv203rkrczid";
- # Most tests fail (at least some due to directory permissions)
- doCheck = false;
+ nativeBuildInputs = [ shared-mime-info ];
+
+ preCheck = ''
+ export HOME=$TEMPDIR
+ '';
meta = with lib; {
description = "Alternative to xdg-open to manage default applications with ease";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix
index 30fd40a108..d928700308 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils }:
+{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils, ueberzug }:
stdenvNoCC.mkDerivation rec {
pname = "neofetch";
- version = "7.1.0";
+ version = "unstable-2020-11-26";
src = fetchFromGitHub {
owner = "dylanaraps";
repo = "neofetch";
- rev = version;
- sha256 = "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv";
+ rev = "6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f";
+ sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE=";
};
strictDeps = true;
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/neofetch \
- --prefix PATH : ${lib.makeBinPath [ pciutils ]}
+ --prefix PATH : ${lib.makeBinPath [ pciutils ueberzug ]}
'';
makeFlags = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix
index 6d38516997..d7f6a3d873 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/pcb2gcode/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "pcb2gcode";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "pcb2gcode";
repo = "pcb2gcode";
rev = "v${version}";
- sha256 = "sha256-BELugmnnedqXTnSwiQN3XbqkWKTKF27ElQAwrEWNSao=";
+ sha256 = "sha256-blbfpMBe7X3OrNbBiz8fNzKcS/bbViQUTXtdxZpXPBk=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix
index 03f24c16aa..8eeee269b0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix
@@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests
+, lvm2, pam, python, util-linux, json_c, nixosTests
, ncurses }:
stdenv.mkDerivation rec {
pname = "snapper";
- version = "0.8.15";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
- sha256 = "1rqv1qfxr02qbkix1mpx91s4827irxryxkhby3ii0fdkm3ympsas";
+ sha256 = "1gx3ichbkdqlzl7w187vc3xpmr9prmnp7as0h6ympgigradj5c7g";
};
nativeBuildInputs = [
@@ -26,14 +26,6 @@ stdenv.mkDerivation rec {
passthru.tests.snapper = nixosTests.snapper;
- patches = [
- # Don't use etc/dbus-1/system.d
- (fetchpatch {
- url = "https://github.com/openSUSE/snapper/commit/c51708aea22d9436da287cba84424557ad03644b.patch";
- sha256 = "106pf7pv8z3q37c8ckmgwxs1phf2fy7l53a9g5xq5kk2rjj1cx34";
- })
- ];
-
postPatch = ''
# Hard-coded root paths, hard-coded root paths everywhere...
for file in {client,data,pam,scripts,zypp-plugin}/Makefile.am; do
diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
index c589590abc..1e3eae7870 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.51.0";
+ version = "0.52.1";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "1bmnwvjhw2ba7yqn9if83d57b8qbrbqgy2br8q2drz4ylk0gjirg";
+ sha256 = "sha256-BX+NUF7mgZyrloj3h9YcG2r6ZZWO20hXQYbBvaK34JQ=";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
done
'';
- cargoSha256 = "1d4ca8yzx437x53i7z2kddv9db89zy6ywbgl6y1cwwd6wscbrxcq";
+ cargoSha256 = "sha256-8xqbPkdIVfAkeG1WZFq56N0rcF+uh2FeMKzz4FgMFYs=";
preCheck = ''
HOME=$TMPDIR
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix
index 7fcd5322c2..629cf548c2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
+, fetchpatch
, autoreconfHook
, pkg-config
, bison
@@ -31,6 +32,15 @@ stdenv.mkDerivation rec {
sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p";
};
+ patches = [
+ # Fix cross-compilation
+ # https://github.com/tmux/tmux/pull/2651
+ (fetchpatch {
+ url = "https://github.com/tmux/tmux/commit/bb6242675ad0c7447daef148fffced882e5b4a61.patch";
+ sha256 = "1acr3xv3gqpq7qa2f8hw7c4f42hi444lfm1bz6wqj8f3yi320zjr";
+ })
+ ];
+
nativeBuildInputs = [
pkg-config
autoreconfHook
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix
index 04eb29ca1e..0c4085d829 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix
@@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "vector";
- version = "0.12.2";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-LutCzpJo47wvEze7bAObRVraNhVuQFc9NQ79NzKA9CM=";
+ sha256 = "sha256-Sur5QfPIoJXkcYdyNlIHOvmV2yBedhNm7UinmaFEc2E=";
};
- cargoSha256 = "sha256-GU5p9DB5Bk8eQc1B/WA87grbVJVcT1ELJ0WzmRYgDzc=";
+ cargoSha256 = "sha256-1Xm1X1pfx9J0tBck2WA+zt2OxtQsqustcWPazsPyKPY=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ]
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix
new file mode 100644
index 0000000000..95a4bbe9fb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, rustPlatform
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "anevicon";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "rozgo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1m3ci7g7nn28p6x5m85av3ljgszwlg55f1hmgjnarc6bas5bapl7";
+ };
+
+ cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1";
+
+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
+ cargoPatches = [
+ # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1
+ (fetchpatch {
+ name = "cargo-lock-file.patch";
+ url = "https://github.com/rozgo/anevicon/commit/205440a0863aaea34394f30f4255fa0bb1704aed.patch";
+ sha256 = "02syzm7irn4slr3s5dwwhvg1qx8fdplwlhza8gfkc6ajl7vdc7ri";
+ })
+ ];
+
+ meta = with lib; {
+ description = "UDP-based load generator";
+ homepage = "https://github.com/rozgo/anevicon";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix
index a889821c94..5c7b26ced0 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, nixosTests }:
+{ lib, stdenv, fetchurl, fetchpatch, nixosTests }:
stdenv.mkDerivation rec {
pname = "babeld";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "01vzhrspnm4sy9ggaz9n3bfl5hy3qlynr218j3mdcddzm3h00kqm";
};
+ patches = [
+ (fetchpatch {
+ # Skip kernel_setup_interface when `skip-kernel-setup` is enabled.
+ url = "https://github.com/jech/babeld/commit/f9698a5616842467ad08a5f9ed3d6fcfa2dd2898.patch";
+ sha256 = "00kj2jxsfq0pjk5wrkslyvkww57makxlwa4fd82g7g9hrgahpqwr";
+ })
+ ];
+
preBuild = ''
makeFlags="PREFIX=$out ETCDIR=$out/etc"
'';
diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix
index 8e9097f2f9..187c07b040 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
- version = "8.6.12";
+ version = "9.1.0";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Oad0JpeeCpIHfH9e1pTKtrnvZ+eFx3dR5GP6g6piFS0=";
+ sha256 = "sha256-teH4Y6PrUSE7Rxw0WV7Ka+CB44nwYXy9q09wOAhC8Bc=";
};
- vendorSha256 = "sha256-LYMZFaCNlJg+9Hoh2VbY6tMHv6oT7r+JHBcQYpOceRQ=";
+ vendorSha256 = "sha256-HPUvL22BrVH9/j41VFaystZWs0LO6KNIf2cNYqKxWnY=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix
index 40353ea278..72f5b6f57f 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lychee";
- version = "0.5.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "lycheeverse";
repo = pname;
- rev = "v${version}";
- sha256 = "03dsp0384mwr51dkqfl25xba0m17sppabiz7slhxcig89b0ksykm";
+ rev = version;
+ sha256 = "0kpwpbv0dqb0p4bxjlcjas6x1n91rdsvy2psrc1nyr1sh6gb1q5j";
};
- cargoSha256 = "08y2wpm2qgm2jsy257b2p2anxy4q3bj2kfdr5cnb6wnaz9g4ypq2";
+ cargoSha256 = "1b915zkg41n3azk4hhg6fgc83n7iq8p7drvdyil2m2a4qdjvp9r3";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wstunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
deleted file mode 100644
index a851dcd4ea..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/wstunnel/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ mkDerivation, async, base, base64-bytestring, binary, bytestring
-, classy-prelude, cmdargs, connection, hslogger, mtl, network
-, network-conduit-tls, streaming-commons, text
-, unordered-containers, websockets
-, hspec, iproute
-, lib, fetchFromGitHub, fetchpatch
-}:
-
-mkDerivation rec {
- pname = "wstunnel";
- version = "unstable-2020-07-12";
-
- src = fetchFromGitHub {
- owner = "erebe";
- repo = pname;
- rev = "093a01fa3a34eee5efd8f827900e64eab9d16c05";
- sha256 = "17p9kq0ssz05qzl6fyi5a5fjbpn4bxkkwibb9si3fhzrxc508b59";
- };
-
- isLibrary = false;
- isExecutable = true;
-
- libraryHaskellDepends = [
- async base base64-bytestring binary bytestring classy-prelude
- connection hslogger mtl network network-conduit-tls
- streaming-commons text unordered-containers websockets
- iproute
- ];
-
- executableHaskellDepends = [
- base bytestring classy-prelude cmdargs hslogger text
- ];
-
- testHaskellDepends = [ base text hspec ];
-
- homepage = "https://github.com/erebe/wstunnel";
- description = "UDP and TCP tunnelling over WebSocket";
- maintainers = with lib.maintainers; [ gebner ];
- license = lib.licenses.bsd3;
-
-}
diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix
index 1383de79fe..e50de9fcfc 100644
--- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "bettercap";
- version = "2.30.2";
+ version = "2.31.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5CAWMW0u/8BUn/8JJBApyHGH+/Tz8hzAmSChoT2gFr8=";
+ sha256 = "sha256-PmS4ox1ZaHrBGJAdNByott61rEvfmR1ZJ12ut0MGtrc=";
};
- vendorSha256 = "sha256-fApxHxdzEEc+M+U5f0271VgrkXTGkUD75BpDXpVYd5k=";
+ vendorSha256 = "sha256-3j64Z4BQhAbUtoHJ6IT1SCsKxSeYZRxSO3K2Nx9Vv4w=";
doCheck = false;
@@ -30,10 +30,12 @@ buildGoModule rec {
meta = with lib; {
description = "A man in the middle tool";
longDescription = ''
- BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more.
+ BetterCAP is a powerful, flexible and portable tool created to perform various
+ types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic
+ in realtime, sniff for credentials and much more.
'';
homepage = "https://www.bettercap.org/";
- license = with licenses; gpl3;
+ license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ y0no ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix b/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix
index 9b1457554f..b294bb6281 100644
--- a/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dnsx";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "dnsx";
rev = "v${version}";
- sha256 = "sha256-CjWFXYU34PE4I9xihQbPxVcxLyiMCYueuaB/LaXhHQg=";
+ sha256 = "sha256-k71Pw6XdOFMUf7w7QAAxqQkmkCINl+3KApkIPRyAQLM=";
};
- vendorSha256 = "sha256-vTXvlpXpFf78Cwxq/y6ysSeXM3g71kHBn9zd6c4mxlk=";
+ vendorSha256 = "sha256-YA0XZSXmpAcNEFutrBbQE8DN7v5hcva0fscemEMLewU=";
meta = with lib; {
description = "Fast and multi-purpose DNS toolkit";
diff --git a/third_party/nixpkgs/pkgs/tools/security/earlybird/default.nix b/third_party/nixpkgs/pkgs/tools/security/earlybird/default.nix
new file mode 100644
index 0000000000..30916acda7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/earlybird/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+buildGoModule {
+ pname = "earlybird";
+ version = "1.25.0";
+
+ src = fetchFromGitHub {
+ owner = "americanexpress";
+ repo = "earlybird";
+ # According to the GitHub repo, the latest version *is* 1.25.0, but they
+ # tagged it as "refs/heads/main-2"
+ rev = "4f365f1c02972dc0a68a196a262912d9c4325b21";
+ sha256 = "UZXHYBwBmb9J1HrE/htPZcKvZ+7mc+oXnUtzgBmBgN4=";
+ };
+
+ vendorSha256 = "oSHBR1EvK/1+cXqGNCE9tWn6Kd/BwNY3m5XrKCAijhA=";
+
+ meta = with lib; {
+ description = "A sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more";
+ homepage = "https://github.com/americanexpress/earlybird";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix
new file mode 100644
index 0000000000..954dd07d6a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, python2
+, fetchFromGitHub
+}:
+python2.pkgs.buildPythonPackage rec {
+ pname = "flare-floss";
+ version = "1.7.0";
+
+ src = fetchFromGitHub {
+ owner = "fireeye";
+ repo = "flare-floss";
+ rev = "v${version}";
+ sha256 = "GMOA1+qM2A/Qw33kOTIINEvjsfqjWQWBXHNemh3IK8w=";
+ };
+
+ propagatedBuildInputs = with python2.pkgs; [
+ pyyaml
+ simplejson
+ tabulate
+ vivisect
+ plugnplay
+ viv-utils
+ enum34
+ ];
+
+ checkInputs = [
+ python2.pkgs.pytestCheckHook
+ ];
+
+ disabledTests = [
+ # test data is in a submodule
+ "test_main"
+ ];
+
+ pythonImportsCheck = [
+ "floss"
+ "floss.plugins"
+ ];
+
+ meta = with lib; {
+ description = "Automatically extract obfuscated strings from malware";
+ homepage = "https://github.com/fireeye/flare-floss";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix
index 6611233266..140ced9ff4 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix
@@ -23,14 +23,13 @@ let
};
in stdenv.mkDerivation rec {
-
pname = "ghidra";
- version = "9.2.2";
- versiondate = "20201229";
+ version = "9.2.3";
+ versiondate = "20210325";
src = fetchzip {
url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip";
- sha256 = "1xahkwiqdcwxssah16hhgrmyam49cb341xp5ysycj1h0kkm8p53s";
+ sha256 = "sha256-/rQ3JeOR/D+HxzkJ+nV+pd/7V81+tCyTOndwpXI05hg=";
};
nativeBuildInputs = [
@@ -72,7 +71,7 @@ in stdenv.mkDerivation rec {
homepage = "https://ghidra-sre.org/";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
license = licenses.asl20;
- maintainers = with maintainers; [ ck3d govanify ];
+ maintainers = with maintainers; [ ck3d govanify mic92 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
index 13bbdbb99d..5db1f1d20e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "grype";
- version = "0.9.0";
+ version = "0.10.2";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-X67TEHKmKKuTFGo55ZVkYVNw4f/d8aU2b/FQsq1OIJg=";
+ sha256 = "sha256-kKzrV2TTO8NmB3x27ZStMZpSIRGwm5Ev+cPGwT50FEU=";
};
- vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo=";
+ vendorSha256 = "sha256-PC2n6+gPDxpG8RTAmCfK4P40yfxqlleYI6Ex4FtPjk4=";
propagatedBuildInputs = [ docker ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
index 8c57845e79..ced514767e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.40"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.41"
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
index df2feb42ad..c5ccfc5a9d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: fb842915658f23b8997aa2cab4c3a62f3170cbbd
- ref: refs/tags/6.0.40
+ revision: 451fe6ffdb90fffe3df6b788e6410217a511a3f4
+ ref: refs/tags/6.0.41
specs:
- metasploit-framework (6.0.40)
+ metasploit-framework (6.0.41)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -123,7 +123,7 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
- aws-partitions (1.445.0)
+ aws-partitions (1.446.0)
aws-sdk-core (3.114.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -146,7 +146,7 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
- bindata (2.4.8)
+ bindata (2.4.9)
bson (4.12.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
@@ -168,11 +168,15 @@ GEM
eventmachine (1.2.7)
faker (2.17.0)
i18n (>= 1.6, < 2)
- faraday (1.3.0)
+ faraday (1.4.1)
+ faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
+ faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3)
- ruby2_keywords
+ ruby2_keywords (>= 0.0.4)
+ faraday-excon (1.1.0)
faraday-net_http (1.0.1)
+ faraday-net_http_persistent (1.1.0)
faye-websocket (0.11.0)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
index 19d53b1bb2..27bbaf2b7c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.0.40";
+ version = "6.0.41";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-QEaTHGCgBl1Lh6zZO1OSY3kS+6+xOr1lbHPNeS1DZZ8=";
+ sha256 = "sha256-6oaTc3UQayZ/ThurwFXdI1prwriz/XVS9zoeD427mj8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
index 7440eae07c..ed2c124450 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yvjc0vpcycr5plvkh63cjpivqi0slzq6sj60jllz8p99kli4xrj";
+ sha256 = "1n7cr44r7fvmc3rpk5kwwsz34ym2cmih76ij5xh2w1mmfyh3bgry";
type = "gem";
};
- version = "1.445.0";
+ version = "1.446.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -204,10 +204,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
+ sha256 = "16z30ca74h1mr452jnj1csv6yfnmdxsz0m1xpjf3svwybrx25rng";
type = "gem";
};
- version = "2.4.8";
+ version = "2.4.9";
};
bson = {
groups = ["default"];
@@ -344,10 +344,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
+ sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi";
type = "gem";
};
- version = "1.3.0";
+ version = "1.4.1";
+ };
+ faraday-excon = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
+ type = "gem";
+ };
+ version = "1.1.0";
};
faraday-net_http = {
groups = ["default"];
@@ -359,6 +369,16 @@
};
version = "1.0.1";
};
+ faraday-net_http_persistent = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
faye-websocket = {
groups = ["default"];
platforms = [];
@@ -514,12 +534,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "fb842915658f23b8997aa2cab4c3a62f3170cbbd";
- sha256 = "17v58cnpkkbkdijvsfmimzxi4yb3j99kpndchx5ms1m0c0f96ij0";
+ rev = "451fe6ffdb90fffe3df6b788e6410217a511a3f4";
+ sha256 = "0gwspf6hy7isyx97bzdkp316nni3vmaw1aqv9rzjcsqhfmrr71pa";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.0.40";
+ version = "6.0.41";
};
metasploit-model = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/tools/security/ntlmrecon/default.nix b/third_party/nixpkgs/pkgs/tools/security/ntlmrecon/default.nix
new file mode 100644
index 0000000000..d24d4ed4d6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/ntlmrecon/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "ntlmrecon";
+ version = "0.4";
+ disabled = python3.pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "pwnfoo";
+ repo = "NTLMRecon";
+ rev = "v-${version}";
+ sha256 = "0rrx49li2l9xlcax84qxjf60nbzp3fgq77c36yqmsp0pc9i89ah6";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [
+ colorama
+ iptools
+ requests
+ termcolor
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "ntlmrecon" ];
+
+ meta = with lib; {
+ description = "Information enumerator for NTLM authentication enabled web endpoints";
+ homepage = "https://github.com/pwnfoo/NTLMRecon";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
index 2d96c89970..1b70524145 100644
--- a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
@@ -1,6 +1,7 @@
{ lib
, rustPlatform
, fetchFromGitLab
+, installShellFiles
, pkg-config
, python3
, dbus
@@ -12,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
- version = "0.2.7";
+ version = "0.2.9";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "v${version}";
- sha256 = "sha256-1Jrgf5UW6k0x3q6kQIB6Q7moOhConEnUU9r+21W5Uu8=";
+ sha256 = "sha256-9qaRhTfdppU72w8jDwD1e8ABuGG+9GyrRIUVsry4Vos=";
};
- cargoSha256 = "sha256-N3pLW/OGeurrl+AlwdfbZ3T7WzEOAuyUMdIR164Xp7k=";
+ cargoSha256 = "sha256-j+kyllMcYj7/Ig5ho548L1wW+TtuQOc/zkxT6SNNN6w=";
postPatch = ''
# The GPGME backend is recommended
@@ -31,10 +32,16 @@ rustPlatform.buildRustPackage rec {
done
'';
- nativeBuildInputs = [ gpgme pkg-config python3 ];
+ nativeBuildInputs = [ gpgme installShellFiles pkg-config python3 ];
buildInputs = [ dbus glib gpgme gtk3 libxcb ];
+ postInstall = ''
+ for shell in bash fish zsh; do
+ installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout)
+ done
+ '';
+
meta = with lib; {
description = "Secure, fast & convenient password manager CLI using GPG and git to sync";
homepage = "https://gitlab.com/timvisee/prs";
diff --git a/third_party/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/third_party/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
index 774a14f72b..391eb1ad58 100644
--- a/third_party/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
+++ b/third_party/nixpkgs/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
@@ -7,10 +7,10 @@ diff -ur trousers-0.3.11.2.orig/src/tcsd/tcsd_conf.c trousers-0.3.11.2/src/tcsd/
+#ifndef ALLOW_NON_TSS_CONFIG_FILE
/* make sure user/group TSS owns the conf file */
- if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) {
+ if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) {
LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file,
@@ -775,6 +776,7 @@
- LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file);
+ LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file);
return TCSERR(TSS_E_INTERNAL_ERROR);
}
+#endif
diff --git a/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix b/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix
index c7a11e16f3..16536409b5 100644
--- a/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix
@@ -1,17 +1,15 @@
-{ lib, stdenv, fetchurl, openssl, pkg-config }:
+{ lib, stdenv, fetchurl, openssl, pkg-config, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "trousers";
- version = "0.3.14";
+ version = "0.3.15";
src = fetchurl {
url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz";
- sha256 = "0iwgsbrbb7nfqgl61x8aailwxm8akxh9gkcwxhsvf50x4qx72l6f";
+ sha256 = "0zy7r9cnr2gvwr2fb1q4fc5xnvx405ymcbrdv7qsqwl3a4zfjnqy";
};
- sourceRoot = ".";
-
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ openssl ];
patches = [ ./allow-non-tss-config-file-owner.patch ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
index f8e831ef2c..e04ab9df08 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "vault";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
- sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg";
+ sha256 = "0ncy99gw2pp5v2qbbgvri7qlirjj8qsvgjmjqyx3gddlpzpyiz3q";
};
goPackagePath = "github.com/hashicorp/vault";
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
index fc8b2865f2..40ce05331f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
@@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, unzip }:
let
- version = "1.7.0";
+ version = "1.7.1";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
- sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma";
+ sha256 = "021qa8jcqwy27q83lvamvv5zqnkwk5y0jsb8al5yxpgzxqnmsyb1";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
- sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd";
+ sha256 = "02hhxpa8craa91nfgvwziswisfdnqw4gbwrxyxr753v1y00y1sz8";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
- sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp";
+ sha256 = "141zzfwrjdjv8ymrdc4mxs2f4cphdir4xjaa40s571ri38in33zh";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
- sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg";
+ sha256 = "1plrmmy86zb2ij49dk2mwn364i2n83ch4gjz5pln2d4wjx21gpaq";
};
};
diff --git a/third_party/nixpkgs/pkgs/tools/security/xorex/default.nix b/third_party/nixpkgs/pkgs/tools/security/xorex/default.nix
new file mode 100644
index 0000000000..84919f5482
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/xorex/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+python3.pkgs.buildPythonApplication rec {
+ pname = "xorex";
+ version = "0.3.0";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "Neo23x0";
+ repo = "xorex";
+ rev = version;
+ sha256 = "rBsOSXWnHRhpLmq20XBuGx8gGBM8ouMyOISkbzUcvE4=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ chmod +x xorex.py
+ mv xorex.py $out/bin/xorex
+
+ runHook postInstall
+ '';
+
+ propagatedBuildInputs = with python3.pkgs; [
+ colorama
+ pefile
+ ];
+
+ meta = with lib; {
+ description = "XOR Key Extractor";
+ homepage = "https://github.com/Neo23x0/xorex";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/yarGen/default.nix b/third_party/nixpkgs/pkgs/tools/security/yarGen/default.nix
new file mode 100644
index 0000000000..8a2d51b8e1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/yarGen/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, python3
+, fetchFromGitHub
+, fetchpatch
+}:
+python3.pkgs.buildPythonApplication rec {
+ pname = "yarGen";
+ version = "0.23.4";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "Neo23x0";
+ repo = "yarGen";
+ rev = version;
+ sha256 = "6PJNAeeLAyUlZcIi0g57sO1Ex6atn7JhbK9kDbNrZ6A=";
+ };
+
+ patches = [
+ # https://github.com/Neo23x0/yarGen/pull/33
+ (fetchpatch {
+ name = "use-built-in-scandir.patch";
+ url = "https://github.com/Neo23x0/yarGen/commit/cae14ac8efeb5536885792cae99d1d0f7fb6fde3.patch";
+ sha256 = "0z6925r7n1iysld5c8li5nkm1dbxg8j7pn0626a4vic525vf8ndl";
+ })
+ # https://github.com/Neo23x0/yarGen/pull/34
+ (fetchpatch {
+ name = "use-cwd-for-abspath.patch";
+ url = "https://github.com/Neo23x0/yarGen/commit/441dafb702149f5728c2c6736fc08741a46deb26.patch";
+ sha256 = "lNp3oC2BM7tBzN4AetvPr+xJLz6KkZxQmsldeZaxJQU=";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace yarGen.py \
+ --replace "./3rdparty/strings.xml" "$out/share/yarGen/3rdparty/strings.xml"
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dt "$out/bin" yarGen.py
+ install -Dt "$out/share/yarGen/3rdparty" 3rdparty/strings.xml
+
+ runHook postInstall
+ '';
+
+ propagatedBuildInputs = with python3.pkgs; [
+ pefile
+ lxml
+ ];
+
+ meta = with lib; {
+ description = "A generator for YARA rules";
+ homepage = "https://github.com/Neo23x0/yarGen";
+ license = licenses.bsd3;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
index 348d635584..3b7ef2c88d 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
@@ -35,7 +34,14 @@ buildGoModule rec {
installManPage gdu.1
'';
- doCheck = !(stdenv.isAarch64 || stdenv.isDarwin);
+ # tests fail with:
+ # dir_test.go:76:
+ # Error Trace: dir_test.go:76
+ # Error: Not equal:
+ # expected: 0
+ # actual : 512
+ # Test: TestFlags
+ doCheck = false;
meta = with lib; {
description = "Disk usage analyzer with console interface";
diff --git a/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix b/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix
new file mode 100644
index 0000000000..610b494439
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/text/dcs/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, python3Packages
+, perl
+, zopfli
+, stdenv
+}:
+buildGoModule {
+ pname = "dcs";
+ version = "unstable-2021-04-07";
+
+ src = fetchFromGitHub {
+ owner = "Debian";
+ repo = "dcs";
+ rev = "da46accc4d55e9bfde1a6852ac5a9e730fcbbb2c";
+ sha256 = "N+6BXlKn1YTlh0ZdPNWa0nuJNcQtlUIc9TocM8cbzQk=";
+ };
+
+ vendorSha256 = "l2mziuisx0HzuP88rS5M+Wha6lu8P036wJYZlmzjWfs=";
+
+ # Depends on dcs binaries
+ doCheck = false;
+
+ nativeBuildInputs = [
+ python3Packages.slimit
+ (perl.withPackages (p: [ p.CSSMinifier ]))
+ zopfli
+ ];
+
+ postBuild = ''
+ make -C static -j$NIX_BUILD_CORES
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share/dcs
+ cp -r cmd/dcs-web/templates $out/share/dcs
+ cp -r static $out/share/dcs
+ '';
+
+ meta = with lib; {
+ description = "Debian Code Search";
+ homepage = "https://github.com/Debian/dcs";
+ license = licenses.bsd3;
+ maintainers = teams.determinatesystems.members;
+ broken = stdenv.isAarch64;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/text/zoekt/default.nix b/third_party/nixpkgs/pkgs/tools/text/zoekt/default.nix
new file mode 100644
index 0000000000..cb270f69ad
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/text/zoekt/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, git
+}:
+buildGoModule {
+ pname = "zoekt";
+ version = "unstable-2021-03-17";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "zoekt";
+ rev = "d92b3b80e582e735b2459413ee7d9dbbf294d629";
+ sha256 = "JdORh6bRdHsAYwsmdKY0OUavXfu3HsPQFkQjRBkcMBo=";
+ };
+
+ vendorSha256 = "d+Xvl6fleMO0frP9qr5tZgkzsnH5lPELwmEQEspD22M=";
+
+ checkInputs = [
+ git
+ ];
+
+ meta = with lib; {
+ description = "Fast trigram based code search";
+ homepage = "https://github.com/google/zoekt";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index f4b1963ab5..999c26e320 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -602,6 +602,7 @@ mapAliases ({
phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
+ quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index f31d9fdd1c..92de726825 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -404,6 +404,8 @@ in
find-cursor = callPackage ../tools/X11/find-cursor { };
+ flare-floss = callPackage ../tools/security/flare-floss { };
+
prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { };
@@ -1300,6 +1302,8 @@ in
cyclone-scheme = callPackage ../development/interpreters/cyclone { };
+ cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { };
+
deltachat-electron = callPackage
../applications/networking/instant-messengers/deltachat-electron { };
@@ -1347,6 +1351,8 @@ in
enpass = callPackage ../tools/security/enpass { };
+ esbuild = callPackage ../development/tools/esbuild { };
+
essentia-extractor = callPackage ../tools/audio/essentia-extractor { };
esh = callPackage ../tools/text/esh { };
@@ -1561,6 +1567,10 @@ in
xcodeenv = callPackage ../development/mobile/xcodeenv { };
+ gomobile = callPackage ../development/mobile/gomobile {
+ buildGoModule = buildGo115Module;
+ };
+
ssh-agents = callPackage ../tools/networking/ssh-agents { };
ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { };
@@ -1598,6 +1608,10 @@ in
novacomd = callPackage ../development/mobile/webos/novacomd.nix { };
};
+ anevicon = callPackage ../tools/networking/anevicon {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
apprise = with python3Packages; toPythonApplication apprise;
aria2 = callPackage ../tools/networking/aria2 {
@@ -1704,6 +1718,10 @@ in
bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
+ beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
+ inherit (plasma5Packages) breeze-icons;
+ };
+
bc = callPackage ../tools/misc/bc { };
bdf2psf = callPackage ../tools/misc/bdf2psf { };
@@ -2362,6 +2380,8 @@ in
dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
+ earlybird = callPackage ../tools/security/earlybird { };
+
earlyoom = callPackage ../os-specific/linux/earlyoom { };
EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };
@@ -2709,7 +2729,9 @@ in
lexicon = callPackage ../tools/admin/lexicon { };
- lief = callPackage ../development/libraries/lief {};
+ lief = callPackage ../development/libraries/lief {
+ python = python3;
+ };
libnbd = callPackage ../development/libraries/libnbd { };
@@ -3765,6 +3787,8 @@ in
dcraw = callPackage ../tools/graphics/dcraw { };
+ dcs = callPackage ../tools/text/dcs { };
+
dcfldd = callPackage ../tools/system/dcfldd { };
debianutils = callPackage ../tools/misc/debianutils { };
@@ -4164,6 +4188,8 @@ in
zeek = callPackage ../applications/networking/ids/zeek { };
+ zoekt = callPackage ../tools/text/zoekt { };
+
zoxide = callPackage ../tools/misc/zoxide { };
zzuf = callPackage ../tools/security/zzuf { };
@@ -4488,6 +4514,8 @@ in
flent = python3Packages.callPackage ../applications/networking/flent { };
+ flexoptix-app = callPackage ../tools/misc/flexoptix-app { };
+
flpsed = callPackage ../applications/editors/flpsed { };
fluentd = callPackage ../tools/misc/fluentd { };
@@ -5928,11 +5956,7 @@ in
lbreakout2 = callPackage ../games/lbreakout2 { };
- lefthook = callPackage ../applications/version-management/git-and-tools/lefthook {
- # Please use empty attrset once upstream bugs have been fixed
- # https://github.com/Arkweid/lefthook/issues/151
- buildGoModule = buildGo114Module;
- };
+ lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { };
lego = callPackage ../tools/admin/lego { };
@@ -6066,6 +6090,8 @@ in
matrix-corporal = callPackage ../servers/matrix-corporal { };
+ mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
+
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
@@ -6923,6 +6949,8 @@ in
notable = callPackage ../applications/misc/notable { };
+ ntlmrecon = callPackage ../tools/security/ntlmrecon { };
+
nvchecker = with python3Packages; toPythonApplication nvchecker;
miller = callPackage ../tools/text/miller { };
@@ -7460,6 +7488,8 @@ in
pgmetrics = callPackage ../tools/misc/pgmetrics { };
+ pgsync = callPackage ../development/tools/database/pgsync { };
+
pdsh = callPackage ../tools/networking/pdsh {
rsh = true; # enable internal rsh implementation
ssh = openssh;
@@ -8274,6 +8304,8 @@ in
sigil = libsForQt5.callPackage ../applications/editors/sigil { };
+ signald = callPackage ../applications/networking/instant-messengers/signald { };
+
signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
@@ -9283,8 +9315,7 @@ in
wsmancli = callPackage ../tools/system/wsmancli {};
- wstunnel = haskell.lib.justStaticExecutables
- (haskellPackages.callPackage ../tools/networking/wstunnel {});
+ wstunnel = haskell.lib.justStaticExecutables haskellPackages.wstunnel;
wolfebin = callPackage ../tools/networking/wolfebin {
python = python2;
@@ -11293,6 +11324,10 @@ in
};
rust = rust_1_51;
+ mrustc = callPackage ../development/compilers/mrustc { };
+ mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
+ mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
+
rustPackages_1_45 = rust_1_45.packages.stable;
rustPackages_1_51 = rust_1_51.packages.stable;
rustPackages = rustPackages_1_51;
@@ -12625,6 +12660,8 @@ in
csslint = callPackage ../development/web/csslint { };
+ css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
+
cvise = python3Packages.callPackage ../development/tools/misc/cvise {
inherit (llvmPackages_11) llvm clang-unwrapped;
};
@@ -13664,6 +13701,8 @@ in
ytt = callPackage ../development/tools/ytt {};
+ zls = callPackage ../development/tools/zls { };
+
zydis = callPackage ../development/libraries/zydis { };
winpdb = callPackage ../development/tools/winpdb { };
@@ -16341,6 +16380,8 @@ in
libxls = callPackage ../development/libraries/libxls { };
+ libxlsxwriter = callPackage ../development/libraries/libxlsxwriter { };
+
libxmi = callPackage ../development/libraries/libxmi { };
libxml2 = callPackage ../development/libraries/libxml2 {
@@ -17483,6 +17524,10 @@ in
fftw = fftwFloat;
};
+ sphinx = with python3Packages; toPythonApplication sphinx;
+
+ sphinx-serve = with python3Packages; toPythonApplication sphinx-serve;
+
sphinxbase = callPackage ../development/libraries/sphinxbase { };
sphinxsearch = callPackage ../servers/search/sphinxsearch { };
@@ -17523,6 +17568,8 @@ in
sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };
+ sqlitecpp = callPackage ../development/libraries/sqlitecpp { };
+
sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;
sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
@@ -19126,8 +19173,6 @@ in
qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };
- quagga = callPackage ../servers/quagga { };
-
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
elixir = beam_nox.interpreters.elixir_1_8;
@@ -23655,6 +23700,8 @@ in
'' + (drv.postInstall or "");
});
+ pixelnuke = callPackage ../applications/graphics/pixelnuke { };
+
slack = callPackage ../applications/networking/instant-messengers/slack { };
slack-cli = callPackage ../tools/networking/slack-cli { };
@@ -23777,6 +23824,8 @@ in
wlroots = wlroots_0_12;
};
+ workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
+
windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
@@ -28920,6 +28969,7 @@ in
osi = callPackage ../development/libraries/science/math/osi { };
or-tools = callPackage ../development/libraries/science/math/or-tools {
+ python = python3;
abseil-cpp = abseil-cpp.override { static = true; };
};
@@ -29041,9 +29091,7 @@ in
aspino = callPackage ../applications/science/logic/aspino {};
- beluga = callPackage ../applications/science/logic/beluga {
- ocamlPackages = ocaml-ng.ocamlPackages_4_07;
- };
+ beluga = callPackage ../applications/science/logic/beluga {};
boogie = dotnetPackages.Boogie;
@@ -29834,6 +29882,8 @@ in
image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
+ infnoise = callPackage ../misc/drivers/infnoise { };
+
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
@@ -30680,6 +30730,8 @@ in
xortool = python3Packages.callPackage ../tools/security/xortool { };
+ xorex = callPackage ../tools/security/xorex { };
+
xow = callPackage ../misc/drivers/xow { };
xbps = callPackage ../tools/package-management/xbps { };
@@ -30748,6 +30800,8 @@ in
yara = callPackage ../tools/security/yara { };
+ yarGen = callPackage ../tools/security/yarGen { };
+
yaxg = callPackage ../tools/graphics/yaxg {};
yuzu-mainline = import ../misc/emulators/yuzu {
diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index a312354660..9db246eae4 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -4481,6 +4481,20 @@ let
propagatedBuildInputs = [ Clone ];
};
+ CSSMinifier = buildPerlPackage {
+ pname = "CSS-Minifier";
+ version = "0.01";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PM/PMICHAUX/CSS-Minifier-0.01.tar.gz";
+ sha256 = "0Kk0m46LfoOrcM+IVM+7Qv8pwfbHyCmPIlfdIaoMf+8=";
+ };
+ meta = with lib; {
+ description = "Perl extension for minifying CSS";
+ license = licenses.artistic1;
+ maintainers = teams.determinatesystems.members;
+ };
+ };
+
CSSMinifierXS = buildPerlModule {
pname = "CSS-Minifier-XS";
version = "0.09";
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index f22df1c35d..fc78e1b143 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -395,6 +395,8 @@ in {
angr = callPackage ../development/python-modules/angr { };
+ angrop = callPackage ../development/python-modules/angrop { };
+
aniso8601 = callPackage ../development/python-modules/aniso8601 { };
annexremote = callPackage ../development/python-modules/annexremote { };
@@ -941,6 +943,8 @@ in {
bacpypes = callPackage ../development/python-modules/bacpypes { };
+ banal = callPackage ../development/python-modules/banal { };
+
bandit = callPackage ../development/python-modules/bandit { };
bap = callPackage ../development/python-modules/bap {
@@ -1513,6 +1517,8 @@ in {
commandparse = callPackage ../development/python-modules/commandparse { };
+ commoncode = callPackage ../development/python-modules/commoncode { };
+
CommonMark = callPackage ../development/python-modules/commonmark { };
compiledb = callPackage ../development/python-modules/compiledb { };
@@ -1631,6 +1637,8 @@ in {
cssmin = callPackage ../development/python-modules/cssmin { };
+ css-html-js-minify = callPackage ../development/python-modules/css-html-js-minify { };
+
css-parser = callPackage ../development/python-modules/css-parser { };
cssselect2 = callPackage ../development/python-modules/cssselect2 { };
@@ -1668,6 +1676,8 @@ in {
cx_oracle = callPackage ../development/python-modules/cx_oracle { };
+ cxxfilt = callPackage ../development/python-modules/cxxfilt { };
+
cycler = callPackage ../development/python-modules/cycler { };
cymem = callPackage ../development/python-modules/cymem { };
@@ -1773,10 +1783,14 @@ in {
debian = callPackage ../development/python-modules/debian { };
+ debian-inspector = callPackage ../development/python-modules/debian-inspector { };
+
debts = callPackage ../development/python-modules/debts { };
debugpy = callPackage ../development/python-modules/debugpy { };
+ debut = callPackage ../development/python-modules/debut { };
+
decorator = callPackage ../development/python-modules/decorator { };
deep_merge = callPackage ../development/python-modules/deep_merge { };
@@ -1787,6 +1801,8 @@ in {
deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { };
+ deezer-python = callPackage ../development/python-modules/deezer-python { };
+
defcon = callPackage ../development/python-modules/defcon { };
deform = callPackage ../development/python-modules/deform { };
@@ -2287,6 +2303,24 @@ in {
exrex = callPackage ../development/python-modules/exrex { };
+ extractcode = callPackage ../development/python-modules/extractcode { };
+
+ extractcode-7z = callPackage ../development/python-modules/extractcode/7z.nix {
+ inherit (pkgs) p7zip;
+ };
+
+ extractcode-libarchive = callPackage ../development/python-modules/extractcode/libarchive.nix {
+ inherit (pkgs)
+ libarchive
+ libb2
+ bzip2
+ expat
+ lz4
+ lzma
+ zlib
+ zstd;
+ };
+
extras = callPackage ../development/python-modules/extras { };
eyeD3 = callPackage ../development/python-modules/eyed3 { };
@@ -2397,6 +2431,8 @@ in {
finalfusion = callPackage ../development/python-modules/finalfusion { };
+ fingerprints = callPackage ../development/python-modules/fingerprints { };
+
fints = callPackage ../development/python-modules/fints { };
fiona = callPackage ../development/python-modules/fiona { };
@@ -2660,6 +2696,8 @@ in {
gcovr = callPackage ../development/python-modules/gcovr { };
+ gcsfs = callPackage ../development/python-modules/gcsfs { };
+
gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; });
gdata = callPackage ../development/python-modules/gdata { };
@@ -2682,6 +2720,8 @@ in {
geeknote = callPackage ../development/python-modules/geeknote { };
+ gemfileparser = callPackage ../development/python-modules/gemfileparser { };
+
genanki = callPackage ../development/python-modules/genanki { };
genome-collector = callPackage ../development/python-modules/genome-collector { };
@@ -3155,6 +3195,8 @@ in {
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
+ homeconnect = callPackage ../development/python-modules/homeconnect { };
+
homematicip = callPackage ../development/python-modules/homematicip { };
homepluscontrol = callPackage ../development/python-modules/homepluscontrol { };
@@ -3387,6 +3429,8 @@ in {
intake = callPackage ../development/python-modules/intake { };
+ intbitset = callPackage ../development/python-modules/intbitset { };
+
intelhex = callPackage ../development/python-modules/intelhex { };
internetarchive = callPackage ../development/python-modules/internetarchive { };
@@ -3701,6 +3745,8 @@ in {
karton-core = callPackage ../development/python-modules/karton-core { };
+ karton-dashboard = callPackage ../development/python-modules/karton-dashboard { };
+
karton-mwdb-reporter = callPackage ../development/python-modules/karton-mwdb-reporter { };
karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { };
@@ -3895,6 +3941,10 @@ in {
liblarch = callPackage ../development/python-modules/liblarch { };
+ liblzfse = callPackage ../development/python-modules/liblzfse {
+ inherit (pkgs) lzfse;
+ };
+
libmodulemd = pipe pkgs.libmodulemd [
toPythonModule
(p:
@@ -4006,6 +4056,10 @@ in {
license-expression = callPackage ../development/python-modules/license-expression { };
+ lief = (toPythonModule (pkgs.lief.override {
+ inherit python;
+ })).py;
+
lightblue = callPackage ../development/python-modules/lightblue { };
lightgbm = callPackage ../development/python-modules/lightgbm { };
@@ -4505,6 +4559,8 @@ in {
multi_key_dict = callPackage ../development/python-modules/multi_key_dict { };
+ multimethod = callPackage ../development/python-modules/multimethod { };
+
multipledispatch = callPackage ../development/python-modules/multipledispatch { };
multiprocess = callPackage ../development/python-modules/multiprocess { };
@@ -4619,6 +4675,8 @@ in {
ncclient = callPackage ../development/python-modules/ncclient { };
+ nclib = callPackage ../development/python-modules/nclib { };
+
ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
ndjson = callPackage ../development/python-modules/ndjson { };
@@ -4721,6 +4779,8 @@ in {
noiseprotocol = callPackage ../development/python-modules/noiseprotocol { };
+ normality = callPackage ../development/python-modules/normality { };
+
nose2 = callPackage ../development/python-modules/nose2 { };
nose = callPackage ../development/python-modules/nose { };
@@ -4857,6 +4917,8 @@ in {
omnilogic = callPackage ../development/python-modules/omnilogic { };
+ ondilo = callPackage ../development/python-modules/ondilo { };
+
onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
onnx = callPackage ../development/python-modules/onnx { };
@@ -4884,6 +4946,8 @@ in {
pythonPackages = self;
}));
+ openerz-api = callPackage ../development/python-modules/openerz-api { };
+
openhomedevice = callPackage ../development/python-modules/openhomedevice { };
openidc-client = callPackage ../development/python-modules/openidc-client { };
@@ -5303,8 +5367,12 @@ in {
pluggy = callPackage ../development/python-modules/pluggy { };
+ plugincode = callPackage ../development/python-modules/plugincode { };
+
pluginbase = callPackage ../development/python-modules/pluginbase { };
+ plugnplay = callPackage ../development/python-modules/plugnplay { };
+
plugwise = callPackage ../development/python-modules/plugwise { };
plum-py = callPackage ../development/python-modules/plum-py { };
@@ -5676,6 +5744,8 @@ in {
pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { };
+ pycocotools = callPackage ../development/python-modules/pycocotools { };
+
pycodestyle = callPackage ../development/python-modules/pycodestyle { };
pycognito = callPackage ../development/python-modules/pycognito { };
@@ -5761,6 +5831,8 @@ in {
pydrive = callPackage ../development/python-modules/pydrive { };
+ pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };
+
pydsdl = callPackage ../development/python-modules/pydsdl { };
pydub = callPackage ../development/python-modules/pydub { };
@@ -5944,6 +6016,10 @@ in {
PyICU = callPackage ../development/python-modules/pyicu { };
+ pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy {
+ inherit (pkgs) ssdeep;
+ };
+
pyinotify = callPackage ../development/python-modules/pyinotify { };
pyinputevent = callPackage ../development/python-modules/pyinputevent { };
@@ -6066,6 +6142,8 @@ in {
pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };
+ pymaven-patch = callPackage ../development/python-modules/pymaven-patch { };
+
pymavlink = callPackage ../development/python-modules/pymavlink { };
pymazda = callPackage ../development/python-modules/pymazda { };
@@ -6074,6 +6152,8 @@ in {
pymc3 = callPackage ../development/python-modules/pymc3 { };
+ pymdstat = callPackage ../development/python-modules/pymdstat { };
+
pymediainfo = callPackage ../development/python-modules/pymediainfo { };
pymediaroom = callPackage ../development/python-modules/pymediaroom { };
@@ -6438,6 +6518,12 @@ in {
pysmappee = callPackage ../development/python-modules/pysmappee { };
+ pysmart-smartx = callPackage ../development/python-modules/pysmart-smartx { };
+
+ pysmartapp = callPackage ../development/python-modules/pysmartapp { };
+
+ pysmartthings = callPackage ../development/python-modules/pysmartthings { };
+
pysmb = callPackage ../development/python-modules/pysmb { };
pysmbc = callPackage ../development/python-modules/pysmbc { };
@@ -6934,6 +7020,8 @@ in {
python-periphery = callPackage ../development/python-modules/python-periphery { };
+ python-picnic-api = callPackage ../development/python-modules/python-picnic-api { };
+
python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
python-prctl = callPackage ../development/python-modules/python-prctl { };
@@ -6946,6 +7034,8 @@ in {
python-redis-lock = callPackage ../development/python-modules/python-redis-lock { };
+ python-registry = callPackage ../development/python-modules/python-registry { };
+
python-rtmidi = callPackage ../development/python-modules/python-rtmidi { };
python-sat = callPackage ../development/python-modules/python-sat { };
@@ -7193,6 +7283,8 @@ in {
qds_sdk = callPackage ../development/python-modules/qds_sdk { };
+ qiling = callPackage ../development/python-modules/qiling { };
+
qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { };
qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };
@@ -7384,6 +7476,8 @@ in {
requirements-detector = callPackage ../development/python-modules/requirements-detector { };
+ requirements-parser = callPackage ../development/python-modules/requirements-parser { };
+
resampy = callPackage ../development/python-modules/resampy { };
responses = callPackage ../development/python-modules/responses { };
@@ -7476,6 +7570,8 @@ in {
roku = callPackage ../development/python-modules/roku { };
+ rokuecp = callPackage ../development/python-modules/rokuecp { };
+
roman = callPackage ../development/python-modules/roman { };
roombapy = callPackage ../development/python-modules/roombapy { };
@@ -7576,6 +7672,8 @@ in {
inherit (pkgs) sane-backends;
};
+ saneyaml = callPackage ../development/python-modules/saneyaml { };
+
sampledata = callPackage ../development/python-modules/sampledata { };
samplerate = callPackage ../development/python-modules/samplerate { };
@@ -7598,6 +7696,8 @@ in {
scales = callPackage ../development/python-modules/scales { };
+ scancode-toolkit = callPackage ../development/python-modules/scancode-toolkit { };
+
scandir = callPackage ../development/python-modules/scandir { };
scapy = callPackage ../development/python-modules/scapy { };
@@ -7737,6 +7837,8 @@ in {
seqdiag = callPackage ../development/python-modules/seqdiag { };
+ seqeval = callPackage ../development/python-modules/seqeval { };
+
sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override {
pythonPackages = self;
pythonSupport = true;
@@ -7905,6 +8007,8 @@ in {
smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };
+ smhi-pkg = callPackage ../development/python-modules/smhi-pkg { };
+
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
smmap = callPackage ../development/python-modules/smmap { };
@@ -7994,10 +8098,14 @@ in {
spark_parser = callPackage ../development/python-modules/spark_parser { };
+ sparklines = callPackage ../development/python-modules/sparklines { };
+
SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { };
sparse = callPackage ../development/python-modules/sparse { };
+ spdx-tools = callPackage ../development/python-modules/spdx-tools { };
+
speaklater = callPackage ../development/python-modules/speaklater { };
spectral-cube = callPackage ../development/python-modules/spectral-cube { };
@@ -8066,12 +8174,16 @@ in {
sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
+ sphinx-material = callPackage ../development/python-modules/sphinx-material { };
+
sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { };
sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { };
sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { };
+ sphinx-serve = callPackage ../development/python-modules/sphinx-serve { };
+
sphinx-testing = callPackage ../development/python-modules/sphinx-testing { };
spidev = callPackage ../development/python-modules/spidev { };
@@ -8314,6 +8426,8 @@ in {
telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { };
+ telfhash = callPackage ../development/python-modules/telfhash { };
+
tempita = callPackage ../development/python-modules/tempita { };
tempora = callPackage ../development/python-modules/tempora { };
@@ -8383,6 +8497,8 @@ in {
termstyle = callPackage ../development/python-modules/termstyle { };
+ tern = callPackage ../development/python-modules/tern { };
+
teslajsonpy = callPackage ../development/python-modules/teslajsonpy { };
tess = callPackage ../development/python-modules/tess { };
@@ -8668,6 +8784,12 @@ in {
txtorcon = callPackage ../development/python-modules/txtorcon { };
+ typecode = callPackage ../development/python-modules/typecode { };
+
+ typecode-libmagic = callPackage ../development/python-modules/typecode/libmagic.nix {
+ inherit (pkgs) file zlib;
+ };
+
typed-ast = callPackage ../development/python-modules/typed-ast { };
typeguard = callPackage ../development/python-modules/typeguard { };
@@ -8796,6 +8918,8 @@ in {
else
callPackage ../development/python-modules/urllib3/2.nix { };
+ urlpy = callPackage ../development/python-modules/urlpy { };
+
urwid = callPackage ../development/python-modules/urwid { };
urwidtrees = callPackage ../development/python-modules/urwidtrees { };
@@ -8885,6 +9009,10 @@ in {
vispy = callPackage ../development/python-modules/vispy { };
+ vivisect = callPackage ../development/python-modules/vivisect { };
+
+ viv-utils = callPackage ../development/python-modules/viv-utils { };
+
vmprof = callPackage ../development/python-modules/vmprof { };
vncdo = callPackage ../development/python-modules/vncdo { };
@@ -9035,6 +9163,8 @@ in {
woob = callPackage ../development/python-modules/woob { };
+ woodblock = callPackage ../development/python-modules/woodblock { };
+
word2vec = callPackage ../development/python-modules/word2vec { };
wordcloud = callPackage ../development/python-modules/wordcloud { };
@@ -9380,5 +9510,7 @@ in {
zulip = callPackage ../development/python-modules/zulip { };
+ zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { };
+
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
}