gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2022-03-31 00:10:59 +00:00
committed by GitHub
parent 9a5aa75d56 35619ce1e5
commit c6a9cb4378
51 changed files with 1839 additions and 2106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+9 -2
View File
@@ -229,6 +229,13 @@
<link xlink:href="options.html#opt-services.prometheus.exporters.pve">services.prometheus.exporters.pve</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/netbox-community/netbox">netbox</link>,
infrastructure resource modeling (IRM) tool. Available as
<link xlink:href="options.html#opt-services.netbox.enable">services.netbox</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://tetrd.app">tetrd</link>, share your
@@ -1018,8 +1025,8 @@
<listitem>
<para>
<literal>pkgs.pgadmin</literal> now refers to
<literal>pkgs.pgadmin4</literal>. If you still need pgadmin3,
use <literal>pkgs.pgadmin3</literal>.
<literal>pkgs.pgadmin4</literal>. <literal>pgadmin3</literal>
has been removed.
</para>
</listitem>
<listitem>
nixos/doc/manual/man-pages.xml
+7 -2
View File
@@ -3,10 +3,15 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>NixOS Reference Pages</title>
<info>
<author><personname><firstname>Eelco</firstname><surname>Dolstra</surname></personname>
<author>
<personname><firstname>Eelco</firstname><surname>Dolstra</surname></personname>
<contrib>Author</contrib>
</author>
<copyright><year>2007-2020</year><holder>Eelco Dolstra</holder>
<author>
<personname><othername>The Nixpkgs/NixOS contributors</othername></personname>
<contrib>Author</contrib>
</author>
<copyright><year>2007-2022</year><holder>Eelco Dolstra and the Nixpkgs/NixOS contributors</holder>
</copyright>
</info>
<xi:include href="man-configuration.xml" />
nixos/doc/manual/release-notes/rl-2205.section.md
+3 -2
View File
@@ -67,6 +67,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [prometheus-pve-exporter](https://github.com/prometheus-pve/prometheus-pve-exporter), a tool that exposes information from the Proxmox VE API for use by Prometheus. Available as [services.prometheus.exporters.pve](options.html#opt-services.prometheus.exporters.pve).
- [netbox](https://github.com/netbox-community/netbox), infrastructure resource modeling (IRM) tool. Available as [services.netbox](options.html#opt-services.netbox.enable).
- [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable).
- [agate](https://github.com/mbrubeck/agate), a very simple server for the Gemini hypertext protocol. Available as [services.agate](options.html#opt-services.agate.enable).
@@ -375,8 +377,7 @@ In addition to numerous new and upgraded packages, this release has the followin
you should change the package you refer to. If you don't need them update your
commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.
- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`.
If you still need pgadmin3, use `pkgs.pgadmin3`.
- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed.
- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
and `pkgs.noto-fonts-cjk-serif` because they each have different release
nixos/modules/module-list.nix
+1
View File
@@ -1048,6 +1048,7 @@
./services/web-apps/mediawiki.nix
./services/web-apps/miniflux.nix
./services/web-apps/moodle.nix
./services/web-apps/netbox.nix
./services/web-apps/nextcloud.nix
./services/web-apps/nexus.nix
./services/web-apps/node-red.nix
nixos/modules/services/web-apps/netbox.nix
+265
View File
@@ -0,0 +1,265 @@
{ config, lib, pkgs, buildEnv, ... }:
with lib;
let
cfg = config.services.netbox;
staticDir = cfg.dataDir + "/static";
configFile = pkgs.writeTextFile {
name = "configuration.py";
text = ''
STATIC_ROOT = '${staticDir}'
ALLOWED_HOSTS = ['*']
DATABASE = {
'NAME': 'netbox',
'USER': 'netbox',
'HOST': '/run/postgresql',
}
# Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate
# configuration exists for each. Full connection details are required in both sections, and it is strongly recommended
# to use two separate database IDs.
REDIS = {
'tasks': {
'URL': 'unix://${config.services.redis.servers.netbox.unixSocket}?db=0',
'SSL': False,
},
'caching': {
'URL': 'unix://${config.services.redis.servers.netbox.unixSocket}?db=1',
'SSL': False,
}
}
with open("${cfg.secretKeyFile}", "r") as file:
SECRET_KEY = file.readline()
${optionalString cfg.enableLdap "REMOTE_AUTH_BACKEND = 'netbox.authentication.LDAPBackend'"}
${cfg.extraConfig}
'';
};
pkg = (pkgs.netbox.overrideAttrs (old: {
installPhase = old.installPhase + ''
ln -s ${configFile} $out/opt/netbox/netbox/netbox/configuration.py
'' + optionalString cfg.enableLdap ''
ln -s ${ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py
'';
})).override {
plugins = ps: ((cfg.plugins ps)
++ optional cfg.enableLdap [ ps.django-auth-ldap ]);
};
netboxManageScript = with pkgs; (writeScriptBin "netbox-manage" ''
#!${stdenv.shell}
export PYTHONPATH=${pkg.pythonPath}
sudo -u netbox ${pkg}/bin/netbox "$@"
'');
in {
options.services.netbox = {
enable = mkOption {
type = lib.types.bool;
default = false;
description = ''
Enable Netbox.
This module requires a reverse proxy that serves <literal>/static</literal> separately.
See this <link xlink:href="https://github.com/netbox-community/netbox/blob/develop/contrib/nginx.conf/">example</link> on how to configure this.
'';
};
listenAddress = mkOption {
type = types.str;
default = "[::1]";
description = ''
Address the server will listen on.
'';
};
port = mkOption {
type = types.port;
default = 8001;
description = ''
Port the server will listen on.
'';
};
plugins = mkOption {
type = types.functionTo (types.listOf types.package);
default = _: [];
defaultText = literalExpression ''
python3Packages: with python3Packages; [];
'';
description = ''
List of plugin packages to install.
'';
};
dataDir = mkOption {
type = types.str;
default = "/var/lib/netbox";
description = ''
Storage path of netbox.
'';
};
secretKeyFile = mkOption {
type = types.path;
description = ''
Path to a file containing the secret key.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Additional lines of configuration appended to the <literal>configuration.py</literal>.
See the <link xlink:href="https://netbox.readthedocs.io/en/stable/configuration/optional-settings/">documentation</link> for more possible options.
'';
};
enableLdap = mkOption {
type = types.bool;
default = false;
description = ''
Enable LDAP-Authentication for Netbox.
This requires a configuration file being pass through <literal>ldapConfigPath</literal>.
'';
};
ldapConfigPath = mkOption {
type = types.path;
default = "";
description = ''
Path to the Configuration-File for LDAP-Authentification, will be loaded as <literal>ldap_config.py</literal>.
See the <link xlink:href="https://netbox.readthedocs.io/en/stable/installation/6-ldap/#configuration">documentation</link> for possible options.
'';
};
};
config = mkIf cfg.enable {
services.redis.servers.netbox.enable = true;
services.postgresql = {
enable = true;
ensureDatabases = [ "netbox" ];
ensureUsers = [
{
name = "netbox";
ensurePermissions = {
"DATABASE netbox" = "ALL PRIVILEGES";
};
}
];
};
environment.systemPackages = [ netboxManageScript ];
systemd.targets.netbox = {
description = "Target for all NetBox services";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" "redis-netbox.service" ];
};
systemd.services = let
defaultServiceConfig = {
WorkingDirectory = "${cfg.dataDir}";
User = "netbox";
Group = "netbox";
StateDirectory = "netbox";
StateDirectoryMode = "0750";
Restart = "on-failure";
};
in {
netbox-migration = {
description = "NetBox migrations";
wantedBy = [ "netbox.target" ];
environment = {
PYTHONPATH = pkg.pythonPath;
};
serviceConfig = defaultServiceConfig // {
Type = "oneshot";
ExecStart = ''
${pkg}/bin/netbox migrate
'';
};
};
netbox = {
description = "NetBox WSGI Service";
wantedBy = [ "netbox.target" ];
after = [ "netbox-migration.service" ];
preStart = ''
${pkg}/bin/netbox trace_paths --no-input
${pkg}/bin/netbox collectstatic --no-input
${pkg}/bin/netbox remove_stale_contenttypes --no-input
'';
environment = {
PYTHONPATH = pkg.pythonPath;
};
serviceConfig = defaultServiceConfig // {
ExecStart = ''
${pkgs.python3Packages.gunicorn}/bin/gunicorn netbox.wsgi \
--bind ${cfg.listenAddress}:${toString cfg.port} \
--pythonpath ${pkg}/opt/netbox/netbox
'';
};
};
netbox-rq = {
description = "NetBox Request Queue Worker";
wantedBy = [ "netbox.target" ];
after = [ "netbox.service" ];
environment = {
PYTHONPATH = pkg.pythonPath;
};
serviceConfig = defaultServiceConfig // {
ExecStart = ''
${pkg}/bin/netbox rqworker high default low
'';
};
};
netbox-housekeeping = {
description = "NetBox housekeeping job";
after = [ "netbox.service" ];
environment = {
PYTHONPATH = pkg.pythonPath;
};
serviceConfig = defaultServiceConfig // {
Type = "oneshot";
ExecStart = ''
${pkg}/bin/netbox housekeeping
'';
};
};
};
systemd.timers.netbox-housekeeping = {
description = "Run NetBox housekeeping job";
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = "daily";
};
};
users.users.netbox = {
home = "${cfg.dataDir}";
isSystemUser = true;
group = "netbox";
};
users.groups.netbox = {};
users.groups."${config.services.redis.servers.netbox.user}".members = [ "netbox" ];
};
}
nixos/modules/system/boot/stage-2-init.sh
+2 -6
View File
@@ -167,10 +167,6 @@ exec 1>&$logOutFd 2>&$logErrFd
exec {logOutFd}>&- {logErrFd}>&-
# Start systemd.
# Start systemd in a clean environment.
echo "starting systemd..."
PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \
TZDIR=/etc/zoneinfo \
exec @systemdExecutable@
exec env - @systemdExecutable@ "$@"
nixos/modules/system/boot/stage-2.nix
+2 -9
View File
@@ -19,11 +19,6 @@ let
pkgs.coreutils
pkgs.util-linux
] ++ lib.optional useHostResolvConf pkgs.openresolv);
fsPackagesPath = lib.makeBinPath config.system.fsPackages;
systemdUnitPathEnvVar = lib.optionalString (config.boot.extraSystemdUnitPaths != [])
("SYSTEMD_UNIT_PATH="
+ builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths
+ ":"); # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable
postBootCommands = pkgs.writeText "local-cmds"
''
${config.boot.postBootCommands}
@@ -48,12 +43,10 @@ in
};
systemdExecutable = mkOption {
default = "systemd";
default = "/run/current-system/systemd/lib/systemd/systemd";
type = types.str;
description = ''
The program to execute to start systemd. Typically
<literal>systemd</literal>, which will find systemd in the
PATH.
The program to execute to start systemd.
'';
};
nixos/modules/system/boot/systemd.nix
+23
View File
@@ -302,6 +302,16 @@ in
'';
};
systemd.managerEnvironment = mkOption {
type = with types; attrsOf (nullOr (oneOf [ str path package ]));
default = {};
example = { SYSTEMD_LOG_LEVEL = "debug"; };
description = ''
Environment variables of PID 1. These variables are
<emphasis>not</emphasis> passed to started units.
'';
};
systemd.enableCgroupAccounting = mkOption {
default = true;
type = types.bool;
@@ -470,11 +480,13 @@ in
enabledUpstreamSystemUnits = filter (n: ! elem n cfg.suppressedSystemUnits) upstreamSystemUnits;
enabledUnits = filterAttrs (n: v: ! elem n cfg.suppressedSystemUnits) cfg.units;
in ({
"systemd/system".source = generateUnits "system" enabledUnits enabledUpstreamSystemUnits upstreamSystemWants;
"systemd/system.conf".text = ''
[Manager]
ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)}
${optionalString config.systemd.enableCgroupAccounting ''
DefaultCPUAccounting=yes
DefaultIOAccounting=yes
@@ -542,6 +554,17 @@ in
(v: let n = escapeSystemdPath v.where;
in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts);
# Environment of PID 1
systemd.managerEnvironment = {
# Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools
PATH = lib.makeBinPath config.system.fsPackages;
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
TZDIR = "/etc/zoneinfo";
# If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable
SYSTEMD_UNIT_PATH = lib.mkIf (config.boot.extraSystemdUnitPaths != []) "${builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths}:";
};
system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled
[ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET"
"SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC"
nixos/tests/all-tests.nix
+1
View File
@@ -341,6 +341,7 @@ in
networking.networkd = handleTest ./networking.nix { networkd = true; };
networking.scripted = handleTest ./networking.nix { networkd = false; };
specialisation = handleTest ./specialisation.nix {};
netbox = handleTest ./web-apps/netbox.nix {};
# TODO: put in networking.nix after the test becomes more complete
networkingProxy = handleTest ./networking-proxy.nix {};
nextcloud = handleTest ./nextcloud {};
nixos/tests/botamusique.nix
+4
View File
@@ -6,6 +6,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
nodes = {
machine = { config, ... }: {
networking.extraHosts = ''
127.0.0.1 all.api.radio-browser.info
'';
services.murmur = {
enable = true;
registerName = "NixOS tests";
nixos/tests/systemd.nix
+4
View File
@@ -192,5 +192,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
with subtest("systemd per-unit accounting works"):
assert "IP traffic received: 84B" in output_ping
assert "IP traffic sent: 84B" in output_ping
with subtest("systemd environment is properly set"):
machine.systemctl("daemon-reexec") # Rewrites /proc/1/environ
machine.succeed("grep -q TZDIR=/etc/zoneinfo /proc/1/environ")
'';
})
nixos/tests/web-apps/netbox.nix
+30
View File
@@ -0,0 +1,30 @@
import ../make-test-python.nix ({ lib, pkgs, ... }: {
name = "netbox";
meta = with lib.maintainers; {
maintainers = [ n0emis ];
};
machine = { ... }: {
services.netbox = {
enable = true;
secretKeyFile = pkgs.writeText "secret" ''
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
'';
};
};
testScript = ''
machine.start()
machine.wait_for_unit("netbox.target")
machine.wait_until_succeeds("journalctl --since -1m --unit netbox --grep Listening")
with subtest("Home screen loads"):
machine.succeed(
"curl -sSfL http://[::1]:8001 | grep '<title>Home | NetBox</title>'"
)
with subtest("Staticfiles are generated"):
machine.succeed("test -e /var/lib/netbox/static/netbox.js")
'';
})
pkgs/applications/misc/fuzzel/default.nix
+2
View File
@@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
"-Dsvg-backend=${withSVGBackend}"
];
CFLAGS = "-Wno-error=comment"; # https://gitlab.gnome.org/GNOME/librsvg/-/issues/856
meta = with lib; {
description = "Wayland-native application launcher, similar to rofi’s drun mode";
homepage = "https://codeberg.org/dnkl/fuzzel";
pkgs/applications/networking/instant-messengers/profanity/default.nix
+4 -22
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoconf-archive
, autoreconfHook
, cmocka
@@ -10,7 +9,7 @@
, expect
, glib
, glibcLocales
, libmesode
, libstrophe
, libmicrohttpd
, libotr
, libuuid
@@ -36,34 +35,17 @@ assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
stdenv.mkDerivation rec {
pname = "profanity";
version = "0.11.1";
version = "0.12.0";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = version;
hash = "sha256-8WGHOy0fSW8o7vMCYZqqpvDsn81JZefM6wGfjQ5iKbU=";
hash = "sha256-kmixWp9Q2tMVp+tk5kbTdBfgRNghKk3+48L582hqlm8=";
};
patches = [
./patches/packages-osx.patch
# pullupstream fixes for ncurses-6.3
(fetchpatch {
name = "ncurses-6.3-p1.patch";
url = "https://github.com/profanity-im/profanity/commit/e5b6258c997d4faf36e2ffb8a47b386c5629b4eb.patch";
sha256 = "sha256-4rwpvsgfIQ60GcLS0O7Hyn7ZidREjYT+dVND54z0zrw=";
})
(fetchpatch {
name = "ncurses-6.3-p2.patch";
url = "https://github.com/profanity-im/profanity/commit/fd9ccec8dc604902bbb1d444dba4223ccee0a092.patch";
sha256 = "sha256-4gZaXoDNulBIR+e6y/9bJKXVactCHWS8H8lPJaJwVwE=";
})
(fetchpatch {
name = "ncurses-6.3-p3.patch";
url = "https://github.com/profanity-im/profanity/commit/242696f09a49c8446ba6aef8bdad65fb58a77715.patch";
sha256 = "sha256-BOYHkae9aIA7HaVM23Yu25TTK9e3SuV+u0FEi7Sn62I=";
})
];
enableParallelBuilding = true;
@@ -81,7 +63,7 @@ stdenv.mkDerivation rec {
expat
expect
glib
libmesode
libstrophe
libmicrohttpd
libotr
libuuid
pkgs/applications/science/misc/rink/default.nix
+3 -3
View File
@@ -2,17 +2,17 @@
, libiconv, Security }:
rustPlatform.buildRustPackage rec {
version = "0.6.2";
version = "0.6.3";
pname = "rink";
src = fetchFromGitHub {
owner = "tiffany352";
repo = "rink-rs";
rev = "v${version}";
sha256 = "sha256-l2Rj15zaJm94EHwvOssfvYQNOoWj45Nq9M85n+A0vo4=";
sha256 = "sha256-AhC3c6CpV0tlD6d/hFWt7hGj2UsXsOCeujkRSDlpvCM=";
};
cargoSha256 = "sha256-GhuvwVkDRFjC6BghaNMFZZG9hResTN1u0AuvIXlFmig=";
cargoSha256 = "sha256-Xo5iYwL4Db+GWMl5UXbPmj0Y0PJYR4Q0aUGnYCd+NB8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ]
pkgs/applications/version-management/git-and-tools/gh/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-NvVm/deO4LSIl5TSziqsrGt9atCXjt4UZ/VJfmX3i4c=";
sha256 = "sha256-edlGJD+80k1ySpyNcKc5c2O0MX+S4fQgH5mwHQUxXM8=";
};
vendorSha256 = "sha256-pBjg6WyD61+Bl3ttcpl/b9XoWBCi7cDvE8NPaZGu7Aw=";
vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ=";
nativeBuildInputs = [ installShellFiles ];
pkgs/desktops/gnome/apps/gnome-books/default.nix
+12 -1
View File
@@ -1,8 +1,10 @@
{ lib, stdenv
{ stdenv
, lib
, meson
, ninja
, gettext
, fetchurl
, fetchpatch
, evince
, gjs
, pkg-config
@@ -35,6 +37,15 @@ stdenv.mkDerivation rec {
sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5";
};
patches = [
# Fix build with meson 0.61
# https://gitlab.gnome.org/GNOME/gnome-books/-/merge_requests/62
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-books/-/commit/2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5.patch";
sha256 = "v2mLzrxSWrkJ0N6seR8jNXX14FsneEPuE9ELLVUe6+E=";
})
];
nativeBuildInputs = [
meson
ninja
pkgs/desktops/gnome/core/gnome-screenshot/default.nix
+54 -15
View File
@@ -1,18 +1,63 @@
{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3
, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
, gnome, gsettings-desktop-schemas }:
{ stdenv
, lib
, gettext
, libxml2
, libhandy
, fetchurl
, fetchpatch
, pkg-config
, libcanberra-gtk3
, gtk3
, glib
, meson
, ninja
, python3
, wrapGAppsHook
, appstream-glib
, desktop-file-utils
, gnome
, gsettings-desktop-schemas
}:
let
stdenv.mkDerivation rec {
pname = "gnome-screenshot";
version = "41.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc=";
};
patches = [
# Fix build with meson 0.61
# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/186
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-screenshot/-/commit/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch";
sha256 = "Js83h/3xxcw2hsgjzGa5lAYFXVrt6MPhXOTh5dZTx/w=";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
appstream-glib
libxml2
desktop-file-utils
python3
wrapGAppsHook
];
buildInputs = [
gtk3
glib
libcanberra-gtk3
libhandy
gnome.adwaita-icon-theme
gsettings-desktop-schemas
];
doCheck = true;
postPatch = ''
@@ -20,12 +65,6 @@ in stdenv.mkDerivation rec {
patchShebangs build-aux/postinstall.py
'';
nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [
gtk3 glib libcanberra-gtk3 libhandy gnome.adwaita-icon-theme
gsettings-desktop-schemas
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
@@ -34,10 +73,10 @@ in stdenv.mkDerivation rec {
};
meta = with lib; {
homepage = "https://en.wikipedia.org/wiki/GNOME_Screenshot";
homepage = "https://gitlab.gnome.org/GNOME/gnome-screenshot";
description = "Utility used in the GNOME desktop environment for taking screenshots";
maintainers = teams.gnome.members;
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
pkgs/desktops/gnome/devtools/devhelp/default.nix
+12 -1
View File
@@ -1,5 +1,7 @@
{ lib, stdenv
{ stdenv
, lib
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
@@ -29,6 +31,15 @@ stdenv.mkDerivation rec {
sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI=";
};
patches = [
# Fix build with meson 0.61
# https://gitlab.gnome.org/GNOME/devhelp/-/issues/59
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/devhelp/-/commit/281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch";
sha256 = "LmHoeQ0zJwOhuasAUYy8FfpDnEO+UNfEb293uKttYKo=";
})
];
nativeBuildInputs = [
meson
ninja
pkgs/desktops/gnome/games/gnome-2048/default.nix
+10
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, wrapGAppsHook
, meson
, vala
@@ -23,6 +24,15 @@ stdenv.mkDerivation rec {
sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2";
};
patches = [
# Fix build with meson 0.61
# https://gitlab.gnome.org/GNOME/gnome-2048/-/merge_requests/21
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-2048/-/commit/194e22699f7166a016cd39ba26dd719aeecfc868.patch";
sha256 = "Qpn/OJJwblRm5Pi453aU2HwbrNjsf+ftmSnns/5qZ9E=";
})
];
nativeBuildInputs = [
itstool
meson
pkgs/development/python-modules/dash/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dash";
version = "2.3.0";
version = "2.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "plotly";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iH56c2PO1G/NlLmYC+6sdAMZ+kXvUkpkqxfnl9EmDsQ=";
sha256 = "sha256-gsP/WbALUkO3AB0uuX/ByhzaeIDSUUE1Cb8Cnh4GEh0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/desktop-notifier/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.3.5";
version = "3.4.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SamSchott";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tXvA1EddTrOcTupQqZrX58jXiAqB5gMJP+OE3fZxGJI=";
sha256 = "sha256-lOXoiWY6gyWBL4RLrvslqcMmwtjMTOaHJZzsDO+C/F4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/dm-haiku/default.nix
+3
View File
@@ -7,6 +7,7 @@
, jaxlib
, jmp
, lib
, pytest-xdist
, pytestCheckHook
, tabulate
, tensorflow
@@ -33,9 +34,11 @@ buildPythonPackage rec {
cloudpickle
dm-tree
jaxlib
pytest-xdist
pytestCheckHook
tensorflow
];
pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
pythonImportsCheck = [
"haiku"
pkgs/development/python-modules/flax/default.nix
+3
View File
@@ -7,6 +7,7 @@
, msgpack
, numpy
, optax
, pytest-xdist
, pytestCheckHook
, tensorflow
}:
@@ -37,9 +38,11 @@ buildPythonPackage rec {
checkInputs = [
keras
pytest-xdist
pytestCheckHook
tensorflow
];
pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
disabledTestPaths = [
# Docs test, needs extra deps + we're not interested in it.
pkgs/development/python-modules/huawei-lte-api/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "huawei-lte-api";
version = "1.5.4";
version = "1.6";
disabled = pythonOlder "3.4";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Salamek";
repo = "huawei-lte-api";
rev = version;
hash = "sha256-aTxP2lVrGr2B+ELz7fnVZVB0nm9HHAb15wDafV44h7M=";
hash = "sha256-dJWGs5ZFVYp8/3U24eVRMtA7Marpd88GeW8uX+n6nhY=";
};
postPatch = ''
pkgs/development/python-modules/libcloud/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "apache-libcloud";
version = "3.5.0";
version = "3.5.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Bz8QSSl2+qODoisTuCwkmCfP6QoIPHFiDoMW6BWm2zs=";
sha256 = "sha256-7JLDlHj+kKJ+PP6IbEPLy5iaRZPCOf+fLB3XdSCGPPI=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/optax/default.nix
+3
View File
@@ -6,6 +6,7 @@
, jaxlib
, lib
, numpy
, pytest-xdist
, pytestCheckHook
}:
@@ -32,8 +33,10 @@ buildPythonPackage rec {
checkInputs = [
dm-haiku
pytest-xdist
pytestCheckHook
];
pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
pythonImportsCheck = [
"optax"
pkgs/development/python-modules/social-auth-app-django/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib, buildPythonPackage, fetchFromGitHub, social-auth-core, django, python }:
buildPythonPackage rec {
pname = "social-auth-app-django";
version = "5.0.0";
src = fetchFromGitHub {
owner = "python-social-auth";
repo = "social-app-django";
rev = version;
sha256 = "sha256-ONhdXxclHRpVtijpKEZlmGDhjid/jnTaPq6LQtjxCC4=";
};
propagatedBuildInputs = [
social-auth-core
];
pythonImportsCheck = [ "social_django" ];
checkInputs = [
django
];
checkPhase = ''
${python.interpreter} -m django test --settings="tests.settings"
'';
meta = with lib; {
homepage = "https://github.com/python-social-auth/social-app-django";
description = "Python Social Auth - Application - Django";
license = licenses.bsd3;
maintainers = with maintainers; [ n0emis ];
};
}
pkgs/development/python-modules/social-auth-core/default.nix
+63
View File
@@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, oauthlib
, requests_oauthlib
, pyjwt
, cryptography
, defusedxml
, python3-openid
, python-jose
, python3-saml
, pytestCheckHook
, httpretty
}:
buildPythonPackage rec {
pname = "social-auth-core";
version = "4.2.0";
src = fetchFromGitHub {
owner = "python-social-auth";
repo = "social-core";
rev = version;
sha256 = "sha256-kaL6sfAyQlzxszCEbhW7sns/mcOv0U+QgplmUd6oegQ=";
};
# Disable checking the code coverage
prePatch = ''
substituteInPlace social_core/tests/requirements.txt \
--replace "coverage>=3.6" "" \
--replace "pytest-cov>=2.7.1" ""
substituteInPlace tox.ini \
--replace "{posargs:-v --cov=social_core}" "{posargs:-v}"
'';
propagatedBuildInputs = [
requests
oauthlib
requests_oauthlib
pyjwt
cryptography
defusedxml
python3-openid
python-jose
python3-saml
];
checkInputs = [
pytestCheckHook
httpretty
];
pythonImportsCheck = [ "social_core" ];
meta = with lib; {
homepage = "https://github.com/python-social-auth/social-core";
description = "Python Social Auth - Core";
license = licenses.bsd3;
maintainers = with maintainers; [ n0emis ];
};
}
pkgs/development/python-modules/tensorflow-datasets/default.nix
+3
View File
@@ -24,6 +24,7 @@
, protobuf
, pycocotools
, pydub
, pytest-xdist
, pytestCheckHook
, requests
, scikitimage
@@ -88,12 +89,14 @@ buildPythonPackage rec {
pillow
pycocotools
pydub
pytest-xdist
pytestCheckHook
scikitimage
scipy
tensorflow
tifffile
];
pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
disabledTestPaths = [
# Sandbox violations: network access, filesystem write attempts outside of build dir, ...
pkgs/development/tools/wp-cli/default.nix
+1
View File
@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
mainProgram = "wp";
};
}
pkgs/os-specific/linux/rdma-core/default.nix
+8 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "rdma-core";
version = "39.0";
version = "39.1";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${version}";
sha256 = "sha256-7Z06bdCtv/gdZKzKfcU+JrWl4+b6b/cdKp8pMLCZZo0=";
sha256 = "19jfrb0jv050abxswzh34nx2zr8if3rb2k5a7n5ydvi3x9r8827w";
};
strictDeps = true;
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib"
];
patches = [
# this has been fixed in master. As soon as it gets into a release, this
# patch won't apply anymore and can be removed.
./pkg-config-template.patch
];
postPatch = ''
substituteInPlace srp_daemon/srp_daemon.sh.in \
--replace /bin/rm rm
pkgs/os-specific/linux/rdma-core/pkg-config-template.patch
+14
View File
@@ -0,0 +1,14 @@
diff -ru source/buildlib/template.pc.in source-fixed/buildlib/template.pc.in
--- source/buildlib/template.pc.in 1970-01-01 01:00:01.000000000 +0100
+++ source-fixed/buildlib/template.pc.in 2022-03-30 22:29:12.988625941 +0200
@@ -1,7 +1,6 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_INCLUDEDIR@
Name: lib@PC_LIB_NAME@
Description: RDMA Core Userspace Library
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix
Generated
+1029 -1842
View File
File diff suppressed because it is too large Load Diff
pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json
+28 -29
View File
@@ -1,11 +1,11 @@
{
"name": "matrix-appservice-irc",
"version": "0.32.1",
"version": "0.33.1",
"description": "An IRC Bridge for Matrix",
"main": "app.js",
"bin": "./bin/matrix-appservice-irc",
"engines": {
"node": ">=12"
"node": ">=14"
},
"scripts": {
"prepare": "npm run build",
@@ -26,46 +26,45 @@
"url": "https://github.com/matrix-org/matrix-appservice-irc/issues"
},
"dependencies": {
"@sentry/node": "^5.27.1",
"@sentry/node": "^6.17.9",
"bluebird": "^3.7.2",
"diff": "^5.0.0",
"escape-string-regexp": "^4.0.0",
"extend": "^3.0.2",
"he": "^1.2.0",
"logform": "^2.2.0",
"matrix-appservice-bridge": "^3.1.2",
"logform": "^2.4.0",
"matrix-appservice-bridge": "^3.2.0",
"matrix-org-irc": "^1.2.0",
"nedb": "^1.1.2",
"nodemon": "^2.0.7",
"matrix-bot-sdk": "0.5.19",
"nopt": "^3.0.1",
"p-queue": "^6.6.2",
"pg": "^8.6.0",
"quick-lru": "^4.0.1",
"pg": "^8.7.3",
"quick-lru": "^5.1.1",
"request": "^2.54.0",
"request-promise-native": "^1.0.9",
"sanitize-html": "^2.4.0",
"winston": "^3.3.3",
"winston-daily-rotate-file": "^4.5.5"
"sanitize-html": "^2.7.0",
"winston": "^3.6.0",
"winston-daily-rotate-file": "^4.6.1"
},
"devDependencies": {
"@types/bluebird": "^3.5.32",
"@types/diff": "^5.0.1",
"@tsconfig/node14": "^1.0.1",
"@types/bluebird": "^3.5.36",
"@types/diff": "^5.0.2",
"@types/express": "4.17.13",
"@types/express-serve-static-core": "4.17.28",
"@types/extend": "^3.0.1",
"@types/he": "^1.1.1",
"@types/nedb": "^1.8.11",
"@types/he": "^1.1.2",
"@types/nedb": "^1.8.12",
"@types/node": "^14",
"@types/nopt": "^3.0.29",
"@types/pg": "^8.6.0",
"@types/sanitize-html": "^2.3.1",
"@types/express": "4.17.11",
"@types/express-serve-static-core": "4.17.19",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"eslint": "^7.21.0",
"jasmine": "^3.6.2",
"nyc": "^14.1.1",
"prom-client": "13.1.0",
"proxyquire": "^1.4.0",
"typescript": "^4.4.3"
"@types/pg": "^8.6.4",
"@types/sanitize-html": "^2.6.2",
"@typescript-eslint/eslint-plugin": "^5.12.0",
"@typescript-eslint/parser": "^5.12.0",
"eslint": "^8.9.0",
"jasmine": "^3.99.0",
"proxyquire": "^2.1.3",
"nyc": "^15.1.0",
"request-promise-native": "^1.0.9",
"typescript": "^4.5.5"
}
}
pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json
+5 -4
View File
@@ -1,9 +1,10 @@
{
"url": "https://github.com/matrix-org/matrix-appservice-irc",
"rev": "6d5795ce9544c8d73f4846f1bd7190d352dddead",
"date": "2021-10-25T12:54:49+02:00",
"path": "/nix/store/by3iwfs5yayyv576qvfl650dgjw7jy5k-matrix-appservice-irc",
"sha256": "06v5ihn03vidfa8aq8q9yil5s0hdgz09hzsm75fk5v8d8bi3d7d4",
"rev": "00c8e7afb057021126c5e8ea9a46f2f8a55ea0bc",
"date": "2022-03-30T14:29:04+01:00",
"path": "/nix/store/9cm14kvicwc83irmbb8zsr8rc4893l22-matrix-appservice-irc",
"sha256": "1zhcihji9cwrdajx5dfnd4w38xsnqnqmwccngfiwrh8mwra7phfi",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix nix-prefetch-git
#! nix-shell -i bash -p nodePackages.node2nix curl jq nix nix-prefetch-git
set -euo pipefail
# cd to the folder containing this script
pkgs/servers/web-apps/netbox/config.patch
+50
View File
@@ -0,0 +1,50 @@
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index d5a7bfaec..68754a8c5 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -222,6 +222,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '')
TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)
TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False)
TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False)
+TASKS_REDIS_URL = TASKS_REDIS.get('URL')
# Caching
if 'caching' not in REDIS:
@@ -236,11 +237,12 @@ CACHING_REDIS_SENTINELS = REDIS['caching'].get('SENTINELS', [])
CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'default')
CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis'
CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False)
+CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}')
CACHES = {
'default': {
'BACKEND': 'django_redis.cache.RedisCache',
- 'LOCATION': f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}',
+ 'LOCATION': CACHING_REDIS_URL,
'OPTIONS': {
'CLIENT_CLASS': 'django_redis.client.DefaultClient',
'PASSWORD': CACHING_REDIS_PASSWORD,
@@ -383,7 +385,7 @@ USE_X_FORWARDED_HOST = True
X_FRAME_OPTIONS = 'SAMEORIGIN'
# Static files (CSS, JavaScript, Images)
-STATIC_ROOT = BASE_DIR + '/static'
+STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/')
STATIC_URL = f'/{BASE_PATH}static/'
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'project-static', 'dist'),
@@ -562,6 +564,14 @@ if TASKS_REDIS_USING_SENTINEL:
'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT
},
}
+elif TASKS_REDIS_URL:
+ RQ_PARAMS = {
+ 'URL': TASKS_REDIS_URL,
+ 'PASSWORD': TASKS_REDIS_PASSWORD,
+ 'SSL': TASKS_REDIS_SSL,
+ 'SSL_CERT_REQS': None if TASKS_REDIS_SKIP_TLS_VERIFY else 'required',
+ 'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT,
+ }
else:
RQ_PARAMS = {
'HOST': TASKS_REDIS_HOST,
pkgs/servers/web-apps/netbox/default.nix
+117
View File
@@ -0,0 +1,117 @@
{ lib
, pkgs
, fetchFromGitHub
, nixosTests
, python3
, plugins ? ps: [] }:
let
py = python3.override {
packageOverrides = self: super: {
django = super.django_3;
graphql-core = super.graphql-core.overridePythonAttrs (old: rec {
version = "3.1.7";
src = fetchFromGitHub {
owner = "graphql-python";
repo = old.pname;
rev = "v${version}";
sha256 = "1mwwh55qd5bcpvgy6pyliwn8jkmj4yk4d2pqb6mdkgqhdic2081l";
};
});
jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
version = "3.2.0";
src = self.fetchPypi {
pname = old.pname;
inherit version;
sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";
};
});
lxml = super.lxml.overridePythonAttrs (old: rec {
pname = "lxml";
version = "4.6.5";
src = self.fetchPypi {
inherit pname version;
sha256 = "6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca";
};
});
};
};
extraBuildInputs = plugins py.pkgs;
in
py.pkgs.buildPythonApplication rec {
pname = "netbox";
version = "3.1.10";
src = fetchFromGitHub {
owner = "netbox-community";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qREq4FJHHTA9Vm6f9kSfiYqur2omFmdsoZ4OdaPFcpU=";
};
format = "other";
patches = [
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
./config.patch
];
propagatedBuildInputs = with py.pkgs; [
django_3
django-cors-headers
django-debug-toolbar
django-filter
django-graphiql-debug-toolbar
django-mptt
django-pglocks
django-prometheus
django-redis
django-rq
django-tables2
django-taggit
django-timezone-field
djangorestframework
drf-yasg
graphene-django
jinja2
markdown
markdown-include
mkdocs-material
netaddr
pillow
psycopg2
pyyaml
social-auth-core
social-auth-app-django
svgwrite
tablib
jsonschema
] ++ extraBuildInputs;
installPhase = ''
mkdir -p $out/opt/netbox
cp -r . $out/opt/netbox
chmod +x $out/opt/netbox/netbox/manage.py
makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \
--prefix PYTHONPATH : "$PYTHONPATH"
'';
passthru = {
# PYTHONPATH of all dependencies used by the package
pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;
tests = {
inherit (nixosTests) netbox;
};
};
meta = with lib; {
homepage = "https://github.com/netbox-community/netbox";
description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
license = licenses.asl20;
maintainers = with maintainers; [ n0emis raitobezarius ];
};
}
pkgs/shells/oil/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "oil";
version = "0.9.8";
version = "0.9.9";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
sha256 = "sha256-OsrxfJ5dF9Anpg1r6Hj+aD194l99X9Yh4vIZ+R+aH8E=";
sha256 = "sha256-b2tMS5z4oejh3C/3vznIWhG4cd3anp5RuffhoORrKCQ=";
};
postPatch = ''
pkgs/tools/admin/pgadmin/3.nix
-63
View File
@@ -1,63 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
stdenv.mkDerivation rec {
pname = "pgadmin3";
version = "1.22.2";
src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz";
sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v";
};
enableParallelBuilding = true;
buildInputs = [ postgresql wxGTK openssl zlib ];
patches = [
(fetchpatch {
sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk";
name = "843344.patch";
url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344";
})
];
preConfigure = ''
substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
'';
configureFlags = [
"--with-pgsql=${postgresql}"
"--with-libxml2=${libxml2.dev}"
"--with-libxslt=${libxslt.dev}"
];
# starting with C++11 narrowing became an error
# and not just a warning. With the current c++ compiler
# pgadmin3 will fail with several "narrowing" errors.
# see https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html#index-Wno-narrowing
makeFlags = "CXXFLAGS=-Wno-narrowing" ;
meta = with lib; {
description = "PostgreSQL administration GUI tool";
homepage = "https://www.pgadmin.org";
license = licenses.gpl2;
maintainers = with maintainers; [ domenkozar wmertens ];
platforms = platforms.unix;
};
postFixup = let
desktopItem = makeDesktopItem {
name = "pgAdmin";
desktopName = "pgAdmin III";
genericName = "SQL Administration";
exec = "pgadmin3";
icon = "pgAdmin3";
categories = [ "Development" ];
mimeTypes = [ "text/html" ];
};
in ''
mkdir -p $out/share/pixmaps;
cp pgadmin/include/images/pgAdmin3.png $out/share/pixmaps/;
cp -rv ${desktopItem}/share/applications $out/share/
'';
}
pkgs/tools/admin/stripe-cli/default.nix
+1
View File
@@ -22,5 +22,6 @@ buildGoModule rec {
description = "A command-line tool for Stripe";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ RaghavSood ];
mainProgram = "stripe";
};
}
pkgs/tools/audio/botamusique/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@
, nodePackages
}:
let
nodejs = pkgs.nodejs-12_x;
nodejs = pkgs.nodejs-14_x;
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
pkgs/tools/backup/ddar/default.nix
-40
View File
@@ -1,40 +0,0 @@
{ lib, python2, fetchFromGitHub, roundup, ncurses }:
python2.pkgs.buildPythonApplication rec {
pname = "ddar";
version = "1.0";
src = fetchFromGitHub {
owner = "basak";
repo = pname;
rev = "v${version}";
sha256 = "158jdy5261k9yw540g48hddy5zyqrr81ir9fjlcy4jnrwfkg7ynm";
};
prePatch = ''
substituteInPlace t/local-functions \
--replace 'PATH="$ddar_src:$PATH"' 'PATH="$out/bin:$PATH"'
# Test requires additional software and compilation of some C programs
substituteInPlace t/basic-test.sh \
--replace it_stores_and_extracts_corpus0 dont_test
'';
preBuild = ''
make -f Makefile.prep synctus/ddar_pb2.py
'';
nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ];
propagatedBuildInputs = with python2.pkgs; [ protobuf ];
checkInputs = [ roundup ncurses ];
checkPhase = ''
roundup t/basic-test.sh
'';
meta = with lib; {
description = "Unix de-duplicating archiver";
license = licenses.gpl3;
homepage = src.meta.homepage;
};
}
pkgs/tools/misc/disper/default.nix
-36
View File
@@ -1,36 +0,0 @@
{ lib, stdenv, fetchFromGitHub, python2, xorg, makeWrapper }:
stdenv.mkDerivation rec {
pname = "disper";
version = "0.3.1.1";
src = fetchFromGitHub {
owner = "apeyser";
repo = pname;
rev = "${pname}-${version}";
sha256 = "1kl4py26n95q0690npy5mc95cv1cyfvh6kxn8rvk62gb8scwg9zn";
};
nativeBuildInputs = [ makeWrapper ];
strictDeps = true;
buildInputs = [ python2 ];
preConfigure = ''
export makeFlags="PREFIX=$out"
'';
postInstall = ''
wrapProgram $out/bin/disper \
--prefix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
'';
meta = {
description = "On-the-fly display switch utility";
homepage = "https://willem.engen.nl/projects/disper/";
platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
};
}
pkgs/tools/misc/esphome/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
version = "2022.3.1";
version = "2022.3.2";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-x2gdRUBpyhk6iKvuW6ZKSpokaHfYz1ugclBjP15rJsk=";
sha256 = "sha256-s5NisPUoppROM/p7qm1da4lStpAWZvk18zkUEsOn0Pg=";
};
postPatch = ''
pkgs/tools/misc/somafm-cli/default.nix
+1
View File
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ SuperSandro2000 ];
mainProgram = "somafm";
};
}
pkgs/tools/wayland/wl-mirror/default.nix
+2 -2
View File
@@ -26,13 +26,13 @@ in
stdenv.mkDerivation rec {
pname = "wl-mirror";
version = "0.8.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "Ferdi265";
repo = "wl-mirror";
rev = "v${version}";
hash = "sha256-P5rvZPpIStlOSGj3PaiXAMPWqgWpkC+4IrixEMwoGJU=";
hash = "sha256-W/8DApyd7KtrOrP7Qj6oPKXxLrVzHDuIMOdg+k5ngr4=";
};
patchPhase = ''
pkgs/top-level/aliases.nix
+3
View File
@@ -230,6 +230,7 @@ mapAliases ({
dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22
dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22
dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20
ddar = throw "ddar has been removed: abandoned by upstream"; # Added 2022-03-18
deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22
deadpixi-sam = deadpixi-sam-unstable;
@@ -255,6 +256,7 @@ mapAliases ({
devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22
dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26
digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22
disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18
displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12
dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22
dnnl = oneDNN; # Added 2020-04-22
@@ -847,6 +849,7 @@ mapAliases ({
perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22
perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22
pgadmin = pgadmin4;
pgadmin3 = throw "pgadmin3 was removed for being unmaintained, use pgadmin4 instead."; # Added 2022-03-30
pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22
pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22
pkgs/top-level/all-packages.nix
+2 -8
View File
@@ -2884,8 +2884,6 @@ with pkgs;
dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { };
ddar = callPackage ../tools/backup/ddar { };
ddate = callPackage ../tools/misc/ddate { };
ddosify = callPackage ../development/tools/ddosify { };
@@ -4899,8 +4897,6 @@ with pkgs;
dirvish = callPackage ../tools/backup/dirvish { };
disper = callPackage ../tools/misc/disper { };
dleyna-connector-dbus = callPackage ../development/libraries/dleyna-connector-dbus { };
dleyna-core = callPackage ../development/libraries/dleyna-core { };
@@ -8266,6 +8262,8 @@ with pkgs;
netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { };
netbox = callPackage ../servers/web-apps/netbox { };
netcat = libressl.nc;
netcat-gnu = callPackage ../tools/networking/netcat { };
@@ -34021,10 +34019,6 @@ with pkgs;
pgadmin4 = callPackage ../tools/admin/pgadmin { };
pgadmin3 = callPackage ../tools/admin/pgadmin/3.nix {
openssl = openssl_1_0_2;
};
pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { };
pgf = pgf2;
pkgs/top-level/python-packages.nix
+4
View File
@@ -9379,6 +9379,10 @@ in {
socketio-client = callPackage ../development/python-modules/socketio-client { };
social-auth-app-django = callPackage ../development/python-modules/social-auth-app-django { };
social-auth-core = callPackage ../development/python-modules/social-auth-core { };
socialscan = callPackage ../development/python-modules/socialscan { };
socid-extractor = callPackage ../development/python-modules/socid-extractor { };