nur-packages

commit 22e2ab28830a8287784626d3d345f6d340b51202
parent b06884b33bafcce216d44a274cfd22cb75be31b6
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Tue, 30 Mar 2021 10:57:05 +0300

Up

Diffstat:
M
nix/sources.json
 | 
28
----------------------------
M
pkgs/embox/default.nix
 | 
18
++++++++++++------
M
pkgs/misc/cfiles/default.nix
 | 
18
++++++++++++------
M
pkgs/misc/pvs-studio/default.nix
 | 
6
+++---

4 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -13,20 +13,6 @@
         "url": "https://github.com/ruarxive/apibackuper/archive/1ff139f688d59b899ff041ccc282e224110ddc76.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "cfiles": {
-        "branch": "master",
-        "builtin": false,
-        "date": "2020-06-09T05:17:34Z",
-        "description": "A ncurses file manager written in C with vim like keybindings",
-        "homepage": "https://github.com/mananapr/cfiles",
-        "owner": "mananapr",
-        "repo": "cfiles",
-        "rev": "c225a0d5ef60d8ce3f3acb0a54951a5c90849644",
-        "sha256": "11qq002gq4xi6vzwgrsr2hf3aj3fcaqcic3hw33mbj27xxxpaah4",
-        "type": "tarball",
-        "url": "https://github.com/mananapr/cfiles/archive/c225a0d5ef60d8ce3f3acb0a54951a5c90849644.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "cheetah3": {
         "branch": "master",
         "builtin": false,
@@ -139,20 +125,6 @@
         "url": "https://github.com/wladich/elevation_server/archive/ed023fee8e7a4347f240d35fc0c855fdfff0464f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "embox": {
-        "branch": "master",
-        "builtin": false,
-        "date": "2021-03-08T09:26:30Z",
-        "description": "Modular and configurable OS for embedded applications",
-        "homepage": "http://embox.github.io",
-        "owner": "embox",
-        "repo": "embox",
-        "rev": "d24671d0e06d5f3077c95bd6b8bea5d7736e9b7f",
-        "sha256": "0lmknzc7y6p4zs58mmf95y8yz1pj8bf8v7d7cnk4x16mpjhd39mr",
-        "type": "tarball",
-        "url": "https://github.com/embox/embox/archive/d24671d0e06d5f3077c95bd6b8bea5d7736e9b7f.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "foma": {
         "branch": "master",
         "builtin": false,
diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix
@@ -1,8 +1,8 @@
 { lib
 , stdenv
+, fetchFromGitHub
 , fetchurl
 , writers
-, sources
 , cpio
 , gcc-arm-embedded
 , python
@@ -27,11 +27,16 @@ let
       -nographic
   '';
 in
-stdenv.mkDerivation {
-  pname = "embox-unstable";
-  version = lib.substring 0 10 sources.embox.date;
+stdenv.mkDerivation rec {
+  pname = "embox";
+  version = "0.5.1";
 
-  src = sources.embox;
+  src = fetchFromGitHub {
+    owner = "embox";
+    repo = "embox";
+    rev = "v${version}";
+    sha256 = "0lvlmw60ab3n48cqb857phsvw9mpc5qfva4dw7wyilgs635x567c";
+  };
 
   patches = [ ./0001-fix-build.patch ];
 
@@ -63,7 +68,8 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    inherit (sources.embox) description homepage;
+    description = "Modular and configurable OS for embedded applications";
+    homepage = "http://embox.github.io/";
     license = licenses.bsd2;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, pkg-config, ncurses, w3m, ueberzug, sources }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, w3m, ueberzug }:
 
-stdenv.mkDerivation {
-  pname = "cfiles-unstable";
-  version = lib.substring 0 10 sources.cfiles.date;
+stdenv.mkDerivation rec {
+  pname = "cfiles";
+  version = "1.8";
 
-  src = sources.cfiles;
+  src = fetchFromGitHub {
+    owner = "mananapr";
+    repo = "cfiles";
+    rev = "v${version}";
+    sha256 = "1nj20d839a2q3m23hbv53vdv6ifkjb5qjcsyxdw3k7l6841qx4v3";
+  };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ncurses w3m ueberzug ];
@@ -22,7 +27,8 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    inherit (sources.cfiles) description homepage;
+    description = "A ncurses file manager written in C with vim like keybindings";
+    homepage = "https://github.com/mananapr/cfiles";
     license = licenses.mit;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
diff --git a/pkgs/misc/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix
@@ -10,13 +10,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "pvs-studio";
-  version = "7.11.44138.98";
+  version = "7.12.46137.116";
 
   src = fetchurl {
     url = "https://files.viva64.com/pvs-studio-${version}-${suffix}.tgz";
     sha256 = {
-      x86_64-linux = "1mrqfz5fbizafhsqfp67mrrhr6hfx7f53g9bixrxi1m1albgm062";
-      x86_64-darwin = "0jz6rgk44c8r94s2sqb1d16rclh33rf1w8dcpy8h6csdxsbdnqk5";
+      x86_64-linux = "0vgr0whkczpzsjrpp3gf9ydvc98b7754r7xfb7wncklam8s6bwaz";
+      x86_64-darwin = "1n6agfq39bm58dk23cd5fbf5w2wm8302fmxrhfldij7dj2fmbq4d";
     }.${system} or throwSystem;
   };