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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-21 00:03:04 +00:00 committed by GitHub
commit fc3641aa1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
126 changed files with 444 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/config/console.nix
View File

@ -168,7 +168,6 @@ in
"${config.boot.initrd.systemd.package.kbd}/bin/setfont"
"${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"
"${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed
"${config.boot.initrd.systemd.package.kbd.gzip}/bin/.gzip-wrapped"
] ++ optionals (hasPrefix builtins.storeDir cfg.font) [
"${cfg.font}"
] ++ optionals (hasPrefix builtins.storeDir cfg.keyMap) [

3
nixos/modules/system/boot/systemd/initrd.nix
View File

@ -441,9 +441,6 @@ in {
# fido2 support
"${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so"
"${pkgs.libfido2}/lib/libfido2.so.1"
# the unwrapped systemd-cryptsetup executable
"${cfg.package}/lib/systemd/.systemd-cryptsetup-wrapped"
] ++ jobScripts;
targets.initrd.aliases = ["default.target"];

2
nixos/tests/all-tests.nix
View File

@ -648,6 +648,7 @@ in {
systemd-confinement = handleTest ./systemd-confinement.nix {};
systemd-coredump = handleTest ./systemd-coredump.nix {};
systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {};
systemd-credentials-tpm2 = handleTest ./systemd-credentials-tpm2.nix {};
systemd-escaping = handleTest ./systemd-escaping.nix {};
systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {};
systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix {};
@ -658,6 +659,7 @@ in {
systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {};
systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {};
systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix {};
systemd-journal = handleTest ./systemd-journal.nix {};
systemd-machinectl = handleTest ./systemd-machinectl.nix {};
systemd-networkd = handleTest ./systemd-networkd.nix {};

124
nixos/tests/systemd-credentials-tpm2.nix Normal file
View File

@ -0,0 +1,124 @@
import ./make-test-python.nix ({ lib, pkgs, system, ... }:
let
tpmSocketPath = "/tmp/swtpm-sock";
tpmDeviceModels = {
x86_64-linux = "tpm-tis";
aarch64-linux = "tpm-tis-device";
};
in
{
name = "systemd-credentials-tpm2";
meta = {
maintainers = with pkgs.lib.maintainers; [ tmarkus ];
};
nodes.machine = { pkgs, ... }: {
virtualisation = {
qemu.options = [
"-chardev socket,id=chrtpm,path=${tpmSocketPath}"
"-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm"
"-device ${tpmDeviceModels.${system}},tpmdev=tpm_dev_0"
];
};
boot.initrd.availableKernelModules = [ "tpm_tis" ];
environment.systemPackages = with pkgs; [ diffutils ];
};
testScript = ''
import subprocess
from tempfile import TemporaryDirectory
# From systemd-initrd-luks-tpm2.nix
class Tpm:
def __init__(self):
self.state_dir = TemporaryDirectory()
self.start()
def start(self):
self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm",
"socket",
"--tpmstate", f"dir={self.state_dir.name}",
"--ctrl", "type=unixio,path=${tpmSocketPath}",
"--tpm2",
])
# Check whether starting swtpm failed
try:
exit_code = self.proc.wait(timeout=0.2)
if exit_code is not None and exit_code != 0:
raise Exception("failed to start swtpm")
except subprocess.TimeoutExpired:
pass
"""Check whether the swtpm process exited due to an error"""
def check(self):
exit_code = self.proc.poll()
if exit_code is not None and exit_code != 0:
raise Exception("swtpm process died")
CRED_NAME = "testkey"
CRED_RAW_FILE = f"/root/{CRED_NAME}"
CRED_FILE = f"/root/{CRED_NAME}.cred"
def systemd_run(machine, cmd):
machine.log(f"Executing command (via systemd-run): \"{cmd}\"")
(status, out) = machine.execute( " ".join([
"systemd-run",
"--service-type=exec",
"--quiet",
"--wait",
"-E PATH=\"$PATH\"",
"-p StandardOutput=journal",
"-p StandardError=journal",
f"-p LoadCredentialEncrypted={CRED_NAME}:{CRED_FILE}",
f"$SHELL -c '{cmd}'"
]) )
if status != 0:
raise Exception(f"systemd_run failed (status {status})")
machine.log("systemd-run finished successfully")
tpm = Tpm()
@polling_condition
def swtpm_running():
tpm.check()
machine.wait_for_unit("multi-user.target")
with subtest("Check whether TPM device exists"):
machine.succeed("test -e /dev/tpm0")
machine.succeed("test -e /dev/tpmrm0")
with subtest("Check whether systemd-creds detects TPM2 correctly"):
cmd = "systemd-creds has-tpm2"
machine.log(f"Running \"{cmd}\"")
(status, _) = machine.execute(cmd)
# Check exit code equals 0 or 1 (1 means firmware support is missing, which is OK here)
if status != 0 and status != 1:
raise Exception("systemd-creds failed to detect TPM2")
with subtest("Encrypt credential using systemd-creds"):
machine.succeed(f"dd if=/dev/urandom of={CRED_RAW_FILE} bs=1k count=16")
machine.succeed(f"systemd-creds --with-key=host+tpm2 encrypt --name=testkey {CRED_RAW_FILE} {CRED_FILE}")
with subtest("Write provided credential and check for equality"):
CRED_OUT_FILE = f"/root/{CRED_NAME}.out"
systemd_run(machine, f"systemd-creds cat testkey > {CRED_OUT_FILE}")
machine.succeed(f"cmp --silent -- {CRED_RAW_FILE} {CRED_OUT_FILE}")
with subtest("Check whether systemd service can see credential in systemd-creds list"):
systemd_run(machine, f"systemd-creds list | grep {CRED_NAME}")
with subtest("Check whether systemd service can access credential in $CREDENTIALS_DIRECTORY"):
systemd_run(machine, f"cmp --silent -- $CREDENTIALS_DIRECTORY/{CRED_NAME} {CRED_RAW_FILE}")
'';
})

33
nixos/tests/systemd-initrd-vconsole.nix Normal file
View File

@ -0,0 +1,33 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "systemd-initrd-vconsole";
nodes.machine = { pkgs, ... }: {
boot.kernelParams = [ "rd.systemd.unit=rescue.target" ];
boot.initrd.systemd = {
enable = true;
emergencyAccess = true;
};
console = {
earlySetup = true;
keyMap = "colemak";
};
};
testScript = ''
# Boot into rescue shell in initrd
machine.start()
machine.wait_for_console_text("Press Enter for maintenance")
machine.send_console("\n")
machine.wait_for_console_text("Logging in with home")
# Check keymap
machine.send_console("(printf '%s to receive text: \\n' Ready && read text && echo \"$text\") </dev/tty1\n")
machine.wait_for_console_text("Ready to receive text:")
for key in "asdfjkl;\n":
machine.send_key(key)
machine.wait_for_console_text("arstneio")
machine.send_console("systemctl poweroff\n")
'';
})

2
pkgs/applications/audio/ams/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Realtime modular synthesizer for ALSA";
homepage = "http://alsamodular.sourceforge.net";
homepage = "https://alsamodular.sourceforge.net";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ sjfloat ];

2
pkgs/applications/audio/bristol/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A range of synthesiser, electric piano and organ emulations";
homepage = "http://bristol.sourceforge.net";
homepage = "https://bristol.sourceforge.net";
license = licenses.gpl3;
platforms = ["x86_64-linux" "i686-linux"];
maintainers = [ maintainers.goibhniu ];

2
pkgs/applications/audio/calf/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "http://calf-studio-gear.org";
homepage = "https://calf-studio-gear.org";
description = "A set of high quality open source audio plugins for musicians";
license = licenses.lgpl2;
maintainers = [ maintainers.goibhniu ];

2
pkgs/applications/audio/eflite/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
CFLAGS = lib.optionalString debug " -DDEBUG=2";
meta = {
homepage = "http://eflite.sourceforge.net";
homepage = "https://eflite.sourceforge.net";
description = "Speech server for screen readers";
longDescription = ''
EFlite is a speech server for Emacspeak and other screen

2
pkgs/applications/audio/freewheeling/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
software, released under the GNU GPL license.
'' ;
homepage = "http://freewheeling.sourceforge.net";
homepage = "https://freewheeling.sourceforge.net";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sepi ];
platforms = lib.platforms.linux;

2
pkgs/applications/audio/jamin/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://jamin.sourceforge.net";
homepage = "https://jamin.sourceforge.net";
description = "JACK Audio Mastering interface";
license = licenses.gpl2;
maintainers = [ maintainers.nico202 ];

2
pkgs/applications/audio/petrifoo/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "MIDI controllable audio sampler";
longDescription = "a fork of Specimen";
homepage = "http://petri-foo.sourceforge.net";
homepage = "https://petri-foo.sourceforge.net";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];

2
pkgs/applications/audio/qmidiarp/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
parallel.
'';
homepage = "http://qmidiarp.sourceforge.net";
homepage = "https://qmidiarp.sourceforge.net";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ sjfloat ];

2
pkgs/applications/audio/qtscrobbler/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware.
'';
homepage = "http://qtscrob.sourceforge.net";
homepage = "https://qtscrob.sourceforge.net";
license = licenses.gpl2;
maintainers = [ maintainers.vanzef ];
platforms = platforms.linux;

2
pkgs/applications/audio/rakarrack/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Multi-effects processor emulating a guitar effects pedalboard";
homepage = "http://rakarrack.sourceforge.net";
homepage = "https://rakarrack.sourceforge.net";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];

2
pkgs/applications/audio/yasr/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
]; # taken from the debian yasr package
meta = {
homepage = "http://yasr.sourceforge.net";
homepage = "https://yasr.sourceforge.net";
description = "A general-purpose console screen reader";
longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems.";
platforms = lib.platforms.linux;

2
pkgs/applications/editors/bviplus/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Ncurses based hex editor with a vim-like interface";
homepage = "http://bviplus.sourceforge.net";
homepage = "https://bviplus.sourceforge.net";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];

2
pkgs/applications/editors/ht/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "File editor/viewer/analyzer for executables";
homepage = "http://hte.sourceforge.net";
homepage = "https://hte.sourceforge.net";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];

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

@ -3418,6 +3418,18 @@ final: prev:
meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
};
go-nvim = buildVimPluginFrom2Nix {
pname = "go.nvim";
version = "2023-02-19";
src = fetchFromGitHub {
owner = "ray-x";
repo = "go.nvim";
rev = "c11b8b50f3f4eeef7f7a8f07f697fd67794fd2ac";
sha256 = "12r0j62d76m2vh88wv4phc5s2r43scx3j8f814slnyigprdprs9k";
};
meta.homepage = "https://github.com/ray-x/go.nvim/";
};
godbolt-nvim = buildVimPluginFrom2Nix {
pname = "godbolt.nvim";
version = "2023-01-02";
@ -13401,6 +13413,18 @@ final: prev:
meta.homepage = "https://github.com/posva/vim-vue/";
};
vim-vue-plugin = buildVimPluginFrom2Nix {
pname = "vim-vue-plugin";
version = "2023-02-02";
src = fetchFromGitHub {
owner = "leafOfTree";
repo = "vim-vue-plugin";
rev = "58ac69b2c8a98a9bd2a95fbaa7b5f0fe806bad0f";
sha256 = "0x8a66r1wlyashyqxmdpz3wnqhgfmscs42m2r82g5ic6a7n6f36l";
};
meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/";
};
vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime";
version = "2023-02-06";

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

@ -285,6 +285,7 @@ https://github.com/gregsexton/gitv/,,
https://github.com/DNLHC/glance.nvim/,HEAD,
https://github.com/gleam-lang/gleam.vim/,,
https://github.com/ellisonleao/glow.nvim/,,
https://github.com/ray-x/go.nvim/,HEAD,
https://github.com/p00f/godbolt.nvim/,HEAD,
https://github.com/roman/golden-ratio/,,
https://github.com/buoto/gotests-vim/,,
@ -1125,6 +1126,7 @@ https://github.com/ngemily/vim-vp4/,HEAD,
https://github.com/hrsh7th/vim-vsnip/,,
https://github.com/hrsh7th/vim-vsnip-integ/,,
https://github.com/posva/vim-vue/,,
https://github.com/leafOfTree/vim-vue-plugin/,HEAD,
https://github.com/wakatime/vim-wakatime/,,
https://github.com/osyo-manga/vim-watchdogs/,,
https://github.com/jasonccox/vim-wayland-clipboard/,,

2
pkgs/applications/graphics/gqview/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A fast image viewer";
homepage = "http://gqview.sourceforge.net";
homepage = "https://gqview.sourceforge.net";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ ];

2
pkgs/applications/misc/artha/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An offline thesaurus based on WordNet";
homepage = "http://artha.sourceforge.net";
homepage = "https://artha.sourceforge.net";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;

2
pkgs/applications/misc/audio/soxr/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An audio resampling library";
homepage = "http://soxr.sourceforge.net";
homepage = "https://soxr.sourceforge.net";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ ];

2
pkgs/applications/misc/djvulibre/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files";
homepage = "http://djvu.sourceforge.net";
homepage = "https://djvu.sourceforge.net";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ Anton-Latukha ];
platforms = platforms.all;

2
pkgs/applications/misc/eaglemode/default.nix
View File

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "http://eaglemode.sourceforge.net";
homepage = "https://eaglemode.sourceforge.net";
description = "Zoomable User Interface";
changelog = "https://eaglemode.sourceforge.net/ChangeLog.html";
license = licenses.gpl3;

2
pkgs/applications/misc/eureka-editor/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://eureka-editor.sourceforge.net";
homepage = "https://eureka-editor.sourceforge.net";
description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen";
license = licenses.gpl2Plus;
platforms = platforms.all;

81
pkgs/applications/misc/foxitreader/default.nix
View File

@ -1,81 +0,0 @@
{ mkDerivation, lib, fetchzip, libarchive, autoPatchelfHook, libsecret, libGL, zlib, openssl, qtbase, qtwebkit, qtxmlpatterns }:
mkDerivation rec {
pname = "foxitreader";
version = "2.4.4.0911";
src = fetchzip {
url = "https://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/${lib.versions.major version}.x/${lib.versions.majorMinor version}/en_us/FoxitReader.enu.setup.${version}.x64.run.tar.gz";
sha256 = "0ff4xs9ipc7sswq0czfhpsd7qw7niw0zsf9wgsqhbbgzcpbdhcb7";
stripRoot = false;
};
buildInputs = [ libGL libsecret openssl qtbase qtwebkit qtxmlpatterns zlib ];
nativeBuildInputs = [ autoPatchelfHook libarchive ];
buildPhase = ''
runHook preBuild
input_file=$src/*.run
mkdir -p extracted
# Look for all 7z files and extract them
grep --only-matching --byte-offset --binary \
--text -P '7z\xBC\xAF\x27\x1C\x00\x03' $input_file | cut -d: -f1 |
while read position; do
tail -c +$(($position + 1)) $input_file > file.7z
bsdtar xf file.7z -C extracted
done
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cd extracted
cp -r \
CollectStrategy.txt \
cpdf_settings \
fxplugins \
lang \
resource \
run \
stamps \
welcome \
Wrappers \
$out/lib/
patchelf $out/lib/fxplugins/librms.so \
--replace-needed libssl.so.10 libssl.so \
--replace-needed libcrypto.so.10 libcrypto.so
# FIXME: Doing this with one invocation is broken right now
patchelf $out/lib/fxplugins/librmscrypto.so \
--replace-needed libssl.so.10 libssl.so
patchelf $out/lib/fxplugins/librmscrypto.so \
--replace-needed libcrypto.so.10 libcrypto.so
install -D -m 755 FoxitReader -t $out/bin
# Install icon and desktop files
install -D -m 644 images/FoxitReader.png -t $out/share/pixmaps/
install -D -m 644 FoxitReader.desktop -t $out/share/applications/
echo Exec=FoxitReader %F >> $out/share/applications/FoxitReader.desktop
runHook postInstall
'';
qtWrapperArgs = [ "--set appname FoxitReader" "--set selfpath $out/lib" ];
meta = with lib; {
description = "A viewer for PDF documents";
homepage = "https://www.foxitsoftware.com/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ p-h rhoriguchi ];
};
}

8
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "2.9.17";
version = "2.10.4";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
x86_64-linux = "sha256-kdmxSXKHIyVdvVNEoZkSIQlOkTt97bpAdrV0sxhL1Ug=";
x86_64-darwin = "sha256-o3Q5foEuBi4OTHr6mP0ZXOxkkUw/c/jXaZOtztQf0gM=";
x86_64-linux = "sha256-KEEPPtWxaY6+Nu/CE+AVAnaVZ30zmASWiIYaJt4a+3E=";
x86_64-darwin = "sha256-8Rkj1pV6tJygznbfELnAhzhh7ImnTm9dxCxCjYlWdnU=";
}.${system} or throwSystem;
};
@ -35,7 +35,7 @@ let
Markdown format.
'';
homepage = "https://joplinapp.org";
license = licenses.mit;
license = licenses.agpl3Plus;
maintainers = with maintainers; [ hugoreeves ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};

2
pkgs/applications/misc/menumaker/default.nix
View File

@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Heuristics-driven menu generator for several window managers";
homepage = "http://menumaker.sourceforge.net";
homepage = "https://menumaker.sourceforge.net";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];

2
pkgs/applications/misc/wcalc/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A command line calculator";
homepage = "http://w-calc.sourceforge.net";
homepage = "https://w-calc.sourceforge.net";
license = licenses.gpl2;
platforms = platforms.all;
};

6
pkgs/applications/misc/zine/default.nix
View File

@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "zine";
version = "0.10.1";
version = "0.11.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-3xFJ7v/IZQ3yfU0D09sFXV+4XKRau+Mj3BNxkeUjbbU=";
sha256 = "sha256-koN30s+giX4wOp4i5QtTLE/t1ZJ9mP0K0YfY0kTuDJY=";
};
cargoHash = "sha256-3Sw/USfGJuf6JGSR3Xkjnmm/UR7NK8rB8St48b4WpIM=";
cargoHash = "sha256-Re/ooEJCRjQSnz1VSzz4uRWx81yOzChBEeH7gedAHJw=";
nativeBuildInputs = [
pkg-config

2
pkgs/applications/radio/unixcw/default.nix
View File

@ -31,7 +31,7 @@ mkDerivation rec {
These change the parameters used when sounding the Morse code.
cw reports any errors in embedded commands
'';
homepage = "http://unixcw.sourceforge.net";
homepage = "https://unixcw.sourceforge.net";
maintainers = [ maintainers.mafo ];
license = licenses.gpl2;
platforms=platforms.linux;

2
pkgs/applications/science/astronomy/xplanet/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Renders an image of the earth or other planets into the X root window";
homepage = "http://xplanet.sourceforge.net";
homepage = "https://xplanet.sourceforge.net";
license = licenses.gpl2;
maintainers = with maintainers; [ lassulus sander ];
platforms = platforms.all;

2
pkgs/applications/science/biology/bowtie/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An ultrafast memory-efficient short read aligner";
license = licenses.artistic2;
homepage = "http://bowtie-bio.sourceforge.net";
homepage = "https://bowtie-bio.sourceforge.net";
maintainers = with maintainers; [ prusnak ];
platforms = platforms.all;
};

2
pkgs/applications/science/biology/seaview/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
Gouy M., Guindon S. & Gascuel O. (2010) SeaView version 4 : a multiplatform graphical user interface for sequence alignment and phylogenetic tree building. Molecular Biology and Evolution 27(2):221-224.
'';
homepage = "http://doua.prabi.fr/software/seaview";
homepage = "https://doua.prabi.fr/software/seaview";
license = licenses.gpl3;
maintainers = [ maintainers.iimog ];
platforms = platforms.linux;

2
pkgs/applications/science/electronics/gtkwave/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = {
description = "VCD/Waveform viewer for Unix and Win32";
homepage = "http://gtkwave.sourceforge.net";
homepage = "https://gtkwave.sourceforge.net";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ thoughtpolice jiegec ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;

2
pkgs/applications/science/electronics/qucs/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Integrated circuit simulator";
homepage = "http://qucs.sourceforge.net";
homepage = "https://qucs.sourceforge.net";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;

2
pkgs/applications/science/electronics/xoscope/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Oscilloscope through the sound card";
homepage = "http://xoscope.sourceforge.net";
homepage = "https://xoscope.sourceforge.net";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;

2
pkgs/applications/science/logic/yices/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high-performance theorem prover and SMT solver";
homepage = "http://yices.csl.sri.com";
homepage = "https://yices.csl.sri.com";
license = licenses.gpl3;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ thoughtpolice ];

2
pkgs/applications/science/math/gretl/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gretl is a cross-platform software package for econometric analysis,
written in the C programming language.
'';
homepage = "http://gretl.sourceforge.net";
homepage = "https://gretl.sourceforge.net";
license = licenses.gpl3;
maintainers = with maintainers; [ dmrauh ];
platforms = with platforms; all;

2
pkgs/applications/science/math/lp_solve/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A Mixed Integer Linear Programming (MILP) solver";
homepage = "http://lpsolve.sourceforge.net";
homepage = "https://lpsolve.sourceforge.net";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ smironov ];
platforms = platforms.unix;

2
pkgs/applications/science/math/singular/default.nix
View File

@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
# https://www.singular.uni-kl.de:8002/trac/ticket/837
platforms = subtractLists platforms.i686 platforms.unix;
license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
homepage = "http://www.singular.uni-kl.de";
homepage = "https://www.singular.uni-kl.de";
downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
mainProgram = "Singular";
};

2
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
View File

@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://www.gromacs.org";
homepage = "https://www.gromacs.org";
license = licenses.gpl2;
description = "Molecular dynamics software package";
longDescription = ''

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

@ -15,12 +15,12 @@
buildGoModule rec {
pname = "gitea";
version = "1.18.3";
version = "1.18.4";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU=";
hash = "sha256-LSSOmqSeiv9qNCAsRWYtjRLfUDLMd8mOVAxTOacvNOA=";
};
vendorHash = null;

2
pkgs/applications/video/imagination/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Lightweight and simple DVD slide show maker";
homepage = "http://imagination.sourceforge.net";
homepage = "https://imagination.sourceforge.net";
license = licenses.gpl3Only;
maintainers = with maintainers; [ austinbutler ];
platforms = platforms.linux;

2
pkgs/applications/video/tivodecode/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file";
homepage = "http://tivodecode.sourceforge.net";
homepage = "https://tivodecode.sourceforge.net";
platforms = platforms.unix;
license = licenses.bsd3;
};

3
pkgs/build-support/kernel/make-initrd-ng/README.md
View File

@ -38,6 +38,9 @@ object is copied depends on its type.
- If it is *also* an ELF file, then all of its direct shared
library dependencies are also listed as objects to be copied.
- If an unwrapped file exists as `.[filename]-wrapped`, then it is
also listed as an object to be copied.
2. A directory's direct children are listed as objects to be copied,
and a directory at the same absolute path in the initrd is created.

16
pkgs/build-support/kernel/make-initrd-ng/src/main.rs
View File

@ -1,8 +1,9 @@
use std::collections::{HashSet, VecDeque};
use std::env;
use std::ffi::OsStr;
use std::ffi::{OsStr, OsString};
use std::fs;
use std::hash::Hash;
use std::iter::FromIterator;
use std::io::{BufRead, BufReader, Error};
use std::os::unix;
use std::path::{Component, Path, PathBuf};
@ -163,6 +164,19 @@ fn handle_path(
let typ = fs::symlink_metadata(&source)?.file_type();
if typ.is_file() && !target.exists() {
copy_file(&source, &target, queue)?;
if let Some(filename) = source.file_name() {
source.set_file_name(OsString::from_iter([
OsStr::new("."),
filename,
OsStr::new("-wrapped"),
]));
let wrapped_path = source.as_path();
if wrapped_path.exists() {
queue.push_back(Box::from(wrapped_path));
}
}
} else if typ.is_symlink() {
let link_target = fs::read_link(&source)?;

2
pkgs/data/fonts/proggyfonts/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://www.upperbounds.net";
homepage = "https://www.upperbounds.net";
description = "A set of fixed-width screen fonts that are designed for code listings";
license = licenses.mit;
platforms = platforms.all;

2
pkgs/development/interpreters/metamath/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
in the Metamath Proof Explorer, and it generated its web pages. The *.mm
ASCII databases (set.mm and others) are also included in this derivation.
'';
homepage = "http://us.metamath.org";
homepage = "https://us.metamath.org";
downloadPage = "https://us.metamath.org/#downloads";
license = licenses.gpl2Plus;
maintainers = [ maintainers.taneb ];

2
pkgs/development/libraries/armadillo/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "C++ linear algebra library";
homepage = "http://arma.sourceforge.net";
homepage = "https://arma.sourceforge.net";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ juliendehos knedlsepp ];

2
pkgs/development/libraries/clucene-core/2.x.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
CLucene is a port of the very popular Java Lucene text search engine API.
'';
homepage = "http://clucene.sourceforge.net";
homepage = "https://clucene.sourceforge.net";
platforms = platforms.unix;
license = with licenses; [ asl20 lgpl2 ];
};

2
pkgs/development/libraries/clucene-core/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
CLucene is a port of the very popular Java Lucene text search engine API.
'';
homepage = "http://clucene.sourceforge.net";
homepage = "https://clucene.sourceforge.net";
platforms = platforms.unix;
license = with licenses; [ asl20 lgpl2 ];
};

2
pkgs/development/libraries/dbus-cplusplus/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-ecore" "--disable-tests" ];
meta = with lib; {
homepage = "http://dbus-cplusplus.sourceforge.net";
homepage = "https://dbus-cplusplus.sourceforge.net";
description = "C++ API for D-BUS";
license = licenses.gpl2Plus;
platforms = platforms.linux;

2
pkgs/development/libraries/gtkspell/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Word-processor-style highlighting and replacement of misspelled words";
homepage = "http://gtkspell.sourceforge.net";
homepage = "https://gtkspell.sourceforge.net";
platforms = platforms.unix;
license = licenses.gpl2;
};

2
pkgs/development/libraries/hamlib/4.nix
View File

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
command line interface or in a text-oriented interactive interface.
'';
license = with licenses; [ gpl2Plus lgpl2Plus ];
homepage = "http://hamlib.sourceforge.net";
homepage = "https://hamlib.sourceforge.net";
maintainers = with maintainers; [ relrod ];
platforms = with platforms; unix;
};

2
pkgs/development/libraries/hamlib/default.nix
View File

@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
command line interface or in a text-oriented interactive interface.
'';
license = with licenses; [ gpl2Plus lgpl2Plus ];
homepage = "http://hamlib.sourceforge.net";
homepage = "https://hamlib.sourceforge.net";
maintainers = with maintainers; [ relrod ];
platforms = with platforms; unix;
};

2
pkgs/development/libraries/hunspell/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = with lib; {
homepage = "http://hunspell.sourceforge.net";
homepage = "https://hunspell.sourceforge.net";
description = "Spell checker";
longDescription = ''
Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla

2
pkgs/development/libraries/id3lib/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags";
homepage = "http://id3lib.sourceforge.net";
homepage = "https://id3lib.sourceforge.net";
platforms = platforms.unix;
license = licenses.lgpl2;
};

2
pkgs/development/libraries/java/httpunit/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://httpunit.sourceforge.net";
homepage = "https://httpunit.sourceforge.net";
platforms = platforms.unix;
license = licenses.mit;
};

2
pkgs/development/libraries/lesstif/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An open source clone of the Motif widget set";
homepage = "http://lesstif.sourceforge.net";
homepage = "https://lesstif.sourceforge.net";
platforms = platforms.unix;
license = with licenses; [ gpl2 lgpl2 ];
};

2
pkgs/development/libraries/libcdaudio/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A portable library for controlling audio CDs";
homepage = "http://libcdaudio.sourceforge.net";
homepage = "https://libcdaudio.sourceforge.net";
platforms = lib.platforms.linux;
license = lib.licenses.lgpl2;
};

2
pkgs/development/libraries/libiodbc/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "iODBC driver manager";
homepage = "http://www.iodbc.org";
homepage = "https://www.iodbc.org";
platforms = platforms.unix;
license = licenses.bsd3;
};

2
pkgs/development/libraries/liblastfmSF/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
meta = {
homepage = "http://liblastfm.sourceforge.net";
homepage = "https://liblastfm.sourceforge.net";
description = "Unofficial C lastfm library";
license = lib.licenses.gpl3;
};

2
pkgs/development/libraries/liblouis/default.nix
View File

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Open-source braille translator and back-translator";
homepage = "http://liblouis.org/";
homepage = "https://liblouis.org/";
license = with licenses; [
lgpl21Plus # library
gpl3Plus # tools

2
pkgs/development/libraries/libmcrypt/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Replacement for the old crypt() package and crypt(1) command, with extensions";
homepage = "http://mcrypt.sourceforge.net";
homepage = "https://mcrypt.sourceforge.net";
license = "GPL";
platforms = lib.platforms.all;
};

2
pkgs/development/libraries/libmhash/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
following rfc2104 (HMAC). It also includes some key generation algorithms
which are based on hash algorithms.
'';
homepage = "http://mhash.sourceforge.net";
homepage = "https://mhash.sourceforge.net";
license = "LGPL";
platforms = lib.platforms.unix;
};

2
pkgs/development/libraries/libwpd/0.8.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library for importing WordPerfect documents";
homepage = "http://libwpd.sourceforge.net";
homepage = "https://libwpd.sourceforge.net";
license = with licenses; [ lgpl21 mpl20 ];
platforms = platforms.unix;
};

2
pkgs/development/libraries/libwpg/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
homepage = "http://libwpg.sourceforge.net";
homepage = "https://libwpg.sourceforge.net";
description = "C++ library to parse WPG";
license = with licenses; [ lgpl21 mpl20 ];
platforms = platforms.all;

2
pkgs/development/libraries/loki/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms";
homepage = "http://loki-lib.sourceforge.net";
homepage = "https://loki-lib.sourceforge.net";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ peterhoeg ];

2
pkgs/development/libraries/podofo/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://podofo.sourceforge.net";
homepage = "https://podofo.sourceforge.net";
description = "A library to work with the PDF file format";
platforms = platforms.all;
license = with licenses; [ gpl2Plus lgpl2Plus ];

2
pkgs/development/libraries/ucx/default.nix
View File

@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Unified Communication X library";
homepage = "http://www.openucx.org";
homepage = "https://www.openucx.org";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.markuskowa ];

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

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"
"http://www.unixodbc.org/${pname}-${version}.tar.gz"
"https://www.unixodbc.org/${pname}-${version}.tar.gz"
];
sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w=";
};
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "ODBC driver manager for Unix";
homepage = "http://www.unixodbc.org/";
homepage = "https://www.unixodbc.org/";
license = licenses.lgpl2;
platforms = platforms.unix;
};

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

@ -90399,7 +90399,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The browser package manager";
homepage = "http://bower.io";
homepage = "https://bower.io";
license = "MIT";
};
production = true;
@ -113383,7 +113383,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
homepage = "http://github.com/remy/inliner";
homepage = "https://github.com/remy/inliner";
license = "MIT";
};
production = true;
@ -115668,7 +115668,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = "http://jshint.com/";
homepage = "https://jshint.com/";
license = "MIT";
};
production = true;
@ -119084,7 +119084,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Leaner CSS";
homepage = "http://lesscss.org";
homepage = "https://lesscss.org";
license = "Apache-2.0";
};
production = true;
@ -119109,7 +119109,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "clean-css plugin for less.js";
homepage = "http://lesscss.org";
homepage = "https://lesscss.org";
};
production = true;
bypassCache = true;
@ -123170,7 +123170,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Web Inspector based nodeJS debugger";
homepage = "http://github.com/node-inspector/node-inspector";
homepage = "https://github.com/node-inspector/node-inspector";
};
production = true;
bypassCache = true;
@ -123660,7 +123660,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Low-code programming for event-driven applications";
homepage = "http://nodered.org";
homepage = "https://nodered.org";
license = "Apache-2.0";
};
production = true;
@ -128430,7 +128430,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Production process manager for Node.JS applications with a built-in load balancer.";
homepage = "http://pm2.keymetrics.io/";
homepage = "https://pm2.keymetrics.io/";
license = "AGPL-3.0";
};
production = true;
@ -150171,7 +150171,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "CLI tool for running Yeoman generators";
homepage = "http://yeoman.io";
homepage = "https://yeoman.io";
license = "BSD-2-Clause";
};
production = true;

4
pkgs/development/python-modules/azure-mgmt-kusto/default.nix
View File

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "3.0.0";
version = "3.1.0";
pname = "azure-mgmt-kusto";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-sSE/jN2YWuf81dUsZFLgYUnTv9e1PnO9qszjuHlUcDI=";
sha256 = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc=";
extension = "zip";
};

10
pkgs/development/python-modules/boltons/default.nix
View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "mahmoud";
repo = "boltons";
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk=";
};
@ -41,8 +41,12 @@ buildPythonPackage rec {
"boltons"
];
disabledTests = lib.optionals (pythonAtLeast "3.11") [
# https://github.com/mahmoud/boltons/issues/326
"test_frozendict_api"
];
meta = with lib; {
homepage = "https://github.com/mahmoud/boltons";
description = "Constructs, recipes, and snippets extending the Python standard library";
longDescription = ''
Boltons is a set of over 200 BSD-licensed, pure-Python utilities
@ -59,6 +63,8 @@ buildPythonPackage rec {
- A full-featured TracebackInfo type, for representing stack
traces, in tbutils
'';
homepage = "https://github.com/mahmoud/boltons";
changelog = "https://github.com/mahmoud/boltons/blob/${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ twey ];
};

3
pkgs/development/python-modules/dinghy/default.nix
View File

@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "nedbat";
repo = pname;
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw=";
};
@ -47,6 +47,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A GitHub activity digest tool";
homepage = "https://github.com/nedbat/dinghy";
changelog = "https://github.com/nedbat/dinghy/blob/${version}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [ trundle veehaitch ];
};

34
pkgs/development/python-modules/eliot/default.nix
View File

@ -6,7 +6,7 @@
, boltons
, hypothesis
, pyrsistent
, pytest
, pytestCheckHook
, setuptools
, six
, testtools
@ -16,19 +16,15 @@
buildPythonPackage rec {
pname = "eliot";
version = "1.14.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149";
hash = "sha256-wvCZo+jV7PwidFdm58xmSkjbZLa4nZht/ycEkdhoMUk=";
};
nativeCheckInputs = [
hypothesis
testtools
pytest
];
propagatedBuildInputs = [
aiocontextvars
boltons
@ -38,19 +34,31 @@ buildPythonPackage rec {
zope_interface
];
pythonImportsCheck = [ "eliot" ];
nativeCheckInputs = [
hypothesis
pytestCheckHook
testtools
];
pythonImportsCheck = [
"eliot"
];
# Tests run eliot-prettyprint in out/bin.
# test_parse_stream is broken, skip it.
checkPhase = ''
preCheck = ''
export PATH=$out/bin:$PATH
pytest -k 'not test_parse_stream'
'';
disabledTests = [
"test_parse_stream"
# AttributeError: module 'inspect' has no attribute 'getargspec'
"test_default"
];
meta = with lib; {
homepage = "https://eliot.readthedocs.io";
description = "Logging library that tells you why it happened";
license = licenses.asl20;
maintainers = [ maintainers.dpausp ];
maintainers = with maintainers; [ dpausp ];
};
}

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

@ -1,12 +1,13 @@
{ lib
, buildPythonPackage
, fetchPypi
, boltons
, attrs
, boltons
, buildPythonPackage
, face
, fetchPypi
, pytestCheckHook
, pyyaml
, pythonAtLeast
, pythonOlder
, pyyaml
}:
buildPythonPackage rec {
@ -40,6 +41,9 @@ buildPythonPackage rec {
disabledTests = [
# Test is outdated (was made for PyYAML 3.x)
"test_main_yaml_target"
] ++ lib.optionals (pythonAtLeast "3.11") [
"test_regular_error_stack"
"test_long_target_repr"
];
pythonImportsCheck = [
@ -47,12 +51,13 @@ buildPythonPackage rec {
];
meta = with lib; {
homepage = "https://github.com/mahmoud/glom";
description = "Restructuring data, the Python way";
longDescription = ''
glom helps pull together objects from other objects in a
declarative, dynamic, and downright simple way.
'';
homepage = "https://github.com/mahmoud/glom";
changelog = "https://github.com/mahmoud/glom/blob/v${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ twey ];
};

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

@ -40,7 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for building complex data processing software by combining widely used machine learning algorithms";
homepage = "http://mdp-toolkit.sourceforge.net";
homepage = "https://mdp-toolkit.sourceforge.net";
license = licenses.bsd3;
maintainers = with maintainers; [ nico202 ];
};

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

@ -83,7 +83,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Optional static typing for Python";
homepage = "http://www.mypy-lang.org";
homepage = "https://www.mypy-lang.org";
license = licenses.mit;
maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ];
};

2
pkgs/development/python-modules/mypy/extensions.nix
View File

@ -40,7 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Experimental type system extensions for programs checked with the mypy typechecker";
homepage = "http://www.mypy-lang.org";
homepage = "https://www.mypy-lang.org";
license = licenses.mit;
maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ];
};

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

@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = {
description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x";
homepage = "http://pyopengl.sourceforge.net/";
homepage = "https://pyopengl.sourceforge.net/";
maintainers = with lib.maintainers; [ laikq ];
license = lib.licenses.bsd3;
};

1
pkgs/development/python-modules/restview/default.nix
View File

@ -44,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "ReStructuredText viewer";
homepage = "https://mg.pov.lt/restview/";
changelog = "https://github.com/mgedmin/restview/blob/${version}/CHANGES.rst";
license = licenses.gpl3Only;
maintainers = with maintainers; [ koral ];
};

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

@ -3,13 +3,13 @@
, aiofiles
, beautifulsoup4
, buildPythonPackage
, doCheck ? true
, doCheck ? !stdenv.isDarwin # on Darwin, tests fail but pkg still works
, fetchFromGitHub
, gunicorn
, httptools
, multidict
, pytest-asyncio
,pytestCheckHook
, pytestCheckHook
, pythonOlder
, pythonAtLeast
, sanic-routing
@ -69,7 +69,7 @@ buildPythonPackage rec {
# needed for relative paths for some packages
cd tests
'' + lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString stdenv.isDarwin ''
# OSError: [Errno 24] Too many open files
ulimit -n 1024
'';
@ -126,7 +126,6 @@ buildPythonPackage rec {
pythonImportsCheck = [ "sanic" ];
meta = with lib; {
broken = stdenv.isDarwin;
description = "Web server and web framework";
homepage = "https://github.com/sanic-org/sanic/";
changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}";

11
pkgs/development/python-modules/yalexs/default.nix
View File

@ -3,7 +3,6 @@
, aiohttp
, aioresponses
, aiounittest
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pubnub
@ -17,16 +16,16 @@
buildPythonPackage rec {
pname = "yalexs";
version = "1.2.6";
version = "1.2.8";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "sha256-E+Forcx6dRtDeagcjGGE8DFkAKUgsHyCEONW7WU0lpo=";
rev = "refs/tags/v${version}";
hash = "sha256-SdWfhA6mroZnqHQYPieuZvox+OGEHWOTlfuHqu5r0cg=";
};
propagatedBuildInputs = [
@ -41,7 +40,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
aioresponses
aiounittest
asynctest
pytestCheckHook
requests-mock
];
@ -59,6 +57,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell";
homepage = "https://github.com/bdraco/yalexs";
changelog = "https://github.com/bdraco/yalexs/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

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

@ -1,45 +1,53 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, pcre
, python3
, libxslt
, docbook_xsl
, docbook_xml_dtd_45
, withZ3 ? true
, z3
, which
}:
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "2.9.3";
version = "2.10";
src = fetchFromGitHub {
owner = "danmar";
repo = "cppcheck";
rev = version;
hash = "sha256-AaZzr5r+tpG5M40HSx45KCUBPhN/nSpXxS5H3FuSx2c=";
hash = "sha256-Ss35foFlh4sw6TxMp++0b9E5KDUjBpDPuWIHsak8OGY=";
};
buildInputs = [ pcre
(python3.withPackages (ps: [ps.pygments]))
] ++ lib.optionals withZ3 [ z3 ];
nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 which ];
buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ];
nativeBuildInputs = [ installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which ];
makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]
++ lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ];
makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ];
outputs = [ "out" "man" ];
enableParallelBuilding = true;
postBuild = ''
make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
'';
doCheck = true;
postInstall = ''
make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
mkdir -p $man/share/man/man1
cp cppcheck.1 $man/share/man/man1/cppcheck.1
installManPage cppcheck.1
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
echo 'int main() {}' > ./installcheck.cpp
$out/bin/cppcheck ./installcheck.cpp > /dev/null
runHook postInstallCheck
'';
meta = with lib; {

4
pkgs/development/tools/continuous-integration/github-runner/default.nix
View File

@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
version = "2.302.0";
version = "2.302.1";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-eIMiXdw62JGlSnMkmFf9vqOpp1QC9DkD/2wDPHJuVBI=";
hash = "sha256-l7kGKhHpE5kEo8QMmwZKnG4cctj2INhnko7KfAXfrQ8=";
};
nativeBuildInputs = [

2
pkgs/development/tools/explain/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library and utility to explain system call errors";
homepage = "http://libexplain.sourceforge.net";
homepage = "https://libexplain.sourceforge.net";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ McSinyx ];
platforms = platforms.unix;

6
pkgs/development/tools/golangci-lint/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
version = "1.51.1";
version = "1.51.2";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
hash = "sha256-BkkC23dO40gnEQ6sJcbLR2UzdigMrta2+NnZA2bk3E8=";
hash = "sha256-F2rkVZ5ia9/wyTw1WIeizFnuaHoS2A8VzVOGDcshy64=";
};
vendorHash = "sha256-CS9Z3nvOleKTYjw89IKybsUI33w0If/mYDUpQHLO58U=";
vendorHash = "sha256-JO/mRJB3gRTtBj6pW1267/xXUtalTJo0p3q5e34vqTs=";
doCheck = false;

2
pkgs/development/tools/literate-programming/nuweb/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A simple literate programming tool";
homepage = "http://nuweb.sourceforge.net";
homepage = "https://nuweb.sourceforge.net";
license = licenses.free;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.unix;

2
pkgs/development/tools/misc/dfu-util/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
phones. With dfu-util you are able to download firmware to your device or
upload firmware from it.
'';
homepage = "http://dfu-util.sourceforge.net";
homepage = "https://dfu-util.sourceforge.net";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.fpletz ];

2
pkgs/development/tools/solarus-quest-editor/default.nix
View File

@ -33,7 +33,7 @@ mkDerivation rec {
Many full-fledged games have been writen for the engine.
Games can be created easily using the editor.
'';
homepage = "http://www.solarus-games.org";
homepage = "https://www.solarus-games.org";
license = licenses.gpl3;
maintainers = [ ];
platforms = platforms.linux;

2
pkgs/development/tools/udis86/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" "lib" ];
meta = with lib; {
homepage = "http://udis86.sourceforge.net";
homepage = "https://udis86.sourceforge.net";
license = licenses.bsd2;
maintainers = with maintainers; [ timor ];
mainProgram = "udcli";

2
pkgs/games/rili/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL SDL_mixer ];
meta = {
homepage = "http://ri-li.sourceforge.net";
homepage = "https://ri-li.sourceforge.net";
license = lib.licenses.gpl2Plus;
description = "A children's train game";
longDescription = ''

2
pkgs/games/solarus/default.nix
View File

@ -33,7 +33,7 @@ mkDerivation rec {
Solarus is a game engine for Zelda-like ARPG games written in lua.
Many full-fledged games have been writen for the engine.
'';
homepage = "http://www.solarus-games.org";
homepage = "https://www.solarus-games.org";
license = licenses.gpl3;
maintainers = [ ];
platforms = platforms.linux;

2
pkgs/os-specific/linux/guvcview/default.nix
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A simple interface for devices supported by the linux UVC driver";
homepage = "http://guvcview.sourceforge.net";
homepage = "https://guvcview.sourceforge.net";
maintainers = [ maintainers.coconnor ];
license = licenses.gpl3;
platforms = platforms.linux;

2
pkgs/os-specific/linux/nmon/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "AIX & Linux Performance Monitoring tool";
homepage = "http://nmon.sourceforge.net";
homepage = "https://nmon.sourceforge.net";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ sveitser ];

2
pkgs/os-specific/linux/uvcdynctrl/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A simple interface for devices supported by the linux UVC driver";
homepage = "http://guvcview.sourceforge.net";
homepage = "https://guvcview.sourceforge.net";
license = licenses.gpl3Plus;
maintainers = [ maintainers.puffnfresh ];
platforms = platforms.linux;

2
pkgs/os-specific/linux/xf86-input-wacom/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
maintainers = with maintainers; [ goibhniu fortuneteller2k ];
description = "Wacom digitizer driver for X11";
homepage = "http://linuxwacom.sourceforge.net";
homepage = "https://linuxwacom.sourceforge.net";
license = licenses.gpl2Only;
platforms = platforms.linux; # Probably, works with other unixes as well
};

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