commit 01a525b84e9c22daa7fbce4e006c87e4e2f7d41d · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/x11/window-managers/stumpwm.nix

··· 15 services.xserver.windowManager.session = singleton { 16 name = "stumpwm"; 17 start = '' 18 - ${pkgs.stumpwm}/bin/stumpwm & 19 waitPID=$! 20 ''; 21 }; 22 - environment.systemPackages = [ pkgs.stumpwm ]; 23 }; 24 }

··· 15 services.xserver.windowManager.session = singleton { 16 name = "stumpwm"; 17 start = '' 18 + ${pkgs.lispPackages.stumpwm}/bin/stumpwm & 19 waitPID=$! 20 ''; 21 }; 22 + environment.systemPackages = [ pkgs.lispPackages.stumpwm ]; 23 }; 24 }

+6 -6

pkgs/applications/editors/sublime/3/packages.nix

··· 5 in 6 rec { 7 sublime3-dev = common { 8 - buildVersion = "3170"; 9 - x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; 10 - x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; 11 } {}; 12 13 sublime3 = common { 14 - buildVersion = "3170"; 15 - x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; 16 - x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; 17 } {}; 18 }

··· 5 in 6 rec { 7 sublime3-dev = common { 8 + buildVersion = "3176"; 9 + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; 10 + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; 11 } {}; 12 13 sublime3 = common { 14 + buildVersion = "3176"; 15 + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; 16 + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; 17 } {}; 18 }

+1 -5

pkgs/development/compilers/gcc/4.8/default.nix

··· 185 libc_dev = stdenv.cc.libc_dev; 186 187 postPatch = 188 - if (hostPlatform.isHurd 189 - || (libcCross != null # e.g., building `gcc.crossDrv' 190 - && libcCross ? crossConfig 191 - && libcCross.crossConfig == "i586-pc-gnu") 192 - || (crossGNU && libcCross != null)) 193 then 194 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 195 # in glibc, so add the right `-I' flags to the default spec string.

··· 185 libc_dev = stdenv.cc.libc_dev; 186 187 postPatch = 188 + if targetPlatform.isHurd 189 then 190 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 191 # in glibc, so add the right `-I' flags to the default spec string.

+1 -5

pkgs/development/compilers/gcc/4.9/default.nix

··· 194 libc_dev = stdenv.cc.libc_dev; 195 196 postPatch = 197 - if (hostPlatform.isHurd 198 - || (libcCross != null # e.g., building `gcc.crossDrv' 199 - && libcCross ? crossConfig 200 - && libcCross.crossConfig == "i586-pc-gnu") 201 - || (crossGNU && libcCross != null)) 202 then 203 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 204 # in glibc, so add the right `-I' flags to the default spec string.

··· 194 libc_dev = stdenv.cc.libc_dev; 195 196 postPatch = 197 + if targetPlatform.isHurd 198 then 199 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 200 # in glibc, so add the right `-I' flags to the default spec string.

+1 -5

pkgs/development/compilers/gcc/5/default.nix

··· 196 ''; 197 198 postPatch = 199 - if (hostPlatform.isHurd 200 - || (libcCross != null # e.g., building `gcc.crossDrv' 201 - && libcCross ? crossConfig 202 - && libcCross.crossConfig == "i586-pc-gnu") 203 - || (crossGNU && libcCross != null)) 204 then 205 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 206 # in glibc, so add the right `-I' flags to the default spec string.

··· 196 ''; 197 198 postPatch = 199 + if targetPlatform.isHurd 200 then 201 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 202 # in glibc, so add the right `-I' flags to the default spec string.

+1 -5

pkgs/development/compilers/gcc/6/default.nix

··· 196 ''; 197 198 postPatch = 199 - if (hostPlatform.isHurd 200 - || (libcCross != null # e.g., building `gcc.crossDrv' 201 - && libcCross ? crossConfig 202 - && libcCross.crossConfig == "i586-pc-gnu") 203 - || (crossGNU && libcCross != null)) 204 then 205 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 206 # in glibc, so add the right `-I' flags to the default spec string.

··· 196 ''; 197 198 postPatch = 199 + if targetPlatform.isHurd 200 then 201 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 202 # in glibc, so add the right `-I' flags to the default spec string.

+1 -5

pkgs/development/compilers/gcc/7/default.nix

··· 168 patchShebangs $configureScript 169 done 170 '' + ( 171 - if (hostPlatform.isHurd 172 - || (libcCross != null # e.g., building `gcc.crossDrv' 173 - && libcCross ? crossConfig 174 - && libcCross.crossConfig == "i586-pc-gnu") 175 - || (crossGNU && libcCross != null)) 176 then 177 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 178 # in glibc, so add the right `-I' flags to the default spec string.

··· 168 patchShebangs $configureScript 169 done 170 '' + ( 171 + if targetPlatform.isHurd 172 then 173 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 174 # in glibc, so add the right `-I' flags to the default spec string.

+1 -5

pkgs/development/compilers/gcc/8/default.nix

··· 163 patchShebangs $configureScript 164 done 165 '' + ( 166 - if (hostPlatform.isHurd 167 - || (libcCross != null # e.g., building `gcc.crossDrv' 168 - && libcCross ? crossConfig 169 - && libcCross.crossConfig == "i586-pc-gnu") 170 - || (crossGNU && libcCross != null)) 171 then 172 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 173 # in glibc, so add the right `-I' flags to the default spec string.

··· 163 patchShebangs $configureScript 164 done 165 '' + ( 166 + if targetPlatform.isHurd 167 then 168 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 169 # in glibc, so add the right `-I' flags to the default spec string.

+1 -5

pkgs/development/compilers/gcc/snapshot/default.nix

··· 138 hardeningDisable = [ "format" ]; 139 140 postPatch = 141 - if (hostPlatform.isHurd 142 - || (libcCross != null # e.g., building `gcc.crossDrv' 143 - && libcCross ? crossConfig 144 - && libcCross.crossConfig == "i586-pc-gnu") 145 - || (crossGNU && libcCross != null)) 146 then 147 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 148 # in glibc, so add the right `-I' flags to the default spec string.

··· 138 hardeningDisable = [ "format" ]; 139 140 postPatch = 141 + if targetPlatform.isHurd 142 then 143 # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not 144 # in glibc, so add the right `-I' flags to the default spec string.

+2 -2

pkgs/development/libraries/fstrm/default.nix

··· 2 3 stdenv.mkDerivation rec { 4 name = "fstrm-${version}"; 5 - version = "0.3.2"; 6 7 src = fetchFromGitHub { 8 owner = "farsightsec"; 9 repo = "fstrm"; 10 rev = "v${version}"; 11 - sha256 = "135m0d4z1wbiaazs3bh6z53a35mgs33gvfki8pl4xfaw9cfcfpd2"; 12 }; 13 14 outputs = [ "bin" "out" "dev" ];

··· 2 3 stdenv.mkDerivation rec { 4 name = "fstrm-${version}"; 5 + version = "0.4.0"; 6 7 src = fetchFromGitHub { 8 owner = "farsightsec"; 9 repo = "fstrm"; 10 rev = "v${version}"; 11 + sha256 = "11i8b3wy6j3z3fcv816xccxxlrfkczdr8bm2gnan6yv4ppbji4ny"; 12 }; 13 14 outputs = [ "bin" "out" "dev" ];

+2 -2

pkgs/development/tools/parsing/byacc/default.nix

··· 2 3 stdenv.mkDerivation rec { 4 name = "byacc-${version}"; 5 - version = "20170709"; 6 7 src = fetchurl { 8 urls = [ 9 "ftp://ftp.invisible-island.net/byacc/${name}.tgz" 10 "https://invisible-mirror.net/archives/byacc/${name}.tgz" 11 ]; 12 - sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7"; 13 }; 14 15 doCheck = true;

··· 2 3 stdenv.mkDerivation rec { 4 name = "byacc-${version}"; 5 + version = "20180510"; 6 7 src = fetchurl { 8 urls = [ 9 "ftp://ftp.invisible-island.net/byacc/${name}.tgz" 10 "https://invisible-mirror.net/archives/byacc/${name}.tgz" 11 ]; 12 + sha256 = "14ynlrcsc2hwny3gxng19blfvglhqd4m7hl597fwksf7zfzhv56h"; 13 }; 14 15 doCheck = true;

+3 -3

pkgs/tools/networking/ccnet/default.nix

··· 1 {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: 2 3 stdenv.mkDerivation rec { 4 - version = "6.1.7"; 5 - seafileVersion = "6.1.7"; 6 name = "ccnet-${version}"; 7 8 src = fetchurl { 9 url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; 10 - sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r"; 11 }; 12 13 nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ];

··· 1 {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: 2 3 stdenv.mkDerivation rec { 4 + version = "6.1.8"; 5 + seafileVersion = "6.1.8"; 6 name = "ccnet-${version}"; 7 8 src = fetchurl { 9 url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; 10 + sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm"; 11 }; 12 13 nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ];