nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
; Conflicts:
;	pkgs/development/lisp-modules-new/ql.nix
This commit is contained in:
Jan Tojnar
2022-11-15 13:02:43 +01:00
parent 1f4c790f71 8c8f38c136
commit 69782b499b
83 changed files with 1378 additions and 1184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/languages-frameworks/vim.section.md
View File

@@ -125,7 +125,7 @@ If one of your favourite plugins isn't packaged, you can package it yourself:
{ config, pkgs, ... }:
let
easygrep = pkgs.vimUtils.buildVimPlugin {
easygrep = pkgs.vimUtils.buildVimPluginFrom2Nix {
name = "vim-easygrep";
src = pkgs.fetchFromGitHub {
owner = "dkprice";
@@ -155,6 +155,8 @@ in
}
```
If your package requires building specific parts, use instead `pkgs.vimUtils.buildVimPlugin`.
### Specificities for some plugins
#### Treesitter

26
nixos/modules/services/web-servers/nginx/default.nix
View File

@@ -198,8 +198,8 @@ let
${optionalString cfg.statusPage ''
server {
listen 80;
${optionalString enableIPv6 "listen [::]:80;" }
listen ${cfg.defaultHTTPListenPort};
${optionalString enableIPv6 "listen [::]:${cfg.defaultHTTPListenPort};" }
server_name localhost;
@@ -246,8 +246,8 @@ let
if vhost.listen != [] then vhost.listen
else
let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else cfg.defaultListenAddresses;
in optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs)
++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs);
in optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = cfg.defaultSSLListenPort; ssl = true; }) addrs)
++ optionals (!onlySSL) (map (addr: { inherit addr; port = cfg.defaultHTTPListenPort; ssl = false; }) addrs);
hostListen =
if vhost.forceSSL
@@ -449,6 +449,24 @@ in
'';
};
defaultHTTPListenPort = mkOption {
type = types.port;
default = 80;
example = 8080;
description = lib.mdDoc ''
If vhosts do not specify listen.port, use these ports for HTTP by default.
'';
};
defaultSSLListenPort = mkOption {
type = types.port;
default = 443;
example = 8443;
description = lib.mdDoc ''
If vhosts do not specify listen.port, use these ports for SSL by default.
'';
};
package = mkOption {
default = pkgs.nginxStable;
defaultText = literalExpression "pkgs.nginxStable";

6
nixos/modules/tasks/filesystems.nix
View File

@@ -300,7 +300,11 @@ in
boot.supportedFilesystems = map (fs: fs.fsType) fileSystems;
# Add the mount helpers to the system path so that `mount' can find them.
system.fsPackages = [ pkgs.dosfstools ];
system.fsPackages = [
pkgs.dosfstools
# This is needed for the main fsck utility wrapping the fs-specific ones.
pkgs.util-linux
];
environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages;

6
pkgs/applications/audio/sony-headphones-client/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "SonyHeadphonesClient";
version = "1.2";
version = "1.3.1";
src = fetchFromGitHub {
owner = "Plutoberth";
repo = "SonyHeadphonesClient";
rev = "v${version}";
sha256 = "sha256-oejXrs9X+R6Jydro0XIw2XifzFA7asDhpobtaE3//Hc=";
hash = "sha256-0DQanrglJiGsN8qQ5KxkL8I+Fpt1abeeuKiM8v9GclM=";
fetchSubmodules = true;
};
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-Wno-dev" ];
patches = [ ./gcc.patch ];
postPatch = ''
substituteInPlace Constants.h \
--replace "UNKNOWN = -1" "// UNKNOWN removed since it doesn't fit in char"

19
pkgs/applications/audio/sony-headphones-client/gcc.patch
View File

@@ -1,19 +0,0 @@
diff --git a/SingleInstanceFuture.h b/SingleInstanceFuture.h
index 8af733f..d2e6c49 100644
--- a/SingleInstanceFuture.h
+++ b/SingleInstanceFuture.h
@@ -12,13 +12,13 @@ template <class T>
class SingleInstanceFuture : public std::future<T>
{
public:
- SingleInstanceFuture<T>() = default;
+ SingleInstanceFuture(void) = default;
template<class Func, class... Args>
void setFromAsync(Func func, Args&&... args) noexcept(false);
bool ready();
private:
- SingleInstanceFuture<T>(std::future<T> other);
+ SingleInstanceFuture(std::future<T> other);
SingleInstanceFuture<T> operator=(std::future<T>& other);
};

10
pkgs/applications/audio/spotifywm/default.nix
View File

@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
stdenv.mkDerivation {
pname = "spotifywm-unstable";
version = "2016-11-28";
version = "2022-10-26";
src = fetchFromGitHub {
owner = "dasJ";
repo = "spotifywm";
rev = "91dd5532ffb7a398d775abe94fe7781904ab406f";
sha256 = "01z088i83410bpx1vbp7c6cq01r431v55l7340x3izp53lnpp379";
owner = "dasJ";
repo = "spotifywm";
rev = "8624f539549973c124ed18753881045968881745";
sha256 = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=";
};
buildInputs = [ xorg.libX11 ];

11
pkgs/applications/blockchains/alfis/default.nix
View File

@@ -2,6 +2,7 @@
, lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, pkg-config
, makeWrapper
, webkitgtk
@@ -23,7 +24,15 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-QOKFnre5MW9EvrKrKBHWpOxi2fBKTDMhzCDX3ISd2cQ=";
};
cargoSha256 = "sha256-D+3HIyj1zbs5m8hwLpITS25u/wrRM5GfnwlUUuLX8DQ=";
cargoPatches = [
(fetchpatch {
name = "bump-rust-web-view.patch";
url = "https://github.com/Revertron/Alfis/commit/03b461a740ab6ccbacd576eafc7a3faf4a66648f.patch";
sha256 = "sha256-CSqSMdVD31w7QxxXWtjKmqlaEirmbs1EVuiefSf1NKY=";
})
];
cargoSha256 = "sha256-B4xI++U6RCljXCyaOmNj/SwA6I16zoiZsgk2VTiKfkg=";
checkFlags = [
# these want internet access, disable them

792
pkgs/applications/editors/vim/plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

82
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@@ -75,12 +75,12 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "5b60f99";
version = "3ef3f7f";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "5b60f99545fea00a33bbfae5be956f684c4c69e2";
hash = "sha256-4R6+15ZbtC/LtSHpk7DqcMiFYjht+062Av31spK07rc=";
rev = "3ef3f7f99e16e528e6689eae44dff35150993307";
hash = "sha256-xBRSwuodQTrKHjwx3JVgnwsAkp9EO+6su3hc2d+6DBQ=";
};
};
clojure = buildGrammar {
@@ -209,12 +209,12 @@
};
dockerfile = buildGrammar {
language = "dockerfile";
version = "25c71d6";
version = "f913be9";
source = fetchFromGitHub {
owner = "camdencheek";
repo = "tree-sitter-dockerfile";
rev = "25c71d6a24cdba8f0c74ef40d4d2d93defd7e196";
hash = "sha256-Y6RvFXKryFH+NF87YKa8QIgB+Dh871cfuM/em0b4ks4=";
rev = "f913be9bb8689af22114605012693146fbe9ddaa";
hash = "sha256-EoZDjUyL4dEwE6E9r9KruQ8Kb83bAyyFq7a/NFBdZjU=";
};
};
dot = buildGrammar {
@@ -269,12 +269,12 @@
};
embedded_template = buildGrammar {
language = "embedded_template";
version = "1a538da";
version = "91fc5ae";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-embedded-template";
rev = "1a538da253d73f896b9f6c0c7d79cda58791ac5c";
hash = "sha256-vebevlTAISkHhNcv89tzSXJX3DsGakxWaxxmv9KU40g=";
rev = "91fc5ae1140d5c9d922312431f7d251a48d7b8ce";
hash = "sha256-WAMCwKS+gOvBVC9h0qKHLgNedCRQwbJV+++SDqHhK5g=";
};
};
erlang = buildGrammar {
@@ -533,12 +533,12 @@
};
hocon = buildGrammar {
language = "hocon";
version = "bb412e2";
version = "c390f10";
source = fetchFromGitHub {
owner = "antosha417";
repo = "tree-sitter-hocon";
rev = "bb412e2633f4a3611a4e16efe58d917093bb4782";
hash = "sha256-ujVznEMWnhUjWZS+LAZZYba1Ybs2oLg/iCHPba1TZcQ=";
rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc";
hash = "sha256-9Zo3YYoo9mJ4Buyj7ofSrlZURrwstBo0vgzeTq1jMGw=";
};
};
html = buildGrammar {
@@ -633,12 +633,12 @@
};
julia = buildGrammar {
language = "julia";
version = "8fb38ab";
version = "58d0701";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
rev = "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25";
hash = "sha256-G619Zlb2uL2PskYKNqoG6XXBxRipeGFU4eOLw7u3BRo=";
rev = "58d0701550b4cce02acf433eedada03b634cc524";
hash = "sha256-ywliyXSL6A/NtqPnjRU++4C26H9MO6slz/3bIYFgGp4=";
};
};
kotlin = buildGrammar {
@@ -859,12 +859,12 @@
};
perl = buildGrammar {
language = "perl";
version = "ff5c310";
version = "749d26f";
source = fetchFromGitHub {
owner = "ganezdragon";
repo = "tree-sitter-perl";
rev = "ff5c3108083af6fcb7575e32a7558b8165a05bcd";
hash = "sha256-ETlvojT2X8gg323zxxNBpNqJ4ARVeo5ICKxRXUpzTv8=";
rev = "749d26fe13fb131b92e6515416096e572575b981";
hash = "sha256-VOLvfgh1ZbuDk1BKBW9ln/9b/seudFv0PTIOFe1AtNE=";
};
};
php = buildGrammar {
@@ -969,22 +969,22 @@
};
r = buildGrammar {
language = "r";
version = "0f4f66e";
version = "80efda5";
source = fetchFromGitHub {
owner = "r-lib";
repo = "tree-sitter-r";
rev = "0f4f66e5050037b759ea040dafd596bcdda1de94";
hash = "sha256-5rgc1ZmzFT3Hgv0GKVu5Ns21Nc3Ck8NW2naslvKzguM=";
rev = "80efda55672d1293aa738f956c7ae384ecdc31b4";
hash = "sha256-qUfyITSZRnSm4zZHfkM/Dm5AeFEFLcCtRrInx0Xs/tg=";
};
};
racket = buildGrammar {
language = "racket";
version = "69ca563";
version = "09cb27a";
source = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-racket";
rev = "69ca563af3bcf9d67220532e0814786f2dc34db1";
hash = "sha256-GLBi/NM7dFsPtmZWbFm/vM0gOwqbihOqXnxMR5k8hWE=";
rev = "09cb27a06415bce529a26774a842f5a80d50d362";
hash = "sha256-+chEzpHh4eBTEpx2+sFXDMco18zNPFUu5HMQ3dB+LwI=";
};
};
rasi = buildGrammar {
@@ -1049,12 +1049,12 @@
};
rust = buildGrammar {
language = "rust";
version = "47b061c";
version = "0431a2c";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "47b061c1e1ba3a7e9c2f450363a50e87de3f7c61";
hash = "sha256-v6ExAQxXIOeLfCjxbIhVEd7XBCkXHCiukRyrUqEBxIA=";
rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9";
hash = "sha256-DnUq8TwLGPtN1GXw0AV2t+tj7UKrU4kU32rjGoCHMpE=";
};
};
scala = buildGrammar {
@@ -1069,12 +1069,12 @@
};
scheme = buildGrammar {
language = "scheme";
version = "af0fd1f";
version = "bdcd2c8";
source = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-scheme";
rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9";
hash = "sha256-K3+zmykjq2DpCnk17Ko9LOyGQTBZb1/dgVXIVynCYd4=";
rev = "bdcd2c8496701153506a9e3e1b76dfed852873ba";
hash = "sha256-KfcWGE92nx9lrs3V/lKeE0pPqCqFC/mHamkyryrcdoo=";
};
};
scss = buildGrammar {
@@ -1159,14 +1159,14 @@
};
swift = buildGrammar {
language = "swift";
version = "d7808f0";
version = "25f8de3";
source = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
nativeBuildInputs = [ nodejs tree-sitter ];
postFetch = "pushd $out && tree-sitter generate && popd";
rev = "d7808f030a44dc8768948042baa7566949785e2f";
hash = "sha256-7Gjpf2isOpeOV3ZMTMibK+F4C4v8ywOPin2Wv86s+AM=";
rev = "25f8de356e3c33099ed691bd3b8b5c0fe3a11e15";
hash = "sha256-KCmEE5O7EAA0uUcYkM/FpeEIn9tOqrJosSpYsBvivOk=";
};
};
sxhkdrc = buildGrammar {
@@ -1275,12 +1275,12 @@
};
v = buildGrammar {
language = "v";
version = "d0e7c75";
version = "66b92a8";
source = fetchFromGitHub {
owner = "vlang";
repo = "vls";
rev = "d0e7c755193c762eb1521e3b4740b22929cc91cc";
hash = "sha256-d1NeZixsN9992Q1UC5ZKGN4LNxlsvdL91QW2K8d1J9Y=";
rev = "66b92a89ef1e149300df79c0b2a934ad959c8eec";
hash = "sha256-R6Irz3sdyzKH1qWOUwUYK1OKhYs0PUYS/azYn/nb6jk=";
};
location = "tree_sitter_v";
};
@@ -1304,6 +1304,16 @@
hash = "sha256-l4DgThuP9EFU55YQ9lgvVP/8pXojOllQ870gRsBF3FE=";
};
};
vhs = buildGrammar {
language = "vhs";
version = "2f87b9d";
source = fetchFromGitHub {
owner = "charmbracelet";
repo = "tree-sitter-vhs";
rev = "2f87b9d973597e69552ecf6a4fe16470fbd8c44e";
hash = "sha256-G1ytXVBeGN1606aFrPdNFp3Khlg/BTFq2VS176Knb7k=";
};
};
vim = buildGrammar {
language = "vim";
version = "4ae7bd6";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@@ -652,6 +652,7 @@ https://github.com/nvim-telescope/telescope-fzf-native.nvim/,,
https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,,
https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
https://github.com/nvim-telescope/telescope-github.nvim/,,
https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD,
https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
https://github.com/MrcJkb/telescope-manix/,HEAD,
https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,

1
pkgs/applications/misc/darkman/default.nix
View File

@@ -45,5 +45,6 @@ buildGoModule rec {
homepage = "https://gitlab.com/WhyNotHugo/darkman";
license = licenses.isc;
maintainers = [ maintainers.ajgrf ];
platforms = platforms.linux;
};
}

15
pkgs/applications/misc/gammu/default.nix
View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite
{ lib, stdenv, fetchFromGitHub, substituteAll, pkg-config, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite, bash, dialog
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
, postgresSupport ? false, postgresql ? null
}:
@@ -17,13 +17,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I=";
};
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
patches = [
./bashcomp-dir.patch
./systemd.patch
(substituteAll {
src = ./gammu-config-dialog.patch;
dialog = "${dialog}/bin/dialog";
})
];
nativeBuildInputs = [ pkg-config cmake ];
strictDeps = true;
buildInputs = [ bluez libusb1 curl gettext sqlite libiconv ]
buildInputs = [ bash bluez libusb1 curl gettext sqlite libiconv ]
++ optionals dbiSupport [ libdbi libdbiDrivers ]
++ optionals postgresSupport [ postgresql ];

20
pkgs/applications/misc/gammu/gammu-config-dialog.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/utils/gammu-config
+++ b/utils/gammu-config
@@ -59,16 +59,7 @@
shift
done
-if type dialog > /dev/null 2>&1 ; then
- DIALOG=dialog
-elif type cdialog > /dev/null 2>&1 ; then
- DIALOG=cdialog
-elif type whiptail > /dev/null 2>&1 ; then
- DIALOG=whiptail
-else
- echo "You need dialog, cdialog or whiptail installed to make this work"
- exit 1
-fi
+DIALOG=@dialog@
if [ -f "$CONFIG" ] ; then
if [ ! -w "$CONFIG" ] ; then

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

@@ -19,13 +19,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2022.09.22-3";
version = "2022.11.02-2";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-b+XPsKeDVj3crOTxb52CxXmldkurVlNcZ/ODuJIbQ2A=";
sha256 = "sha256-E/lJDw1QMPT0QcaTOxEyJL4hmEFkq21vQkgZbssszJg=";
fetchSubmodules = true;
};

22
pkgs/applications/misc/tellico/default.nix
View File

@@ -1,5 +1,5 @@
{ lib
, fetchurl
, fetchFromGitLab
, mkDerivation
, cmake
, exempi
@@ -24,17 +24,21 @@
mkDerivation rec {
pname = "tellico";
version = "3.4.1";
version = "3.4.4";
src = fetchurl {
# version 3.3.0 just uses 3.3 in its file name
urls = [
"https://tellico-project.org/files/tellico-${version}.tar.xz"
"https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz"
];
sha256 = "sha256-+FFN6sO0mvlage8JazyrqNZk4onejz1XJPiOK3gnhWE=";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "office";
repo = pname;
rev = "v${version}";
hash = "sha256-Qgan0mnDTQx+KKCAnRpgi9CCbXIRBMQtAyH/Mr20VSw=";
};
postPatch = ''
substituteInPlace src/gui/imagewidget.h \
--replace ksane_version.h KF5/ksane_version.h
'';
nativeBuildInputs = [
cmake
extra-cmake-modules

1
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@@ -204,6 +204,7 @@ stdenv.mkDerivation {
else "https://archive.mozilla.org/pub/firefox/releases/";
};
meta = with lib; {
changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
description = "Mozilla Firefox, free web browser (binary package)";
homepage = "https://www.mozilla.org/firefox/";
license = licenses.mpl20;

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

19
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,22 +3,14 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "106.0.5";
version = "107.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "879b054340d632c5d972888ceb67da0d02f28f6755e9683c8e4e7fb71b55bde0e588b98e24bae448ffea8ddd3e30c44dc0563554ecd69506862796a64ca040d7";
sha512 = "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e";
};
# This patch could be applied anywhere (just rebuild, no effect)
extraPatches = lib.optionals stdenv.isAarch64 [
(fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1791275
name = "no-sysctl-aarch64.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/0efaf5a00aaceeed679885e4cd393bd9a5fcd0ff";
hash = "sha256-wS/KufeLFxCexQalGGNg8+vnQhzDiL79OLt8FtL/JJ8=";
})
];
meta = {
changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
description = "A web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ lovesegfault hexa ];
@@ -37,14 +29,15 @@ rec {
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.4.0esr";
version = "102.5.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "30d9e6ef04fd86516e2cea3c797ec99af4c96b08576bb3409c0026da4fd1218167f89a007109e1fa4e2571f98f2dbe5ab58a26473533d45301f75b90ec3dbf28";
sha512 = "f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13";
};
meta = {
changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
description = "A web browser built from Firefox Extended Support Release source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ hexa ];

17
pkgs/applications/networking/cloudflare-dyndns/default.nix
View File

@@ -1,17 +1,10 @@
{ lib
, buildPythonApplication
, attrs
, click
, cloudflare
, python3
, fetchFromGitHub
, fetchpatch
, poetry-core
, pydantic
, pytestCheckHook
, requests
}:
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "cloudflare-dyndns";
version = "4.1";
format = "pyproject";
@@ -23,11 +16,11 @@ buildPythonApplication rec {
hash = "sha256-6Q5fpJ+HuQ+hc3xTtB5tR43pn9WZ0nZZR723iLAkpis=";
};
nativeBuildInputs = [
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
attrs
click
cloudflare
@@ -35,7 +28,7 @@ buildPythonApplication rec {
requests
];
checkInputs = [
checkInputs = with python3.pkgs; [
pytestCheckHook
];

3
pkgs/applications/networking/cluster/fn-cli/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, docker }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, docker }:
buildGoModule rec {
pname = "fn";
@@ -32,5 +32,6 @@ buildGoModule rec {
homepage = "https://fnproject.io";
license = licenses.asl20;
maintainers = [ maintainers.c4605 ];
broken = stdenv.isDarwin;
};
}

16
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@@ -30,13 +30,13 @@
"version": "0.1.1"
},
"aiven": {
"hash": "sha256-+Uzz2eu873lh707/zADfMK/4D5wDMxXZtAf0RU6V42M=",
"hash": "sha256-2QdpXNCnnYh75CyqeKJbYgFB63TCcMrWlUPLe/puvOw=",
"owner": "aiven",
"provider-source-address": "registry.terraform.io/aiven/aiven",
"repo": "terraform-provider-aiven",
"rev": "v3.8.0",
"vendorHash": "sha256-F+zF9xqHNCXrGxOjEoe8gaGS0C7EO0s61CjN9+9PiYk=",
"version": "3.8.0"
"rev": "v3.8.1",
"vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=",
"version": "3.8.1"
},
"akamai": {
"hash": "sha256-QbCDaDII+xEA3lXjODsz8jai2mg3N/3uC4fruiLqvWc=",
@@ -777,13 +777,13 @@
"version": "0.6.12"
},
"newrelic": {
"hash": "sha256-C8lWtFECZrtj6ZyurbysZnCMfX1uJWhO4r188Wobg/M=",
"hash": "sha256-TZM7MRdc3Fok2e8FR04ccC19rd1OXvrRnm6yQRRhXJU=",
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.6.1",
"vendorHash": "sha256-lEFcR908CK4RSSO/3kbqQ/wse5HKaqveWUZbzUhUTMI=",
"version": "3.6.1"
"rev": "v3.7.0",
"vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=",
"version": "3.7.0"
},
"nomad": {
"hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",

4
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@@ -25,13 +25,13 @@
, libvpx
}:
stdenv.mkDerivation rec {
version = "2.8.2";
version = "2.9.0";
pname = "baresip";
src = fetchFromGitHub {
owner = "baresip";
repo = "baresip";
rev = "v${version}";
sha256 = "sha256-+hkV9s4ORm4Kqu9zBmxtFZJFG3gh70OOxpjix052bM0=";
sha256 = "sha256-B4d8D4IfLYAIYVN80Lrh5bywD5iacSnUVwEzbc6Xq7g=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@@ -21,12 +21,12 @@
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.2.8";
version = "2.2.9";
outputs = [ "out" "doc" "info" ];
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "A/PSN6LuKh0WM2QXyaXxe0nPcEXu/qYCHwggu/hdClM=";
sha256 = "+lMbIx1Y/h8wztoO1iZoPqnr37ds5H74uyfC93Qiz/s=";
};
patches = lib.optional smimeSupport (fetchpatch {

1
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@@ -205,6 +205,7 @@ stdenv.mkDerivation {
};
meta = with lib; {
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
description = "Mozilla Thunderbird, a full-featured email client (binary package)";
homepage = "http://www.mozilla.org/thunderbird/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];

1
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View File

@@ -19,6 +19,7 @@ rec {
];
meta = with lib; {
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
description = "A full-featured e-mail client";
homepage = "https://thunderbird.net/";
maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ];

4
pkgs/applications/office/qownnotes/default.nix
View File

@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "22.10.2";
version = "22.11.4";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
hash = "sha256-cHUkMrfVrdQXKrmK2jcNT6CHw0+VEWc1tp1XGuI0XcQ=";
hash = "sha256-oZLbplYn1AYCv/fPb2dotpQeb8MITx7F5Tc4Wxd65Ew=";
};
nativeBuildInputs = [ qmake qttools ];

3
pkgs/applications/science/chemistry/element/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "element";
@@ -18,5 +18,6 @@ buildGoModule rec {
homepage = "https://github.com/gennaro-tedesco/element";
license = licenses.asl20;
maintainers = [ maintainers.j0hax ];
broken = stdenv.isDarwin;
};
}

4
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "2.20.0";
version = "2.20.2";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-g83JuV+RPtuQJoxcMgMlZbHftqohA9frIk/y89/PucY=";
sha256 = "sha256-atUC6vb/tOO2GapMjTqFi4qjDAdSf2F8v3gZuzyt+9Q=";
};
vendorSha256 = "sha256-FSniCYr3emV9W/BuEkWe0a4aZ5RCoZJc7+K+f2q49ys=";

4
pkgs/applications/version-management/got/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.78";
version = "0.79";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
sha256 = "sha256-fi0YF0YCOtzA02Ix42BU6fi1UKgF/X6mG3S0fP/ZwxE=";
sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw=";
};
nativeBuildInputs = [ pkg-config bison ];

13
pkgs/applications/version-management/mercurial/default.nix
View File

@@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.2.3";
version = "6.3.0";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-mNGuAC9orfU9ZcWUf+i3o3n5jPBdm46h9Ad9LKXc6ds=";
sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg=";
};
format = "other";
@@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-UWYXVPdEMITLNdBjnoo8IuLOGZiwUJL+dqSl26nf5qs=";
sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@@ -149,9 +149,6 @@ let
# doesn't like the extra setlocale warnings emitted by our bash wrappers
test-locale.t
# Python 3.10 error message change https://bz.mercurial-scm.org/show_bug.cgi?id=6643
test-http-bad-server.t
# Python 3.10-3.12 deprecation warning: distutils
# https://bz.mercurial-scm.org/show_bug.cgi?id=6729
test-hghave.t
@@ -159,6 +156,10 @@ let
# Python 3.10-3.12 deprecation warning: asyncore
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t
# Test broken with recent versions of git due to default policy change
# https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302
test-convert-git.t
EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg"

31
pkgs/applications/virtualization/ecs-agent/default.nix
View File

@@ -1,27 +1,30 @@
{ lib, fetchFromGitHub, buildGoPackage }:
{ lib, fetchFromGitHub, buildGoModule }:
buildGoPackage rec {
pname = "amazon-ecs-agent";
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.66.2";
goPackagePath = "github.com/aws/${pname}";
subPackages = [ "agent" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
sha256 = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik=";
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik=";
};
vendorHash = null;
modRoot = "./agent";
excludedPackages = [ "./version/gen" ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
homepage = "https://github.com/aws/amazon-ecs-agent";
changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md";
license = licenses.asl20;
platforms = platforms.unix;
homepage = "https://github.com/aws/amazon-ecs-agent";
changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ copumpkin ];
mainProgram = "agent";
};

4
pkgs/desktops/mate/caja-extensions/default.nix
View File

@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./hardcode-gsettings.patch;
CAJA_GSETTINGS_PATH = glib.getSchemaPath mate.caja;
TERM_GSETTINGS_PATH = glib.getSchemaPath mate.mate-terminal;
caja_gsetttings_path = glib.getSchemaPath mate.caja;
desktop_gsetttings_path = glib.getSchemaPath mate.mate-desktop;
})
];

8
pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch
View File

@@ -53,7 +53,7 @@ index e14a9bf..691afab 100644
+ GSettingsSchemaSource* schema_source;
+ GSettingsSchema* schema;
+
+ schema_source = g_settings_schema_source_new_from_directory("@CAJA_GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@caja_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
@@ -74,7 +74,7 @@ index e14a9bf..691afab 100644
+ GSettingsSchemaSource* schema_source;
+ GSettingsSchema* schema;
+
+ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
@@ -95,7 +95,7 @@ index e14a9bf..691afab 100644
+ GSettingsSchemaSource* schema_source;
+ GSettingsSchema* schema;
+
+ schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
@@ -155,7 +155,7 @@ index 3119e9f..4f80c88 100644
filename = g_filename_from_uri(uri, NULL, NULL);
- settings = g_settings_new (WP_SCHEMA);
+ schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@",
+ schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",
+ g_settings_schema_source_get_default(),
+ TRUE, NULL);
+ schema = g_settings_schema_source_lookup(schema_source,

2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.files.dockitem Normal file
View File

@@ -0,0 +1,2 @@
[PlankDockItemPreferences]
Launcher=file:///run/current-system/sw/share/applications/io.elementary.files.desktop

2
pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
View File

@@ -1,2 +1,2 @@
[net.launchpad.plank.dock.settings]
dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
dock-items=['gala-multitaskingview.dockitem','io.elementary.files.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']

14
pkgs/development/compilers/neko/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
{ lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
}:
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g";
};
patches = [
# https://github.com/HaxeFoundation/neko/pull/224
(fetchpatch {
url = "https://github.com/HaxeFoundation/neko/commit/ff5da9b0e96cc0eabc44ad2c10b7a92623ba49ee.patch";
sha256 = "sha256-isM7QGPiyXgT2zpIGd+r12vKg7I1rOWYTTWxuECafro=";
})
];
nativeBuildInputs = [ cmake pkg-config git ];
buildInputs =
[ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
@@ -26,7 +34,9 @@ stdenv.mkDerivation rec {
bin/neko bin/test.n
'';
doInstallCheck = true;
# Called from tools/test.neko line 2
# Uncaught exception - Segmentation fault
doInstallCheck = !stdenv.isDarwin;
dontPatchELF = true;
dontStrip = true;

15
pkgs/development/interpreters/bats/libraries.nix
View File

@@ -10,8 +10,9 @@
};
dontBuild = true;
installPhase = ''
mkdir -p "$out/share/bats"
cp -r . "$out/share/bats/bats-assert"
mkdir -p "$out/share/bats/bats-assert"
cp load.bash "$out/share/bats/bats-assert"
cp -r src "$out/share/bats/bats-assert"
'';
meta = {
description = "Common assertions for Bats";
@@ -33,8 +34,9 @@
};
dontBuild = true;
installPhase = ''
mkdir -p "$out/share/bats"
cp -r . "$out/share/bats/bats-file"
mkdir -p "$out/share/bats/bats-file"
cp load.bash "$out/share/bats/bats-file"
cp -r src "$out/share/bats/bats-file"
'';
meta = {
description = "Common filesystem assertions for Bats";
@@ -56,8 +58,9 @@
};
dontBuild = true;
installPhase = ''
mkdir -p "$out/share/bats"
cp -r . "$out/share/bats/bats-support"
mkdir -p "$out/share/bats/bats-support"
cp load.bash "$out/share/bats/bats-support"
cp -r src "$out/share/bats/bats-support"
'';
meta = {
description = "Supporting library for Bats test helpers";

5
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@@ -17,7 +17,6 @@
, libGL ? null
, libGLU ? null
, wxGTK ? null
, wxmac ? null
, xorg ? null
, parallelBuild ? false
, systemd
@@ -72,7 +71,7 @@
}:
assert wxSupport -> (if stdenv.isDarwin
then wxmac != null
then wxGTK != null
else libGL != null && libGLU != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null;
@@ -80,7 +79,7 @@ assert javacSupport -> openjdk11 != null;
let
inherit (lib) optional optionals optionalAttrs optionalString;
wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
wxPackages2 = if stdenv.isDarwin then [ wxGTK ] else wxPackages;
in
stdenv.mkDerivation ({

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libfixposix";
version="0.4.3";
version="0.5.1";
src = fetchFromGitHub {
owner = "sionescu";
repo = "libfixposix";
rev = "v${version}";
sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j";
sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ];

28
pkgs/development/lisp-modules-new/import/database/sqlite.lisp
View File

@@ -71,6 +71,31 @@ getAttr = builtins.getAttr;
in {")
;; Random compilation errors
(defparameter +broken-packages+
(list
;; no dispatch function defined for #\t
"hu.dwim.logger"
"hu.dwim.serializer"
"hu.dwim.quasi-quote"
;; Tries to write in $HOME
"ubiquitous"
"math"
;; Upstream bad packaging, multiple systems in clml.blas.asd
"clml.blas.hompack"
;; Fails on SBCL due to heap exhaustion
"magicl"
;; Probably missing dependency in QL data
"mcclim-bezier"
;; Missing dependency on c2ffi cffi extension
"hu.dwim.zlib"
;; Missing libgvc.so native library
"hu.dwim.graphviz"
;; These require libRmath.so, but I don't know where to get it from
"cl-random"
"cl-random-tests"
))
(defmethod database->nix-expression ((database sqlite-database) outfile)
(sqlite:with-open-database (db (database-url database))
(with-open-file (f outfile
@@ -131,6 +156,7 @@ in {")
(remove "asdf"
(str:split-omit-nulls #\, deps)
:test #'string=))))
,@(when (find #\/ name)
,@(when (or (find #\/ name)
(find name +broken-packages+ :test #'string=))
'(("meta" (:attrs ("broken" (:symbol "true"))))))))))))
(format f "~%}~%"))))

37
pkgs/development/lisp-modules-new/imported.nix vendored
View File

@@ -20457,6 +20457,9 @@ in {
});
systems = [ "cl-random" ];
lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-num-utils" pkgs) (getAttr "cl-rmath" pkgs) (getAttr "cl-slice" pkgs) (getAttr "gsll" pkgs) (getAttr "let-plus" pkgs) (getAttr "lla" pkgs) ];
meta = {
broken = true;
};
};
cl-random-forest = {
pname = "cl-random-forest";
@@ -20496,6 +20499,9 @@ in {
});
systems = [ "cl-random-tests" ];
lispLibs = [ (getAttr "cl-random" pkgs) (getAttr "clunit" pkgs) ];
meta = {
broken = true;
};
};
cl-rdfxml = {
pname = "cl-rdfxml";
@@ -25092,6 +25098,9 @@ in {
});
systems = [ "clml.blas.hompack" ];
lispLibs = [ (getAttr "f2cl-lib" pkgs) ];
meta = {
broken = true;
};
};
clml_dot_blas_dot_real = {
pname = "clml.blas.real";
@@ -36543,10 +36552,6 @@ in {
});
systems = [ "gsll" ];
lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "foreign-array" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ];
meta = {
# needs "nativeLibs=nixpkgs.gsl" for libgslcblas.so and a way to set CFLAGS="-I gsl/include" or something similar
broken = true;
};
};
gt = {
pname = "gt";
@@ -37991,6 +37996,9 @@ in {
});
systems = [ "hu.dwim.graphviz" ];
lispLibs = [ (getAttr "cffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "metabang-bind" pkgs) ];
meta = {
broken = true;
};
};
hu_dot_dwim_dot_graphviz_dot_documentation = {
pname = "hu.dwim.graphviz.documentation";
@@ -38030,6 +38038,9 @@ in {
});
systems = [ "hu.dwim.logger" ];
lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "local-time" pkgs) ];
meta = {
broken = true;
};
};
hu_dot_dwim_dot_logger_plus_iolib = {
pname = "hu.dwim.logger+iolib";
@@ -38381,6 +38392,9 @@ in {
});
systems = [ "hu.dwim.quasi-quote" ];
lispLibs = [ (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ];
meta = {
broken = true;
};
};
hu_dot_dwim_dot_quasi-quote_dot_css = {
pname = "hu.dwim.quasi-quote.css";
@@ -38718,6 +38732,9 @@ in {
});
systems = [ "hu.dwim.serializer" ];
lispLibs = [ (getAttr "babel" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ];
meta = {
broken = true;
};
};
hu_dot_dwim_dot_serializer_dot_documentation = {
pname = "hu.dwim.serializer.documentation";
@@ -39379,6 +39396,9 @@ in {
});
systems = [ "hu.dwim.zlib" ];
lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) ];
meta = {
broken = true;
};
};
hu_dot_dwim_dot_zlib_slash_fancy = {
pname = "hu.dwim.zlib_fancy";
@@ -47305,6 +47325,9 @@ in {
});
systems = [ "math" ];
lispLibs = [ (getAttr "cl-utilities" pkgs) (getAttr "font-discovery" pkgs) (getAttr "gsll" pkgs) (getAttr "vgplot" pkgs) ];
meta = {
broken = true;
};
};
math_slash_appr = {
pname = "math_appr";
@@ -47717,6 +47740,9 @@ in {
});
systems = [ "mcclim-bezier" ];
lispLibs = [ (getAttr "flexichain" pkgs) (getAttr "clim" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "mcclim-clx" pkgs) (getAttr "mcclim-null" pkgs) (getAttr "mcclim-render" pkgs) ];
meta = {
broken = true;
};
};
mcclim-bezier_slash_clx = {
pname = "mcclim-bezier_clx";
@@ -68823,6 +68849,9 @@ in {
});
systems = [ "ubiquitous" ];
lispLibs = [ ];
meta = {
broken = true;
};
};
ubiquitous-concurrent = {
pname = "ubiquitous-concurrent";

16
pkgs/development/lisp-modules-new/patches/cl-freetype2-fix-grovel-includes.patch Normal file
View File

@@ -0,0 +1,16 @@
--- a/src/ffi/grovel/grovel-freetype.h
+++ b/src/ffi/grovel/grovel-freetype.h
@@ -2,7 +2,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <ftsystem.h>
-#include <fttypes.h>
-#include <ftlist.h>
-#include <ftimage.h>
+#include <freetype/ftsystem.h>
+#include <freetype/fttypes.h>
+#include <freetype/ftlist.h>
+#include <freetype/ftimage.h>
Diff finished. Mon Nov 14 22:41:57 2022

53
pkgs/development/lisp-modules-new/ql.nix
View File

@@ -22,6 +22,29 @@ let
cl-cairo2 = pkg: {
nativeLibs = [ cairo ];
};
cl-cairo2-xlib = pkg: {
nativeLibs = [ gtk2-x11 ];
};
cl-freetype2 = pkg: {
nativeLibs = [ freetype ];
nativeBuildInputs = [ freetype ];
patches = [ ./patches/cl-freetype2-fix-grovel-includes.patch ];
};
cl-pango = pkg: {
nativeLibs = [ pango ];
};
cl-gtk2-gdk = pkg: {
nativeLibs = [ gtk2-x11 ];
};
cl-gtk2-glib = pkg: {
nativeLibs = [ glib ];
};
cl-gtk2-pango = pkg: {
nativeLibs = [ pango ];
};
cl-rsvg2 = pkg: {
nativeLibs = [ librsvg ];
};
cl-cffi-gtk-gdk = pkg: {
nativeLibs = [ gtk3 ];
};
@@ -134,22 +157,38 @@ let
systems = [ "iolib" "iolib/os" "iolib/pathnames" ];
};
"cl-ana.hdf-cffi" = pkg: {
nativeBuildInputs = [ hdf5 ];
nativeLibs = [ hdf5 ];
nativeBuildInputs = [ pkgs.hdf5 ];
nativeLibs = [ pkgs.hdf5 ];
NIX_LDFLAGS = [ "-lhdf5" ];
};
gsll = pkg: {
nativeBuildInputs = [ gsl ];
nativeLibs = [ gsl ];
nativeBuildInputs = [ pkgs.gsl ];
nativeLibs = [ pkgs.gsl ];
};
cl-libyaml = pkg: {
nativeLibs = [ libyaml ];
nativeLibs = [ pkgs.libyaml ];
};
cl-libxml2 = pkg: {
nativeLibs = [ libxml2 ];
nativeLibs = [ pkgs.libxml2 ];
};
cl-readline = pkg: {
nativeLibs = [ readline ];
nativeLibs = [ pkgs.readline ];
};
pzmq = pkg: {
nativeBuildInputs = [ pkgs.zeromq ];
nativeLibs = [ pkgs.zeromq ];
};
pzmq-compat = pkg: {
nativeBuildInputs = [ pkgs.zeromq ];
nativeLibs = [ pkgs.zeromq ];
};
pzmq-examples = pkg: {
nativeBuildInputs = [ pkgs.zeromq ];
nativeLibs = [ pkgs.zeromq ];
};
pzmq-test = pkg: {
nativeBuildInputs = [ pkgs.zeromq ];
nativeLibs = [ pkgs.zeromq ];
};
};

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

@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "aiomysensors";
version = "0.3.2";
version = "0.3.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = pname;
rev = "v${version}";
hash = "sha256-XPvnZOshA+PdFOzOlJXMfRTRYSue0uHsNwQsCwv3WOU=";
hash = "sha256-VvGhFf9x257YdSmOxjztGZW9FLBNd028rH3+BvXAQ4o=";
};
nativeBuildInputs = [

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

@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "airthings-ble";
version = "0.5.2";
version = "0.5.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "vincegio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-EPzYIPoT5yAdobmdfaehOYhYeKM6NMpcNZWVR2Dac8k=";
hash = "sha256-5moJ/Pu1Ixy4s7mCbjxQYROafjHVDM2cmpg0imDznl0=";
};
postPatch = ''

15
pkgs/development/python-modules/apache-beam/default.nix
View File

@@ -5,6 +5,7 @@
, dill
, fastavro
, fetchFromGitHub
, fetchpatch
, freezegun
, grpcio
, grpcio-tools
@@ -53,6 +54,16 @@ buildPythonPackage rec {
sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0=";
};
patches = [
(fetchpatch {
# https://github.com/apache/beam/pull/24143
name = "fix-for-dill-0.3.6.patch";
url = "https://github.com/apache/beam/commit/7e014435b816015d21cc07f3f6c80809f3d8023d.patch";
hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk=";
stripLen = 2;
})
];
pythonRelaxDeps = [
# See https://github.com/NixOS/nixpkgs/issues/156957
"dill"
@@ -138,6 +149,10 @@ buildPythonPackage rec {
"apache_beam/runners/portability/flink_runner_test.py"
"apache_beam/runners/portability/samza_runner_test.py"
"apache_beam/runners/portability/spark_runner_test.py"
# Fails starting from dill 0.3.6 because it tries to pickle pytest globals:
# https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499.
"apache_beam/transforms/window_test.py"
];
disabledTests = [

39
pkgs/development/python-modules/asyncio_mqtt/default.nix
View File

@@ -1,15 +1,19 @@
{ lib
, anyio
, buildPythonPackage
, fetchFromGitHub
, paho-mqtt
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-scm
, typing-extensions
}:
buildPythonPackage rec {
pname = "asyncio-mqtt";
version = "0.13.0";
format = "setuptools";
version = "0.14.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -17,22 +21,47 @@ buildPythonPackage rec {
owner = "sbtinstruments";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-On4N5KPnbwYrJguWwBdrnaNq58ZeGIPYSFzIRBfojpQ=";
hash = "sha256-ByVslOx/XsxVan2/xdRi+wOQR9oVpIGtHPcHlIcHMEk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
paho-mqtt
] ++ lib.optionals (pythonOlder "3.10") [
typing-extensions
];
# Module will have tests starting with > 0.13.0
doCheck = false;
checkInputs = [
anyio
pytestCheckHook
];
pythonImportsCheck = [
"asyncio_mqtt"
];
disabledTests = [
# Tests require network access
"test_client_filtered_messages"
"test_client_unfiltered_messages"
"test_client_unsubscribe"
"test_client_will"
"test_client_tls_context"
"test_client_tls_params"
"test_client_username_password "
"test_client_logger"
"test_client_max_concurrent_outgoing_calls"
"test_client_websockets"
"test_client_pending_calls_threshold"
"test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls"
];
meta = with lib; {
description = "Idomatic asyncio wrapper around paho-mqtt";
homepage = "https://github.com/sbtinstruments/asyncio-mqtt";

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

@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "coconut";
version = "1.6.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "evhub";
repo = "coconut";
rev = "v${version}";
sha256 = "/397YGV6QWWmKfqr5hSvqRoPOu7Hx1Pak6rVPR3etzw=";
sha256 = "sha256-TkMwOE/Jug1zKjR1048o/Jmn8o9/oQPNqzwXYakwpgs=";
};
propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ];
@@ -29,7 +29,7 @@ buildPythonPackage rec {
# Currently most tests have performance issues
pytestFlagsArray = [
"tests/constants_test.py"
"coconut/tests/constants_test.py"
];
pythonImportsCheck = [ "coconut" ];

4
pkgs/development/python-modules/google-nest-sdm/default.nix
View File

@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
version = "2.0.0";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = "refs/tags/${version}";
sha256 = "sha256-af1oYeNEQdz6HivAhvQY0xm3J4s+uXpcdema37oG15U=";
hash = "sha256-gT8Zrjzzunm5nt0GHYY0z2ZxtKBSc6FXndlrStbwo64=";
};
propagatedBuildInputs = [

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

@@ -2,6 +2,7 @@
, aiofiles
, buildPythonPackage
, cached-property
, colorama
, fetchFromGitHub
, git
, pdm-pep517
@@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "griffe";
version = "0.23.0";
version = "0.24.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,7 +21,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = pname;
rev = version;
hash = "sha256-eoWOkAwAd3ab9+uUfAdrYhkheibfGYkuoNQX/3nS57w=";
hash = "sha256-Gcht9pmh15dvSHRsG9y82l4HoJ7l/gxbmrRh7Jow2Bs=";
};
postPatch = ''
@@ -34,7 +35,9 @@ buildPythonPackage rec {
pdm-pep517
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
propagatedBuildInputs = [
colorama
] ++ lib.optionals (pythonOlder "3.8") [
cached-property
];

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

@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "growattserver";
version = "1.2.3";
version = "1.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "indykoning";
repo = "PyPi_GrowattServer";
rev = "refs/tags/${version}";
hash = "sha256-79/siHqwY3TNFIxodR24TJwsrKapG1GP4u4fIKxdFI4=";
hash = "sha256-HZsgha7CAjJYDDBlh2Ib24glUiMAXpNR8KsSdm78BA8=";
};
propagatedBuildInputs = [

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

@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "heatzypy";
version = "2.1.1";
version = "2.1.5";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Cyr-ius";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw=";
hash = "sha256-Z60apquRzhkPbxgGKgDswtW9GUXGt9MbdAsh3Yh31b0=";
};
postPatch = ''

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

@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "mitmproxy-wireguard";
version = "0.1.17";
version = "0.1.18";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "decathorpe";
repo = "mitmproxy_wireguard";
rev = "refs/tags/${version}";
hash = "sha256-G//3h9QHModKNcGqG2FcV65bver809J4Xnig/Fr5zdg=";
hash = "sha256-vDexI9ihZhisbtt7k9epYD3RjPUaUnEX1TuDQDHZO8A=";
};
nativeBuildInputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-KPk6lLofsWDG+rswG5+q4bs9CZJFn4RuepX/OQvZ1Pw=";
hash = "sha256-iVrF+9D4HHRx1E10GbGftcmil3Epw6iuRdf2m2o+/u8=";
};
# Module has no tests, only a test client

5
pkgs/development/python-modules/mkdocstrings-python/default.nix
View File

@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "mkdocstrings-python";
version = "0.7.1";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = "python";
rev = version;
hash = "sha256-cZk6Eu6Jp3tSPAb0HplR/I0pX2YIFhOaAsI3YRS0LVw=";
hash = "sha256-KAVBK0ZR1R27cWH99DVOYNFWKa4ubBXzgM0hVpGRIpE=";
};
nativeBuildInputs = [
@@ -39,6 +39,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'license = "ISC"' 'license = {text = "ISC"}' \
--replace 'dynamic = ["version"]' 'version = "${version}"'
'';

2
pkgs/development/python-modules/pymemcache/default.nix
View File

@@ -7,6 +7,7 @@
, pytestCheckHook
, pythonOlder
, zstd
, stdenv
}:
buildPythonPackage rec {
@@ -52,5 +53,6 @@ buildPythonPackage rec {
homepage = "https://pymemcache.readthedocs.io/";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
broken = stdenv.is32bit;
};
}

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

@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "slixmpp";
version = "1.8.2";
version = "1.8.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-U7lD2iVy2gS5Ktop4PVKg+cUbIg4MJt+m6tH5aOb1Y4=";
hash = "sha256-rJtZqq7tZ/VFk4fMpDZYyTQRa1Pokmn2aw6LA+FBGXw=";
};
propagatedBuildInputs = [

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

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "stevedore";
version = "4.1.0";
version = "4.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-AlGKjw1tKb6KRFt/KsY3U/8p6PKi+qAXd1aNVQDXd6Y=";
sha256 = "sha256-f4rrbj+Q+WgywwG/8hp+te776JTIjFBkg9NVVl2IzBo=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/database/sqlfluff/default.nix
View File

@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-5QWjlidDtf0OWQ9sdS08bCX5XV41igWmPr20gwbumQU=";
hash = "sha256-B1tqL8bc+mWEjQrS4lQM55/ahOeUyuE8VBtk6QMj6Mk=";
};
propagatedBuildInputs = with python3.pkgs; [

52
pkgs/development/tools/datree/default.nix
View File

@@ -1,47 +1,57 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
, testers
, datree
}:
buildGoModule rec {
pname = "datree";
version = "1.6.42";
version = "1.7.3";
src = fetchFromGitHub {
owner = "datreeio";
repo = "datree";
rev = version;
hash = "sha256-4sj+zyFYtG/C6oDuQno/rkyxgdnnvAn9GZ5qvqA+UhA=";
hash = "sha256-FeGV/GXzt/AHprvKyt/gPAxxJ7d46GXrh0QRLb7qp0E=";
};
vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw=";
vendorHash = "sha256-m3O5AoAHSM6rSnmL5N7V37XU38FADb0Edt/EZvvb2u4=";
nativeBuildInputs = [ installShellFiles ];
ldflags = [
"-extldflags '-static'"
"-s"
"-w"
"-X github.com/datreeio/datree/cmd.CliVersion=${version}"
];
nativeBuildInputs = [ installShellFiles ];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/datree version | grep ${version} > /dev/null
'';
tags = [ "main" ];
postInstall = ''
for shell in bash fish zsh; do
$out/bin/datree completion $shell > datree.$shell
installShellCompletion datree.$shell
done
installShellCompletion \
--cmd datree \
--bash <($out/bin/datree completion bash) \
--fish <($out/bin/datree completion fish) \
--zsh <($out/bin/datree completion zsh)
'';
doCheck = true;
passthru.tests.version = testers.testVersion {
package = datree;
command = "datree version";
};
meta = with lib; {
description =
"CLI tool to ensure K8s manifests and Helm charts follow best practices as well as your organization’s policies";
description = "CLI tool to ensure K8s manifests and Helm charts follow best practices";
longDescription = ''
Datree provides an E2E policy enforcement solution to run automatic checks
for rule violations. Datree can be used on the command line, admission
webhook, or even as a kubectl plugin to run policies against Kubernetes
objects.
'';
homepage = "https://datree.io/";
license = [ licenses.asl20 ];
maintainers = [ maintainers.jceb ];
mainProgram = "datree";
license = licenses.asl20;
maintainers = with maintainers; [ azahi jceb ];
};
}

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

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
version = "0.35";
version = "0.36.0";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TYtjwEQTXjkp1o95cXJw0VDVv5us07K+6NrJF9bsJfg=";
sha256 = "sha256-0emAo/K27lmQ+409maTR/hnonQVkbijF0RAwvIErBFo=";
};
vendorSha256 = null;

9
pkgs/development/tools/libsigrokdecode/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, python3, check, libxcrypt }:
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }:
stdenv.mkDerivation rec {
pname = "libsigrokdecode";
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";
};
nativeBuildInputs = [ pkg-config ];
# upstream was rleased before Python 3.9 and thus only checks versions up to 3.8
postPatch = ''
substituteInPlace configure.ac --replace '[python-3.8-embed]' '[python3-embed]'
'';
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ glib python3 libxcrypt ];
checkInputs = [ check ];
doCheck = true;

4
pkgs/development/tools/ocaml/dune/3.nix
View File

@@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "3.5.0";
version = "3.6.0";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "sha256-d71MZwQ1n64ZaWNs/DzXpRe6NgSBnvickZwHYrUJNhA=";
sha256 = "sha256-CKDGyVIWBOYM82r7oDbs8bEH31Hu0Uovt+72z90r8ng=";
};
nativeBuildInputs = [ ocaml findlib ];

14
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
View File

@@ -1,26 +1,24 @@
{ lib, buildDunePackage, fetchFromGitHub
{ lib, buildDunePackage, fetchurl
, ocamlbuild
}:
buildDunePackage rec {
pname = "js_of_ocaml-ocamlbuild";
version = "4.0.0";
version = "5.0";
minimalOCamlVersion = "4.02";
src = fetchFromGitHub {
owner = "ocsigen";
repo = pname;
rev = "852302c8f35b946e2ec275c529a79e46d8749be6";
sha256 = "sha256:03ayvakvbh4wi4dwcgd7r9y8ka8cv3d59hb81yk2dxyd94bln145";
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml-ocamlbuild/releases/download/${version}/js_of_ocaml-ocamlbuild-${version}.tbz";
sha256 = "sha256-qlm8vxzie8sqPrd6iiwf8X6d2+DyQOOhmMoc67ChwHs=";
};
propagatedBuildInputs = [ ocamlbuild ];
meta = {
description = "An ocamlbuild plugin to compile to JavaScript";
homepage = "https://github.com/ocsigen/js_of_ocaml-ocamlbuild";
license = lib.licenses.lgpl2Only;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}

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

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.115";
version = "0.0.118";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eb5k6gW70Z4bVrJhrDtI6G1Hk5C98gdqZP6rkgiI6uQ=";
sha256 = "sha256-th+ODoQVwzEN+pfuBcp18vbUBWCLEWwE/wOh+I0uoN4=";
};
cargoSha256 = "sha256-s2ufpiCqQG5JoLsEscIusY/4B7SieABIK164Up0H74I=";
cargoSha256 = "sha256-jFSCelFksJ4are7EjyAUJnLTgSlWviYOiV8UMgi4SA0=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

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

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.430";
version = "0.0.431";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-XlUg0FNQw8IuZ5biMILy53FJ9s84+M/VdACSbBwGKG0=";
sha256 = "sha256-X3zKD5AyLYNhVtNpvGShbXjX+bNN7xYjVSfs1TqhgeQ=";
};
vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc=";

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

@@ -2,7 +2,7 @@
, freeglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib
, libSM, libunwind, libX11, xorgproto, libXext, libXi
, libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
, makeDesktopItem, qtbase, qtdeclarative, glew
, makeDesktopItem, qtbase, qtdeclarative, glew, curl
}:
let
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
freeglut freealut libGLU libGL libICE libjpeg openal openscenegraph plib
libSM libunwind libX11 xorgproto libXext libXi
libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase
glew qtdeclarative
glew qtdeclarative curl
];
postInstall = ''

10
pkgs/games/tuxpaint/default.nix
View File

@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
version = "0.9.27";
version = "0.9.28";
pname = "tuxpaint";
src = fetchurl {
url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-qyuA6J34gijNDsCmyQtJ1UPLFXqjj7kMvTop8AFAVXo=";
url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}-sdl1.tar.gz";
sha256 = "sha256-b4Ru9GqyGf2jMmM24szGXO2vbSxCwvPmA6tgEUWhhos=";
};
nativeBuildInputs = [
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
# stamps
stamps = fetchurl {
url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2021-11-25/tuxpaint-stamps-2021.11.25.tar.gz";
sha256 = "sha256-y1XuIbLSW0QO4has+rC7jZBq8cma28d+jbEe7DBYnVI=";
url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2022-06-04/tuxpaint-stamps-2022.06.04.tar.gz";
sha256 = "sha256-hCBlV2+uVUNY4A5R1xpJJhamSQsStZIigGdHfCh6C/g=";
};
postInstall = ''

35
pkgs/servers/unfs3/default.nix
View File

@@ -1,15 +1,27 @@
{ fetchurl, lib, stdenv, flex, bison }:
{ fetchFromGitHub
, lib
, stdenv
, flex
, bison
, autoreconfHook
, pkg-config
, libtirpc
}:
stdenv.mkDerivation rec {
pname = "unfs3";
version = "0.9.22";
version = "0.10.0";
src = fetchurl {
url = "mirror://sourceforge/unfs3/${pname}-${version}.tar.gz";
sha256 = "076zkyqkn56q0a8n3h65n1a68fknk4hrrp6mbhajq5s1wp5248j8";
src = fetchFromGitHub {
owner = "unfs3";
repo = pname;
rev = "refs/tags/${pname}-${version}";
hash = "sha256-5iAriIutBhwyZVS7AG2fnkrHOI7pNAKfYv062Cy0WXw=";
};
nativeBuildInputs = [ flex bison ];
nativeBuildInputs = [ flex bison autoreconfHook pkg-config ];
buildInputs = [ libtirpc ];
configureFlags = [ "--disable-shared" ];
@@ -25,13 +37,16 @@ stdenv.mkDerivation rec {
server.
'';
homepage = "http://unfs3.sourceforge.net/";
# The old http://unfs3.sourceforge.net/ has a <meta>
# http-equiv="refresh" pointing here, so we can assume that
# whoever controls the old URL approves of the "unfs3" github
# account.
homepage = "https://unfs3.github.io/";
changelog = "https://raw.githubusercontent.com/unfs3/unfs3/unfs3-${version}/NEWS";
mainProgram = "unfsd";
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = [ ];
# https://github.com/unfs3/unfs3/issues/13
broken = true;
};
}

4
pkgs/servers/web-apps/freshrss/default.nix
View File

@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "FreshRSS";
version = "1.20.0";
version = "1.20.1";
src = fetchFromGitHub {
owner = "FreshRSS";
repo = "FreshRSS";
rev = version;
hash = "sha256-mzhEw2kFv77SmeuEx66n9ujWMscZO3+03tHimk1/vk4=";
hash = "sha256-hpxBPYNFw5Wz07SdYT9GLX8XicAtKi82HjlLCccQMtk=";
};
passthru.tests = nixosTests.freshrss;

22
pkgs/tools/X11/ncview/default.nix
View File

@@ -1,5 +1,11 @@
{ lib, stdenv, fetchurl
, netcdf, xlibsWrapper, xorg, udunits, expat
{ lib
, stdenv
, fetchurl
, expat
, libpng
, udunits
, netcdf
, xorg
}:
let
@@ -14,7 +20,17 @@ in stdenv.mkDerivation {
sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8";
};
buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ];
buildInputs = [
expat
libpng
netcdf
udunits
xorg.libICE
xorg.libSM
xorg.libX11
xorg.libXaw
xorg.libXt
];
meta = with lib; {
description = "Visual browser for netCDF format files";

7
pkgs/tools/admin/pulumi/default.nix
View File

@@ -14,16 +14,16 @@
buildGoModule rec {
pname = "pulumi";
version = "3.43.1";
version = "3.46.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-LbPXCwU6aJp+z5scfej5Reo2X8QUvZpASWkcDBBF1J0=";
hash = "sha256-bEAggHGMhSSwEiYj+DdJRajR4DLunpidbd4DflkBrQ8=";
};
vendorSha256 = "sha256-APGiCqHdXDRCFx0W8RDeL89sskYZ2vzdpg4ePE7KixA=";
vendorSha256 = "sha256-+JKCCNkByqWuvAv8qUL3L9DlDhvIbMsDbsfn3KYolUo=";
sourceRoot = "source/pkg";
@@ -62,6 +62,7 @@ buildGoModule rec {
# Code generation tests also download dependencies from network
rm codegen/{docs,dotnet,go,nodejs,python,schema}/*_test.go
rm -R codegen/{dotnet,go,nodejs,python}/gen_program_test
'' + lib.optionalString stdenv.isDarwin ''
export PULUMI_HOME=$(mktemp -d)
'';

84
pkgs/tools/graphics/appleseed/default.nix
View File

@@ -1,84 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile,
eigen, libpng, python3, libGLU, qt4, openexr, openimageio,
opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper
}:
let boost_static = boost165.override {
enableStatic = true;
enablePython = true;
python = python3;
};
in stdenv.mkDerivation rec {
pname = "appleseed";
version = "2.0.5-beta";
src = fetchFromGitHub {
owner = "appleseedhq";
repo = "appleseed";
rev = version;
sha256 = "1sq9s0rzjksdn8ayp1g17gdqhp7fqks8v1ddd3i5rsl96b04fqx5";
};
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
boost_static guile eigen libpng python3
libGLU qt4 openexr openimageio opencolorio_1 xercesc
osl seexpr
];
NIX_CFLAGS_COMPILE = toString [
"-I${openexr.dev}/include/OpenEXR"
"-I${ilmbase.dev}/include/OpenEXR"
"-I${openimageio.dev}/include/OpenImageIO"
"-Wno-unused-but-set-variable"
"-Wno-error=class-memaccess"
"-Wno-error=maybe-uninitialized"
"-Wno-error=catch-value"
"-Wno-error=stringop-truncation"
];
cmakeFlags = [
"-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON"
"-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON"
"-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON"
"-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON"
"-DWITH_PYTHON=ON"
"-DWITH_DISNEY_MATERIAL=ON"
"-DUSE_SSE=ON"
"-DUSE_SSE42=ON"
];
meta = with lib; {
description = "Open source, physically-based global illumination rendering engine";
homepage = "https://appleseedhq.net/";
maintainers = with maintainers; [ hodapp ];
license = licenses.mit;
platforms = platforms.linux;
};
# Work around a bug in the CMake build:
postInstall = ''
chmod a+x $out/bin/*
wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python3}
'';
}
# TODO: Is the below problematic?
# CMake Warning (dev) at /nix/store/dsyw2zla2h3ld2p0jj4cv0j3wal1bp3h-cmake-3.11.2/share/cmake-3.11/Modules/FindOpenGL.cmake:270 (message):
# Policy CMP0072 is not set: FindOpenGL prefers GLVND by default when
# available. Run "cmake --help-policy CMP0072" for policy details. Use the
# cmake_policy command to set the policy and suppress this warning.
#
# FindOpenGL found both a legacy GL library:
#
# OPENGL_gl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGL.so
#
# and GLVND libraries for OpenGL and GLX:
#
# OPENGL_opengl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libOpenGL.so
# OPENGL_glx_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGLX.so
#
# OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for
# compatibility with CMake 3.10 and below the legacy GL library will be used.

6
pkgs/tools/graphics/netpbm/default.nix
View File

@@ -20,14 +20,14 @@ stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
pname = "netpbm";
version = "11.0.1";
version = "11.0.2";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "4448";
sha256 = "LWnEalfott+q/pcqhQYJ1ifJh+lZ2lZbpCMd+jR9/vQ=";
rev = "4468";
sha256 = "EW96q9DsM1lQ3QZAmp0hZhQ6icsZFDGa3wYmjCQmBRE=";
};
nativeBuildInputs = [

4
pkgs/tools/misc/lazydocker/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazydocker";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
sha256 = "sha256-Ns758mqz4O8hKpu3LHFFm1U1vxF1TJZ4GKstWADXOl0=";
sha256 = "sha256-P03L3UbXAlNUUwAwDqsIIs/ECB6s3GqCESbPK4AgnYg=";
};
vendorSha256 = null;

4
pkgs/tools/networking/inetutils/default.nix
View File

@@ -1,5 +1,6 @@
{ stdenv, lib, fetchurl, ncurses, perl, help2man
, apparmorRulesFromClosure
, libxcrypt
}:
stdenv.mkDerivation rec {
@@ -18,8 +19,9 @@ stdenv.mkDerivation rec {
./inetutils-1_9-PATH_PROCNET_DEV.patch
];
strictDeps = true;
nativeBuildInputs = [ help2man perl /* for `whois' */ ];
buildInputs = [ ncurses /* for `talk' */ ];
buildInputs = [ ncurses /* for `talk' */ libxcrypt ];
# Don't use help2man if cross-compiling
# https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html

5
pkgs/tools/networking/minidlna/default.nix
View File

@@ -2,16 +2,15 @@
let
pname = "minidlna";
version = "1.3.1";
version = "1.3.2";
in
stdenv.mkDerivation {
inherit pname version;
# tarball for 1.3.1 is missing
src = fetchgit {
url = "https://git.code.sf.net/p/${pname}/git";
rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-nbvz/QHSZBTZEqX/utOoOF5vorhrxGqIBA9qfpIZzyU=";
hash = "sha256-v+puglrbuLqHIAbrO7bhOA0npc/GYp0Bdi3DnD9qyII=";
};
preConfigure = ''

10
pkgs/tools/networking/mozillavpn/default.nix
View File

@@ -21,13 +21,13 @@
let
pname = "mozillavpn";
version = "2.10.1";
version = "2.11.0";
src = fetchFromGitHub {
owner = "mozilla-mobile";
repo = "mozilla-vpn-client";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-am2acceDig7tjhkO5GiWfvkq0Mabyxedbc8mR49SXBU=";
hash = "sha256-QXxZ6RQwXrVsaZRkW13r7aoz8iHxuT0nW/2aFDpLLzU=";
};
netfilter-go-modules = (buildGoModule {
@@ -40,14 +40,14 @@ let
inherit src;
name = "${pname}-${version}-extension-bridge";
preBuild = "cd extension/bridge";
hash = "sha256-sw6iylh3SgCDA1z/xvwNGWrCU2xr7IVPUL4fdOi43lc=";
hash = "sha256-BRUUEDIVQoF+FuKnoBzFbMyeGOgGb6/boYSaftZPF2U=";
};
signatureDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}-signature";
preBuild = "cd signature";
hash = "sha256-gBJIzTTo6i415aHwUsBriokUt2K/r55QCpC6Tv8GXh4=";
hash = "sha256-oSO7KS4aBwSVYIyxmWTXKn0CL9t6CDR/hx+0+nbf/dM=";
};
in
@@ -108,7 +108,7 @@ stdenv.mkDerivation {
substituteInPlace extension/CMakeLists.txt \
--replace '/etc' "$out/etc"
substituteInPlace src/connectionbenchmark/benchmarktaskdownload.cpp \
substituteInPlace src/connectionbenchmark/benchmarktasktransfer.cpp \
--replace 'QT_VERSION >= 0x060400' 'false'
ln -s '${netfilter-go-modules}' linux/netfilter/vendor

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

@@ -30,11 +30,11 @@ let
in
stdenv.mkDerivation rec {
pname = "tor";
version = "0.4.7.10";
version = "0.4.7.11";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "sha256-ZH5W36Weo22rBSAn/Px2Y5BcgmwDUJNjxFaQDs1DWls=";
sha256 = "sha256-zzyvvu29vF/RwFQOdNbRCgBerf+SkJg5OBX4Z+MqE24=";
};
outputs = [ "out" "geoip" ];

6
pkgs/tools/text/difftastic/default.nix
View File

@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.37.0";
version = "0.38.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-LwDoIvhZj/1fHg2eWgadwTcegeOKPpY8aCAugLfKtDE=";
sha256 = "sha256-NhuFyJvXk3N9G6LedAPwJIDdd0CfFs1rjYmC1tJTqB8=";
};
depsExtraArgs = {
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
popd
'';
};
cargoSha256 = "sha256-u4zM4mmYxy1o1FXQ8SjLJB9YFhYI5SbUZH2Wca7Kjmg=";
cargoSha256 = "sha256-0XqLdjF9O8CRVyq7j7IvOqCUB0oCV2P703BcWwSlIx8=";
passthru.tests.version = testers.testVersion { package = difftastic; };

19
pkgs/tools/text/zoekt/default.nix
View File

@@ -1,28 +1,31 @@
{ stdenv
, lib
{ lib
, buildGoModule
, fetchFromGitHub
, git
}:
buildGoModule {
pname = "zoekt";
version = "unstable-2021-03-17";
version = "unstable-2022-11-09";
src = fetchFromGitHub {
owner = "google";
owner = "sourcegraph";
repo = "zoekt";
rev = "d92b3b80e582e735b2459413ee7d9dbbf294d629";
sha256 = "JdORh6bRdHsAYwsmdKY0OUavXfu3HsPQFkQjRBkcMBo=";
rev = "c4b18d3b44da94b3e7c9c94467d68c029666bb86";
hash = "sha256-QtwOiBxBeFkhRfH3R2fP72b05Hc4+zt9njqCNVcprZ4=";
};
vendorSha256 = "d+Xvl6fleMO0frP9qr5tZgkzsnH5lPELwmEQEspD22M=";
vendorHash = "sha256-DiAqFJ8E5V0/eHztm92WVrf1XGPXmmOaVXaWHfQMn2k=";
checkInputs = [
git
];
preCheck = ''
export HOME=`mktemp -d`
git config --global --replace-all protocol.file.allow always
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "Fast trigram based code search";
homepage = "https://github.com/google/zoekt";
license = licenses.asl20;

1
pkgs/top-level/aliases.nix
View File

@@ -83,6 +83,7 @@ mapAliases ({
antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead"; # Added 2020-08-06
antimicroX = antimicrox; # Added 2021-10-31
apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02
appleseed = throw "appleseed has been removed, because it was unmaintained"; # Added 2022-05-26
arangodb_3_3 = throw "arangodb_3_3 went end of life and has been removed"; # Added 2022-10-08
arangodb_3_4 = throw "arangodb_3_4 went end of life and has been removed"; # Added 2022-10-08
arangodb_3_5 = throw "arangodb_3_5 went end of life and has been removed"; # Added 2022-10-08

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

@@ -3451,7 +3451,7 @@ with pkgs;
cloudflared = callPackage ../applications/networking/cloudflared { };
cloudflare-dyndns = python3Packages.cloudflare-dyndns;
cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };
cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
@@ -5039,8 +5039,6 @@ with pkgs;
apparix = callPackage ../tools/misc/apparix { };
appleseed = callPackage ../tools/graphics/appleseed { };
apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };
arping = callPackage ../tools/networking/arping { };
@@ -16803,9 +16801,7 @@ with pkgs;
python = python3;
};
libsigrokdecode = callPackage ../development/tools/libsigrokdecode {
python3 = python38;
};
libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
# special forks used for dsview
libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };

4
pkgs/top-level/python-packages.nix
View File

@@ -518,8 +518,6 @@ self: super: with self; {
appdirs = callPackage ../development/python-modules/appdirs { };
appleseed = toPythonModule (pkgs.appleseed.override { python3 = self.python; });
applicationinsights = callPackage ../development/python-modules/applicationinsights { };
appnope = callPackage ../development/python-modules/appnope { };
@@ -1800,8 +1798,6 @@ self: super: with self; {
cloudflare = callPackage ../development/python-modules/cloudflare { };
cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };
cloudpickle = callPackage ../development/python-modules/cloudpickle { };
cloudscraper = callPackage ../development/python-modules/cloudscraper { };