Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
055dd6c5e5
|
|
@ -1835,6 +1835,12 @@
|
|||
fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25";
|
||||
}];
|
||||
};
|
||||
benkuhn = {
|
||||
email = "ben@ben-kuhn.com";
|
||||
github = "ben-kuhn";
|
||||
githubId = 16821405;
|
||||
name = "Ben Kuhn";
|
||||
};
|
||||
benley = {
|
||||
email = "benley@gmail.com";
|
||||
github = "benley";
|
||||
|
|
@ -9352,6 +9358,12 @@
|
|||
githubId = 458783;
|
||||
name = "Martin Gammelsæter";
|
||||
};
|
||||
martinramm = {
|
||||
email = "martin-ramm@gmx.de";
|
||||
github = "MartinRamm";
|
||||
githubId = 31626748;
|
||||
name = "Martin Ramm";
|
||||
};
|
||||
marzipankaiser = {
|
||||
email = "nixos@gaisseml.de";
|
||||
github = "marzipankaiser";
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ in
|
|||
You should only need to adjust this if you require a newer Mesa
|
||||
version for your hardware or because you need to patch a bug.
|
||||
'';
|
||||
apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";
|
||||
apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");
|
||||
};
|
||||
mesaPackage32 = mkOption {
|
||||
type = types.package;
|
||||
|
|
@ -110,7 +110,7 @@ in
|
|||
Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit
|
||||
systems. Used when {option}`driSupport32Bit` is set.
|
||||
'';
|
||||
apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";
|
||||
apply = mesa: mesa.drivers or (throw "`mesa` package must have a `drivers` output.");
|
||||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ in
|
|||
# loaders.cache based on that and set the environment variable
|
||||
# GDK_PIXBUF_MODULE_FILE to point to it.
|
||||
config = lib.mkIf (cfg.modulePackages != []) {
|
||||
environment.variables = {
|
||||
environment.sessionVariables = {
|
||||
GDK_PIXBUF_MODULE_FILE = "${loadersCache}";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,15 +18,15 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "drawing";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maoschanz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9nosriI3Kdf1M5/TYFWn1jtQTqNKhBcFh7q3E4Uoq4s=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kNF9db8NoHWW1A0WEFQzxHqAQ4A7kxInMRZFJOXQX/k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -64,6 +64,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop";
|
||||
homepage = "https://maoschanz.github.io/drawing/";
|
||||
changelog = "https://github.com/maoschanz/drawing/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ mothsart ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index f01f824..e00d079 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -328,7 +328,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "swayws"
|
||||
-version = "1.1.1"
|
||||
+version = "1.2.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"env_logger",
|
||||
|
|
@ -2,16 +2,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swayws";
|
||||
version = "unstable-2022-03-10";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "w0lff";
|
||||
repo = pname;
|
||||
rev = "514f3c664439cf2c11bb9096c7e1d3b8c0b898a2";
|
||||
sha256 = "sha256-vUnbn79v08riYLMBI8BxeBPpe/pHOWlraG7QAaohw3s=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PvKpcTewajvbzUHPssBahWVcAQB3V/aMmOJ/wA0Nrv4=";
|
||||
cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo=";
|
||||
# Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1
|
||||
cargoPatches = [
|
||||
./ws-update-Cargo-lock.patch
|
||||
];
|
||||
|
||||
# swayws does not have any tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
76
pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix
Normal file
76
pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ lib
|
||||
, findutils
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, gnugrep
|
||||
, gnused
|
||||
, mfc5890cnlpr
|
||||
, pkgsi686Linux
|
||||
, psutils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mfc5890cncupswrapper";
|
||||
version = "1.1.2-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf006170/${pname}-${version}.i386.deb";
|
||||
hash = "sha256-UOCwzB09/a1/2rliY+hTrslSvO5ztVj51auisPx7OIQ=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x $src $out
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
lpr=${mfc5890cnlpr}/usr/local/Brother/Printer/mfc5890cn
|
||||
dir=$out/usr/local/Brother/Printer/mfc5890cn
|
||||
|
||||
interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2
|
||||
patchelf --set-interpreter "$interpreter" "$dir/cupswrapper/brcupsconfpt1"
|
||||
|
||||
#comment out lpadmin commands to prohibit changes to CUPS config by just installing this driver.
|
||||
substituteInPlace $dir/cupswrapper/cupswrappermfc5890cn \
|
||||
--replace "lpadmin" "#lpadmin" \
|
||||
--replace "/usr/" "$out/usr/"
|
||||
|
||||
#mfc5890cnlpr is a dependency of this package. Link all files of mfc5890cnlpr into the $out/usr folder, as other scripts depend on these files being present.
|
||||
#Ideally, we would use substituteInPlace for each file this package actually requires. But the scripts of Brother use variables to dynamically build the paths
|
||||
#at runtime, making this approach more complex. Hence, the easier route of simply linking all files was choosen.
|
||||
find "$lpr" -type f -exec sh -c "mkdir -vp \$(echo '{}' | sed 's|$lpr|$dir|g' | xargs dirname) && ln -s '{}' \$(echo '{}' | sed 's|$lpr|$dir|g')" \;
|
||||
|
||||
mkdir -p $out/usr/share/ppd/
|
||||
mkdir -p $out/usr/lib64/cups/filter
|
||||
sed -i '941,972d' $dir/cupswrapper/cupswrappermfc5890cn
|
||||
$dir/cupswrapper/cupswrappermfc5890cn
|
||||
|
||||
chmod +x $out/usr/lib64/cups/filter/brlpdwrappermfc5890cn
|
||||
wrapProgram $out/usr/lib64/cups/filter/brlpdwrappermfc5890cn --prefix PATH : ${lib.makeBinPath [coreutils psutils gnugrep gnused]}
|
||||
|
||||
mkdir -p $out/lib/cups/filter
|
||||
mkdir -p $out/share/cups/model
|
||||
ln $out/usr/lib64/cups/filter/brlpdwrappermfc5890cn $out/lib/cups/filter
|
||||
ln $dir/cupswrapper/cupswrappermfc5890cn $out/lib/cups/filter
|
||||
ln $out/usr/share/ppd/brmfc5890cn.ppd $out/share/cups/model
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Brother MFC-5890CN CUPS wrapper driver.";
|
||||
londDescription = "Brother MFC-5890CN CUPS wrapper driver. Use the connection string 'lpd://\${IP_ADDRESS}/binary_p1' when connecting to this printer via the network.";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ martinramm ];
|
||||
};
|
||||
}
|
||||
75
pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix
Normal file
75
pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
{ stdenv
|
||||
, a2ps
|
||||
, lib
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, file
|
||||
, gawk
|
||||
, ghostscript
|
||||
, gnused
|
||||
, pkgsi686Linux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mfc5890cnlpr";
|
||||
version = "1.1.2-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf006168/${pname}-${version}.i386.deb";
|
||||
sha256 = "119h3s1p9pv83mrfv6cmxpc0v33xf8c9nw5clj9yafv3aizxy6dp";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x $src $out
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
dir=$out/usr/local/Brother/Printer/mfc5890cn
|
||||
|
||||
patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $dir/lpd/brmfc5890cnfilter
|
||||
|
||||
wrapProgram $dir/inf/setupPrintcapij \
|
||||
--prefix PATH : ${lib.makeBinPath [
|
||||
coreutils
|
||||
]}
|
||||
|
||||
substituteInPlace $dir/lpd/filtermfc5890cn \
|
||||
--replace "/usr/" "$out/usr/"
|
||||
|
||||
wrapProgram $dir/lpd/filtermfc5890cn \
|
||||
--prefix PATH : ${lib.makeBinPath [
|
||||
a2ps
|
||||
coreutils
|
||||
file
|
||||
ghostscript
|
||||
gnused
|
||||
]}
|
||||
|
||||
substituteInPlace $dir/lpd/psconvertij2 \
|
||||
--replace '`which gs`' "${ghostscript}/bin/gs"
|
||||
|
||||
wrapProgram $dir/lpd/psconvertij2 \
|
||||
--prefix PATH : ${lib.makeBinPath [
|
||||
gnused
|
||||
gawk
|
||||
]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Brother MFC-5890CN LPR printer driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ martinramm ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +1,17 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, mkYarnPackage
|
||||
, baseUrl ? null
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "synapse-admin";
|
||||
version = "0.8.5";
|
||||
version = "0.8.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Awesome-Technologies";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0miHtEJ5e8MaqGc4ezPvwhGjoCZyOE7md0DUCC/ZOfk=";
|
||||
sha256 = "sha256-kvQBzrCu1sgDccKhr0i2DgDmO5z6u6s+vw5KymttoK4=";
|
||||
};
|
||||
|
||||
yarnNix = ./yarn.nix;
|
||||
|
|
|
|||
|
|
@ -10,25 +10,31 @@
|
|||
"url": "https://github.com/Awesome-Technologies/synapse-admin"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@testing-library/jest-dom": "^5.1.1",
|
||||
"@testing-library/jest-dom": "^5.16.5",
|
||||
"@testing-library/react": "^11.2.6",
|
||||
"@testing-library/user-event": "^13.1.8",
|
||||
"eslint": "^7.25.0",
|
||||
"@testing-library/user-event": "^14.4.3",
|
||||
"eslint": "^8.32.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-prettier": "^3.1.2",
|
||||
"eslint-config-react-app": "^7.0.1",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"jest-fetch-mock": "^3.0.3",
|
||||
"prettier": "^2.2.0",
|
||||
"ra-test": "^3.15.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.7.1",
|
||||
"@emotion/styled": "^11.6.0",
|
||||
"@mui/icons-material": "^5.3.1",
|
||||
"@mui/material": "^5.4.0",
|
||||
"papaparse": "^5.2.0",
|
||||
"prop-types": "^15.7.2",
|
||||
"ra-language-chinese": "^2.0.10",
|
||||
"ra-language-french": "^4.2.0",
|
||||
"ra-language-german": "^3.13.4",
|
||||
"react": "^17.0.0",
|
||||
"react-admin": "^3.19.7",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-scripts": "^4.0.0"
|
||||
"react-scripts": "^5.0.1"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -28,13 +28,13 @@ let
|
|||
# This includes the complete source so the per-script derivations can run the tests.
|
||||
core = stdenv.mkDerivation rec {
|
||||
pname = "bat-extras";
|
||||
version = "2021.04.06";
|
||||
version = "2023.03.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eth-p";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MphI2n+oHZrw8bPohNGeGdST5LS1c6s/rKqtpcR9cLo=";
|
||||
sha256 = "sha256-0Ged4qBeGi0p29unXrnQjoxWc6Fcl2oJThxkfL+t50A=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -38730,6 +38730,9 @@ with pkgs;
|
|||
mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
|
||||
mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
|
||||
|
||||
mfc5890cncupswrapper = callPackage ../misc/cups/drivers/mfc5890cncupswrapper { };
|
||||
mfc5890cnlpr = callPackage ../misc/cups/drivers/mfc5890cnlpr { };
|
||||
|
||||
mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { };
|
||||
mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue