Unverified Commit cdab0d3f authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 50adc1bf a48eed91

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -8625,6 +8625,12 @@ 
    githubId = 6430643;

    name = "Henry Till";

  };

  hensoko = {

    email = "hensoko@pub.solar";

    github = "hensoko";

    githubId = 13552930;

    name = "hensoko";

  };

  heph2 = {

    email = "srht@mrkeebs.eu";

    github = "heph2";

pkgs/applications/editors/leafpad/default.nix

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }:



stdenv.mkDerivation rec {

  version = "0.8.19";

  pname = "leafpad";

  src = fetchurl {

    url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz";

    sha256 = "sha256-B9P3EvTb0KMyUf0d7hTiGv3J+SCQ/HaMEasKxVatvpc=";

  };



  nativeBuildInputs = [ pkg-config intltool ];

  buildInputs = [ gtk2 ];



  hardeningDisable = [ "format" ];



  configureFlags = [

    "--enable-chooser"

  ];



  meta = with lib; {

    description = "Notepad clone for GTK 2.0";

    homepage = "http://tarot.freeshell.org/leafpad";

    platforms = platforms.linux;

    maintainers = [ maintainers.flosse ];

    license = licenses.gpl3;

    mainProgram = "leafpad";

  };

}

pkgs/applications/editors/qxw/default.nix

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, gtk2, pcre }:



stdenv.mkDerivation rec {

  pname = "qxw";

  version = "20200708";



  src = fetchurl {

    url = "https://www.quinapalus.com/qxw-${version}.tar.gz";

    sha256 = "1si3ila7137c7x4mp3jv1q1mh3jp0p4khir1yz1rwy0mp3znwv7d";

  };



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ gtk2 pcre ];



  makeFlags = [ "DESTDIR=$(out)" ];



  patchPhase = ''

    sed -i 's/ `dpkg-buildflags[^`]*`//g;

            /mkdir -p/d;

            s/cp -a/install -D/;

            s,/usr/games,/bin,' Makefile

  '';



  meta = with lib; {

    description = "Program to help create and publish crosswords";

    homepage = "https://www.quinapalus.com/qxw.html";

    license = licenses.gpl2;

    maintainers = [ maintainers.tckmn ];

    platforms = platforms.linux;

    mainProgram = "qxw";

  };

}

pkgs/applications/misc/1password-gui/default.nix

+9 −9
Original line number Diff line number Diff line
@@ -10,43 +10,43 @@ 


let

  pname = "1password";

  version = if channel == "stable" then "8.10.46" else "8.10.48-17.BETA";

  version = if channel == "stable" then "8.10.48" else "8.10.50-8.BETA";



  sources = {

    stable = {

      x86_64-linux = {

        url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";

        hash = "sha256-oewS90rSBqxA0V+ttcmUXznUZ3+mb5FKtmYD4kUDmTk=";

        hash = "sha256-6yC7wDYd6FJluiVXyc6O03GiZkG48ttRl1N1A9djI9A=";

      };

      aarch64-linux = {

        url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";

        hash = "sha256-tHQIhLPTD2dFRK542kFnpExg36paaNuzyOED8ZKyIYk=";

        hash = "sha256-RN3FC7JIAJvd1hWdVH1CAOUsYr5rpq9o3JVbyfwWWKk=";

      };

      x86_64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";

        hash = "sha256-pnAE1UTMXX89wshEI/wzhySb1NZY5ke5bSYmUjvU/pc=";

        hash = "sha256-iJkIzVeI/mqFbBAGqQPABq1sAeS9k0j+EuUND1VYWJQ=";

      };

      aarch64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";

        hash = "sha256-MmHUa96keBV9+E2GQdgz/aCTXeFkVNqHV0eH8/WhvhY=";

        hash = "sha256-LZ56dIJ5vXJ1SbCI8hdeldKJwzkfM0Tp8d9eZ4tQ9/k=";

      };

    };

    beta = {

      x86_64-linux = {

        url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";

        hash = "sha256-4SPZJP/ebnyAMEWrIGonb+5nYXuM8KCPK9modC/Cr/Y=";

        hash = "sha256-Wm8TZjPVkqn+Y0PvSxTBAGduQNBAWUvy0AEGveVvMS0=";

      };

      aarch64-linux = {

        url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";

        hash = "sha256-V5Nt81Trw6l7DAUtCX2Yv/fL2wBJpJER0iaOBmMfQ5o=";

        hash = "sha256-pF1DmzfcfyT/JVJx97dykbFwEjgOMpTvofTaZvwIIvE=";

      };

      x86_64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";

        hash = "sha256-UfSUPqZgbYdWyrfw41SdnnI1IeA+dYsfBAu/UQl0vVI=";

        hash = "sha256-MOilWgFZazVrMc6cCHqZO03KmBP8HCPevrxcKAMKEoE=";

      };

      aarch64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";

        hash = "sha256-ynkDnJtoKMAtegeilB0XIH+YrSS9EKYV1ceN0Ecls+A=";

        hash = "sha256-TBA2OJXSjKzAR+gvVPCetSc7MVCNoyw4xo6w+9EIayc=";

      };

    };

  };

pkgs/applications/misc/epdfview/default.nix

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, poppler }:



stdenv.mkDerivation rec {

  pname = "epdfview";

  version = "0.1.8";



  src = fetchurl {

    url = "mirror://debian/pool/main/e/epdfview/epdfview_${version}.orig.tar.gz";

    sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64";

  };



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ gtk2 poppler ];



  hardeningDisable = [ "format" ];



  patches = [ (fetchpatch {

                name = "epdfview-0.1.8-glib2-headers.patch";

                url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-glib2-headers.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634";

                sha256 = "17df6s1zij5ficj67xszq6kd88cy620az3ic55065ccnmsd73f8h";

              })

              (fetchpatch {

                name = "epdfview-0.1.8-modern-cups.patch";

                url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-modern-cups.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634";

                sha256 = "07yvgvai2bvbr5fa1mv6lg7nqr0qyryjn1xyjlh8nidg9k9vv001";

              })

            ];



  meta = with lib; {

    homepage = "https://packages.debian.org/wheezy/epdfview";

    description = "Lightweight PDF document viewer using Poppler and GTK";

    longDescription = ''

      ePDFView is a free lightweight PDF document viewer using Poppler and

      GTK libraries. The aim of ePDFView is to make a simple PDF document

      viewer, in the lines of Evince but without using the Gnome libraries.

    '';

    license = licenses.gpl2;

    maintainers = [ maintainers.astsmtl ];

    platforms = platforms.linux;

    mainProgram = "epdfview";

  };

}