nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-20 03:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-19 00:02:58 +00:00 committed by GitHub
commit 5658def54f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 99 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/doc/manual/configuration/config-syntax.chapter.md
View File

@ -15,5 +15,4 @@ NixOS configuration files.
<xi:include href="config-file.section.xml" />
<xi:include href="abstractions.section.xml" />
<xi:include href="modularity.section.xml" />
<xi:include href="summary.section.xml" />
```

46
nixos/doc/manual/configuration/summary.section.md
View File

@ -1,46 +0,0 @@
# Syntax Summary {#sec-nix-syntax-summary}
Below is a summary of the most important syntactic constructs in the Nix
expression language. It's not complete. In particular, there are many
other built-in functions. See the [Nix
manual](https://nixos.org/nix/manual/#chap-writing-nix-expressions) for
the rest.
| Example | Description |
|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------|
| *Basic values* | |
| `"Hello world"` | A string |
| `"${pkgs.bash}/bin/sh"` | A string containing an expression (expands to `"/nix/store/hash-bash-version/bin/sh"`) |
| `true`, `false` | Booleans |
| `123` | An integer |
| `./foo.png` | A path (relative to the containing Nix expression) |
| *Compound values* | |
| `{ x = 1; y = 2; }` | A set with attributes named `x` and `y` |
| `{ foo.bar = 1; }` | A nested set, equivalent to `{ foo = { bar = 1; }; }` |
| `rec { x = "foo"; y = x + "bar"; }` | A recursive set, equivalent to `{ x = "foo"; y = "foobar"; }` |
| `[ "foo" "bar" ]` | A list with two elements |
| *Operators* | |
| `"foo" + "bar"` | String concatenation |
| `1 + 2` | Integer addition |
| `"foo" == "f" + "oo"` | Equality test (evaluates to `true`) |
| `"foo" != "bar"` | Inequality test (evaluates to `true`) |
| `!true` | Boolean negation |
| `{ x = 1; y = 2; }.x` | Attribute selection (evaluates to `1`) |
| `{ x = 1; y = 2; }.z or 3` | Attribute selection with default (evaluates to `3`) |
| `{ x = 1; y = 2; } // { z = 3; }` | Merge two sets (attributes in the right-hand set taking precedence) |
| *Control structures* | |
| `if 1 + 1 == 2 then "yes!" else "no!"` | Conditional expression |
| `assert 1 + 1 == 2; "yes!"` | Assertion check (evaluates to `"yes!"`). See [](#sec-assertions) for using assertions in modules |
| `let x = "foo"; y = "bar"; in x + y` | Variable definition |
| `with pkgs.lib; head [ 1 2 3 ]` | Add all attributes from the given set to the scope (evaluates to `1`) |
| *Functions (lambdas)* | |
| `x: x + 1` | A function that expects an integer and returns it increased by 1 |
| `(x: x + 1) 100` | A function call (evaluates to 101) |
| `let inc = x: x + 1; in inc (inc (inc 100))` | A function bound to a variable and subsequently called by name (evaluates to 103) |
| `{ x, y }: x + y` | A function that expects a set with required attributes `x` and `y` and concatenates them |
| `{ x, y ? "bar" }: x + y` | A function that expects a set with required attribute `x` and optional `y`, using `"bar"` as default value for `y` |
| `{ x, y, ... }: x + y` | A function that expects a set with required attributes `x` and `y` and ignores any other attributes |
| `{ x, y } @ args: x + y` | A function that expects a set with required attributes `x` and `y`, and binds the whole set to `args` |
| *Built-in functions* | |
| `import ./foo.nix` | Load and return Nix expression in given file |
| `map (x: x + x) [ 1 2 3 ]` | Apply a function to every element of a list (evaluates to `[ 2 4 6 ]`) |

1
nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml
View File

@ -17,5 +17,4 @@
<xi:include href="config-file.section.xml" />
<xi:include href="abstractions.section.xml" />
<xi:include href="modularity.section.xml" />
<xi:include href="summary.section.xml" />
</chapter>

332
nixos/doc/manual/from_md/configuration/summary.section.xml
View File

@ -1,332 +0,0 @@
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-syntax-summary">
<title>Syntax Summary</title>
<para>
Below is a summary of the most important syntactic constructs in the
Nix expression language. It’s not complete. In particular, there are
many other built-in functions. See the
<link xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
manual</link> for the rest.
</para>
<informaltable>
<tgroup cols="2">
<colspec align="left" />
<colspec align="left" />
<thead>
<row>
<entry>
Example
</entry>
<entry>
Description
</entry>
</row>
</thead>
<tbody>
<row>
<entry>
<emphasis>Basic values</emphasis>
</entry>
<entry>
</entry>
</row>
<row>
<entry>
<literal>&quot;Hello world&quot;</literal>
</entry>
<entry>
A string
</entry>
</row>
<row>
<entry>
<literal>&quot;${pkgs.bash}/bin/sh&quot;</literal>
</entry>
<entry>
A string containing an expression (expands to
<literal>&quot;/nix/store/hash-bash-version/bin/sh&quot;</literal>)
</entry>
</row>
<row>
<entry>
<literal>true</literal>, <literal>false</literal>
</entry>
<entry>
Booleans
</entry>
</row>
<row>
<entry>
<literal>123</literal>
</entry>
<entry>
An integer
</entry>
</row>
<row>
<entry>
<literal>./foo.png</literal>
</entry>
<entry>
A path (relative to the containing Nix expression)
</entry>
</row>
<row>
<entry>
<emphasis>Compound values</emphasis>
</entry>
<entry>
</entry>
</row>
<row>
<entry>
<literal>{ x = 1; y = 2; }</literal>
</entry>
<entry>
A set with attributes named <literal>x</literal> and
<literal>y</literal>
</entry>
</row>
<row>
<entry>
<literal>{ foo.bar = 1; }</literal>
</entry>
<entry>
A nested set, equivalent to
<literal>{ foo = { bar = 1; }; }</literal>
</entry>
</row>
<row>
<entry>
<literal>rec { x = &quot;foo&quot;; y = x + &quot;bar&quot;; }</literal>
</entry>
<entry>
A recursive set, equivalent to
<literal>{ x = &quot;foo&quot;; y = &quot;foobar&quot;; }</literal>
</entry>
</row>
<row>
<entry>
<literal>[ &quot;foo&quot; &quot;bar&quot; ]</literal>
</entry>
<entry>
A list with two elements
</entry>
</row>
<row>
<entry>
<emphasis>Operators</emphasis>
</entry>
<entry>
</entry>
</row>
<row>
<entry>
<literal>&quot;foo&quot; + &quot;bar&quot;</literal>
</entry>
<entry>
String concatenation
</entry>
</row>
<row>
<entry>
<literal>1 + 2</literal>
</entry>
<entry>
Integer addition
</entry>
</row>
<row>
<entry>
<literal>&quot;foo&quot; == &quot;f&quot; + &quot;oo&quot;</literal>
</entry>
<entry>
Equality test (evaluates to <literal>true</literal>)
</entry>
</row>
<row>
<entry>
<literal>&quot;foo&quot; != &quot;bar&quot;</literal>
</entry>
<entry>
Inequality test (evaluates to <literal>true</literal>)
</entry>
</row>
<row>
<entry>
<literal>!true</literal>
</entry>
<entry>
Boolean negation
</entry>
</row>
<row>
<entry>
<literal>{ x = 1; y = 2; }.x</literal>
</entry>
<entry>
Attribute selection (evaluates to <literal>1</literal>)
</entry>
</row>
<row>
<entry>
<literal>{ x = 1; y = 2; }.z or 3</literal>
</entry>
<entry>
Attribute selection with default (evaluates to
<literal>3</literal>)
</entry>
</row>
<row>
<entry>
<literal>{ x = 1; y = 2; } // { z = 3; }</literal>
</entry>
<entry>
Merge two sets (attributes in the right-hand set taking
precedence)
</entry>
</row>
<row>
<entry>
<emphasis>Control structures</emphasis>
</entry>
<entry>
</entry>
</row>
<row>
<entry>
<literal>if 1 + 1 == 2 then &quot;yes!&quot; else &quot;no!&quot;</literal>
</entry>
<entry>
Conditional expression
</entry>
</row>
<row>
<entry>
<literal>assert 1 + 1 == 2; &quot;yes!&quot;</literal>
</entry>
<entry>
Assertion check (evaluates to
<literal>&quot;yes!&quot;</literal>). See
<xref linkend="sec-assertions" /> for using assertions in
modules
</entry>
</row>
<row>
<entry>
<literal>let x = &quot;foo&quot;; y = &quot;bar&quot;; in x + y</literal>
</entry>
<entry>
Variable definition
</entry>
</row>
<row>
<entry>
<literal>with pkgs.lib; head [ 1 2 3 ]</literal>
</entry>
<entry>
Add all attributes from the given set to the scope
(evaluates to <literal>1</literal>)
</entry>
</row>
<row>
<entry>
<emphasis>Functions (lambdas)</emphasis>
</entry>
<entry>
</entry>
</row>
<row>
<entry>
<literal>x: x + 1</literal>
</entry>
<entry>
A function that expects an integer and returns it increased
by 1
</entry>
</row>
<row>
<entry>
<literal>(x: x + 1) 100</literal>
</entry>
<entry>
A function call (evaluates to 101)
</entry>
</row>
<row>
<entry>
<literal>let inc = x: x + 1; in inc (inc (inc 100))</literal>
</entry>
<entry>
A function bound to a variable and subsequently called by
name (evaluates to 103)
</entry>
</row>
<row>
<entry>
<literal>{ x, y }: x + y</literal>
</entry>
<entry>
A function that expects a set with required attributes
<literal>x</literal> and <literal>y</literal> and
concatenates them
</entry>
</row>
<row>
<entry>
<literal>{ x, y ? &quot;bar&quot; }: x + y</literal>
</entry>
<entry>
A function that expects a set with required attribute
<literal>x</literal> and optional <literal>y</literal>,
using <literal>&quot;bar&quot;</literal> as default value
for <literal>y</literal>
</entry>
</row>
<row>
<entry>
<literal>{ x, y, ... }: x + y</literal>
</entry>
<entry>
A function that expects a set with required attributes
<literal>x</literal> and <literal>y</literal> and ignores
any other attributes
</entry>
</row>
<row>
<entry>
<literal>{ x, y } @ args: x + y</literal>
</entry>
<entry>
A function that expects a set with required attributes
<literal>x</literal> and <literal>y</literal>, and binds the
whole set to <literal>args</literal>
</entry>
</row>
<row>
<entry>
<emphasis>Built-in functions</emphasis>
</entry>
<entry>
</entry>
</row>
<row>
<entry>
<literal>import ./foo.nix</literal>
</entry>
<entry>
Load and return Nix expression in given file
</entry>
</row>
<row>
<entry>
<literal>map (x: x + x) [ 1 2 3 ]</literal>
</entry>
<entry>
Apply a function to every element of a list (evaluates to
<literal>[ 2 4 6 ]</literal>)
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</section>

3
pkgs/applications/editors/imhex/default.nix
View File

@ -17,7 +17,6 @@
, curl
, fmt_8
, nlohmann_json
, xlibsWrapper
, yara
}:
@ -45,7 +44,7 @@ gcc12Stdenv.mkDerivation rec {
hash = "sha256-SFv5ulyjm5Yf+3Gpx+A74so2YClCJx1sx0LE5fh5eG4=";
};
nativeBuildInputs = [ cmake llvm python3 perl pkg-config xlibsWrapper ];
nativeBuildInputs = [ cmake llvm python3 perl pkg-config ];
buildInputs = [
capstone

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

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, xlibsWrapper, libXv, libpng }:
{ fetchurl, lib, stdenv, libX11, libXext, libXv, libpng }:
stdenv.mkDerivation rec {
pname = "qemacs";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg";
};
buildInputs = [ xlibsWrapper libpng libXv ];
buildInputs = [ libpng libX11 libXext libXv ];
preInstall = ''
mkdir -p $out/bin $out/man

4
pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
View File

@ -2,14 +2,14 @@
, notmuch, openssl, pkg-config, sqlite, xapian, zlib
}:
stdenv.mkDerivation rec {
version = "5";
version = "6";
pname = "muchsync";
passthru = {
inherit version;
};
src = fetchurl {
url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz";
sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb";
sha256 = "Cz3jtNiF7bn4h6B9y8i1luf+8gOMYeaCz6VaE/pM6eg=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ notmuch openssl sqlite xapian zlib ];

41
pkgs/desktops/gnome/extensions/emoji-selector/default.nix
View File

@ -1,41 +0,0 @@
{ lib, stdenv, fetchFromGitHub, glib, gettext }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-emoji-selector";
version = "22";
src = fetchFromGitHub {
owner = "maoschanz";
repo = "emoji-selector-for-gnome";
rev = version;
sha256 = "sha256-sD/xlNrs2ntI7KaPMopT5CnFyuXd9ZKuKPNQYgiho0U=";
};
passthru = {
extensionUuid = "emoji-selector@maestroschan.fr";
extensionPortalSlug = "emoji-selector";
};
nativeBuildInputs = [ glib ];
buildPhase = ''
runHook preBuild
glib-compile-schemas "./emoji-selector@maestroschan.fr/schemas"
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/gnome-shell/extensions
cp -r "emoji-selector@maestroschan.fr" $out/share/gnome-shell/extensions
runHook postInstall
'';
meta = with lib; {
description =
"GNOME Shell extension providing a searchable popup menu displaying most emojis";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ rawkode ];
homepage = "https://github.com/maoschanz/emoji-selector-for-gnome";
};
}

60
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

1
pkgs/desktops/gnome/extensions/manuallyPackaged.nix
View File

@ -6,7 +6,6 @@
"dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { };
"drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { };
"EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { };
"emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { };
"gsconnect@andyholmes.github.io" = callPackage ./gsconnect { };
"icon-hider@kalnitsky.org" = callPackage ./icon-hider { };
"impatience@gfxmonk.net" = callPackage ./impatience { };

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
{ lib, stdenv, fetchFromGitHub, cmake, libGLU }:
stdenv.mkDerivation rec {
pname = "glbinding";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libGLU xlibsWrapper ];
buildInputs = [ libGLU ];
meta = with lib; {
homepage = "https://github.com/cginternals/glbinding/";

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc
, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL
, libpng, libjpeg, libXinerama, freetype, SDL, libGLU, libGL
, libsndfile, portaudio, libmysqlclient, fontconfig
}:
@ -29,7 +29,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config libtool gettext ];
buildInputs = [
bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc
bsdbuild perl libXinerama SDL libGL libmysqlclient mandoc
freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
];

22
pkgs/development/libraries/lirc/default.nix
View File

@ -1,5 +1,21 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3,
alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, pkg-config
, help2man
, python3
, alsa-lib
, libxslt
, systemd
, libusb-compat-0_1
, libftdi1
, libICE
, libSM
, libX11
}:
let
pythonEnv = python3.pythonForBuild.withPackages (p: with p; [ pyyaml setuptools ]);
@ -54,7 +70,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ pkg-config ];
buildInputs = [ alsa-lib xlibsWrapper systemd libusb-compat-0_1 libftdi1 ];
buildInputs = [ alsa-lib systemd libusb-compat-0_1 libftdi1 libICE libSM libX11 ];
DEVINPUT_HEADER = "include/linux/input-event-codes.h";

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "neo4j";
version = "5.2.0";
version = "5.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = "refs/tags/${version}";
hash = "sha256-g5jeqE1eu+4iqXp57EF9xt8To2oyI3ey5URGRoPLs1Q=";
hash = "sha256-d4OkXj6mZjrdRG8UyxWeAh3rLywz2TUk2pZq+Ni1F3s=";
};
propagatedBuildInputs = [

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

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "sip";
version = "6.7.1";
version = "6.7.4";
src = fetchPypi {
pname = "sip";
inherit version;
sha256 = "sha256-KBcP34gPk3Am/If6qcF3sGLDU8XRaeoyQrB4AmFN3Qw=";
sha256 = "sha256-nb+KDnyNdtFkLi/dP1PmpSL3wwmA5Sd2PEV2DCUFz78=";
};
propagatedBuildInputs = [ packaging ply toml ];

4
pkgs/development/python-modules/tplink-omada-client/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "tplink-omada-client";
version = "1.0.1";
version = "1.0.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "tplink_omada_client";
inherit version;
hash = "sha256-72Oxrjn1KNasdW9XITuqM5L59/5/R/BvM175d18eFmI=";
hash = "sha256-W3WJPYQofNcpW5AyIW3ms6FxQ2yWzocL3nrZGCdm+gk=";
};
nativeBuildInputs = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "vt-py";
version = "0.17.1";
version = "0.17.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "VirusTotal";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-yG0bKBn3pQWtxjuxkhKMMJW1nzbsk5y/9h2OOCkdch8=";
hash = "sha256-nveMsebW828ATEW6vw+var+GxbJj2N0mNaQlkx+GH3w=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "whois";
version = "0.9.17";
version = "0.9.18";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
sha256 = "sha256-r77M0IxZ72Sl5c6rA7z8EdZ6rYS/oMrdvdt/E/Pw7nQ=";
sha256 = "sha256-15oa7E33VQMPtI2LJ0XVKd42m9BY9jZLL3XGXpAhv/A=";
};
propagatedBuildInputs = [

13
pkgs/development/tools/misc/babeltrace/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, glib, libuuid, popt, elfutils }:
stdenv.mkDerivation rec {
pname = "babeltrace";
@ -9,9 +9,18 @@ stdenv.mkDerivation rec {
sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
};
nativeBuildInputs = [ pkg-config ];
# The pre-generated ./configure script uses an old autoconf version which
# breaks cross-compilation (replaces references to malloc with rpl_malloc).
# Re-generate with nixpkgs's autoconf. This requires glib to be present in
# nativeBuildInputs for its m4 macros to be present.
nativeBuildInputs = [ autoreconfHook glib pkg-config ];
buildInputs = [ glib libuuid popt elfutils ];
# --enable-debug-info (default) requires the configure script to run host
# executables to determine the elfutils library version, which cannot be done
# while cross compiling.
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-debug-info";
meta = with lib; {
description = "Command-line tool and library to read and convert LTTng tracefiles";
homepage = "https://www.efficios.com/babeltrace";

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-julia",
"rev": "bedd19f3c3d745c3da8451a35c7bfc5f48d07ee6",
"date": "2022-11-05T17:27:50-05:00",
"path": "/nix/store/ldklarlvv3jlxsfi7gnqmim7csnxp2qf-tree-sitter-julia",
"sha256": "0cnp0rff6igjfz9i8ckffj9r1fr2nzdw82hag6dml331z7nbjjkf",
"rev": "628713553c42f30595a3b0085bb587e9359b986a",
"date": "2022-11-15T18:14:44-05:00",
"path": "/nix/store/4d712q8sjvbh845cd2b0xbvlng1iasaj-tree-sitter-julia",
"sha256": "12xlv4gbqdw0mr1zgnzs74pxpdkq4vfvs77gnr49zsrycjflf7xw",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/r-lib/tree-sitter-r",
"rev": "0f4f66e5050037b759ea040dafd596bcdda1de94",
"date": "2022-10-12T16:08:16-07:00",
"path": "/nix/store/yffaihslg48mx67cy4gw8n8m3wrc9a7h-tree-sitter-r",
"sha256": "1qw2ngr9db3nv9bc74y2rlsvbk9np5djj1pxhb3ks5dkk7airf76",
"rev": "80efda55672d1293aa738f956c7ae384ecdc31b4",
"date": "2022-11-10T09:19:03-08:00",
"path": "/nix/store/x7rjhqp9qxh9xwq2l38jz5wbkbzz0vfl-tree-sitter-r",
"sha256": "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/FallenAngel97/tree-sitter-rego",
"rev": "6d70da3a998fd0081efc5d1019c71e74cc1568e9",
"date": "2022-08-17T15:53:32+03:00",
"path": "/nix/store/r23jy7qfsl6snbp0z7p5lk9x0q9ssgzs-tree-sitter-rego",
"sha256": "1phjhrngv818mcwvbrfpi0hrzc05cjckds5ddmndc8h7wi0db9cb",
"rev": "b2667c975f07b33be3ceb83bea5cfbad88095866",
"date": "2022-11-18T14:07:12+02:00",
"path": "/nix/store/ky8xv5v5i273n0zqin0mnsx810382wfn-tree-sitter-rego",
"sha256": "18qw5ahx6qcfq9gs6gcakl178gnnryksv6gyamyd6vypz20kwz6b",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/derekstride/tree-sitter-sql",
"rev": "70c50264ae022193adb364ffa7a767d765ed9857",
"date": "2022-11-02T09:36:19-04:00",
"path": "/nix/store/f1pg3pf4fyfmls30l1ma1nlwq61fxxqs-tree-sitter-sql",
"sha256": "16s58bvll2r80zga63fjzjbkfxm3zdr3vljjk69cvjwnpy668yfh",
"rev": "4f1b91246b43190e34957d9de9a0f3625879ba33",
"date": "2022-11-18T10:16:02-05:00",
"path": "/nix/store/l84kfw631akx7v4k6c0s4hdvaanjh8a1-tree-sitter-sql",
"sha256": "03wbxfkwk5i31knf1hgqkb56r66vk18k5n4919hhnhy9vvrm0mw3",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

4
pkgs/games/terraria-server/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "terraria-server";
version = "1.4.4.8.1";
version = "1.4.4.9";
urlVersion = lib.replaceChars [ "." ] [ "" ] version;
src = fetchurl {
url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip";
sha256 = "sha256-4mM9+iE2HJnzoW4mvet3sy0mngQ62dxhxa1eDJxBGBo=";
sha256 = "sha256-Mk+5s9OlkyTLXZYVT0+8Qcjy2Sb5uy2hcC8CML0biNY=";
};
buildInputs = [ file ];

4
pkgs/tools/security/commix/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "commix";
version = "3.5";
version = "3.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "commixproject";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3UCHTgIW7ArXQD0Kj5XwE1I5VszsueXDJ68QWdQrAho=";
hash = "sha256-QdhJp7oUqOY8Z36haIrHgP4hVGaFXlOxNVg1ams7uhg=";
};
# Project has no tests

2
pkgs/top-level/all-packages.nix
View File

@ -5277,8 +5277,6 @@ with pkgs;
libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph {
lua = lua5_4;
# needs to be the same openssl version as python/pyopenssl
curl = (curl.override { openssl = openssl_1_1; });
})
ceph
ceph-client;