dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-31 00:02:22 +00:00 committed by GitHub
commit 881b2aa181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 1865 additions and 1727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho
- made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
- [22.05 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2205-release-notes)
- [22.11 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module

12
CONTRIBUTING.md
View File

@ -119,17 +119,15 @@ Anything that does not cause user or downstream dependency regressions can be ba
- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
- Security critical applications (E.g. `firefox`)
## Generating 22.05 Release Notes
(This section also applies to backporting 21.11 release notes: substitute "rl-2205" for "rl-2111".)
## Generating 22.11 Release Notes
Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document.
Steps for updating 22.05 Release notes:
Steps for updating 22.11 Release notes:
1. Edit `nixos/doc/manual/release-notes/rl-2205.section.md` with the desired changes
2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2205.section.xml`
3. Include changes to `rl-2205.section.md` and `rl-2205.section.xml` in the same commit.
1. Edit `nixos/doc/manual/release-notes/rl-2211.section.md` with the desired changes
2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2211.section.xml`
3. Include changes to `rl-2211.section.md` and `rl-2211.section.xml` in the same commit.
## Reviewing contributions

16
nixos/doc/manual/from_md/installation/upgrading.chapter.xml
View File

@ -12,7 +12,7 @@
<listitem>
<para>
<emphasis>Stable channels</emphasis>, such as
<link xlink:href="https://nixos.org/channels/nixos-21.11"><literal>nixos-21.11</literal></link>.
<link xlink:href="https://nixos.org/channels/nixos-22.05"><literal>nixos-22.05</literal></link>.
These only get conservative bug fixes and package upgrades. For
instance, a channel update may cause the Linux kernel on your
system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix),
@ -33,7 +33,7 @@
<listitem>
<para>
<emphasis>Small channels</emphasis>, such as
<link xlink:href="https://nixos.org/channels/nixos-21.11-small"><literal>nixos-21.11-small</literal></link>
<link xlink:href="https://nixos.org/channels/nixos-22.05-small"><literal>nixos-22.05-small</literal></link>
or
<link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>.
These are identical to the stable and unstable channels
@ -60,8 +60,8 @@
<para>
When you first install NixOS, you’re automatically subscribed to the
NixOS channel that corresponds to your installation source. For
instance, if you installed from a 21.11 ISO, you will be subscribed
to the <literal>nixos-21.11</literal> channel. To see which NixOS
instance, if you installed from a 22.05 ISO, you will be subscribed
to the <literal>nixos-22.05</literal> channel. To see which NixOS
channel you’re subscribed to, run the following as root:
</para>
<programlisting>
@ -76,17 +76,17 @@ nixos https://nixos.org/channels/nixos-unstable
</programlisting>
<para>
(Be sure to include the <literal>nixos</literal> parameter at the
end.) For instance, to use the NixOS 21.11 stable channel:
end.) For instance, to use the NixOS 22.05 stable channel:
</para>
<programlisting>
# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
</programlisting>
<para>
If you have a server, you may want to use the <quote>small</quote>
channel instead:
</para>
<programlisting>
# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos
</programlisting>
<para>
And if you want to live on the bleeding edge:
@ -146,7 +146,7 @@ system.autoUpgrade.allowReboot = true;
also specify a channel explicitly, e.g.
</para>
<programlisting language="bash">
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05;
</programlisting>
</section>
</chapter>

2
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -1,5 +1,5 @@
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-22.05">
<title>Release 22.05 (“Quokka”, 2022.05/??)</title>
<title>Release 22.05 (“Quokka”, 2022.05/30)</title>
<itemizedlist spacing="compact">
<listitem>
<para>

16
nixos/doc/manual/installation/upgrading.chapter.md
View File

@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated
automatically from NixOS's Git repository after certain tests have
passed and all packages have been built. These channels are:
- *Stable channels*, such as [`nixos-21.11`](https://nixos.org/channels/nixos-21.11).
- *Stable channels*, such as [`nixos-22.05`](https://nixos.org/channels/nixos-22.05).
These only get conservative bug fixes and package upgrades. For
instance, a channel update may cause the Linux kernel on your system
to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not
@ -19,7 +19,7 @@ passed and all packages have been built. These channels are:
radical changes between channel updates. It's not recommended for
production systems.
- *Small channels*, such as [`nixos-21.11-small`](https://nixos.org/channels/nixos-21.11-small)
- *Small channels*, such as [`nixos-22.05-small`](https://nixos.org/channels/nixos-22.05-small)
or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small).
These are identical to the stable and unstable channels described above,
except that they contain fewer binary packages. This means they get updated
@ -38,8 +38,8 @@ newest supported stable release.
When you first install NixOS, you're automatically subscribed to the
NixOS channel that corresponds to your installation source. For
instance, if you installed from a 21.11 ISO, you will be subscribed to
the `nixos-21.11` channel. To see which NixOS channel you're subscribed
instance, if you installed from a 22.05 ISO, you will be subscribed to
the `nixos-22.05` channel. To see which NixOS channel you're subscribed
to, run the following as root:
```ShellSession
@ -54,16 +54,16 @@ To switch to a different NixOS channel, do
```
(Be sure to include the `nixos` parameter at the end.) For instance, to
use the NixOS 21.11 stable channel:
use the NixOS 22.05 stable channel:
```ShellSession
# nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
# nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
```
If you have a server, you may want to use the "small" channel instead:
```ShellSession
# nix-channel --add https://nixos.org/channels/nixos-21.11-small nixos
# nix-channel --add https://nixos.org/channels/nixos-22.05-small nixos
```
And if you want to live on the bleeding edge:
@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel
modules. You can also specify a channel explicitly, e.g.
```nix
system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.11;
system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.05;
```

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

@ -1,4 +1,4 @@
# Release 22.05 (“Quokka”, 2022.05/??) {#sec-release-22.05}
# Release 22.05 (“Quokka”, 2022.05/30) {#sec-release-22.05}
- Support is planned until the end of December 2022, handing over to 22.11.

10
nixos/modules/services/computing/slurm/slurm.nix
View File

@ -361,8 +361,13 @@ in
++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
wantedBy = [ "multi-user.target" ];
after = [ "systemd-tmpfiles-clean.service" ];
requires = [ "network.target" ];
after = [
"systemd-tmpfiles-clean.service"
"munge.service"
"network-online.target"
"remote-fs.target"
];
wants = [ "network-online.target" ];
serviceConfig = {
Type = "forking";
@ -371,6 +376,7 @@ in
PIDFile = "/run/slurmd.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
LimitMEMLOCK = "infinity";
Delegate="Yes";
};
};

9
pkgs/applications/editors/xedit/default.nix
View File

@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-WF+4avzRRL0+OA3KxzK7JwmArkPu9fEl+728R6ouXmg=";
};
# ./lisp/mathimp.c:493:10: error: implicitly declaring library function 'finite' with type 'int (double)'
postPatch = lib.optionalString stdenv.isDarwin ''
for i in $(find . -type f -name "*.c"); do
substituteInPlace $i --replace "finite" "isfinite"
done
'';
nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ];
buildInputs = [
libX11
@ -40,6 +47,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.freedesktop.org/xorg/app/xedit";
license = with licenses; [ mit ];
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

66
pkgs/applications/graphics/curtail/default.nix Normal file
View File

@ -0,0 +1,66 @@
{ lib
, python3
, fetchFromGitHub
, wrapGAppsHook
, appstream-glib
, desktop-file-utils
, gettext
, gtk3
, meson
, ninja
, pkg-config
, gobject-introspection
, jpegoptim
, libwebp
, optipng
, pngquant
}:
python3.pkgs.buildPythonApplication rec {
pname = "curtail";
version = "1.3.0";
format = "other";
src = fetchFromGitHub {
owner = "Huluti";
repo = "Curtail";
rev = version;
sha256 = "sha256-tNk+KI+DEMR63zfcBpfPTxAFKzvGWvpa9erK9SAAtPc=";
};
nativeBuildInputs = [
wrapGAppsHook
appstream-glib
desktop-file-utils
gettext
gtk3
meson
ninja
pkg-config
];
propagatedBuildInputs = [
appstream-glib
python3.pkgs.pygobject3
gobject-introspection
gettext
];
# Currently still required for the gobject-introspection setup hook
strictDeps = false;
preInstall = ''
patchShebangs ../build-aux/meson/postinstall.py
'';
postInstall = ''
wrapProgram $out/bin/curtail --prefix PATH : ${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}
'';
meta = with lib; {
description = "Simple & useful image compressor";
homepage = "https://github.com/Huluti/Curtail";
license = licenses.gpl3Only;
maintainers = with maintainers; [ anselmschueler ];
};
}

4
pkgs/applications/misc/sway-launcher-desktop/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sway-launcher-desktop";
version = "1.5.4";
version = "1.6.0";
src = fetchFromGitHub {
owner = "Biont";
repo = "sway-launcher-desktop";
rev = "v${version}";
sha256 = "0i19igj30jyszqb63ibq0b0zxzvjw3z1zikn9pbk44ig1c0v61aa";
sha256 = "HCGUFXrj6b9Pb6b5y9yupBumFLQyH1QVMrfoBM4HbMg=";
};
postPatch = ''

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

@ -12,15 +12,15 @@
buildGoModule rec {
pname = "werf";
version = "1.2.99";
version = "1.2.107";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-D9NwVZGB0UV0tRe927GpxHzdvAeqcRJOYfocbbj6BRM=";
sha256 = "sha256-a66BN8thTEKrXCOXpYIlbQnlA0VYEomQrc/m87qn6j4=";
};
vendorSha256 = "sha256-ZMSTl9WFTF5x+tiQZ37ihVrOuLS0W5PjyXbbzyHJNsI=";
vendorSha256 = "sha256-NwrkjeDicp4fmeviTCSs9lSg33Cgpv8tBdm84RJz/gQ=";
proxyVendor = true;
nativeBuildInputs = [ installShellFiles pkg-config ];

30
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View File

@ -1,13 +1,12 @@
{ lib
, copyDesktopItems
, electron_16
, electron_18
, esbuild
, fetchFromGitHub
, fetchpatch
, libdeltachat
, makeDesktopItem
, makeWrapper
, nodejs-14_x
, nodePackages
, noto-fonts-emoji
, pkg-config
, roboto
@ -19,24 +18,23 @@
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.76.0";
version = "1.84.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo=";
hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${old.pname}-${version}";
hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok=";
hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs=";
};
patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches;
});
electronExec = if stdenv.isDarwin then
"${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
"${electron_18}/Applications/Electron.app/Contents/MacOS/Electron"
else
"${electron_16}/bin/electron";
"${electron_18}/bin/electron";
esbuild' = esbuild.overrideAttrs (old: rec {
version = "0.12.29";
src = fetchFromGitHub {
@ -46,15 +44,15 @@ let
hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg=";
};
});
in nodejs-14_x.pkgs.deltachat-desktop.override rec {
in nodePackages.deltachat-desktop.override rec {
pname = "deltachat-desktop";
version = "1.28.2";
version = "1.30.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-jhtriDnt8Yl8eCmUTEyoPjccZV8RNAchMykkkiRpF60=";
hash = "sha256-vp6vqoQvkAe7QPy4210r/5c1GNaGWgYvG0LyLqtCAxw=";
};
nativeBuildInputs = [
@ -75,8 +73,13 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec {
USE_SYSTEM_LIBDELTACHAT = "true";
VERSION_INFO_GIT_REF = src.rev;
preRebuild = ''
substituteInPlace package.json \
--replace "node ./bin/check-nodejs-version.js" true
'';
postInstall = ''
rm -r node_modules/deltachat-node/{deltachat-core-rust,prebuilds,src}
rm -r node_modules/deltachat-node/node/prebuilds
npm run build
@ -117,6 +120,7 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec {
meta = with lib; {
description = "Email-based instant messaging for Desktop";
homepage = "https://github.com/deltachat/deltachat-desktop";
changelog = "https://github.com/deltachat/deltachat-desktop/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};

53
pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch
View File

@ -1,53 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ed8020c..44ca43e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16)
project(deltachat LANGUAGES C)
include(GNUInstallDirs)
+if(APPLE)
+ set(DYNAMIC_EXT "dylib")
+elseif(UNIX)
+ set(DYNAMIC_EXT "so")
+else()
+ set(DYNAMIC_EXT "dll")
+endif()
+
find_program(CARGO cargo)
add_custom_command(
OUTPUT
"target/release/libdeltachat.a"
- "target/release/libdeltachat.so"
+ "target/release/libdeltachat.${DYNAMIC_EXT}"
"target/release/pkgconfig/deltachat.pc"
COMMAND
PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -32,11 +40,11 @@ add_custom_target(
ALL
DEPENDS
"target/release/libdeltachat.a"
- "target/release/libdeltachat.so"
+ "target/release/libdeltachat.${DYNAMIC_EXT}"
"target/release/pkgconfig/deltachat.pc"
)
install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py
index c8ed43e2..714c7e30 100755
--- a/python/install_python_bindings.py
+++ b/python/install_python_bindings.py
@@ -24,7 +24,7 @@
print("running:", " ".join(cmd))
subprocess.check_call(cmd)
- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)
+ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True)
if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
subprocess.check_call([

27
pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
View File

@ -1,30 +1,28 @@
{
"name": "deltachat-desktop",
"version": "1.28.2",
"version": "1.30.0",
"dependencies": {
"@blueprintjs/core": "^3.22.3",
"@deltachat/message_parser_wasm": "^0.3.0",
"@blueprintjs/core": "^4.1.2",
"@deltachat/message_parser_wasm": "^0.4.0",
"@deltachat/react-qr-reader": "^4.0.0",
"@mapbox/geojson-extent": "^1.0.0",
"application-config": "^1.0.1",
"classnames": "^2.3.1",
"debounce": "^1.2.0",
"deltachat-node": "1.76.0",
"deltachat-node": "1.84.0",
"emoji-js-clean": "^4.0.0",
"emoji-mart": "^3.0.0",
"emoji-mart": "^3.0.1",
"emoji-regex": "^9.2.2",
"error-stack-parser": "^2.0.7",
"filesize": "^8.0.6",
"immutable": "^4.0.0",
"mapbox-gl": "^1.12.0",
"mime-types": "^2.1.31",
"moment": "^2.27.0",
"node-fetch": "^2.6.7",
"moment": "^2.29.2",
"path-browserify": "^1.0.1",
"rc": "^1.2.8",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-qr-reader": "^2.2.1",
"react-qr-svg": "^2.1.0",
"react-string-replace": "^1.0.0",
"react-virtualized-auto-sizer": "^1.0.5",
"react-window": "^1.8.6",
@ -32,26 +30,23 @@
"react-zoom-pan-pinch": "^2.1.3",
"source-map-support": "^0.5.19",
"stackframe": "^1.2.1",
"tempy": "^0.3.0",
"url-parse": "^1.5.9",
"use-debounce": "^3.3.0",
"@babel/core": "^7.7.7",
"@babel/preset-env": "^7.7.7",
"@babel/preset-react": "^7.7.4",
"@types/debounce": "^1.2.0",
"@types/emoji-mart": "^3.0.2",
"@types/emoji-mart": "^3.0.9",
"@types/mapbox-gl": "^0.54.5",
"@types/mime-types": "^2.1.0",
"@types/node": "^14.14.20",
"@types/node-fetch": "^2.5.7",
"@types/prop-types": "^15.7.3",
"@types/rc": "^1.1.0",
"@types/react": "^16.9.17",
"@types/react-dom": "^16.9.4",
"@types/react": "^17.0.2",
"@types/react-dom": "^17.0.2",
"@types/react-window": "^1.8.4",
"@types/react-window-infinite-loader": "^1.0.4",
"@types/url-parse": "^1.4.3",
"electron": "^14.2.9",
"electron": "^18.0.3",
"esbuild": "^0.12.29",
"glob-watcher": "^5.0.5",
"sass": "^1.26.5",

2
pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh
View File

@ -29,7 +29,7 @@ tac default.nix \
src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link)
jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \
jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@types/node-fetch","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","node-fetch","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \
"$src/package.json" > package.json.new
if cmp --quiet package.json{.new,}; then

2
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -9,6 +9,7 @@
, wrapQtAppsHook
, extra-cmake-modules
, qtbase
, qtwayland
, qtsvg
, qtimageformats
, qt5compat
@ -112,6 +113,7 @@ env.mkDerivation rec {
buildInputs = [
qtbase
qtwayland
qtsvg
qtimageformats
qt5compat

8
pkgs/applications/networking/mailreaders/mmh/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }:
let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e";
{ lib, stdenv, fetchurl, fetchpatch, ncurses, autoreconfHook, flex }:
let rev = "b17ea39dc17e5514f33b3f5c34ede92bd16e208c";
in stdenv.mkDerivation rec {
pname = "mmh";
version = "unstable-2019-09-08";
version = "unstable-2020-08-21";
src = fetchurl {
url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz";
name = "mmh-${rev}.tgz";
sha256 = "1q97p4g3f1q2m567i2dbx7mm7ixw3g91ww2rymwj42cxk9iyizhv";
sha256 = "1bqfxafw4l2y46pnsxgy4ji1xlyifzw01k1ykbsjj9p61q3nv6l6";
};
postPatch = ''

12
pkgs/applications/networking/netperf/default.nix
View File

@ -1,4 +1,4 @@
{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub }:
{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation {
pname = "netperf";
@ -11,6 +11,16 @@ stdenv.mkDerivation {
sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c=";
};
patches = [
# Pul fix pending upstream inclusion for -fno-common toolchains:
# https://github.com/HewlettPackard/netperf/pull/46
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch";
sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4=";
})
];
buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios;
nativeBuildInputs = [ autoreconfHook ];
autoreconfPhase = ''

20
pkgs/applications/networking/p2p/ncdc/default.nix
View File

@ -1,25 +1,19 @@
{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }:
{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config
, glib, gnutls, perl, libmaxminddb }:
stdenv.mkDerivation rec {
pname = "ncdc";
version = "1.22.1";
version = "1.23";
src = fetchurl {
url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi";
hash = "sha256-gEq65B/MqWnof2UEg65+OiN0Gdq70yCJfiX+iFHwoss=";
};
patches = [
# Upstream fix for ncurses-6.3 support:
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://g.blicky.net/ncdc.git/patch/?id=4126dd51e90deb9e22dfd139cc4518a7812fcad6";
sha256 = "13hqkmhmbazj6cllb5b2ccgf51vsn5lri7jqkqc5xwivgcisfrij";
})
];
nativeBuildInputs = [ perl pkg-config ];
buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls libmaxminddb ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ];
configureFlags = [ "--with-geoip" ];
meta = with lib; {
description = "Modern and lightweight direct connect client with a friendly ncurses interface";

10
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkg-config
{ mkDerivation, lib, fetchFromGitHub, pkg-config
, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg
, debugSupport ? false
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
@ -24,7 +24,7 @@ mkDerivation rec {
enableParallelBuilding = true;
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ makeWrapper pkg-config ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ]
++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support
@ -40,11 +40,7 @@ mkDerivation rec {
++ optional (!webuiSupport) "--disable-webui"
++ optional debugSupport "--enable-debug";
postInstall = "wrapProgram $out/bin/${
if guiSupport
then "qbittorrent"
else "qbittorrent-nox"
} --prefix PATH : ${makeBinPath [ python3 ]}";
qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}";
meta = {
description = "Featureful free software BitTorrent client";

21
pkgs/applications/office/paperless-ngx/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, fetchurl
, fetchpatch
, nixosTests
, python3
, ghostscript
@ -15,11 +14,16 @@
}:
let
# Use specific package versions required by paperless-ngx
py = python3.override {
packageOverrides = self: super: {
django = super.django_3;
django = super.django_4;
# django-extensions 3.1.5 is required, but its tests are incompatible with Django 4
django-extensions = super.django-extensions.overridePythonAttrs (_: {
doCheck = false;
});
# Incompatible with aioredis 2
aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec {
version = "1.3.1";
src = oldAttrs.src.override {
@ -34,11 +38,12 @@ let
in
py.pkgs.pythonPackages.buildPythonApplication rec {
pname = "paperless-ngx";
version = "1.6.0";
version = "1.7.1";
# Fetch the release tarball instead of a git ref because it contains the prebuilt fontend
src = fetchurl {
url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/ngx-${version}/${pname}-${version}.tar.xz";
sha256 = "07mrxbwahkm00n9nvssd6d13p80w333g84cd38bzp0l34nzim5zl";
url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz";
hash = "sha256-8vx4hvbIqaChjPyS8Q0ar2bz/pLzEdxoF7P2gBEeFzc=";
};
format = "other";
@ -92,6 +97,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
numpy
ocrmypdf
pathvalidate
pdf2image
pdfminer-six
pikepdf
pillow
@ -109,6 +115,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
python-magic
pytz
pyyaml
pyzbar
redis
regex
reportlab
@ -189,6 +196,6 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
description = "A supercharged version of paperless: scan, index, and archive all of your physical documents";
homepage = "https://paperless-ngx.readthedocs.io/en/latest/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ lukegb ];
maintainers = with maintainers; [ lukegb gador earvstedt ];
};
}

6
pkgs/applications/virtualization/docker/compose.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.5.1";
version = "2.6.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-8YS0bTcjKQ9VOXPXDHPlU/m1JxEXlnV+Kkum9HNmSfc=";
sha256 = "sha256-Fg99ugaqH/jL3KUZ5Vh/SJnqzEyOaR/KuPFwt2oqXxM=";
};
vendorSha256 = "sha256-XffTZvjRayn6qta2uU8bq0KDadazZm278iX3jis6y+s=";
vendorSha256 = "sha256-7uNQNO+EI90J2Btz2tnumKqd+AtVWON+Csh6tkTNKNA=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

10
pkgs/data/fonts/camingo-code/default.nix
View File

@ -7,11 +7,13 @@ in fetchzip rec {
url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip";
postFetch = ''
unzip $downloadedFile
install -m444 -Dt $out/share/fonts/truetype fonts/camingo-code/*.ttf
install -m444 -Dt $out/share/doc/${name} fonts/camingo-code/*.txt
install -Dm644 $out/camingo-code/*.ttf -t $out/share/fonts/truetype
install -Dm644 $out/camingo-code/*.txt -t $out/share/doc/${name}
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
sha256 = "16iqjwwa7pnswvcc4w8nglkd0m0fz50qsz96i1kcpqip3nwwvw7y";
sha256 = "sha256-/vDNuR034stmiCZ9jUH5DlTQJn0WccLY5treoziXOJo=";
meta = with lib; {
homepage = "https://www.myfonts.com/fonts/jan-fromm/camingo-code/";

30
pkgs/data/fonts/gdouros/default.nix
View File

@ -2,25 +2,29 @@
let
fonts = {
aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "1w4ks341jw12p6zi1fy1hb3kqiqv61yn8i2hr9ybng9n8xdw03li"; description = "Aegean"; };
aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "16j8rj3mr2cddag7laxvzpm5w3yk467fwzsk60nq8pnh6ab1v05y"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "1f2v9cjk307c5lw0si9hwjcll5wb9nwwy5im0y16kvpgwh2ccshc"; description = "Sumero-Akkadian Cuneiform"; };
assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "18nx6ayfk3ba6wg1rp37r9fll5ajrwq2mp5w2l3y1q1kk92frkid"; description = "Neo-Assyrian in Unicode with OpenType"; };
eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "1kk5rd3wd7y13z9bqcg1k9idbwad4l3hfmi3lbfk4y1w895vgxk2"; description = "Byzantine Musical Notation in Unicode with OpenType"; };
maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "0fzzrlkd4m2dj2phg97nz782w0afmw0f0ykdvlwyp29j1ak7yyp1"; description = "Maya Hieroglyphs"; };
symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "04pxh5agvlkyg8mvv2szwshnmzi3n0m7va4xsyq401zbsa147rmi"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "1xp8qlfpvcf5n96zgm07zij3ndlzvqjlii8gx9sbj5aa56rxkdgb"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "0cvnxblk9wsr8mxm5lrdpdm456vi7lln7qh53b67npg4baf0as63"; description = "Glyphs and Icons for blocks of The Unicode Standard"; };
aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "sha256-1DnbfL6bKn8Upht/ZYfKIp9kuDHq7y9E+jkt2Yhr38A="; description = "Aegean"; };
aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "sha256-tObgHlhaquq6Akn/HdYKNfnKHHJP42yAT7lIn5qdCzY="; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "sha256-iHiXfxMS9FIlrRgT23MfxzCqYJMQrKuKYDShrqB74vU="; description = "Sumero-Akkadian Cuneiform"; };
assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "sha256-YjTQjv1Vybr14Sn9pUdbGYVf4ZIjGT+cpB1qCIg1NNQ="; description = "Neo-Assyrian in Unicode with OpenType"; };
eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "sha256-PaYBJOV+dmRV1ehY7TwDNL9dz1jPo58I3N8lWX1Vmy8="; description = "Byzantine Musical Notation in Unicode with OpenType"; };
maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "sha256-9uqGo4hweV1ydI+pEp76IqmHslWvxr87rTvziQs35bQ="; description = "Maya Hieroglyphs"; };
symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "sha256-C9HmforXr/Hqopb3go+bzqRFcWPv+0rz0JZsXc3mcxw="; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "sha256-1bDi5mwrT2I8gx6QdhnWjXATFdNAU9nt77BiFIci6C8="; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "sha256-6lSkDb603XIrBGy4fZhY7xYDd3x0qA0PRQOlQ9Roig0="; description = "Glyphs and Icons for blocks of The Unicode Standard"; };
};
mkpkg = name_: {version, file, sha256, description}: fetchzip rec {
name = "${name_}-${version}";
url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
stripRoot = false;
postFetch = ''
mkdir -p $out/share/{fonts,doc}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile \*.odt \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any
rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty
mkdir -p $out/share/{fonts/opentype,doc/${name_}}
mv $out/*.otf -t "$out/share/fonts/opentype"
mv $out/*.{odt,ods,pdf,xlsx} -t "$out/share/doc/${name_}" || true # install docs if any
find $out -type d -empty -delete
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
inherit sha256;

9
pkgs/data/fonts/hannom/default.nix
View File

@ -7,9 +7,14 @@ in fetchzip {
url = "mirror://sourceforge/vietunicode/hannom/hannom%20v${version}/hannomH.zip";
stripRoot = false;
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
mkdir -p $out/share/fonts/truetype
mv $out/*.ttf -t $out/share/fonts/truetype
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
sha256 = "sha256-zOYJxEHl4KM0ncVQDBs9+e3z8DxzF2ef3pRj0OVSuUo=";

9
pkgs/data/fonts/helvetica-neue-lt-std/default.nix
View File

@ -7,12 +7,17 @@ in fetchzip {
url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip";
stripRoot = false;
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile "Helvetica Neue LT Std/*.otf" -d $out/share/fonts/opentype
install -Dm644 $out/'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9";
sha256 = "sha256-gM/QXrKI2xrrCBYt4R+Fk5Tj0AIkrnCP/pwgh0A/MyI=";
meta = with lib; {
homepage = "https://web.archive.org/web/20190926040940/http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html";

12
pkgs/data/fonts/kochi-substitute-naga10/default.nix
View File

@ -7,14 +7,18 @@ fetchzip {
url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2";
stripRoot = false;
postFetch = ''
tar -xjf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf
cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf
mv $out/*/kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf
mv $out/*/kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
sha256 = "1bjb5cr3wf3d5y7xj1ly2mkv4ndwvg615rb1ql6lsqc2icjxk7j9";
sha256 = "sha256-SZ7ZJYuCYU0NxWHlEszbvFmyZxWeBtmPL204PjIrS64=";
meta = {
description = "Japanese font, non-free replacement for MS Gothic and MS Mincho";

12
pkgs/data/fonts/liberastika/default.nix
View File

@ -7,13 +7,17 @@ in fetchzip rec {
url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip";
stripRoot = false;
postFetch = ''
mkdir -p $out/share/{doc,fonts}
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile AUTHORS ChangeLog COPYING README -d "$out/share/doc/${name}"
mkdir -p $out/share/fonts
install -Dm644 $out/*.ttf -t $out/share/fonts/truetype
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
sha256 = "1a9dvl1pzch2vh8sqyyn1d1wz4n624ffazl6hzlc3s5k5lzrb6jp";
sha256 = "sha256-1hoETOjPRUIzzM+NUR+g/Ph16jXmH2ARSlZHjgEwoeM=";
meta = with lib; {
description = "Liberation Sans fork with improved cyrillic support";

18
pkgs/data/fonts/xkcd-font/default.nix
View File

@ -11,20 +11,12 @@ in fetchFromGitHub {
rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
postFetch = ''
pushd $out
install -Dm444 -t $out/share/fonts/opentype/ $out/xkcd/build/xkcd.otf
install -Dm444 -t $out/share/fonts/truetype/ $out/xkcd-script/font/xkcd-script.ttf
install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
# remove unrelated files
for f in * .*; do
case "$f" in
share|.|..) ;;
*) rm -rf "$f" ;;
esac
done
popd
shopt -s extglob dotglob
rm -rf $out/!(share)
shopt -u extglob dotglob
'';
sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY=";

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "fplll";
version = "5.4.1";
version = "5.4.2";
src = fetchFromGitHub {
owner = "fplll";
repo = "fplll";
rev = version;
sha256 = "sha256-6Zde8/bPOQQ16DqhqrQuGXDrf5HQEn5lwxauvyBr4XQ=";
sha256 = "sha256-6pzErZtT5xzCMcsNy2EwrZHiAICLrRl1dv59bp23hAA=";
};
nativeBuildInputs = [

5
pkgs/development/libraries/libnatspec/default.nix
View File

@ -13,13 +13,12 @@ stdenv.mkDerivation rec {
buildInputs = [ popt ];
propagatedBuildInputs = [ libiconv ];
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "http://natspec.sourceforge.net/";
description = "A library intended to smooth national specificities in using of programs";
platforms = platforms.unix;
license = licenses.lgpl21;
};
} // lib.optionalAttrs (!stdenv.isLinux) {
propagatedBuildInputs = [ libiconv ];
}

5
pkgs/development/libraries/qt-6/default.nix
View File

@ -83,9 +83,8 @@ let
qtwebsockets = callPackage ./modules/qtwebsockets.nix { };
qtwebview = callPackage ./modules/qtwebview.nix { };
wrapQtAppsHook = makeSetupHook
{
deps = [ self.qtbase.dev self.qtwayland.dev makeWrapper ];
wrapQtAppsHook = makeSetupHook {
deps = [ makeWrapper ];
} ./hooks/wrap-qt-apps-hook.sh;
};

2872
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

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

@ -20,13 +20,13 @@
buildPythonPackage rec {
pname = "ansible-lint";
version = "6.2.1";
version = "6.2.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yg3u5YNcv6+buhgnWGiKiKC5xoUrMrFed+SwN2whvB8=";
sha256 = "sha256-uOKVb+3pC9KBUOl/IJqK94fGAB9YS7ZhMRKhzhrqMR0=";
};
postPatch = ''

12
pkgs/development/python-modules/authheaders/default.nix
View File

@ -1,5 +1,5 @@
{ buildPythonPackage, fetchPypi, isPy27, lib
, authres, dnspython, dkimpy, ipaddress, publicsuffix2
{ buildPythonPackage, fetchPypi, lib
, authres, dnspython, dkimpy, publicsuffix2
}:
buildPythonPackage rec {
@ -11,12 +11,12 @@ buildPythonPackage rec {
sha256 = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk=";
};
propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ]
++ lib.optional isPy27 ipaddress;
propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ];
meta = {
meta = with lib; {
description = "Python library for the generation of email authentication headers";
homepage = "https://github.com/ValiMail/authentication-headers";
license = lib.licenses.mit;
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

6
pkgs/development/python-modules/celery/default.nix
View File

@ -69,6 +69,11 @@ buildPythonPackage rec {
disabledTests = [
"msgpack"
"test_check_privileges_no_fchown"
] ++ lib.optionals stdenv.isDarwin [
# too many open files on hydra
"test_cleanup"
"test_with_autoscaler_file_descriptor_safety"
"test_with_file_descriptor_safety"
];
pythonImportsCheck = [
@ -80,7 +85,6 @@ buildPythonPackage rec {
};
meta = with lib; {
broken = stdenv.isDarwin;
description = "Distributed task queue";
homepage = "https://github.com/celery/celery/";
license = licenses.bsd3;

13
pkgs/development/python-modules/fpylll/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, buildPythonPackage
, pkgconfig
, gmp
@ -15,15 +16,23 @@
buildPythonPackage rec {
pname = "fpylll";
version = "0.5.6";
version = "0.5.7";
src = fetchFromGitHub {
owner = "fplll";
repo = "fpylll";
rev = version;
sha256 = "sha256-Bxcc0941+pl2Uzam48qe+PFlcBWsJ0rDYZxrxIYQpEA=";
sha256 = "sha256-iUPreJ8BSB8LDisbJis0xn8ld6+Nf9Z4AP8SWJlCfZg=";
};
patches = [
(fetchpatch {
name = "remove-strategies-doctest.patch";
url = "https://github.com/fplll/fpylll/commit/3edffcd189e9d827a322d83b0f84d32e5f067442.patch";
sha256 = "sha256-U7qOIbVzUNwYmjOPryjnE3J+MX/vMwm3T0UyOZ5ylLc=";
})
];
buildInputs = [
gmp
pari

21
pkgs/development/python-modules/huggingface-hub/default.nix
View File

@ -14,33 +14,40 @@
buildPythonPackage rec {
pname = "huggingface-hub";
version = "0.6.0";
version = "0.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "huggingface";
repo = "huggingface_hub";
rev = "refs/tags/v${version}";
sha256 = "sha256-jR4aqMAAQJ5a7pOe3RpCtLgdm5JVVSPsBQtube6FeqM=";
hash = "sha256-GUe9+Z23vt3sfpntDnToMY5vWLK6m0zRySSJgMljetg=";
};
nativeBuildInputs = [ packaging ];
propagatedBuildInputs = [
filelock
packaging
pyyaml
requests
ruamel-yaml
tqdm
typing-extensions
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
# Tests require network access.
doCheck = false;
pythonImportsCheck = [ "huggingface_hub" ];
pythonImportsCheck = [
"huggingface_hub"
];
meta = with lib; {
homepage = "https://github.com/huggingface/huggingface_hub";
description = "Download and publish models and other files on the huggingface.co hub";
homepage = "https://github.com/huggingface/huggingface_hub";
changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ];

7
pkgs/development/python-modules/pdf2image/default.nix
View File

@ -4,13 +4,18 @@ buildPythonPackage rec {
pname = "pdf2image";
version = "1.16.0";
propagatedBuildInputs = [ pillow poppler_utils ];
propagatedBuildInputs = [ pillow ];
src = fetchPypi {
inherit pname version;
sha256 = "d58ed94d978a70c73c2bb7fdf8acbaf2a7089c29ff8141be5f45433c0c4293bb";
};
postPatch = ''
# Only replace first match in file
sed -i '0,/poppler_path=None/s||poppler_path="${poppler_utils}/bin"|' pdf2image/pdf2image.py
'';
meta = with lib; {
description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object";
homepage = "https://github.com/Belval/pdf2image";

9
pkgs/development/python-modules/ua-parser/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, pyyaml }:
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "ua-parser";
@ -9,10 +9,15 @@ buildPythonPackage rec {
sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7";
};
propagatedBuildInputs = [ pyyaml ];
postPatch = ''
substituteInPlace setup.py \
--replace '"pyyaml"' ""
'';
doCheck = false; # requires files from uap-core
pythonImportsCheck = [ "ua_parser" ];
meta = with lib; {
description = "A python implementation of the UA Parser";
homepage = "https://github.com/ua-parser/uap-python";

13
pkgs/development/python-modules/uamqp/default.nix
View File

@ -27,6 +27,19 @@ buildPythonPackage rec {
./darwin-azure-c-shared-utility-corefoundation.patch
];
postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) ''
# force darwin aarch64 to use openssl instead of applessl, removing
# some quirks upstream thinks they need to use openssl on macos
sed -i \
-e '/^use_openssl =/cuse_openssl = True' \
-e 's/\bazssl\b/ssl/' \
-e 's/\bazcrypto\b/crypto/' \
setup.py
sed -i \
-e '/#define EVP_PKEY_id/d' \
src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c
'';
nativeBuildInputs = [
cmake
];

4
pkgs/development/tools/analysis/cppcheck/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "2.7.5";
version = "2.8";
src = fetchFromGitHub {
owner = "danmar";
repo = "cppcheck";
rev = version;
sha256 = "sha256-GRhQXGldirIhUBI4CucDTTxuZhG0XW0qp1FjYXhVS0o=";
sha256 = "sha256-2gPgsu4XOPAEsxGNoDFl2Q7Vr/58SI98FnPeKZMv0go=";
};
buildInputs = [ pcre

27
pkgs/development/tools/ejson/default.nix
View File

@ -1,4 +1,4 @@
{ lib, bundlerEnv, ruby, buildGoPackage, fetchFromGitHub }:
{ lib, bundlerEnv, ruby, buildGoModule, fetchFromGitHub }:
let
# needed for manpage generation
gems = bundlerEnv {
@ -6,27 +6,27 @@ let
gemdir = ./.;
inherit ruby;
};
in buildGoPackage rec {
in
buildGoModule rec {
pname = "ejson";
version = "1.2.1";
rev = "v${version}";
nativeBuildInputs = [ gems ];
goPackagePath = "github.com/Shopify/ejson";
subPackages = [ "cmd/ejson" ];
version = "1.3.3";
src = fetchFromGitHub {
owner = "Shopify";
repo = "ejson";
inherit rev;
sha256 = "09356kp059hbzmqpzlz4b3agg93yqqygh5l5ddbxcsaqx4qiwdr7";
rev = "v${version}";
sha256 = "sha256-M2Gk+/l1tNlIAe1/fR1WLEOey+tjCUmMAujc76gmeZA=";
};
vendorSha256 = "sha256-9+x7HrbXRoS/7ZADWwhsbynQLr3SyCbcsp9QnSubov0=";
nativeBuildInputs = [ gems ];
ldflags = [ "-s" "-w" ];
# set HOME, otherwise bundler will insert stuff in the manpages
postBuild = ''
cd go/src/$goPackagePath
HOME=$PWD make man
HOME=$PWD make man SHELL=$SHELL
'';
postInstall = ''
@ -38,7 +38,6 @@ in buildGoPackage rec {
description = "A small library to manage encrypted secrets using asymmetric encryption";
license = licenses.mit;
homepage = "https://github.com/Shopify/ejson";
platforms = platforms.unix;
maintainers = [ maintainers.manveru ];
};
}

6
pkgs/development/tools/wasm-bindgen-cli/default.nix
View File

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
version = "0.2.79";
version = "0.2.80";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-3kWhhzYmIo/GFieI0i7XVJIZxIaaJHHuDp38k5xcFmI=";
sha256 = "sha256-f3XRVuK892TE6xP7eq3aKpl9d3fnOFxLh+/K59iWPAg=";
};
cargoSha256 = "sha256-xKYdvcrx3a9AKiRU8yJ3JNQp1Q2pEufwo+in82yTV6c=";
cargoSha256 = "sha256-WJ5hPw2mzZB+GMoqo3orhl4fCFYKWXOWqaFj1EMrb2Q=";
nativeBuildInputs = [ pkg-config ];

8
pkgs/games/cutemaze/default.nix
View File

@ -4,6 +4,8 @@
, cmake
, qttools
, wrapQtAppsHook
, qtbase
, qtwayland
, qtsvg
}:
@ -22,7 +24,11 @@ stdenv.mkDerivation rec {
wrapQtAppsHook
];
buildInputs = [ qtsvg ];
buildInputs = [
qtbase
qtwayland
qtsvg
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications

9
pkgs/servers/computing/slurm/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl
, python3, munge, perl, pam, shadow, coreutils
, python3, munge, perl, pam, shadow, coreutils, dbus, libbpf
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, xorg, lz4, rdma-core, nixosTests
, pmix
@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "21.08.8.2";
version = "22.05.0.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "1n9gn879lff3iv2yi163fv2cwymgfqigh0jxs2kklc97g3nn23yx";
sha256 = "0bc8kycrc5a8kqffbd03k22z38f7z8fj725iniq8hz6srhf5nxgs";
};
outputs = [ "out" "dev" ];
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
curl python3 munge perl pam
libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi shadow.su
pmix json_c libjwt libyaml
pmix json_c libjwt libyaml dbus libbpf
] ++ lib.optionals enableX11 [ xorg.xauth ];
configureFlags = with lib;
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
"--with-ofed=${rdma-core}"
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"
"--with-bpf=${libbpf}"
] ++ (optional (gtk2 == null) "--disable-gtktest")
++ (optional (!enableX11) "--disable-x11");

36
pkgs/shells/powershell/getHashes.sh Executable file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash wget coreutils gnutar nix
version=$1
if [[ -z $version ]]
then
echo "Pass the version to get hashes for as an argument"
exit 1
fi
allOutput=""
dlDest=$(mktemp)
exDest=$(mktemp -d)
trap 'rm $dlDest; rm -r $exDest' EXIT
for plat in osx linux; do
for arch in x64 arm64; do
URL="https://github.com/PowerShell/PowerShell/releases/download/v$version/powershell-$version-$plat-$arch.tar.gz"
wget $URL -O $dlDest >&2
tar -xzf $dlDest -C $exDest >&2
hash=$(nix hash path $exDest)
allOutput+="
variant: $plat $arch
hash: $hash
"
done
done
echo "$allOutput"

67
pkgs/tools/networking/magic-wormhole-rs/Cargo.toml.patch
View File

@ -1,67 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index d33b5d6..ddde8ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -150,33 +150,6 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "async-std"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952"
-dependencies = [
- "async-channel",
- "async-global-executor",
- "async-io",
- "async-lock",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "num_cpus",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
[[package]]
name = "async-std"
version = "1.10.0"
@@ -230,7 +203,7 @@ version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5682ea0913e5c20780fe5785abacb85a411e7437bf52a1bedb93ddb3972cb8dd"
dependencies = [
- "async-std 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-std",
"async-tls",
"futures-io",
"futures-util",
@@ -1154,7 +1127,7 @@ name = "magic-wormhole"
version = "0.3.0"
dependencies = [
"async-io",
- "async-std 1.10.0 (git+https://github.com/async-rs/async-std)",
+ "async-std",
"async-tungstenite",
"base64",
"bytecodec",
diff --git a/Cargo.toml b/Cargo.toml
index b4ff2c0..d4094af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -82,3 +82,6 @@ required-features = ["bin"]
[profile.release]
overflow-checks = true
+
+[patch.crates-io]
+async-std = { version = "1.9.0", features = ["attributes", "unstable"], git = "https://github.com/async-rs/async-std" }

18
pkgs/tools/networking/magic-wormhole-rs/default.nix
View File

@ -2,23 +2,25 @@
, stdenv
, fetchFromGitHub
, rustPlatform
, libxcb
, Security
, AppKit
}:
rustPlatform.buildRustPackage rec {
pname = "magic-wormhole-rs";
version = "0.3.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "magic-wormhole";
repo = "magic-wormhole.rs";
rev = version;
sha256 = "sha256-i4vJ6HmtM42m1x1UtOq9xlmhYIa5ZKXUm1rGFNRprmY=";
sha256 = "sha256-+H/IzMxiGz7UVVkEWpmyBepGET9doQFNDvOCZEMF0p4=";
};
# this patch serves as a workaround for the problems of cargo-vendor described in
# https://github.com/NixOS/nixpkgs/issues/30742
# and can probably be removed once the issue is resolved
cargoPatches = [ ./Cargo.toml.patch ];
cargoSha256 = "sha256-ujwvwr4GR/rQWnXFfL8sqPyz4QvGeOxwBrT+gf+vjsI=";
cargoSha256 = "sha256-pRdb5NSqueHmK5vbZfmbDGOz7NQvmUI/pj9KgShiIn0=";
buildInputs = [ libxcb ]
++ lib.optionals stdenv.isDarwin [ Security AppKit ];
# all tests involve networking and are bound fail
doCheck = false;
@ -27,7 +29,9 @@ rustPlatform.buildRustPackage rec {
broken = stdenv.isDarwin;
description = "Rust implementation of Magic Wormhole, with new features and enhancements";
homepage = "https://github.com/magic-wormhole/magic-wormhole.rs";
changelog = "https://github.com/magic-wormhole/magic-wormhole.rs/raw/${version}/changelog.md";
license = licenses.eupl12;
maintainers = with maintainers; [ zeri piegames ];
mainProgram = "wormhole-rs";
};
}

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

@ -25753,6 +25753,8 @@ with pkgs;
curseradio = callPackage ../applications/audio/curseradio { };
curtail = callPackage ../applications/graphics/curtail { };
cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
cvs = callPackage ../applications/version-management/cvs { };
@ -27980,7 +27982,9 @@ with pkgs;
magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
magic-wormhole-rs = callPackage ../tools/networking/magic-wormhole-rs/default.nix { };
magic-wormhole-rs = callPackage ../tools/networking/magic-wormhole-rs {
inherit (darwin.apple_sdk.frameworks) Security AppKit;
};
magnetophonDSP = lib.recurseIntoAttrs {
CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
@ -35329,7 +35333,9 @@ with pkgs;
webwormhole = callPackage ../tools/networking/webwormhole { };
werf = callPackage ../applications/networking/cluster/werf { };
werf = callPackage ../applications/networking/cluster/werf {
buildGoModule = buildGo118Module;
};
wifi-password = callPackage ../os-specific/darwin/wifi-password {};