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-11-20 00:15:26 +00:00
committed by GitHub
parent 01ce03efa4 fc627062ab
commit bcf3605380
166 changed files with 1468 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+7
View File
@@ -11330,6 +11330,13 @@
githubId = 35086;
name = "Jonathan Wright";
};
quantenzitrone = {
email = "quantenzitrone@protonmail.com";
github = "Quantenzitrone";
githubId = 74491719;
matrix = "@quantenzitrone:matrix.org";
name = "quantenzitrone";
};
queezle = {
email = "git@queezle.net";
github = "queezle42";
nixos/doc/manual/configuration/user-mgmt.chapter.md
+1 -2
View File
@@ -32,8 +32,7 @@ account will cease to exist. Also, imperative commands for managing users and
groups, such as useradd, are no longer available. Passwords may still be
assigned by setting the user\'s
[hashedPassword](#opt-users.users._name_.hashedPassword) option. A
hashed password can be generated using `mkpasswd -m
sha-512`.
hashed password can be generated using `mkpasswd`.
A user ID (uid) is assigned automatically. You can also specify a uid
manually by adding
nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml
+1 -1
View File
@@ -39,7 +39,7 @@ users.users.alice = {
Passwords may still be assigned by setting the user's
<link linkend="opt-users.users._name_.hashedPassword">hashedPassword</link>
option. A hashed password can be generated using
<literal>mkpasswd -m sha-512</literal>.
<literal>mkpasswd</literal>.
</para>
<para>
A user ID (uid) is assigned automatically. You can also specify a
nixos/lib/test-driver/test_driver/machine.py
+5 -4
View File
@@ -684,10 +684,10 @@ class Machine:
with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
retry(tty_matches)
def send_chars(self, chars: str) -> None:
def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None:
with self.nested("sending keys ‘{}‘".format(chars)):
for char in chars:
self.send_key(char)
self.send_key(char, delay)
def wait_for_file(self, filename: str) -> None:
"""Waits until the file exists in machine's file system."""
@@ -860,10 +860,11 @@ class Machine:
if matches is not None:
return
def send_key(self, key: str) -> None:
def send_key(self, key: str, delay: Optional[float] = 0.01) -> None:
key = CHAR_TO_KEY.get(key, key)
self.send_monitor_command("sendkey {}".format(key))
time.sleep(0.01)
if delay is not None:
time.sleep(delay)
def send_console(self, chars: str) -> None:
assert self.process
nixos/modules/config/users-groups.nix
+21 -1
View File
@@ -35,7 +35,7 @@ let
'';
hashedPasswordDescription = ''
To generate a hashed password run `mkpasswd -m sha-512`.
To generate a hashed password run `mkpasswd`.
If set to an empty string (`""`), this user will
be able to log in without being asked for a password (but not via remote
@@ -592,6 +592,26 @@ in {
'';
};
# Warn about user accounts with deprecated password hashing schemes
system.activationScripts.hashes = {
deps = [ "users" ];
text = ''
users=()
while IFS=: read -r user hash tail; do
if [[ "$hash" = "$"* && ! "$hash" =~ ^\$(y|gy|7|2b|2y|2a|6)\$ ]]; then
users+=("$user")
fi
done </etc/shadow
if (( "''${#users[@]}" )); then
echo "
WARNING: The following user accounts rely on password hashes that will
be removed in NixOS 23.05. They should be renewed as soon as possible."
printf ' - %s\n' "''${users[@]}"
fi
'';
};
# for backwards compatibility
system.activationScripts.groups = stringAfter [ "users" ] "";
nixos/modules/module-list.nix
+2
View File
@@ -382,6 +382,7 @@
./services/databases/pgmanage.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/surrealdb.nix
./services/databases/victoriametrics.nix
./services/desktops/accountsservice.nix
./services/desktops/bamf.nix
@@ -718,6 +719,7 @@
./services/monitoring/teamviewer.nix
./services/monitoring/telegraf.nix
./services/monitoring/thanos.nix
./services/monitoring/tremor-rs.nix
./services/monitoring/tuptime.nix
./services/monitoring/unifi-poller.nix
./services/monitoring/ups.nix
nixos/modules/services/databases/surrealdb.nix
+79
View File
@@ -0,0 +1,79 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.surrealdb;
in {
options = {
services.surrealdb = {
enable = mkEnableOption (lib.mdDoc "A scalable, distributed, collaborative, document-graph database, for the realtime web ");
dbPath = mkOption {
type = types.str;
description = lib.mdDoc ''
The path that surrealdb will write data to. Use null for in-memory.
Can be one of "memory", "file://:path", "tikv://:addr".
'';
default = "file:///var/lib/surrealdb/";
example = "memory";
};
host = mkOption {
type = types.str;
description = lib.mdDoc ''
The host that surrealdb will connect to.
'';
default = "127.0.0.1";
example = "127.0.0.1";
};
port = mkOption {
type = types.port;
description = lib.mdDoc ''
The port that surrealdb will connect to.
'';
default = 8000;
example = 8000;
};
};
};
config = mkIf cfg.enable {
# Used to connect to the running service
environment.systemPackages = [ pkgs.surrealdb ] ;
systemd.services.surrealdb = {
description = "A scalable, distributed, collaborative, document-graph database, for the realtime web ";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.surrealdb}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${optionalString (cfg.dbPath != null) "-- ${cfg.dbPath}"}";
DynamicUser = true;
Restart = "on-failure";
StateDirectory = "surrealdb";
CapabilityBoundingSet = "";
NoNewPrivileges = true;
PrivateTmp = true;
ProtectHome = true;
ProtectClock = true;
ProtectProc = "noaccess";
ProcSubset = "pid";
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectControlGroups = true;
ProtectHostname = true;
RestrictSUIDSGID = true;
RestrictRealtime = true;
RestrictNamespaces = true;
LockPersonality = true;
RemoveIPC = true;
SystemCallFilter = [ "@system-service" "~@privileged" ];
};
};
};
}
nixos/modules/services/monitoring/tremor-rs.nix
+129
View File
@@ -0,0 +1,129 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.tremor-rs;
loggerSettingsFormat = pkgs.formats.yaml { };
loggerConfigFile = loggerSettingsFormat.generate "logger.yaml" cfg.loggerSettings;
in {
options = {
services.tremor-rs = {
enable = lib.mkEnableOption (lib.mdDoc "Tremor event- or stream-processing system");
troyFileList = mkOption {
type = types.listOf types.path;
default = [];
description = lib.mdDoc "List of troy files to load.";
};
tremorLibDir = mkOption {
type = types.path;
default = "";
description = lib.mdDoc "Directory where to find /lib containing tremor script files";
};
host = mkOption {
type = types.str;
default = "127.0.0.1";
description = lib.mdDoc "The host tremor should be listening on";
};
port = mkOption {
type = types.port;
default = 9898;
description = lib.mdDoc "the port tremor should be listening on";
};
loggerSettings = mkOption {
description = lib.mdDoc "Tremor logger configuration";
default = {};
type = loggerSettingsFormat.type;
example = {
refresh_rate = "30 seconds";
appenders.stdout.kind = "console";
root = {
level = "warn";
appenders = [ "stdout" ];
};
loggers = {
tremor_runtime = {
level = "debug";
appenders = [ "stdout" ];
additive = false;
};
tremor = {
level = "debug";
appenders = [ "stdout" ];
additive = false;
};
};
};
defaultText = literalExpression ''
{
refresh_rate = "30 seconds";
appenders.stdout.kind = "console";
root = {
level = "warn";
appenders = [ "stdout" ];
};
loggers = {
tremor_runtime = {
level = "debug";
appenders = [ "stdout" ];
additive = false;
};
tremor = {
level = "debug";
appenders = [ "stdout" ];
additive = false;
};
};
}
'';
};
};
};
config = mkIf (cfg.enable) {
environment.systemPackages = [ pkgs.tremor-rs ] ;
systemd.services.tremor-rs = {
description = "Tremor event- or stream-processing system";
wantedBy = [ "multi-user.target" ];
requires = [ "network-online.target" ];
after = [ "network-online.target" ];
environment.TREMOR_PATH = "${pkgs.tremor-rs}/lib:${cfg.tremorLibDir}";
serviceConfig = {
ExecStart = "${pkgs.tremor-rs}/bin/tremor --logger-config ${loggerConfigFile} server run ${concatStringsSep " " cfg.troyFileList} --api-host ${cfg.host}:${toString cfg.port}";
DynamicUser = true;
Restart = "always";
NoNewPrivileges = true;
PrivateTmp = true;
ProtectHome = true;
ProtectClock = true;
ProtectProc = "noaccess";
ProcSubset = "pid";
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectControlGroups = true;
ProtectHostname = true;
RestrictSUIDSGID = true;
RestrictRealtime = true;
RestrictNamespaces = true;
LockPersonality = true;
RemoveIPC = true;
SystemCallFilter = [ "@system-service" "~@privileged" ];
};
};
};
}
nixos/modules/services/web-apps/keycloak.nix
+25 -2
View File
@@ -482,6 +482,10 @@ in
assertion = (cfg.database.useSSL && cfg.database.type == "postgresql") -> (cfg.database.caCert != null);
message = "A CA certificate must be specified (in 'services.keycloak.database.caCert') when PostgreSQL is used with SSL";
}
{
assertion = createLocalPostgreSQL -> config.services.postgresql.settings.standard_conforming_strings or true;
message = "Setting up a local PostgreSQL db for Keycloak requires `standard_conforming_strings` turned on to work reliably";
}
];
environment.systemPackages = [ keycloakBuild ];
@@ -544,7 +548,13 @@ in
create_role="$(mktemp)"
trap 'rm -f "$create_role"' EXIT
# Read the password from the credentials directory and
# escape any single quotes by adding additional single
# quotes after them, following the rules laid out here:
# https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS
db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
db_password="''${db_password//\'/\'\'}"
echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role"
psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role"
psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
@@ -566,8 +576,16 @@ in
script = ''
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
# Read the password from the credentials directory and
# escape any single quotes by adding additional single
# quotes after them, following the rules laid out here:
# https://dev.mysql.com/doc/refman/8.0/en/string-literals.html
db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
db_password="''${db_password//\'/\'\'}"
( echo "SET sql_mode = 'NO_BACKSLASH_ESCAPES';"
echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
) | mysql -N
@@ -632,12 +650,17 @@ in
${secretReplacements}
# Escape any backslashes in the db parameters, since
# they're otherwise unexpectedly read as escape
# sequences.
sed -i '/db-/ s|\\|\\\\|g' /run/keycloak/conf/keycloak.conf
'' + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''
mkdir -p /run/keycloak/ssl
cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/
'' + ''
export KEYCLOAK_ADMIN=admin
export KEYCLOAK_ADMIN_PASSWORD=${cfg.initialAdminPassword}
export KEYCLOAK_ADMIN_PASSWORD=${escapeShellArg cfg.initialAdminPassword}
kc.sh start --optimized
'';
};
nixos/modules/system/boot/stage-1-init.sh
+9 -1
View File
@@ -342,6 +342,14 @@ checkFS() {
return 0
}
escapeFstab() {
local original="$1"
# Replace space
local escaped="${original// /\\040}"
# Replace tab
echo "${escaped//$'\t'/\\011}"
}
# Function for mounting a file system.
mountFS() {
@@ -569,7 +577,7 @@ while read -u 3 mountPoint; do
continue
fi
mountFS "$device" "$mountPoint" "$options" "$fsType"
mountFS "$device" "$(escapeFstab "$mountPoint")" "$(escapeFstab "$options")" "$fsType"
done
exec 3>&-
nixos/modules/tasks/filesystems.nix
+1 -1
View File
@@ -167,7 +167,7 @@ let
else throw "No device specified for mount point ‘${fs.mountPoint}’.")
+ " " + escape (rootPrefix + fs.mountPoint)
+ " " + fs.fsType
+ " " + builtins.concatStringsSep "," (fs.options ++ (extraOpts fs))
+ " " + escape (builtins.concatStringsSep "," (fs.options ++ (extraOpts fs)))
+ " " + (optionalString (!excludeChecks)
("0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2")))
+ "\n"
nixos/release-combined.nix
+1
View File
@@ -77,6 +77,7 @@ in rec {
(onFullSupported "nixos.tests.i3wm")
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple")
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault")
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolEscape")
(onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvols")
(onSystems ["x86_64-linux"] "nixos.tests.installer.luksroot")
(onSystems ["x86_64-linux"] "nixos.tests.installer.lvm")
nixos/tests/all-tests.nix
+2 -1
View File
@@ -252,8 +252,8 @@ in {
haproxy = handleTest ./haproxy.nix {};
hardened = handleTest ./hardened.nix {};
healthchecks = handleTest ./web-apps/healthchecks.nix {};
hbase1 = handleTest ./hbase.nix { package=pkgs.hbase1; };
hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; };
hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; };
hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };
hedgedoc = handleTest ./hedgedoc.nix {};
herbstluftwm = handleTest ./herbstluftwm.nix {};
@@ -491,6 +491,7 @@ in {
pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {};
pgjwt = handleTest ./pgjwt.nix {};
pgmanage = handleTest ./pgmanage.nix {};
phosh = handleTest ./phosh.nix {};
php = handleTest ./php {};
php80 = handleTest ./php { php = pkgs.php80; };
php81 = handleTest ./php { php = pkgs.php81; };
nixos/tests/installer-systemd-stage-1.nix
+4 -3
View File
@@ -8,9 +8,10 @@
# them when fixed.
inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })
# bcache
# btrfsSimple
# btrfsSubvolDefault
# btrfsSubvols
btrfsSimple
btrfsSubvolDefault
btrfsSubvolEscape
btrfsSubvols
# encryptedFSWithKeyfile
# grub1
# luksroot
nixos/tests/installer.nix
+21
View File
@@ -911,4 +911,25 @@ in {
)
'';
};
# Test to see if we can deal with subvols that need to be escaped in fstab
btrfsSubvolEscape = makeInstallerTest "btrfsSubvolEscape" {
createPartitions = ''
machine.succeed(
"sgdisk -Z /dev/vda",
"sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
"mkfs.btrfs -L root /dev/vda3",
"btrfs device scan",
"mount LABEL=root /mnt",
"btrfs subvol create '/mnt/nixos in space'",
"btrfs subvol create /mnt/boot",
"umount /mnt",
"mount -o 'defaults,subvol=nixos in space' LABEL=root /mnt",
"mkdir /mnt/boot",
"mount -o defaults,subvol=boot LABEL=root /mnt/boot",
)
'';
};
}
nixos/tests/keycloak.nix
+10 -7
View File
@@ -5,10 +5,13 @@
let
certs = import ./common/acme/server/snakeoil-certs.nix;
frontendUrl = "https://${certs.domain}";
initialAdminPassword = "h4IhoJFnt2iQIR9";
keycloakTest = import ./make-test-python.nix (
{ pkgs, databaseType, ... }:
let
initialAdminPassword = "h4Iho\"JFn't2>iQIR9";
adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
in
{
name = "keycloak";
meta = with pkgs.lib.maintainers; {
@@ -37,7 +40,7 @@ let
type = databaseType;
username = "bogus";
name = "also bogus";
passwordFile = "${pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH"}";
passwordFile = "${pkgs.writeText "dbPassword" ''wzf6\"vO"Cb\nP>p#6;c&o?eu=q'THE'''H''''E''}";
};
plugins = with config.services.keycloak.package.plugins; [
keycloak-discord
@@ -111,7 +114,7 @@ let
keycloak.succeed("""
curl -sSf -d 'client_id=admin-cli' \
-d 'username=admin' \
-d 'password=${initialAdminPassword}' \
-d "password=$(<${adminPasswordFile})" \
-d 'grant_type=password' \
'${frontendUrl}/realms/master/protocol/openid-connect/token' \
| jq -r '"Authorization: bearer " + .access_token' >admin_auth_header
@@ -119,10 +122,10 @@ let
# Register the metrics SPI
keycloak.succeed(
"${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt",
"KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password '${initialAdminPassword}'",
"KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'",
"curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'"
"""${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt""",
"""KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password "$(<${adminPasswordFile})" """,
"""KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'""",
"""curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'"""
)
# Publish the realm, including a test OIDC client and user
nixos/tests/phosh.nix
+65
View File
@@ -0,0 +1,65 @@
import ./make-test-python.nix ({ pkgs, ...}: let
pin = "1234";
in {
name = "phosh";
meta = with pkgs.lib.maintainers; {
maintainers = [ zhaofengli ];
};
nodes = {
phone = { config, pkgs, ... }: {
users.users.nixos = {
isNormalUser = true;
password = pin;
};
services.xserver.desktopManager.phosh = {
enable = true;
user = "nixos";
group = "users";
phocConfig = {
outputs.Virtual-1 = {
scale = 2;
};
};
};
systemd.services.phosh = {
environment = {
# Accelerated graphics fail on phoc 0.20 (wlroots 0.15)
"WLR_RENDERER" = "pixman";
};
};
virtualisation.resolution = { x = 720; y = 1440; };
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci,xres=720,yres=1440" ];
};
};
enableOCR = true;
testScript = ''
import time
start_all()
phone.wait_for_unit("phosh.service")
with subtest("Check that we can see the lock screen info page"):
# Saturday, January 1
phone.succeed("timedatectl set-time '2022-01-01 07:00'")
phone.wait_for_text("Saturday")
phone.screenshot("01lockinfo")
with subtest("Check that we can unlock the screen"):
phone.send_chars("${pin}", delay=0.2)
time.sleep(1)
phone.screenshot("02unlock")
phone.send_chars("\n")
phone.wait_for_text("All Apps")
phone.screenshot("03launcher")
'';
})
pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
version = "4.4.2";
version = "4.4.3";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
sha256 = "sha256-nLXpf0Xi7yuz/Rm8Sfkr1PGLuazN+Lh6sIqkWFBmP3w=";
sha256 = "sha256-NP9cM1xIHblMdUFKIviPKDi6su6Nc3xsX2pnPeP7hdQ=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
pkgs/applications/audio/lollypop/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
version = "1.4.36";
version = "1.4.35";
format = "other";
doCheck = false;
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "sha256-Ka/rYgWGuCQTzguJiyQpY5SPC1iB5XOVy/Gezj+DYpk=";
sha256 = "sha256-Rdp0gZjdj2tXOWarsTpqgvSZVXAQsCLfk5oUyalE/ZA=";
};
nativeBuildInputs = [
pkgs/applications/audio/praat/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
version = "6.2.23";
version = "6.3";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
sha256 = "sha256-gl+kT8wXLCWnNmOBx6Vg+FbmJ8kJ8pJKsahpqcYw9Lk=";
sha256 = "sha256-/XSBUM6HkANATl1Y9vs8mQFgBTyVeCv8TxcaIdP/Nm8=";
};
configurePhase = ''
pkgs/applications/audio/ptcollab/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "ptcollab";
version = "0.6.4.1";
version = "0.6.4.5";
src = fetchFromGitHub {
owner = "yuxshao";
repo = "ptcollab";
rev = "v${version}";
sha256 = "sha256-/Z0UDxZtVnGKVmscNCZAvTGMALq/uMd7/h3r/QvUs0M=";
sha256 = "sha256-O7CNPMS0eRcqt2xAtyEFyLSV8U2xbxuV1DpBxZAFwQs=";
};
nativeBuildInputs = [ qmake pkg-config ];
pkgs/applications/blockchains/nearcore/default.nix
+3 -3
View File
@@ -4,7 +4,7 @@
}:
rustPlatform.buildRustPackage rec {
pname = "nearcore";
version = "1.29.0";
version = "1.29.1";
# https://github.com/near/nearcore/tags
src = fetchFromGitHub {
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
# there is also a branch for this version number, so we need to be explicit
rev = "refs/tags/${version}";
sha256 = "sha256-TOZ6j4CaiOXmNn8kgVGP27SjvLDlGvabAA+PAEyFXIk=";
sha256 = "sha256-TmmGLrDpNOfadOIwmG7XRgI89XQjaqIavxCEE2plumc=";
};
cargoSha256 = "sha256-LjBgsQynHIfrQP4Z7j1J8+PLqRZWGAOQ5dJaGOqabVk=";
cargoSha256 = "sha256-4suoHP6AXhXlt7+sHMX5RW/LGZrbMhNNmzYvFBcnMTs=";
cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ];
postPatch = ''
pkgs/applications/editors/neovim/default.nix
+2 -2
View File
@@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "sha256-mVeVjkP8JpTi2aW59ZuzQPi5YvEySVAtxko7xxAx/es=";
sha256 = "sha256-B2ZpwhdmdvPOnxVyJDfNzUT5rTVuBhJXyMwwzCl9Fac=";
};
patches = [
pkgs/applications/emulators/basiliskii/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2 }:
{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }:
stdenv.mkDerivation {
pname = "basiliskii";
version = "unstable-2022-09-30";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sourceRoot = "source/BasiliskII/src/Unix";
patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ];
nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = [ SDL2 gtk2 ];
buildInputs = [ SDL2 gtk2 mpfr ];
preConfigure = ''
NO_CONFIGURE=1 ./autogen.sh
'';
pkgs/applications/emulators/duckstation/default.nix
+16 -15
View File
@@ -4,31 +4,32 @@
, SDL2
, cmake
, copyDesktopItems
, makeDesktopItem
, curl
, extra-cmake-modules
, libevdev
, libpulseaudio
, libXrandr
, libpulseaudio
, makeDesktopItem
, mesa # for libgbm
, ninja
, pkg-config
, qtbase
, qtsvg
, qttools
, vulkan-loader
#, wayland # Wayland doesn't work correctly this version
, wayland
, wrapQtAppsHook
, enableWayland ? true
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "duckstation";
version = "unstable-2022-07-08";
version = "unstable-2022-11-18";
src = fetchFromGitHub {
owner = "stenzek";
repo = pname;
rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f";
sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs=";
repo = "duckstation";
rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b";
sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4=";
};
nativeBuildInputs = [
@@ -44,19 +45,19 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL2
curl
libevdev
libpulseaudio
libXrandr
mesa
qtbase
qtsvg
vulkan-loader
#wayland
];
]
++ lib.optionals enableWayland [ wayland ];
cmakeFlags = [
"-DUSE_DRMKMS=ON"
#"-DUSE_WAYLAND=ON"
];
]
++ lib.optionals enableWayland [ "-DUSE_WAYLAND=ON" ];
desktopItems = [
(makeDesktopItem {
@@ -80,7 +81,7 @@ stdenv.mkDerivation rec {
cp -r bin $out/share/duckstation
ln -s $out/share/duckstation/duckstation-qt $out/bin/
install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png
install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png
runHook postInstall
'';
pkgs/applications/emulators/sameboy/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sameboy";
version = "0.15.6";
version = "0.15.8";
src = fetchFromGitHub {
owner = "LIJI32";
repo = "SameBoy";
rev = "v${version}";
sha256 = "sha256-WsZuOKq/Dfk2zgYFXSwZPUuPrJQJ3y3mJHL6s61mTig=";
sha256 = "sha256-SBK+aYekEJreD0XBvYaU12eIKmm9JNYIpPt1XhUtH4c=";
};
enableParallelBuilding = true;
pkgs/applications/graphics/qimgv/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
mkDerivation rec {
pname = "qimgv";
version = "1.0.2";
version = "1.0.3-alpha";
src = fetchFromGitHub {
owner = "easymodo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YlV/ysm7bdPverpKpanrL+jPVvMtP1paoAm0PREMaww=";
sha256 = "sha256-fHMSo8zlOl9Lt8nYwClUzON4TPB9Ogwven+TidsesxY=";
};
nativeBuildInputs = [
pkgs/applications/graphics/qimgv/qt5-12-compat.diff
-13
View File
@@ -1,13 +0,0 @@
diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
index 96ec9d3..6d95d08 100644
--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
+++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) {
void LinuxWorker::run() {
emit started();
- isRunning.storeRelaxed(true);
+ isRunning.store(true);
if (fd == -1) {
qDebug() << TAG << "File descriptor isn't set! Stopping";
pkgs/applications/kde/kdevelop/kdevelop.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules
, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase
, qtquickcontrols, qttools, kde-cli-tools, qtbase
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
@@ -24,7 +24,7 @@ mkDerivation rec {
];
propagatedBuildInputs = [
qtquickcontrols qtwebkit boost libkomparediff2
qtquickcontrols boost libkomparediff2
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
pkgs/applications/kde/rocs.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, boost,
qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee,
qtbase, qtscript, qtquickcontrols, qtxmlpatterns, grantlee,
kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons
}:
@@ -19,7 +19,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost
qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee
qtbase qtscript qtquickcontrols qtxmlpatterns grantlee
kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons
];
}
pkgs/applications/misc/eureka-ideas/default.nix
+8 -5
View File
@@ -2,6 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, openssl
, stdenv
, Security
@@ -22,13 +23,15 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
checkFlags = lib.optionals stdenv.isLinux [
# failing on linux for unknown reasons
"--skip=config_manager::tests"
buildInputs = [
libgit2
openssl
] ++ lib.optionals stdenv.isDarwin [
Security
];
dontUseCargoParallelTests = true;
meta = with lib; {
description = "CLI tool to input and store your ideas without leaving the terminal";
homepage = "https://github.com/simeg/eureka";
pkgs/applications/misc/metadata-cleaner/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
version = "2.2.5";
version = "2.2.7";
format = "other";
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = pname;
rev = "v${version}";
hash = "sha256-Yb5tCvhVg9p4v7++MmoaeQDyP1qdfpHM+IGj8BoacVs=";
hash = "sha256-Kqvnw0cPPkqgJQdc6vkP4U96AQuyFSNMQTzTdIUghWw=";
};
nativeBuildInputs = [
pkgs/applications/misc/process-compose/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "process-compose";
version = "0.24.1";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
sha256 = "TKLLq6I+Mcvdz51m8nydTWcslBcQlJCJFoJ10SgfVWU=";
};
ldflags = [ "-X main.version=v${version}" ];
nativeBuildInputs = [ installShellFiles ];
vendorSha256 = "IsO1B6z1/HoGQ8xdNKQqZ/eZd90WikDbU9XiP0z28mU=";
doCheck = false;
postInstall = ''
mv $out/bin/{src,process-compose}
installShellCompletion --cmd process-compose \
--bash <($out/bin/process-compose completion bash) \
--zsh <($out/bin/process-compose completion zsh) \
--fish <($out/bin/process-compose completion fish)
'';
meta = with lib; {
description = "A simple and flexible scheduler and orchestrator to manage non-containerized applications";
homepage = "https://github.com/F1bonacc1/process-compose";
license = licenses.asl20;
maintainers = with maintainers; [ thenonameguy ];
mainProgram = "process-compose";
};
}
pkgs/applications/networking/browsers/luakit/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "luakit";
version = "2.3";
version = "2.3.1";
src = fetchFromGitHub {
owner = "luakit";
repo = pname;
rev = version;
hash = "sha256-5YeJkbWk1wHxWXqWOvhEDeScWPU/aRVhuOWRHLSHVZM=";
hash = "sha256-6baN3e5ZJ8hw6mhQ0AapyVIYFSdmXcfo45ReQNliIPw=";
};
nativeBuildInputs = [
pkgs/applications/networking/cluster/kubeseal/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubeseal";
version = "0.19.1";
version = "0.19.2";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "sha256-+WwxYnVW6rdZ+A4L2qLtXXaMWLC4ulEoP+vtdtkLvlE=";
sha256 = "sha256-LluWV/GWBJ+dmn94GtqPNCIDTZk2zlNhrbcM2pALUpU=";
};
vendorSha256 = "sha256-505nUMuFteOfIurGYRGHqo9diTSEa56tmQZ3jIGtULQ=";
vendorSha256 = "sha256-f7rznlRKEkHsU72QvRpOtvhg5rp9PuEoADhQOeD16rU=";
subPackages = [ "cmd/kubeseal" ];
pkgs/applications/networking/cluster/terraform-providers/providers.json
+10 -10
View File
@@ -423,13 +423,13 @@
"version": "2.2.0"
},
"github": {
"hash": "sha256-cLBBz5qPRY+TpcO0yfyTXOQLQYz58hB1l6ufThbBSuM=",
"hash": "sha256-3ivfHKoj7jXQ3WsoTNSCL1zD93Pr0pjtZ9LneW9My4o=",
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v5.8.0",
"rev": "v5.9.0",
"vendorHash": null,
"version": "5.8.0"
"version": "5.9.0"
},
"gitlab": {
"hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=",
@@ -642,13 +642,13 @@
"version": "1.14.0"
},
"kubernetes": {
"hash": "sha256-93cGlfYUH4VTdDYbtGySOUw5Kak7hKs0gxLCT0Bxca4=",
"hash": "sha256-hWFC8VBbM3BRGrX1Y45Znd/W3klYy/7aS7JbbKN7EUg=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
"repo": "terraform-provider-kubernetes",
"rev": "v2.15.0",
"rev": "v2.16.0",
"vendorHash": null,
"version": "2.15.0"
"version": "2.16.0"
},
"launchdarkly": {
"hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=",
@@ -1121,13 +1121,13 @@
"version": "1.78.12"
},
"tfe": {
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
"hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
"repo": "terraform-provider-tfe",
"rev": "v0.38.0",
"vendorHash": "sha256-reXq1MyAhHRet1WwDJZafdOg1r7J4sktQ/QhQUPhDak=",
"version": "0.38.0"
"rev": "v0.39.0",
"vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=",
"version": "0.39.0"
},
"thunder": {
"hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
pkgs/applications/networking/feedreaders/goeland/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "goeland";
version = "0.12.1";
version = "0.12.3";
src = fetchFromGitHub {
owner = "slurdge";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7ZfZ5sf8vK51geWZ5iKFPwd/v26f7MTDmtKkxamKwRQ=";
sha256 = "sha256-R3ZkGTq0g90DkflLXr2MUBIv5Qspi3OM+sdDGqJYjyw=";
};
vendorSha256 = "sha256-iljGBe8c6dqEHRpMN5cz7wmminejoiXXDKuQDazDztA=";
pkgs/applications/networking/go-graft/default.nix
+3 -3
View File
@@ -2,19 +2,19 @@
buildGoModule rec {
pname = "go-graft";
version = "0.2.14";
version = "0.2.15";
src = fetchFromGitHub {
owner = "mzz2017";
repo = "gg";
rev = "v${version}";
sha256 = "sha256-XymtLguAHCtOrRADRcWsPYq9cZo+FVUPOceIj7SmH8k=";
sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA=";
};
CGO_ENABLED = 0;
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
vendorSha256 = "sha256-MJMOCUIosLT9XhRsahQMx4Kq6j/aqCjhPq0ZvJc/Soc=";
vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI=";
subPackages = [ "." ];
meta = with lib; {
pkgs/applications/networking/instant-messengers/go-neb/default.nix
+2 -1
View File
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests, olm }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests, olm }:
buildGoModule {
pname = "go-neb";
@@ -21,6 +21,7 @@ buildGoModule {
passthru.tests.go-neb = nixosTests.go-neb;
meta = with lib; {
broken = stdenv.isDarwin;
description = "Extensible matrix bot written in Go";
homepage = "https://github.com/matrix-org/go-neb";
license = licenses.asl20;
pkgs/applications/networking/sniffers/kismet/default.nix
+79 -26
View File
@@ -1,36 +1,43 @@
{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd
, sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils
, withNetworkManager ? false, glib, networkmanager
, withPython ? false, python3
, withSensors ? false, lm_sensors}:
# couldn't get python modules to build correctly,
# waiting for some other volunteer to fix it
assert !withPython;
{ lib
, stdenv
, binutils
, elfutils
, fetchurl
, glib
, libcap
, libmicrohttpd
, libnl
, libpcap
, libusb1
, libwebsockets
, lm_sensors
, networkmanager
, pcre
, pkg-config
, openssl
, protobuf
, protobufc
, python3
, sqlite
, withNetworkManager ? false
, withPython ? true
, withSensors ? false
, zlib
}:
stdenv.mkDerivation rec {
pname = "kismet";
version = "2020-09-R2";
version = "2022-08-R1";
src = fetchurl {
url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";
sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg";
hash = "sha256-IUnM6sVSZQhlP00C3PemlOPaPcAAojcqHuS/mYgnl4E=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc
libusb1 libcap binutils elfutils
] ++ lib.optionals withNetworkManager [ networkmanager glib ]
++ lib.optional withSensors lm_sensors
++ lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf
ps.numpy ps.pyserial ]));
configureFlags = []
++ lib.optional (!withNetworkManager) "--disable-libnm"
++ lib.optional (!withPython) "--disable-python-tools"
++ lib.optional (!withSensors) "--disable-lmsensors";
postPatch = ''
substituteInPlace Makefile.in \
--replace "-m 4550" ""
'';
postConfigure = ''
sed -e 's/-o $(INSTUSR)//' \
@@ -40,12 +47,58 @@ stdenv.mkDerivation rec {
-i Makefile
'';
nativeBuildInputs = [
pkg-config
] ++ lib.optionals withPython [
python3
];
buildInputs = [
binutils
elfutils
libcap
libmicrohttpd
libnl
libpcap
openssl
libusb1
libwebsockets
pcre
protobuf
protobufc
sqlite
zlib
] ++ lib.optionals withNetworkManager [
networkmanager
glib
] ++ lib.optional withSensors [
lm_sensors
];
propagatedBuildInputs = [
] ++ lib.optional withPython (python3.withPackages (ps: [
ps.numpy
ps.protobuf
ps.pyserial
ps.setuptools
ps.websockets
]));
configureFlags = [
] ++ lib.optional (!withNetworkManager) [
"--disable-libnm"
] ++ lib.optional (!withPython) [
"--disable-python-tools"
] ++ lib.optional (!withSensors) [
"--disable-lmsensors"
];
enableParallelBuilding = true;
meta = with lib; {
description = "Wireless network sniffer";
homepage = "https://www.kismetwireless.net/";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
pkgs/applications/networking/twtxt/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "twtxt";
version = "1.2.3";
version = "1.3.1";
src = fetchFromGitHub {
owner = "buckket";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AdM95G2Vz3UbVPI7fs8/D78BMxscbTGrCpIyyHzSmho=";
rev = "refs/tags/v${version}";
sha256 = "sha256-CbFh1o2Ijinfb8X+h1GP3Tp+8D0D3/Czt/Uatd1B4cw=";
};
# Relax some dependencies
pkgs/applications/office/libreoffice/default.nix
+1 -1
View File
@@ -96,7 +96,7 @@
, gpgme
, libwebp
, abseil-cpp
, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ]
, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
, mkDerivation ? null
pkgs/applications/radio/btlejack/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "btlejack";
version = "2.0.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "virtualabs";
repo = "btlejack";
rev = "v${version}";
sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378";
rev = "refs/tags/v${version}";
sha256 = "sha256-Q6y9murV1o2i1sluqTVB5+X3B7ywFsI0ZvlJjHrHSpo=";
};
postPatch = ''
pkgs/applications/version-management/fossil/default.nix
+2 -2
View File
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "fossil";
version = "2.19";
version = "2.20";
src = fetchurl {
url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
sha256 = "sha256-RZ9/7b4lRJqFVyfXwzutO8C/Pa6XPyxtvpp7gmEGoj4=";
sha256 = "1knff50rr8f39myxj50fprb9ya87cslmwz7zzfya56l33r7i7jh3";
};
nativeBuildInputs = [ installShellFiles tcl tcllib ];
pkgs/applications/version-management/git-and-tools/gitnuro/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "gitnuro";
version = "1.1.0";
version = "1.1.1";
src = fetchurl {
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar";
hash = "sha256-tAFFl14mmXhLr6V/vTDe9lwX7trsaTWgIqkwxD3mBUw=";
hash = "sha256-ugZBk/aQ2pjL9xY66g20MorAQ02GHIdJTv8ejadaBgY=";
};
icon = fetchurl {
pkgs/applications/version-management/git-and-tools/gitui/default.nix
+8 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitui";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
sha256 = "sha256-B/RKPYq1U40NV3AM/cQi2eQaK5vxynP3JA0DReSBuCo=";
sha256 = "sha256-ZLGA0LHdGPqIoNG2k4nunVWYlOnwRT8nqTSwUWGkfCU=";
};
cargoSha256 = "sha256-r4kritS3v8GgFZfWeeyrsy6v3IlH3DByTU8Ir4FDngs=";
cargoSha256 = "sha256-ArJerq3gLzPm66RWDCvkpPFyh7ZyaoqLO/3zSjFTL04=";
nativeBuildInputs = [ pkg-config ];
@@ -32,6 +32,11 @@ rustPlatform.buildRustPackage rec {
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;
# The cargo config overrides linkers for some targets, breaking the build
# on e.g. `aarch64-linux`. These overrides are not required in the Nix
# environment: delete them.
postPatch = "rm .cargo/config";
meta = with lib; {
description = "Blazing fast terminal-ui for Git written in Rust";
homepage = "https://github.com/extrawurst/gitui";
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-mkGyY50WBmVbZ9FEfZRWoGLeZy0HkBzYACbF2u8EN1o=";
sha256 = "sha256-ZMqqiPSNNJw9t3p5h/GUHa9cvl9LcJ4u0HMf1ag8qCc=";
};
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";
pkgs/applications/version-management/git-repo/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.29.9";
version = "2.30";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-MJMVKdftA4PZ5vmrekcKAKX+0khHl3e83SXsn+P7VT8=";
sha256 = "sha256-Ck+Q7sHhMqUWu6WeA3DhY+svMxH2sU0WvmyvZ5qsW+E=";
};
# Fix 'NameError: name 'ssl' is not defined'
pkgs/applications/version-management/gitoxide/default.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
sha256 = "sha256-UtQ9LcGE9mLowttAAwR1ujD+BSCosFk+GHQvDwG/CAQ=";
sha256 = "sha256-VB7v51YW4aA5WHVD5ZWFzv9hQskjQeqMzm+pQ9glODg=";
};
cargoSha256 = "sha256-0cZy7hOaREtdFB0Ww1VSV4ILpB0utSBcKlC3t9fhum8=";
cargoSha256 = "sha256-uII6o/cJktpUFxROuu11dNSXx0p6phVVqszmbYK9Rd0=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = if stdenv.isDarwin
pkgs/applications/video/kooha/default.nix
+1
View File
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gst_all_1.gstreamer
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-ugly
gtk4
pkgs/applications/video/media-downloader/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "media-downloader";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = pname;
rev = "${version}";
sha256 = "sha256-pDldAg4q6qGvRHuffKU49akDwwSTNCZPJ6AgauxgotI=";
sha256 = "sha256-uu/4S7cVWHOhBq52NF0AargE0nbPwjF0txSWL0DquQo=";
};
nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ];
pkgs/applications/window-managers/gamescope/default.nix
+3 -3
View File
@@ -26,7 +26,7 @@
}:
let
pname = "gamescope";
version = "3.11.48";
version = "3.11.49";
in
stdenv.mkDerivation {
inherit pname version;
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
owner = "Plagman";
repo = "gamescope";
rev = "refs/tags/${version}";
hash = "sha256-/a0fW0NVIrg9tuK+mg+D+IOcq3rJJxKdFwspM1ZRR9M=";
hash = "sha256-GRq/b013wFRHzFz2YCulJRtcwzX/dhJKd8dkATSLug0=";
};
patches = [ ./use-pkgconfig.patch ];
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
description = "SteamOS session compositing window manager";
homepage = "https://github.com/Plagman/gamescope";
license = licenses.bsd2;
maintainers = with maintainers; [ nrdxp ];
maintainers = with maintainers; [ nrdxp zhaofengli ];
platforms = platforms.linux;
};
}
pkgs/applications/window-managers/phosh/default.nix
+3
View File
@@ -28,6 +28,7 @@
, polkit
, libsecret
, evolution-data-server
, nixosTests
}:
stdenv.mkDerivation rec {
@@ -122,6 +123,8 @@ stdenv.mkDerivation rec {
providedSessions = [
"sm.puri.Phosh"
];
tests.phosh = nixosTests.phosh;
};
meta = with lib; {
pkgs/data/icons/numix-icon-theme/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme";
version = "22.08.16";
version = "22.11.17";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-EveIr5XYyQYhz0AqZQBql3j0LnD8taNdzB/6IV7Mz2k=";
sha256 = "sha256-B6Yg9NkPBpByMMV4GcEBmOlSKx1s0MClGWL2RWIJMwA=";
};
nativeBuildInputs = [
pkgs/data/icons/whitesur-icon-theme/default.nix
+3 -4
View File
@@ -9,8 +9,7 @@
, themeVariants ? []
}:
let
pname = "Whitesur-icon-theme";
let pname = "Whitesur-icon-theme";
in
lib.checkListOfEnum "${pname}: theme variants" [
"default"
@@ -27,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-08-30";
version = "2022-11-17";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "pcvRD4CUwUT46/kmMbnerj5mqPCcHIRreVIh9wz6Kfg=";
hash = "sha256-crZ6JQeXeSjTHGIBptioNiFZas7MksJcjaKGlMP4fo0=";
};
nativeBuildInputs = [ gtk3 jdupes ];
pkgs/development/compilers/chicken/4/eggDerivation.nix
+5 -1
View File
@@ -42,4 +42,8 @@ stdenv.mkDerivation ({
runHook postInstall
'';
} // (builtins.removeAttrs args ["name" "buildInputs"]) // override)
meta = {
inherit (chicken.meta) platforms;
} // args.meta or {};
} // (builtins.removeAttrs args ["name" "buildInputs" "meta"]) // override)
pkgs/development/compilers/chicken/5/eggDerivation.nix
+5 -1
View File
@@ -39,4 +39,8 @@ stdenv.mkDerivation ({
runHook postInstall
'';
} // (builtins.removeAttrs args ["name" "buildInputs"]) // override)
meta = {
inherit (chicken.meta) platforms;
} // args.meta or {};
} // (builtins.removeAttrs args ["name" "buildInputs" "meta"]) // override)
pkgs/development/libraries/hiredis/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hiredis";
version = "1.0.2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "redis";
repo = "hiredis";
rev = "v${version}";
sha256 = "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb";
sha256 = "sha256-0ESRnZTL6/vMpek+2sb0YQU3ajXtzj14yvjfOSQYjf4=";
};
PREFIX = "\${out}";
pkgs/development/libraries/libhv/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, Security }:
stdenv.mkDerivation (finalAttrs: {
pname = "libhv";
version = "1.3.0";
src = fetchFromGitHub {
owner = "ithewei";
repo = "libhv";
rev = "v${finalAttrs.version}";
hash = "sha256-LMk8B/1EofcQcIF3kGmtPdM2s+/gN9ctcsybwTpf4Po=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security;
cmakeFlags = [
"-DENABLE_UDS=ON"
"-DWITH_MQTT=ON"
"-DWITH_CURL=ON"
"-DWITH_NGHTTP2=ON"
"-DWITH_OPENSSL=ON"
"-DWITH_KCP=ON"
];
meta = with lib; {
description = "A c/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server";
homepage = "https://github.com/ithewei/libhv";
license = licenses.bsd3;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
})
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+3
View File
@@ -69,5 +69,8 @@ qtModule {
meta = {
maintainers = with lib.maintainers; [ abbradar periklis ];
knownVulnerabilities = [
"QtWebkit upstream is unmaintained and receives no security updates, see https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/"
];
};
}
pkgs/development/libraries/wxwidgets/wxGTK30.nix
+2 -2
View File
@@ -41,13 +41,13 @@ let
in
stdenv.mkDerivation rec {
pname = "wxwidgets";
version = "3.0.5";
version = "3.0.5.1";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
hash = "sha256-p69nNCg552j+nldGY0oL65uFRVu4xXCkoE10F5MwY9A=";
hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/development/ocaml-modules/iter/default.nix
+6 -7
View File
@@ -1,25 +1,24 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, dune-configurator
, mdx, qtest, result
, result, seq
, mdx, ounit2, qcheck-core
}:
buildDunePackage rec {
pname = "iter";
version = "1.4";
useDune2 = true;
version = "1.6";
src = fetchFromGitHub {
owner = "c-cube";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Kk92GM7IVXOSVBkeN6wj67Q3UGCyuOOVi2umpn1AZTo=";
sha256 = "sha256-FbM/Vk/h4wkrBjyf9/QXTvTOA0nNqsdHP1mDnVkg1is=";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ result ];
propagatedBuildInputs = [ result seq ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ mdx.bin qtest ];
checkInputs = [ mdx.bin ounit2 qcheck-core ];
meta = {
homepage = "https://github.com/c-cube/sequence";
pkgs/development/ocaml-modules/mlgmpidl/default.nix
+5 -3
View File
@@ -1,17 +1,18 @@
{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }:
{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr, bigarray-compat }:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-mlgmpidl";
version = "1.2.12";
version = "1.2.15";
src = fetchFromGitHub {
owner = "nberth";
repo = "mlgmpidl";
rev = version;
sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza";
sha256 = "sha256-85wy5eVWb5qdaa2lLDcfqlUTIY7vnN3nGMdxoj5BslU=";
};
nativeBuildInputs = [ perl ocaml findlib camlidl ];
buildInputs = [ gmp mpfr ];
propagatedBuildInputs = [ bigarray-compat ];
strictDeps = true;
@@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--gmp-prefix ${gmp.dev}"
"--mpfr-prefix ${mpfr.dev}"
"-disable-profiling"
];
postConfigure = ''
pkgs/development/python-modules/aioairzone/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.4.9";
version = "0.5.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-qG+EPZjH3I4TRGka7J21ukGpuJQfA/Nuy6DbIUnykcs=";
hash = "sha256-L2R4Qu72bvUjJyE/bBMeKufK/TAFw9u/oGowS1rCqP4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/aioesphomeapi/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "11.4.3";
version = "11.5.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-g901qWU6aiaV0kLmtWJffXZrOsKjvOGI0TOgQFzuuPA=";
hash = "sha256-z3ILdtxDU4xLBY5mVAKal2nBo2sdO5rlSQDyexwHUtI=";
};
postPatch = ''
pkgs/development/python-modules/aws-lambda-builders/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.20.0";
version = "1.23.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "refs/tags/v${version}";
hash = "sha256-+XOxz3xWIYacfUizztd4mH5kvBw/dkN9WiS38dONs7Y=";
hash = "sha256-3jzUowSeO6j7DzIlOkeU3KUFFIUi7cEyvjbIL8uRGcU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/azure-mgmt-security/default.nix
+16 -5
View File
@@ -1,18 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
{ lib
, buildPythonPackage
, fetchPypi
, azure-common
, azure-mgmt-core
, msrest
, msrestazure
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
version = "2.0.0";
pname = "azure-mgmt-security";
disabled = isPy27;
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2sr3clHf5EvbXAx5FH3d3ab1/Y48r6Ojww3p9WX35aM=";
hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q=";
extension = "zip";
};
@@ -21,12 +27,17 @@ buildPythonPackage rec {
azure-mgmt-core
msrest
msrestazure
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
];
# no tests included
doCheck = false;
pythonImportsCheck = [ "azure.common" "azure.mgmt.security" ];
pythonImportsCheck = [
"azure.common"
"azure.mgmt.security"
];
meta = with lib; {
description = "Microsoft Azure Security Center Management Client Library for Python";
pkgs/development/python-modules/boschshcpy/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "boschshcpy";
version = "0.2.35";
version = "0.2.36";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tschamm";
repo = pname;
rev = version;
sha256 = "sha256-MzVv0HN87eDsz0mP/rqH6FZVRgq95iTuu8mikkofT30=";
sha256 = "sha256-X/nlu/hwdgmUOw7+hALRhyCG/vphnWAK22fSWuUAjs0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/boxx/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "boxx";
version = "0.10.7";
version = "0.10.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OPbqCsTZZskZOJMcK1OJsG3Qgx4K0X217g5pNWQZDAM=";
hash = "sha256-uk4DYmbV/4zSyL2QzlAJLvgC6ieBjP/xkuyDktUEmIo=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/bthome-ble/default.nix
+4 -3
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "2.2.1";
version = "2.3.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-IaDnQCZJZipiPW6lOLrdxw7QfPx/zlwaizkBxv8I2V8=";
rev = "refs/tags/v${version}";
hash = "sha256-4KsMYQQN/4A2sbk2Fj8CYOBf7/UAciJ4wTSFYZaCfdk=";
};
nativeBuildInputs = [
@@ -51,6 +51,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for BThome BLE devices";
homepage = "https://github.com/Bluetooth-Devices/bthome-ble";
changelog = "https://github.com/bluetooth-devices/bthome-ble/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/clickhouse-cityhash/default.nix
+13 -4
View File
@@ -2,21 +2,30 @@
, buildPythonPackage
, fetchPypi
, setuptools
, pythonOlder
}:
buildPythonPackage rec {
pname = "clickhouse-cityhash";
version = "1.0.2.3";
version = "1.0.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0z8nl0ly2p1h6nygwxs6y40q8y424w40fkjv3jyf8vvcg4h7sdrg";
sha256 = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg=";
};
propagatedBuildInputs = [ setuptools ];
propagatedBuildInputs = [
setuptools
];
doCheck = false;
pythonImportsCheck = [ "clickhouse_cityhash" ];
pythonImportsCheck = [
"clickhouse_cityhash"
];
meta = with lib; {
description = "Python-bindings for CityHash, a fast non-cryptographic hash algorithm";
pkgs/development/python-modules/clize/default.nix
+4 -7
View File
@@ -8,9 +8,9 @@
, pytestCheckHook
, pythonOlder
, python-dateutil
, setuptools
, repeated-test
, setuptools-scm
, sigtools
, unittest2
}:
buildPythonPackage rec {
@@ -26,7 +26,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
@@ -42,14 +42,11 @@ buildPythonPackage rec {
];
};
# repeated_test no longer exists in nixpkgs
# also see: https://github.com/epsy/clize/issues/74
doCheck = false;
checkInputs = [
pytestCheckHook
python-dateutil
pygments
unittest2
repeated-test
];
pythonImportsCheck = [
pkgs/development/python-modules/compreffor/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "compreffor";
version = "0.5.2";
version = "0.5.3";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rsC0HJCl3IGqEqUqfCwRRNwzjtfGDlxcCkeOU3On22Q=";
sha256 = "sha256-fUEpbU+wqh72lt/ZJdKvMifUAwYivpmzx9QQfcb4cTo=";
};
nativeBuildInputs = [
pkgs/development/python-modules/datasette/default.nix
+3 -3
View File
@@ -29,7 +29,7 @@
buildPythonPackage rec {
pname = "datasette";
version = "0.63.1";
version = "0.63.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -37,8 +37,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
sha256 = "sha256-KMD4dmflmBp0s4nueLyPpDnXngpftS9/h5M6RPYMGrk=";
rev = "refs/tags/${version}";
sha256 = "sha256-VDmh2Q/ab5xaNbj0APuQ9pkZ+GHoNXW2crrJXi556Fk=";
};
postPatch = ''
pkgs/development/python-modules/datashader/default.nix
+2 -2
View File
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "datashader";
version = "0.14.2";
version = "0.14.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-q8aOpuJD6aX9m9jPm9PY5vZGBJL6Jpf+pPHbcQVOJLg=";
hash = "sha256-zHbo03Ll40H8okBIaqrWSJby4aQAg7ukETNHerUPX28=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/dbus-fast/default.nix
+3 -3
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dbus-fast";
version = "1.73.0";
version = "1.75.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-JkhcDefz7SiZ+w6ijPAnKNyxTZ/5tmQUyOPnKb3EFGc=";
hash = "sha256-bmHUfRytUGlS0X1PEQHFocMZ4+FslA2rvzqHNE+3B3E=";
};
nativeBuildInputs = [
@@ -89,9 +89,9 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}";
description = "Faster version of dbus-next";
homepage = "https://github.com/bluetooth-devices/dbus-fast";
changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/diff-cover/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "diff-cover";
version = "7.0.1";
version = "7.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "diff_cover";
inherit version;
hash = "sha256-aSWDVdr4J2BXqS5CzsUllK2M/n3VBdbw5W/kQLxEGNA=";
hash = "sha256-OENUR9rTKrt+AdHDlCU5AhpSI4ijtYXVg6biB8wTNJc=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/django-webpack-loader/default.nix
+14 -3
View File
@@ -1,17 +1,28 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "django-webpack-loader";
version = "1.6.0";
version = "1.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-opQY/0FpADW+ENLJSgZV2rCZAJxouJiDmBPWoQmxTXE=";
hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8=";
};
# django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?)
doCheck = false;
pythonImportsCheck = [
"webpack_loader"
];
meta = with lib; {
description = "Use webpack to generate your static bundles";
homepage = "https://github.com/owais/django-webpack-loader";
pkgs/development/python-modules/dulwich/default.nix
+18 -9
View File
@@ -10,11 +10,10 @@
, glibcLocales
, gnupg
, gpgme
, mock
, urllib3
, paramiko
, pytestCheckHook
, pythonOlder
, urllib3
}:
buildPythonPackage rec {
@@ -36,18 +35,28 @@ buildPythonPackage rec {
urllib3
];
passthru.optional-dependencies = {
fastimport = [
fastimport
];
pgp = [
gpgme
gnupg
];
paramiko = [
paramiko
];
};
checkInputs = [
fastimport
gevent
geventhttpclient
git
glibcLocales
gpgme
gnupg
mock
paramiko
pytestCheckHook
];
] ++ passthru.optional-dependencies.fastimport
++ passthru.optional-dependencies.pgp
++ passthru.optional-dependencies.paramiko;
doCheck = !stdenv.isDarwin;
@@ -70,7 +79,7 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "Simple Python implementation of the Git file formats and protocols";
description = "Implementation of the Git file formats and protocols";
longDescription = ''
Dulwich is a Python implementation of the Git file formats and protocols, which
does not depend on Git itself. All functionality is available in pure Python.
pkgs/development/python-modules/fakeredis/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.10.1";
version = "2.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-Tqm1p3CNU61aHhiVyP5Gt6bMxni3wvEvR3HFv328Hk0=";
hash = "sha256-y9fuVg5Mu0ZT8hoja9V5mEfOz/hPH66Zbk5Rr/luPSc=";
};
nativeBuildInputs = [
pkgs/development/python-modules/filemagic/default.nix
-30
View File
@@ -1,30 +0,0 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, file
, isPy3k, mock, unittest2 }:
buildPythonPackage {
pname = "filemagic";
version = "1.6";
disabled = !isPy3k; # asserts on ResourceWarning
# Don't use the PyPI source because it's missing files required for testing
src = fetchFromGitHub {
owner = "aliles";
repo = "filemagic";
rev = "138649062f769fb10c256e454a3e94ecfbf3017b";
sha256 = "1jxf928jjl2v6zv8kdnfqvywdwql1zqkm1v5xn1d5w0qjcg38d4n";
};
postPatch = ''
substituteInPlace magic/api.py --replace "ctypes.util.find_library('magic')" \
"'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
'';
checkInputs = [ mock ] ++ lib.optionals (!isPy3k) [ unittest2 ];
meta = with lib; {
description = "File type identification using libmagic";
homepage = "https://github.com/aliles/filemagic";
license = licenses.asl20;
maintainers = with maintainers; [ erikarvstedt ];
};
}
pkgs/development/python-modules/flux-led/default.nix
+3 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
version = "0.28.32";
version = "0.28.34";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = "refs/tags/${version}";
sha256 = "sha256-YZ0ox04xakpazOIAERM2EO5c4PzmaSwYWULSjp0MJbw=";
hash = "sha256-bIL9ivjCLKeTLK3n0ytgGkXQggsuDiMCY7kAtE81qfY=";
};
propagatedBuildInputs = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to communicate with the flux_led smart bulbs";
homepage = "https://github.com/Danielhiversen/flux_led";
changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ colemickens ];
platforms = platforms.linux;
pkgs/development/python-modules/g2pkk/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, jamo
, nltk
}:
buildPythonPackage rec {
pname = "g2pkk";
version = "0.1.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-YarV1Btn1x3Sm4Vw/JDSyJy3ZJMXAQHZJJJklSG0R+Q=";
};
propagatedBuildInputs = [
jamo
nltk
];
pythonImportsCheck = [
"g2pkk"
];
doCheck = false;
meta = with lib; {
description = "Cross-platform g2p for Korean";
homepage = "https://github.com/harmlessman/g2pkk";
license = licenses.asl20;
maintainers = teams.tts.members;
};
}
pkgs/development/python-modules/geopy/default.nix
+5 -9
View File
@@ -11,21 +11,17 @@
buildPythonPackage rec {
pname = "geopy";
version = "2.2.0";
disabled = pythonOlder "3.5";
version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-zFz0T/M/CABKkChuiKsFkWj2pphZuFeE5gz0HxZYaz8=";
rev = "refs/tags/${version}";
sha256 = "sha256-bHfjUfuiEH3AxRDTLmbm67bKOw6fBuMQDUQA2NLg800=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "geographiclib<2,>=1.49" "geographiclib"
'';
propagatedBuildInputs = [
geographiclib
];
pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
-2
View File
@@ -7,7 +7,6 @@
, pythonOlder
, requests
, responses
, tox
}:
buildPythonPackage rec {
@@ -31,7 +30,6 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
responses
tox
];
disabledTests = [
pkgs/development/python-modules/identify/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.5.8";
version = "2.5.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QI4NtNPkR3mD/UVFeKimo5pgBmnRKaxQ6JiwPDbjh/0=";
sha256 = "sha256-5ISxzOTTlA1EcBO5N6YtBEah0SRehGeVIONj30zOKk0=";
};
checkInputs = [
pkgs/development/python-modules/jamo/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jamo";
version = "0.4.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "JDongian";
repo = "python-jamo";
rev = "refs/tags/v${version}";
hash = "sha256-QHI3Rqf1aQOsW49A/qnIwRnPuerbtyerf+eWIiEvyho=";
};
pythonImportsCheck = [
"jamo"
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
changelog = "https://github.com/JDongian/python-jamo/releases/tag/v${version}";
description = "Hangul syllable decomposition and synthesis using jamo";
homepage = "https://github.com/JDongian/python-jamo";
license = licenses.asl20;
maintainers = teams.tts.members;
};
}
pkgs/development/python-modules/lupa/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "lupa";
version = "1.13";
version = "1.14.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4=";
sha256 = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4=";
};
nativeBuildInputs = [ cython ];
pkgs/development/python-modules/mastodon-py/default.nix
+2 -2
View File
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "mastodon-py";
version = "1.6.1";
version = "1.6.3";
src = fetchFromGitHub {
owner = "halcy";
repo = "Mastodon.py";
rev = "refs/tags/${version}";
sha256 = "sha256-ip2TT5ISOS6HJOnTWajOR5Bajs8ba9QX1EIuPmdHLsE=";
sha256 = "sha256-bzacM5bJa936sBW+hgm9GOezW8cVY2oPaWApqjDYLSo=";
};
postPatch = ''
pkgs/development/python-modules/name-that-hash/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "name-that-hash";
version = "1.10";
version = "1.11.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "HashPals";
repo = pname;
rev = version;
hash = "sha256-3sddUPoC3NfKQzmNgqPf/uHaYN9VZBqsmV712uz1Phg=";
hash = "sha256-zOb4BS3zG1x8GLXAooqqvMOw0fNbw35JuRWOdGP26/8=";
};
# TODO remove on next update which bumps rich
pkgs/development/python-modules/od/default.nix
+16 -7
View File
@@ -1,25 +1,34 @@
{ lib, buildPythonPackage, fetchPypi, unittest2 }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, repeated-test
}:
buildPythonPackage rec {
pname = "od";
version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk=";
hash = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk=";
};
# repeated_test no longer exists in nixpkgs
# also see: https://github.com/epsy/od/issues/1
doCheck = false;
checkInputs = [
unittest2
repeated-test
];
pythonImportsCheck = [
"od"
];
meta = with lib; {
description = "Shorthand syntax for building OrderedDicts";
homepage = "https://github.com/epsy/od";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/peaqevcore/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "7.3.3";
version = "7.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fg5/5x4vUsm0kvVJtvlgB3PZSmU4pXkU6V0+yEDqNRg=";
hash = "sha256-7b6fF6wVNo4kBJ+s1lxNSl1C2vZjnAmHOtVSmqoiY9Q=";
};
postPatch = ''
pkgs/development/python-modules/plotext/default.nix
+30
View File
@@ -0,0 +1,30 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
}:
buildPythonPackage rec {
pname = "plotext";
version = "5.2.8";
format = "setuptools";
src = fetchFromGitHub {
owner = "piccolomo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-V7N7p5RxLKYLmJeojikYJ/tT/IpVGzG3ZPVvUisDAVs=";
};
# Package does not have a conventional test suite that can be run with either
# `pytestCheckHook` or the standard setuptools testing situation.
doCheck = false;
pythonImportsCheck = [ "plotext" ];
meta = with lib; {
description = "Plotting directly in the terminal";
homepage = "https://github.com/piccolomo/plotext";
license = licenses.mit;
maintainers = with maintainers; [ samuela ];
};
}
pkgs/development/python-modules/prodict/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, lib
}:
buildPythonPackage rec {
pname = "prodict";
version = "0.8.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ramazanpolat";
repo = pname;
rev = version;
hash = "sha256-c46JEQFg4KRwerqpMSgh6+tYRpKTOX02Lzsq4/meS3o=";
};
# make setuptools happy on case-sensitive filesystems
postPatch = ''if [[ ! -f README.md ]]; then mv README.MD README.md; fi'';
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "prodict" ];
meta = {
description = "Access Python dictionary as a class with type hinting and autocompletion";
homepage = "https://github.com/ramazanpolat/prodict";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcdarwin ];
};
}
pkgs/development/python-modules/pwntools/default.nix
+1 -1
View File
@@ -84,7 +84,7 @@ buildPythonPackage rec {
'';
meta = with lib; {
homepage = "http://pwntools.com";
homepage = "https://pwntools.com";
description = "CTF framework and exploit development library";
license = licenses.mit;
maintainers = with maintainers; [ bennofs kristoff3r pamplemousse ];
pkgs/development/python-modules/pypandoc/default.nix
+19 -6
View File
@@ -1,16 +1,24 @@
{ lib, substituteAll, buildPythonPackage, fetchFromGitHub
, pandoc, texlive
{ lib
, buildPythonPackage
, fetchFromGitHub
, pandoc
, pandocfilters
, pythonOlder
, substituteAll
, texlive
}:
buildPythonPackage rec {
pname = "pypandoc";
version = "1.8.1";
version = "1.10";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "NicklasTegner";
owner = "JessicaTegner";
repo = pname;
rev = "v${version}";
hash = "sha256-1vQmONQFJrjptwVVjw25Wyt59loatjScsdnSax+q/f8=";
hash = "sha256:05m585l4sipjzpkrv4yj5s7w45yxhxlym55lkhnavsshlvisinkz";
};
patches = [
@@ -24,11 +32,16 @@ buildPythonPackage rec {
checkInputs = [
texlive.combined.scheme-small
pandocfilters
];
pythonImportsCheck = [
"pypandoc"
];
meta = with lib; {
description = "Thin wrapper for pandoc";
homepage = "https://github.com/NicklasTegner/pypandoc";
homepage = "https://github.com/JessicaTegner/pypandoc";
license = licenses.mit;
maintainers = with maintainers; [ sternenseemann bennofs ];
};
pkgs/development/python-modules/pyrect/default.nix
+8 -5
View File
@@ -1,25 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, tox
, pytestCheckHook
, pygame
}:
buildPythonPackage rec {
pname = "PyRect";
pname = "pyrect";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
pname = "PyRect";
inherit version;
sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g=";
};
checkInputs = [ tox pytestCheckHook pygame ];
pythonImportsCheck = [ "pyrect" ];
checkInputs = [ pytestCheckHook pygame ];
preCheck = ''
export LC_ALL="en_US.UTF-8"
'';
pythonImportsCheck = [ "pyrect" ];
meta = with lib; {
description = "Simple module with a Rect class for Pygame-like rectangular areas";
homepage = "https://github.com/asweigart/pyrect";
pkgs/development/python-modules/pyrogram/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyrogram";
version = "2.0.59";
version = "2.0.62";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pyrogram";
repo = "pyrogram";
rev = "v${version}";
hash = "sha256-vGgtVXvi/zvbU8f+LBQJN8GSxyVqdv/fBYfsBR4BKf4=";
hash = "sha256-Kex9xIjcAYCzHeqWoDAIgTMuih0s42/O2zfTYxWEqbM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pysma/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pysma";
version = "0.7.2";
version = "0.7.3";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hIrdT0b9XKw1UoPZtQQ7IaW+HV8wuA9Rwoo8XYdGyw8=";
sha256 = "sha256-8LwxRiYUhKYZkrjDNcnOkssvfw/tZ6dj1GKZQ6UkqsQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/qiskit-terra/default.nix
+1 -1
View File
@@ -193,7 +193,7 @@ buildPythonPackage rec {
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = true; # tests segfault python
description = "Provides the foundations for Qiskit.";
longDescription = ''
Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware.

Some files were not shown because too many files have changed in this diff Show More