Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
commit
1c52b361a8
21
.github/workflows/check-maintainers-sorted.yaml
vendored
Normal file
21
.github/workflows/check-maintainers-sorted.yaml
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
name: "Check that maintainer list is sorted"
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
paths:
|
||||
- 'maintainers/maintainer-list.nix'
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
nixos:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v19
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
- name: Check that maintainer-list.nix is sorted
|
||||
run: nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix
|
||||
File diff suppressed because it is too large
Load Diff
57
maintainers/scripts/check-maintainers-sorted.nix
Normal file
57
maintainers/scripts/check-maintainers-sorted.nix
Normal file
@ -0,0 +1,57 @@
|
||||
let
|
||||
lib = import ../../lib;
|
||||
inherit (lib)
|
||||
add attrNames elemAt foldl' genList length replaceStrings sort toLower trace;
|
||||
|
||||
maintainers = import ../maintainer-list.nix;
|
||||
simplify = replaceStrings [ "-" "_" ] [ "" "" ];
|
||||
compare = a: b: simplify (toLower a) < simplify (toLower b);
|
||||
namesSorted =
|
||||
sort
|
||||
(a: b: a.key < b.key)
|
||||
(map
|
||||
(n: let pos = builtins.unsafeGetAttrPos n maintainers;
|
||||
in assert pos == null -> throw "maintainers entry ${n} is malformed";
|
||||
{ name = n; line = pos.line; key = toLower (simplify n); })
|
||||
(attrNames maintainers));
|
||||
before = { name, line, key }:
|
||||
foldl'
|
||||
(acc: n: if n.key < key && (acc == null || n.key > acc.key) then n else acc)
|
||||
null
|
||||
namesSorted;
|
||||
errors = foldl' add 0
|
||||
(map
|
||||
(i: let a = elemAt namesSorted i;
|
||||
b = elemAt namesSorted (i + 1);
|
||||
lim = let t = before a; in if t == null then "the initial {" else t.name;
|
||||
in if a.line >= b.line
|
||||
then trace
|
||||
("maintainer ${a.name} (line ${toString a.line}) should be listed "
|
||||
+ "after ${lim}, not after ${b.name} (line ${toString b.line})")
|
||||
1
|
||||
else 0)
|
||||
(genList (i: i) (length namesSorted - 1)));
|
||||
in
|
||||
assert errors == 0; "all good!"
|
||||
|
||||
# generate edit commands to sort the list.
|
||||
# may everything following the last current entry (closing } ff) in the wrong place
|
||||
# with lib;
|
||||
# concatStringsSep
|
||||
# "\n"
|
||||
# (let first = foldl' (acc: n: if n.line < acc then n.line else acc) 999999999 namesSorted;
|
||||
# commands = map
|
||||
# (i: let e = elemAt namesSorted i;
|
||||
# begin = foldl'
|
||||
# (acc: n: if n.line < e.line && n.line > acc then n.line else acc)
|
||||
# 1
|
||||
# namesSorted;
|
||||
# end =
|
||||
# foldl' (acc: n: if n.line > e.line && n.line < acc then n.line else acc)
|
||||
# 999999999
|
||||
# namesSorted;
|
||||
# in "${toString e.line},${toString (end - 1)} p")
|
||||
# (genList (i: i) (length namesSorted));
|
||||
# in map
|
||||
# (c: "sed -ne '${c}' maintainers/maintainer-list.nix")
|
||||
# ([ "1,${toString (first - 1)} p" ] ++ commands))
|
||||
@ -592,7 +592,8 @@ in
|
||||
|| dmConf.sddm.enable
|
||||
|| dmConf.xpra.enable
|
||||
|| dmConf.sx.enable
|
||||
|| dmConf.startx.enable);
|
||||
|| dmConf.startx.enable
|
||||
|| config.services.greetd.enable);
|
||||
in mkIf (default) (mkDefault true);
|
||||
|
||||
# so that the service won't be enabled when only startx is used
|
||||
|
||||
@ -130,6 +130,13 @@ let
|
||||
pkgs.replaceDependency { inherit oldDependency newDependency drv; }
|
||||
) baseSystemAssertWarn config.system.replaceRuntimeDependencies;
|
||||
|
||||
systemWithBuildDeps = system.overrideAttrs (o: {
|
||||
systemBuildClosure = pkgs.closureInfo { rootPaths = [ system.drvPath ]; };
|
||||
buildCommand = o.buildCommand + ''
|
||||
ln -sn $systemBuildClosure $out/build-closure
|
||||
'';
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
@ -306,6 +313,27 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
system.includeBuildDependencies = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to include the build closure of the whole system in
|
||||
its runtime closure. This can be useful for making changes
|
||||
fully offline, as it includes all sources, patches, and
|
||||
intermediate outputs required to build all the derivations
|
||||
that the system depends on.
|
||||
|
||||
Note that this includes _all_ the derivations, down from the
|
||||
included applications to their sources, the compilers used to
|
||||
build them, and even the bootstrap compiler used to compile
|
||||
the compilers. This increases the size of the system and the
|
||||
time needed to download its dependencies drastically: a
|
||||
minimal configuration with no extra services enabled grows
|
||||
from ~670MiB in size to 13.5GiB, and takes proportionally
|
||||
longer to download.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -336,7 +364,7 @@ in
|
||||
]; };
|
||||
};
|
||||
|
||||
system.build.toplevel = system;
|
||||
system.build.toplevel = if config.system.includeBuildDependencies then systemWithBuildDeps else system;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "touchosc";
|
||||
version = "1.1.6.150";
|
||||
version = "1.1.9.163";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "linux-arm64";
|
||||
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-sYkAFyXnmzgSzo68OF0oiv8tUvY+g1WCcY783OZO+RM=";
|
||||
armv7l-linux = "sha256-GWpYW1262plxIzPVzBEh4Z3fQIhSmy0N9xAgwnjXrQE=";
|
||||
x86_64-linux = "sha256-LUWlLEsTUqVoWAkjXC/zOziPqO85H8iIlwJU7eqLRcY=";
|
||||
aarch64-linux = "sha256-LhF0pgMRbEXeLt5g56VBNuCssaTjsczx/+C76ckmGZo=";
|
||||
armv7l-linux = "sha256-T4AzXIbhO6fNN8xDFwz6M2lSH6hLgNjVyDsSt8m+Mr4=";
|
||||
x86_64-linux = "sha256-LJ36kHx8PPzfLpJMx1ANSmifS84saCQ8pF0quhgzdt0=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix curl libxml2 jq common-updater-scripts
|
||||
#!nix-shell -i bash -p nix curl libxml2 jq
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
@ -8,6 +8,20 @@ nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixp
|
||||
attr="${UPDATE_NIX_ATTR_PATH:-touchosc}"
|
||||
version="$(curl -sSL https://hexler.net/touchosc/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)"
|
||||
|
||||
narhash() {
|
||||
nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash
|
||||
}
|
||||
|
||||
nixeval() {
|
||||
if [ "$#" -ge 2 ]; then
|
||||
systemargs=(--argstr system "$2")
|
||||
else
|
||||
systemargs=()
|
||||
fi
|
||||
|
||||
nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r .
|
||||
}
|
||||
|
||||
findpath() {
|
||||
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
|
||||
outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
|
||||
@ -19,15 +33,22 @@ findpath() {
|
||||
echo "$path"
|
||||
}
|
||||
|
||||
oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}"
|
||||
|
||||
pkgpath="$(findpath "$attr")"
|
||||
|
||||
sed -i -e "/version\s*=/ s|\"$UPDATE_NIX_OLD_VERSION\"|\"$version\"|" "$pkgpath"
|
||||
if [ "$version" = "$oldversion" ]; then
|
||||
echo 'update.sh: New version same as old version, nothing to do.'
|
||||
exit 0
|
||||
fi
|
||||
|
||||
sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath"
|
||||
|
||||
for system in aarch64-linux armv7l-linux x86_64-linux; do
|
||||
url="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.url | jq -r .)"
|
||||
url="$(nixeval "$attr".src.url "$system")"
|
||||
|
||||
curhash="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.outputHash | jq -r .)"
|
||||
newhash="$(nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash)"
|
||||
curhash="$(nixeval "$attr".src.outputHash "$system")"
|
||||
newhash="$(narhash "$url")"
|
||||
|
||||
sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
|
||||
done
|
||||
|
||||
@ -45,7 +45,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kodelife";
|
||||
version = "1.0.6.163";
|
||||
version = "1.0.8.170";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "linux-arm64";
|
||||
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-BbNk/YfTx/J8ApgdiY/thnD2MFUUCSQt/CMjkewLcL0=";
|
||||
armv7l-linux = "sha256-fp4YM2BgyTr4vvxw5FaqKyGm608q8fOpB3gAgPA9UQ4=";
|
||||
x86_64-linux = "sha256-sLRdU/UW2JORAUOPzmr+VUkcLoesrshjdLvDCizX0iM=";
|
||||
aarch64-linux = "sha256-FHE87B34QSc7rcKHE3wkZq1VzcZeKWh68rlIIMDRmm8=";
|
||||
armv7l-linux = "sha256-OqomlL7IFHyQQULbdbf5I0dRXdy3lDHY4ej2P1OZgzo=";
|
||||
x86_64-linux = "sha256-QNcWMVZ4bTXPLFEtD35hP2LbuNntvF2e9Wk2knt4TBY=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, sqlite
|
||||
, tinyxml
|
||||
, wrapGAppsHook
|
||||
, wxGTK30
|
||||
, wxGTK32
|
||||
, gtk3
|
||||
, xdg-utils
|
||||
}:
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
pugixml
|
||||
sqlite
|
||||
tinyxml
|
||||
wxGTK30
|
||||
wxGTK32
|
||||
gtk3
|
||||
xdg-utils
|
||||
];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
@ -22,36 +21,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "mail";
|
||||
rev = version;
|
||||
sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4=";
|
||||
sha256 = "sha256-IY+ml/ftLSk0A3Emi0ZL2wxIDIngNU6QKbHErRAaaMA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# build: fix documentation build
|
||||
# https://github.com/elementary/mail/pull/795
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/mail/commit/52a422cb1c5f061d8a683005e44da0a1c2195096.patch";
|
||||
sha256 = "sha256-ndcIZXvmQbM/31Wtm6OSCnXdMYx+OlJrqV+baq6m+KY=";
|
||||
})
|
||||
# build: support webkit2gtk-4.1
|
||||
# https://github.com/elementary/mail/pull/794
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch";
|
||||
sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs=";
|
||||
})
|
||||
# Fix crash on setting message flag
|
||||
# https://github.com/elementary/mail/pull/825
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/mail/commit/c630f926196e44e086ddda6086cb8b9bdd3efc83.patch";
|
||||
sha256 = "sha256-4vEETSHA1Gd8GpBZuko4X+9AjG7SFwUlK2MxrWq+iOE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxml2
|
||||
meson
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, addOpenGLRunpath
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.9.4";
|
||||
version = "1.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4AQnMMKo4BvajfhhKmhTZA0snKPnO4WjOuZAeiWU5PY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zzlecBk7Mi3Nhj4eIAp81pq7+lIiKpvEaNeXuJKDPII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake addOpenGLRunpath ];
|
||||
@ -20,6 +25,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "oneAPI Level Zero Specification Headers and Loader";
|
||||
homepage = "https://github.com/oneapi-src/level-zero";
|
||||
changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ziguana ];
|
||||
};
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "routes";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.05";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz";
|
||||
sha256 = "sha256-WSlASDTA1UX+NhW38/XuLkOkdwjIxz0OUkX6Nd2iROg=";
|
||||
hash = "sha256-O2KdaYwrAOUEwTtM14NUgGNxnc8BWAycP1EEuB6w1og=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshutil";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "kumaraditya303";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HDN170lKxMj5vK94dn0sNXNDKoksg1tJ8G+vZEU7g/4=";
|
||||
hash = "sha256-XIGjiLjoyS/7vUDIyBPvHNMyHOBa0gsg/c/vGgrhZAg=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bottleneck";
|
||||
version = "1.3.6";
|
||||
version = "1.3.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Bottleneck";
|
||||
inherit version;
|
||||
hash = "sha256-vBXiVF1CgtbyUpWX3xvW5MXwxEKWs/hCW8g1MFvZQ8k=";
|
||||
hash = "sha256-4UZ+NzrUado0DtD/KDIU1lMcwIv9yiCDNho6pkcGgfg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glean-parser";
|
||||
version = "7.0.0";
|
||||
version = "7.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "glean_parser";
|
||||
inherit version;
|
||||
hash = "sha256-xIlg3W/A3FBvVOEin/ku0QdmzGXlmOm5yLeYvoGkzNU=";
|
||||
hash = "sha256-IgBaLVTVF4pGkC5EKZvLaa7U6Lwy2r/xit3E26kWEas=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -68,6 +68,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK";
|
||||
homepage = "https://github.com/mozilla/glean_parser";
|
||||
changelog = "https://github.com/mozilla/glean_parser/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [];
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jira";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "pycontribs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EZCvYpcQ1dSsXDhipUalrHEG5SYOochktYrBdIoNDRo=";
|
||||
hash = "sha256-6Nx12xEEPSWZE6XORU3I5HYM7vIjbAWPu7vNrzR4W24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -62,6 +62,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library to interact with the JIRA REST API";
|
||||
homepage = "https://github.com/pycontribs/jira";
|
||||
changelog = "https://github.com/pycontribs/jira/releases/tag/${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ globin ];
|
||||
};
|
||||
|
||||
@ -1,29 +1,29 @@
|
||||
{ lib
|
||||
, argcomplete
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, hatchling
|
||||
, userpath
|
||||
, argcomplete
|
||||
, packaging
|
||||
, importlib-metadata
|
||||
, packaging
|
||||
, pip
|
||||
, platformdirs
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, userpath
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pipx";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# no tests in the pypi tarball, so we directly fetch from github
|
||||
src = fetchFromGitHub {
|
||||
owner = "pipxproject";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6cKKVOgHIoKNfGqvDWK5cwBGBDkgfyRuBRDV6fruBoA=";
|
||||
hash = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,9 +31,10 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
userpath
|
||||
argcomplete
|
||||
packaging
|
||||
platformdirs
|
||||
userpath
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
@ -51,6 +52,7 @@ buildPythonPackage rec {
|
||||
# start local pypi server and use in tests
|
||||
"--net-pypiserver"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# disable tests which are difficult to emulate due to shell manipulations
|
||||
"path_warning"
|
||||
@ -74,9 +76,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Install and Run Python Applications in Isolated Environments";
|
||||
description = "Install and run Python applications in isolated environments";
|
||||
homepage = "https://github.com/pipxproject/pipx";
|
||||
changelog = "https://github.com/pypa/pipx/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yshym ];
|
||||
};
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyquil";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "rigetti";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jA6nYQSfdxd9FCTMQlYTe/EbV39vV0h9F9Fgf1M0+SY=";
|
||||
hash = "sha256-iHyYX9e3O611OzBMafqn4V+yR1y8y4twiJehYDYlvdg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-openstackclient";
|
||||
version = "6.1.0";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7ZF5GFG/eQmvQYnVmaV8iWYPhWldJPPumlZloeJkNLg=";
|
||||
hash = "sha256-fFOr4bc7RT9Z2ntzZ5w7dZtI5RuLBUhktf3qLqgnJ9Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slackclient";
|
||||
version = "3.20.0";
|
||||
version = "3.20.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws=";
|
||||
hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -36,14 +36,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/iAScBKZJ3iATZP3XOk3DViFcwcmOcODLOw49Uv35KU=";
|
||||
hash = "sha256-gRrhRoxYuX/JqjEYfWtVMXeEJY8KR+v2nYHKtjnj+hU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -107,6 +107,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Industrial-strength Natural Language Processing (NLP)";
|
||||
homepage = "https://github.com/explosion/spaCy";
|
||||
changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stanza";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "stanfordnlp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-v4/wYfXqOwSXxx864LNxviRtsqu5DXqs9diswA1oZXc=";
|
||||
hash = "sha256-sFGAVavY16UQNJmW467+Ekojws59UMcAoCc1t9wWHM4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -47,6 +47,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Official Stanford NLP Python Library for Many Human Languages";
|
||||
homepage = "https://github.com/stanfordnlp/stanza/";
|
||||
changelog = "https://github.com/stanfordnlp/stanza/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ riotbib ];
|
||||
};
|
||||
|
||||
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.8.2";
|
||||
version = "5.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
hash = "sha256-jwr3QPgJ6vKSk8yGxndQ69AickP8PorNDuGyJzHMpV4=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Fbluq3Q/BgPwTVNKW28FJL+Ok46hDiBjwFt6KwN4anc=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@ -110,6 +110,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "UNIX-like reverse engineering framework and command-line tools";
|
||||
homepage = "https://radare.org";
|
||||
changelog = "https://github.com/radareorg/radare2/releases/tag/${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ azahi raskin makefu mic92 arkivm ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -238,11 +238,11 @@ in {
|
||||
# zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2
|
||||
# for future releases, please delete this condition.
|
||||
kernelCompatible =
|
||||
if kernel.stdenv.isx86_64
|
||||
if stdenv'.isx86_64
|
||||
then kernel.kernelOlder "6.3"
|
||||
else kernel.kernelOlder "6.2";
|
||||
latestCompatibleLinuxPackages =
|
||||
if kernel.stdenv.isx86_64
|
||||
if stdenv'.isx86_64
|
||||
then linuxPackages_6_2
|
||||
else linuxPackages_6_1;
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rtsp-simple-server";
|
||||
version = "0.21.5";
|
||||
version = "0.21.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aler9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BwifUZxTM5/7UdSCN7glPU1MWLu7yBxfVAHInGLf4yA=";
|
||||
hash = "sha256-b9sb5XU+wE14N4N7NELE26gSntu7wJgpneIF+T2w6WY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OO4Ak+dmf6yOCZmV/lVhrHnseWoi2MysUh+NKpwrZxI=";
|
||||
vendorHash = "sha256-rKmaxsDQ6+cLp6eaw8TRjpPsNcQlPauqmX6hcslc2Wo=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "halp";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "halp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A48r7bDXyYVYrsyhqaQMk7c9fuCzilj2Ch9dYHFh8xY=";
|
||||
hash = "sha256-gcWE2PRDBnZ+ijbuu85S4xCuNvNrYVWtfXQyiajJVKQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CTLCpGkUobMgKsGLCZ1Z+zfLbvn37TXPmIWynGs1ybA=";
|
||||
cargoHash = "sha256-Y21w+UlsQA/lDbnQTiD5EsbIKuh0REZrsWm+JHIeoKg=";
|
||||
|
||||
patches = [
|
||||
# patch tests to point to the correct target directory
|
||||
|
||||
@ -3,11 +3,12 @@
|
||||
, httpServer ? false # build web interface for the daemon
|
||||
, client ? false # build amule remote gui
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, lib
|
||||
, cmake
|
||||
, zlib
|
||||
, wxGTK30 # WxGTK 3.0 must be used because aMule does not yet work well with 3.1
|
||||
, wxGTK32
|
||||
, perl
|
||||
, cryptopp
|
||||
, libupnp
|
||||
@ -37,11 +38,18 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/a/amule/1%3A2.3.3-3/debian/patches/wx3.2.patch";
|
||||
hash = "sha256-OX5Ef80bL+dQqHo2OBLZvzMUrU6aOHfsF7AtoE1r7rs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
wxGTK30
|
||||
wxGTK32
|
||||
perl
|
||||
cryptopp.dev
|
||||
libupnp
|
||||
@ -90,6 +98,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
# Undefined symbols for architecture arm64: "_FSFindFolder"
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-03-10";
|
||||
version = "2023-03-15";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-H7zPCPOQZgsujdic8o7/+OjLm7iP9PRFlpO0lH6YhwM=";
|
||||
hash = "sha256-qP14hkYO8gXD9C3B6uhBnYDx3YZMbbvtzHOSKFtFSmA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.16.0";
|
||||
version = "8.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EazTDPJMMUGmGSfQ5d7J1opv/KlapQLZZYxjbzBRaUY=";
|
||||
hash = "sha256-zidRNnvbjqLxYE0fBRygYWWBf5pS9xLLYFpSB0dtNks=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE=";
|
||||
|
||||
24
pkgs/tools/security/rsign2/default.nix
Normal file
24
pkgs/tools/security/rsign2/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsign2";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-Ono7cKXccYMmkrlsJ+Z85w8z0fEduuEQhRlHQQk0vzU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Yuf4iTWGQp/1ZUVqaR0tKfFxKJ9JEmMLq1LL7gwf6w0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line tool to sign files and verify signatures";
|
||||
homepage = "https://github.com/jedisct1/rsign2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "rsign";
|
||||
};
|
||||
}
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchFromGitHub, fetchzip, stdenv }:
|
||||
|
||||
rec {
|
||||
version = "1.0.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "returntocorp";
|
||||
repo = "semgrep";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4fNBpokHKCtMB3P0ot1TzcuzOs5hlyH8nIw+bCGqThA=";
|
||||
sha256 = "sha256-qtiOZRqN+EqJs7kDmNReW4uweEynJd0TrU7vpR/fbqI=";
|
||||
};
|
||||
|
||||
# submodule dependencies
|
||||
@ -18,14 +18,14 @@ rec {
|
||||
"cli/src/semgrep/lang" = fetchFromGitHub {
|
||||
owner = "returntocorp";
|
||||
repo = "semgrep-langs";
|
||||
rev = "65cb2ed80e31e01b122f893fef8428d14432da75";
|
||||
sha256 = "sha256-HdPJdOlMM1l7vNSATkEu5KrCkpt2feEAH8LFDU84KUM=";
|
||||
rev = "08656cdefc9e6818c64e168cf51ee1e76ea8829e";
|
||||
sha256 = "sha256-vYf33JhfvEDmt/VW0hBOmqailIERS0GdUgrPuCxWt9I=";
|
||||
};
|
||||
"cli/src/semgrep/semgrep_interfaces" = fetchFromGitHub {
|
||||
owner = "returntocorp";
|
||||
repo = "semgrep-interfaces";
|
||||
rev = "c69e30a4cf39f11cab5378700f5e193e8282079e";
|
||||
sha256 = "sha256-Wr3/TWx/LHiTFCoGY4sqdsn3dHvMsEIVYA3RGiv88xQ=";
|
||||
rev = "deffcb8e0e5166e29ce17b8af72716f45cbb2aa6";
|
||||
sha256 = "sha256-yrVn1fJcAkQd3TMIvrWa5NDb/fN3ngybOycu7DG4pbE=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -35,11 +35,11 @@ rec {
|
||||
data = {
|
||||
x86_64-linux = {
|
||||
suffix = "-ubuntu-16.04.tgz";
|
||||
sha256 = "sha256-SsaAuhcDyO3nr6H2xOtdxzOoEQd6aIe0mlpehvDWzU0=";
|
||||
sha256 = "sha256-cnF92jrVeRxDAbDQxicZ4+CfdOD7BJUz2fHjIHEim24=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
suffix = "-osx.zip";
|
||||
sha256 = "sha256-DAcAB/q6XeljCp4mVljIJB4AUjUuzMSRMFzIuyjWMew=";
|
||||
sha256 = "sha256-eg6oHTz3vRd4GubvOYiJIjv/NZgXRWHPBmFvSu60S+E=";
|
||||
};
|
||||
};
|
||||
src = let
|
||||
|
||||
@ -17,15 +17,17 @@ buildPythonApplication rec {
|
||||
pname = "semgrep";
|
||||
inherit (common) src version;
|
||||
|
||||
postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList (
|
||||
path: submodule: ''
|
||||
# substitute ${path}
|
||||
# remove git submodule placeholder
|
||||
rm -r ${path}
|
||||
# link submodule
|
||||
ln -s ${submodule}/ ${path}
|
||||
''
|
||||
) common.submodules)) + ''
|
||||
postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList
|
||||
(
|
||||
path: submodule: ''
|
||||
# substitute ${path}
|
||||
# remove git submodule placeholder
|
||||
rm -r ${path}
|
||||
# link submodule
|
||||
ln -s ${submodule}/ ${path}
|
||||
''
|
||||
)
|
||||
common.submodules)) + ''
|
||||
cd cli
|
||||
'';
|
||||
|
||||
@ -50,6 +52,7 @@ buildPythonApplication rec {
|
||||
click-option-group
|
||||
glom
|
||||
requests
|
||||
rich
|
||||
ruamel-yaml
|
||||
tqdm
|
||||
packaging
|
||||
|
||||
@ -25,7 +25,7 @@ instantiateClean() {
|
||||
|
||||
# get latest version
|
||||
NEW_VERSION=$(
|
||||
curl -s -H
|
||||
curl -s -H \
|
||||
"Accept: application/vnd.github.v3+json" \
|
||||
${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \
|
||||
https://api.github.com/repos/returntocorp/semgrep/releases/latest \
|
||||
@ -75,8 +75,8 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.com
|
||||
| jq '.[]' -r \
|
||||
| while read -r PLATFORM; do
|
||||
echo "Updating core for $PLATFORM"
|
||||
SUFFIX=$(instantiateClean semgrep.common.core.data."$1".suffix "$PLATFORM")
|
||||
OLD_HASH=$(instantiateClean semgrep.common.core.data."$1".sha256 "$PLATFORM")
|
||||
SUFFIX=$(instantiateClean semgrep.common.core.data."$PLATFORM".suffix)
|
||||
OLD_HASH=$(instantiateClean semgrep.common.core.data."$PLATFORM".sha256)
|
||||
echo "Old hash $OLD_HASH"
|
||||
|
||||
NEW_URL="https://github.com/returntocorp/semgrep/releases/download/v$NEW_VERSION/semgrep-v$NEW_VERSION$SUFFIX"
|
||||
@ -123,7 +123,7 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas
|
||||
NEW_URL=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g")
|
||||
NEW_HASH=$(nix --experimental-features nix-command hash to-sri "sha256:$(nix-prefetch-url "$NEW_URL")")
|
||||
|
||||
TMP_HASH="sha256-ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
|
||||
TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
|
||||
replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE"
|
||||
replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE"
|
||||
NEW_HASH="$(fetchgithub semgrep.passthru.common.submodules."$SUBMODULE")"
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tlsx";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9Cs5lkt7lAgCl/q2Xc8W5A8/frKER/d3mS1KH9jAy68=";
|
||||
hash = "sha256-rKnnBvutJqWUOsYt47+VwreJVRtJYYhRVxZdSqymRiw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eQnrSE45UGRbJ7zO6TdBh6UKooUEnhVxg4cdgoFu5eM=";
|
||||
vendorHash = "sha256-kLZCtmKJKNjmEk7vPoHfzqEnuBrycDYGNMh/zUDZ76g=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HFopiZamQ0A40u/+/pTxwYb598vyvWlNV4510Ode5RM=";
|
||||
hash = "sha256-aReYFw6mlPhf11bhLII5CrMG1G9d0hhPsFVrZxmt72o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xmB1i7IKTELvqZBxVL23Zpr7CfihW6LPBKwPUUXnHmQ=";
|
||||
vendorHash = "sha256-+Z8nzna5KedWzmhBKGSpsbE8ooaC9sPk6Bh5zkrzwrQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -5689,6 +5689,8 @@ with pkgs;
|
||||
|
||||
rsbkb = callPackage ../tools/text/rsbkb { };
|
||||
|
||||
rsign2 = callPackage ../tools/security/rsign2 { };
|
||||
|
||||
rsyslog = callPackage ../tools/system/rsyslog {
|
||||
withHadoop = false; # Currently Broken
|
||||
withKsi = false; # Currently Broken
|
||||
|
||||
Loading…
Reference in New Issue
Block a user