diff options
| author | 0x4A6F <0x4A6F@users.noreply.github.com> | 2021-01-28 19:00:49 +0000 |
|---|---|---|
| committer | 0x4A6F <0x4A6F@users.noreply.github.com> | 2021-01-28 19:42:59 +0000 |
| commit | 2451c4d1d6b71f321d84e188a039f9d53ce68327 (patch) | |
| tree | 1144cf26bf4b74c4a2cabf823a9d25b9b6f799c8 | |
| parent | 3666a66ee0e474c95a4c9c5c10bb4913e21e269f (diff) | |
| download | nixpkgs-2451c4d1d6b71f321d84e188a039f9d53ce68327.tar nixpkgs-2451c4d1d6b71f321d84e188a039f9d53ce68327.tar.gz nixpkgs-2451c4d1d6b71f321d84e188a039f9d53ce68327.tar.bz2 nixpkgs-2451c4d1d6b71f321d84e188a039f9d53ce68327.tar.lz nixpkgs-2451c4d1d6b71f321d84e188a039f9d53ce68327.tar.xz nixpkgs-2451c4d1d6b71f321d84e188a039f9d53ce68327.tar.zst nixpkgs-2451c4d1d6b71f321d84e188a039f9d53ce68327.zip | |
firejail: 0.9.64 -> 0.9.64.2
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.upstream | 3 |
2 files changed, 15 insertions, 27 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 6c0b5117e9d..979f55cc351 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -1,25 +1,18 @@ -{lib, stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}: -let - s = # Generated upstream information - rec { - baseName="firejail"; - version="0.9.64"; - name="${baseName}-${version}"; - url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz"; - sha256="1zgjwy2k57nx0r63fzr15gijah098ig0bll66jd615vc9q3snfz5"; - }; - buildInputs = [ - which - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - name = "${s.name}.tar.bz2"; +{ lib, stdenv, fetchFromGitHub, fetchpatch, which, xdg-dbus-proxy, nixosTests }: + +stdenv.mkDerivation rec { + pname = "firejail"; + version = "0.9.64.2"; + + src = fetchFromGitHub { + owner = "netblue30"; + repo = "firejail"; + rev = version; + sha256 = "1adizsb7pxr101bvvd359hxympnv36rnikp78npdr5dcvwddv3dv"; }; + buildInputs = [ which ]; + patches = [ # Adds the /nix directory when using an overlay. # Required to run any programs under this mode. @@ -79,12 +72,10 @@ stdenv.mkDerivation { passthru.tests = nixosTests.firejail; meta = { - inherit (s) version; description = "Namespace-based sandboxing tool for Linux"; - license = lib.licenses.gpl2Plus ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "https://firejail.wordpress.com/"; - downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/"; }; } diff --git a/pkgs/os-specific/linux/firejail/default.upstream b/pkgs/os-specific/linux/firejail/default.upstream deleted file mode 100644 index 0e6576c44a8..00000000000 --- a/pkgs/os-specific/linux/firejail/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url https://sourceforge.net/projects/firejail/files/firejail/ -version_link '[-][0-9.]+[.]tar[.][a-z0-9]+/download$' -SF_redirect |