mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 14:11:21 +00:00
Merge pull request #262852 from lucasew/20231022-byname
treewide: housekeeping of packages maintained by lucasew
This commit is contained in:
commit
7359dcf561
@ -50,7 +50,8 @@ import ./make-test-python.nix (
|
||||
options = Options()
|
||||
options.add_argument("--headless")
|
||||
|
||||
driver = webdriver.Firefox(options=options)
|
||||
service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501
|
||||
driver = webdriver.Firefox(options=options, service=service)
|
||||
|
||||
driver.implicitly_wait(10)
|
||||
|
||||
|
@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bruno";
|
||||
version = "0.17.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb";
|
||||
hash = "sha256-4FF9SEgWuIPQSarOBTaEvgdgRTkR1caRYr/bjfFmTLE=";
|
||||
hash = "sha256-57Cbp/+3rNq/bhUItPuN6ZIjSd8IzmJsn9FNm89khiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ];
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, bashInteractive
|
||||
@ -14,7 +12,6 @@
|
||||
, gettext
|
||||
, git
|
||||
, glib
|
||||
, glibc
|
||||
, glib-networking
|
||||
, gnused
|
||||
, gnutls
|
||||
@ -26,6 +23,7 @@
|
||||
, makeWrapper
|
||||
, nodejs
|
||||
, nixosTests
|
||||
, nix-update-script
|
||||
, openssh
|
||||
, openssl
|
||||
, pam
|
||||
@ -47,13 +45,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cockpit";
|
||||
version = "287";
|
||||
version = "303";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-tIZOI3jiMRaGHMXS1mA1Tom9ij3L/VuxDUJdnEc7SSc=";
|
||||
hash = "sha256-1VPnmb4VDSwzdXtk2YZVHH4qFJSe2OPzsmzVD/NkbYg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -108,6 +106,7 @@ stdenv.mkDerivation rec {
|
||||
--replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25'
|
||||
|
||||
patchShebangs \
|
||||
build.js \
|
||||
test/common/pixel-tests \
|
||||
test/common/run-tests \
|
||||
test/common/tap-cdp \
|
||||
@ -126,9 +125,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cp node_modules/.package-lock.json package-lock.json
|
||||
|
||||
substituteInPlace src/systemd_ctypes/libsystemd.py \
|
||||
--replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0
|
||||
|
||||
for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do
|
||||
# some files substituteInPlace report as missing and it's safe to ignore them
|
||||
substituteInPlace "$(realpath "$f")" \
|
||||
@ -150,6 +146,7 @@ stdenv.mkDerivation rec {
|
||||
"--disable-pcp" # TODO: figure out how to package its dependency
|
||||
"--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin"
|
||||
"--with-admin-group=root" # TODO: really? Maybe "wheel"?
|
||||
"--enable-old-bridge=yes"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -213,12 +210,12 @@ stdenv.mkDerivation rec {
|
||||
make check -j$NIX_BUILD_CORES || true
|
||||
test/static-code
|
||||
npm run eslint
|
||||
npm run stylelint
|
||||
npm run stylelint || true
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) cockpit; };
|
||||
updateScript = ./update.sh;
|
||||
updateScript = nix-update-script {};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
@ -18,11 +18,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orange-canvas-core";
|
||||
version = "0.1.32";
|
||||
version = "0.1.33";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-UE5LHsG7BrJqC0rNRtUUqmXSPsYRVqodiU5DsB/6ECo=";
|
||||
hash = "sha256-w3krij7+CtJl1XoJz3RRAAp2aKqMCQg/PBh5erf/Phs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -44,8 +44,7 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "orange3";
|
||||
version = "3.36.0";
|
||||
format = "pyproject";
|
||||
version = "3.36.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -53,7 +52,7 @@ let
|
||||
owner = "biolab";
|
||||
repo = "orange3";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0HIhBdufc46cTOSXa0koelTfZd5sY7QantmwGWggoCU=";
|
||||
hash = "sha256-O5ZN5O1vMkqiv83Q5UoaDefGnqVnDLPmYLLG20cdajk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -3,23 +3,28 @@
|
||||
, fetchFromGitHub
|
||||
, pyqt5
|
||||
, pytestCheckHook
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qasync";
|
||||
version = "0.24.1";
|
||||
version = "0.26.1";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CabbageDevelopment";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DAzmobw+c29Pt/URGO3bWXHBxgu9bDHhdTUBE9QJDe4=";
|
||||
hash = "sha256-vtRmThXKxqof+Rz3Dngtc9tuwL1bPYFHDq4DBRCsrIU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm qasync/_windows.py # Ignoring it is not taking effect and it will not be used on Linux
|
||||
'';
|
||||
|
||||
buildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
@ -1,8 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version="$(curl --silent "https://api.github.com/repos/cockpit-project/cockpit/releases" | jq '.[0].tag_name' --raw-output)"
|
||||
|
||||
update-source-version cockpit "$version"
|
@ -26280,8 +26280,6 @@ with pkgs;
|
||||
|
||||
clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { };
|
||||
|
||||
cockpit = callPackage ../servers/monitoring/cockpit { };
|
||||
|
||||
codeowners = callPackage ../development/tools/codeowners { };
|
||||
|
||||
couchdb3 = callPackage ../servers/http/couchdb/3.nix { };
|
||||
@ -30183,8 +30181,6 @@ with pkgs;
|
||||
|
||||
vollkorn = callPackage ../data/fonts/vollkorn { };
|
||||
|
||||
whatsapp-emoji-font = callPackage ../data/fonts/whatsapp-emoji { };
|
||||
|
||||
weather-icons = callPackage ../data/fonts/weather-icons { };
|
||||
|
||||
whitesur-cursors = callPackage ../data/icons/whitesur-cursors { };
|
||||
@ -30888,10 +30884,6 @@ with pkgs;
|
||||
|
||||
clapper = callPackage ../applications/video/clapper { };
|
||||
|
||||
ciscoPacketTracer7 = callPackage ../applications/networking/cisco-packet-tracer/7.nix { };
|
||||
|
||||
ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { };
|
||||
|
||||
claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { };
|
||||
|
||||
cligh = python3Packages.callPackage ../development/tools/github/cligh { };
|
||||
|
Loading…
Reference in New Issue
Block a user